Fix typos in docstrings.

[gnu-emacs] / lisp / buff-menu.el

diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el
index 3d1aa4e9f38d8c0f33c93f24b65b00b38d58555c..9ec78309f9d3db2242c41db6ad9ea37c02d8dde9 100644 (file)
--- a/lisp/buff-menu.el
+++ b/lisp/buff-menu.el
@@ -1,7 +1,7 @@
 ;;; buff-menu.el --- buffer menu main function and support functions -*- coding:utf-8 -*-
 
 ;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: convenience
@@ -151,19 +151,19 @@ Auto Revert Mode.")
     (define-key map [follow-link] 'mouse-face)
     (define-key map (kbd "M-s a C-s")   'Buffer-menu-isearch-buffers)
     (define-key map (kbd "M-s a M-C-s") 'Buffer-menu-isearch-buffers-regexp)
-    (define-key map [menu-bar Buffer-menu-mode] (cons (purecopy "Buffer Menu") menu-map))
+    (define-key map [menu-bar Buffer-menu-mode] (cons (purecopy "Buffer-Menu") menu-map))
     (define-key menu-map [quit]
       `(menu-item ,(purecopy "Quit") quit-window
-                :help ,(purecopy "Mark buffer on this line to be deleted by x command")))
+                :help ,(purecopy "Remove the buffer menu from the display")))
     (define-key menu-map [rev]
       `(menu-item ,(purecopy "Refresh") revert-buffer
                 :help ,(purecopy "Refresh the *Buffer List* buffer contents")))
-    (define-key menu-map [s0] '("--"))
+    (define-key menu-map [s0] menu-bar-separator)
     (define-key menu-map [tf]
       `(menu-item ,(purecopy "Show only file buffers") Buffer-menu-toggle-files-only
                  :button (:toggle . Buffer-menu-files-only)
                  :help ,(purecopy "Toggle whether the current buffer-menu displays only file buffers")))
-    (define-key menu-map [s1] '("--"))
+    (define-key menu-map [s1] menu-bar-separator)
     ;; FIXME: The "Select" entries could use better names...
     (define-key menu-map [sel]
       `(menu-item ,(purecopy "Select marked") Buffer-menu-select
@@ -180,14 +180,14 @@ Auto Revert Mode.")
     (define-key menu-map [tw]
       `(menu-item ,(purecopy "Select in current window") Buffer-menu-this-window
                 :help ,(purecopy "Select this line's buffer in this window")))
-    (define-key menu-map [s2] '("--"))
+    (define-key menu-map [s2] menu-bar-separator)
     (define-key menu-map [is]
       `(menu-item ,(purecopy "Regexp Isearch marked buffers") Buffer-menu-isearch-buffers-regexp
                 :help ,(purecopy "Search for a regexp through all marked buffers using Isearch")))
     (define-key menu-map [ir]
       `(menu-item ,(purecopy "Isearch marked buffers") Buffer-menu-isearch-buffers
                 :help ,(purecopy "Search for a string through all marked buffers using Isearch")))
-    (define-key menu-map [s3] '("--"))
+    (define-key menu-map [s3] menu-bar-separator)
     (define-key menu-map [by]
       `(menu-item ,(purecopy "Bury") Buffer-menu-bury
                 :help ,(purecopy "Bury the buffer listed on this line")))
@@ -197,7 +197,7 @@ Auto Revert Mode.")
     (define-key menu-map [ex]
       `(menu-item ,(purecopy "Execute") Buffer-menu-execute
                 :help ,(purecopy "Save and/or delete buffers marked with s or k commands")))
-    (define-key menu-map [s4] '("--"))
+    (define-key menu-map [s4] menu-bar-separator)
     (define-key menu-map [delb]
       `(menu-item ,(purecopy "Mark for delete and move backwards") Buffer-menu-delete-backwards
                 :help ,(purecopy "Mark buffer on this line to be deleted by x command and move up one line")))
@@ -678,12 +678,13 @@ For more information, see the function `buffer-menu'."
     (setq name (copy-sequence name)))
   (add-text-properties 0 (length name) name-props name)
   (add-text-properties 0 (length size) size-props size)
-  (concat name
-         (make-string (- Buffer-menu-buffer+size-width
-                         (string-width name)
-                         (string-width size))
-                      ?\s)
-         size))
+  (let ((name+space-width (- Buffer-menu-buffer+size-width
+                            (string-width size))))
+    (concat name
+           (propertize (make-string (- name+space-width (string-width name))
+                                    ?\s)
+                       'display `(space :align-to ,(+ 4 name+space-width)))
+           size)))
 
 (defun Buffer-menu-sort (column)
   "Sort the buffer menu by COLUMN."
@@ -889,7 +890,7 @@ For more information, see the function `buffer-menu'."
                ;; This way we avoid problems with unusual buffer names.
                (let ((name (nth 2 buffer))
                      (size (int-to-string (nth 3 buffer))))
-                     (Buffer-menu-buffer+size name size
+                 (Buffer-menu-buffer+size name size
                         `(buffer-name ,name
                                       buffer ,(car buffer)
                                       font-lock-face buffer-menu-buffer