diff options
| author | Karoly Lorentey <[email protected]> | 2006-03-26 13:57:43 +0000 |
|---|---|---|
| committer | Karoly Lorentey <[email protected]> | 2006-03-26 13:57:43 +0000 |
| commit | 095fe28140411c14e1e77d6c076655c06ca191a9 (patch) | |
| tree | f85f170cb35f2cd2f87a83e05785bc064fcc3eb6 /lisp/menu-bar.el | |
| parent | 9b7b2b9e3570fe12323c9b5e88447d74eec0f4f8 (diff) | |
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
* lisp/faces.el (x-create-frame-with-faces): Remove bogus check for first
frame. Call `tool-bar-setup'.
* lisp/frame.el (window-system-default-frame-alist): Enhance doc string.
* lisp/frame.el (frame-notice-user-settings): Don't put 'tool-bar-lines
in `default-frame-alist' when initial frame is on a tty.
* lisp/frame.el (modify-all-frames-parameters): Simplify using
`assq-delete-all'. Remove specified parameters from
`window-system-default-frame-alist'.
* lisp/fringe.el (set-fringe-mode): Simplify and fix using
`modify-all-frames-parameters'.
* lisp/menu-bar.el (menu-bar-mode): Ditto.
* lisp/scroll-bar.el (set-scroll-bar-mode): Ditto.
* lisp/tool-bar.el (tool-bar-mode): Ditto. Remove 'tool-bar-map length
check before calling `tool-bar-setup'.
* lisp/tool-bar.el (tool-bar-setup): New variable.
* lisp/tool-bar.el (tool-bar-setup): Use it to guard against multiple
calls. Add optional frame parameter, and select that frame before
adding items.
* src/frame.c (syms_of_frame): Enhance doc string of `default-frame-alist'.
git-archimport-id: [email protected]/emacs--multi-tty--0--patch-536
Diffstat (limited to 'lisp/menu-bar.el')
| -rw-r--r-- | lisp/menu-bar.el | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index 0ec4339f82..75d68d0baa 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -1765,18 +1765,10 @@ turn on menu bars; otherwise, turn off menu bars." :init-value nil :global t :group 'frames + ;; Make menu-bar-mode and default-frame-alist consistent. - (let ((lines (if menu-bar-mode 1 0))) - ;; Alter existing frames... - (mapc (lambda (frame) - (modify-frame-parameters frame - (list (cons 'menu-bar-lines lines)))) - (frame-list)) - ;; ...and future ones. - (let ((elt (assq 'menu-bar-lines default-frame-alist))) - (if elt - (setcdr elt lines) - (add-to-list 'default-frame-alist (cons 'menu-bar-lines lines))))) + (modify-all-frames-parameters (list (cons 'menu-bar-lines + (if menu-bar-mode 1 0)))) ;; Make the message appear when Emacs is idle. We can not call message ;; directly. The minor-mode message "Menu-bar mode disabled" comes |