diff options
| author | Karoly Lorentey <[email protected]> | 2006-03-26 14:20:01 +0000 |
|---|---|---|
| committer | Karoly Lorentey <[email protected]> | 2006-03-26 14:20:01 +0000 |
| commit | 6a5af08f8d3bb831a78edf17e9c38813bbfbb6f8 (patch) | |
| tree | e4e263c9e6cc2f9310c9d1954eb016b0b7f2c22b /lisp/menu-bar.el | |
| parent | 095fe28140411c14e1e77d6c076655c06ca191a9 (diff) | |
Fix tool-bar and menu-bar toggles in Show/Hide menu to reflect the state of the current frame.
* lisp/tool-bar.el (toggle-tool-bar-mode-from-frame): New function.
* lisp/menu-bar.el (toggle-menu-bar-mode-from-frame): New function.
(menu-bar-showhide-menu): Use them to change "Menu-bar" and
"Tool-bar" toggles to reflect the state of the current frame.
git-archimport-id: [email protected]/emacs--multi-tty--0--patch-537
Diffstat (limited to 'lisp/menu-bar.el')
| -rw-r--r-- | lisp/menu-bar.el | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index 75d68d0baa..a9987d589f 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -935,15 +935,15 @@ mail status in mode line")) :button `(:toggle . tooltip-mode))) (define-key menu-bar-showhide-menu [menu-bar-mode] - '(menu-item "Menu-bar" menu-bar-mode + '(menu-item "Menu-bar" toggle-menu-bar-mode-from-frame :help "Toggle menu-bar on/off" - :button (:toggle . menu-bar-mode))) + :button (:toggle . (> (frame-parameter nil 'menu-bar-lines) 0)))) (define-key menu-bar-showhide-menu [showhide-tool-bar] - (list 'menu-item "Tool-bar" 'tool-bar-mode - :help "Turn tool-bar on/off" + (list 'menu-item "Tool-bar" 'toggle-tool-bar-mode-from-frame + :help "Toggle tool-bar on/off" :visible `(display-graphic-p) - :button `(:toggle . tool-bar-mode))) + :button `(:toggle . (> (frame-parameter nil 'tool-bar-lines) 0)))) (define-key menu-bar-options-menu [showhide] (list 'menu-item "Show/Hide" menu-bar-showhide-menu @@ -1778,6 +1778,14 @@ turn on menu bars; otherwise, turn off menu bars." "Menu-bar mode disabled. Use M-x menu-bar-mode to make the menu bar appear.")) menu-bar-mode) +(defun toggle-menu-bar-mode-from-frame (&optional arg) + "Toggle menu bar on or off, based on the status of the current frame. +See `menu-bar-mode' for more information." + (interactive (list (or current-prefix-arg 'toggle))) + (if (eq arg 'toggle) + (menu-bar-mode (if (> (frame-parameter nil 'menu-bar-lines) 0) 0 1)) + (menu-bar-mode arg))) + (provide 'menu-bar) ;;; arch-tag: 6e6a3c22-4ec4-4d3d-8190-583f8ef94ced |