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

[Juanma Barranquero]

Index: emacs/lisp/startup.el
diff -c emacs/lisp/startup.el:1.367 emacs/lisp/startup.el:1.368
*** emacs/lisp/startup.el:1.367 Thu Jul 14 00:57:45 2005
--- emacs/lisp/startup.el       Fri Jul 15 14:47:06 2005
***************
*** 184,192 ****
  
  (defvar keyboard-type nil
    "The brand of keyboard you are using.
! This variable is used to define
! the proper function and keypad keys for use under X.  It is used in a
! fashion analogous to the environment variable TERM.")
  
  (defvar window-setup-hook nil
    "Normal hook run to initialize window system display.
--- 184,192 ----
  
  (defvar keyboard-type nil
    "The brand of keyboard you are using.
! This variable is used to define the proper function and keypad
! keys for use under X.  It is used in a fashion analogous to the
! environment variable TERM.")
  
  (defvar window-setup-hook nil
    "Normal hook run to initialize window system display.
***************
*** 234,240 ****
  This variable is defined for customization so as to make
  it visible in the relevant context.  However, actually customizing it
  is not allowed, since it would not work anyway.  The only way to set
! this variable usefully is to set it during while building and dumping Emacs."
    :type '(choice (const :tag "none" nil) string)
    :group 'initialization
    :initialize 'custom-initialize-default
--- 234,240 ----
  This variable is defined for customization so as to make
  it visible in the relevant context.  However, actually customizing it
  is not allowed, since it would not work anyway.  The only way to set
! this variable usefully is to set it while building and dumping Emacs."
    :type '(choice (const :tag "none" nil) string)
    :group 'initialization
    :initialize 'custom-initialize-default
***************
*** 664,672 ****
      ;; processed.  This is consistent with the way main in emacs.c
      ;; does things.
      (while (and (not done) args)
!       (let* ((longopts '(("--no-init-file") ("--no-site-file") ("--user")
!                          ("--debug-init") ("--iconic") ("--icon-type")
!                        ("--no-blinking-cursor") ("--bare-bones")))
               (argi (pop args))
               (orig-argi argi)
               argval)
--- 664,672 ----
      ;; processed.  This is consistent with the way main in emacs.c
      ;; does things.
      (while (and (not done) args)
!       (let* ((longopts '(("--no-init-file") ("--no-site-file") 
("--debug-init")
!                          ("--user") ("--iconic") ("--icon-type") ("--quick")
!                        ("--no-blinking-cursor") ("--basic-display")))
               (argi (pop args))
               (orig-argi argi)
               argval)
***************
*** 1057,1062 ****
--- 1057,1063 ----
           :face variable-pitch
           "\
  Copying Conditions\tConditions for redistributing and changing Emacs
+ Getting New Versions\tHow to obtain the latest version of Emacs
  More Manuals / Ordering Manuals       Buying printed manuals from the FSF\n")
    (:face variable-pitch
           "You can do basic editing with the menu bar and scroll bar \
***************
*** 1342,1361 ****
  
  Useful File menu items:
  Exit Emacs            (or type Control-x followed by Control-c)
! Recover Session               recover files you were editing before a crash
  
  Important Help menu items:
! Emacs Tutorial                Learn-by-doing tutorial for using Emacs 
efficiently.
  Emacs FAQ             Frequently asked questions and answers
  Read the Emacs Manual View the Emacs manual using Info
  \(Non)Warranty                GNU Emacs comes with ABSOLUTELY NO WARRANTY
! Copying Conditions    Conditions for redistributing and changing Emacs.
! Getting New Versions  How to obtain the latest version of Emacs.
! More Manuals / Ordering Manuals    How to order printed manuals from the FSF.
  ")
                  (insert "\n\n" (emacs-version)
                          "
! Copyright (C) 2004 Free Software Foundation, Inc."))
  
              ;; No mouse menus, so give help using kbd commands.
  
--- 1343,1362 ----
  
  Useful File menu items:
  Exit Emacs            (or type Control-x followed by Control-c)
! Recover Session               Recover files you were editing before a crash
  
  Important Help menu items:
! Emacs Tutorial                Learn how to use Emacs efficiently
  Emacs FAQ             Frequently asked questions and answers
  Read the Emacs Manual View the Emacs manual using Info
  \(Non)Warranty                GNU Emacs comes with ABSOLUTELY NO WARRANTY
! Copying Conditions    Conditions for redistributing and changing Emacs
! Getting New Versions  How to obtain the latest version of Emacs
! More Manuals / Ordering Manuals    How to order printed manuals from the FSF
  ")
                  (insert "\n\n" (emacs-version)
                          "
! Copyright (C) 2005 Free Software Foundation, Inc."))
  
              ;; No mouse menus, so give help using kbd commands.
  
***************
*** 1403,1409 ****
  
              (insert "\n\n" (emacs-version)
                      "
! Copyright (C) 2004 Free Software Foundation, Inc.")
  
              (if (and (eq (key-binding "\C-h\C-c") 'describe-copying)
                       (eq (key-binding "\C-h\C-d") 'describe-distribution)
--- 1404,1410 ----
  
              (insert "\n\n" (emacs-version)
                      "
! Copyright (C) 2005 Free Software Foundation, Inc.")
  
              (if (and (eq (key-binding "\C-h\C-c") 'describe-copying)
                       (eq (key-binding "\C-h\C-d") 'describe-distribution)