mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-02-05 20:43:08 +00:00
Code Issues Releases Activity

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

Browse Source 
necessary anymore.
This commit is contained in:
Dan Nicolaescu 2008-10-11 12:56:26 +00:00
parent 1d3b373653
commit 32f1cc7b8c
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -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

12
lisp/startup.el
View File

@ -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