diff options
| author | Otto Moerbeek <otto@cvs.openbsd.org> | 2003-11-25 20:12:40 +0000 |
|---|---|---|
| committer | Otto Moerbeek <otto@cvs.openbsd.org> | 2003-11-25 20:12:40 +0000 |
| commit | 8dec545c586449d9e5f4a74c285ae295727a6e6d (patch) | |
| tree | 24ede7fd8fd6d4bfc330f35ece0d823d276f1a3f /lib/libedit/emacs.c | |
| parent | 735da5f8c0917e2182e8f693897d286fe0456ef8 (diff) | |
Sync libedit to NetBSD libedit as of Nov 8, 2003.
Tested by jmc@ djm@ and myself
Diffstat (limited to 'lib/libedit/emacs.c')
| -rw-r--r-- | lib/libedit/emacs.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/lib/libedit/emacs.c b/lib/libedit/emacs.c index 59b01ac31fc..b0e13cbaa79 100644 --- a/lib/libedit/emacs.c +++ b/lib/libedit/emacs.c @@ -1,5 +1,5 @@ -/* $OpenBSD: emacs.c,v 1.6 2003/10/31 08:42:24 otto Exp $ */ -/* $NetBSD: emacs.c,v 1.15 2003/08/07 16:44:31 agc Exp $ */ +/* $OpenBSD: emacs.c,v 1.7 2003/11/25 20:12:38 otto Exp $ */ +/* $NetBSD: emacs.c,v 1.16 2003/11/02 20:07:58 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)emacs.c 8.1 (Berkeley) 6/4/93"; #else -static const char rcsid[] = "$OpenBSD: emacs.c,v 1.6 2003/10/31 08:42:24 otto Exp $"; +static const char rcsid[] = "$OpenBSD: emacs.c,v 1.7 2003/11/25 20:12:38 otto Exp $"; #endif #endif /* not lint && not SCCSID */ @@ -120,10 +120,8 @@ em_yank(EditLine *el, int c __attribute__((__unused__))) { char *kp, *cp; - if (el->el_chared.c_kill.last == el->el_chared.c_kill.buf) { - if (!ch_enlargebufs(el, 1)) - return (CC_ERROR); - } + if (el->el_chared.c_kill.last == el->el_chared.c_kill.buf) + return (CC_NORM); if (el->el_line.lastchar + (el->el_chared.c_kill.last - el->el_chared.c_kill.buf) >= |