diff options
| author | Juri Linkov | 2008-07-19 23:57:12 +0000 |
|---|---|---|
| committer | Juri Linkov | 2008-07-19 23:57:12 +0000 |
| commit | 008c22f2dc294fb9528cdb2a90144251675655fc (patch) | |
| tree | 6593cab405b20b161cab198b98c138c577732ea8 | |
| parent | aac420937fd5cb5fc06e416f00edf97fba1934dc (diff) | |
| download | emacs-008c22f2dc294fb9528cdb2a90144251675655fc.tar.gz emacs-008c22f2dc294fb9528cdb2a90144251675655fc.zip | |
(proced-mode, proced): Add \\<proced-mode-map> to docstrings.
| -rw-r--r-- | lisp/ChangeLog | 21 | ||||
| -rw-r--r-- | lisp/proced.el | 9 |
2 files changed, 26 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1ba07db5f5a..cee9364d337 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,24 @@ | |||
| 1 | 2008-07-19 Juri Linkov <juri@jurta.org> | ||
| 2 | |||
| 3 | * startup.el (fancy-startup-text): Move the line "To quit | ||
| 4 | a partially entered command, type Control-g" a few lines below | ||
| 5 | to be after the line "To start". Add text "at gnu.org" to | ||
| 6 | "Overview of Emacs features". | ||
| 7 | |||
| 8 | * dired.el (dired-mode-map): Fix menu text of | ||
| 9 | image-dired-display-thumbs. | ||
| 10 | |||
| 11 | * image-dired.el (image-dired-cmd-create-thumbnail-options) | ||
| 12 | (image-dired-cmd-create-temp-image-options) | ||
| 13 | (image-dired-cmd-create-standard-thumbnail-command): Add > to the | ||
| 14 | ImageMagick command line to change the dimensions of the image | ||
| 15 | only if its width or height exceeds the geometry specification. | ||
| 16 | |||
| 17 | * longlines.el: Add coding cookie utf-8 for the pilcrow sign. | ||
| 18 | |||
| 19 | * proced.el (proced-mode, proced): Add \\<proced-mode-map> | ||
| 20 | to docstrings. | ||
| 21 | |||
| 1 | 2008-07-19 Adrian Robert <Adrian.B.Robert@gmail.com> | 22 | 2008-07-19 Adrian Robert <Adrian.B.Robert@gmail.com> |
| 2 | * term/ns-win.el (ns-ps-print-menu-map): Fix typo pointed out by | 23 | * term/ns-win.el (ns-ps-print-menu-map): Fix typo pointed out by |
| 3 | Vinicius Jose Latorre. | 24 | Vinicius Jose Latorre. |
diff --git a/lisp/proced.el b/lisp/proced.el index fa99eb25d04..c7fc6344895 100644 --- a/lisp/proced.el +++ b/lisp/proced.el | |||
| @@ -307,7 +307,7 @@ JUSTIFY is 'left or 'right for left or right-justified output of ps(1).") | |||
| 307 | 307 | ||
| 308 | (define-derived-mode proced-mode nil "Proced" | 308 | (define-derived-mode proced-mode nil "Proced" |
| 309 | "Mode for displaying UNIX system processes and sending signals to them. | 309 | "Mode for displaying UNIX system processes and sending signals to them. |
| 310 | Type \\[proced-mark-process] to mark a process for later commands. | 310 | Type \\<proced-mode-map>\\[proced-mark] to mark a process for later commands. |
| 311 | Type \\[proced-send-signal] to send signals to marked processes. | 311 | Type \\[proced-send-signal] to send signals to marked processes. |
| 312 | 312 | ||
| 313 | \\{proced-mode-map}" | 313 | \\{proced-mode-map}" |
| @@ -327,7 +327,7 @@ Type \\[proced-send-signal] to send signals to marked processes. | |||
| 327 | ;;;###autoload | 327 | ;;;###autoload |
| 328 | (defun proced (&optional arg) | 328 | (defun proced (&optional arg) |
| 329 | "Mode for displaying UNIX system processes and sending signals to them. | 329 | "Mode for displaying UNIX system processes and sending signals to them. |
| 330 | Type \\[proced-mark-process] to mark a process for later commands. | 330 | Type \\<proced-mode-map>\\[proced-mark] to mark a process for later commands. |
| 331 | Type \\[proced-send-signal] to send signals to marked processes. | 331 | Type \\[proced-send-signal] to send signals to marked processes. |
| 332 | 332 | ||
| 333 | If invoked with optional ARG the window displaying the process | 333 | If invoked with optional ARG the window displaying the process |
| @@ -346,8 +346,9 @@ information will be displayed but not selected. | |||
| 346 | (if arg | 346 | (if arg |
| 347 | (display-buffer buffer) | 347 | (display-buffer buffer) |
| 348 | (pop-to-buffer buffer) | 348 | (pop-to-buffer buffer) |
| 349 | (message (substitute-command-keys | 349 | (message |
| 350 | "type \\[quit-window] to quit, \\[proced-help] for help"))))) | 350 | (substitute-command-keys |
| 351 | "Type \\<proced-mode-map>\\[quit-window] to quit, \\[proced-help] for help"))))) | ||
| 351 | 352 | ||
| 352 | (defun proced-next-line (arg) | 353 | (defun proced-next-line (arg) |
| 353 | "Move down lines then position at `proced-goal-column'. | 354 | "Move down lines then position at `proced-goal-column'. |