diff options
| author | stefanf <stefanf@FreeBSD.org> | 2007-06-10 19:06:09 +0000 |
|---|---|---|
| committer | stefanf <stefanf@FreeBSD.org> | 2007-06-10 19:06:09 +0000 |
| commit | ce047ca5eeaa67687d3b47fc9efb30d6bd34d8eb (patch) | |
| tree | f27a090c796f4ade2d63452e9542fdbe365a55ec /include | |
| parent | dac62e7ff2f6d9dbbc83623d558cd1169444ce35 (diff) | |
| download | FreeBSD-src-ce047ca5eeaa67687d3b47fc9efb30d6bd34d8eb.zip FreeBSD-src-ce047ca5eeaa67687d3b47fc9efb30d6bd34d8eb.tar.gz | |
Merge NetBSD changes, among them:
el.c 1.44, el.h 1.17, editline.3 1.53, histedit.h 1.31:
# add EL_GETFP, and EL_SETFP.
el.c 1.42, term.c 1.46, term.h 1.18, editline.3 1.52, histedit.h 1.29:
# - Add more readline functions, enough for gdb-6.5
# - Make el_get varyadic, and implement EL_GETTC.
# - XXX: the EL_SETTC api will change in the future.
Note: The latter change breaks the ABI of the el_get() function.
Approved by: re (kensmith)
Diffstat (limited to 'include')
| -rw-r--r-- | include/histedit.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/histedit.h b/include/histedit.h index a4db871..0db9f75 100644 --- a/include/histedit.h +++ b/include/histedit.h @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)histedit.h 8.2 (Berkeley) 1/3/94 - * $NetBSD: histedit.h,v 1.28 2005/07/14 15:00:58 christos Exp $ + * $NetBSD: histedit.h,v 1.31 2006/12/15 22:13:33 christos Exp $ * $FreeBSD$ */ @@ -104,7 +104,7 @@ int el_parse(EditLine *, int, const char **); * Low level editline access functions */ int el_set(EditLine *, int, ...); -int el_get(EditLine *, int, void *); +int el_get(EditLine *, int, ...); #if 0 unsigned char _el_fn_complete(EditLine *, int); #endif @@ -130,6 +130,9 @@ unsigned char _el_fn_complete(EditLine *, int); #define EL_CLIENTDATA 14 /* , void *); */ #define EL_UNBUFFERED 15 /* , int); */ #define EL_PREP_TERM 16 /* , int); */ +#define EL_GETTC 17 /* , const char *, ..., NULL); */ +#define EL_GETFP 18 /* , int, FILE **) */ +#define EL_SETFP 19 /* , int, FILE *) */ #define EL_BUILTIN_GETCFN (NULL) |
