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

[Thien-Thi Nguyen]

Index: emacs/lisp/startup.el
diff -c emacs/lisp/startup.el:1.340 emacs/lisp/startup.el:1.341
*** emacs/lisp/startup.el:1.340 Sun Mar  6 00:48:45 2005
--- emacs/lisp/startup.el       Mon Apr  4 07:41:58 2005
***************
*** 1004,1011 ****
  using the mouse.\n\n"
           :face (variable-pitch :weight bold)
           "Important Help menu items:\n"
!          :face variable-pitch "\
! Emacs Tutorial\tLearn-by-doing tutorial for using Emacs efficiently
  Emacs FAQ\tFrequently asked questions and answers
  Read the Emacs Manual\tView the Emacs manual using Info
  \(Non)Warranty\tGNU Emacs comes with "
--- 1004,1030 ----
  using the mouse.\n\n"
           :face (variable-pitch :weight bold)
           "Important Help menu items:\n"
!          :face variable-pitch
!            (lambda ()
!              (let* ((en "TUTORIAL")
!                     (tut (or (get-language-info current-language-environment
!                                                 'tutorial)
!                              en))
!                     (title (with-temp-buffer
!                              (insert-file-contents
!                               (expand-file-name tut data-directory)
!                               nil 0 256)
!                              (search-forward ".")
!                              (buffer-substring (point-min) (1- (point))))))
!                ;; If there is a specific tutorial for the current language
!                ;; environment and it is not English, append its title.
!                (concat
!                 "Emacs Tutorial\tLearn how to use Emacs efficiently"
!                 (if (string= en tut)
!                     ""
!                   (concat " (" title ")"))
!                 "\n")))
!            :face variable-pitch "\
  Emacs FAQ\tFrequently asked questions and answers
  Read the Emacs Manual\tView the Emacs manual using Info
  \(Non)Warranty\tGNU Emacs comes with "
***************
*** 1069,1082 ****
  
  (defun fancy-splash-insert (&rest args)
    "Insert text into the current buffer, with faces.
! Arguments from ARGS should be either strings or pairs `:face FACE',
  where FACE is a valid face specification, as it can be used with
  `put-text-properties'."
    (let ((current-face nil))
      (while args
        (if (eq (car args) :face)
          (setq args (cdr args) current-face (car args))
!       (insert (propertize (car args)
                            'face current-face
                            'help-echo fancy-splash-help-echo)))
        (setq args (cdr args)))))
--- 1088,1105 ----
  
  (defun fancy-splash-insert (&rest args)
    "Insert text into the current buffer, with faces.
! Arguments from ARGS should be either strings, functions called
! with no args that return a string, or pairs `:face FACE',
  where FACE is a valid face specification, as it can be used with
  `put-text-properties'."
    (let ((current-face nil))
      (while args
        (if (eq (car args) :face)
          (setq args (cdr args) current-face (car args))
!       (insert (propertize (let ((it (car args)))
!                               (if (functionp it)
!                                   (funcall it)
!                                 it))
                            'face current-face
                            'help-echo fancy-splash-help-echo)))
        (setq args (cdr args)))))