emacs: lisp/startup.el comparison

comparison lisp/startup.el @ 90602:b5c13d1564a9

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 437-446) - Update from CVS - lisp/url/url-methods.el: Fix format error when http_proxy is empty string - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 137-140) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-111

author	Miles Bader <miles@gnu.org>
date	Wed, 20 Sep 2006 06:04:23 +0000
parents	a1a25ac6c88a 980586804d04
children	bb0e318b7c53

comparison

equal deleted inserted replaced

-:a1a25ac6c88a
+:b5c13d1564a9
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Fancy splash screen
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (defvar fancy-splash-text
-'((:face variable-pitch
+'((:face (variable-pitch :weight bold)
-	   "You can do basic editing with the menu bar and scroll bar \
-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
 ""
 (concat " (" title ")"))
 "\n")))
 :face variable-pitch "\
 Emacs FAQ\tFrequently asked questions and answers
-Read the Emacs Manual\tView the Emacs manual using Info
+View Emacs Manual\tView the Emacs manual using Info
-\(Non)Warranty\tGNU Emacs comes with "
+Absence of Warranty\tGNU Emacs comes with "
 	   :face (variable-pitch :slant oblique)
 	   "ABSOLUTELY NO WARRANTY\n"
 	   :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
+(:face (variable-pitch :weight bold)
-	   "You can do basic editing with the menu bar and scroll bar \
+	 "Useful File menu items:\n"
-using the mouse.\n\n"
+	 :face variable-pitch "\
-	   :face (variable-pitch :weight bold)
+Exit Emacs\t\t(Or type Control-x followed by Control-c)
-	   "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
 "
 :face '(variable-pitch :foreground "red")
 (if (eq system-type 'gnu/linux)
 "GNU Emacs is one component of the GNU/Linux operating system."
 "GNU Emacs is one component of the GNU operating system."))
 (insert "\n")
+(fancy-splash-insert
+:face 'variable-pitch
+"You can do basic editing with the menu bar and scroll bar \
+using the mouse.\n\n")
 (if fancy-splash-outer-buffer
 (fancy-splash-insert
 :face 'variable-pitch
 (substitute-command-keys
 	(concat
 		  (regexp-quote (file-name-nondirectory
 				 auto-save-list-file-prefix)))
 	  t)
 	 (fancy-splash-insert :face '(variable-pitch :foreground "red")
 			      "\n\nIf an Emacs session crashed recently, "
-			      "type M-x recover-session RET\nto recover"
+			      "type Meta-x recover-session RET\nto recover"
 			      " the files you were editing."))))
 (defun fancy-splash-screens-1 (buffer)
 "Timer function displaying a splash screen."
 (when (> (float-time) fancy-splash-stop-time)
 (throw 'exit nil))
 (defun fancy-splash-screens (&optional hide-on-input)
 "Display fancy splash screens when Emacs starts."
-(setq fancy-splash-help-echo (startup-echo-area-message))
 (if hide-on-input
 (let ((old-hourglass display-hourglass)
 	    (fancy-splash-outer-buffer (current-buffer))
 	    splash-buffer
 	    (old-minor-mode-map-alist minor-mode-map-alist)
 	    (frame (fancy-splash-frame))
 	    timer)
 	(save-selected-window
 	  (select-frame frame)
 	  (switch-to-buffer "GNU Emacs")
-	  (setq tab-width 20)
 	  (setq splash-buffer (current-buffer))
 	  (catch 'stop-splashing
 	    (unwind-protect
-		(let ((map (make-sparse-keymap)))
+		(let ((map (make-sparse-keymap))
+		      (cursor-type nil))
 		  (use-local-map map)
 		  (define-key map [switch-frame] 'ignore)
 		  (define-key map [t] 'fancy-splash-default-action)
 		  (define-key map [mouse-movement] 'ignore)
 		  (define-key map [mode-line t] 'ignore)
-		  (setq cursor-type nil
+		  (setq display-hourglass nil
-			display-hourglass nil
 			minor-mode-map-alist nil
 			emulation-mode-map-alists nil
 			buffer-undo-list t
 			mode-line-format (propertize "---- %b %-"
 						     'face 'mode-line-buffer-id)
 			fancy-splash-stop-time (+ (float-time)
 						  fancy-splash-max-time)
 			timer (run-with-timer 0 fancy-splash-delay
 					      #'fancy-splash-screens-1
 					      splash-buffer))
+		  (message "%s" (startup-echo-area-message))
 		  (recursive-edit))
 	      (cancel-timer timer)
 	      (setq display-hourglass old-hourglass
 		    minor-mode-map-alist old-minor-mode-map-alist
 		    emulation-mode-map-alists old-emulation-mode-map-alists)
 Warning Warning!!!  Pure space overflow    !!!Warning Warning
 \(See the node Pure Storage in the Lisp manual for details.)\n"))
 (let (fancy-splash-outer-buffer)
 (fancy-splash-head)
 (dolist (text fancy-splash-text)
-	(apply #'fancy-splash-insert text))
+	(apply #'fancy-splash-insert text)
+	(insert "\n"))
+(skip-chars-backward "\n")
+(delete-region (point) (point-max))
+(insert "\n")
 (fancy-splash-tail)
 (set-buffer-modified-p nil)
 (setq buffer-read-only t)
 (if (and view-read-only (not view-mode))
 	  (view-mode-enter nil 'kill-buffer))
 (concat "\\`"
 (regexp-quote (file-name-nondirectory
 auto-save-list-file-prefix)))
 t)
 (insert "\n\nIf an Emacs session crashed recently, "
-"type M-x recover-session RET\nto recover"
+"type Meta-x recover-session RET\nto recover"
 " the files you were editing."))
 ;; Display the input that we set up in the buffer.
 (set-buffer-modified-p nil)
 	  (setq buffer-read-only t)

Mercurial > emacs

comparison lisp/startup.el @ 90602:b5c13d1564a9