diff options
| -rw-r--r-- | lisp/help.el | 68 |
1 files changed, 48 insertions, 20 deletions
diff --git a/lisp/help.el b/lisp/help.el index 8d27ce5a046..81cea9ab088 100644 --- a/lisp/help.el +++ b/lisp/help.el | |||
| @@ -53,40 +53,51 @@ | |||
| 53 | 53 | ||
| 54 | (define-key help-map "\C-c" 'describe-copying) | 54 | (define-key help-map "\C-c" 'describe-copying) |
| 55 | (define-key help-map "\C-d" 'describe-distribution) | 55 | (define-key help-map "\C-d" 'describe-distribution) |
| 56 | (define-key help-map "\C-w" 'describe-no-warranty) | 56 | (define-key help-map "\C-e" 'view-emacs-problems) |
| 57 | (define-key help-map "\C-f" 'view-emacs-FAQ) | ||
| 58 | (define-key help-map "\C-h" 'view-hello-file) | ||
| 59 | (define-key help-map "\C-m" 'view-order-manuals) | ||
| 60 | (define-key help-map "\C-n" 'view-emacs-news) | ||
| 57 | (define-key help-map "\C-p" 'describe-project) | 61 | (define-key help-map "\C-p" 'describe-project) |
| 62 | (define-key help-map "\C-w" 'describe-no-warranty) | ||
| 63 | |||
| 64 | ;; This does not fit the pattern, but it is natural given the C-\ command. | ||
| 65 | (define-key help-map "\C-\\" 'describe-input-method) | ||
| 66 | |||
| 67 | (define-key help-map "C" 'describe-coding-system) | ||
| 68 | (define-key help-map "F" 'Info-goto-emacs-command-node) | ||
| 69 | (define-key help-map "I" 'describe-input-method) | ||
| 70 | (define-key help-map "K" 'Info-goto-emacs-key-command-node) | ||
| 71 | (define-key help-map "L" 'describe-language-environment) | ||
| 72 | (define-key help-map "S" 'info-lookup-symbol) | ||
| 73 | |||
| 58 | (define-key help-map "a" 'apropos-command) | 74 | (define-key help-map "a" 'apropos-command) |
| 59 | 75 | ||
| 60 | (define-key help-map "b" 'describe-bindings) | 76 | (define-key help-map "b" 'describe-bindings) |
| 61 | 77 | ||
| 62 | (define-key help-map "c" 'describe-key-briefly) | 78 | (define-key help-map "c" 'describe-key-briefly) |
| 63 | (define-key help-map "k" 'describe-key) | ||
| 64 | 79 | ||
| 65 | (define-key help-map "d" 'describe-function) | 80 | (define-key help-map "e" 'view-echo-area-messages) |
| 81 | |||
| 66 | (define-key help-map "f" 'describe-function) | 82 | (define-key help-map "f" 'describe-function) |
| 67 | 83 | ||
| 68 | (define-key help-map "F" 'view-emacs-FAQ) | 84 | (define-key help-map "h" 'view-hello-file) |
| 69 | 85 | ||
| 70 | (define-key help-map "i" 'info) | 86 | (define-key help-map "i" 'info) |
| 71 | (define-key help-map "4i" 'info-other-window) | 87 | (define-key help-map "4i" 'info-other-window) |
| 72 | (define-key help-map "\C-f" 'Info-goto-emacs-command-node) | 88 | |
| 73 | (define-key help-map "\C-k" 'Info-goto-emacs-key-command-node) | 89 | (define-key help-map "k" 'describe-key) |
| 74 | (define-key help-map "\C-i" 'info-lookup-symbol) | ||
| 75 | 90 | ||
| 76 | (define-key help-map "l" 'view-lossage) | 91 | (define-key help-map "l" 'view-lossage) |
| 77 | 92 | ||
| 78 | (define-key help-map "m" 'describe-mode) | 93 | (define-key help-map "m" 'describe-mode) |
| 79 | (define-key help-map "\C-m" 'view-order-manuals) | ||
| 80 | 94 | ||
| 81 | (define-key help-map "\C-n" 'view-emacs-news) | ||
| 82 | (define-key help-map "n" 'view-emacs-news) | 95 | (define-key help-map "n" 'view-emacs-news) |
| 83 | 96 | ||
| 84 | (define-key help-map "p" 'finder-by-keyword) | 97 | (define-key help-map "p" 'finder-by-keyword) |
| 85 | (autoload 'finder-by-keyword "finder" | 98 | (autoload 'finder-by-keyword "finder" |
| 86 | "Find packages matching a given keyword." t) | 99 | "Find packages matching a given keyword." t) |
| 87 | 100 | ||
| 88 | (define-key help-map "P" 'view-emacs-problems) | ||
| 89 | |||
| 90 | (define-key help-map "s" 'describe-syntax) | 101 | (define-key help-map "s" 'describe-syntax) |
| 91 | 102 | ||
| 92 | (define-key help-map "t" 'help-with-tutorial) | 103 | (define-key help-map "t" 'help-with-tutorial) |
| @@ -163,7 +174,7 @@ If FUNCTION is nil, applies `message' to it, thus printing it." | |||
| 163 | 174 | ||
| 164 | (defalias 'help 'help-for-help) | 175 | (defalias 'help 'help-for-help) |
| 165 | (make-help-screen help-for-help | 176 | (make-help-screen help-for-help |
| 166 | "a b c C f F C-f i I k C-k l L m n p s t v w C-c C-d C-n C-p C-w; ? for help:" | 177 | "a b c C e f F C-f i I k C-k l L m p s t v w C-c C-d C-n C-p C-w or ? :" |
| 167 | "You have typed %THIS-KEY%, the help character. Type a Help option: | 178 | "You have typed %THIS-KEY%, the help character. Type a Help option: |
| 168 | \(Use SPC or DEL to scroll through this text. Type \\<help-map>\\[help-quit] to exit the Help command.) | 179 | \(Use SPC or DEL to scroll through this text. Type \\<help-map>\\[help-quit] to exit the Help command.) |
| 169 | 180 | ||
| @@ -176,17 +187,16 @@ c describe-key-briefly. Type a command key sequence; | |||
| 176 | C describe-coding-system. This describes either a specific coding system | 187 | C describe-coding-system. This describes either a specific coding system |
| 177 | (if you type its name) or the coding systems currently in use | 188 | (if you type its name) or the coding systems currently in use |
| 178 | (if you type just RET). | 189 | (if you type just RET). |
| 190 | e view-echo-area-messages. Show the `*Messages*' buffer. | ||
| 179 | f describe-function. Type a function name and get documentation of it. | 191 | f describe-function. Type a function name and get documentation of it. |
| 180 | C-f Info-goto-emacs-command-node. Type a function name; | 192 | F Info-goto-emacs-command-node. Type a function name; |
| 181 | it takes you to the Info node for that command. | 193 | it takes you to the Info node for that command. |
| 182 | i info. The info documentation reader. | 194 | i info. The info documentation reader. |
| 183 | I describe-input-method. Describe a specific input method (if you type | 195 | I describe-input-method. Describe a specific input method (if you type |
| 184 | its name) or the current input method (if you type just RET). | 196 | its name) or the current input method (if you type just RET). |
| 185 | C-i info-lookup-symbol. Display the definition of a specific symbol | ||
| 186 | as found in the manual for the language this buffer is written in. | ||
| 187 | k describe-key. Type a command key sequence; | 197 | k describe-key. Type a command key sequence; |
| 188 | it displays the full documentation. | 198 | it displays the full documentation. |
| 189 | C-k Info-goto-emacs-key-command-node. Type a command key sequence; | 199 | K Info-goto-emacs-key-command-node. Type a command key sequence; |
| 190 | it takes you to the Info node for the command bound to that key. | 200 | it takes you to the Info node for the command bound to that key. |
| 191 | l view-lossage. Show last 100 characters you typed. | 201 | l view-lossage. Show last 100 characters you typed. |
| 192 | L describe-language-environment. This describes either a | 202 | L describe-language-environment. This describes either a |
| @@ -194,24 +204,35 @@ L describe-language-environment. This describes either a | |||
| 194 | or the current language environment (if you type just RET). | 204 | or the current language environment (if you type just RET). |
| 195 | m describe-mode. Print documentation of current minor modes, | 205 | m describe-mode. Print documentation of current minor modes, |
| 196 | and the current major mode, including their special commands. | 206 | and the current major mode, including their special commands. |
| 197 | n view-emacs-news. Display news of recent Emacs changes. | ||
| 198 | p finder-by-keyword. Find packages matching a given topic keyword. | 207 | p finder-by-keyword. Find packages matching a given topic keyword. |
| 199 | s describe-syntax. Display contents of syntax table, plus explanations. | 208 | s describe-syntax. Display contents of syntax table, plus explanations. |
| 209 | S info-lookup-symbol. Display the definition of a specific symbol | ||
| 210 | as found in the manual for the language this buffer is written in. | ||
| 200 | t help-with-tutorial. Select the Emacs learn-by-doing tutorial. | 211 | t help-with-tutorial. Select the Emacs learn-by-doing tutorial. |
| 201 | v describe-variable. Type name of a variable; | 212 | v describe-variable. Type name of a variable; |
| 202 | it displays the variable's documentation and value. | 213 | it displays the variable's documentation and value. |
| 203 | w where-is. Type command name; it prints which keystrokes | 214 | w where-is. Type command name; it prints which keystrokes |
| 204 | invoke that command. | 215 | invoke that command. |
| 205 | 216 | ||
| 206 | F Display the frequently asked questions file. | 217 | C-c Display Emacs copying permission (GNU General Public License). |
| 207 | h Display the HELLO file which illustrates various scripts. | ||
| 208 | C-c Display Emacs copying permission (General Public License). | ||
| 209 | C-d Display Emacs ordering information. | 218 | C-d Display Emacs ordering information. |
| 219 | C-e Display info about Emacs problems. | ||
| 220 | C-f Display the Emacs FAQ. | ||
| 221 | C-h Display the HELLO file which illustrates various scripts. | ||
| 222 | C-m Display how to order printed Emacs manuals. | ||
| 210 | C-n Display news of recent Emacs changes. | 223 | C-n Display news of recent Emacs changes. |
| 211 | C-p Display information about the GNU project. | 224 | C-p Display information about the GNU project. |
| 212 | C-w Display information on absence of warranty for GNU Emacs." | 225 | C-w Display information on absence of warranty for GNU Emacs." |
| 213 | help-map) | 226 | help-map) |
| 214 | 227 | ||
| 228 | |||
| 229 | |||
| 230 | (define-key help-map "F" 'Info-goto-emacs-command-node) | ||
| 231 | (define-key help-map "K" 'Info-goto-emacs-key-command-node) | ||
| 232 | (define-key help-map "I" 'info-lookup-symbol) | ||
| 233 | |||
| 234 | |||
| 235 | |||
| 215 | 236 | ||
| 216 | 237 | ||
| 217 | (defun function-called-at-point () | 238 | (defun function-called-at-point () |
| @@ -307,6 +328,13 @@ With numeric argument, display information on correspondingly older changes." | |||
| 307 | (view-file (expand-file-name file data-directory)) | 328 | (view-file (expand-file-name file data-directory)) |
| 308 | (error "No such old news")))) | 329 | (error "No such old news")))) |
| 309 | 330 | ||
| 331 | (defun view-echo-area-messages () | ||
| 332 | "View the log of recent echo-area messages: the `*Messages*' buffer. | ||
| 333 | The number of messages retained in that buffer | ||
| 334 | is specified by the variable `message-log-max'." | ||
| 335 | (interactive) | ||
| 336 | (switch-to-buffer (get-buffer-create "*Messages*"))) | ||
| 337 | |||
| 310 | (defun view-order-manuals () | 338 | (defun view-order-manuals () |
| 311 | "Display the Emacs ORDERS file." | 339 | "Display the Emacs ORDERS file." |
| 312 | (interactive) | 340 | (interactive) |