projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change sources over to using GPLv3
[deliverable/binutils-gdb.git]
/
readline
/
keymaps.h
diff --git
a/readline/keymaps.h
b/readline/keymaps.h
index 3a504fb014fb37cd5194ed40afee95018f29815c..66fa2a5ec14a07650b6a195dc4402be63066ecf2 100644
(file)
--- a/
readline/keymaps.h
+++ b/
readline/keymaps.h
@@
-30,17
+30,11
@@
extern "C" {
#if defined (READLINE_LIBRARY)
# include "rlstdc.h"
# include "chardefs.h"
#if defined (READLINE_LIBRARY)
# include "rlstdc.h"
# include "chardefs.h"
+# include "rltypedefs.h"
#else
# include <readline/rlstdc.h>
# include <readline/chardefs.h>
#else
# include <readline/rlstdc.h>
# include <readline/chardefs.h>
-#endif
-
-#if !defined (_FUNCTION_DEF)
-# define _FUNCTION_DEF
-typedef int Function ();
-typedef void VFunction ();
-typedef char *CPFunction ();
-typedef char **CPPFunction ();
+# include <readline/rltypedefs.h>
#endif
/* A keymap contains one entry for each key in the ASCII set.
#endif
/* A keymap contains one entry for each key in the ASCII set.
@@
-50,16
+44,17
@@
typedef char **CPPFunction ();
TYPE says which kind of thing FUNCTION is. */
typedef struct _keymap_entry {
char type;
TYPE says which kind of thing FUNCTION is. */
typedef struct _keymap_entry {
char type;
-
Function
*function;
+
rl_command_func_t
*function;
} KEYMAP_ENTRY;
/* This must be large enough to hold bindings for all of the characters
in a desired character set (e.g, 128 for ASCII, 256 for ISO Latin-x,
} KEYMAP_ENTRY;
/* This must be large enough to hold bindings for all of the characters
in a desired character set (e.g, 128 for ASCII, 256 for ISO Latin-x,
- and so on). */
-#define KEYMAP_SIZE 256
+ and so on) plus one for subsequence matching. */
+#define KEYMAP_SIZE 257
+#define ANYOTHERKEY KEYMAP_SIZE-1
/* I wanted to make the above structure contain a union of:
/* I wanted to make the above structure contain a union of:
- union {
Function
*function; struct _keymap_entry *keymap; } value;
+ union {
rl_command_func_t
*function; struct _keymap_entry *keymap; } value;
but this made it impossible for me to create a static array.
Maybe I need C lessons. */
but this made it impossible for me to create a static array.
Maybe I need C lessons. */
@@
-76,30
+71,30
@@
extern KEYMAP_ENTRY_ARRAY vi_insertion_keymap, vi_movement_keymap;
/* Return a new, empty keymap.
Free it with free() when you are done. */
/* Return a new, empty keymap.
Free it with free() when you are done. */
-extern Keymap rl_make_bare_keymap
__P
((void));
+extern Keymap rl_make_bare_keymap
PARAMS
((void));
/* Return a new keymap which is a copy of MAP. */
/* Return a new keymap which is a copy of MAP. */
-extern Keymap rl_copy_keymap
__P
((Keymap));
+extern Keymap rl_copy_keymap
PARAMS
((Keymap));
/* Return a new keymap with the printing characters bound to rl_insert,
the lowercase Meta characters bound to run their equivalents, and
the Meta digits bound to produce numeric arguments. */
/* Return a new keymap with the printing characters bound to rl_insert,
the lowercase Meta characters bound to run their equivalents, and
the Meta digits bound to produce numeric arguments. */
-extern Keymap rl_make_keymap
__P
((void));
+extern Keymap rl_make_keymap
PARAMS
((void));
/* Free the storage associated with a keymap. */
/* Free the storage associated with a keymap. */
-extern void rl_discard_keymap
__P
((Keymap));
+extern void rl_discard_keymap
PARAMS
((Keymap));
/* These functions actually appear in bind.c */
/* Return the keymap corresponding to a given name. Names look like
`emacs' or `emacs-meta' or `vi-insert'. */
/* These functions actually appear in bind.c */
/* Return the keymap corresponding to a given name. Names look like
`emacs' or `emacs-meta' or `vi-insert'. */
-extern Keymap rl_get_keymap_by_name
__P((
char *));
+extern Keymap rl_get_keymap_by_name
PARAMS((const
char *));
/* Return the current keymap. */
/* Return the current keymap. */
-extern Keymap rl_get_keymap
__P
((void));
+extern Keymap rl_get_keymap
PARAMS
((void));
/* Set the current keymap to MAP. */
/* Set the current keymap to MAP. */
-extern void rl_set_keymap
__P
((Keymap));
+extern void rl_set_keymap
PARAMS
((Keymap));
#ifdef __cplusplus
}
#ifdef __cplusplus
}
This page took
0.023238 seconds
and
4
git commands to generate.