diff options
| author | Karoly Lorentey | 2004-05-23 05:08:13 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2004-05-23 05:08:13 +0000 |
| commit | 2d2884b5c5f2e1ce27e30123111536f9db8ddfc7 (patch) | |
| tree | d429cc1578b1d8bcb8d9f0a9d161d8f2361d8ae3 /src/keymap.c | |
| parent | d4d89d3741e8cfd34f7db695bf2a801e5584f9a7 (diff) | |
| parent | 71d5a208a41e0982a9565d8cc215bd110fcac864 (diff) | |
| download | emacs-2d2884b5c5f2e1ce27e30123111536f9db8ddfc7.tar.gz emacs-2d2884b5c5f2e1ce27e30123111536f9db8ddfc7.zip | |
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-330
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-331
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-332
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-333
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-334
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-335
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-336
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-337
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-338
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-173
Diffstat (limited to 'src/keymap.c')
| -rw-r--r-- | src/keymap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/keymap.c b/src/keymap.c index a4aeea8ae63..60a6d177e35 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -1079,15 +1079,15 @@ event type that has no other definition in this keymap. | |||
| 1079 | 1079 | ||
| 1080 | DEF is anything that can be a key's definition: | 1080 | DEF is anything that can be a key's definition: |
| 1081 | nil (means key is undefined in this keymap), | 1081 | nil (means key is undefined in this keymap), |
| 1082 | a command (a Lisp function suitable for interactive calling) | 1082 | a command (a Lisp function suitable for interactive calling), |
| 1083 | a string (treated as a keyboard macro), | 1083 | a string (treated as a keyboard macro), |
| 1084 | a keymap (to define a prefix key), | 1084 | a keymap (to define a prefix key), |
| 1085 | a symbol. When the key is looked up, the symbol will stand for its | 1085 | a symbol (when the key is looked up, the symbol will stand for its |
| 1086 | function definition, which should at that time be one of the above, | 1086 | function definition, which should at that time be one of the above, |
| 1087 | or another symbol whose function definition is used, etc. | 1087 | or another symbol whose function definition is used, etc.), |
| 1088 | a cons (STRING . DEFN), meaning that DEFN is the definition | 1088 | a cons (STRING . DEFN), meaning that DEFN is the definition |
| 1089 | (DEFN should be a valid definition in its own right), | 1089 | (DEFN should be a valid definition in its own right), |
| 1090 | or a cons (KEYMAP . CHAR), meaning use definition of CHAR in map KEYMAP. | 1090 | or a cons (MAP . CHAR), meaning use definition of CHAR in keymap MAP. |
| 1091 | 1091 | ||
| 1092 | If KEYMAP is a sparse keymap with a binding for KEY, the existing | 1092 | If KEYMAP is a sparse keymap with a binding for KEY, the existing |
| 1093 | binding is altered. If there is no binding for KEY, the new pair | 1093 | binding is altered. If there is no binding for KEY, the new pair |