From c03f308fa4f38f831e6bebdf9c05029e1f702acd Mon Sep 17 00:00:00 2001 From: yamaoka Date: Sat, 18 Oct 2003 11:44:07 +0000 Subject: [PATCH] Synch to Gnus 200310181108. --- GNUS-NEWS | 8 ++-- lisp/ChangeLog | 58 +++++++++++++++++++++++++++ lisp/gnus-art.el | 33 +++++++++------- lisp/gnus-msg.el | 15 ++++--- lisp/gnus-sum.el | 1 + lisp/mail-source.el | 2 +- lisp/message.el | 106 +++++++++++++++++++++++++++++++++++++++++++++++--- lisp/rfc2047.el | 12 ++++-- texi/ChangeLog | 11 ++++++ texi/gnus-ja.texi | 40 +++++++++++-------- texi/gnus.texi | 61 ++++++++++++++++------------- texi/message-ja.texi | 4 +- texi/message.texi | 4 +- texi/texi2latex.el | 3 +- 14 files changed, 277 insertions(+), 81 deletions(-) diff --git a/GNUS-NEWS b/GNUS-NEWS index 9c401ca..fda953f 100644 --- a/GNUS-NEWS +++ b/GNUS-NEWS @@ -453,10 +453,12 @@ This also obsoletes `gnus-article-hide-pgp-hook'. This change was made to avoid conflict with the standard binding of `back-to-indentation', which is also useful in message mode. -** The default for message-forward-show-mml changed to nil. +** The default for message-forward-show-mml changed to symbol best. -The reason is that decoding MIME, showing MML, and later re-encode the -MIME does not work properly for, e.g., PGP/MIME signed messages. +The behaviour for the `best' value is to show MML (i.e., convert MIME +to MML) when appropriate. MML will not be used when forwarding signed +or encrypted messages, as the conversion invalidate the digital +signature. ** Bug fixes. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a9b33db..faf9ead 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,63 @@ +2003-10-18 Jesper Harder + + * gnus-msg.el (gnus-summary-resend-message-edit): Avoid error when + fields aren't found. + +2003-10-18 Simon Josefsson + + * message.el (message-forward-make-body-plain) + (message-forward-make-body-mime, message-forward-make-body-mml) + (message-forward-make-body-digest-plain) + (message-forward-make-body-digest-mime) + (message-forward-make-body-digest): New, derived from + message-forward-make-body. + (message-forward-make-body): Use them. + (message-forward-show-mml): New default 'best. + (message-forward-make-body): Support it. + +2003-10-18 Lars Magne Ingebrigtsen + + * gnus-art.el (gnus-article-mode): Set gnus-page-broken to nil. + (gnus-article-prepare): Don't set to t. + (gnus-narrow-to-page): Set to t if we break. + +2003-06-11 Daniel N,Ai(Bri + + * message.el (message-resend): Generate Resent-Message-ID header. + +2003-10-18 Lars Magne Ingebrigtsen + + * gnus-art.el (gnus-article-next-page): Don't go to the next line + before checking end-of-buffer. + (gnus-mime-delete-part): Don't insert parts twice. + 2003-10-17 Lars Magne Ingebrigtsen + * gnus-art.el (article-update-date-lapsed): Make sure point + doesn't move around (much). + +2003-07-28 Vasily Korytov + + * mail-source.el (mail-source-keyword-map): List "cur" before + "new" for maildirs. + +2003-10-17 Lars Magne Ingebrigtsen + + * gnus-sum.el (gnus-summary-enter-digest-group): ogroup, nor + group. + + * gnus-msg.el (gnus-inews-insert-archive-gcc): Use the parent + name for gcc-self. + (gnus-inews-insert-archive-gcc): Paren mistake. + + * gnus-sum.el (gnus-summary-enter-digest-group): Add + parent-group. + + * gnus-art.el (gnus-ignored-headers): Add more headers. + + * rfc2047.el (rfc2047-encode): See which encoding is shorter -- + base64 or QP. + * nnmail.el (nnmail-article-group): Default to "bogus". * mail-source.el (mail-source-delete-incoming): Change to nil. diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 5c647fb..55c7b93 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -159,7 +159,7 @@ "X-Virus-Scanned" "X-Delivery-Agent" "Posted-Date" "X-Gateway" "X-Local-Origin" "X-Local-Destination" "X-UserInfo1" "X-Received-Date" "X-Hashcash" "Face" "X-DMCA-Notifications" - "X-Abuse-and-DMCA-Info" "X-Postfilter")) + "X-Abuse-and-DMCA-Info" "X-Postfilter" "X-Gpg-.*" "X-Disclaimer")) "*All headers that start with this regexp will be hidden. This variable can also be a list of regexps of headers to be ignored. If `gnus-visible-headers' is non-nil, this variable will be ignored." @@ -3100,9 +3100,12 @@ function and want to see what the date was before converting." (lambda (w) (set-buffer (window-buffer w)) (when (eq major-mode 'gnus-article-mode) - (goto-char (point-min)) - (when (re-search-forward "^X-Sent:" nil t) - (article-date-lapsed t)))) + (let ((mark (point-marker))) + (goto-char (point-min)) + (when (re-search-forward "^X-Sent:" nil t) + (article-date-lapsed t)) + (goto-char (marker-position mark)) + (move-marker mark nil)))) nil 'visible))))) (defun gnus-start-date-timer (&optional n) @@ -3802,7 +3805,7 @@ commands: (set (make-local-variable 'tool-bar-map) gnus-summary-tool-bar-map))) (gnus-update-format-specifications nil 'article-mode) (set (make-local-variable 'page-delimiter) gnus-page-delimiter) - (make-local-variable 'gnus-page-broken) + (set (make-local-variable 'gnus-page-broken) nil) (make-local-variable 'gnus-button-marker-list) (make-local-variable 'gnus-article-current-summary) (make-local-variable 'gnus-article-mime-handles) @@ -4040,10 +4043,8 @@ If ALL-HEADERS is non-nil, no headers are hidden." (gnus-article-prepare-display) ;; Do page break. (goto-char (point-min)) - (setq gnus-page-broken - (when gnus-break-pages - (gnus-narrow-to-page) - t))) + (when gnus-break-pages + (gnus-narrow-to-page))) (let ((gnus-article-mime-handle-alist-1 gnus-article-mime-handle-alist)) (gnus-set-mode-line 'article)) @@ -4393,8 +4394,6 @@ Replace it with some information about the removed part." (erase-buffer) (insert (concat - "<#part type=text/plain nofile=yes disposition=attachment" - " description=\"Deleted attachment (" bsize " Byte)\">" ",----\n" "| The following attachment has been deleted:\n" "|\n" @@ -4402,10 +4401,12 @@ Replace it with some information about the removed part." "| Filename: " filename "\n" "| Size (encoded): " bsize " Byte\n" "| Description: " description "\n" - "`----\n" - "<#/part>")) + "`----\n")) (setcdr data - (cdr (mm-make-handle nil `("text/plain")))))) + (cdr (mm-make-handle + nil `("text/plain") nil nil + (list "attachment") + (format "Deleted attachment (%s bytes)" bsize)))))) (set-buffer gnus-summary-buffer) ;; FIXME: maybe some of the following code (borrowed from ;; `gnus-mime-save-part-and-strip') isn't necessary? @@ -5319,6 +5320,7 @@ If given a numerical ARG, move forward ARG pages." (re-search-backward page-delimiter nil 'move (1+ (abs arg)))) ((> arg 0) (re-search-forward page-delimiter nil 'move arg))) + (setq gnus-page-broken t) (goto-char (match-end 0))) (narrow-to-region (point) @@ -5381,7 +5383,8 @@ Argument LINES specifies lines to be scrolled up." (if (or (not gnus-page-broken) (save-excursion (save-restriction - (widen) (forward-line 1) (eobp)))) ;Real end-of-buffer? + (widen) + (eobp)))) ;Real end-of-buffer? (progn (when gnus-article-over-scroll (gnus-article-next-page-1 lines)) diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el index 3213fa0..7ee3e30 100644 --- a/lisp/gnus-msg.el +++ b/lisp/gnus-msg.el @@ -1550,8 +1550,8 @@ composing a new message." (goto-char (point-max)) (insert mail-header-separator) (goto-char (point-min)) - (re-search-forward "^To:\\|^Newsgroups:" nil 'move) - (forward-char 1) + (when (re-search-forward "^To:\\|^Newsgroups:" nil 'move) + (forward-char 1)) (widen))))) (defun gnus-summary-post-forward (&optional full-headers) @@ -2016,9 +2016,14 @@ this is a reply." (if (string-match " " gcc-self-val) (concat "\"" gcc-self-val "\"") gcc-self-val) - (if (string-match " " group) - (concat "\"" group "\"") - group))) + ;; In nndoc groups, we use the parent group name + ;; instead of the current group. + (let ((group (or (gnus-group-find-parameter + gnus-newsgroup-name 'parent-group) + group))) + (if (string-match " " group) + (concat "\"" group "\"") + group)))) (if (not (eq gcc-self-val 'none)) (insert "\n") (gnus-delete-line))) diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index fe39b55..67cffad 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -8197,6 +8197,7 @@ to guess what the document format is." (ogroup gnus-newsgroup-name) (params (append (gnus-info-params (gnus-get-info ogroup)) (list (cons 'to-group ogroup)) + (list (cons 'parent-group ogroup)) (list (cons 'save-article-group ogroup)))) (case-fold-search t) (buf (current-buffer)) diff --git a/lisp/mail-source.el b/lisp/mail-source.el index 64cc4fd..5fb603f 100644 --- a/lisp/mail-source.el +++ b/lisp/mail-source.el @@ -345,7 +345,7 @@ Common keywords should be listed here.") (:leave)) (maildir (:path (or (getenv "MAILDIR") "~/Maildir/")) - (:subdirs ("new" "cur")) + (:subdirs ("cur" "new")) (:function)) (imap (:server (getenv "MAILHOST")) diff --git a/lisp/message.el b/lisp/message.el index fdbe633..018deee 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -593,12 +593,19 @@ Otherwise, directly inline the old message in the forwarded message." :group 'message-forwarding :type 'boolean) -(defcustom message-forward-show-mml nil - "*Non-nil means show forwarded messages as mml. -Otherwise, forwarded messages are unchanged." +(defcustom message-forward-show-mml 'best + "*Non-nil means show forwarded messages as MML (decoded from MIME). +Otherwise, forwarded messages are unchanged. +Can also be the symbol `best' to indicate that MML should be +used, except when it is a bad idea to use MML. One example where +it is a bad idea is when forwarding a signed or encrypted +message, because converting MIME to MML would invalidate the +digital signature." :version "21.1" :group 'message-forwarding - :type 'boolean) + :type '(choice (const :tag "use MML" t) + (const :tag "don't use MML " nil) + (const :tag "use MML when appropriate" best))) (defcustom message-forward-before-signature t "*Non-nil means put forwarded message before signature, else after." @@ -6719,6 +6726,95 @@ Optional NEWS will use news to forward instead of mail." (message-mail nil subject)) (message-forward-make-body cur))) +(defun message-forward-make-body-plain (forward-buffer) + (insert + "\n-------------------- Start of forwarded message --------------------\n") + (let ((b (point)) e) + (save-restriction + (narrow-to-region (point) (point)) + (mml-insert-buffer forward-buffer) + (goto-char (point-min)) + (when (looking-at "From ") + (replace-match "X-From-Line: ")) + (goto-char (point-max))) + (setq e (point)) + (insert + "\n-------------------- End of forwarded message --------------------\n"))) + +(defun message-forward-make-body-mime (forward-buffer) + (insert "\n\n<#part type=message/rfc822 disposition=inline raw=t>\n") + (let ((b (point)) e) + (save-restriction + (narrow-to-region (point) (point)) + (mml-insert-buffer forward-buffer) + (goto-char (point-min)) + (when (looking-at "From ") + (replace-match "X-From-Line: ")) + (goto-char (point-max))) + (setq e (point)) + (insert "<#/part>\n"))) + +(defun message-forward-make-body-mml (forward-buffer) + (insert "\n\n<#mml type=message/rfc822 disposition=inline>\n") + (let ((b (point)) e) + (if (not message-forward-decoded-p) + (insert + (with-temp-buffer + (mm-disable-multibyte) + (insert + (with-current-buffer forward-buffer + (mm-with-unibyte-current-buffer (buffer-string)))) + (mm-enable-multibyte) + (mime-to-mml) + (goto-char (point-min)) + (when (looking-at "From ") + (replace-match "X-From-Line: ")) + (buffer-string))) + (save-restriction + (narrow-to-region (point) (point)) + (mml-insert-buffer forward-buffer) + (goto-char (point-min)) + (when (looking-at "From ") + (replace-match "X-From-Line: ")) + (goto-char (point-max)))) + (setq e (point)) + (insert "<#/mml>\n") + (when (and (not current-prefix-arg) + message-forward-ignored-headers) + (save-restriction + (narrow-to-region b e) + (goto-char b) + (narrow-to-region (point) + (or (search-forward "\n\n" nil t) (point))) + (message-remove-header message-forward-ignored-headers t))))) + +(defun message-forward-make-body-digest-plain (forward-buffer) + (insert + "\n-------------------- Start of forwarded message --------------------\n") + (let ((b (point)) e) + (mml-insert-buffer forward-buffer) + (setq e (point)) + (insert + "\n-------------------- End of forwarded message --------------------\n"))) + +(defun message-forward-make-body-digest-mime (forward-buffer) + (insert "\n<#multipart type=digest>\n") + (let ((b (point)) e) + (insert-buffer-substring forward-buffer) + (setq e (point)) + (insert "<#/multipart>\n") + (save-restriction + (narrow-to-region b e) + (goto-char b) + (narrow-to-region (point) + (or (search-forward "\n\n" nil t) (point))) + (delete-region (point-min) (point-max))))) + +(defun message-forward-make-body-digest (forward-buffer) + (if message-forward-as-mime + (message-forward-make-body-digest-mime forward-buffer) + (message-forward-make-body-digest-plain forward-buffer))) + ;;;###autoload (defun message-forward-make-body (forward-buffer) ;; Put point where we want it before inserting the forwarded @@ -6788,7 +6884,7 @@ Optional NEWS will use news to forward instead of mail." message-setup-hook) (message-setup `((To . ,address)))) ;; Insert our usual headers. - (message-generate-headers '(From Date To)) + (message-generate-headers '(From Date To Message-ID)) (message-narrow-to-headers) ;; Remove X-Draft-From header etc. (message-remove-header message-ignored-mail-headers t) diff --git a/lisp/rfc2047.el b/lisp/rfc2047.el index 02e7943..1160022 100644 --- a/lisp/rfc2047.el +++ b/lisp/rfc2047.el @@ -405,11 +405,15 @@ By default, the region is treated as containing addresses (see (mm-charset-to-coding-system mime-charset))) ;; Fixme: Better, calculate the number of non-ASCII ;; characters, at least for 8-bit charsets. - (encoding (if (assq mime-charset - rfc2047-charset-encoding-alist) - (cdr (assq mime-charset + (encoding (or (cdr (assq mime-charset rfc2047-charset-encoding-alist)) - 'B)) + ;; For the charsets that don't have a preferred + ;; encoding, choose the one that's shorter. + (save-restriction + (narrow-to-region b e) + (if (eq (mm-qp-or-base64) 'base64) + 'B + 'Q)))) (start (concat "=?" (downcase (symbol-name mime-charset)) "?" (downcase (symbol-name encoding)) "?")) diff --git a/texi/ChangeLog b/texi/ChangeLog index 6850c06..370c883 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,14 @@ +2003-10-18 Jesper Harder + + * gnus.texi (Group Mail Splitting) + (Filtering Spam Using The Spam ELisp Package): Markup fixes. + + * message.texi (Security): @url -> @uref. + +2003-10-18 Lars Magne Ingebrigtsen + + * gnus.texi: Define gnusasis and gnusurl. + 2003-10-12 Jesper Harder * gnus.texi (Group Mail Splitting): Markup fix. diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index c3c280d..3bfc53d 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -53,6 +53,8 @@ \newcommand{\gnustt}[1]{{\gnusselectttfont{}#1}} \newcommand{\gnuscode}[1]{\gnustt{#1}} +\newcommand{\gnusasis}[1]{\gnustt{#1}} +\newcommand{\gnusurl}[1]{\gnustt{#1}} \newcommand{\gnuscommand}[1]{\gnustt{#1}} \newcommand{\gnusenv}[1]{\gnustt{#1}} \newcommand{\gnussamp}[1]{``{\fontencoding{OT1}\gnusselectttfont{}#1}''} @@ -154,6 +156,11 @@ } }{\end{list}} +\newenvironment{asislist}% +{\begin{list}{}{ +} +}{\end{list}} + \newenvironment{kbdlist}% {\begin{list}{}{ \labelwidth=0cm @@ -13291,31 +13298,32 @@ table) $B$K=>$C$F40A4$K9gCW$7$J$1$l$P$J$j$^$;$s!#@55,I=8=$G%U%#!<%k%IL>$+(B $B$?!<$/$5$s$N%a!<%j%s%0%j%9%H$r9XFI$7$F$$$k$1$l$I!"J}$b$7$/$O$I$A$i$+$r@_Dj$7(B +$B$G(B @code{to-list}, @code{to-address} $B$NN>J}$b$7$/$O$I$A$i$+$r@_Dj$7(B $B$F(B @code{nnmail-split-methods} $B$r(B @code{gnus-group-split} $B$K@_Dj$9$k$@$1(B $B$G$9!#J,3d4X?t$OA4$F$N%0%k!<%W$G$3$l$i$N%Q%i%a!<%?$rAv::$7!"$=$l$K=>$C$F(B $BJ,3d$7$^$9!#$9$J$o$A!"%a!<%k%0%k!<%W$N%Q%i%a!<(B -$B%?(B @var{to-list} $B$+(B @var{to-address} $B$G;XDj$5$l$?%"%I%l%9$+$iEj9F$5$l$?(B -$B$b$N$+!"$=$N%"%I%l%9$XEj9F$5$l$?%a%C%;!<%8$,$=$N%0%k!<%W$KJ]B8$5$l$^$9!#(B +$B%?(B @code{to-list} $B$+(B @code{to-address} $B$G;XDj$5$l$?%"%I%l%9$+$iEj9F$5$l(B +$B$?$b$N$+!"$=$N%"%I%l%9$XEj9F$5$l$?%a%C%;!<%8$,$=$N%0%k!<%W$KJ]B8$5$l$^$9!#(B $B$H$-$K$O!"%a!<%j%s%0%j%9%H$K$OJ#?t$N%"%I%l%9$,$"$j!"%a!<%kJ,3d$K$=$l$iA4(B -$B$F$rG'<1$5$;$kI,MW$,$"$k$+$b$7$l$^$;$s(B: @var{extra-aliases} $B%0%k!<%W%Q%i(B -$B%a!<%?$rDI2C$N%"%I%l%9$N%j%9%H$K@_Dj$9$k$@$1$G=*$j$G$9!#@55,I=8=$r;H$$$?(B -$B$1$l$P!"(B@var{split-regexp} $B$r@_Dj$7$F$/$@$5$$!#(B +$B$F$rG'<1$5$;$kI,MW$,$"$k$+$b$7$l$^$;$s(B: @code{extra-aliases} $B%0%k!<%W%Q(B +$B%i%a!<%?$rDI2C$N%"%I%l%9$N%j%9%H$K@_Dj$9$k$@$1$G=*$j$G$9!#@55,I=8=$r;H$$(B +$B$?$1$l$P!"(B@code{split-regexp} $B$r@_Dj$7$F$/$@$5$$!#(B $B$3$l$i$NA4$F$N%0%k!<%W$N%Q%i%a!<%?$O!"(B@code{nnmail-split-fancy} $BJ,3d$r:n(B $B@.$9$k$?$a$K;HMQ$5$l!"$=$l$O(B @var{field} $B$,(B @samp{any} $B$G!"(B -@var{value} $B$,(B @var{to-list}, @var{to-address}, @var{extra-aliases} $B$NA4(B -$B$F!"(B@var{split-regexp} $B$NA4$F$N9gCW$K9gCW$9$kC1FH$N@55,I=8=!"(B -@var{split} $B$,%0%k!<%W$NL>A0$K$J$j$^$9!#(B@var{restrict} $B$b;HMQ$G$-$^$9(B: -@var{split-exclude} $B%Q%i%a!<%?$r@55,I=8=$N%j%9%H$K@_Dj$9$k$@$1$G$9!#(B +@var{value} $B$,(B @code{to-list}, @code{to-address}, +@code{extra-aliases} $B$N$9$Y$F!"(B@code{split-regexp} $B$NA4$F$N9gCW$K9gCW$9(B +$B$kC1FH$N@55,I=8=!"(B@var{split} $B$,%0%k!<%W$NL>A0$K$J$j$^$9!#(B@var{restrict} +$B$b;HMQ$G$-$^$9(B: @code{split-exclude} $B%Q%i%a!<%?$r@55,I=8=$N%j%9%H$K@_Dj(B +$B$9$k$@$1$G$9!#(B $B$3$l$i$NA4$F$N%Q%i%a!<%?$r;H$C$F@5$7$$J,3d$,@8@.$5$l$J$$$H$-$d!"2?$+0c$C(B $B$?$b$N$,I,MW$J$H$-$O!"%Q%i%a!<(B -$B%?(B @var{split-spec} $B$r(B @code{nnmail-split-fancy} $BJ,3d$K@_Dj$9$k$3$H$,$G(B +$B%?(B @code{split-spec} $B$r(B @code{nnmail-split-fancy} $BJ,3d$K@_Dj$9$k$3$H$,$G(B $B$-$^$9!#$3$N>l9g$O!"B>$NA0$K=q$$$?A4$F$N%Q%i%a!<%?(B $B$O(B @code{gnus-group-split} $B$KL5;k$5$l$^$9!#FC$K!"(B -@var{split-spec} $B$O(B @code{nil} $B$K@_Dj$9$k$3$H$,$G$-!"$=$N>l9g$O%0%k!<%W(B +@code{split-spec} $B$O(B @code{nil} $B$K@_Dj$9$k$3$H$,$G$-!"$=$N>l9g$O%0%k!<%W(B $B$O(B @code{gnus-group-split} $B$KL5;k$5$l$^$9!#(B @vindex gnus-group-split-default-catch-all-group @@ -13324,7 +13332,7 @@ table) $B$K=>$C$F40A4$K9gCW$7$J$1$l$P$J$j$^$;$s!#@55,I=8=$G%U%#!<%k%IL>$+(B $B$^$9!#%a%C%;!<%8$,$I$NJ,3d$K$b9gCW$7$J$1$l$P!"$I$l$+$N%0%k!<%W(B $B$G(B @var{split-spec} $B$,(B @code{catch-all} $B$K@_Dj$5$l$F$$$J$$>l9g(B $B$O(B @code{gnus-group-split-default-catch-all-group} $B$G;XDj$5$l$F$$$k%0%k!<(B -$B%W$KJ]B8$5$l$^$9!#(B@var{split-spec} $B$,(B @code{catch-all} $B$K@_Dj$5$l$F$$$k(B +$B%W$KJ]B8$5$l$^$9!#(B@code{split-spec} $B$,(B @code{catch-all} $B$K@_Dj$5$l$F$$$k(B $B%0%k!<%W$,$"$k>l9g$O!"$=$N%0%k!<%W$,A4$F$rJa3M$9$k%0%k!<%W$H$7$F;HMQ$5$l(B $B$^$9!#$3$NJQ?t$O$7$P$7$PC1$K%0%k!<%W$r;XDj$9$k$?$a$K;H$o$l$^$9$,!"G$0U$N(B $BJ#;($JFC5iJ,3d$r$b@_Dj$9$k(B ($B7k6I!"%0%k!<%WL>$OFC5iJ,3d$J$N$G$9(B) $B$N$G!"8D(B @@ -13375,10 +13383,10 @@ nnml:mail.others: $B$a$K;H$&$3$H$,$G$-$^$9!#$=$N>l9g!"C10l$N(B @code{|} $BJ,3d$,=PNO$5$l$^$9!#(B @var{catch-all} $B$O(B @code{gnus-group-split-default-catch-all-group} $B$N$h(B $B$&$K!":G8e$Nl9g!"%0%k!<%W$K(B @var{split-spec} $B$,(B @code{catch-all} $B$K@_Dj$5$l$F$$$k(B -$B$b$N$,$"$k$H!"$3$N%0%k!<%W$,(B @var{catch-all} $B0z?t$r>e=q$-$7$^$9!#(B +$B$$>l9g!"%0%k!<%W$K(B @code{split-spec} $B$,(B @code{catch-all} $B$K@_Dj$5$l$F$$(B +$B$k$b$N$,$"$k$H!"$3$N%0%k!<%W$,(B @var{catch-all} $B0z?t$r>e=q$-$7$^$9!#(B @findex gnus-group-split-setup $BIT1?$J$3$H$K!"A4$F$N%0%k%W$H%Q%i%a!<%?$rAv::$9$k$3$H$OHs>o$KCY$$$G$9!#FC(B diff --git a/texi/gnus.texi b/texi/gnus.texi index 6269cb7..cfce69f 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -53,6 +53,8 @@ \newcommand{\gnustt}[1]{{\gnusselectttfont{}#1}} \newcommand{\gnuscode}[1]{\gnustt{#1}} +\newcommand{\gnusasis}[1]{\gnustt{#1}} +\newcommand{\gnusurl}[1]{\gnustt{#1}} \newcommand{\gnuscommand}[1]{\gnustt{#1}} \newcommand{\gnusenv}[1]{\gnustt{#1}} \newcommand{\gnussamp}[1]{``{\fontencoding{OT1}\gnusselectttfont{}#1}''} @@ -154,6 +156,11 @@ } }{\end{list}} +\newenvironment{asislist}% +{\begin{list}{}{ +} +}{\end{list}} + \newenvironment{kbdlist}% {\begin{list}{}{ \labelwidth=0cm @@ -14042,31 +14049,31 @@ Otherwise, answers to all your messages would end up in the @findex gnus-group-split If you subscribe to dozens of mailing lists but you don't want to maintain mail splitting rules manually, group mail splitting is for you. -You just have to set @var{to-list} and/or @var{to-address} in group +You just have to set @code{to-list} and/or @code{to-address} in group parameters or group customization and set @code{nnmail-split-methods} to @code{gnus-group-split}. This splitting function will scan all groups for those parameters and split mail accordingly, i.e., messages posted -from or to the addresses specified in the parameters @var{to-list} or -@var{to-address} of a mail group will be stored in that group. +from or to the addresses specified in the parameters @code{to-list} or +@code{to-address} of a mail group will be stored in that group. Sometimes, mailing lists have multiple addresses, and you may want mail -splitting to recognize them all: just set the @var{extra-aliases} group +splitting to recognize them all: just set the @code{extra-aliases} group parameter to the list of additional addresses and it's done. If you'd -rather use a regular expression, set @var{split-regexp}. +rather use a regular expression, set @code{split-regexp}. All these parameters in a group will be used to create an @code{nnmail-split-fancy} split, in which the @var{field} is @samp{any}, the @var{value} is a single regular expression that matches -@var{to-list}, @var{to-address}, all of @var{extra-aliases} and all -matches of @var{split-regexp}, and the @var{split} is the name of the +@code{to-list}, @code{to-address}, all of @code{extra-aliases} and all +matches of @code{split-regexp}, and the @var{split} is the name of the group. @var{restrict}s are also supported: just set the -@var{split-exclude} parameter to a list of regular expressions. +@code{split-exclude} parameter to a list of regular expressions. If you can't get the right split to be generated using all these parameters, or you just need something fancier, you can set the -parameter @var{split-spec} to an @code{nnmail-split-fancy} split. In +parameter @code{split-spec} to an @code{nnmail-split-fancy} split. In this case, all other aforementioned parameters will be ignored by -@code{gnus-group-split}. In particular, @var{split-spec} may be set to +@code{gnus-group-split}. In particular, @code{split-spec} may be set to @code{nil}, in which case the group will be ignored by @code{gnus-group-split}. @@ -14075,7 +14082,7 @@ this case, all other aforementioned parameters will be ignored by by defining a single @code{&} fancy split containing one split for each group. If a message doesn't match any split, it will be stored in the group named in @code{gnus-group-split-default-catch-all-group}, unless -some group has @var{split-spec} set to @code{catch-all}, in which case +some group has @code{split-spec} set to @code{catch-all}, in which case that group is used as the catch-all group. Even though this variable is often used just to name a group, it may also be set to an arbitrarily complex fancy split (after all, a group name is a fancy split), and this @@ -14125,9 +14132,9 @@ parameters will be scanned to generate the output split. @var{no-crosspost} can be used to disable cross-posting; in this case, a single @code{|} split will be output. @var{catch-all} is the fall back fancy split, used like @code{gnus-group-split-default-catch-all-group}. -If @var{catch-all} is @code{nil}, or if @var{split-regexp} matches the +If @var{catch-all} is @code{nil}, or if @code{split-regexp} matches the empty string in any selected group, no catch-all split will be issued. -Otherwise, if some group has @var{split-spec} set to @code{catch-all}, +Otherwise, if some group has @code{split-spec} set to @code{catch-all}, this group will override the value of the @var{catch-all} argument. @findex gnus-group-split-setup @@ -22397,13 +22404,13 @@ group. If you have seen a message, had it marked as spam, then unmarked it, it won't be marked as spam when you enter the group thereafter. You can disable that behavior, so all unread messages will get the @samp{$} mark, if you set the -@code{spam-mark-only-unseen-as-spam} parameter to nil. You should -remove the @samp{$} mark when you are in the group summary buffer for -every message that is not spam after all. To remove the @samp{$} -mark, you can use @kbd{M-u} to ``unread'' the article, or @kbd{d} for -declaring it read the non-spam way. When you leave a group, all -spam-marked (@samp{$}) articles are sent to a spam processor which -will study them as spam samples. +@code{spam-mark-only-unseen-as-spam} parameter to @code{nil}. You +should remove the @samp{$} mark when you are in the group summary +buffer for every message that is not spam after all. To remove the +@samp{$} mark, you can use @kbd{M-u} to ``unread'' the article, or +@kbd{d} for declaring it read the non-spam way. When you leave a +group, all spam-marked (@samp{$}) articles are sent to a spam +processor which will study them as spam samples. Messages may also be deleted in various other ways, and unless @code{ham-marks} group parameter gets overridden below, marks @samp{R} @@ -22454,16 +22461,16 @@ a ham processor, which will study these as non-spam samples. @vindex spam-process-ham-in-spam-groups By default the variable @code{spam-process-ham-in-spam-groups} is -nil. Set it to t if you want ham found in spam groups to be -processed. Normally this is not done, you are expected instead to -send your ham to a ham group and process it there. +@code{nil}. Set it to @code{t} if you want ham found in spam groups +to be processed. Normally this is not done, you are expected instead +to send your ham to a ham group and process it there. @vindex spam-process-ham-in-nonham-groups By default the variable @code{spam-process-ham-in-nonham-groups} is -nil. Set it to t if you want ham found in non-ham (spam or -unclassified) groups to be processed. Normally this is not done, you -are expected instead to send your ham to a ham group and process it -there. +@code{nil}. Set it to @code{t} if you want ham found in non-ham (spam +or unclassified) groups to be processed. Normally this is not done, +you are expected instead to send your ham to a ham group and process +it there. @vindex gnus-spam-process-destinations When you leave a @emph{ham} or @emph{unclassified} group, all diff --git a/texi/message-ja.texi b/texi/message-ja.texi index 7e22732..b355c1a 100644 --- a/texi/message-ja.texi +++ b/texi/message-ja.texi @@ -1068,7 +1068,7 @@ solution is to use PGP 2.x instead (i.e., if you use @code{pgg}, set @code{pgg-default-scheme} to @code{pgp}). If you do want to use GnuPG, you can use a compatibility script called @code{gpg-2comp} available from -@url{http://muppet.faveve.uni-stuttgart.de/~gero/gpg-2comp/}. You +@uref{http://muppet.faveve.uni-stuttgart.de/~gero/gpg-2comp/}. You could also convince your fellow PGP 2.x users to convert to GnuPG. @vindex mml-signencrypt-style-alist As a final workaround, you can make the sign and encryption work in @@ -1086,7 +1086,7 @@ to change this behavior you can customize the This causes to sign and encrypt in two passes, thus generating a message that can be understood by PGP version 2. -(Refer to @url{http://www.gnupg.org/gph/en/pgp2x.html} for more +(Refer to @uref{http://www.gnupg.org/gph/en/pgp2x.html} for more information about the problem.) @end ignore diff --git a/texi/message.texi b/texi/message.texi index ca27bf3..ec41b32 100644 --- a/texi/message.texi +++ b/texi/message.texi @@ -1050,7 +1050,7 @@ solution is to use PGP 2.x instead (i.e., if you use @code{pgg}, set @code{pgg-default-scheme} to @code{pgp}). If you do want to use GnuPG, you can use a compatibility script called @code{gpg-2comp} available from -@url{http://muppet.faveve.uni-stuttgart.de/~gero/gpg-2comp/}. You +@uref{http://muppet.faveve.uni-stuttgart.de/~gero/gpg-2comp/}. You could also convince your fellow PGP 2.x users to convert to GnuPG. @vindex mml-signencrypt-style-alist As a final workaround, you can make the sign and encryption work in @@ -1068,7 +1068,7 @@ to change this behavior you can customize the This causes to sign and encrypt in two passes, thus generating a message that can be understood by PGP version 2. -(Refer to @url{http://www.gnupg.org/gph/en/pgp2x.html} for more +(Refer to @uref{http://www.gnupg.org/gph/en/pgp2x.html} for more information about the problem.) @node Various Commands diff --git a/texi/texi2latex.el b/texi/texi2latex.el index 35f7a4f..a5e5a26 100644 --- a/texi/texi2latex.el +++ b/texi/texi2latex.el @@ -277,7 +277,8 @@ (latexi-exchange-command (concat "gnus" command) arg)) ((member command '("sc" "file" "dfn" "emph" "kbd" "key" "uref" "code" "samp" "var" "strong" "i" - "result" "email" "env" "r" "command")) + "result" "email" "env" "r" "command" "asis" + "url")) (goto-char (match-beginning 0)) (delete-char 1) (insert "\\gnus")) -- 1.7.10.4