(command-line): Revert 2008-09-26 change, not

necessary anymore.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 36c296d8daa9d2f7e30e35df02585586714468b6..d344508c421f5df2d1716af1d0e25ba3cf3cd02e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-11  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * startup.el (command-line): Revert 2008-09-26 change, not
+       necessary anymore.
+
 2008-10-10  Andreas Schwab  <schwab@suse.de>
 
        * simple.el (minibuffer-complete-shell-command): Bind

diff --git a/lisp/startup.el b/lisp/startup.el
index 8c2fd91c3f721339e6530a3bb3b74702be2309e8..09b21a325a937f83abef798a4bd86b9f58ad6c42 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -889,13 +889,11 @@ opening the first frame (e.g. open a connection to an X server).")
                                '("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
-                    emacs-basic-display
-                    (and (memq initial-window-system '(x w32))
-                         (<= (frame-parameter nil 'menu-bar-lines) 0)))))
+  ;; 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)))
     (menu-bar-mode 1))
 
   ;; Enable tool-bar-mode if necessary.  Note that we might enable it