 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile,v 1.53 2015/01/29 20:30:02 joerg Exp $
+#	$NetBSD: Makefile,v 1.54 2016/02/17 19:47:49 christos Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 USE_SHLIBDIR=	yes
 WIDECHAR ?= yes
 WARNS?=	5
 LIB=	edit
 LIBDPLIBS+=     terminfo ${.CURDIR}/../libterminfo
 .include "bsd.own.mk"
 COPTS+=	-Wunused-parameter
 @@ -42,32 +42,32 @@ SRCS += tokenizern.c historyn.c
 CLEANFILES+=tokenizern.c.tmp tokenizern.c historyn.c.tmp historyn.c
 CPPFLAGS+=-DWIDECHAR
 .endif
 LIBEDITDIR?=${.CURDIR}
 INCS= histedit.h
 INCSDIR=/usr/include
 CLEANFILES+=editline.c
 CLEANFILES+=common.h.tmp editline.c.tmp emacs.h.tmp fcns.c.tmp fcns.h.tmp
 CLEANFILES+=help.c.tmp help.h.tmp vi.h.tmp tc1.o tc1
 CLEANFILES+=tokenizern.c.tmp tokenizern.c tokenizerw.c.tmp tokenizerw.c
 CPPFLAGS+=-I. -I${LIBEDITDIR}
 CPPFLAGS+=-I. -I${.CURDIR}
 CPPFLAGS+=#-DDEBUG_TTY -DDEBUG_KEY -DDEBUG_READ -DDEBUG -DDEBUG_REFRESH
 CPPFLAGS+=#-DDEBUG_PASTE -DDEBUG_EDIT
 AHDR=vi.h emacs.h common.h
 ASRC=${LIBEDITDIR}/vi.c ${LIBEDITDIR}/emacs.c ${LIBEDITDIR}/common.c
 DPSRCS+=	${AHDR} fcns.h help.h fcns.c help.c
 CLEANFILES+=	${AHDR} fcns.h help.h fcns.c help.c
 SUBDIR=	readline
 vi.h: vi.c makelist Makefile
 	${_MKTARGET_CREATE}
 	${HOST_SH} ${LIBEDITDIR}/makelist -h ${LIBEDITDIR}/vi.c \
 	    > ${.TARGET}.tmp && \
 	    mv ${.TARGET}.tmp ${.TARGET}
 @@ -110,26 +110,26 @@ editline.c: ${OSRCS} makelist Makefile
 tokenizern.c: makelist Makefile
 	${_MKTARGET_CREATE}
 	${HOST_SH} ${LIBEDITDIR}/makelist -n tokenizer.c > ${.TARGET}.tmp && \
 	    mv ${.TARGET}.tmp ${.TARGET}
 historyn.c: makelist Makefile
 	${_MKTARGET_CREATE}
 	${HOST_SH} ${LIBEDITDIR}/makelist -n history.c > ${.TARGET}.tmp && \
 	    mv ${.TARGET}.tmp ${.TARGET}
 tc1.o:	${LIBEDITDIR}/TEST/tc1.c
 tc1:	libedit.a tc1.o
 	${_MKTARGET_LINK}
 	${CC} ${LDFLAGS} ${.ALLSRC} -o ${.TARGET} libedit.a ${LDADD} -ltermlib
 .include <bsd.lib.mk>
 .include <bsd.subdir.mk>
 # XXX
 .if defined(HAVE_GCC)
 COPTS.editline.c+=	-Wno-cast-qual
 COPTS.tokenizer.c+=	-Wno-cast-qual
 COPTS.tokenizern.c+=	-Wno-cast-qual
 .endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vi.c,v 1.53 2016/02/16 22:53:14 christos Exp $	*/
+/*	$NetBSD: vi.c,v 1.54 2016/02/17 19:47:49 christos Exp $	*/
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Christos Zoulas of Cornell University.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -27,27 +27,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
 #if 0
 static char sccsid[] = "@(#)vi.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: vi.c,v 1.53 2016/02/16 22:53:14 christos Exp $");
+__RCSID("$NetBSD: vi.c,v 1.54 2016/02/17 19:47:49 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 /*
  * vi.c: Vi mode commands.
  */
 #include <sys/wait.h>
 #include <ctype.h>
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 @@ -575,27 +575,27 @@ vi_zero(EditLine *el, wint_t c)
 	if (el->el_state.doingarg)
 		return ed_argument_digit(el, c);
 	el->el_line.cursor = el->el_line.buffer;
 	if (el->el_chared.c_vcmd.action != NOP) {
 		cv_delfini(el);
 		return CC_REFRESH;
+	}
 	return CC_CURSOR;
+}
 /* vi_delete_prev_char():
- * 	Vi move to previous character (backspace)
+ *	Vi move to previous character (backspace)
  *	[^H] in insert mode only
  */
 protected el_action_t
 /*ARGSUSED*/
 vi_delete_prev_char(EditLine *el, wint_t c __attribute__((__unused__)))
+{
 	if (el->el_line.cursor <= el->el_line.buffer)
 		return CC_ERROR;
 	c_delbefore1(el);
 	el->el_line.cursor--;
 	return CC_REFRESH;
 @@ -967,27 +967,27 @@ vi_to_history_line(EditLine *el, wint_t
 	/* Lack of a 'count' means oldest, not 1 */
 	if (!el->el_state.doingarg) {
 		el->el_history.eventno = 0x7fffffff;
 		hist_get(el);
 	} else {
 		/* This is brain dead, all the rest of this code counts
 		 * upwards going into the past.  Here we need count in the
 		 * other direction (to match the output of fc -l).
 		 * I could change the world, but this seems to suffice.
 		 */
 		el->el_history.eventno = 1;
 		if (hist_get(el) == CC_ERROR)
 			return CC_ERROR;
 		el->el_history.eventno = 1 + el->el_history.ev.num
 					- el->el_state.argument;
 		if (el->el_history.eventno < 0) {
 			el->el_history.eventno = sv_event_no;
 			return CC_ERROR;
+		}
+	}
 	rval = hist_get(el);
 	if (rval == CC_ERROR)
 		el->el_history.eventno = sv_event_no;
 	return rval;
+}
 /* vi_histedit():

 @@ -1,14 +1,14 @@
-/*	$NetBSD: chared.c,v 1.46 2016/02/16 22:53:14 christos Exp $	*/
+/*	$NetBSD: chared.c,v 1.47 2016/02/17 19:47:49 christos Exp $	*/
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Christos Zoulas of Cornell University.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -27,27 +27,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
 #if 0
 static char sccsid[] = "@(#)chared.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: chared.c,v 1.46 2016/02/16 22:53:14 christos Exp $");
+__RCSID("$NetBSD: chared.c,v 1.47 2016/02/17 19:47:49 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 /*
  * chared.c: Character editor utilities
  */
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
 #include "el.h"
 #include "common.h"
 @@ -516,27 +516,27 @@ ch_enlargebufs(EditLine *el, size_t addl
 		while(newsz - sz < addlen)
 			newsz *= 2;
+	}
 	/*
 	 * Reallocate line buffer.
 	 */
 	newbuffer = el_realloc(el->el_line.buffer, newsz * sizeof(*newbuffer));
 	if (!newbuffer)
 		return 0;
 	/* zero the newly added memory, leave old data in */
 	(void) memset(&newbuffer[sz], 0, (newsz - sz) * sizeof(*newbuffer));
 	oldbuf = el->el_line.buffer;
 	el->el_line.buffer = newbuffer;
 	el->el_line.cursor = newbuffer + (el->el_line.cursor - oldbuf);
 	el->el_line.lastchar = newbuffer + (el->el_line.lastchar - oldbuf);
 	/* don't set new size until all buffers are enlarged */
 	el->el_line.limit  = &newbuffer[sz - EL_LEAVE];
 	/*
 	 * Reallocate kill buffer.
 	 */
 	newbuffer = el_realloc(el->el_chared.c_kill.buf, newsz *
 	    sizeof(*newbuffer));
 @@ -565,27 +565,27 @@ ch_enlargebufs(EditLine *el, size_t addl
 	/* zero the newly added memory, leave old data in */
 	(void) memset(&newbuffer[sz], 0, (newsz - sz) * sizeof(*newbuffer));
 	el->el_chared.c_undo.buf = newbuffer;
 	newbuffer = el_realloc(el->el_chared.c_redo.buf,
 	    newsz * sizeof(*newbuffer));
 	if (!newbuffer)
 		return 0;
 	el->el_chared.c_redo.pos = newbuffer +
 			(el->el_chared.c_redo.pos - el->el_chared.c_redo.buf);
 	el->el_chared.c_redo.lim = newbuffer +
 			(el->el_chared.c_redo.lim - el->el_chared.c_redo.buf);
 	el->el_chared.c_redo.buf = newbuffer;
 	if (!hist_enlargebuf(el, sz, newsz))
 		return 0;
 	/* Safe to set enlarged buffer size */
 	el->el_line.limit  = &el->el_line.buffer[newsz - EL_LEAVE];
 	if (el->el_chared.c_resizefun)
 		(*el->el_chared.c_resizefun)(el, el->el_chared.c_resizearg);
 	return 1;
+}
 /* ch_end():
  *	Free the data structures used by the editor
  */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: chartype.c,v 1.18 2016/02/16 22:53:14 christos Exp $	*/
+/*	$NetBSD: chartype.c,v 1.19 2016/02/17 19:47:49 christos Exp $	*/
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -28,27 +28,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * chartype.c: character classification and meta information
  */
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: chartype.c,v 1.18 2016/02/16 22:53:14 christos Exp $");
+__RCSID("$NetBSD: chartype.c,v 1.19 2016/02/17 19:47:49 christos Exp $");
 #endif /* not lint && not SCCSID */
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
 #include "el.h"
 #define CT_BUFSIZ ((size_t)1024)
 #ifdef WIDECHAR
 protected int
 ct_conv_cbuff_resize(ct_buffer_t *conv, size_t csize)
 @@ -66,27 +66,27 @@ ct_conv_cbuff_resize(ct_buffer_t *conv,
 		el_free(conv->cbuff);
 		conv->cbuff = NULL;
 		return -1;
+	}
 	conv->cbuff = p;
 	return 0;
+}
 protected int
 ct_conv_wbuff_resize(ct_buffer_t *conv, size_t wsize)
