diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-02-10 14:39:14 +0200 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-02-10 14:39:14 +0200 |
| commit | fab053ccf84ccb537999615da8f962d03ef5da76 (patch) | |
| tree | 8fe605da2602d2813c45a29eed2bd24d42eabbfb /cmd-line-utils/libedit/emacs.c | |
| parent | 6c6fc0978e0123d515bf95059028ebdb9afd75f8 (diff) | |
| download | mariadb-git-fab053ccf84ccb537999615da8f962d03ef5da76.tar.gz | |
From jperkin : Merge libedit 2.11 and related files,
based on NetBSD CVS as of 2009/02/06 20:09:00.
Diffstat (limited to 'cmd-line-utils/libedit/emacs.c')
| -rw-r--r-- | cmd-line-utils/libedit/emacs.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/cmd-line-utils/libedit/emacs.c b/cmd-line-utils/libedit/emacs.c index 79f2bf0c818..135bd75f566 100644 --- a/cmd-line-utils/libedit/emacs.c +++ b/cmd-line-utils/libedit/emacs.c @@ -1,4 +1,4 @@ -/* $NetBSD: emacs.c,v 1.19 2004/10/28 21:14:52 dsl Exp $ */ +/* $NetBSD: emacs.c,v 1.21 2006/03/06 21:11:56 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -32,7 +32,13 @@ * SUCH DAMAGE. */ -#include <config.h> +#include "config.h" +#if !defined(lint) && !defined(SCCSID) +#if 0 +static char sccsid[] = "@(#)emacs.c 8.1 (Berkeley) 6/4/93"; +#else +#endif +#endif /* not lint && not SCCSID */ /* * emacs.c: Emacs functions @@ -45,15 +51,14 @@ */ protected el_action_t /*ARGSUSED*/ -em_delete_or_list(EditLine *el, int c __attribute__((__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 a EOF */ - term__flush(); + term_writec(el, c); /* then do an EOF */ return (CC_EOF); } else { /* |