diff options
| author | stefanf <stefanf@FreeBSD.org> | 2007-03-11 18:30:22 +0000 |
|---|---|---|
| committer | stefanf <stefanf@FreeBSD.org> | 2007-03-11 18:30:22 +0000 |
| commit | 11fa4c47513c298a58113f8fd2a473ec7f643254 (patch) | |
| tree | 509b6d0c810b13835386c30b69cd13d7ebcd95d7 /lib/libedit/emacs.c | |
| parent | 8355c667d5270a72a500fdd281ef01faca0fa571 (diff) | |
| download | FreeBSD-src-11fa4c47513c298a58113f8fd2a473ec7f643254.zip FreeBSD-src-11fa4c47513c298a58113f8fd2a473ec7f643254.tar.gz | |
Merge the following changes from NetBSD:
chared.h 1.17, common.c 1.19, emacs.c 1.21, key.c 1.18, key.h 1.9, map.c 1.23,
term.c 1.42, term.h 1.17, vi.c 1.25:
# Print the actual eofc, instead of ^D\b\b.
# Change internal character decoding to prevent buffer oveflows.
key.c 1.19, key.h 1.10:
# move declaration to header file.
term.c 1.43:
# Coverity CID 806: Prevent NULL deref
term.c 1.44:
# Coverity CID 1668: Plug memory leak.
term.c 1.45:
# Fix compilation.
MFC after: 3 weeks
Diffstat (limited to 'lib/libedit/emacs.c')
| -rw-r--r-- | lib/libedit/emacs.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/libedit/emacs.c b/lib/libedit/emacs.c index c17788e..a285b1c 100644 --- a/lib/libedit/emacs.c +++ b/lib/libedit/emacs.c @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $NetBSD: emacs.c,v 1.20 2005/08/08 14:05:37 christos Exp $ + * $NetBSD: emacs.c,v 1.21 2006/03/06 21:11:56 christos Exp $ */ #if !defined(lint) && !defined(SCCSID) @@ -50,15 +50,14 @@ __FBSDID("$FreeBSD$"); */ protected el_action_t /*ARGSUSED*/ -em_delete_or_list(EditLine *el, int c __unused) +em_delete_or_list(EditLine *el, int c) { if (el->el_line.cursor == el->el_line.lastchar) { /* if I'm at the end */ if (el->el_line.cursor == el->el_line.buffer) { /* and the beginning */ - term_overwrite(el, STReof, 4); /* then do an EOF */ - term__flush(); + term_writec(el, c); /* then do an EOF */ return (CC_EOF); } else { /* |