+{
 	void *p;
 	if (wsize <= conv->wsize)
 		return 0;
 	conv->wsize = wsize;
 	p = el_realloc(conv->wbuff, conv->wsize * sizeof(*conv->wbuff));
 	if (p == NULL) {
 		conv->wsize = 0;
 		el_free(conv->wbuff);
 		conv->wbuff = NULL;
 		return -1;
+	}
 	conv->wbuff = p;
 	return 0;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: chartype.h,v 1.20 2016/02/14 17:06:24 christos Exp $	*/
+/*	$NetBSD: chartype.h,v 1.21 2016/02/17 19:47:49 christos Exp $	*/
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -62,27 +62,27 @@
 #define ct_mbrtowc           mbrtowc
 #define ct_wctob             wctob
 #define ct_wctomb            wctomb
 #define ct_wctomb_reset      wctomb(0,0)
 #define ct_wcstombs          wcstombs
 #define ct_mbstowcs          mbstowcs
 #define Char			wchar_t
 #define FUN(prefix,rest)	prefix ## _w ## rest
 #define FUNW(type)		type ## _w
 #define TYPE(type)		type ## W
 #define FSTR			"%ls"
-#define STR(x) 			L ## x
+#define STR(x)			L ## x
 #define UC(c)			c
 #define Isalpha(x)  iswalpha(x)
 #define Isalnum(x)  iswalnum(x)
 #define Isgraph(x)  iswgraph(x)
 #define Isspace(x)  iswspace(x)
 #define Isdigit(x)  iswdigit(x)
 #define Iscntrl(x)  iswcntrl(x)
 #define Isprint(x)  iswprint(x)
 #define Isupper(x)  iswupper(x)
 #define Islower(x)  iswlower(x)
 #define Toupper(x)  towupper(x)
 #define Tolower(x)  towlower(x)
 @@ -103,39 +103,39 @@
 #define Strcspn(s,r)    wcscspn(s,r)
 #define Strtol(p,e,b)   wcstol(p,e,b)
 static inline int
 Width(wchar_t c)
+{
 	int w = wcwidth(c);
 	return w < 0 ? 0 : w;
+}
 #else /* NARROW */
-size_t 	ct_mbrtowc(char *, const char *, size_t, void *);
+size_t	ct_mbrtowc(char *, const char *, size_t, void *);
 #define ct_wctob(w)          ((int)(w))
 #define ct_wctomb            error
 #define ct_wctomb_reset
 #define ct_wcstombs(a, b, c)    (strncpy(a, b, c), strlen(a))
 #define ct_mbstowcs(a, b, c)    (strncpy(a, b, c), strlen(a))
 #define Char			char
 #define FUN(prefix,rest)	prefix ## _ ## rest
 #define FUNW(type)		type
 #define TYPE(type)		type
 #define FSTR			"%s"
-#define STR(x) 			x
+#define STR(x)			x
 #define UC(c)			(unsigned char)(c)
 #define Isalpha(x)  isalpha((unsigned char)x)
 #define Isalnum(x)  isalnum((unsigned char)x)
 #define Isgraph(x)  isgraph((unsigned char)x)
 #define Isspace(x)  isspace((unsigned char)x)
 #define Isdigit(x)  isdigit((unsigned char)x)
 #define Iscntrl(x)  iscntrl((unsigned char)x)
 #define Isprint(x)  isprint((unsigned char)x)
 #define Isupper(x)  isupper((unsigned char)x)
 #define Islower(x)  islower((unsigned char)x)
 #define Toupper(x)  toupper((unsigned char)x)
 @@ -204,27 +204,27 @@ protected size_t ct_enc_width(Char);
 #define ct_free_argv(s)
 #endif
 #ifndef NARROWCHAR
 /* Encode a characted into the destination buffer, provided there is sufficent
  * buffer space available. Returns the number of bytes used up (zero if the
  * character cannot be encoded, -1 if there was not enough space available). */
 /* The maximum buffer size to hold the most unwieldly visual representation,
  * in this case \U+nnnnn. */
 #define VISUAL_WIDTH_MAX ((size_t)8)
 /* The terminal is thought of in terms of X columns by Y lines. In the cases
  * where a wide character takes up more than one column, the adjacent
  * occupied column entries will contain this faux character. */
 #define MB_FILL_CHAR ((Char)-1)
 /* Visual width of character c, taking into account ^? , \0177 and \U+nnnnn
  * style visual expansions. */
 protected int ct_visual_width(Char);
 /* Turn the given character into the appropriate visual format, matching
  * the width given by ct_visual_width(). Returns the number of characters used
  * up, or -1 if insufficient space. Buffer length is in count of Char's. */
 protected ssize_t ct_visual_char(Char *, size_t, Char);
 /* Convert the given string into visual format, using the ct_visual_char()

 @@ -1,14 +1,14 @@
-/*	$NetBSD: common.c,v 1.37 2016/02/16 22:53:14 christos Exp $	*/
+/*	$NetBSD: common.c,v 1.38 2016/02/17 19:47:49 christos Exp $	*/
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Christos Zoulas of Cornell University.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -27,27 +27,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
 #if 0
 static char sccsid[] = "@(#)common.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: common.c,v 1.37 2016/02/16 22:53:14 christos Exp $");
