Mercurial > emacs
diff lisp/menu-bar.el @ 109147:783986775ee8
Set default-frame-alist, if necessary, in menu/tool-bar-mode.
* menu-bar.el (menu-bar-mode):
* tool-bar.el (tool-bar-mode): Replace default-frame-alist element
if it has been set.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Mon, 05 Jul 2010 13:54:13 -0400 |
parents | 2f0720afc474 |
children | c9970d4bfd62 |
line wrap: on
line diff
--- a/lisp/menu-bar.el Mon Jul 05 12:42:50 2010 -0400 +++ b/lisp/menu-bar.el Mon Jul 05 13:54:13 2010 -0400 @@ -1937,15 +1937,20 @@ ;; Turn the menu-bars on all frames on or off. (let ((val (if menu-bar-mode 1 0))) (dolist (frame (frame-list)) - (set-frame-parameter frame 'menu-bar-lines val))) - + (set-frame-parameter frame 'menu-bar-lines val)) + ;; If the user has given `default-frame-alist' a `menu-bar-lines' + ;; parameter, replace it. + (if (assq 'menu-bar-lines default-frame-alist) + (setq default-frame-alist + (cons (cons 'menu-bar-lines val) + (assq-delete-all 'menu-bar-lines + default-frame-alist))))) ;; Make the message appear when Emacs is idle. We can not call message ;; directly. The minor-mode message "Menu-bar mode disabled" comes ;; after this function returns, overwriting any message we do here. (when (and (called-interactively-p 'interactive) (not menu-bar-mode)) (run-with-idle-timer 0 nil 'message - "Menu-bar mode disabled. Use M-x menu-bar-mode to make the menu bar appear.")) - menu-bar-mode) + "Menu-bar mode disabled. Use M-x menu-bar-mode to make the menu bar appear."))) (defun toggle-menu-bar-mode-from-frame (&optional arg) "Toggle menu bar on or off, based on the status of the current frame.