diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2008-10-11 12:56:26 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2008-10-11 12:56:26 +0000 |
| commit | 32f1cc7b8caa6599c2c068833801a30e4f55e87d (patch) | |
| tree | f9407a9c5fbdac668d7a4541e407bda096cf48ba | |
| parent | 1d3b373653ee8d8c7438b5995f8be2e40fa4cba6 (diff) | |
| download | emacs-32f1cc7b8caa6599c2c068833801a30e4f55e87d.tar.gz | |
(command-line): Revert 2008-09-26 change, not
necessary anymore.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/startup.el | 12 |
2 files changed, 10 insertions, 7 deletions
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 |