From d399c2c990e89d8323f58f327d3928be9359305d Mon Sep 17 00:00:00 2001 From: yamaoka Date: Mon, 29 Oct 2001 01:00:53 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 21 +++++++++++++++++++++ lisp/gnus.el | 4 ++-- lisp/message.el | 2 +- lisp/nnweb.el | 28 +++++++++++++++++++++------- texi/ChangeLog | 4 ++++ texi/message-ja.texi | 9 +++++---- texi/message.texi | 14 ++++++++------ 7 files changed, 62 insertions(+), 20 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0f80117..ea21e21 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,24 @@ +2001-10-27 Simon Josefsson + + * message.el (message-indent-citation): Don't add trailing + whitespace when citing text. + + * gnus.el (gnus-group-faq-directory): Fix. From Jesper Harder + . + +2001-10-26 14:00:00 ShengHuo ZHU + + * nnweb.el (nnweb-possibly-change-server): Create nnweb-hashtb if + not available. + (nnweb-request-scan): Nix nnweb-hashtb if ephemeral. + (nnweb-type-definition): Add google as alias of dejanews. + (nnweb-google-parse-1): Forward 1 line. + +2001-10-26 Kai Gro,A_(Bjohann + + * gnus-msg.el (gnus-summary-mail-forward): Doc fix: add pointer to + variable `message-forward-ignored-headers'. + 2001-10-24 Per Abrahamsen * gnus.el (gnus-expand-group-parameter): New function. diff --git a/lisp/gnus.el b/lisp/gnus.el index daed3a0..6079f50 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -1202,10 +1202,10 @@ list, Gnus will try all the methods in the list until it finds a match." (defcustom gnus-group-faq-directory '("/ftp@mirrors.aol.com:/pub/rtfm/usenet/" - "/ftp@sunsite.auc.dk:/pub/usenet/" "/ftp@sunsite.doc.ic.ac.uk:/pub/usenet/news-faqs/" "/ftp@src.doc.ic.ac.uk:/usenet/news-FAQS/" "/ftp@ftp.seas.gwu.edu:/pub/rtfm/" + "/ftp@ftp.pasteur.fr:/pub/FAQ/" "/ftp@rtfm.mit.edu:/pub/usenet/" "/ftp@ftp.uni-paderborn.de:/pub/FAQ/" "/ftp@ftp.sunet.se:/pub/usenet/" @@ -1232,7 +1232,7 @@ If the default site is too slow, try one of these: Europe: ftp.uni-paderborn.de /pub/FAQ src.doc.ic.ac.uk /usenet/news-FAQS ftp.sunet.se /pub/usenet - sunsite.auc.dk /pub/usenet + ftp.pasteur.fr /pub/FAQ Asia: nctuccca.edu.tw /USENET/FAQ hwarang.postech.ac.kr /pub/usenet ftp.hk.super.net /mirror/faqs" diff --git a/lisp/message.el b/lisp/message.el index 4083b53..4279819 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -2400,7 +2400,7 @@ However, if `message-yank-prefix' is non-nil, insert that prefix on each line." (save-excursion (goto-char start) (while (< (point) (mark t)) - (if (looking-at ">") + (if (or (looking-at ">") (looking-at "^$")) (insert message-yank-cited-prefix) (insert message-yank-prefix)) (forward-line 1)))) diff --git a/lisp/nnweb.el b/lisp/nnweb.el index 760ef75..862d6f0 100644 --- a/lisp/nnweb.el +++ b/lisp/nnweb.el @@ -55,14 +55,25 @@ (defvoo nnweb-directory (nnheader-concat gnus-directory "nnweb/") "Where nnweb will save its files.") -(defvoo nnweb-type 'dejanews +(defvoo nnweb-type 'google "What search engine type is being used. -Valid types include `dejanews', `dejanewsold', `reference', +Valid types include `google', `dejanews', `dejanewsold', `reference', and `altavista'.") (defvar nnweb-type-definition '( - (dejanews ;; bought by google.com + (google + ;;(article . nnweb-google-wash-article) + ;;(id . "http://groups.google.com/groups?as_umsgid=%s") + (article . ignore) + (id . "http://groups.google.com/groups?selm=%s&output=gplain") + ;;(reference . nnweb-google-reference) + (reference . identity) + (map . nnweb-google-create-mapping) + (search . nnweb-google-search) + (address . "http://groups.google.com/groups") + (identifier . nnweb-google-identity)) + (dejanews ;; alias of google ;;(article . nnweb-google-wash-article) ;;(id . "http://groups.google.com/groups?as_umsgid=%s") (article . ignore) @@ -136,6 +147,8 @@ and `altavista'.") (deffoo nnweb-request-scan (&optional group server) (nnweb-possibly-change-server group server) + (if nnweb-ephemeral-p + (setq nnweb-hashtb (gnus-make-hashtable 4095))) (funcall (nnweb-definition 'map)) (unless nnweb-ephemeral-p (nnweb-write-active) @@ -305,10 +318,11 @@ and `altavista'.") (nnweb-open-server server))) (unless nnweb-group-alist (nnweb-read-active)) + (unless nnweb-hashtb + (setq nnweb-hashtb (gnus-make-hashtable 4095))) (when group (when (and (not nnweb-ephemeral-p) - (not (equal group nnweb-group))) - (setq nnweb-hashtb (gnus-make-hashtable 4095)) + (equal group nnweb-group)) (nnweb-request-group group nil t)))) (defun nnweb-init (server) @@ -747,7 +761,7 @@ and `altavista'.") (while (re-search-forward "a href=/groups\\(\\?[^ \">]*selm=\\([^ &\">]+\\)\\)" nil t) (setq mid (match-string 2) - url (format + url (format "http://groups.google.com/groups?selm=%s&output=gplain" mid)) (narrow-to-region (search-forward ">" nil t) (search-forward "" nil t)) @@ -756,7 +770,7 @@ and `altavista'.") (setq Subject (buffer-string)) (goto-char (point-max)) (widen) - (forward-line 2) + (forward-line 1) (when (looking-at "
]+>") (goto-char (match-end 0))) (if (not (looking-at "]+>")) diff --git a/texi/ChangeLog b/texi/ChangeLog index 7d00cd5..4e591c6 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,7 @@ +2001-10-27 Simon Josefsson + + * message.texi (Insertion): Fix message-yank*-prefix. + 2001-10-25 Simon Josefsson * gnus.texi (Mail Source Specifiers): More info on SSL, kerberos etc. diff --git a/texi/message-ja.texi b/texi/message-ja.texi index 470f62d..0ec7123 100644 --- a/texi/message-ja.texi +++ b/texi/message-ja.texi @@ -497,9 +497,9 @@ Hallvard B Furuseth writes: @cindex quoting $B$"$J$?$,5-;v$KJVEz$+%U%)%m!<%"%C%W$r$7$F$$$k$H$-$O!"IaDL$O$"$J$?$,1~Ez$7(B $B$F$$$k?M$N$b$N$K0zMQId$rIU$1$?$$$G$7$g$&!#0zMQJ8$NA^F~$O(B @dfn{$BE=$jIU$1(B} -$B$K$h$C$F$J$5$l(B ($B$9$G$K0zMQId$,IU$$$F$$$k$b$N$OBP>]30!"(B +$B$K$h$C$F$J$5$l(B ($B$9$G$K0zMQId$,IU$$$F$$$k$b$N$H6u9T$OBP>]30!"(B @code{message-yank-cited-prefix} $B$r;2>H$N$3$H(B)$B!"$=$l$>$l$NE=$jIU$1$i$l$?(B -$B0zMQ9T$O$=$NA0$K(B @code{message-yank-prefix} $B$rIU$1$i$l$^$9!#=i4|CM(B +$B9T$O$=$NA0$K(B @code{message-yank-prefix} $B$rIU$1$i$l$^$9!#=i4|CM(B $B$O(B @samp{> } $B$G$9!#(B @item message-yank-cited-prefix @@ -507,8 +507,9 @@ Hallvard B Furuseth writes: @cindex yanking @cindex cited @cindex quoting -$B$9$G$K0zMQ$5$l$?9T$K$O(B @code{message-yank-prefix} $B$NBe$o$j$K$3$NJQ?t$NFb(B -$BMF$,0zMQId$H$7$F;H$o$l$^$9!#=i4|CM$O(B @samp{>} $B$G$9!#(B +$B5-;v$+$i0zMQ$5$l$?%F%-%9%H$,$9$G$K0zMQ$5$l$?$b$N$@$C$?$j6u$@$C$?>l9g!"$=(B +$B$l$>$l$N9T$K$O$3$NJQ?t$NCM$,A0CV$5$l$^$9!#=i4|CM$O(B @samp{>} $B$G$9!#(B +@code{message-yank-prefix} $B$b;2>H$7$F2<$5$$!#(B @item message-yank-add-new-references @vindex message-yank-add-new-references diff --git a/texi/message.texi b/texi/message.texi index a12eb0c..4704117 100644 --- a/texi/message.texi +++ b/texi/message.texi @@ -515,18 +515,20 @@ Article Highlighting, gnus}, for details. @cindex quoting When you are replying to or following up an article, you normally want to quote the person you are answering. Inserting quoted text is done -by @dfn{yanking}, and each quoted line you yank (except earlier -quotes, see @code{message-yank-cited-prefix}) will have -@code{message-yank-prefix} prepended to it. The default is @samp{> }. +by @dfn{yanking}, and each line you yank will have +@code{message-yank-prefix} prepended to it (except for quoted and +empty lines which uses @code{message-yank-cited-prefix}). The default +is @samp{> }. @item message-yank-cited-prefix @vindex message-yank-cited-prefix @cindex yanking @cindex cited @cindex quoting -The @code{message-yank-prefix} prefix is not used on already cited -lines, instead the contents of this variable is used as yank prefix. -The default is @samp{>}. +When yanking text from a article which contains no text or already +cited text, each line will be prefixed with the contents of this +variable. The default is @samp{>}. See also +@code{message-yank-prefix}. @item message-yank-add-new-references @vindex message-yank-add-new-references -- 1.7.10.4