From: yamaoka Date: Wed, 8 Dec 2004 13:13:11 +0000 (+0000) Subject: Synch to No Gnus 200412081310. X-Git-Tag: t-gnus-6_17_4-quimby-~644 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=8754d3a67cec19160b35606b961574e7114265ce;p=elisp%2Fgnus.git- Synch to No Gnus 200412081310. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 81a7ef9..63ec7c9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,20 @@ +2004-11-25 Reiner Steib + + * message.el (message-forbidden-properties): Fixed typo in doc + string. + +2004-11-25 Reiner Steib + + * gnus-util.el (gnus-replace-in-string): Added doc string. + + * nnmail.el (nnmail-split-header-length-limit): Increase to 2048 + to avoid problems when splitting mails with many recipients. + +2004-11-22 Stefan Monnier + + * gnus-sum.el (gnus-summary-exit): Remove redundant and harmful + pop-to-buffer, covered by the subsequent gnus-configure-windows. + 2004-12-05 Nelson Ferreira * spam-stat.el (spam-stat-save): Load the hashtable from disk only @@ -270,8 +287,8 @@ * sieve.el (sieve): Add :version. - * sha1.el (sha1): Added :version. - (sha1-use-external): Removed redundant version. + * sha1.el (sha1): Add :version. + (sha1-use-external): Remove redundant version. * nnmail.el (nnmail-split-fancy-with-parent-ignore-groups) (nnmail-cache-ignore-groups, nnmail-spool-hook) @@ -283,8 +300,8 @@ * mml2015.el (mml2015-unabbrev-trust-alist): Add :version. * mml-sec.el (mml-default-sign-method) - (mml-default-encrypt-method, mml-signencrypt-style-alist): Add - :version. + (mml-default-encrypt-method, mml-signencrypt-style-alist): + Add :version. * mm-uu.el (mm-uu-diff-groups-regexp): Add :version. @@ -345,8 +362,8 @@ * html2text.el: Beautify code. Improve doc strings. Some checkdoc cleanup. (html2text-get-attr, html2text-fix-paragraph): Simplify code. - (html2text-format-tag-list): Added "strong" and "em". From - "Alfred M. Szmidt" (tiny change). + (html2text-format-tag-list): Add "strong" and "em". + From "Alfred M. Szmidt" (tiny change). 2004-10-29 Teodor Zlatanov @@ -368,8 +385,8 @@ . * mm-util.el (mm-coding-system-priorities): Prefer iso-8859-1 than - iso-2022-jp even in the Japanese language environment. Suggested - by Jason Rumney . + iso-2022-jp even in the Japanese language environment. + Suggested by Jason Rumney . 2004-10-28 Katsumi Yamaoka @@ -412,7 +429,7 @@ >>>>>>> 7.511 2004-10-25 Reiner Steib - * html2text.el (html2text-buffer-head): Removed. Use `goto-char' + * html2text.el (html2text-buffer-head): Remove. Use `goto-char' instead. 2004-10-25 Teodor Zlatanov diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index 74f59dc..863fe89 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -6726,22 +6726,19 @@ If FORCE (the prefix), also save the .newsrc file(s)." (when (eq mode 'gnus-summary-mode) (gnus-kill-buffer buf))) (setq gnus-current-select-method gnus-select-method) - (if leave-hidden - (set-buffer gnus-group-buffer) - (pop-to-buffer gnus-group-buffer)) - (if (not quit-config) - (progn - (goto-char group-point) - (unless leave-hidden - (gnus-configure-windows 'group 'force)) - (unless (pos-visible-in-window-p) - (forward-line (/ (static-if (featurep 'xemacs) - (window-displayed-height) - (1- (window-height))) - -2)) - (set-window-start (selected-window) (point)) - (goto-char group-point))) - (gnus-handle-ephemeral-exit quit-config)) + (set-buffer gnus-group-buffer) + (if quit-config + (gnus-handle-ephemeral-exit quit-config) + (goto-char group-point) + (unless leave-hidden + (gnus-configure-windows 'group 'force)) + (unless (pos-visible-in-window-p) + (forward-line (/ (static-if (featurep 'xemacs) + (window-displayed-height) + (1- (window-height))) + -2)) + (set-window-start (selected-window) (point)) + (goto-char group-point))) ;; Clear the current group name. (unless quit-config (setq gnus-newsgroup-name nil))))) diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el index 19ab5e7..beaf6f7 100644 --- a/lisp/gnus-util.el +++ b/lisp/gnus-util.el @@ -64,6 +64,11 @@ (defalias 'gnus-replace-in-string 'replace-in-string)) ((fboundp 'replace-regexp-in-string) (defun gnus-replace-in-string (string regexp newtext &optional literal) + "Replace all matches for REGEXP with NEWTEXT in STRING. +If LITERAL is non-nil, insert NEWTEXT literally. Return a new +string containing the replacements. + +This is a compatibility function for different Emacsen." (replace-regexp-in-string regexp newtext string nil literal))))) (defun gnus-boundp (variable) diff --git a/lisp/message.el b/lisp/message.el index e27c770..2b8abe7 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -2660,7 +2660,7 @@ message composition doesn't break too bad." ;; fontified: is used by font-lock. ;; syntax-table, local-map: I dunno. ;; We need to add XEmacs names to the list. - "Property list of with properties.forbidden in message buffers. + "Property list of with properties forbidden in message buffers. The values of the properties are ignored, only the property names are used.") (defun message-tamago-not-in-use-p (pos) diff --git a/lisp/nnmail.el b/lisp/nnmail.el index 93dfd7e..b0b2861 100644 --- a/lisp/nnmail.el +++ b/lisp/nnmail.el @@ -552,7 +552,7 @@ parameter. It should return nil, `warn' or `delete'." :group 'nnmail :type '(repeat symbol)) -(defcustom nnmail-split-header-length-limit 512 +(defcustom nnmail-split-header-length-limit 2048 "Header lines longer than this limit are excluded from the split function." :version "21.1" :group 'nnmail diff --git a/texi/ChangeLog b/texi/ChangeLog index eaf072f..b147902 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,14 @@ +2004-11-22 Reiner Steib + + * message.texi (Various Message Variables): Mention that all mail + file variables are derived from `message-directory'. + + * gnus.texi (Splitting Mail): Clarify bogus group. + +2004-11-16 Reiner Steib + + * gnus.texi (Filtering Spam Using The Spam ELisp Package): + 2004-12-07 Teodor Zlatanov * gnus.texi (Filtering Spam Using The Spam ELisp Package) diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index 1b64671..7e94c74 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -12554,13 +12554,17 @@ Splitting}. それは、メールがそのグループに属すると考えるのであれば、@code{nil} でな い値を帰す必要があります。 -これらの最後は常に総合的なものであるべきで、他の正規表現に合致しないメー -ルに合致するために、この正規表現は @emph{いつも} @samp{*}であるべきです。 -(これらの法則は連想リストの初めから終わりまで順番に実行されます。相互投 -稿 (crosspost) を使用可能にしていない限り、最初の合致した法則が ``勝ちま -す''。相互投稿を使用可能にしている場合、全ての合致した法則が ``勝ちま -す''。) メール分割によって新しいグループが作られた場合は、それらを見るた -めに @code{gnus-group-find-new-groups} を実行する必要があるでしょう。 +@cindex @samp{bogus} group +これらのグループの最後は常に総合的なものであるべきで、他の正規表現に合致 +しないメールに合致するために、この正規表現は @emph{いつも} @samp{""}であ +るべきです。(これらの法則は連想リストの初めから終わりまで順番に実行され +ます。相互投稿 (crosspost) を使用可能にしていない限り、最初の合致した法 +則が ``勝ちます''。相互投稿を使用可能にしている場合、全ての合致した法則 +が ``勝ちます''。) 合致する規則がなかったら、メールは最後 +に @samp{bogus} グループで終わります。メール分割によって新しいグループが +作られた場合は、それらを見るために @code{gnus-group-find-new-groups} を +実行する必要があるでしょう。これは @samp{bogus} グループにも当てはまりま +す。 もしあなた自身でこれをいじくりまわしたいときは、あなたの選んだ関数をこの 変数に設定する事ができます。この関数は入って来たメールメッセージのヘッダー @@ -12577,7 +12581,7 @@ Splitting}. メールバックエンドはすべて相互投稿の機能を提供しています。いくつかの正規 表現が合致すると、メールは全てのグループに ``相互投稿'' されます。 @code{nnmail-crosspost} はこの機能を使うかどうかを指定します。どの記事も -総合の (@samp{*}) グループに相互投稿されない事に注意してください。 +総合の (@samp{""}) グループに相互投稿されない事に注意してください。 @vindex nnmail-crosspost-link-function @cindex crosspost diff --git a/texi/gnus.texi b/texi/gnus.texi index 96eea00..17ccace 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -13346,14 +13346,16 @@ called narrowed to the headers with the first element of the rule as the argument. It should return a non-@code{nil} value if it thinks that the mail belongs in that group. +@cindex @samp{bogus} group The last of these groups should always be a general one, and the regular -expression should @emph{always} be @samp{*} so that it matches any mails +expression should @emph{always} be @samp{""} so that it matches any mails that haven't been matched by any of the other regexps. (These rules are -processed from the beginning of the alist toward the end. The first -rule to make a match will ``win'', unless you have crossposting enabled. -In that case, all matching rules will ``win''.) When new groups are -created by splitting mail, you may want to run -@code{gnus-group-find-new-groups} to see the new groups. +processed from the beginning of the alist toward the end. The first rule +to make a match will ``win'', unless you have crossposting enabled. In +that case, all matching rules will ``win''.) If no rule matched, the mail +will end up in the @samp{bogus} group. When new groups are created by +splitting mail, you may want to run @code{gnus-group-find-new-groups} to +see the new groups. This also applies to the @samp{bogus} group. If you like to tinker with this yourself, you can set this variable to a function of your choice. This function will be called without any @@ -13370,7 +13372,7 @@ some add @code{X-Gnus-Group} headers; most rename the Unix mbox The mail back ends all support cross-posting. If several regexps match, the mail will be ``cross-posted'' to all those groups. @code{nnmail-crosspost} says whether to use this mechanism or not. Note -that no articles are crossposted to the general (@samp{*}) group. +that no articles are crossposted to the general (@samp{""}) group. @vindex nnmail-crosspost-link-function @cindex crosspost diff --git a/texi/message.texi b/texi/message.texi index fa4781f..accafdd 100644 --- a/texi/message.texi +++ b/texi/message.texi @@ -1919,6 +1919,7 @@ follows this line--} by default. @item message-directory @vindex message-directory Directory used by many mailey things. The default is @file{~/Mail/}. +All other mail file variables are derived from @code{message-directory}. @item message-auto-save-directory @vindex message-auto-save-directory