(defvar emacs-quick-startup nil)
+(defvar emacs-basic-display nil)
+
(defvar init-file-debug nil)
(defvar init-file-had-error nil)
(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))
;; 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))
(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))
"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
(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