summaryrefslogtreecommitdiff
path: root/lisp/frame.el
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1994-06-25 18:20:55 +0000
committerRichard M. Stallman <rms@gnu.org>1994-06-25 18:20:55 +0000
commitd05077c301aa396b2fe138655be779a292641e2d (patch)
treedf7ecd943fa76df019e6b8e05e2f8a37c2c72948 /lisp/frame.el
parent2e76240623611da10f556f0ed845e2754574fec1 (diff)
downloademacs-d05077c301aa396b2fe138655be779a292641e2d.tar.gz
(frame-notice-user-settings): Make menu-bar-mode
and default-frame-alist consistent with each other.
Diffstat (limited to 'lisp/frame.el')
-rw-r--r--lisp/frame.el8
1 files changed, 8 insertions, 0 deletions
diff --git a/lisp/frame.el b/lisp/frame.el
index e76ac2f1fe7..524a9f3d8a5 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -166,6 +166,14 @@ These supersede the values given in `default-frame-alist'.")
;;; information to which we must react; do what needs to be done.
(defun frame-notice-user-settings ()
+ ;; Make menu-bar-mode and default-frame-alist consistent.
+ (let ((default (assq 'menu-bar-lines default-frame-alist)))
+ (if default
+ (setq menu-bar-mode (not (eq (cdr default) 0)))
+ (setq default-frame-alist
+ (cons (cons 'menu-bar-lines (if menu-bar-mode 1 0))
+ default-frame-alist))))
+
;; Creating and deleting frames may shift the selected frame around,
;; and thus the current buffer. Protect against that. We don't
;; want to use save-excursion here, because that may also try to set