[Emacs-diffs] Changes to emacs/lisp/startup.el

[Richard M . Stallman]

Index: emacs/lisp/startup.el
diff -c emacs/lisp/startup.el:1.344 emacs/lisp/startup.el:1.345
*** emacs/lisp/startup.el:1.344 Thu Apr  7 11:09:34 2005
--- emacs/lisp/startup.el       Sun Apr 10 23:36:22 2005
***************
*** 277,282 ****
--- 277,284 ----
  
  (defvar emacs-quick-startup nil)
  
+ (defvar emacs-basic-display nil)
+ 
  (defvar init-file-debug nil)
  
  (defvar init-file-had-error nil)
***************
*** 677,687 ****
                (setq argval nil
                        argi orig-argi)))))
        (cond
!        ((member argi '("-Q" "-bare-bones"))
          (setq init-file-user nil
                site-run-file nil
!               no-blinking-cursor t
!               emacs-quick-startup t)
          (push '(vertical-scroll-bars . nil) initial-frame-alist))
         ((member argi '("-q" "-no-init-file"))
          (setq init-file-user nil))
--- 679,691 ----
                (setq argval nil
                        argi orig-argi)))))
        (cond
!        ((member argi '("-Q" "-quick"))
          (setq init-file-user nil
                site-run-file nil
!               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,729 ****
  
    ;; If frame was created with a menu bar, set menu-bar-mode on.
    (unless (or noninteractive
!             emacs-quick-startup
                (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
                (not (display-graphic-p))
                (<= (frame-parameter nil 'tool-bar-lines) 0))
      (tool-bar-mode 1))
--- 720,733 ----
  
    ;; If frame was created with a menu bar, set menu-bar-mode on.
    (unless (or noninteractive
!             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-basic-display
                (not (display-graphic-p))
                (<= (frame-parameter nil 'tool-bar-lines) 0))
      (tool-bar-mode 1))
***************
*** 734,740 ****
    (custom-reevaluate-setting 'normal-erase-is-backspace)
  
    (unless (or noninteractive
!             emacs-quick-startup
                (not (display-graphic-p))
                (not (fboundp 'x-show-tip)))
      (tooltip-mode 1))
--- 738,744 ----
    (custom-reevaluate-setting 'normal-erase-is-backspace)
  
    (unless (or noninteractive
!             emacs-basic-display
                (not (display-graphic-p))
                (not (fboundp 'x-show-tip)))
      (tooltip-mode 1))
***************
*** 1041,1047 ****
           "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
  
  
  
--- 1045,1051 ----
           "Useful File menu items:\n"
           :face variable-pitch "\
  Exit Emacs\t(Or type Control-x followed by Control-c)
! Recover Crashed Session\tRecover files you were editing before a crash
  
  
  
***************
*** 1165,1171 ****
                         (emacs-version)
                         "\n"
                         :face '(variable-pitch :height 0.5)
!                        "Copyright (C) 2004 Free Software Foundation, Inc.")
      (and auto-save-list-file-prefix
         ;; Don't signal an error if the
         ;; directory for auto-save-list files
--- 1169,1175 ----
                         (emacs-version)
                         "\n"
                         :face '(variable-pitch :height 0.5)
!                        "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