From fb6fa03213f875dcac630578f1861a58cf1297cd Mon Sep 17 00:00:00 2001 From: yamaoka Date: Wed, 23 Aug 2000 12:29:17 +0000 Subject: [PATCH] (gnus-group-startup-message): Use `image-size' to simplify the program. --- ChangeLog | 3 +++ lisp/gnus.el | 24 +++++++++--------------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index e166eb6..9798fd9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2000-08-23 Katsumi Yamaoka + * 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 04924d4..5b2409d 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -763,13 +763,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)) "" @@ -777,15 +770,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 @@ -818,8 +813,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) -- 1.7.10.4