From: yamaoka <yamaoka>
Date: Wed, 6 Oct 1999 07:02:47 +0000 (+0000)
Subject: (gnus-xmas-group-startup-message): Display version string; fix glyph position.
X-Git-Tag: t-gnus-6_13_2-03~3
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=35a1e0b0222d39dcfdc989108663cabd0fb5174a;p=elisp%2Fgnus.git-

(gnus-xmas-group-startup-message): Display version string; fix glyph position.
---

diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el
index 53e7432..2aed9fd 100644
--- a/lisp/gnus-xmas.el
+++ b/lisp/gnus-xmas.el
@@ -623,7 +623,10 @@ the resulting string may be narrower than END-COLUMN.
 			     ("background" . ,(face-background 'default)))])
 			 ((featurep 'xbm)
 			  `[xbm :file ,logo-xbm])
-			 (t [nothing])))))
+			 (t [nothing]))))
+	   (wpheight (window-pixel-height))
+	   (rest (1- (/ (* (- wpheight (glyph-height glyph)) (window-height))
+			wpheight 2))))
       (insert " ")
       (set-extent-begin-glyph (make-extent (point) (point)) glyph)
       (goto-char (point-min))
@@ -631,15 +634,23 @@ the resulting string may be narrower than END-COLUMN.
 	(insert (make-string (/ (max (- (window-width) (or x 35)) 0) 2)
 			     ?\ ))
 	(forward-line 1))
-      (setq gnus-simple-splash nil))
-    (goto-char (point-min))
-    (let* ((pheight (+ 20 (count-lines (point-min) (point-max))))
-	   (wheight (window-height))
-	   (rest (- wheight pheight)))
-      (insert (make-string (max 0 (* 2 (/ rest 3))) ?\n))))
+      (setq gnus-simple-splash nil)
+      (goto-char (point-min))
+      (insert gnus-product-name " " gnus-version-number
+	      (if (zerop (string-to-number gnus-revision-number))
+		  ""
+		(concat " (r" gnus-revision-number ") "))
+	      "based on " gnus-original-product-name " v"
+	      gnus-original-version-number "\n")
+      (goto-char (point-min))
+      (put-text-property (point) (gnus-point-at-eol) 'face 'gnus-splash-face)
+      (insert-char ?\ ; space
+		   (max 0 (/ (- (window-width) (gnus-point-at-eol)) 2)))
+      (forward-line 1)
+      (insert-char ?\n rest)
+      (set-window-start (selected-window) (point-min))))
    (t
-    (insert
-     (format "              %s
+    (insert "
           _    ___ _             _
           _ ___ __ ___  __    _ ___
           __   _     ___    __  ___
@@ -659,9 +670,20 @@ the resulting string may be narrower than END-COLUMN.
           __
 
 "
-	     ""))
+	    )
+    (goto-char (point-min))
+    (insert gnus-product-name " " gnus-version-number
+	    (if (zerop (string-to-number gnus-revision-number))
+		""
+	      (concat " (r" gnus-revision-number ") "))
+	    "based on " gnus-original-product-name " v"
+	    gnus-original-version-number)
+    (goto-char (point-min))
+    (insert-char ?\ ; space
+		 (max 0 (/ (- (window-width) (gnus-point-at-eol)) 2)))
+    (forward-line 1)
     ;; And then hack it.
-    (gnus-indent-rigidly (point-min) (point-max)
+    (gnus-indent-rigidly (point) (point-max)
 			 (/ (max (- (window-width) (or x 46)) 0) 2))
     (goto-char (point-min))
     (forward-line 1)