diff options
| author | pfg <pfg@FreeBSD.org> | 2014-07-17 02:14:25 +0000 |
|---|---|---|
| committer | pfg <pfg@FreeBSD.org> | 2014-07-17 02:14:25 +0000 |
| commit | 30eedb40f8116d0b9e1474448737253ee214d44a (patch) | |
| tree | f9a2b5d76dcd431fca9f52c6c575514897497474 /lib/libedit/common.c | |
| parent | 082dc1af3f2b61b464dcf541f07a5ee1969edbb2 (diff) | |
| download | FreeBSD-src-30eedb40f8116d0b9e1474448737253ee214d44a.zip FreeBSD-src-30eedb40f8116d0b9e1474448737253ee214d44a.tar.gz | |
MFC r268502:
Sync some (mostly cosmetical) changes from NetBSD
Makefile,v 1.37
tc1.c v 1.3
Rename TEST/test.c tc1.c
common.c,v 1.23
pass lint on _LP64.
emacs.c,v 1.22
pass lint on _LP64.
filecomplete.h,v 1.8
mv NetBSD ID back from 1.9 as we don't
have the widecharacter support.
prompt.c,v 1.14
prompt.h,v 1.9
term.h,v 1.20
read.h,v 1.6
Update NetBSD version strings
sys.h,v 1.12
Misc sun stuff.
tty.c 1.31
handle EINTR in the termios operations
Allow a single process to control multiple ttys (for pthreads using _REENTRANT)
using multiple EditLine objects.
pass lint on _LP64.
Don't depend on side effects inside an assert
Obtained from: NetBSD
Diffstat (limited to 'lib/libedit/common.c')
| -rw-r--r-- | lib/libedit/common.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/libedit/common.c b/lib/libedit/common.c index 0599554..64490c9 100644 --- a/lib/libedit/common.c +++ b/lib/libedit/common.c @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $NetBSD: common.c,v 1.19 2006/03/06 21:11:56 christos Exp $ + * $NetBSD: common.c,v 1.23 2009/02/27 04:18:45 msaitoh Exp $ */ #if !defined(lint) && !defined(SCCSID) @@ -121,7 +121,7 @@ ed_delete_prev_word(EditLine *el, int c __unused) *kp++ = *p; el->el_chared.c_kill.last = kp; - c_delbefore(el, el->el_line.cursor - cp); /* delete before dot */ + c_delbefore(el, (int)(el->el_line.cursor - cp));/* delete before dot */ el->el_line.cursor = cp; if (el->el_line.cursor < el->el_line.buffer) el->el_line.cursor = el->el_line.buffer; /* bounds check */ @@ -208,9 +208,6 @@ ed_move_to_end(EditLine *el, int c __unused) el->el_line.cursor = el->el_line.lastchar; if (el->el_map.type == MAP_VI) { -#ifdef VI_MOVE - el->el_line.cursor--; -#endif if (el->el_chared.c_vcmd.action != NOP) { cv_delfini(el); return (CC_REFRESH); |
