summaryrefslogtreecommitdiffstats
path: root/lib/libedit/emacs.c
diff options
context:
space:
mode:
authorschwarze <schwarze@openbsd.org>2016-01-30 00:06:39 +0000
committerschwarze <schwarze@openbsd.org>2016-01-30 00:06:39 +0000
commitfd40972a32cae034e619460a2b6f83c3492db0ca (patch)
tree72798d3d835644ba0a1c63eade7f249cf5f8e482 /lib/libedit/emacs.c
parentwhitespace fixes; ok ajacoutot (diff)
downloadwireguard-openbsd-fd40972a32cae034e619460a2b6f83c3492db0ca.tar.xz
wireguard-openbsd-fd40972a32cae034e619460a2b6f83c3492db0ca.zip
Third step in synching with NetBSD:
* rename fkey_t to funckey_t and el_term_t to el_terminal_t * rename struct editline member el_term to el_terminal * rename many functions in terminal.c from term_*() to terminal_*(), for consistency with the file name and to not look related to <term.h> No functional change. This makes refresh.c and sig.c almost identical to the NetBSD versions. It reduces the remaining diff from +2446 -1805 to +2053 -1420. OK czarkoff@
Diffstat (limited to 'lib/libedit/emacs.c')
-rw-r--r--lib/libedit/emacs.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libedit/emacs.c b/lib/libedit/emacs.c
index f2c4eae272e..011916a839d 100644
--- a/lib/libedit/emacs.c
+++ b/lib/libedit/emacs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: emacs.c,v 1.9 2010/06/30 00:05:35 nicm Exp $ */
+/* $OpenBSD: emacs.c,v 1.10 2016/01/30 00:06:39 schwarze Exp $ */
/* $NetBSD: emacs.c,v 1.23 2009/12/30 22:37:40 christos Exp $ */
/*-
@@ -53,14 +53,14 @@ em_delete_or_list(EditLine *el, Int c)
/* if I'm at the end */
if (el->el_line.cursor == el->el_line.buffer) {
/* and the beginning */
- term_writec(el, c); /* then do an EOF */
+ terminal_writec(el, c); /* then do an EOF */
return (CC_EOF);
} else {
/*
* Here we could list completions, but it is an
* error right now
*/
- term_beep(el);
+ terminal_beep(el);
return (CC_ERROR);
}
} else {