Merged in changes from CVS trunk.

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

diff --git a/lisp/ebuff-menu.el b/lisp/ebuff-menu.el
index ecadc2c732221f890f5385cd7a99481b68ee1c9c..bed46c7161816faed00d76a17815f74703ab09b3 100644 (file)
--- a/lisp/ebuff-menu.el
+++ b/lisp/ebuff-menu.el
@@ -3,6 +3,8 @@
 ;; Copyright (C) 1985, 1986, 1994 Free Software Foundation, Inc.
 
 ;; Author: Richard Mlynarik <mly@ai.mit.edu>
+;; Maintainer: FSF
+;; Keywords: convenience
 
 ;; This file is part of GNU Emacs.
 
@@ -17,8 +19,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
 
 ;;; Commentary:
 
@@ -51,16 +54,17 @@ 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}" 
+\\{electric-buffer-menu-mode-map}"
   (interactive "P")
   (let (select buffer)
     (save-window-excursion
-      (save-window-excursion (list-buffers arg))
-      (setq buffer (window-buffer (Electric-pop-up-window "*Buffer List*")))
+      (setq buffer (list-buffers-noselect arg))
+      (Electric-pop-up-window buffer)
       (unwind-protect
          (progn
            (set-buffer buffer)
            (Electric-buffer-menu-mode)
+           (electric-buffer-update-highlight)
            (setq select
                  (catch 'electric-buffer-menu-select
                    (message "<<< Press Return to bury the buffer list >>>")
@@ -68,14 +72,20 @@ Calls value of `electric-buffer-menu-mode-hook' on entry if non-nil.
                            ?\ )
                        (progn (setq unread-command-events nil)
                               (throw 'electric-buffer-menu-select nil)))
-                   (let ((first (progn (goto-char (point-min))
-                                       (forward-line 2)
+                   (let ((start-point (point))
+                         (first (progn (goto-char (point-min))
+                                       (unless Buffer-menu-use-header-line
+                                         (forward-line 2))
                                        (point)))
                          (last (progn (goto-char (point-max))
                                       (forward-line -1)
                                       (point)))
                          (goal-column 0))
-                     (goto-char first)
+                     ;; Use start-point if it is meaningful.
+                     (goto-char (if (or (< start-point first)
+                                        (> start-point last))
+                                    first
+                                  start-point))
                      (Electric-command-loop 'electric-buffer-menu-select
                                             nil
                                             t
@@ -103,12 +113,14 @@ Calls value of `electric-buffer-menu-mode-hook' on entry if non-nil.
         (signal (car condition) (cdr condition)))
        ((< (point) (car state))
         (goto-char (point-min))
-        (forward-line 2))
+        (unless Buffer-menu-use-header-line
+          (forward-line 2)))
        ((> (point) (cdr state))
         (goto-char (point-max))
         (forward-line -1)
         (if (pos-visible-in-window-p (point-max))
-            (recenter -1)))))
+            (recenter -1))))
+  (electric-buffer-update-highlight))
 
 (put 'Electric-buffer-menu-mode 'mode-class 'special)
 (defun Electric-buffer-menu-mode ()
@@ -152,10 +164,9 @@ electric-buffer-menu-mode-hook if it is non-nil."
 (put 'Electric-buffer-menu-undefined 'suppress-keymap t)
 (if electric-buffer-menu-mode-map
     nil
-  (let ((map (make-keymap)) (submap (make-keymap)))
+  (let ((map (make-keymap)))
     (fillarray (car (cdr map)) 'Electric-buffer-menu-undefined)
-    (define-key map "\e" submap)
-    (fillarray (car (cdr submap)) 'Electric-buffer-menu-undefined)
+    (define-key map "\e" nil)
     (define-key map "\C-z" 'suspend-emacs)
     (define-key map "v" 'Electric-buffer-menu-mode-view-buffer)
     (define-key map (char-to-string help-char) 'Helper-help)
@@ -200,7 +211,7 @@ electric-buffer-menu-mode-hook if it is non-nil."
     (define-key map [escape escape escape] 'Electric-buffer-menu-quit)
     (define-key map [mouse-2] 'Electric-buffer-menu-mouse-select)
     (setq electric-buffer-menu-mode-map map)))
- 
+
 (defun Electric-buffer-menu-exit ()
   (interactive)
   (setq unread-command-events (listify-key-sequence (this-command-keys)))
@@ -233,7 +244,8 @@ Does not execute select, save, or delete commands."
 (defun Electric-buffer-menu-undefined ()
   (interactive)
   (ding)
-  (message (if (and (eq (key-binding "\C-c\C-c") 'Electric-buffer-menu-quit)
+  (message "%s"
+          (if (and (eq (key-binding "\C-c\C-c") 'Electric-buffer-menu-quit)
                    (eq (key-binding " ") 'Electric-buffer-menu-select)
                    (eq (key-binding (char-to-string help-char)) 'Helper-help)
                    (eq (key-binding "?") 'Helper-describe-bindings))
@@ -255,4 +267,20 @@ Returns to Electric Buffer Menu when done."
       (message "Buffer %s does not exist!" bufnam)
       (sit-for 4))))
 
+(defvar electric-buffer-overlay nil)
+(defun electric-buffer-update-highlight ()
+  (when (eq major-mode 'Electric-buffer-menu-mode)
+    ;; Make sure we have an overlay to use.
+    (or electric-buffer-overlay
+       (progn
+         (make-local-variable 'electric-buffer-overlay)
+         (setq electric-buffer-overlay (make-overlay (point) (point)))))
+    (move-overlay electric-buffer-overlay
+                 (save-excursion (beginning-of-line) (point))
+                 (save-excursion (end-of-line) (point)))
+    (overlay-put electric-buffer-overlay 'face 'highlight)))
+
+(provide 'ebuff-menu)
+
+;;; arch-tag: 1d4509b3-eece-4d4f-95ea-77c83eaf0275
 ;;; ebuff-menu.el ends here