mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-30 08:09:04 +00:00
Code Issues Releases Activity

(fancy-splash-tail): Update copyright year.

Browse Source 
(command-line): Split part of -Q into -D.
(emacs-basic-display): New defvar.
(fancy-splash-text): Correct name of menu item.
This commit is contained in:
Richard M. Stallman 2005-04-10 23:36:22 +00:00
parent 6b98170fcf
commit dc58296ddc
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lisp/startup.el
View File

@ -277,6 +277,8 @@ from being initialized."
(defvar emacs-quick-startup nil)
(defvar emacs-basic-display nil)
(defvar init-file-debug nil)
(defvar init-file-had-error nil)
@ -677,11 +679,13 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
(setq argval nil
argi orig-argi)))))
(cond
((member argi '("-Q" "-bare-bones"))
((member argi '("-Q" "-quick"))
(setq init-file-user nil
site-run-file nil
no-blinking-cursor t
emacs-quick-startup t)
emacs-quick-startup t))
((member argi '("-D" "-basic-display"))
(setq no-blinking-cursor t
emacs-basic-display t)
(push '(vertical-scroll-bars . nil) initial-frame-alist))
((member argi '("-q" "-no-init-file"))
(setq init-file-user nil))
@ -716,14 +720,14 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
;; If frame was created with a menu bar, set menu-bar-mode on.
(unless (or noninteractive
emacs-quick-startup
emacs-basic-display
(and (memq window-system '(x w32))
(<= (frame-parameter nil 'menu-bar-lines) 0)))
(menu-bar-mode 1))
;; If frame was created with a tool bar, switch tool-bar-mode on.
(unless (or noninteractive
emacs-quick-startup
emacs-basic-display
(not (display-graphic-p))
(<= (frame-parameter nil 'tool-bar-lines) 0))
(tool-bar-mode 1))
@ -734,7 +738,7 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
(custom-reevaluate-setting 'normal-erase-is-backspace)
(unless (or noninteractive
emacs-quick-startup
emacs-basic-display
(not (display-graphic-p))
(not (fboundp 'x-show-tip)))
(tooltip-mode 1))
@ -1041,7 +1045,7 @@ using the mouse.\n\n"
"Useful File menu items:\n"
:face variable-pitch "\
Exit Emacs\t(Or type Control-x followed by Control-c)
Recover Session\tRecover files you were editing before a crash
Recover Crashed Session\tRecover files you were editing before a crash
@ -1165,7 +1169,7 @@ where FACE is a valid face specification, as it can be used with
(emacs-version)
"\n"
:face '(variable-pitch :height 0.5)
"Copyright (C) 2004 Free Software Foundation, Inc.")
"Copyright (C) 2005 Free Software Foundation, Inc.")
(and auto-save-list-file-prefix
;; Don't signal an error if the
;; directory for auto-save-list files