changeset 98613:38e69a51ceaf

(command-line): Revert 2008-09-26 change, not necessary anymore.
author Dan Nicolaescu <dann@ics.uci.edu>
date Sat, 11 Oct 2008 12:56:26 +0000
parents cd7bedfff49a
children 4890ebba8627
files lisp/ChangeLog lisp/startup.el
diffstat 2 files changed, 10 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Fri Oct 10 18:22:01 2008 +0000
+++ b/lisp/ChangeLog	Sat Oct 11 12:56:26 2008 +0000
@@ -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
--- a/lisp/startup.el	Fri Oct 10 18:22:01 2008 +0000
+++ b/lisp/startup.el	Sat Oct 11 12:56:26 2008 +0000
@@ -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
-		     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