From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Sat, 11 Oct 2008 12:56:26 +0000 (+0000)
Subject: (command-line): Revert 2008-09-26 change, not
X-Git-Tag: emacs-pretest-23.0.90~2566
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=32f1cc7b8caa6599c2c068833801a30e4f55e87d;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 36c296d8daa..d344508c421 100644
--- 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 8c2fd91c3f7..09b21a325a9 100644
--- 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