[Emacs-diffs] Changes to emacs/lisp/ebuff-menu.el [emacs-unicode-2]

[Miles Bader]

Index: emacs/lisp/ebuff-menu.el
diff -c emacs/lisp/ebuff-menu.el:1.31.4.1 emacs/lisp/ebuff-menu.el:1.31.4.2
*** emacs/lisp/ebuff-menu.el:1.31.4.1   Fri Apr 16 12:49:49 2004
--- emacs/lisp/ebuff-menu.el    Fri Nov 12 02:52:52 2004
***************
*** 38,46 ****
  
  (defvar electric-buffer-menu-mode-map nil)
  
  ;;;###autoload
  (defun electric-buffer-list (arg)
!   "Pops up a buffer describing the set of Emacs buffers.
  Vaguely like ITS lunar select buffer; combining typeoutoid buffer
  listing with menuoid buffer selection.
  
--- 38,49 ----
  
  (defvar electric-buffer-menu-mode-map nil)
  
+ (defvar electric-buffer-menu-mode-hook nil
+   "Normal hook run by `electric-buffer-list'.")
+ 
  ;;;###autoload
  (defun electric-buffer-list (arg)
!   "Pop up a buffer describing the set of Emacs buffers.
  Vaguely like ITS lunar select buffer; combining typeoutoid buffer
  listing with menuoid buffer selection.
  
***************
*** 50,58 ****
  
  To exit and select a new buffer, type a space when the cursor is on
  the appropriate line of the buffer-list window.  Other commands are
! much like those of buffer-menu-mode.
  
! Calls value of `electric-buffer-menu-mode-hook' on entry if non-nil.
  
  \\{electric-buffer-menu-mode-map}"
    (interactive "P")
--- 53,61 ----
  
  To exit and select a new buffer, type a space when the cursor is on
  the appropriate line of the buffer-list window.  Other commands are
! much like those of `Buffer-menu-mode'.
  
! Run hooks in `electric-buffer-menu-mode-hook' on entry.
  
  \\{electric-buffer-menu-mode-map}"
    (interactive "P")
***************
*** 144,151 ****
  
  \\{electric-buffer-menu-mode-map}
  
! Entry to this mode via command electric-buffer-list calls the value of
! electric-buffer-menu-mode-hook if it is non-nil."
    (kill-all-local-variables)
    (use-local-map electric-buffer-menu-mode-map)
    (setq mode-name "Electric Buffer Menu")
--- 147,154 ----
  
  \\{electric-buffer-menu-mode-map}
  
! Entry to this mode via command `electric-buffer-list' calls the value of
! `electric-buffer-menu-mode-hook'."
    (kill-all-local-variables)
    (use-local-map electric-buffer-menu-mode-map)
    (setq mode-name "Electric Buffer Menu")
***************
*** 223,230 ****
  
  (defun Electric-buffer-menu-select ()
    "Leave Electric Buffer Menu, selecting buffers and executing changes.
! Saves buffers marked \"S\".  Deletes buffers marked \"K\".
! Selects buffer at point and displays buffers marked \">\" in other windows."
    (interactive)
    (throw 'electric-buffer-menu-select (point)))
  
--- 226,233 ----
  
  (defun Electric-buffer-menu-select ()
    "Leave Electric Buffer Menu, selecting buffers and executing changes.
! Save buffers marked \"S\".  Delete buffers marked \"K\".
! Select buffer at point and display buffers marked \">\" in other windows."
    (interactive)
    (throw 'electric-buffer-menu-select (point)))
  
***************
*** 237,243 ****
  
  (defun Electric-buffer-menu-quit ()
    "Leave Electric Buffer Menu, restoring previous window configuration.
! Does not execute select, save, or delete commands."
    (interactive)
    (throw 'electric-buffer-menu-select nil))
  
--- 240,246 ----
  
  (defun Electric-buffer-menu-quit ()
    "Leave Electric Buffer Menu, restoring previous window configuration.
! Skip execution of select, save, and delete commands."
    (interactive)
    (throw 'electric-buffer-menu-select nil))
  
***************
*** 258,264 ****
  
  (defun Electric-buffer-menu-mode-view-buffer ()
    "View buffer on current line in Electric Buffer Menu.
! Returns to Electric Buffer Menu when done."
    (interactive)
    (let ((bufnam (Buffer-menu-buffer nil)))
      (if bufnam
--- 261,267 ----
  
  (defun Electric-buffer-menu-mode-view-buffer ()
    "View buffer on current line in Electric Buffer Menu.
! Return to Electric Buffer Menu when done."
    (interactive)
    (let ((bufnam (Buffer-menu-buffer nil)))
      (if bufnam