16,20c16
< * 3. All advertising materials mentioning features or use of this software
< * must display the following acknowledgement:
< * This product includes software developed by the University of
< * California, Berkeley and its contributors.
< * 4. Neither the name of the University nor the names of its contributors
---
> * 3. Neither the name of the University nor the names of its contributors
36c32
< * $NetBSD: emacs.c,v 1.8 2000/09/04 22:06:29 lukem Exp $
---
> * $NetBSD: emacs.c,v 1.19 2004/10/28 21:14:52 dsl Exp $
43c39
< __FBSDID("$FreeBSD: head/lib/libedit/emacs.c 108533 2003-01-01 18:49:04Z schweikh $");
---
> __FBSDID("$FreeBSD: head/lib/libedit/emacs.c 148834 2005-08-07 20:55:59Z stefanf $");
57c53
< em_delete_or_list(EditLine *el, int c)
---
> em_delete_or_list(EditLine *el, int c __unused)
76c72,75
< c_delafter(el, el->el_state.argument); /* delete after dot */
---
> if (el->el_state.doingarg)
> c_delafter(el, el->el_state.argument);
> else
> c_delafter1(el);
91c90
< em_delete_next_word(EditLine *el, int c)
---
> em_delete_next_word(EditLine *el, int c __unused)
120c119
< em_yank(EditLine *el, int c)
---
> em_yank(EditLine *el, int c __unused)
124,127c123,124
< if (el->el_chared.c_kill.last == el->el_chared.c_kill.buf) {
< if (!ch_enlargebufs(el, 1))
< return (CC_ERROR);
< }
---
> if (el->el_chared.c_kill.last == el->el_chared.c_kill.buf)
> return (CC_NORM);
157c154
< em_kill_line(EditLine *el, int c)
---
> em_kill_line(EditLine *el, int c __unused)
179c176
< em_kill_region(EditLine *el, int c)
---
> em_kill_region(EditLine *el, int c __unused)
212c209
< em_copy_region(EditLine *el, int c)
---
> em_copy_region(EditLine *el, int c __unused)
216c213
< if (el->el_chared.c_kill.mark)
---
> if (!el->el_chared.c_kill.mark)
236c233
< /* em_gosmacs_traspose():
---
> /* em_gosmacs_transpose():
241c238
< em_gosmacs_traspose(EditLine *el, int c)
---
> em_gosmacs_transpose(EditLine *el, int c)
261c258
< em_next_word(EditLine *el, int c)
---
> em_next_word(EditLine *el, int c __unused)
272c269
< if (el->el_chared.c_vcmd.action & DELETE) {
---
> if (el->el_chared.c_vcmd.action != NOP) {
286c283
< em_upper_case(EditLine *el, int c)
---
> em_upper_case(EditLine *el, int c __unused)
294,295c291,292
< if (islower((unsigned char) *cp))
< *cp = toupper((unsigned char) *cp);
---
> if (islower((unsigned char)*cp))
> *cp = toupper((unsigned char)*cp);
310c307
< em_capitol_case(EditLine *el, int c)
---
> em_capitol_case(EditLine *el, int c __unused)
318,320c315,317
< if (isalpha((unsigned char) *cp)) {
< if (islower((unsigned char) *cp))
< *cp = toupper((unsigned char) *cp);
---
> if (isalpha((unsigned char)*cp)) {
> if (islower((unsigned char)*cp))
> *cp = toupper((unsigned char)*cp);
326,327c323,324
< if (isupper((unsigned char) *cp))
< *cp = tolower((unsigned char) *cp);
---
> if (isupper((unsigned char)*cp))
> *cp = tolower((unsigned char)*cp);
342c339
< em_lower_case(EditLine *el, int c)
---
> em_lower_case(EditLine *el, int c __unused)
350,351c347,348
< if (isupper((unsigned char) *cp))
< *cp = tolower((unsigned char) *cp);
---
> if (isupper((unsigned char)*cp))
> *cp = tolower((unsigned char)*cp);
366c363
< em_set_mark(EditLine *el, int c)
---
> em_set_mark(EditLine *el, int c __unused)
380c377
< em_exchange_mark(EditLine *el, int c)
---
> em_exchange_mark(EditLine *el, int c __unused)
397c394
< em_universal_argument(EditLine *el, int c)
---
> em_universal_argument(EditLine *el, int c __unused)
414c411
< em_meta_next(EditLine *el, int c)
---
> em_meta_next(EditLine *el, int c __unused)
427c424
< em_toggle_overwrite(EditLine *el, int c)
---
> em_toggle_overwrite(EditLine *el, int c __unused)
441c438
< em_copy_prev_word(EditLine *el, int c)
---
> em_copy_prev_word(EditLine *el, int c __unused)
468c465
< em_inc_search_next(EditLine *el, int c)
---
> em_inc_search_next(EditLine *el, int c __unused)
481c478
< em_inc_search_prev(EditLine *el, int c)
---
> em_inc_search_prev(EditLine *el, int c __unused)
486a484,506
>
>
> /* em_delete_prev_char():
> * Delete the character to the left of the cursor
> * [^?]
> */
> protected el_action_t
> /*ARGSUSED*/
> em_delete_prev_char(EditLine *el, int c __unused)
> {
>
> if (el->el_line.cursor <= el->el_line.buffer)
> return (CC_ERROR);
>
> if (el->el_state.doingarg)
> c_delbefore(el, el->el_state.argument);
> else
> c_delbefore1(el);
> el->el_line.cursor -= el->el_state.argument;
> if (el->el_line.cursor < el->el_line.buffer)
> el->el_line.cursor = el->el_line.buffer;
> return (CC_REFRESH);
> }