diff options
| author | Gerd Moellmann <[email protected]> | 2000-09-26 11:52:01 +0000 |
|---|---|---|
| committer | Gerd Moellmann <[email protected]> | 2000-09-26 11:52:01 +0000 |
| commit | 61f2bcd7d1494f26c88e2d3f0821a4b5d2e86249 (patch) | |
| tree | 0d7946373cef5692760bded5e591419e943218b5 /lisp/frame.el | |
| parent | 31d929e56d19e9f6610a69b921742ef570a3ce95 (diff) | |
(frame-notice-user-settings): Make tool-bar-mode and
default-frame-alist consistent.
Diffstat (limited to 'lisp/frame.el')
| -rw-r--r-- | lisp/frame.el | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/lisp/frame.el b/lisp/frame.el index 263e80e2ff..9b404a7535 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -221,13 +221,22 @@ Pass it BUFFER as first arg, and (cdr ARGS) gives the rest of the args." "Act on user's init file settings of frame parameters. React to settings of `default-frame-alist', `initial-frame-alist' there." ;; Make menu-bar-mode and default-frame-alist consistent. - (if (boundp 'menu-bar-mode) - (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))))) + (when (boundp 'menu-bar-mode) + (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))))) + + ;; Make tool-bar-mode and default-frame-alist consistent. + (when (boundp 'tool-bar-mode) + (let ((default (assq 'tool-bar-lines default-frame-alist))) + (if default + (setq tool-bar-mode (not (eq (cdr default) 0))) + (setq default-frame-alist + (cons (cons 'tool-bar-lines (if tool-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 |