diff options
| author | Chong Yidong | 2012-11-28 15:12:56 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-11-28 15:12:56 +0800 |
| commit | a5bf43bab84c273aa582011056909d573783013e (patch) | |
| tree | 0b54189e487bfd0c2346db89a5850972edfdcd66 | |
| parent | a9de9f0c05f835c7091086d14d49e16f9927e663 (diff) | |
| download | emacs-a5bf43bab84c273aa582011056909d573783013e.tar.gz emacs-a5bf43bab84c273aa582011056909d573783013e.zip | |
Buffer Menu doc fixes.
* buff-menu.el (Buffer-menu-delete-backwards, Buffer-menu-mode)
(buffer-menu): Doc fix.
Fixes: debbugs:12294
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/buff-menu.el | 59 |
2 files changed, 37 insertions, 27 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 330439457e1..23caba15449 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-11-28 Chong Yidong <cyd@gnu.org> | ||
| 2 | |||
| 3 | * buff-menu.el (Buffer-menu-delete-backwards, Buffer-menu-mode) | ||
| 4 | (buffer-menu): Doc fix (Bug#12294). | ||
| 5 | |||
| 1 | 2012-11-27 Roland Winkler <winkler@gnu.org> | 6 | 2012-11-27 Roland Winkler <winkler@gnu.org> |
| 2 | 7 | ||
| 3 | * calendar/diary-lib.el (diary-header-line-format): Use keybinding | 8 | * calendar/diary-lib.el (diary-header-line-format): Use keybinding |
diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el index 01035f8727d..3161973ba32 100644 --- a/lisp/buff-menu.el +++ b/lisp/buff-menu.el | |||
| @@ -204,31 +204,11 @@ commands.") | |||
| 204 | 204 | ||
| 205 | (define-derived-mode Buffer-menu-mode tabulated-list-mode "Buffer Menu" | 205 | (define-derived-mode Buffer-menu-mode tabulated-list-mode "Buffer Menu" |
| 206 | "Major mode for Buffer Menu buffers. | 206 | "Major mode for Buffer Menu buffers. |
| 207 | The Buffer Menu is invoked by the commands \\[list-buffers], \\[buffer-menu], and | 207 | The Buffer Menu is invoked by the commands \\[list-buffers], |
| 208 | \\[buffer-menu-other-window]. See `buffer-menu' for details." | 208 | \\[buffer-menu], and \\[buffer-menu-other-window]. |
| 209 | (set (make-local-variable 'buffer-stale-function) | 209 | See `buffer-menu' for a description of its contents. |
| 210 | (lambda (&optional _noconfirm) 'fast)) | ||
| 211 | (add-hook 'tabulated-list-revert-hook 'list-buffers--refresh nil t)) | ||
| 212 | |||
| 213 | (defun buffer-menu (&optional arg) | ||
| 214 | "Switch to the Buffer Menu. | ||
| 215 | By default, all buffers are listed except those whose names start | ||
| 216 | with a space (which are for internal use). With prefix argument | ||
| 217 | ARG, show only buffers that are visiting files. | ||
| 218 | |||
| 219 | The first column (denoted \"C\") shows \".\" for the buffer from | ||
| 220 | which you came. It shows \">\" for buffers you mark to be | ||
| 221 | displayed, and \"D\" for those you mark for deletion. | ||
| 222 | |||
| 223 | The \"R\" column has a \"%\" if the buffer is read-only. | ||
| 224 | The \"M\" column has a \"*\" if it is modified, or \"S\" if you | ||
| 225 | have marked it for saving. | ||
| 226 | |||
| 227 | After this come the buffer name, its size in characters, its | ||
| 228 | major mode, and the visited file name (if any). | ||
| 229 | |||
| 230 | 210 | ||
| 231 | In the Buffer Menu, the following commands are defined: | 211 | In Buffer Menu mode, the following commands are defined: |
| 232 | \\<Buffer-menu-mode-map> | 212 | \\<Buffer-menu-mode-map> |
| 233 | \\[quit-window] Remove the Buffer Menu from the display. | 213 | \\[quit-window] Remove the Buffer Menu from the display. |
| 234 | \\[Buffer-menu-this-window] Select current line's buffer in place of the buffer menu. | 214 | \\[Buffer-menu-this-window] Select current line's buffer in place of the buffer menu. |
| @@ -244,7 +224,7 @@ In the Buffer Menu, the following commands are defined: | |||
| 244 | \\[Buffer-menu-1-window] Select that buffer in full-frame window. | 224 | \\[Buffer-menu-1-window] Select that buffer in full-frame window. |
| 245 | \\[Buffer-menu-2-window] Select that buffer in one window, together with the | 225 | \\[Buffer-menu-2-window] Select that buffer in one window, together with the |
| 246 | buffer selected before this one in another window. | 226 | buffer selected before this one in another window. |
| 247 | \\[Buffer-menu-isearch-buffers] Incremental search in the marked buffers. | 227 | \\[Buffer-menu-isearch-buffers] Incremental search in the marked buffers. |
| 248 | \\[Buffer-menu-isearch-buffers-regexp] Isearch for regexp in the marked buffers. | 228 | \\[Buffer-menu-isearch-buffers-regexp] Isearch for regexp in the marked buffers. |
| 249 | \\[Buffer-menu-visit-tags-table] visit-tags-table this buffer. | 229 | \\[Buffer-menu-visit-tags-table] visit-tags-table this buffer. |
| 250 | \\[Buffer-menu-not-modified] Clear modified-flag on that buffer. | 230 | \\[Buffer-menu-not-modified] Clear modified-flag on that buffer. |
| @@ -259,6 +239,29 @@ In the Buffer Menu, the following commands are defined: | |||
| 259 | \\[revert-buffer] Update the list of buffers. | 239 | \\[revert-buffer] Update the list of buffers. |
| 260 | \\[Buffer-menu-toggle-files-only] Toggle whether the menu displays only file buffers. | 240 | \\[Buffer-menu-toggle-files-only] Toggle whether the menu displays only file buffers. |
| 261 | \\[Buffer-menu-bury] Bury the buffer listed on this line." | 241 | \\[Buffer-menu-bury] Bury the buffer listed on this line." |
| 242 | (set (make-local-variable 'buffer-stale-function) | ||
| 243 | (lambda (&optional _noconfirm) 'fast)) | ||
| 244 | (add-hook 'tabulated-list-revert-hook 'list-buffers--refresh nil t)) | ||
| 245 | |||
| 246 | (defun buffer-menu (&optional arg) | ||
| 247 | "Switch to the Buffer Menu. | ||
| 248 | By default, the Buffer Menu lists all buffers except those whose | ||
| 249 | names start with a space (which are for internal use). With | ||
| 250 | prefix argument ARG, show only buffers that are visiting files. | ||
| 251 | |||
| 252 | In the Buffer Menu, the first column (denoted \"C\") shows \".\" | ||
| 253 | for the buffer from which you came, \">\" for buffers you mark to | ||
| 254 | be displayed, and \"D\" for those you mark for deletion. | ||
| 255 | |||
| 256 | The \"R\" column has a \"%\" if the buffer is read-only. | ||
| 257 | The \"M\" column has a \"*\" if it is modified, or \"S\" if you | ||
| 258 | have marked it for saving. | ||
| 259 | |||
| 260 | The remaining columns show the buffer name, the buffer size in | ||
| 261 | characters, its major mode, and the visited file name (if any). | ||
| 262 | |||
| 263 | See `Buffer-menu-mode' for the keybindings available the Buffer | ||
| 264 | Menu." | ||
| 262 | (interactive "P") | 265 | (interactive "P") |
| 263 | (switch-to-buffer (list-buffers-noselect arg)) | 266 | (switch-to-buffer (list-buffers-noselect arg)) |
| 264 | (message | 267 | (message |
| @@ -280,7 +283,7 @@ ARG, show only buffers that are visiting files." | |||
| 280 | (defun list-buffers (&optional arg) | 283 | (defun list-buffers (&optional arg) |
| 281 | "Display a list of existing buffers. | 284 | "Display a list of existing buffers. |
| 282 | The list is displayed in a buffer named \"*Buffer List*\". | 285 | The list is displayed in a buffer named \"*Buffer List*\". |
| 283 | See `buffer-menu' for details about the Buffer Menu buffer. | 286 | See `buffer-menu' for a description of the Buffer Menu. |
| 284 | 287 | ||
| 285 | By default, all buffers are listed except those whose names start | 288 | By default, all buffers are listed except those whose names start |
| 286 | with a space (which are for internal use). With prefix argument | 289 | with a space (which are for internal use). With prefix argument |
| @@ -377,7 +380,9 @@ buffers to delete; a negative ARG means to delete backwards." | |||
| 377 | 380 | ||
| 378 | (defun Buffer-menu-delete-backwards (&optional arg) | 381 | (defun Buffer-menu-delete-backwards (&optional arg) |
| 379 | "Mark the buffer on this Buffer Menu line for deletion, and move up. | 382 | "Mark the buffer on this Buffer Menu line for deletion, and move up. |
| 380 | Prefix ARG means move that many lines." | 383 | A subsequent \\<Buffer-menu-mode-map>`\\[Buffer-menu-execute]' |
| 384 | command will delete the marked buffer. Prefix ARG means move | ||
| 385 | that many lines." | ||
| 381 | (interactive "p") | 386 | (interactive "p") |
| 382 | (Buffer-menu-delete (- (or arg 1)))) | 387 | (Buffer-menu-delete (- (or arg 1)))) |
| 383 | 388 | ||