diff options
| author | Karl Heuer | 1997-12-04 05:28:27 +0000 |
|---|---|---|
| committer | Karl Heuer | 1997-12-04 05:28:27 +0000 |
| commit | 7bba18953ee1a3161d04d0174c92a87fabfa68a8 (patch) | |
| tree | a669244c5dda9ee2b867775345d4eee8f2cf60f1 | |
| parent | 869fc1d970eb624fb6967a2b67cd2a044c03d96a (diff) | |
| download | emacs-7bba18953ee1a3161d04d0174c92a87fabfa68a8.tar.gz emacs-7bba18953ee1a3161d04d0174c92a87fabfa68a8.zip | |
(global-set-key, local-set-key): Doc fix.
| -rw-r--r-- | lisp/subr.el | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/lisp/subr.el b/lisp/subr.el index af96a546a28..7e21ef9a46b 100644 --- a/lisp/subr.el +++ b/lisp/subr.el | |||
| @@ -1042,12 +1042,15 @@ that can be added." | |||
| 1042 | 1042 | ||
| 1043 | (defun global-set-key (key command) | 1043 | (defun global-set-key (key command) |
| 1044 | "Give KEY a global binding as COMMAND. | 1044 | "Give KEY a global binding as COMMAND. |
| 1045 | COMMAND is a symbol naming an interactively-callable function. | 1045 | COMMAND is the command definition to use; usually it is |
| 1046 | KEY is a key sequence (a string or vector of characters or event types). | 1046 | a symbol naming an interactively-callable function. |
| 1047 | Non-ASCII characters with codes above 127 (such as ISO Latin-1) | 1047 | KEY is a key sequence; noninteractively, it is a string or vector |
| 1048 | can be included if you use a vector. | 1048 | of characters or event types, and non-ASCII characters with codes |
| 1049 | Note that if KEY has a local binding in the current buffer | 1049 | above 127 (such as ISO Latin-1) can be included if you use a vector. |
| 1050 | that local binding will continue to shadow any global binding." | 1050 | |
| 1051 | Note that if KEY has a local binding in the current buffer, | ||
| 1052 | that local binding will continue to shadow any global binding | ||
| 1053 | that you make with this function." | ||
| 1051 | (interactive "KSet key globally: \nCSet key %s to command: ") | 1054 | (interactive "KSet key globally: \nCSet key %s to command: ") |
| 1052 | (or (vectorp key) (stringp key) | 1055 | (or (vectorp key) (stringp key) |
| 1053 | (signal 'wrong-type-argument (list 'arrayp key))) | 1056 | (signal 'wrong-type-argument (list 'arrayp key))) |
| @@ -1056,10 +1059,12 @@ that local binding will continue to shadow any global binding." | |||
| 1056 | 1059 | ||
| 1057 | (defun local-set-key (key command) | 1060 | (defun local-set-key (key command) |
| 1058 | "Give KEY a local binding as COMMAND. | 1061 | "Give KEY a local binding as COMMAND. |
| 1059 | COMMAND is a symbol naming an interactively-callable function. | 1062 | COMMAND is the command definition to use; usually it is |
| 1060 | KEY is a key sequence (a string or vector of characters or event types). | 1063 | a symbol naming an interactively-callable function. |
| 1061 | Non-ASCII characters with codes above 127 (such as ISO Latin-1) | 1064 | KEY is a key sequence; noninteractively, it is a string or vector |
| 1062 | can be included if you use a vector. | 1065 | of characters or event types, and non-ASCII characters with codes |
| 1066 | above 127 (such as ISO Latin-1) can be included if you use a vector. | ||
| 1067 | |||
| 1063 | The binding goes in the current buffer's local map, | 1068 | The binding goes in the current buffer's local map, |
| 1064 | which in most cases is shared with all other buffers in the same major mode." | 1069 | which in most cases is shared with all other buffers in the same major mode." |
| 1065 | (interactive "KSet key locally: \nCSet key %s locally to command: ") | 1070 | (interactive "KSet key locally: \nCSet key %s locally to command: ") |