Show
Ignore:
Timestamp:
09/18/06 20:48:14 (2 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lisp/startup.el

    r4161 r4166  
    11141114 
    11151115(defvar fancy-splash-text 
    1116   '((:face variable-pitch 
    1117            "You can do basic editing with the menu bar and scroll bar \ 
    1118 using the mouse.\n\n" 
    1119            :face (variable-pitch :weight bold) 
     1116  '((:face (variable-pitch :weight bold) 
    11201117           "Important Help menu items:\n" 
    11211118           :face variable-pitch 
    …… 
    11411138           :face variable-pitch "\ 
    11421139Emacs FAQ\tFrequently asked questions and answers 
    1143 Read the Emacs Manual\tView the Emacs manual using Info 
    1144 \(Non)Warranty\tGNU Emacs comes with " 
     1140View Emacs Manual\tView the Emacs manual using Info 
     1141Absence of Warranty\tGNU Emacs comes with " 
    11451142           :face (variable-pitch :slant oblique) 
    11461143           "ABSOLUTELY NO WARRANTY\n" 
    …… 
    11501147Getting New Versions\tHow to obtain the latest version of Emacs 
    11511148More Manuals / Ordering Manuals       Buying printed manuals from the FSF\n") 
    1152   (:face variable-pitch 
    1153            "You can do basic editing with the menu bar and scroll bar \ 
    1154 using the mouse.\n\n" 
    1155            :face (variable-pitch :weight bold) 
    1156            "Useful File menu items:\n" 
    1157            :face variable-pitch "\ 
    1158 Exit Emacs\t(Or type Control-x followed by Control-c) 
     1149  (:face (variable-pitch :weight bold) 
     1150         "Useful File menu items:\n" 
     1151         :face variable-pitch "\ 
     1152Exit Emacs\t\t(Or type Control-x followed by Control-c) 
    11591153Recover Crashed Session\tRecover files you were editing before a crash 
     1154 
    11601155 
    11611156 
    …… 
    12661261     "GNU Emacs is one component of the GNU operating system.")) 
    12671262  (insert "\n") 
     1263  (fancy-splash-insert 
     1264   :face 'variable-pitch 
     1265   "You can do basic editing with the menu bar and scroll bar \ 
     1266using the mouse.\n\n") 
    12681267  (if fancy-splash-outer-buffer 
    12691268      (fancy-splash-insert 
    …… 
    13021301         (fancy-splash-insert :face '(variable-pitch :foreground "red") 
    13031302                              "\n\nIf an Emacs session crashed recently, " 
    1304                               "type M-x recover-session RET\nto recover" 
     1303                              "type Meta-x recover-session RET\nto recover" 
    13051304                              " the files you were editing.")))) 
    13061305 
    …… 
    13471346(defun fancy-splash-screens (&optional hide-on-input) 
    13481347  "Display fancy splash screens when Emacs starts." 
    1349   (setq fancy-splash-help-echo (startup-echo-area-message)) 
    13501348  (if hide-on-input 
    13511349      (let ((old-hourglass display-hourglass) 
    …… 
    13591357          (select-frame frame) 
    13601358          (switch-to-buffer "GNU Emacs") 
    1361           (setq tab-width 20) 
    13621359          (setq splash-buffer (current-buffer)) 
    13631360          (catch 'stop-splashing 
    13641361            (unwind-protect 
    1365                 (let ((map (make-sparse-keymap))) 
     1362                (let ((map (make-sparse-keymap)) 
     1363                      (cursor-type nil)) 
    13661364                  (use-local-map map) 
    13671365                  (define-key map [switch-frame] 'ignore) 
    …… 
    13691367                  (define-key map [mouse-movement] 'ignore) 
    13701368                  (define-key map [mode-line t] 'ignore) 
    1371                   (setq cursor-type nil 
    1372                         display-hourglass nil 
     1369                  (setq display-hourglass nil 
    13731370                        minor-mode-map-alist nil 
    13741371                        emulation-mode-map-alists nil 
    …… 
    13811378                                              #'fancy-splash-screens-1 
    13821379                                              splash-buffer)) 
     1380                  (message "%s" (startup-echo-area-message)) 
    13831381                  (recursive-edit)) 
    13841382              (cancel-timer timer) 
    …… 
    13871385                    emulation-mode-map-alists old-emulation-mode-map-alists) 
    13881386              (kill-buffer splash-buffer))))) 
    1389     ;; If hide-on-input is non-nil, don't hide the buffer on input. 
     1387    ;; If hide-on-input is nil, don't hide the buffer on input. 
    13901388    (if (or (window-minibuffer-p) 
    13911389            (window-dedicated-p (selected-window))) 
    …… 
    14011399      (fancy-splash-head) 
    14021400      (dolist (text fancy-splash-text) 
    1403         (apply #'fancy-splash-insert text)) 
     1401        (apply #'fancy-splash-insert text) 
     1402        (insert "\n")) 
     1403      (skip-chars-backward "\n") 
     1404      (delete-region (point) (point-max)) 
     1405      (insert "\n") 
    14041406      (fancy-splash-tail) 
    14051407      (set-buffer-modified-p nil) 
    …… 
    15781580                t) 
    15791581               (insert "\n\nIf an Emacs session crashed recently, " 
    1580                        "type M-x recover-session RET\nto recover" 
     1582                       "type Meta-x recover-session RET\nto recover" 
    15811583                       " the files you were editing.")) 
    15821584 
    …… 
    15871589              (view-mode-enter nil 'kill-buffer)) 
    15881590          (goto-char (point-min)) 
    1589           (if (or (window-minibuffer-p) 
    1590                  (window-dedicated-p (selected-window))) 
    1591               ;; If hide-on-input is nil, creating a new frame will 
    1592               ;; generate enough events that the subsequent `sit-for' 
    1593               ;; will immediately return anyway. 
    1594               (pop-to-buffer (current-buffer)) 
    1595             (if hide-on-input 
     1591          (if hide-on-input 
     1592              (if (or (window-minibuffer-p) 
     1593                      (window-dedicated-p (selected-window))) 
     1594                  ;; If hide-on-input is nil, creating a new frame will 
     1595                  ;; generate enough events that the subsequent `sit-for' 
     1596                  ;; will immediately return anyway. 
     1597                  nil ;; (pop-to-buffer (current-buffer)) 
    15961598                (save-window-excursion 
    1597                   (switch-to-buffer (current-buffer)) 
    1598                   (sit-for 120)) 
    1599               (switch-to-buffer (current-buffer))))) 
     1599                  (switch-to-buffer (current-buffer)) 
     1600                  (sit-for 120))) 
     1601          (condition-case nil 
     1602              (switch-to-buffer (current-buffer)) 
     1603            ;; In case the window is dedicated or something. 
     1604            (error (pop-to-buffer (current-buffer)))))) 
    16001605      ;; Unwind ... ensure splash buffer is killed 
    16011606      (if hide-on-input