From 3e28960ce9e0613a9762409d75b25b399c0292df Mon Sep 17 00:00:00 2001 From: yamaoka Date: Thu, 26 Oct 2000 13:30:53 +0000 Subject: [PATCH] * texi/gnus.texi: Synch with Gnus. * texi/gnus-ja.texi: Ditto. * lisp/gnus.el (gnus-group-startup-message): Rewrite for Emacs 21. * lisp/lpath.el: Fbind `propertize'. --- ChangeLog | 5 +++++ lisp/gnus.el | 53 +++++++++++++++++++++++++++-------------------------- lisp/lpath.el | 6 ++++-- texi/ChangeLog | 6 ++++++ texi/gnus-ja.texi | 4 ++-- texi/gnus.texi | 4 ++-- 6 files changed, 46 insertions(+), 32 deletions(-) diff --git a/ChangeLog b/ChangeLog index e6ef22b..21ef18f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2000-10-26 Katsumi Yamaoka + + * lisp/gnus.el (gnus-group-startup-message): Rewrite for Emacs 21. + * lisp/lpath.el: Fbind `propertize'. + 2000-10-22 Katsuhiro Hermit Endo * texi/gnus-ja.texi (Changing Servers): Fix typo. diff --git a/lisp/gnus.el b/lisp/gnus.el index bcefb29..a768887 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -774,34 +774,35 @@ be set in `.emacs' instead." (cond ((and (fboundp 'find-image) (display-graphic-p) - (let ((image - (find-image - `((:type xpm :file "gnus.xpm" - :color-symbols - (("thing" . "#724214") - ("shadow" . "#1e3f03") - ("background" . ,(face-background 'default)))) - (:type xbm :file "gnus.xbm" - :foreground ,(face-foreground 'gnus-splash-face) - :background ,(face-background 'default)))))) + (let* ((bg (face-background 'default)) + (fg (face-foreground 'gnus-splash-face)) + (image (find-image + `((:type xpm :file "gnus.xpm" + :color-symbols (("thing" . "#724214") + ("shadow" . "#1e3f03") + ("background" . ,bg))) + (:type xbm :file "gnus.xbm" + :background ,bg :foreground ,fg))))) (when image - (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") - (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 + (propertize + (concat 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) + 'face `(variable-pitch :background ,bg :foreground ,fg))) + (let ((fill-column (window-width))) + (center-region (point-min) (point))) (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-char ?\n (max 1 (round (- (window-height) + (or y (cdr size))) 2))) + (insert + (propertize " " 'display + `(space :align-to + ,(max 0 (round (- (window-width) + (or x (car size))) 2))))) (insert-image image)) (setq gnus-simple-splash nil) t)))) diff --git a/lisp/lpath.el b/lisp/lpath.el index e3baffc..0b4e8ae 100644 --- a/lisp/lpath.el +++ b/lisp/lpath.el @@ -91,10 +91,12 @@ ;; T-gnus. (if (featurep 'xemacs) - (maybe-bind '(mh-lib-progs)) + (progn + (maybe-fbind '(propertize)) + (maybe-bind '(mh-lib-progs))) ;; FSFmacs (maybe-fbind '(charsetp - font-lock-set-defaults function-max-args + font-lock-set-defaults function-max-args propertize smiley-encode-buffer)) (if (boundp 'MULE) (progn diff --git a/texi/ChangeLog b/texi/ChangeLog index 9617f55..b42f7a4 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,9 @@ +2000-10-26 Kai Gro,A_(Bjohann + + * gnus.texi (Gnus Development): nnmail-delete-incoming --> + mail-source-delete-incoming. (Kudos to Karl Kleinpaste + for pointing this out.) + 2000-10-18 Dave Love * gnus.texi (NoCeM): Update. diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index 3fbe68c..99e0f16 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -18324,9 +18324,9 @@ Gnus $B$OFs$D$NCJ3,$N=[4D$G3+H/$5$l$F$$$^$9!#:G=i$NCJ3,(B $B$$$^$9!#(B @cindex Incoming* -@vindex nnmail-delete-incoming +@vindex mail-source-delete-incoming $B%"%k%U%!(B Gnusae $B$H(B $B%j%j!<%9$5$l$?(B Gnusae $B$G$OJQ?t$N=i4|CM$,0c$&$b$N$,$"(B -$B$j$^$9!#FC$K!"(B@code{nnmail-delete-incoming} $B$O%"%k%U%!(B gnusae $B$G(B +$B$j$^$9!#FC$K!"(B@code{mail-source-delete-incoming} $B$O%"%k%U%!(B gnusae $B$G(B $B$O(B @code{nil} $B$G!"%j%j!<%9$5$l$?(B gnusae $B$G$O(B @code{t} $B$G$9!#$3$l$O%a!<%k(B $B$r07$C$F$$$k:]$K!"%"%k%U%!%j%j!<%9$Nsrsw$K$h$j%a!<%k$r<:$J$&$3$H$rHr$1$k(B $B$?$a$G$9!#(B diff --git a/texi/gnus.texi b/texi/gnus.texi index e4699a8..89822c1 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -18935,9 +18935,9 @@ supposed to be able to use these, and these are mostly discussed on the @samp{gnu.emacs.gnus} newsgroup. @cindex Incoming* -@vindex nnmail-delete-incoming +@vindex mail-source-delete-incoming Some variable defaults differ between alpha Gnusae and released Gnusae. -In particular, @code{nnmail-delete-incoming} defaults to @code{nil} in +In particular, @code{mail-source-delete-incoming} defaults to @code{nil} in alpha Gnusae and @code{t} in released Gnusae. This is to prevent lossage of mail if an alpha release hiccups while handling the mail. -- 1.7.10.4