Merge from emacs-23; up to 2010-06-03T22:16:02Z!dann@ics.uci.edu

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

diff --git a/lisp/ebuff-menu.el b/lisp/ebuff-menu.el
index 9f9129919dac372298cc1c6e09d97e1d0eefc70b..a906cf8516a76f2c1e567d5c18580a04b85bfe63 100644 (file)
--- a/lisp/ebuff-menu.el
+++ b/lisp/ebuff-menu.el
@@ -1,7 +1,6 @@
 ;;; ebuff-menu.el --- electric-buffer-list mode
 
-;; Copyright (C) 1985, 1986, 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1985-1986, 1994, 2001-2011  Free Software Foundation, Inc.
 
 ;; Author: Richard Mlynarik <mly@ai.mit.edu>
 ;; Maintainer: FSF
@@ -144,7 +143,7 @@ Run hooks in `electric-buffer-menu-mode-hook' on entry.
                                             (cons first last))))))
        (set-buffer buffer)
        (Buffer-menu-mode)
-       (bury-buffer buffer)
+       (bury-buffer)                ;Get rid of window, if dedicated.
        (message "")))
     (if select
        (progn (set-buffer buffer)
@@ -283,11 +282,10 @@ Return to Electric Buffer Menu when done."
          (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)))
+                 (line-beginning-position)
+                 (line-end-position))
     (overlay-put electric-buffer-overlay 'face 'highlight)))
 
 (provide 'ebuff-menu)
 
-;; arch-tag: 1d4509b3-eece-4d4f-95ea-77c83eaf0275
 ;;; ebuff-menu.el ends here