mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-01 11:14:55 +00:00
Code Issues Releases Activity

(command-line): Turn on menu-bar-mode and

Browse Source 
tool-bar-mode when running as a daemon.
This commit is contained in:
Dan Nicolaescu 2008-09-26 17:42:20 +00:00
parent 1ed6e04d06
commit b082f79218
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -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.

26
lisp/startup.el
View File

@ -899,19 +899,23 @@ opening the first frame (e.g. open a connection to an X server).")
'("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.