[Emacs-diffs] Changes to emacs/lisp/startup.el,v

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   08/09/26 17:42:22

Index: startup.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/startup.el,v
retrieving revision 1.505
retrieving revision 1.506
diff -u -b -r1.505 -r1.506
--- startup.el  21 Sep 2008 23:32:51 -0000      1.505
+++ startup.el  26 Sep 2008 17:42:22 -0000      1.506
@@ -899,18 +899,22 @@
                                '("off" "false")))))
     (setq no-blinking-cursor t))
 
-  ;; If frame was created with a menu bar, set menu-bar-mode on.
-  (unless (or noninteractive
+  ;; 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)))
+                         (<= (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
+  ;; 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))
+                   (<= (frame-parameter nil 'tool-bar-lines) 0))))
     (tool-bar-mode 1))
 
   ;; Can't do this init in defcustom because the relevant variables