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

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   08/10/11 12:56:30

Index: startup.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/startup.el,v
retrieving revision 1.511
retrieving revision 1.512
diff -u -b -r1.511 -r1.512
--- startup.el  10 Oct 2008 08:53:14 -0000      1.511
+++ startup.el  11 Oct 2008 12:56:29 -0000      1.512
@@ -889,13 +889,11 @@
                                '("off" "false")))))
     (setq no-blinking-cursor t))
 
-  ;; 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
+  ;; 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)))))
+                   (<= (frame-parameter nil 'menu-bar-lines) 0)))
     (menu-bar-mode 1))
 
   ;; Enable tool-bar-mode if necessary.  Note that we might enable it