Mercurial > emacs
changeset 98364:229b95df8c83
(command-line): Turn on menu-bar-mode and
tool-bar-mode when running as a daemon.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Fri, 26 Sep 2008 17:42:20 +0000 |
| parents | eabe88300df7 |
| children | e68fa8f78050 |
| files | lisp/ChangeLog lisp/startup.el |
| diffstat | 2 files changed, 20 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Sep 26 10:28:46 2008 +0000 +++ b/lisp/ChangeLog Fri Sep 26 17:42:20 2008 +0000 @@ -1,3 +1,8 @@ +2008-09-26 Dan Nicolaescu <dann@ics.uci.edu> + + * startup.el (command-line): Turn on menu-bar-mode and + tool-bar-mode when running as a daemon. + 2008-09-26 Eli Zaretskii <eliz@gnu.org> * makefile.w32-in ($(lisp)/progmodes/cc-mode.elc): Remove.
--- a/lisp/startup.el Fri Sep 26 10:28:46 2008 +0000 +++ b/lisp/startup.el Fri Sep 26 17:42:20 2008 +0000 @@ -899,19 +899,23 @@ '("off" "false"))))) (setq no-blinking-cursor t)) - ;; If frame was created with a menu bar, set menu-bar-mode on. - (unless (or noninteractive - emacs-basic-display - (and (memq initial-window-system '(x w32)) - (<= (frame-parameter nil 'menu-bar-lines) 0))) + ;; If we run as a daemon, or frame was created with a menu bar, set + ;; menu-bar-mode on. + (when (or (daemonp) + (not (or noninteractive + emacs-basic-display + (and (memq initial-window-system '(x w32)) + (<= (frame-parameter nil 'menu-bar-lines) 0))))) (menu-bar-mode 1)) - ;; If frame was created with a tool bar, switch tool-bar-mode on. - (unless (or noninteractive - emacs-basic-display - (not (display-graphic-p)) - (<= (frame-parameter nil 'tool-bar-lines) 0)) - (tool-bar-mode 1)) + ;; If we run as a daemon or frame was created with a tool bar, + ;; switch tool-bar-mode on. + (when (or (daemonp) + (not (or noninteractive + emacs-basic-display + (not (display-graphic-p)) + (<= (frame-parameter nil 'tool-bar-lines) 0)))) + (tool-bar-mode 1)) ;; Can't do this init in defcustom because the relevant variables ;; are not set.