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
37,38c33,34
< * $NetBSD: el.h,v 1.7 2000/11/11 22:18:57 christos Exp $
< * $FreeBSD: head/lib/libedit/el.h 148814 2005-08-07 08:35:39Z stefanf $
---
> * $NetBSD: el.h,v 1.16 2003/10/18 23:48:42 christos Exp $
> * $FreeBSD: head/lib/libedit/el.h 148834 2005-08-07 20:55:59Z stefanf $
58,60c54,57
< #define HANDLE_SIGNALS 1<<0
< #define NO_TTY 1<<1
< #define EDIT_DISABLED 1<<2
---
> #define HANDLE_SIGNALS 0x01
> #define NO_TTY 0x02
> #define EDIT_DISABLED 0x04
> #define UNBUFFERED 0x08
75c72
< const char *limit; /* Max position */
---
> const char *limit; /* Max position */
86a84,85
> el_action_t thiscmd; /* this command */
> char thisch; /* char that generated it */
91a91
> #define el_strdup(a) strdup(a)
108a109
> #include "read.h"
118a120
> void *el_data; /* Client data */
132,133c134
<
< void *data; /* user data */
---
> el_read_t el_read; /* Character reading stuff */
136c137
< protected int el_editmode(EditLine *, int, char **);
---
> protected int el_editmode(EditLine *, int, const char **);
139,140c140,145
< #define EL_ABORT(a) (void) (fprintf(el->el_errfile, "%s, %d: ", \
< __FILE__, __LINE__), fprintf a, abort())
---
> #define EL_ABORT(a) do { \
> fprintf(el->el_errfile, "%s, %d: ", \
> __FILE__, __LINE__); \
> fprintf a; \
> abort(); \
> } while( /*CONSTCOND*/0);