Mercurial > emacs

comparison lisp/menu-bar.el @ 109147:783986775ee8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
109146:6b22e0739484 109147:783986775ee8
1935 :group 'frames 1935 :group 'frames
1936 1936
1937 ;; Turn the menu-bars on all frames on or off. 1937 ;; Turn the menu-bars on all frames on or off.
1938 (let ((val (if menu-bar-mode 1 0))) 1938 (let ((val (if menu-bar-mode 1 0)))
1939 (dolist (frame (frame-list)) 1939 (dolist (frame (frame-list))
1940 (set-frame-parameter frame 'menu-bar-lines val))) 1940 (set-frame-parameter frame 'menu-bar-lines val))
1941 1941 ;; If the user has given `default-frame-alist' a `menu-bar-lines'
1942 ;; parameter, replace it.
1943 (if (assq 'menu-bar-lines default-frame-alist)
1944 (setq default-frame-alist
1945 (cons (cons 'menu-bar-lines val)
1946 (assq-delete-all 'menu-bar-lines
1947 default-frame-alist)))))
1942 ;; Make the message appear when Emacs is idle. We can not call message 1948 ;; Make the message appear when Emacs is idle. We can not call message
1943 ;; directly. The minor-mode message "Menu-bar mode disabled" comes 1949 ;; directly. The minor-mode message "Menu-bar mode disabled" comes
1944 ;; after this function returns, overwriting any message we do here. 1950 ;; after this function returns, overwriting any message we do here.
1945 (when (and (called-interactively-p 'interactive) (not menu-bar-mode)) 1951 (when (and (called-interactively-p 'interactive) (not menu-bar-mode))
1946 (run-with-idle-timer 0 nil 'message 1952 (run-with-idle-timer 0 nil 'message
1947 "Menu-bar mode disabled. Use M-x menu-bar-mode to make the menu bar appear.")) 1953 "Menu-bar mode disabled. Use M-x menu-bar-mode to make the menu bar appear.")))
1948 menu-bar-mode)
1949 1954
1950 (defun toggle-menu-bar-mode-from-frame (&optional arg) 1955 (defun toggle-menu-bar-mode-from-frame (&optional arg)
1951 "Toggle menu bar on or off, based on the status of the current frame. 1956 "Toggle menu bar on or off, based on the status of the current frame.
1952 See `menu-bar-mode' for more information." 1957 See `menu-bar-mode' for more information."
1953 (interactive (list (or current-prefix-arg 'toggle))) 1958 (interactive (list (or current-prefix-arg 'toggle)))