(dabbrev-case-replace, dabbrev-case-fold-search):

[gnu-emacs] / lisp / msb.el

diff --git a/lisp/msb.el b/lisp/msb.el
index 2b5a4c89231590a8922b50b6449c446086c02d1f..70361ea5fcd584086ff49f9ef996aec2c3e8135d 100644 (file)
--- a/lisp/msb.el
+++ b/lisp/msb.el
@@ -663,7 +663,7 @@ If the argument is left out or nil, then the current buffer is considered."
                     (format
                      "In msb-menu-cond, error for buffer `%s'."
                      (buffer-name buffer)))
-              (error msb--error))))))
+              (error "%s" msb--error))))))
 
 ;; Return (SORT-KEY TITLE . BUFFER-LIST) or nil if the
 ;; buffer-list is empty.
@@ -818,7 +818,7 @@ If the argument is left out or nil, then the current buffer is considered."
 (defun msb--toggle-menu-type ()
   (interactive)
   (setq msb-files-by-directory (not msb-files-by-directory))
-  (menu-bar-update-buffers))
+  (menu-bar-update-buffers t))
 
 (defun mouse-select-buffer (event)
   "Pop up several menus of buffers, for selection with the mouse.
@@ -986,15 +986,6 @@ variable `msb-menu-cond'."
                         (cddr buffers-menu))
                (or buffers-menu 'undefined)))))))
 
-(when (and (boundp 'menu-bar-update-hook)
-          (not (fboundp 'frame-or-buffer-changed-p)))
-  (defvar msb--buffer-count 0)
-  (defun frame-or-buffer-changed-p ()
-    (let ((count (length (buffer-list))))
-      (when (/= count msb--buffer-count)
-        (setq msb--buffer-count count)
-        t))))
-
 (unless (or (not (boundp 'menu-bar-update-hook))
            (memq 'menu-bar-update-buffers menu-bar-update-hook))
     (add-hook 'menu-bar-update-hook 'menu-bar-update-buffers))
@@ -1004,4 +995,8 @@ variable `msb-menu-cond'."
 
 (provide 'msb)
 (eval-after-load 'msb (run-hooks 'msb-after-load-hooks))
+
+;; Load the cl-extra library now, since we will certainly need it later.
+(mapc 'ignore nil)
+
 ;;; msb.el ends here