From: yamaoka <yamaoka>
Date: Wed, 23 Aug 2000 12:29:46 +0000 (+0000)
Subject: Synch with `t-gnus-6_14'.
X-Git-Tag: t-gnus-6_14-quimby-before-installer-changed-~132
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=358863b7f607e3ce5ff4be2cfbe92264753ea53a;p=elisp%2Fgnus.git-

Synch with `t-gnus-6_14'.
---

diff --git a/ChangeLog b/ChangeLog
index 026794e..7105510 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-08-23  Katsumi Yamaoka <yamaoka@jpl.org>
 
+	* lisp/gnus.el (gnus-group-startup-message): Use `image-size' to
+	simplify the program.
+
 	* lisp/gnus-group.el (gnus-group-rename-group): Inhibit renaming of
 	zombie or killed groups.
 
diff --git a/lisp/gnus.el b/lisp/gnus.el
index 3b42a3c..eb8203f 100644
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -784,13 +784,6 @@ be set in `.emacs' instead."
 			  :foreground ,(face-foreground 'gnus-splash-face)
 			  :background ,(face-background 'default))))))
 	   (when image
-	     (insert-image image)
-	     (goto-char (point-min))
-	     (insert-char
-	      ?\ ;; space
-	      (max 0 (let ((cw (frame-char-width)))
-		       (/ (+ (- (* (window-width) cw) 271) cw) 2 cw))))
-	     (goto-char (point-min))
 	     (insert gnus-product-name " " gnus-version-number
 		     (if (zerop (string-to-number gnus-revision-number))
 			 ""
@@ -798,15 +791,17 @@ be set in `.emacs' instead."
 		     " based on " gnus-original-product-name " v"
 		     gnus-original-version-number "\n")
 	     (goto-char (point-min))
+	     (insert-char ?\  (max 0 (/ (- (window-width)
+					   (gnus-point-at-eol)) 2)))
 	     (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 (max 0
-		       (let ((ch (frame-char-height)))
-			 (/ (+ (- (* (1- (window-height)) ch) 273) ch) 2 ch))))
+	     (let ((size (image-size image)))
+	       (insert-char ?\n (max 0 (round (- (window-height)
+						 (or y (cdr size)) 2) 2)))
+	       (insert-char ?\  (max 0 (round (- (window-width)
+						 (or x (car size))) 2)))
+	       (insert-image image))
 	     (setq gnus-simple-splash nil)
 	     t))))
    (t
@@ -839,8 +834,7 @@ be set in `.emacs' instead."
 	    " 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)))
+    (insert-char ?\  (max 0 (/ (- (window-width) (gnus-point-at-eol)) 2)))
     (forward-line 1)
     ;; And then hack it.
     (gnus-indent-rigidly (point) (point-max)