+__RCSID("$NetBSD: common.c,v 1.38 2016/02/17 19:47:49 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 /*
  * common.c: Common Editor functions
  */
 #include <ctype.h>
 #include <string.h>
 #include "el.h"
 #include "common.h"
 #include "parse.h"
 #include "vi.h"
 @@ -443,111 +443,111 @@ ed_unassigned(EditLine *el __attribute__
+}
 /**
  ** TTY key handling.
  **/
 /* ed_tty_sigint():
  *	Tty interrupt character
  *	[^C]
  */
 protected el_action_t
 /*ARGSUSED*/
 ed_tty_sigint(EditLine *el __attribute__((__unused__)),
 	      wint_t c __attribute__((__unused__)))
+{
 	return CC_NORM;
+}
 /* ed_tty_dsusp():
  *	Tty delayed suspend character
  *	[^Y]
  */
 protected el_action_t
 /*ARGSUSED*/
 ed_tty_dsusp(EditLine *el __attribute__((__unused__)),
 	     wint_t c __attribute__((__unused__)))
+{
 	return CC_NORM;
+}
 /* ed_tty_flush_output():
  *	Tty flush output characters
  *	[^O]
  */
 protected el_action_t
 /*ARGSUSED*/
 ed_tty_flush_output(EditLine *el __attribute__((__unused__)),
 		    wint_t c __attribute__((__unused__)))
+{
 	return CC_NORM;
+}
 /* ed_tty_sigquit():
  *	Tty quit character
  *	[^\]
  */
 protected el_action_t
 /*ARGSUSED*/
 ed_tty_sigquit(EditLine *el __attribute__((__unused__)),
 	       wint_t c __attribute__((__unused__)))
+{
 	return CC_NORM;
+}
 /* ed_tty_sigtstp():
  *	Tty suspend character
  *	[^Z]
  */
 protected el_action_t
 /*ARGSUSED*/
 ed_tty_sigtstp(EditLine *el __attribute__((__unused__)),
 	       wint_t c __attribute__((__unused__)))
+{
 	return CC_NORM;
+}
 /* ed_tty_stop_output():
  *	Tty disallow output characters
  *	[^S]
  */
 protected el_action_t
 /*ARGSUSED*/
 ed_tty_stop_output(EditLine *el __attribute__((__unused__)),
 		   wint_t c __attribute__((__unused__)))
+{
 	return CC_NORM;
+}
 /* ed_tty_start_output():
  *	Tty allow output characters
  *	[^Q]
  */
 protected el_action_t
 /*ARGSUSED*/
 ed_tty_start_output(EditLine *el __attribute__((__unused__)),
 		    wint_t c __attribute__((__unused__)))
+{
 	return CC_NORM;
+}
 /* ed_newline():
  *	Execute command
  *	[^J]
  */
 protected el_action_t
 /*ARGSUSED*/
 @@ -592,27 +592,27 @@ ed_clear_screen(EditLine *el, wint_t c _
 	terminal_clear_screen(el);	/* clear the whole real screen */
 	re_clear_display(el);	/* reset everything */
 	return CC_REFRESH;
+}
 /* ed_redisplay():
  *	Redisplay everything
  *	^R
  */
 protected el_action_t
 /*ARGSUSED*/
 ed_redisplay(EditLine *el __attribute__((__unused__)),
 	     wint_t c __attribute__((__unused__)))
+{
 	return CC_REDISPLAY;
+}
 /* ed_start_over():
  *	Erase current line and start from scratch
  *	[^G]
  */
 protected el_action_t
 /*ARGSUSED*/
 @@ -620,27 +620,27 @@ ed_start_over(EditLine *el, wint_t c __a
+{
 	ch_reset(el, 0);
 	return CC_REFRESH;
+}
 /* ed_sequence_lead_in():
  *	First character in a bound sequence
  *	Placeholder for external keys
  */
 protected el_action_t
 /*ARGSUSED*/
 ed_sequence_lead_in(EditLine *el __attribute__((__unused__)),
 		    wint_t c __attribute__((__unused__)))
+{
 	return CC_NORM;
+}
 /* ed_prev_history():
  *	Move to the previous history line
  *	[^P] [k]
  */
 protected el_action_t
 /*ARGSUSED*/
 @@ -654,27 +654,26 @@ ed_prev_history(EditLine *el, wint_t c _
 	if (el->el_history.eventno == 0) {	/* save the current buffer
 						 * away */
 		(void) Strncpy(el->el_history.buf, el->el_line.buffer,
 		    EL_BUFSIZ);
 		el->el_history.last = el->el_history.buf +
 		    (el->el_line.lastchar - el->el_line.buffer);
+	}
 	el->el_history.eventno += el->el_state.argument;
 	if (hist_get(el) == CC_ERROR) {
 		if (el->el_map.type == MAP_VI) {
 			el->el_history.eventno = sv_event;
+		}
 		beep = 1;
 		/* el->el_history.eventno was fixed by first call */
 		(void) hist_get(el);
+	}
 	if (beep)
 		return CC_REFRESH_BEEP;
 	return CC_REFRESH;
+}
 /* ed_next_history():
  *	Move to the next history line

 @@ -1,14 +1,14 @@
-/*	$NetBSD: el.c,v 1.81 2016/02/16 19:08:41 christos Exp $	*/
+/*	$NetBSD: el.c,v 1.82 2016/02/17 19:47:49 christos Exp $	*/
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Christos Zoulas of Cornell University.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -27,39 +27,39 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
 #if 0
 static char sccsid[] = "@(#)el.c	8.2 (Berkeley) 1/3/94";
 #else
-__RCSID("$NetBSD: el.c,v 1.81 2016/02/16 19:08:41 christos Exp $");
+__RCSID("$NetBSD: el.c,v 1.82 2016/02/17 19:47:49 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 /*
  * el.c: EditLine interface functions
  */
 #include <sys/types.h>
 #include <sys/param.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <ctype.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 #ifdef WIDECHAR
 #include <locale.h>
 #include <langinfo.h>
 #endif
 #include "el.h"
 #include "parse.h"
 /* el_init():
  *	Initialize editline and set default parameters.
  */
 public EditLine *
 el_init(const char *prog, FILE *fin, FILE *fout, FILE *ferr)
 @@ -427,27 +427,27 @@ FUN(el,get)(EditLine *el, int op, ...)
 		break;
 	case EL_TERMINAL:
 		terminal_get(el, va_arg(ap, const char **));
 		rv = 0;
 		break;
 	case EL_GETTC:
+	{
 		static char name[] = "gettc";
 		char *argv[20];
 		int i;
- 		for (i = 1; i < (int)__arraycount(argv); i++)
+		for (i = 1; i < (int)__arraycount(argv); i++)
 			if ((argv[i] = va_arg(ap, char *)) == NULL)
 				break;
 		argv[0] = name;
 		rv = terminal_gettc(el, i, argv);
 		break;
+	}
 	case EL_GETCFN:
 		*va_arg(ap, el_rfunc_t *) = el_read_getfn(el);
 		rv = 0;
 		break;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: read.c,v 1.81 2016/02/16 22:53:14 christos Exp $	*/
+/*	$NetBSD: read.c,v 1.82 2016/02/17 19:47:49 christos Exp $	*/
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Christos Zoulas of Cornell University.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -27,41 +27,41 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
 #if 0
 static char sccsid[] = "@(#)read.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: read.c,v 1.81 2016/02/16 22:53:14 christos Exp $");
+__RCSID("$NetBSD: read.c,v 1.82 2016/02/17 19:47:49 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 /*
  * read.c: Clean this junk up! This is horrible code.
  *	   Terminal read functions
  */
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <unistd.h>
+#include <limits.h>
 #include <stdlib.h>
 #include <string.h>
-#include <limits.h>
+#include <unistd.h>
 #include "el.h"
 #define OKCMD	-1	/* must be -1! */
 private int	read__fixio(int, int);
 private int	read_preread(EditLine *);
 private int	read_char(EditLine *, Char *);
 private int	read_getcmd(EditLine *, el_action_t *, Char *);
 private void	read_pop(c_macro_t *);
 /* read_init():
  *	Initialize the read stuff

 @@ -1,14 +1,14 @@
-/*	$NetBSD: el.h,v 1.32 2016/02/16 22:53:14 christos Exp $	*/
+/*	$NetBSD: el.h,v 1.33 2016/02/17 19:47:49 christos Exp $	*/
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Christos Zoulas of Cornell University.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -57,42 +57,42 @@
 #define	UNBUFFERED	0x08
 #define	CHARSET_IS_UTF8 0x10
 #define	NARROW_HISTORY	0x40
 #define	NARROW_READ	0x80
 typedef unsigned char el_action_t;	/* Index to command array	*/
 typedef struct coord_t {		/* Position on the screen	*/
 	int	h;
 	int	v;
 } coord_t;
 typedef struct el_line_t {
-	Char 		*buffer;	/* Input line			*/
+	Char		*buffer;	/* Input line			*/
 	Char	        *cursor;	/* Cursor position		*/
 	Char	        *lastchar;	/* Last character		*/
 	const Char	*limit;		/* Max position			*/
 } el_line_t;
 /*
  * Editor state
  */
 typedef struct el_state_t {
 	int		inputmode;	/* What mode are we in?		*/
 	int		doingarg;	/* Are we getting an argument?	*/
 	int		argument;	/* Numeric argument		*/
 	int		metanext;	/* Is the next char a meta char */
 	el_action_t	lastcmd;	/* Previous command		*/
-	el_action_t	thiscmd;	/* this command 		*/
+	el_action_t	thiscmd;	/* this command			*/
 	Char		thisch;		/* char that generated it	*/
 } el_state_t;
 /*
  * Until we come up with something better...
  */
 #define	el_malloc(a)	malloc(a)
 #define	el_realloc(a,b)	realloc(a, b)
 #define	el_free(a)	free(a)
 #include "tty.h"
 #include "prompt.h"
 #include "keymacro.h"

 @@ -1,14 +1,14 @@
-/*	$NetBSD: filecomplete.c,v 1.39 2016/02/16 22:53:14 christos Exp $	*/
+/*	$NetBSD: filecomplete.c,v 1.40 2016/02/17 19:47:49 christos Exp $	*/
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jaromir Dolecek.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -21,40 +21,40 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: filecomplete.c,v 1.39 2016/02/16 22:53:14 christos Exp $");
+__RCSID("$NetBSD: filecomplete.c,v 1.40 2016/02/17 19:47:49 christos Exp $");
 #endif /* not lint && not SCCSID */
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
 #include <dirent.h>
-#include <string.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <limits.h>
 #include <errno.h>
 #include <fcntl.h>
 #include "el.h"
 #include "filecomplete.h"
 static const Char break_chars[] = { ' ', '\t', '\n', '"', '\\', '\'', '`', '@',
     '$', '>', '<', '=', ';', '|', '&', '{', '(', '\0' };
 /********************************/
 /* completion functions */
 /*
  * does tilde expansion of strings of type ``~user/foo''
 @@ -83,29 +83,29 @@ fn_tilde_expand(const char *txt)
 		if (temp == NULL)
 			return NULL;
 	} else {
 		/* text until string after slash */
 		len = (size_t)(temp - txt + 1);
 		temp = el_malloc(len * sizeof(*temp));
 		if (temp == NULL)
 			return NULL;
 		(void)strncpy(temp, txt + 1, len - 2);
 		temp[len - 2] = '\0';
+	}
 	if (temp[0] == 0) {
 #ifdef HAVE_GETPW_R_POSIX
- 		if (getpwuid_r(getuid(), &pwres, pwbuf, sizeof(pwbuf),
+		if (getpwuid_r(getuid(), &pwres, pwbuf, sizeof(pwbuf),
 		    &pass) != 0)
- 			pass = NULL;
+			pass = NULL;
 #elif HAVE_GETPW_R_DRAFT
 		pass = getpwuid_r(getuid(), &pwres, pwbuf, sizeof(pwbuf));
 #else
 		pass = getpwuid(getuid());
 #endif
 	} else {
 #ifdef HAVE_GETPW_R_POSIX
 		if (getpwnam_r(temp, &pwres, pwbuf, sizeof(pwbuf), &pass) != 0)
 			pass = NULL;
 #elif HAVE_GETPW_R_DRAFT
 		pass = getpwnam_r(temp, &pwres, pwbuf, sizeof(pwbuf));
 #else
 		pass = getpwnam(temp);
 @@ -451,27 +451,27 @@ fn_complete(EditLine *el,
 	/* or (*attempted_completion_function)() */
 	if (point != 0)
 		*point = (int)(li->cursor - li->buffer);
 	if (end != NULL)
 		*end = (int)(li->lastchar - li->buffer);
 	if (attempted_completion_function) {
 		int cur_off = (int)(li->cursor - li->buffer);
 		matches = (*attempted_completion_function)(
 		    ct_encode_string(temp, &el->el_scratch),
 		    cur_off - (int)len, cur_off);
 	} else
 		matches = 0;
 	if (!attempted_completion_function ||
 	    (over != NULL && !*over && !matches))
 		matches = completion_matches(
 		    ct_encode_string(temp, &el->el_scratch), complet_func);
 	if (over != NULL)
 		*over = 0;
 	if (matches) {
 		int i;
 		size_t matches_num, maxlen, match_len, match_display=1;
 		retval = CC_REFRESH;
 		/*
 @@ -501,27 +501,27 @@ fn_complete(EditLine *el,
     display_matches:
 			/*
 			 * More than one match and requested to list possible
 			 * matches.
 			 */
 			for(i = 1, maxlen = 0; matches[i]; i++) {
 				match_len = strlen(matches[i]);
 				if (match_len > maxlen)
 					maxlen = match_len;
+			}
 			/* matches[1] through matches[i-1] are available */
 			matches_num = (size_t)(i - 1);
 			/* newline to get on next line from command line */
 			(void)fprintf(el->el_outfile, "\n");
 			/*
 			 * If there are too many items, ask user for display
 			 * confirmation.
 			 */
 			if (matches_num > query_items) {
 				(void)fprintf(el->el_outfile,
 				    "Display all %zu possibilities? (y or n) ",
 				    matches_num);
 				(void)fflush(el->el_outfile);
 				if (getc(stdin) != 'y')

 @@ -1,14 +1,14 @@
-/*	$NetBSD: hist.h,v 1.17 2016/02/16 15:53:48 christos Exp $	*/
+/*	$NetBSD: hist.h,v 1.18 2016/02/17 19:47:49 christos Exp $	*/
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Christos Zoulas of Cornell University.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -70,17 +70,17 @@ typedef struct el_history_t {
 #define	HIST_PREV(el)		HIST_FUN(el, H_PREV, NULL)
 #define	HIST_SET(el, num)	HIST_FUN(el, H_SET, num)
 #define	HIST_LOAD(el, fname)	HIST_FUN(el, H_LOAD fname)
 #define	HIST_SAVE(el, fname)	HIST_FUN(el, H_SAVE fname)
 #define	HIST_SAVE_FP(el, fp)	HIST_FUN(el, H_SAVE_FP fp)
 protected int		hist_init(EditLine *);
 protected void		hist_end(EditLine *);
 protected el_action_t	hist_get(EditLine *);
 protected int		hist_set(EditLine *, hist_fun_t, void *);
 protected int		hist_command(EditLine *, int, const Char **);
 protected int		hist_enlargebuf(EditLine *, size_t, size_t);
 #ifdef WIDECHAR
-protected wchar_t 	*hist_convert(EditLine *, int, void *);
+protected wchar_t	*hist_convert(EditLine *, int, void *);
 #endif
 #endif /* _h_el_hist */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: histedit.h,v 1.54 2016/02/16 19:29:51 christos Exp $	*/
+/*	$NetBSD: histedit.h,v 1.55 2016/02/17 19:47:49 christos Exp $	*/
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Christos Zoulas of Cornell University.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -118,40 +118,40 @@ unsigned char	_el_fn_complete(EditLine *
  * el_set/el_get parameters
+ *
  * When using el_wset/el_wget (as opposed to el_set/el_get):
  *   Char is wchar_t, otherwise it is char.
  *   prompt_func is el_wpfunc_t, otherwise it is el_pfunc_t .
  * Prompt function prototypes are:
  *   typedef char    *(*el_pfunct_t)  (EditLine *);
  *   typedef wchar_t *(*el_wpfunct_t) (EditLine *);
+ *
  * For operations that support set or set/get, the argument types listed are for
  * the "set" operation. For "get", each listed type must be a pointer.
  * E.g. EL_EDITMODE takes an int when set, but an int* when get.
+ *
  * Operations that only support "get" have the correct argument types listed.
  */
 #define	EL_PROMPT	0	/* , prompt_func);		      set/get */
 #define	EL_TERMINAL	1	/* , const char *);		      set/get */
 #define	EL_EDITOR	2	/* , const Char *);		      set/get */
 #define	EL_SIGNAL	3	/* , int);			      set/get */
 #define	EL_BIND		4	/* , const Char *, ..., NULL);	      set     */
 #define	EL_TELLTC	5	/* , const Char *, ..., NULL);	      set     */
 #define	EL_SETTC	6	/* , const Char *, ..., NULL);	      set     */
 #define	EL_ECHOTC	7	/* , const Char *, ..., NULL);        set     */
 #define	EL_SETTY	8	/* , const Char *, ..., NULL);        set     */
 #define	EL_ADDFN	9	/* , const Char *, const Char,        set     */
-				/*   el_func_t);		 	      */
+				/*   el_func_t);			      */
 #define	EL_HIST		10	/* , hist_fun_t, const void *);	      set     */
 #define	EL_EDITMODE	11	/* , int);			      set/get */
 #define	EL_RPROMPT	12	/* , prompt_func);		      set/get */
 #define	EL_GETCFN	13	/* , el_rfunc_t);		      set/get */
 #define	EL_CLIENTDATA	14	/* , void *);			      set/get */
 #define	EL_UNBUFFERED	15	/* , int);			      set/get */
 #define	EL_PREP_TERM	16	/* , int);			      set     */
 #define	EL_GETTC	17	/* , const Char *, ..., NULL);		  get */
 #define	EL_GETFP	18	/* , int, FILE **);		          get */
 #define	EL_SETFP	19	/* , int, FILE *);		      set     */
 #define	EL_REFRESH	20	/* , void);			      set     */
 #define	EL_PROMPT_ESC	21	/* , prompt_func, Char);	      set/get */
 #define	EL_RPROMPT_ESC	22	/* , prompt_func, Char);	      set/get */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: history.c,v 1.51 2016/02/15 21:35:52 christos Exp $	*/
+/*	$NetBSD: history.c,v 1.52 2016/02/17 19:47:49 christos Exp $	*/
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Christos Zoulas of Cornell University.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -27,38 +27,38 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
 #if 0
 static char sccsid[] = "@(#)history.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: history.c,v 1.51 2016/02/15 21:35:52 christos Exp $");
+__RCSID("$NetBSD: history.c,v 1.52 2016/02/17 19:47:49 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 /*
  * hist.c: TYPE(History) access functions
  */
-#include <string.h>
+#include <sys/stat.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 #include <vis.h>
 #include <sys/stat.h>
 static const char hist_cookie[] = "_HiStOrY_V2_\n";
 #include "histedit.h"
 #include "chartype.h"
 typedef int (*history_gfun_t)(void *, TYPE(HistEvent) *);
 typedef int (*history_efun_t)(void *, TYPE(HistEvent) *, const Char *);
 typedef void (*history_vfun_t)(void *, TYPE(HistEvent) *);
 typedef int (*history_sfun_t)(void *, TYPE(HistEvent) *, const int);
 struct TYPE(history) {
 	void *h_ref;		/* Argument for history fcns	 */
 @@ -427,27 +427,27 @@ history_def_del(void *p, TYPE(HistEvent)
 		return -1;
 	ev->str = Strdup(h->cursor->ev.str);
 	ev->num = h->cursor->ev.num;
 	history_def_delete(h, ev, h->cursor);
 	return 0;
+}
 /* history_def_delete():
  *	Delete element hp of the h list
  */
 /* ARGSUSED */
 private void
 history_def_delete(history_t *h,
 		   TYPE(HistEvent) *ev __attribute__((__unused__)), hentry_t *hp)
+{
 	HistEventPrivate *evp = (void *)&hp->ev;
 	if (hp == &h->list)
 		abort();
 	if (h->cursor == hp) {
 		h->cursor = hp->prev;
 		if (h->cursor == &h->list)
 			h->cursor = hp->next;
+	}
 	hp->prev->next = hp->next;
 	hp->next->prev = hp->prev;
 	h_free(evp->str);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: keymacro.c,v 1.12 2016/02/16 15:53:48 christos Exp $	*/
+/*	$NetBSD: keymacro.c,v 1.13 2016/02/17 19:47:49 christos Exp $	*/
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Christos Zoulas of Cornell University.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -27,66 +27,66 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
 #if 0
 static char sccsid[] = "@(#)key.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: keymacro.c,v 1.12 2016/02/16 15:53:48 christos Exp $");
+__RCSID("$NetBSD: keymacro.c,v 1.13 2016/02/17 19:47:49 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 /*
  * keymacro.c: This module contains the procedures for maintaining
  *	       the extended-key map.
+ *
  *      An extended-key (key) is a sequence of keystrokes introduced
  *	with a sequence introducer and consisting of an arbitrary
  *	number of characters.  This module maintains a map (the
  *	el->el_keymacro.map)
  *	to convert these extended-key sequences into input strs
  *	(XK_STR), editor functions (XK_CMD), or unix commands (XK_EXE).
+ *
  *      Warning:
  *	  If key is a substr of some other keys, then the longer
  *	  keys are lost!!  That is, if the keys "abcd" and "abcef"
  *	  are in el->el_keymacro.map, adding the key "abc" will cause
  *	  the first two definitions to be lost.
+ *
  *      Restrictions:
  *      -------------
  *      1) It is not possible to have one key that is a
  *	   substr of another.
  */
 #include <string.h>
 #include <stdlib.h>
 #include <string.h>
 #include "el.h"
 /*
  * The Nodes of the el->el_keymacro.map.  The el->el_keymacro.map is a
  * linked list of these node elements
  */
 struct keymacro_node_t {
-	Char		 ch;		/* single character of key 	 */
+	Char		 ch;		/* single character of key	 */
 	int		 type;		/* node type			 */
 	keymacro_value_t val;		/* command code or pointer to str,  */
-					/* if this is a leaf 		 */
+					/* if this is a leaf		 */
 	struct keymacro_node_t *next;	/* ptr to next char of this key  */
 	struct keymacro_node_t *sibling;/* ptr to another key with same prefix*/
 };
 private int		 node_trav(EditLine *, keymacro_node_t *, Char *,
     keymacro_value_t *);
 private int		 node__try(EditLine *, keymacro_node_t *, const Char *,
     keymacro_value_t *, int);
 private keymacro_node_t	*node__get(wint_t);
 private void		 node__free(keymacro_node_t *);
 private void		 node__put(EditLine *, keymacro_node_t *);
 private int		 node__delete(EditLine *, keymacro_node_t **,
     const Char *);
 @@ -265,27 +265,27 @@ keymacro_print(EditLine *el, const Char
 		return;
 	el->el_keymacro.buf[0] = '"';
 	if (node_lookup(el, key, el->el_keymacro.map, (size_t)1) <= -1)
 		/* key is not bound */
 		(void) fprintf(el->el_errfile, "Unbound extended key \"" FSTR
 		    "\"\n", key);
 	return;
+}
 /* node_trav():
  *	recursively traverses node in tree until match or mismatch is
- * 	found.  May read in more characters.
+ *	found.  May read in more characters.
  */
 private int
 node_trav(EditLine *el, keymacro_node_t *ptr, Char *ch, keymacro_value_t *val)
+{
 	if (ptr->ch == *ch) {
 		/* match found */
 		if (ptr->next) {
 			/* key not complete so get next char */
 			if (FUN(el,getc)(el, ch) != 1) {/* if EOF or error */
 				val->cmd = ED_END_OF_FILE;
 				return XK_CMD;
 				/* PWP: Pretend we just read an end-of-file */
 @@ -302,27 +302,27 @@ node_trav(EditLine *el, keymacro_node_t
 		if (ptr->sibling) {
 			/* try next sibling */
 			return node_trav(el, ptr->sibling, ch, val);
 		} else {
 			/* no next sibling -- mismatch */
 			val->str = NULL;
 			return XK_STR;
+		}
+	}
+}
 /* node__try():
- * 	Find a node that matches *str or allocate a new one
+ *	Find a node that matches *str or allocate a new one
  */
 private int
 node__try(EditLine *el, keymacro_node_t *ptr, const Char *str,
     keymacro_value_t *val, int ntype)
+{
 	if (ptr->ch != *str) {
 		keymacro_node_t *xm;
 		for (xm = ptr; xm->sibling != NULL; xm = xm->sibling)
 			if (xm->sibling->ch == *str)
 				break;
 		if (xm->sibling == NULL)
 @@ -584,27 +584,27 @@ node_enum(EditLine *el, keymacro_node_t
  */
 protected void
 keymacro_kprint(EditLine *el, const Char *key, keymacro_value_t *val, int ntype)
+{
 	el_bindings_t *fp;
 	char unparsbuf[EL_BUFSIZ];
 	static const char fmt[] = "%-15s->  %s\n";
 	if (val != NULL)
 		switch (ntype) {
 		case XK_STR:
 		case XK_EXE:
 			(void) keymacro__decode_str(val->str, unparsbuf,
 			    sizeof(unparsbuf),
 			    ntype == XK_STR ? "\"\"" : "[]");
 			(void) fprintf(el->el_outfile, fmt,
 			    ct_encode_string(key, &el->el_scratch), unparsbuf);
 			break;
 		case XK_CMD:
 			for (fp = el->el_map.help; fp->name; fp++)
 				if (val->cmd == fp->func) {
                     ct_wcstombs(unparsbuf, fp->name, sizeof(unparsbuf));
                     unparsbuf[sizeof(unparsbuf) -1] = '\0';
 					(void) fprintf(el->el_outfile, fmt,
                         ct_encode_string(key, &el->el_scratch), unparsbuf);
 					break;
+				}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: prompt.h,v 1.12 2016/02/16 15:53:48 christos Exp $	*/
+/*	$NetBSD: prompt.h,v 1.13 2016/02/17 19:47:49 christos Exp $	*/
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Christos Zoulas of Cornell University.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -36,23 +36,23 @@
 /*
  * el.prompt.h: Prompt printing stuff
  */
 #ifndef _h_el_prompt
 #define	_h_el_prompt
 typedef Char    *(*el_pfunc_t)(EditLine *);
 typedef struct el_prompt_t {
 	el_pfunc_t	p_func;		/* Function to return the prompt */
 	coord_t		p_pos;		/* position in the line after prompt */
 	Char		p_ignore;	/* character to start/end literal */
 	int		p_wide;
 } el_prompt_t;
 protected void	prompt_print(EditLine *, int);
 protected int	prompt_set(EditLine *, el_pfunc_t, Char, int, int);
 protected int	prompt_get(EditLine *, el_pfunc_t *, Char *, int);
 protected int	prompt_init(EditLine *);
 protected void	prompt_end(EditLine *);
 #endif /* _h_el_prompt */

 @@ -1,15 +1,15 @@
 #!/bin/sh -
-#	$NetBSD: makelist,v 1.23 2016/02/16 19:08:41 christos Exp $
+#	$NetBSD: makelist,v 1.24 2016/02/17 19:47:49 christos Exp $
+#
 # Copyright (c) 1992, 1993
 #	The Regents of the University of California.  All rights reserved.
+#
 # This code is derived from software contributed to Berkeley by
 # Christos Zoulas of Cornell University.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 @@ -51,27 +51,27 @@ FILES="$@"
 case $FLAG in
 #	generate foo.h file from foo.c
+#
 -n)
     cat << _EOF
 #include "config.h"
 #undef WIDECHAR
 #define NARROWCHAR
 #include "${FILES}"
 _EOF
     ;;
 -h)
     set - `echo $FILES | sed -e 's/\\./_/g'`
     hdr="_h_`basename $1`"
     cat $FILES | $AWK '
 	BEGIN {
 	    printf("/* Automatically generated file, do not edit */\n");
 	    printf("#ifndef %s\n#define %s\n", "'$hdr'", "'$hdr'");
+	}
 	/\(\):/ {
 	    pr = substr($2, 1, 2);
 	    if (pr == "vi" || pr == "em" || pr == "ed") {
 		name = substr($2, 1, length($2) - 3);
+#

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tokenizer.c,v 1.23 2016/02/15 15:37:20 christos Exp $	*/
+/*	$NetBSD: tokenizer.c,v 1.24 2016/02/17 19:47:49 christos Exp $	*/
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Christos Zoulas of Cornell University.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -27,36 +27,37 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
 #if 0
 static char sccsid[] = "@(#)tokenizer.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: tokenizer.c,v 1.23 2016/02/15 15:37:20 christos Exp $");
+__RCSID("$NetBSD: tokenizer.c,v 1.24 2016/02/17 19:47:49 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 /* We build this file twice, once as NARROW, once as WIDE. */
 /*
  * tokenize.c: Bourne shell like tokenizer
  */
 #include <string.h>
 #include <stdlib.h>
 #include <string.h>
 #include "histedit.h"
 #include "chartype.h"
 typedef enum {
 	Q_none, Q_single, Q_double, Q_one, Q_doubleone
 } quote_t;
 #define	TOK_KEEP	1
 #define	TOK_EAT		2
 #define	WINCR		20
 #define	AINCR		10

 @@ -1,14 +1,14 @@
-/*	$NetBSD: map.c,v 1.42 2016/02/16 22:53:14 christos Exp $	*/
+/*	$NetBSD: map.c,v 1.43 2016/02/17 19:47:49 christos Exp $	*/
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Christos Zoulas of Cornell University.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -27,27 +27,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
 #if 0
 static char sccsid[] = "@(#)map.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: map.c,v 1.42 2016/02/16 22:53:14 christos Exp $");
+__RCSID("$NetBSD: map.c,v 1.43 2016/02/17 19:47:49 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 /*
  * map.c: Editor function definitions
  */
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
 #include "el.h"
 #include "help.h"
 #include "parse.h"
 @@ -1149,63 +1149,63 @@ map_print_key(EditLine *el, el_action_t
 private void
 map_print_some_keys(EditLine *el, el_action_t *map, wint_t first, wint_t last)
+{
 	el_bindings_t *bp, *ep;
 	Char firstbuf[2], lastbuf[2];
 	char unparsbuf[EL_BUFSIZ], extrabuf[EL_BUFSIZ];
 	firstbuf[0] = (Char)first;
 	firstbuf[1] = 0;
 	lastbuf[0] = (Char)last;
 	lastbuf[1] = 0;
 	if (map[first] == ED_UNASSIGNED) {
 		if (first == last) {
 			(void) keymacro__decode_str(firstbuf, unparsbuf,
 			    sizeof(unparsbuf), STRQQ);
 			(void) fprintf(el->el_outfile,
 			    "%-15s->  is undefined\n", unparsbuf);
+		}
 		return;
+	}
 	ep = &el->el_map.help[el->el_map.nfunc];
 	for (bp = el->el_map.help; bp < ep; bp++) {
 		if (bp->func == map[first]) {
 			if (first == last) {
 				(void) keymacro__decode_str(firstbuf, unparsbuf,
 				    sizeof(unparsbuf), STRQQ);
 				(void) fprintf(el->el_outfile, "%-15s->  " FSTR "\n",
 				    unparsbuf, bp->name);
 			} else {
 				(void) keymacro__decode_str(firstbuf, unparsbuf,
 				    sizeof(unparsbuf), STRQQ);
 				(void) keymacro__decode_str(lastbuf, extrabuf,
 				    sizeof(extrabuf), STRQQ);
 				(void) fprintf(el->el_outfile,
 				    "%-4s to %-7s->  " FSTR "\n",
 				    unparsbuf, extrabuf, bp->name);
+			}
 			return;
+		}
+	}
 #ifdef MAP_DEBUG
 	if (map == el->el_map.key) {
 		(void) keymacro__decode_str(firstbuf, unparsbuf,
 		    sizeof(unparsbuf), STRQQ);
 		(void) fprintf(el->el_outfile,
 		    "BUG!!! %s isn't bound to anything.\n", unparsbuf);
 		(void) fprintf(el->el_outfile, "el->el_map.key[%d] == %d\n",
 		    first, el->el_map.key[first]);
 	} else {
 		(void) keymacro__decode_str(firstbuf, unparsbuf,
 		    sizeof(unparsbuf), STRQQ);
 		(void) fprintf(el->el_outfile,
 		    "BUG!!! %s isn't bound to anything.\n", unparsbuf);
 		(void) fprintf(el->el_outfile, "el->el_map.alt[%d] == %d\n",
 		    first, el->el_map.alt[first]);
+	}
 #endif
 	EL_ABORT((el->el_errfile, "Error printing keys\n"));
+}
 /* map_print_all_keys():
  *	Print the function description for all keys.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: parse.c,v 1.34 2016/02/16 22:53:14 christos Exp $	*/
+/*	$NetBSD: parse.c,v 1.35 2016/02/17 19:47:49 christos Exp $	*/
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Christos Zoulas of Cornell University.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -27,56 +27,56 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
 #if 0
 static char sccsid[] = "@(#)parse.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: parse.c,v 1.34 2016/02/16 22:53:14 christos Exp $");
+__RCSID("$NetBSD: parse.c,v 1.35 2016/02/17 19:47:49 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 /*
  * parse.c: parse an editline extended command
+ *
  * commands are:
+ *
  *	bind
  *	echotc
  *	edit
  *	gettc
  *	history
  *	settc
  *	setty
  */
 #include <stdlib.h>
 #include <string.h>
 #include "el.h"
 #include "parse.h"
 private const struct {
 	const Char *name;
 	int (*func)(EditLine *, int, const Char **);
 } cmds[] = {
-	{ STR("bind"),  	map_bind	},
+	{ STR("bind"),		map_bind	},
 	{ STR("echotc"),	terminal_echotc	},
-	{ STR("edit"),  	el_editmode	},
+	{ STR("edit"),		el_editmode	},
 	{ STR("history"),	hist_command	},
 	{ STR("telltc"),	terminal_telltc	},
 	{ STR("settc"),	        terminal_settc	},
 	{ STR("setty"),	        tty_stty	},
 	{ NULL,		        NULL		}
 };
 /* parse_line():
  *	Parse a line and dispatch it
  */
 protected int
 parse_line(EditLine *el, const Char *line)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: readline.c,v 1.124 2016/02/16 19:08:41 christos Exp $	*/
+/*	$NetBSD: readline.c,v 1.125 2016/02/17 19:47:49 christos Exp $	*/
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jaromir Dolecek.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -21,43 +21,43 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: readline.c,v 1.124 2016/02/16 19:08:41 christos Exp $");
+__RCSID("$NetBSD: readline.c,v 1.125 2016/02/17 19:47:49 christos Exp $");
 #endif /* not lint && not SCCSID */
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <dirent.h>
 #include <string.h>
 #include <pwd.h>
 #include <ctype.h>
-#include <stdlib.h>
+#include <dirent.h>
 #include <unistd.h>
 #include <limits.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <pwd.h>
 #include <setjmp.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <vis.h>
 #include "readline/readline.h"
 #include "el.h"
 #include "filecomplete.h"
 void rl_prep_terminal(int);
 void rl_deprep_terminal(void);
 /* for rl_complete() */
 #define TAB		'\r'
 /* see comment at the #ifdef for sense of this */
 @@ -256,27 +256,27 @@ _default_history_file(void)
  * READLINE compatibility stuff
  */
 /*
  * Set the prompt
  */
 int
 rl_set_prompt(const char *prompt)
+{
 	char *p;
 	if (!prompt)
 		prompt = "";
 	if (rl_prompt != NULL && strcmp(rl_prompt, prompt) == 0)
 		return 0;
 	if (rl_prompt)
 		el_free(rl_prompt);
 	rl_prompt = strdup(prompt);
 	if (rl_prompt == NULL)
 		return -1;
 	while ((p = strchr(rl_prompt, RL_PROMPT_END_IGNORE)) != NULL)
 		*p = RL_PROMPT_START_IGNORE;
 	return 0;
+}
 @@ -350,27 +350,27 @@ rl_initialize(void)
 	 */
 	el_set(e, EL_ADDFN, "rl_complete",
 	    "ReadLine compatible completion function",
 	    _el_rl_complete);
 	el_set(e, EL_BIND, "^I", "rl_complete", NULL);
 	/*
 	 * Send TSTP when ^Z is pressed.
 	 */
 	el_set(e, EL_ADDFN, "rl_tstp",
 	    "ReadLine compatible suspend function",
 	    _el_rl_tstp);
 	el_set(e, EL_BIND, "^Z", "rl_tstp", NULL);
 	/*
 	 * Set some readline compatible key-bindings.
 	 */
 	el_set(e, EL_BIND, "^R", "em-inc-search-prev", NULL);
 	/*
 	 * Allow the use of Home/End keys.
 	 */
 	el_set(e, EL_BIND, "\\e[1~", "ed-move-to-beg", NULL);
 	el_set(e, EL_BIND, "\\e[4~", "ed-move-to-end", NULL);
 	el_set(e, EL_BIND, "\\e[7~", "ed-move-to-beg", NULL);
 	el_set(e, EL_BIND, "\\e[8~", "ed-move-to-end", NULL);
 	el_set(e, EL_BIND, "\\e[H", "ed-move-to-beg", NULL);
 @@ -1997,38 +1997,38 @@ rl_callback_read_char(void)
 	if (done && rl_linefunc != NULL) {
 		el_set(e, EL_UNBUFFERED, 0);
 		if (done == 2) {
 		    if ((wbuf = strdup(buf)) != NULL)
 			wbuf[count] = '\0';
 		} else
 			wbuf = NULL;
 		(*(void (*)(const char *))rl_linefunc)(wbuf);
 		el_set(e, EL_UNBUFFERED, 1);
+	}
+}
 void
 rl_callback_handler_install(const char *prompt, rl_vcpfunc_t *linefunc)
+{
 	if (e == NULL) {
 		rl_initialize();
+	}
 	(void)rl_set_prompt(prompt);
 	rl_linefunc = linefunc;
 	el_set(e, EL_UNBUFFERED, 1);
+}
 void
 rl_callback_handler_remove(void)
+{
 	el_set(e, EL_UNBUFFERED, 0);
 	rl_linefunc = NULL;
+}
 void
 rl_redisplay(void)
+{
 	char a[2];
 	a[0] = (char)e->el_tty.t_c[TS_IO][C_REPRINT];
 	a[1] = '\0';
 	el_push(e, a);
 @@ -2208,27 +2208,27 @@ rl_completion_matches(const char *str, r
 		if (min > j)
 			min = j;
+	}
 	if (min == 0 && *str) {
 		if ((list[0] = strdup(str)) == NULL)
 			goto out;
 	} else {
 		if ((list[0] = el_malloc((min + 1) * sizeof(*list[0]))) == NULL)
 			goto out;
 		(void)memcpy(list[0], list[1], min);
 		list[0][min] = '\0';
+	}
 	return list;
 out:
 	el_free(list);
 	return NULL;
+}
 char *
 rl_filename_completion_function (const char *text, int state)
+{
 	return fn_filename_completion_function(text, state);
+}
 void
 rl_forced_update_display(void)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: refresh.c,v 1.43 2016/02/16 22:53:14 christos Exp $	*/
+/*	$NetBSD: refresh.c,v 1.44 2016/02/17 19:47:49 christos Exp $	*/
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Christos Zoulas of Cornell University.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -27,53 +27,53 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
 #if 0
 static char sccsid[] = "@(#)refresh.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: refresh.c,v 1.43 2016/02/16 22:53:14 christos Exp $");
+__RCSID("$NetBSD: refresh.c,v 1.44 2016/02/17 19:47:49 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 /*
  * refresh.c: Lower level screen refreshing functions
  */
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
 #include <unistd.h>
 #include "el.h"
 private void	re_nextline(EditLine *);
 private void	re_addc(EditLine *, wint_t);
 private void	re_update_line(EditLine *, Char *, Char *, int);
 private void	re_insert (EditLine *, Char *, int, int, Char *, int);
 private void	re_delete(EditLine *, Char *, int, int, int);
 private void	re_fastputc(EditLine *, wint_t);
 private void	re_clear_eol(EditLine *, int, int, int);
 private void	re__strncopy(Char *, Char *, size_t);
 private void	re__copy_and_pad(Char *, const Char *, size_t);
 #ifdef DEBUG_REFRESH
 private void	re_printstr(EditLine *, const char *, char *, char *);
 #define	__F el->el_errfile
-#define	ELRE_ASSERT(a, b, c)	do 				\
+#define	ELRE_ASSERT(a, b, c)	do				\
 				    if (/*CONSTCOND*/ a) {	\
 					(void) fprintf b;	\
 					c;			\
 				    }				\
 				while (/*CONSTCOND*/0)
 #define	ELRE_DEBUG(a, b)	ELRE_ASSERT(a,b,;)
 /* re_printstr():
  *	Print a string on the debugging pty
  */
 private void
 re_printstr(EditLine *el, const char *str, char *f, char *t)
+{
 @@ -99,27 +99,27 @@ re_nextline(EditLine *el)
 	/*
 	 * If we would overflow (input is longer than terminal size),
 	 * emulate scroll by dropping first line and shuffling the rest.
 	 * We do this via pointer shuffling - it's safe in this case
 	 * and we avoid memcpy().
 	 */
 	if (el->el_refresh.r_cursor.v + 1 >= el->el_terminal.t_size.v) {
 		int i, lins = el->el_terminal.t_size.v;
 		Char *firstline = el->el_vdisplay[0];
 		for(i = 1; i < lins; i++)
 			el->el_vdisplay[i - 1] = el->el_vdisplay[i];
 		firstline[0] = '\0';		/* empty the string */
 		el->el_vdisplay[i - 1] = firstline;
 	} else
 		el->el_refresh.r_cursor.v++;
 	ELRE_ASSERT(el->el_refresh.r_cursor.v >= el->el_terminal.t_size.v,
 	    (__F, "\r\nre_putc: overflow! r_cursor.v == %d > %d\r\n",
 	    el->el_refresh.r_cursor.v, el->el_terminal.t_size.v),
 	    abort());
+}
 /* re_addc():
  *	Draw c, expanding tabs, control chars etc.
  */
 @@ -181,27 +181,27 @@ re_putc(EditLine *el, wint_t c, int shif
 	el->el_refresh.r_cursor.h += w;	/* advance to next place */
 	if (el->el_refresh.r_cursor.h >= el->el_terminal.t_size.h) {
 		/* assure end of line */
 		el->el_vdisplay[el->el_refresh.r_cursor.v][el->el_terminal.t_size.h]
 		    = '\0';
 		re_nextline(el);
+	}
+}
 /* re_refresh():
  *	draws the new virtual screen image from the current input
- *  	line, then goes line-by-line changing the real image to the new
+ *	line, then goes line-by-line changing the real image to the new
  *	virtual image. The routine to re-draw a line can be replaced
  *	easily in hopes of a smarter one being placed there.
  */
 protected void
 re_refresh(EditLine *el)
+{
 	int i, rhdiff;
 	Char *cp, *st;
 	coord_t cur;
 #ifdef notyet
 	size_t termsz;
 #endif
 @@ -440,27 +440,27 @@ re_delete(EditLine *el __attribute__((__
 private void
 re__strncopy(Char *a, Char *b, size_t n)
+{
 	while (n-- && *b)
 		*a++ = *b++;
+}
 /* re_clear_eol():
  *	Find the number of characters we need to clear till the end of line
  *	in order to make sure that we have cleared the previous contents of
  *	the line. fx and sx is the number of characters inserted or deleted
  *	in the first or second diff, diff is the difference between the
- * 	number of characters between the new and old line.
+ *	number of characters between the new and old line.
  */
 private void
 re_clear_eol(EditLine *el, int fx, int sx, int diff)
+{
 	ELRE_DEBUG(1, (__F, "re_clear_eol sx %d, fx %d, diff %d\n",
 	    sx, fx, diff));
 	if (fx < 0)
 		fx = -fx;
 	if (sx < 0)
 		sx = -sx;
 	if (fx > diff)
 @@ -1066,27 +1066,27 @@ re_fastputc(EditLine *el, wint_t c)
 	if (el->el_cursor.h >= el->el_terminal.t_size.h) {
 		/* if we must overflow */
 		el->el_cursor.h = 0;
 		/*
 		 * If we would overflow (input is longer than terminal size),
 		 * emulate scroll by dropping first line and shuffling the rest.
 		 * We do this via pointer shuffling - it's safe in this case
 		 * and we avoid memcpy().
 		 */
 		if (el->el_cursor.v + 1 >= el->el_terminal.t_size.v) {
 			int i, lins = el->el_terminal.t_size.v;
 			Char *firstline = el->el_display[0];
 			for(i = 1; i < lins; i++)
 				el->el_display[i - 1] = el->el_display[i];
 			re__copy_and_pad(firstline, STR(""), (size_t)0);
 			el->el_display[i - 1] = firstline;
 		} else {
 			el->el_cursor.v++;
 			el->el_refresh.r_oldcv++;
+		}
 		if (EL_HAS_AUTO_MARGINS) {
 			if (EL_HAS_MAGIC_MARGINS) {
 				terminal__putc(el, ' ');
 				terminal__putc(el, '\b');

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sys.h,v 1.22 2016/02/16 19:29:51 christos Exp $	*/
+/*	$NetBSD: sys.h,v 1.23 2016/02/17 19:47:49 christos Exp $	*/
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Christos Zoulas of Cornell University.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -47,27 +47,27 @@
 #if !defined(__attribute__) && (defined(__cplusplus) || !defined(__GNUC__)  || __GNUC__ == 2 && __GNUC_MINOR__ < 8)
 # define __attribute__(A)
 #endif
 #ifndef __BEGIN_DECLS
 # ifdef  __cplusplus
 #  define __BEGIN_DECLS  extern "C" {
 #  define __END_DECLS    }
 # else
 #  define __BEGIN_DECLS
 #  define __END_DECLS
 # endif
 #endif
 #ifndef public
 # define public		/* Externally visible functions/variables */
 #endif
 #ifndef private
 # define private	static	/* Always hidden internals */
 #endif
 #ifndef protected
 # define protected	/* Redefined from elsewhere to "static" */
 			/* When we want to hide everything	*/
 #endif
 @@ -102,27 +102,27 @@ ssize_t	getline(char **line, size_t *len
 #ifndef HAVE_U_INT32_T
 typedef unsigned int	u_int32_t;
 #endif
 #ifndef HAVE_SIZE_MAX
 #define SIZE_MAX	((size_t)-1)
 #endif
 #define	REGEX		/* Use POSIX.2 regular expression functions */
 #undef	REGEXP		/* Use UNIX V8 regular expression functions */
 #ifndef WIDECHAR
-#define	setlocale(c, l) 	/*LINTED*/NULL
+#define	setlocale(c, l)		/*LINTED*/NULL
 #define	nl_langinfo(i)		""
 #endif
 #if defined(__sun)
 extern int tgetent(char *, const char *);
 extern int tgetflag(char *);
 extern int tgetnum(char *);
 extern int tputs(const char *, int, int (*)(int));
 extern char* tgoto(const char*, int, int);
 extern char* tgetstr(char*, char**);
 #endif
 #endif /* _h_sys */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: terminal.c,v 1.21 2016/02/16 15:53:48 christos Exp $	*/
+/*	$NetBSD: terminal.c,v 1.22 2016/02/17 19:47:49 christos Exp $	*/
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Christos Zoulas of Cornell University.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -27,57 +27,56 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
 #if 0
 static char sccsid[] = "@(#)term.c	8.2 (Berkeley) 4/30/95";
 #else
-__RCSID("$NetBSD: terminal.c,v 1.21 2016/02/16 15:53:48 christos Exp $");
+__RCSID("$NetBSD: terminal.c,v 1.22 2016/02/17 19:47:49 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 /*
  * terminal.c: Editor/termcap-curses interface
  *	       We have to declare a static variable here, since the
  *	       termcap putchar routine does not take an argument!
  */
-#include <stdio.h>
+#include <sys/types.h>
 #include <sys/ioctl.h>
 #include <limits.h>
 #include <signal.h>
-#include <string.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <limits.h>
 #ifdef HAVE_TERMCAP_H
 #include <termcap.h>
 #endif
 #ifdef HAVE_CURSES_H
 #include <curses.h>
 #elif HAVE_NCURSES_H
 #include <ncurses.h>
 #endif
 /* Solaris's term.h does horrid things. */
 #if defined(HAVE_TERM_H) && !defined(__sun) && !defined(HAVE_TERMCAP_H)
 #include <term.h>
 #endif
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #ifdef _REENTRANT
 #include <pthread.h>
 #endif
 #include "el.h"
 /*
  * IMPORTANT NOTE: these routines are allowed to look at the current screen
  * and the current position assuming that it is correct.  If this is not
  * true, then the update will be WRONG!  This is (should be) a valid
  * assumption...
  */
 @@ -484,27 +483,27 @@ terminal_free_display(EditLine *el)
+	}
 	b = el->el_vdisplay;
 	el->el_vdisplay = NULL;
 	if (b != NULL) {
 		for (bufp = b; *bufp != NULL; bufp++)
 			el_free(*bufp);
 		el_free(b);
+	}
+}
 /* terminal_move_to_line():
  *	move to line <where> (first line == 0)
- * 	as efficiently as possible
+ *	as efficiently as possible
  */
 protected void
 terminal_move_to_line(EditLine *el, int where)
+{
 	int del;
 	if (where == el->el_cursor.v)
 		return;
 	if (where > el->el_terminal.t_size.v) {
 #ifdef DEBUG_SCREEN
 		(void) fprintf(el->el_errfile,
 		    "%s: where is ridiculous: %d\r\n", __func__, where);
 @@ -599,27 +598,27 @@ mc_again:
 					    (where & ~0x7)
 #ifdef WIDECHAR
 					    && (el->el_display[
 					    el->el_cursor.v][where & 0370] !=
 					    MB_FILL_CHAR)
 #endif
 					    ) {
 						/* if not within tab stop */
 						for (i =
 						    (el->el_cursor.h & 0370);
 						    i < (where & ~0x7);
 						    i += 8)
 							terminal__putc(el,
 							    '\t');
 							/* then tab over */
 						el->el_cursor.h = where & ~0x7;
+					}
+				}
 				/*
 				 * it's usually cheaper to just write the
 				 * chars, so we do.
 				 */
 				/*
 				 * NOTE THAT terminal_overwrite() WILL CHANGE
 				 * el->el_cursor.h!!!
 				 */
 				terminal_overwrite(el, &el->el_display[
 @@ -1288,27 +1287,27 @@ terminal_writec(EditLine *el, wint_t c)
 	if (vcnt < 0)
 		vcnt = 0;
 	visbuf[vcnt] = '\0';
 	terminal_overwrite(el, visbuf, (size_t)vcnt);
 	terminal__flush(el);
+}
 /* terminal_telltc():
  *	Print the current termcap characteristics
  */
 protected int
 /*ARGSUSED*/
 terminal_telltc(EditLine *el, int argc __attribute__((__unused__)),
     const Char **argv __attribute__((__unused__)))
+{
 	const struct termcapstr *t;
 	char **ts;
 	(void) fprintf(el->el_outfile, "\n\tYour terminal has the\n");
 	(void) fprintf(el->el_outfile, "\tfollowing characteristics:\n\n");
 	(void) fprintf(el->el_outfile, "\tIt has %d columns and %d lines\n",
 	    Val(T_co), Val(T_li));
 	(void) fprintf(el->el_outfile,
 	    "\tIt has %s meta key\n", EL_HAS_META ? "a" : "no");
 	(void) fprintf(el->el_outfile,
 	    "\tIt can%suse tabs\n", EL_CAN_TAB ? " " : "not ");

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tty.c,v 1.56 2016/02/16 22:53:14 christos Exp $	*/
+/*	$NetBSD: tty.c,v 1.57 2016/02/17 19:47:49 christos Exp $	*/
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Christos Zoulas of Cornell University.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -27,39 +27,39 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
 #if 0
 static char sccsid[] = "@(#)tty.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: tty.c,v 1.56 2016/02/16 22:53:14 christos Exp $");
+__RCSID("$NetBSD: tty.c,v 1.57 2016/02/17 19:47:49 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 /*
  * tty.c: tty interface stuff
  */
 #include <assert.h>
 #include <errno.h>
 #include <unistd.h>	/* for isatty */
 #include <strings.h>	/* for ffs */
 #include <stdlib.h>	/* for abort */
 #include <string.h>
 #include <strings.h>	/* for ffs */
 #include <unistd.h>	/* for isatty */
 #include "el.h"
 #include "parse.h"
 typedef struct ttymodes_t {
 	const char *m_name;
 	unsigned int m_value;
 	int m_type;
 }          ttymodes_t;
 typedef struct ttymap_t {
 	wint_t nch, och;	/* Internal and termio rep of chars */
 	el_action_t bind[3];	/* emacs, vi, and vi-cmd */
 @@ -968,27 +968,27 @@ tty_update_flags(EditLine *el, int kind)
 private void
 tty_update_char(EditLine *el, int mode, int c) {
 	if (!((el->el_tty.t_t[mode][MD_CHAR].t_setmask & C_SH(c)))
 	    && (el->el_tty.t_c[TS_IO][c] != el->el_tty.t_c[EX_IO][c]))
 		el->el_tty.t_c[mode][c] = el->el_tty.t_c[TS_IO][c];
 	if (el->el_tty.t_t[mode][MD_CHAR].t_clrmask & C_SH(c))
 		el->el_tty.t_c[mode][c] = el->el_tty.t_vdisable;
+}
 /* tty_rawmode():
- * 	Set terminal into 1 character at a time mode.
+ *	Set terminal into 1 character at a time mode.
  */
 protected int
 tty_rawmode(EditLine *el)
+{
 	if (el->el_tty.t_mode == ED_IO || el->el_tty.t_mode == QU_IO)
 		return 0;
 	if (el->el_flags & EDIT_DISABLED)
 		return 0;
 	if (tty_getty(el, &el->el_tty.t_ts) == -1) {
 #ifdef DEBUG_TTY

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tc1.c,v 1.6 2014/06/18 20:12:15 christos Exp $	*/
+/*	$NetBSD: tc1.c,v 1.7 2016/02/17 19:47:49 christos Exp $	*/
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Christos Zoulas of Cornell University.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -32,42 +32,42 @@
  * SUCH DAMAGE.
  */
 #include "config.h"
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1992, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n");
 #endif /* not lint */
 #if !defined(lint) && !defined(SCCSID)
 #if 0
 static char sccsid[] = "@(#)test.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: tc1.c,v 1.6 2014/06/18 20:12:15 christos Exp $");
+__RCSID("$NetBSD: tc1.c,v 1.7 2016/02/17 19:47:49 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 /*
  * test.c: A little test program
  */
 #include <stdio.h>
 #include <string.h>
 #include <signal.h>
 #include <sys/wait.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <dirent.h>
 #include <locale.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include "histedit.h"
 static int continuation = 0;
 volatile sig_atomic_t gotsig = 0;
 static	unsigned char	complete(EditLine *, int);
 	int	main(int, char **);
 static	char   *prompt(EditLine *);
 static	void	sig(int);
 static char *
 prompt(EditLine *el)
 @@ -147,27 +147,27 @@ main(int argc, char *argv[])
 					/* Initialize editline		*/
 	el = el_init(*argv, stdin, stdout, stderr);
 	el_set(el, EL_EDITOR, "vi");	/* Default editor is vi		*/
 	el_set(el, EL_SIGNAL, 1);	/* Handle signals gracefully	*/
 	el_set(el, EL_PROMPT_ESC, prompt, '\1');/* Set the prompt function */
 			/* Tell editline to use this history interface	*/
 	el_set(el, EL_HIST, history, hist);
 					/* Add a user-defined function	*/
 	el_set(el, EL_ADDFN, "ed-complete", "Complete argument", complete);
-					/* Bind tab to it 		*/
+					/* Bind tab to it		*/
 	el_set(el, EL_BIND, "^I", "ed-complete", NULL);
 	/*
 	 * Bind j, k in vi command mode to previous and next line, instead
 	 * of previous and next history.
 	 */
 	el_set(el, EL_BIND, "-a", "k", "ed-prev-line", NULL);
 	el_set(el, EL_BIND, "-a", "j", "ed-next-line", NULL);
 	/*
 	 * Source the user's defaults file.
 	 */
 	el_source(el, NULL);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: readline.h,v 1.38 2016/02/15 21:58:38 christos Exp $	*/
+/*	$NetBSD: readline.h,v 1.39 2016/02/17 19:47:49 christos Exp $	*/
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jaromir Dolecek.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -43,27 +43,27 @@ typedef void	  rl_vcpfunc_t(char *);
 typedef char	**rl_completion_func_t(const char *, int, int);
 typedef char     *rl_compentry_func_t(const char *, int);
 typedef int	  rl_command_func_t(int, int);
 /* only supports length */
 typedef struct {
 	int length;
 } HISTORY_STATE;
 typedef void *histdata_t;
 typedef struct _hist_entry {
 	const char	*line;
-	histdata_t 	 data;
+	histdata_t	 data;
 } HIST_ENTRY;
 typedef struct _keymap_entry {
 	char type;
 #define ISFUNC	0
 #define ISKMAP	1
 #define ISMACR	2
 	Function *function;
 } KEYMAP_ENTRY;
 #define KEYMAP_SIZE	256
 typedef KEYMAP_ENTRY KEYMAP_ENTRY_ARRAY[KEYMAP_SIZE];
 @@ -77,36 +77,36 @@ typedef KEYMAP_ENTRY *Keymap;
 #if !defined(__sun) && !defined(__hpux) && !defined(_AIX)
 #include <sys/ttydefaults.h>
 #endif
 #ifndef CTRL
 #define CTRL(c)		((c) & 037)
 #endif
 #endif
 #ifndef UNCTRL
 #define UNCTRL(c)	(((c) - 'a' + 'A')|control_character_bit)
 #endif
 #define RUBOUT		0x7f
 #define ABORT_CHAR	CTRL('G')
-#define RL_READLINE_VERSION 	0x0402
+#define RL_READLINE_VERSION	0x0402
 #define RL_PROMPT_START_IGNORE	'\1'
 #define RL_PROMPT_END_IGNORE	'\2'
 /* global variables used by readline enabled applications */
 #ifdef __cplusplus
 extern "C" {
 #endif
 extern const char	*rl_library_version;
-extern int 		rl_readline_version;
+extern int		rl_readline_version;
 extern char		*rl_readline_name;
 extern FILE		*rl_instream;
 extern FILE		*rl_outstream;
 extern char		*rl_line_buffer;
 extern int		 rl_point, rl_end;
 extern int		 history_base, history_length;
 extern int		 max_input_history;
 extern char		*rl_basic_word_break_characters;
 extern char		*rl_completer_word_break_characters;
 extern char		*rl_completer_quote_characters;
 extern rl_compentry_func_t *rl_completion_entry_function;
 extern char		*(*rl_completion_word_break_hook)(void);
 extern rl_completion_func_t *rl_attempted_completion_function;
 @@ -187,30 +187,30 @@ void		 rl_callback_handler_install(const
 void		 rl_callback_handler_remove(void);
 void		 rl_redisplay(void);
 int		 rl_get_previous_history(int, int);
 void		 rl_prep_terminal(int);
 void		 rl_deprep_terminal(void);
 int		 rl_read_init_file(const char *);
 int		 rl_parse_and_bind(const char *);
 int		 rl_variable_bind(const char *, const char *);
 void		 rl_stuff_char(int);
 int		 rl_add_defun(const char *, rl_command_func_t *, int);
 HISTORY_STATE	*history_get_history_state(void);
 void		 rl_get_screen_size(int *, int *);
 void		 rl_set_screen_size(int, int);
-char 		*rl_filename_completion_function (const char *, int);
+char		*rl_filename_completion_function (const char *, int);
 int		 _rl_abort_internal(void);
 int		 _rl_qsort_string_compare(char **, char **);
-char 	       **rl_completion_matches(const char *, rl_compentry_func_t *);
+char	       **rl_completion_matches(const char *, rl_compentry_func_t *);
 void		 rl_forced_update_display(void);
 int		 rl_set_prompt(const char *);
 int		 rl_on_new_line(void);
 /*
  * The following are not implemented
  */
 int		 rl_kill_text(int, int);
 Keymap		 rl_get_keymap(void);
 void		 rl_set_keymap(Keymap);
 Keymap		 rl_make_bare_keymap(void);
 int		 rl_generic_bind(int, const char *, const char *, Keymap);
 int		 rl_bind_key_in_map(int, rl_command_func_t *, Keymap);

 @@ -1,13 +1,13 @@
-#	$NetBSD: Makefile,v 1.7 2003/08/03 09:23:15 lukem Exp $
+#	$NetBSD: Makefile,v 1.8 2016/02/17 19:47:49 christos Exp $
 NOOBJ=		# defined
 .include <bsd.own.mk>
 .PATH:	${NETBSDSRCDIR}/lib/libedit
 INCS=		readline.h
 INCSDIR=	/usr/include/readline
 INCSYMLINKS=	readline.h ${INCSDIR}/history.h
 .include <bsd.prog.mk>

 @@ -1,14 +1,14 @@
-/*	$NetBSD: read.h,v 1.7 2009/12/30 22:37:40 christos Exp $	*/
+/*	$NetBSD: read.h,v 1.8 2016/02/17 19:47:49 christos Exp $	*/
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Anthony Mallet.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -30,21 +30,21 @@
  */
 /*
  * el.read.h: Character reading functions
  */
 #ifndef	_h_el_read
 #define	_h_el_read
 typedef int (*el_rfunc_t)(EditLine *, Char *);
 typedef struct el_read_t {
 	el_rfunc_t	read_char;	/* Function to read a character */
 } el_read_t;
 protected int		read_init(EditLine *);
 protected void		read_prepare(EditLine *);
 protected void		read_finish(EditLine *);
 protected int		el_read_setfn(EditLine *, el_rfunc_t);
 protected el_rfunc_t	el_read_getfn(EditLine *);
 #endif /* _h_el_read */