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: parse.c,v 1.13 2000/09/04 22:06:31 lukem Exp $
---
> * $NetBSD: parse.c,v 1.22 2005/05/29 04:58:15 lukem Exp $
43c39
< __FBSDID("$FreeBSD: head/lib/libedit/parse.c 84334 2001-10-01 23:00:29Z obrien $");
---
> __FBSDID("$FreeBSD: head/lib/libedit/parse.c 148834 2005-08-07 20:55:59Z stefanf $");
60d55
< #include "tokenizer.h"
64,65c59,60
< char *name;
< int (*func)(EditLine *, int, char **);
---
> const char *name;
> int (*func)(EditLine *, int, const char **);
70c65
< { "history", hist_list },
---
> { "history", hist_command },
84c79
< char **argv;
---
> const char **argv;
89c84
< tok_line(tok, line, &argc, &argv);
---
> tok_str(tok, line, &argc, &argv);
100c95
< el_parse(EditLine *el, int argc, char *argv[])
---
> el_parse(EditLine *el, int argc, const char *argv[])
102c97
< char *ptr;
---
> const char *ptr;
142c137
< parse__escape(const char **const ptr)
---
> parse__escape(const char **ptr)
207c202
< } else if (*p == '^' && isascii(p[1]) && (p[1] == '?' || isalpha(p[1]))) {
---
> } else if (*p == '^') {
214a210
>
236a233,240
> case 'M':
> if (in[1] == '-' && in[2] != '\0') {
> *out++ = '\033';
> in += 2;
> break;
> }
> /*FALLTHROUGH*/
>