diff options
| author | Paul Eggert | 2011-04-13 22:04:02 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-13 22:04:02 -0700 |
| commit | a7ca3326c4740ed3ed118b794d35d235de49f346 (patch) | |
| tree | 5d38e0eac8e839c84a4ccb6e8a07c3c7858fff54 /src/keymap.c | |
| parent | e87b6180b08c60a256dd8557945321ce2354a3a9 (diff) | |
| download | emacs-a7ca3326c4740ed3ed118b794d35d235de49f346.tar.gz emacs-a7ca3326c4740ed3ed118b794d35d235de49f346.zip | |
Undo the DEFUN->DEFUE change.
Diffstat (limited to 'src/keymap.c')
| -rw-r--r-- | src/keymap.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/keymap.c b/src/keymap.c index 741fa4f6dfc..ba958077f0d 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -110,7 +110,7 @@ in case you use it as a menu with `x-popup-menu'. */) | |||
| 110 | Fcons (Fmake_char_table (Qkeymap, Qnil), tail)); | 110 | Fcons (Fmake_char_table (Qkeymap, Qnil), tail)); |
| 111 | } | 111 | } |
| 112 | 112 | ||
| 113 | DEFUE ("make-sparse-keymap", Fmake_sparse_keymap, Smake_sparse_keymap, 0, 1, 0, | 113 | DEFUN ("make-sparse-keymap", Fmake_sparse_keymap, Smake_sparse_keymap, 0, 1, 0, |
| 114 | doc: /* Construct and return a new sparse keymap. | 114 | doc: /* Construct and return a new sparse keymap. |
| 115 | Its car is `keymap' and its cdr is an alist of (CHAR . DEFINITION), | 115 | Its car is `keymap' and its cdr is an alist of (CHAR . DEFINITION), |
| 116 | which binds the character CHAR to DEFINITION, or (SYMBOL . DEFINITION), | 116 | which binds the character CHAR to DEFINITION, or (SYMBOL . DEFINITION), |
| @@ -162,7 +162,7 @@ is also allowed as an element. */) | |||
| 162 | return (KEYMAPP (object) ? Qt : Qnil); | 162 | return (KEYMAPP (object) ? Qt : Qnil); |
| 163 | } | 163 | } |
| 164 | 164 | ||
| 165 | DEFUE ("keymap-prompt", Fkeymap_prompt, Skeymap_prompt, 1, 1, 0, | 165 | DEFUN ("keymap-prompt", Fkeymap_prompt, Skeymap_prompt, 1, 1, 0, |
| 166 | doc: /* Return the prompt-string of a keymap MAP. | 166 | doc: /* Return the prompt-string of a keymap MAP. |
| 167 | If non-nil, the prompt is shown in the echo-area | 167 | If non-nil, the prompt is shown in the echo-area |
| 168 | when reading a key-sequence to be looked-up in this keymap. */) | 168 | when reading a key-sequence to be looked-up in this keymap. */) |
| @@ -293,7 +293,7 @@ keymap_memberp (Lisp_Object map, Lisp_Object maps) | |||
| 293 | 293 | ||
| 294 | /* Set the parent keymap of MAP to PARENT. */ | 294 | /* Set the parent keymap of MAP to PARENT. */ |
| 295 | 295 | ||
| 296 | DEFUE ("set-keymap-parent", Fset_keymap_parent, Sset_keymap_parent, 2, 2, 0, | 296 | DEFUN ("set-keymap-parent", Fset_keymap_parent, Sset_keymap_parent, 2, 2, 0, |
| 297 | doc: /* Modify KEYMAP to set its parent map to PARENT. | 297 | doc: /* Modify KEYMAP to set its parent map to PARENT. |
| 298 | Return PARENT. PARENT should be nil or another keymap. */) | 298 | Return PARENT. PARENT should be nil or another keymap. */) |
| 299 | (Lisp_Object keymap, Lisp_Object parent) | 299 | (Lisp_Object keymap, Lisp_Object parent) |
| @@ -1081,7 +1081,7 @@ is not copied. */) | |||
| 1081 | 1081 | ||
| 1082 | /* GC is possible in this function if it autoloads a keymap. */ | 1082 | /* GC is possible in this function if it autoloads a keymap. */ |
| 1083 | 1083 | ||
| 1084 | DEFUE ("define-key", Fdefine_key, Sdefine_key, 3, 3, 0, | 1084 | DEFUN ("define-key", Fdefine_key, Sdefine_key, 3, 3, 0, |
| 1085 | doc: /* In KEYMAP, define key sequence KEY as DEF. | 1085 | doc: /* In KEYMAP, define key sequence KEY as DEF. |
| 1086 | KEYMAP is a keymap. | 1086 | KEYMAP is a keymap. |
| 1087 | 1087 | ||
| @@ -1212,7 +1212,7 @@ binding KEY to DEF is added at the front of KEYMAP. */) | |||
| 1212 | 1212 | ||
| 1213 | /* This function may GC (it calls Fkey_binding). */ | 1213 | /* This function may GC (it calls Fkey_binding). */ |
| 1214 | 1214 | ||
| 1215 | DEFUE ("command-remapping", Fcommand_remapping, Scommand_remapping, 1, 3, 0, | 1215 | DEFUN ("command-remapping", Fcommand_remapping, Scommand_remapping, 1, 3, 0, |
| 1216 | doc: /* Return the remapping for command COMMAND. | 1216 | doc: /* Return the remapping for command COMMAND. |
| 1217 | Returns nil if COMMAND is not remapped (or not a symbol). | 1217 | Returns nil if COMMAND is not remapped (or not a symbol). |
| 1218 | 1218 | ||
| @@ -1520,7 +1520,7 @@ current_minor_maps (Lisp_Object **modeptr, Lisp_Object **mapptr) | |||
| 1520 | return i; | 1520 | return i; |
| 1521 | } | 1521 | } |
| 1522 | 1522 | ||
| 1523 | DEFUE ("current-active-maps", Fcurrent_active_maps, Scurrent_active_maps, | 1523 | DEFUN ("current-active-maps", Fcurrent_active_maps, Scurrent_active_maps, |
| 1524 | 0, 2, 0, | 1524 | 0, 2, 0, |
| 1525 | doc: /* Return a list of the currently active keymaps. | 1525 | doc: /* Return a list of the currently active keymaps. |
| 1526 | OLP if non-nil indicates that we should obey `overriding-local-map' and | 1526 | OLP if non-nil indicates that we should obey `overriding-local-map' and |
| @@ -1663,7 +1663,7 @@ like in the respective argument of `key-binding'. */) | |||
| 1663 | 1663 | ||
| 1664 | /* GC is possible in this function if it autoloads a keymap. */ | 1664 | /* GC is possible in this function if it autoloads a keymap. */ |
| 1665 | 1665 | ||
| 1666 | DEFUE ("key-binding", Fkey_binding, Skey_binding, 1, 4, 0, | 1666 | DEFUN ("key-binding", Fkey_binding, Skey_binding, 1, 4, 0, |
| 1667 | doc: /* Return the binding for command KEY in current keymaps. | 1667 | doc: /* Return the binding for command KEY in current keymaps. |
| 1668 | KEY is a string or vector, a sequence of keystrokes. | 1668 | KEY is a string or vector, a sequence of keystrokes. |
| 1669 | The binding is probably a symbol with a function definition. | 1669 | The binding is probably a symbol with a function definition. |
| @@ -2180,7 +2180,7 @@ static Lisp_Object Qsingle_key_description, Qkey_description; | |||
| 2180 | 2180 | ||
| 2181 | /* This function cannot GC. */ | 2181 | /* This function cannot GC. */ |
| 2182 | 2182 | ||
| 2183 | DEFUE ("key-description", Fkey_description, Skey_description, 1, 2, 0, | 2183 | DEFUN ("key-description", Fkey_description, Skey_description, 1, 2, 0, |
| 2184 | doc: /* Return a pretty description of key-sequence KEYS. | 2184 | doc: /* Return a pretty description of key-sequence KEYS. |
| 2185 | Optional arg PREFIX is the sequence of keys leading up to KEYS. | 2185 | Optional arg PREFIX is the sequence of keys leading up to KEYS. |
| 2186 | Control characters turn into "C-foo" sequences, meta into "M-foo", | 2186 | Control characters turn into "C-foo" sequences, meta into "M-foo", |
| @@ -2399,7 +2399,7 @@ push_key_description (register unsigned int c, register char *p, int force_multi | |||
| 2399 | 2399 | ||
| 2400 | /* This function cannot GC. */ | 2400 | /* This function cannot GC. */ |
| 2401 | 2401 | ||
| 2402 | DEFUE ("single-key-description", Fsingle_key_description, | 2402 | DEFUN ("single-key-description", Fsingle_key_description, |
| 2403 | Ssingle_key_description, 1, 2, 0, | 2403 | Ssingle_key_description, 1, 2, 0, |
| 2404 | doc: /* Return a pretty description of command character KEY. | 2404 | doc: /* Return a pretty description of command character KEY. |
| 2405 | Control characters turn into C-whatever, etc. | 2405 | Control characters turn into C-whatever, etc. |
| @@ -2677,7 +2677,7 @@ where_is_internal (Lisp_Object definition, Lisp_Object keymaps, | |||
| 2677 | 2677 | ||
| 2678 | /* This function can GC if Flookup_key autoloads any keymaps. */ | 2678 | /* This function can GC if Flookup_key autoloads any keymaps. */ |
| 2679 | 2679 | ||
| 2680 | DEFUE ("where-is-internal", Fwhere_is_internal, Swhere_is_internal, 1, 5, 0, | 2680 | DEFUN ("where-is-internal", Fwhere_is_internal, Swhere_is_internal, 1, 5, 0, |
| 2681 | doc: /* Return list of keys that invoke DEFINITION. | 2681 | doc: /* Return list of keys that invoke DEFINITION. |
| 2682 | If KEYMAP is a keymap, search only KEYMAP and the global keymap. | 2682 | If KEYMAP is a keymap, search only KEYMAP and the global keymap. |
| 2683 | If KEYMAP is nil, search all the currently active keymaps. | 2683 | If KEYMAP is nil, search all the currently active keymaps. |