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

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      07/10/12 18:56:00

Index: startup.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/startup.el,v
retrieving revision 1.465
retrieving revision 1.466
diff -u -b -r1.465 -r1.466
--- startup.el  12 Oct 2007 06:28:54 -0000      1.465
+++ startup.el  12 Oct 2007 18:56:00 -0000      1.466
@@ -1450,7 +1450,7 @@
 
     (when concise
       (fancy-splash-insert
-       :face 'variable-pitch "\n\n"
+       :face 'variable-pitch "\n"
        :link '("Dismiss" (lambda (button)
                           (when startup-screen-inhibit-startup-screen
                             (customize-set-variable 'inhibit-startup-screen t)
@@ -1490,7 +1490,8 @@
   "Display fancy startup screen.
 If CONCISE is non-nil, display a concise version of the
 splash screen in another window."
-  (with-current-buffer (get-buffer-create "*GNU Emacs*")
+  (let ((splash-buffer (get-buffer-create "*GNU Emacs*")))
+    (with-current-buffer splash-buffer 
     (let ((inhibit-read-only t))
       (erase-buffer)
       (make-local-variable 'startup-screen-inhibit-startup-screen)
@@ -1506,18 +1507,22 @@
       (insert "\n")
       (fancy-startup-tail concise))
     (use-local-map splash-screen-keymap)
-    (setq tab-width 22)
+      (setq tab-width 22
+           buffer-read-only t)
     (set-buffer-modified-p nil)
-    (setq buffer-read-only t)
     (if (and view-read-only (not view-mode))
        (view-mode-enter nil 'kill-buffer))
-    (goto-char (point-min)))
-  (if (or (window-minibuffer-p)
-         (window-dedicated-p (selected-window)))
-      (pop-to-buffer (current-buffer)))
+      (goto-char (point-max)))
   (if concise
-      (display-buffer (get-buffer "*GNU Emacs*"))
-    (switch-to-buffer "*GNU Emacs*")))
+       (progn
+         (display-buffer splash-buffer)
+         ;; If the splash screen is in a split window, fit it.
+         (let ((window (get-buffer-window splash-buffer t)))
+           (or (null window)
+               (eq window (selected-window))
+               (eq window (next-window window))
+               (fit-window-to-buffer window))))
+      (switch-to-buffer splash-buffer))))
 
 (defun fancy-about-screen ()
   "Display fancy About screen."
@@ -2150,9 +2155,11 @@
                                  (expand-file-name
                                   (command-line-normalize-file-name orig-argi)
                                   dir)))
-                            (if (= file-count 1)
-                                (setq first-file-buffer (find-file file))
-                              (find-file-other-window file)))
+                            (cond ((= file-count 1)
+                                   (setq first-file-buffer (find-file file)))
+                                  (inhibit-startup-screen
+                                   (find-file-other-window file))
+                                  (t (find-file file))))
                           (or (zerop line)
                               (goto-line line))
                           (setq line 0)