--- a/lisp/ChangeLog	Thu Mar 21 18:55:09 2002 +0000
+++ b/lisp/ChangeLog	Sat Mar 23 05:08:52 2002 +0000
@@ -1,3 +1,14 @@
+2002-03-20  John Paul Wallington  <jpw@shootybangbang.com>
+
+	* menubar-items.el (list-all-buffers): New function.
+	(list-all-buffers-function): New customizable variable.
+	(default-menubar): Replace list-buffers with list-all-buffers.
+
+2002-03-04  Simon Josefsson  <jas@extundo.com>
+
+	* files.el (auto-mode-alist): Move Sieve to a place where the
+	comment is more appropriate for it.
+
 2002-03-20  Ben Wing  <ben@xemacs.org>
 
 	* mule\mule-category.el:

--- a/lisp/files.el	Thu Mar 21 18:55:09 2002 +0000
+++ b/lisp/files.el	Sat Mar 23 05:08:52 2002 +0000
@@ -1260,6 +1260,7 @@
     ("\\.icn\\'" . icon-mode)
     ("\\.\\(?:[ckz]?sh\\|shar\\)\\'" . sh-mode)
     ("\\.[Pp][Rr][Oo]\\'" . idlwave-mode)
+    ("\\.si\\(v\\|eve\\)\\'" . sieve-mode)
     ;; #### Unix-specific!
     ("/\\.\\(?:bash_\\|z\\)?\\(profile\\|login\\|logout\\)\\'" . sh-mode)
     ("/\\.\\(?:[ckz]sh\\|bash\\|tcsh\\|es\\|xinit\\|startx\\)rc\\'" . sh-mode)
@@ -1306,7 +1307,6 @@
     ;; #### The following three are Unix-specific (but do we care?)
     ("/app-defaults/" . xrdb-mode)
     ("\\.[^/]*wm2?\\(?:rc\\)?\\'" . winmgr-mode)
-    ("\\.si\\(v\\|eve\\)\\'" . sieve-mode)
     ("\\.\\(?:jpe?g\\|JPE?G\\|png\\|PNG\\|gif\\|GIF\\|tiff?\\|TIFF?\\)\\'" . image-mode)
     )
 "Alist of filename patterns vs. corresponding major mode functions.

--- a/lisp/menubar-items.el	Thu Mar 21 18:55:09 2002 +0000
+++ b/lisp/menubar-items.el	Sat Mar 23 05:08:52 2002 +0000
@@ -1524,7 +1524,7 @@
       ["Go To %_Previous Buffer" switch-to-other-buffer]
       ["Go To %_Buffer..." switch-to-buffer]
       "----"
-      ["%_List All Buffers" list-buffers]
+      ["%_List All Buffers" list-all-buffers]
       ["%_Delete Buffer" kill-this-buffer
        :suffix (if put-buffer-names-in-file-menu (buffer-name) "")]
       "----"
@@ -1796,6 +1796,14 @@
 		 function)
   :group 'buffers-menu)
 
+(defcustom list-all-buffers-function 'list-buffers
+  "*Function that `list-all-buffers' calls."
+  :type '(choice (const list-buffers)
+		 (const ibuffer)
+		 (const ibuffer-other-window)
+		 function)
+  :group 'buffers-menu)
+
 (defun sort-buffers-menu-alphabetically (buf1 buf2)
   "For use as a value of `buffers-menu-sort-function'.
 Sorts the buffers in alphabetical order by name, but puts buffers beginning
@@ -1990,6 +1998,13 @@
     (append menu buffers)
     ))
 
+(defun list-all-buffers ()
+  "Display a list of buffers.  Calls `list-all-buffers-function'."
+  (interactive)
+  (funcall (if (fboundp list-all-buffers-function)
+	       list-all-buffers-function
+	     'list-buffers)))
+
 
 ;;; The Options menu