summaryrefslogtreecommitdiff
path: root/usr.bin/mg/extend.c
diff options
context:
space:
mode:
authorKjell Wooding <kjell@cvs.openbsd.org>2005-12-13 06:01:28 +0000
committerKjell Wooding <kjell@cvs.openbsd.org>2005-12-13 06:01:28 +0000
commit0cbc971335254de4fe1790983eca3b99bc50012a (patch)
treec5e1196f45ed833bd5dacb99cce1b9a379847d0c /usr.bin/mg/extend.c
parent28a23b22ee1dba99041e501bb64afdc747e6670f (diff)
More name-clash delinting
Diffstat (limited to 'usr.bin/mg/extend.c')
-rw-r--r--usr.bin/mg/extend.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/mg/extend.c b/usr.bin/mg/extend.c
index dacd77eea8d..5f436d04aa9 100644
--- a/usr.bin/mg/extend.c
+++ b/usr.bin/mg/extend.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: extend.c,v 1.41 2005/12/13 05:40:33 kjell Exp $ */
+/* $OpenBSD: extend.c,v 1.42 2005/12/13 06:01:27 kjell Exp $ */
/* This file is in the public domain. */
@@ -360,7 +360,7 @@ dobind(KEYMAP *curmap, const char *p, int unbind)
for (;;) {
ewprintf("%s", bprompt);
pep[-1] = ' ';
- pep = keyname(pep, sizeof(bprompt) -
+ pep = getkeyname(pep, sizeof(bprompt) -
(pep - bprompt), c = getkey(FALSE));
if (doscan(curmap, c, &curmap) != NULL)
break;
@@ -498,7 +498,7 @@ localbind(int f, int n)
*/
/* ARGSUSED */
int
-define_key(int f, int n)
+redefine_key(int f, int n)
{
static char buf[48];
char tmp[32], *bufp;
@@ -747,7 +747,7 @@ excline(char *line)
} else if (fp == localbind || fp == localunbind) {
bind = BINDARG;
curmap = curbp->b_modes[curbp->b_nmodes]->p_map;
- } else if (fp == define_key)
+ } else if (fp == redefine_key)
bind = BINDNEXT;
else
bind = BINDNO;