From d229cffba47b5d173f8c3df1da454fce5ed618f1 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Thu, 5 Oct 2000 13:11:42 +0000 Subject: [PATCH] Sync with `t-gnus-6_14' and Gnus. --- ChangeLog | 11 ++++++++++- lisp/ChangeLog | 4 ++++ lisp/gnus-xmas.el | 15 ++++++++------- lisp/gnus.el | 15 ++++++++------- 4 files changed, 30 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 93a2101..15a0eb8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,15 @@ +2000-10-05 Katsumi Yamaoka + + * lisp/gnus-xmas.el (gnus-xmas-group-startup-message): Don't use + `gnus-point-at-eol'. + * lisp/gnus.el (gnus-group-startup-message): Ditto. + + * lisp/gnus-ems.el (gnus-ems-redefine): Revive annulling of + `gnus-summary-set-display-table'. + 2000-10-04 Akihiro Arisawa - * gnus-sum.el (gnus-build-sparse-threads): Use + * lisp/gnus-sum.el (gnus-build-sparse-threads): Use `make-full-mail-header-from-decoded-header' instead of `make-full-mail-header'. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ed940f6..02f908b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2000-10-05 Stefan Monnier + + * nnimap.el (require): cl. + 2000-10-04 15:24:46 ShengHuo ZHU * gnus-art.el (gnus-article-prepare): Configure windows before diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el index 4cb948d..a043b1d 100644 --- a/lisp/gnus-xmas.el +++ b/lisp/gnus-xmas.el @@ -617,10 +617,11 @@ the resulting string may be narrower than END-COLUMN. (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))) + (end-of-line 0) + (put-text-property (point-min) (point) 'face 'gnus-splash-face) + (insert-char ?\ (prog1 + (max 0 (/ (- (window-width) (point)) 2)) + (goto-char (point-min)))) (forward-line 1) (insert-char ?\n rest) (set-window-start (selected-window) (point-min)))) @@ -653,9 +654,9 @@ the resulting string may be narrower than END-COLUMN. (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))) + (insert-char ?\ (prog1 + (max 0 (/ (- (window-width) (point)) 2)) + (goto-char (point-min)))) (forward-line 1) ;; And then hack it. (gnus-indent-rigidly (point) (point-max) diff --git a/lisp/gnus.el b/lisp/gnus.el index 27d97a8..6e8f162 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -789,11 +789,11 @@ be set in `.emacs' instead." (concat " (r" gnus-revision-number ")")) " 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) + (end-of-line 0) + (put-text-property (point-min) (point) 'face 'gnus-splash-face) + (insert-char ?\ (prog1 + (max 0 (/ (- (window-width) (point)) 2)) + (goto-char (point-min)))) (forward-line 1) (let ((size (image-size image))) (insert-char ?\n (max 0 (round (- (window-height) @@ -832,8 +832,9 @@ be set in `.emacs' instead." (concat " (r" gnus-revision-number ")")) " based on " gnus-original-product-name " v" gnus-original-version-number) - (goto-char (point-min)) - (insert-char ?\ (max 0 (/ (- (window-width) (gnus-point-at-eol)) 2))) + (insert-char ?\ (prog1 + (max 0 (/ (- (window-width) (point)) 2)) + (goto-char (point-min)))) (forward-line 1) ;; And then hack it. (gnus-indent-rigidly (point) (point-max) -- 1.7.10.4