From 4e317cd7d599f8bfe9b7906ba2f75a82e29a5f7a Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Wed, 30 Jun 2010 00:05:36 +0000 Subject: Update libedit to bring it into sync with the latest version from NetBSD. ok deraadt --- lib/libedit/map.h | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'lib/libedit/map.h') diff --git a/lib/libedit/map.h b/lib/libedit/map.h index 5eacd97512d..1dedbef6802 100644 --- a/lib/libedit/map.h +++ b/lib/libedit/map.h @@ -1,5 +1,5 @@ -/* $OpenBSD: map.h,v 1.7 2003/10/31 08:42:24 otto Exp $ */ -/* $NetBSD: map.h,v 1.8 2003/08/07 16:44:32 agc Exp $ */ +/* $OpenBSD: map.h,v 1.8 2010/06/30 00:05:35 nicm Exp $ */ +/* $NetBSD: map.h,v 1.9 2009/12/30 22:37:40 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -42,9 +42,9 @@ #define _h_el_map typedef struct el_bindings_t { /* for the "bind" shell command */ - const char *name; /* function name for bind command */ + const Char *name; /* function name for bind command */ int func; /* function numeric value */ - const char *description; /* description of function */ + const Char *description; /* description of function */ } el_bindings_t; @@ -64,13 +64,15 @@ typedef struct el_map_t { #define MAP_EMACS 0 #define MAP_VI 1 -protected int map_bind(EditLine *, int, const char **); +#define N_KEYS 256 + +protected int map_bind(EditLine *, int, const Char **); protected int map_init(EditLine *); protected void map_end(EditLine *); protected void map_init_vi(EditLine *); protected void map_init_emacs(EditLine *); -protected int map_set_editor(EditLine *, char *); -protected int map_get_editor(EditLine *, const char **); -protected int map_addfunc(EditLine *, const char *, const char *, el_func_t); +protected int map_set_editor(EditLine *, Char *); +protected int map_get_editor(EditLine *, const Char **); +protected int map_addfunc(EditLine *, const Char *, const Char *, el_func_t); #endif /* _h_el_map */ -- cgit v1.2.3