From e42f31fed73fb86dfbdcc3845106e7b34dfcbd87 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Thu, 11 Jul 2002 00:54:36 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 5 +++ lisp/nnimap.el | 5 ++- texi/gnus-ja.texi | 88 ++++++++++++++++++++++++++--------------------------- texi/gnus.texi | 36 +++++++++++----------- 4 files changed, 71 insertions(+), 63 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5466912..9073b87 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2002-07-10 Simon Josefsson + + * nnimap.el (nnimap-split-to-groups): Allow group string to be a + function. From KANEMATSU Daiji . + 2002-07-09 Nevin Kapur * gnus-sum.el (gnus-summary-delete-article): Respect group diff --git a/lisp/nnimap.el b/lisp/nnimap.el index c1c5767..99822b9 100644 --- a/lisp/nnimap.el +++ b/lisp/nnimap.el @@ -1157,7 +1157,10 @@ function is generally only called when Gnus is shutting down." (goto-char (point-min)) (when (and (if (stringp regexp) (progn - (setq regrepp (string-match "\\\\[0-9&]" group)) + (if (not (stringp group)) + (setq group (eval group)) + (setq regrepp + (string-match "\\\\[0-9&]" group))) (re-search-forward regexp nil t)) (funcall regexp group)) ;; Don't enter the article into the same group twice. diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index 5474d25..e7076fa 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -2015,22 +2015,22 @@ Gnus $B$O(B @code{gnus-user-format-function-}@samp{X} $B4X?t$r8F$S=P$7$^$9!#$ (cond (window-system (setq custom-background-mode 'light) (defface my-group-face-1 - '((t (:foreground "Red" :bold t))) "First group face") + '((t (:foreground "Red" :bold t))) "First group face") (defface my-group-face-2 - '((t (:foreground "DarkSeaGreen4" :bold t))) "Second group face") + '((t (:foreground "DarkSeaGreen4" :bold t))) "Second group face") (defface my-group-face-3 - '((t (:foreground "Green4" :bold t))) "Third group face") + '((t (:foreground "Green4" :bold t))) "Third group face") (defface my-group-face-4 - '((t (:foreground "SteelBlue" :bold t))) "Fourth group face") + '((t (:foreground "SteelBlue" :bold t))) "Fourth group face") (defface my-group-face-5 - '((t (:foreground "Blue" :bold t))) "Fifth group face"))) + '((t (:foreground "Blue" :bold t))) "Fifth group face"))) (setq gnus-group-highlight '(((> unread 200) . my-group-face-1) - ((and (< level 3) (zerop unread)) . my-group-face-2) - ((< level 3) . my-group-face-3) - ((zerop unread) . my-group-face-4) - (t . my-group-face-5))) + ((and (< level 3) (zerop unread)) . my-group-face-2) + ((< level 3) . my-group-face-3) + ((zerop unread) . my-group-face-4) + (t . my-group-face-5))) @end lisp @pxref{Faces and Fonts} $B$b;2>H$7$F$/$@$5$$!#(B @@ -4290,8 +4290,8 @@ address "sender" "owner-ding@@hpc.uh.edu")} $B$O!"(B @example if address "sender" "owner-ding@@hpc.uh.edu" @{ - fileinto "INBOX.ding"; - stop; + fileinto "INBOX.ding"; + stop; @} @end example @@ -9124,9 +9124,9 @@ Gnus $B$,F1$8(B @code{Message-ID} $B$r;}$DFs$D$N5-;v$rH/8+$7$?$H$-$O!"2?$+;W$ @lisp (setq gnus-newsgroup-variables - '(message-use-followup-to - (gnus-visible-headers - . "^From:\\|^Newsgroups:\\|^Subject:\\|^Date:\\|^To:"))) + '(message-use-followup-to + (gnus-visible-headers . + "^From:\\|^Newsgroups:\\|^Subject:\\|^Date:\\|^To:"))) @end lisp @end table @@ -10260,13 +10260,13 @@ gnus $B$O>o$KEj9F$K$I$NJ}K!$r;H$&$+$r$"$J$?$K?R$M$^$9!#(B @lisp (add-hook 'gnus-select-group-hook - (lambda () - (cond - ((string-match - "^de\\." (gnus-group-real-name gnus-newsgroup-name)) - (ispell-change-dictionary "deutsch")) - (t - (ispell-change-dictionary "english"))))) + (lambda () + (cond + ((string-match + "^de\\." (gnus-group-real-name gnus-newsgroup-name)) + (ispell-change-dictionary "deutsch")) + (t + (ispell-change-dictionary "english"))))) @end lisp $B$"$J$?$NI,MW$K1~$8$FJQ99$7$F2<$5$$!#(B @@ -10382,7 +10382,7 @@ Gnus $B$O30$X=P$F9T$/A4$F$N%a%C%;!<%8$K!"0l$D$+$=$l0J>e$N$=$N%5!<%P!<$N%0(B '((if (message-news-p) "misc-news" (concat "mail." (format-time-string - "%Y-%m" (current-time)))))) + "%Y-%m" (current-time)))))) @end lisp @c (XEmacs 19.13 $B$K$O(B @code{format-time-string} $B$O$"$j$^$;$s$N$G!"$=(B @@ -11374,7 +11374,7 @@ LIST $B%3%^%s%I$N%*%W%7%g%s$K;H$C$F!"(B($B%5!<%P!<$N(B) $B%j%9%H=PNO$r@_Dj$ @lisp (setq gnus-select-method '(nntp "news.somewhere.edu" - (nntp-list-options ("fj.*" "japan.*")))) + (nntp-list-options ("fj.*" "japan.*")))) @end lisp @item nntp-options-subscribe @@ -11388,7 +11388,7 @@ LIST $B%3%^%s%I$N%*%W%7%g%s$K;H$C$F!"(B($B%5!<%P!<$N(B) $B%j%9%H=PNO$r@_Dj$ @lisp (setq gnus-select-method '(nntp "news.somewhere.edu" - (nntp-options-subscribe "^fj\\.\\|^japan\\."))) + (nntp-options-subscribe "^fj\\.\\|^japan\\."))) @end lisp @item nntp-options-not-subscribe @@ -11402,7 +11402,7 @@ LIST $B%3%^%s%I$N%*%W%7%g%s$K;H$C$F!"(B($B%5!<%P!<$N(B) $B%j%9%H=PNO$r@_Dj$ @lisp (setq gnus-select-method '(nntp "news.somewhere.edu" - (nntp-options-not-subscribe "\\.binaries\\."))) + (nntp-options-not-subscribe "\\.binaries\\."))) @end lisp @end table @@ -14268,7 +14268,7 @@ Web Newspaper $B$K4X$9$k0J2<$N(B @code{nnshimbun} $BJQ?t$rJQ$($k$3$H$,2DG=$G$ (defun gnus-user-format-function-X (header) (let ((descr - (assq nnrss-description-field (mail-header-extra header)))) + (assq nnrss-description-field (mail-header-extra header)))) (if descr (concat "\n\t" (cdr descr)) ""))) @end lisp @@ -16003,7 +16003,7 @@ gnus $B%(!<%8%'%s%H$,$=$N5-;v$r(B SPAM $B$@$H8+Pv$7$?$i??!#$3$NH/8+E*$+$b(B @@ -20367,13 +20367,13 @@ Spam $B$rHr$1$k$?$a$NA09`$N%R%s%H$,==J,$@$C$?F|!9$O2a$.5n$j$^$7$?!#:#$G$O(B (defun kevin-spamassassin () (save-excursion (let ((buf (or (get-buffer " *nnmail incoming*") - (get-buffer " *nnml move*")))) + (get-buffer " *nnml move*")))) (if (not buf) - (progn (message "Oops, cannot find message buffer") nil) - (set-buffer buf) - (if (eq 1 (call-process-region (point-min) (point-max) - "spamc" nil nil nil "-c")) - "spam"))))) + (progn (message "Oops, cannot find message buffer") nil) + (set-buffer buf) + (if (eq 1 (call-process-region (point-min) (point-max) + "spamc" nil nil nil "-c")) + "spam"))))) @end lisp $B0J>e$,$3$l$K4X$9$k$3$H$G$9!#$$$/$D$+$N(B spam $B$O$I$&$7$F$bAGDL$j$7$F$7$^$&(B @@ -21976,7 +21976,7 @@ Gnus 5.8 $B$N?7$7$$5!G=(B: @lisp (setq mail-sources '((directory :path "~/mail/incoming/" - :suffix ".in"))) + :suffix ".in"))) @end lisp $B$b$C$H>\$7$$>pJs$O(B info $B$N(B Select Methods -> Getting Mail -> Mail diff --git a/texi/gnus.texi b/texi/gnus.texi index 7807194..9deaa23 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -1889,15 +1889,15 @@ background is dark: (cond (window-system (setq custom-background-mode 'light) (defface my-group-face-1 - '((t (:foreground "Red" :bold t))) "First group face") + '((t (:foreground "Red" :bold t))) "First group face") (defface my-group-face-2 - '((t (:foreground "DarkSeaGreen4" :bold t))) "Second group face") + '((t (:foreground "DarkSeaGreen4" :bold t))) "Second group face") (defface my-group-face-3 - '((t (:foreground "Green4" :bold t))) "Third group face") + '((t (:foreground "Green4" :bold t))) "Third group face") (defface my-group-face-4 - '((t (:foreground "SteelBlue" :bold t))) "Fourth group face") + '((t (:foreground "SteelBlue" :bold t))) "Fourth group face") (defface my-group-face-5 - '((t (:foreground "Blue" :bold t))) "Fifth group face"))) + '((t (:foreground "Blue" :bold t))) "Fifth group face"))) (setq gnus-group-highlight '(((> unread 200) . my-group-face-1) @@ -4241,8 +4241,8 @@ the line containing the call to @code{stop} is removed.) @example if address "sender" "owner-ding@@hpc.uh.edu" @{ - fileinto "INBOX.ding"; - stop; + fileinto "INBOX.ding"; + stop; @} @end example @@ -9581,7 +9581,7 @@ buffers. For example: (setq gnus-newsgroup-variables '(message-use-followup-to (gnus-visible-headers . - "^From:\\|^Newsgroups:\\|^Subject:\\|^Date:\\|^To:"))) + "^From:\\|^Newsgroups:\\|^Subject:\\|^Date:\\|^To:"))) @end lisp @end table @@ -13565,7 +13565,7 @@ expire mail to groups according to the variable (setq nnmail-expiry-target 'nnmail-fancy-expiry-target nnmail-fancy-expiry-targets '((to-from "boss" "nnfolder:Work") - ("subject" "IMPORTANT" "nnfolder:IMPORTANT.%Y.%b") + ("subject" "IMPORTANT" "nnfolder:IMPORTANT.%Y.%b") ("from" ".*" "nnfolder:Archive-%Y"))) @end lisp @@ -14668,7 +14668,7 @@ the summary buffer. (defun gnus-user-format-function-X (header) (let ((descr - (assq nnrss-description-field (mail-header-extra header)))) + (assq nnrss-description-field (mail-header-extra header)))) (if descr (concat "\n\t" (cdr descr)) ""))) @end lisp @@ -16353,7 +16353,7 @@ wherever. (require 'gnus-agent) (setq gnus-category-predicate-alist (append gnus-category-predicate-alist - '((old . my-article-old-p)))) + '((old . my-article-old-p)))) @end lisp and simply specify your predicate as: @@ -20815,13 +20815,13 @@ call the external tools during splitting. Example fancy split method: (defun kevin-spamassassin () (save-excursion (let ((buf (or (get-buffer " *nnmail incoming*") - (get-buffer " *nnml move*")))) + (get-buffer " *nnml move*")))) (if (not buf) - (progn (message "Oops, cannot find message buffer") nil) - (set-buffer buf) - (if (eq 1 (call-process-region (point-min) (point-max) - "spamc" nil nil nil "-c")) - "spam"))))) + (progn (message "Oops, cannot find message buffer") nil) + (set-buffer buf) + (if (eq 1 (call-process-region (point-min) (point-max) + "spamc" nil nil nil "-c")) + "spam"))))) @end lisp That is about it. As some spam is likely to get through anyway, you @@ -22418,7 +22418,7 @@ this now has changed to @lisp (setq mail-sources '((directory :path "~/mail/incoming/" - :suffix ".in"))) + :suffix ".in"))) @end lisp More information is available in the info doc at Select Methods -> -- 1.7.10.4