 @@ -1,14 +1,14 @@
-/*	$NetBSD: common.c,v 1.27 2011/07/29 15:20:39 christos Exp $	*/
+/*	$NetBSD: common.c,v 1.28 2011/07/29 20:58:07 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.27 2011/07/29 15:20:39 christos Exp $");
+__RCSID("$NetBSD: common.c,v 1.28 2011/07/29 20:58:07 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 /*
  * common.c: Common Editor functions
  */
 #include "el.h"
 /* ed_end_of_file():
  *	Indicate end of file
  *	[^D]
  */
 protected el_action_t
 @@ -127,27 +127,27 @@ ed_delete_prev_word(EditLine *el, Int c
 	el->el_line.cursor = cp;
 	if (el->el_line.cursor < el->el_line.buffer)
 		el->el_line.cursor = el->el_line.buffer; /* bounds check */
 	return CC_REFRESH;
+}
 /* ed_delete_next_char():
  *	Delete character under cursor
  *	[^D] [x]
  */
 protected el_action_t
 /*ARGSUSED*/
-ed_delete_next_char(EditLine *el, Int c)
+ed_delete_next_char(EditLine *el, Int c __attribute__((__unused__)))
+{
 #ifdef DEBUG_EDIT
 #define	EL	el->el_line
 	(void) fprintf(el->el_errlfile,
 	    "\nD(b: %x(%s)  c: %x(%s) last: %x(%s) limit: %x(%s)\n",
 	    EL.buffer, EL.buffer, EL.cursor, EL.cursor, EL.lastchar,
 	    EL.lastchar, EL.limit, EL.limit);
 #endif
 	if (el->el_line.cursor == el->el_line.lastchar) {
 			/* if I'm at the end */
 		if (el->el_map.type == MAP_VI) {
 			if (el->el_line.cursor == el->el_line.buffer) {
 				/* if I'm also at the beginning */
 @@ -422,27 +422,28 @@ ed_argument_digit(EditLine *el, Int c)
 		el->el_state.argument = c - '0';
 		el->el_state.doingarg = 1;
+	}
 	return CC_ARGHACK;
+}
 /* ed_unassigned():
  *	Indicates unbound character
  *	Bound to keys that are not assigned
  */
 protected el_action_t
 /*ARGSUSED*/
-ed_unassigned(EditLine *el, Int c __attribute__((__unused__)))
+ed_unassigned(EditLine *el __attribute__((__unused__)),
     Int c __attribute__((__unused__)))
+{
 	return CC_ERROR;
+}
 /**
  ** TTY key handling.
  **/
 /* ed_tty_sigint():
  *	Tty interrupt character
  *	[^C]

 @@ -1,14 +1,14 @@
-/*	$NetBSD: filecomplete.c,v 1.27 2011/07/29 15:16:33 christos Exp $	*/
+/*	$NetBSD: filecomplete.c,v 1.28 2011/07/29 20:58:07 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,46 +21,42 @@
  * 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.27 2011/07/29 15:16:33 christos Exp $");
+__RCSID("$NetBSD: filecomplete.c,v 1.28 2011/07/29 20:58:07 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 <pwd.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <limits.h>
 #include <errno.h>
 #include <fcntl.h>
 #ifdef HAVE_VIS_H
 #include <vis.h>
 #else
 #include "vis.h"
 #endif
 #include "el.h"
 #include "fcns.h"		/* for EL_NUM_FCNS */
 #include "histedit.h"
 #include "filecomplete.h"
 static const Char break_chars[] = { ' ', '\t', '\n', '"', '\\', '\'', '`', '@',
     '$', '>', '<', '=', ';', '|', '&', '{', '(', '\0' };
 /********************************/
 /* completion functions */
 /*

 @@ -1,14 +1,14 @@
-/*	$NetBSD: history.c,v 1.43 2011/07/29 15:16:33 christos Exp $	*/
+/*	$NetBSD: history.c,v 1.44 2011/07/29 20:58:07 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,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[] = "@(#)history.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: history.c,v 1.43 2011/07/29 15:16:33 christos Exp $");
+__RCSID("$NetBSD: history.c,v 1.44 2011/07/29 20:58:07 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 /*
  * hist.c: TYPE(History) access functions
  */
 #include <string.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #ifdef HAVE_VIS_H
 #include <vis.h>
 #else
 #include "vis.h"
 #endif
 #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) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: readline.c,v 1.96 2011/07/29 15:16:33 christos Exp $	*/
+/*	$NetBSD: readline.c,v 1.97 2011/07/29 20:58:07 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,47 +21,44 @@
  * 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.96 2011/07/29 15:16:33 christos Exp $");
+__RCSID("$NetBSD: readline.c,v 1.97 2011/07/29 20:58:07 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 <pwd.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <limits.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <setjmp.h>
 #ifdef HAVE_VIS_H
 #include <vis.h>
 #else
 #include "vis.h"
 #endif
 #include "readline/readline.h"
 #include "el.h"
 #include "fcns.h"		/* for EL_NUM_FCNS */
 #include "histedit.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 */
 @@ -195,27 +192,27 @@ _move_history(int op)
 	rl_he.line = ev.str;
 	rl_he.data = NULL;
 	return &rl_he;
+}
 /*
  * read one key from user defined input function
  */
 static int
 /*ARGSUSED*/
-_getc_function(EditLine *el, char *c)
+_getc_function(EditLine *el __attribute__((__unused__)), char *c)
+{
 	int i;
 	i = (*rl_getc_function)(NULL);
 	if (i == -1)
 		return 0;
 	*c = i;
 	return 1;
+}
 static void
 _resize_fun(EditLine *el, void *a)
+{
 @@ -1876,37 +1873,38 @@ rl_insert_text(const char *text)
 	if (!text || *text == 0)
 		return 0;
 	if (h == NULL || e == NULL)
 		rl_initialize();
 	if (el_insertstr(e, text) < 0)
 		return 0;
 	return (int)strlen(text);
+}
 /*ARGSUSED*/
 int
-rl_newline(int count, int c)
+rl_newline(int count __attribute__((__unused__)),
     int c __attribute__((__unused__)))
+{
 	/*
 	 * Readline-4.0 appears to ignore the args.
 	 */
 	return rl_insert(1, '\n');
+}
 /*ARGSUSED*/
 static unsigned char
-rl_bind_wrapper(EditLine *el, unsigned char c)
+rl_bind_wrapper(EditLine *el __attribute__((__unused__)), unsigned char c)
+{
 	if (map[c] == NULL)
 	    return CC_ERROR;
 	_rl_update_pos();
 	(*map[c])(NULL, c);
 	/* If rl_done was set by the above call, deal with it here */
 	if (rl_done)
 		return CC_EOF;
 	return CC_NORM;
 @@ -1981,27 +1979,27 @@ rl_redisplay(void)
 int
 rl_get_previous_history(int count, int key)
+{
 	char a[2];
 	a[0] = key;
 	a[1] = '\0';
 	while (count--)
 		el_push(e, a);
 	return 0;
+}
 void
 /*ARGSUSED*/
-rl_prep_terminal(int meta_flag)
+rl_prep_terminal(int meta_flag __attribute__((__unused__)))
+{
 	el_set(e, EL_PREP_TERM, 1);
+}
 void
 rl_deprep_terminal(void)
+{
 	el_set(e, EL_PREP_TERM, 0);
+}
 int
 rl_read_init_file(const char *s)
+{
 @@ -2197,59 +2195,65 @@ _rl_qsort_string_compare(char **s1, char
 HISTORY_STATE *
 history_get_history_state(void)
+{
 	HISTORY_STATE *hs;
 	if ((hs = el_malloc(sizeof(*hs))) == NULL)
 		return NULL;
 	hs->length = history_length;
 	return hs;
+}
 int
 /*ARGSUSED*/
-rl_kill_text(int from, int to)
+rl_kill_text(int from __attribute__((__unused__)),
     int to __attribute__((__unused__)))
+{
 	return 0;
+}
 Keymap
 rl_make_bare_keymap(void)
+{
 	return NULL;
+}
 Keymap
 rl_get_keymap(void)
+{
 	return NULL;
+}
 void
 /*ARGSUSED*/
-rl_set_keymap(Keymap k)
+rl_set_keymap(Keymap k __attribute__((__unused__)))
+{
+}
 int
 /*ARGSUSED*/
-rl_generic_bind(int type, const char * keyseq, const char * data, Keymap k)
+rl_generic_bind(int type __attribute__((__unused__)),
     const char * keyseq __attribute__((__unused__)),
     const char * data __attribute__((__unused__)),
     Keymap k __attribute__((__unused__)))
+{
 	return 0;
+}
 int
 /*ARGSUSED*/
-rl_bind_key_in_map(int key, rl_command_func_t *fun, Keymap k)
+rl_bind_key_in_map(int key __attribute__((__unused__)),
     rl_command_func_t *fun __attribute__((__unused__)),
     Keymap k __attribute__((__unused__)))
+{
 	return 0;
+}
 /* unsupported, but needed by python */
 void
 rl_cleanup_after_signal(void)
+{
+}
 int
 rl_on_new_line(void)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vi.c,v 1.37 2011/07/29 15:16:33 christos Exp $	*/
+/*	$NetBSD: vi.c,v 1.38 2011/07/29 20:58:07 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,27 +32,27 @@
  * SUCH DAMAGE.
  */
 #include "config.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <limits.h>
 #include <sys/wait.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.37 2011/07/29 15:16:33 christos Exp $");
+__RCSID("$NetBSD: vi.c,v 1.38 2011/07/29 20:58:07 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 /*
  * vi.c: Vi mode commands.
  */
 #include "el.h"
 private el_action_t	cv_action(EditLine *, Int);
 private el_action_t	cv_paste(EditLine *, Int);
 /* cv_action():
  *	Handle vi actions.
 @@ -455,27 +455,27 @@ protected el_action_t
 vi_delete_meta(EditLine *el, Int c __attribute__((__unused__)))
+{
 	return cv_action(el, DELETE);
+}
 /* vi_end_big_word():
  *	Vi move to the end of the current space delimited word
  *	[E]
  */
 protected el_action_t
 /*ARGSUSED*/
-vi_end_big_word(EditLine *el, Int c)
+vi_end_big_word(EditLine *el, Int c __attribute__((__unused__)))
+{
 	if (el->el_line.cursor == el->el_line.lastchar)
 		return CC_ERROR;
 	el->el_line.cursor = cv__endword(el->el_line.cursor,
 	    el->el_line.lastchar, el->el_state.argument, cv__isWord);
 	if (el->el_chared.c_vcmd.action != NOP) {
 		el->el_line.cursor++;
 		cv_delfini(el);
 		return CC_REFRESH;
+	}
 @@ -791,27 +791,27 @@ vi_repeat_prev_char(EditLine *el, Int c
 	r = cv_csearch(el, -dir, el->el_search.chacha,
 		el->el_state.argument, el->el_search.chatflg);
 	el->el_search.chadir = dir;
 	return r;
+}
 /* vi_match():
  *	Vi go to matching () {} or []
  *	[%]
  */
 protected el_action_t
 /*ARGSUSED*/
-vi_match(EditLine *el, Int c)
+vi_match(EditLine *el, Int c __attribute__((__unused__)))
+{
 	const Char match_chars[] = STR("()[]{}");
 	Char *cp;
 	size_t delta, i, count;
 	Char o_ch, c_ch;
 	*el->el_line.lastchar = '\0';		/* just in case */
 	i = Strcspn(el->el_line.cursor, match_chars);
 	o_ch = el->el_line.cursor[i];
 	if (o_ch == 0)
 		return CC_ERROR;
 	delta = Strchr(match_chars, o_ch) - match_chars;
 @@ -838,103 +838,103 @@ vi_match(EditLine *el, Int c)
 			el->el_line.cursor++;
 		cv_delfini(el);
 		return CC_REFRESH;
+	}
 	return CC_CURSOR;
+}
 /* vi_undo_line():
  *	Vi undo all changes to line
  *	[U]
  */
 protected el_action_t
 /*ARGSUSED*/
-vi_undo_line(EditLine *el, Int c)
+vi_undo_line(EditLine *el, Int c __attribute__((__unused__)))
+{
 	cv_undo(el);
 	return hist_get(el);
+}
 /* vi_to_column():
  *	Vi go to specified column
  *	[|]
  * NB netbsd vi goes to screen column 'n', posix says nth character
  */
 protected el_action_t
 /*ARGSUSED*/
-vi_to_column(EditLine *el, Int c)
+vi_to_column(EditLine *el, Int c __attribute__((__unused__)))
+{
 	el->el_line.cursor = el->el_line.buffer;
 	el->el_state.argument--;
 	return ed_next_char(el, 0);
+}
 /* vi_yank_end():
  *	Vi yank to end of line
  *	[Y]
  */
 protected el_action_t
 /*ARGSUSED*/
-vi_yank_end(EditLine *el, Int c)
+vi_yank_end(EditLine *el, Int c __attribute__((__unused__)))
+{
 	cv_yank(el, el->el_line.cursor,
 	    (int)(el->el_line.lastchar - el->el_line.cursor));
 	return CC_REFRESH;
+}
 /* vi_yank():
  *	Vi yank
  *	[y]
  */
 protected el_action_t
 /*ARGSUSED*/
-vi_yank(EditLine *el, Int c)
+vi_yank(EditLine *el, Int c __attribute__((__unused__)))
+{
 	return cv_action(el, YANK);
+}
 /* vi_comment_out():
  *	Vi comment out current command
  *	[#]
  */
 protected el_action_t
 /*ARGSUSED*/
-vi_comment_out(EditLine *el, Int c)
+vi_comment_out(EditLine *el, Int c __attribute__((__unused__)))
+{
 	el->el_line.cursor = el->el_line.buffer;
 	c_insert(el, 1);
 	*el->el_line.cursor = '#';
 	re_refresh(el);
 	return ed_newline(el, 0);
+}
 /* vi_alias():
  *	Vi include shell alias
  *	[@]
  * NB: posix implies that we should enter insert mode, however
  * this is against historical precedent...
  */
 #ifdef __weak_reference
 __weakref_visible char *my_get_alias_text(const char *)
     __weak_reference(get_alias_text);
 #endif
 protected el_action_t
 /*ARGSUSED*/
-vi_alias(EditLine *el, Int c)
+vi_alias(EditLine *el, Int c __attribute__((__unused__)))
+{
 #ifdef __weak_reference
 	char alias_name[3];
 	char *alias_text;
 	if (my_get_alias_text == 0) {
 		return CC_ERROR;
+	}
 	alias_name[0] = '_';
 	alias_name[2] = 0;
 	if (el_getc(el, &alias_name[1]) != 1)
 		return CC_ERROR;
 @@ -944,27 +944,27 @@ vi_alias(EditLine *el, Int c)
 		FUN(el,push)(el, ct_decode_string(alias_text, &el->el_scratch));
 	return CC_NORM;
 #else
 	return CC_ERROR;
 #endif
+}
 /* vi_to_history_line():
  *	Vi go to specified history file line.
  *	[G]
  */
 protected el_action_t
 /*ARGSUSED*/
-vi_to_history_line(EditLine *el, Int c)
+vi_to_history_line(EditLine *el, Int c __attribute__((__unused__)))
+{
 	int sv_event_no = el->el_history.eventno;
 	el_action_t rval;
 	if (el->el_history.eventno == 0) {
 		 (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);
+	}
 	/* Lack of a 'count' means oldest, not 1 */
 @@ -989,27 +989,27 @@ vi_to_history_line(EditLine *el, Int c)
+	}
 	rval = hist_get(el);
 	if (rval == CC_ERROR)
 		el->el_history.eventno = sv_event_no;
 	return rval;
+}
 /* vi_histedit():
  *	Vi edit history line with vi
  *	[v]
  */
 protected el_action_t
 /*ARGSUSED*/
-vi_histedit(EditLine *el, Int c)
+vi_histedit(EditLine *el, Int c __attribute__((__unused__)))
+{
 	int fd;
 	pid_t pid;
 	ssize_t st;
 	int status;
 	char tempfile[] = "/tmp/histedit.XXXXXXXXXX";
 	char *cp;
 	size_t len;
 	Char *line;
 	if (el->el_state.doingarg) {
 		if (vi_to_history_line(el, 0) == CC_ERROR)
 			return CC_ERROR;
 @@ -1076,27 +1076,27 @@ vi_histedit(EditLine *el, Int c)
 	unlink(tempfile);
 	/* return CC_REFRESH; */
 	return ed_newline(el, 0);
+}
 /* vi_history_word():
  *	Vi append word from previous input line
  *	[_]
  * Who knows where this one came from!
  * '_' in vi means 'entire current line', so 'cc' is a synonym for 'c_'
  */
 protected el_action_t
 /*ARGSUSED*/
-vi_history_word(EditLine *el, Int c)
+vi_history_word(EditLine *el, Int c __attribute__((__unused__)))
+{
 	const Char *wp = HIST_FIRST(el);
 	const Char *wep, *wsp;
 	int len;
 	Char *cp;
 	const Char *lim;
 	if (wp == NULL)
 		return CC_ERROR;
 	wep = wsp = 0;
 	do {
 		while (Isspace(*wp))
 @@ -1126,27 +1126,27 @@ vi_history_word(EditLine *el, Int c)
 		*cp++ = *wsp++;
 	el->el_line.cursor = cp;
 	el->el_map.current = el->el_map.key;
 	return CC_REFRESH;
+}
 /* vi_redo():
  *	Vi redo last non-motion command
  *	[.]
  */
 protected el_action_t
 /*ARGSUSED*/
-vi_redo(EditLine *el, Int c)
+vi_redo(EditLine *el, Int c __attribute__((__unused__)))
+{
 	c_redo_t *r = &el->el_chared.c_redo;
 	if (!el->el_state.doingarg && r->count) {
 		el->el_state.doingarg = 1;
 		el->el_state.argument = r->count;
+	}
 	el->el_chared.c_vcmd.pos = el->el_line.cursor;
 	el->el_chared.c_vcmd.action = r->action;
 	if (r->pos != r->buf) {
 		if (r->pos + 1 > r->lim)
 			/* sanity */