[src/trunk]: src/lib/libedit term -> terminal

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/786800014b37
branches:  trunk
changeset: 767702:786800014b37
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Jul 28 00:45:50 2011 +0000

description:
term -> terminal

diffstat:

 lib/libedit/search.c |  14 +++++++-------
 lib/libedit/sig.c    |   6 +++---
 lib/libedit/tty.c    |   6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diffs (117 lines):

diff -r 88526caa5a93 -r 786800014b37 lib/libedit/search.c
--- a/lib/libedit/search.c      Thu Jul 28 00:45:30 2011 +0000
+++ b/lib/libedit/search.c      Thu Jul 28 00:45:50 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: search.c,v 1.24 2010/04/15 00:57:33 christos Exp $     */
+/*     $NetBSD: search.c,v 1.25 2011/07/28 00:46:26 christos Exp $     */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)search.c   8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: search.c,v 1.24 2010/04/15 00:57:33 christos Exp $");
+__RCSID("$NetBSD: search.c,v 1.25 2011/07/28 00:46:26 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -254,7 +254,7 @@
                case ED_INSERT:
                case ED_DIGIT:
                        if (el->el_search.patlen >= EL_BUFSIZ - LEN)
-                               term_beep(el);
+                               terminal_beep(el);
                        else {
                                el->el_search.patbuf[el->el_search.patlen++] =
                                    ch;
@@ -279,7 +279,7 @@
                        if (el->el_search.patlen > LEN)
                                done++;
                        else
-                               term_beep(el);
+                               terminal_beep(el);
                        break;
 
                default:
@@ -303,7 +303,7 @@
                                            *el->el_line.cursor != '\n') {
                                                if (el->el_search.patlen >=
                                                    EL_BUFSIZ - LEN) {
-                                                       term_beep(el);
+                                                       terminal_beep(el);
                                                        break;
                                                }
                                                el->el_search.patbuf[el->el_search.patlen++] =
@@ -316,7 +316,7 @@
                                        re_refresh(el);
                                        break;
                                    } else if (isglob(*cp)) {
-                                           term_beep(el);
+                                           terminal_beep(el);
                                            break;
                                    }
                                break;
@@ -401,7 +401,7 @@
                                el->el_search.patbuf[el->el_search.patlen] =
                                    '\0';
                                if (ret == CC_ERROR) {
-                                       term_beep(el);
+                                       terminal_beep(el);
                                        if (el->el_history.eventno !=
                                            ohisteventno) {
                                                el->el_history.eventno =
diff -r 88526caa5a93 -r 786800014b37 lib/libedit/sig.c
--- a/lib/libedit/sig.c Thu Jul 28 00:45:30 2011 +0000
+++ b/lib/libedit/sig.c Thu Jul 28 00:45:50 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sig.c,v 1.15 2009/02/19 15:20:22 christos Exp $        */
+/*     $NetBSD: sig.c,v 1.16 2011/07/28 00:46:06 christos Exp $        */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)sig.c      8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: sig.c,v 1.15 2009/02/19 15:20:22 christos Exp $");
+__RCSID("$NetBSD: sig.c,v 1.16 2011/07/28 00:46:06 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -82,7 +82,7 @@
                tty_rawmode(sel);
                if (ed_redisplay(sel, 0) == CC_REFRESH)
                        re_refresh(sel);
-               term__flush(sel);
+               terminal__flush(sel);
                break;
 
        case SIGWINCH:
diff -r 88526caa5a93 -r 786800014b37 lib/libedit/tty.c
--- a/lib/libedit/tty.c Thu Jul 28 00:45:30 2011 +0000
+++ b/lib/libedit/tty.c Thu Jul 28 00:45:50 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tty.c,v 1.35 2011/01/28 03:41:52 christos Exp $        */
+/*     $NetBSD: tty.c,v 1.36 2011/07/28 00:45:50 christos Exp $        */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)tty.c      8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: tty.c,v 1.35 2011/01/28 03:41:52 christos Exp $");
+__RCSID("$NetBSD: tty.c,v 1.36 2011/07/28 00:45:50 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -1249,7 +1249,7 @@
 
                                cu = strlen(m->m_name) + (x != '\0') + 1;
 
-                               if (len + cu >= (size_t)el->el_term.t_size.h) {
+                               if (len + cu >= (size_t)el->el_terminal.t_size.h) {
                                        (void) fprintf(el->el_outfile, "\n%*s",
                                            (int)st, "");
                                        len = st + cu;