From b008390c2a1e2b0904e1281cd1b1cf07adff3bec Mon Sep 17 00:00:00 2001 From: yamaoka Date: Fri, 7 Feb 2003 15:15:45 +0000 Subject: [PATCH] Synch to Oort Gnus. --- lisp/ChangeLog | 14 ++++++++++++++ lisp/gnus-msg.el | 6 ++++++ lisp/gnus-sum.el | 12 ++++++------ lisp/mail-source.el | 24 +++++++++++++++--------- texi/ChangeLog | 4 ++++ texi/Makefile.in | 7 +++---- texi/gnus-ja.texi | 16 +++++++++++++++- texi/gnus.texi | 15 ++++++++++++++- texi/texi2latex.el | 2 +- 9 files changed, 78 insertions(+), 22 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 48d2ab5..a1cf07b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,17 @@ +2003-02-07 Lars Magne Ingebrigtsen + + * mail-source.el (mail-source-fetch): Ignore errors. + (mail-source-ignore-errors): New variable. + + * gnus-sum.el (gnus-summary-refer-thread): Don't re-fetch current + articles. + + * gnus-msg.el (gnus-version-expose-system): Change default. + +2003-02-07 Vasily Korytov + + * gnus-msg.el (gnus-version-expose-system): New variable. + 2003-02-07 Simon Josefsson * mml-sec.el (mml-unsecure-message): Don't use kill-region. Tiny diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el index dcdca78..2488063 100644 --- a/lisp/gnus-msg.el +++ b/lisp/gnus-msg.el @@ -309,6 +309,12 @@ If nil, the address field will always be empty after invoking :group 'gnus-message :type 'boolean) +(defcustom gnus-version-expose-system nil + "If non-nil, `system-configuration' is exposed in `gnus-extended-version'. +Note that this variable is ineffective in T-gnus." + :group 'gnus-message + :type 'boolean) + ;;; Internal variables. (defvar gnus-inhibit-posting-styles nil diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index 30e1dd1..b9b39e9 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -7967,16 +7967,16 @@ of what's specified by the `gnus-refer-thread-limit' variable." (let ((id (mail-header-id (gnus-summary-article-header))) (limit (if limit (prefix-numeric-value limit) gnus-refer-thread-limit))) - ;; We want to fetch LIMIT *old* headers, but we also have to - ;; re-fetch all the headers in the current buffer, because many of - ;; them may be undisplayed. So we adjust LIMIT. - (when (numberp limit) - (incf limit (- gnus-newsgroup-end gnus-newsgroup-begin))) (unless (eq gnus-fetch-old-headers 'invisible) (gnus-message 5 "Fetching headers for %s..." gnus-newsgroup-name) ;; Retrieve the headers and read them in. (if (eq (gnus-retrieve-headers - (list gnus-newsgroup-end) gnus-newsgroup-name limit) + (list (min + (+ (mail-header-number + (gnus-summary-article-header)) + limit) + gnus-newsgroup-end)) + gnus-newsgroup-name (* limit 2)) 'nov) (gnus-build-all-threads) (error "Can't fetch thread from backends that don't support NOV")) diff --git a/lisp/mail-source.el b/lisp/mail-source.el index fd193b5..1ed294f 100644 --- a/lisp/mail-source.el +++ b/lisp/mail-source.el @@ -231,6 +231,11 @@ See Info node `(gnus)Mail Source Specifiers'." (const :format "" :value :plugged) (boolean :tag "Plugged"))))))) +(defcustom mail-source-ignore-errors nil + "*Ignore errors when querying mail sources. +If nil, the user will be prompted when an error occurs. If non-nil, +the error will be ignored.") + (defcustom mail-source-primary-source nil "*Primary source for incoming mail. If non-nil, this maildrop will be checked periodically for new mail." @@ -478,15 +483,16 @@ Return the number of files that were found." (condition-case err (funcall function source callback) (error - (unless (yes-or-no-p - (format "Mail source %s error (%s). Continue? " - (if (memq ':password source) - (let ((s (copy-sequence source))) - (setcar (cdr (memq ':password s)) - "********") - s) - source) - (cadr err))) + (if (and (not mail-source-ignore-error) + (yes-or-no-p + (format "Mail source %s error (%s). Continue? " + (if (memq ':password source) + (let ((s (copy-sequence source))) + (setcar (cdr (memq ':password s)) + "********") + s) + source) + (cadr err)))) (error "Cannot get new mail")) 0))))))))) diff --git a/texi/ChangeLog b/texi/ChangeLog index 8c3b9d5..1d04330 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,7 @@ +2003-02-07 Lars Magne Ingebrigtsen + + * gnus.texi (Mail Source Customization): Addition. + 2003-02-04 Reiner Steib * message.texi (Mail Variables): Added index entry for diff --git a/texi/Makefile.in b/texi/Makefile.in index 3ef328f..a45ab99 100644 --- a/texi/Makefile.in +++ b/texi/Makefile.in @@ -177,10 +177,10 @@ gnus.latexi gnus-faq.latexi message.latexi emacs-mime.latexi sieve.latexi: $(src TEXINPUTS=$(srcdir):$$TEXINPUTS $(PDFLATEX) gnus.tmplatexi mv gnus.pdf $@ -latexps: latex gnus.dvi-x +latexps: gnus.dvi-x TEXPICTS=$(srcdir) $(DVIPS) -t a4 -f $< > gnus.ps -latexpdf: latex gnus.pdf-x +latexpdf: gnus.pdf-x mv gnus.pdf-x gnus.pdf gnus-manual-a4.latexi: gnus.latexi @@ -208,8 +208,7 @@ psout: latexboth out latexboth: gnus-manual-a4.ps.gz gnus-manual-standard.ps.gz out: - scp gnus-manual-*.ps.gz gnus-manual-*.pdf - www@quimby:html/gnus/documents + scp gnus-manual-*.ps.gz gnus-manual-*.pdf www@quimby:html/gnus/documents veryclean: clean rm -f gnus.dvi gnus.ps texi2latex.elc diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index 0c52f84..1b7ade3 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -68,6 +68,8 @@ \newcommand{\gnusversion}[1]{{\small\textit{#1}}} \newcommand{\gnusauthor}[1]{{\large\textbf{#1}}} \newcommand{\gnusresult}[1]{\gnustt{=> #1}} +\newcommand{\gnusacronym}[1]{\textit{#1}} +\newcommand{\gnusemail}[1]{\textit{#1}} \newcommand{\gnusbullet}{{${\bullet}$}} \newcommand{\gnusdollar}{\$} @@ -8114,7 +8116,6 @@ gnus が記事を表示する既定のやり方を変えたいとき @item W m @kindex W m (概略) @findex gnus-summary-morse-message -@c @icon{gnus-summary-morse-message} 記事バッファをモールス復号します (@code{gnus-summary-morse-message})。 @item W t @@ -10513,6 +10514,14 @@ ISP が POP-before-SMTP の認証を要求している場合に有用です。関 なくとも、メーリングリストへのフォローアップはたいていのときに動作します。 これらのグループに投稿する事は (@kbd{a}) それでも苦痛を引き起こすでしょ うけど。 + +@item gnus-version-expose-system +@vindex gnus-version-expose-system + +ディフォルトでシステムタイプ (@samp{i686-pc-linux} のよう +な @code{system-configuration} 変数の値) が自動的に生成され +る User-Agent ヘッダーに現れます。それは (主に美的感覚によって) 消すこと +が望まれるかもしれません。そういう場合は、これを @code{nil} にして下さい。 @end table あなたは自分が送るメッセージの綴りを調べたいと思うかも知れません。もしく @@ -12681,6 +12690,11 @@ UNDELETED} はおそらくたいていの人には最良の選択でしょうが、ときど @code{nil} でなければ、入って来たファイルは、それを処理した後に消去され ます。 +@item mail-source-ignore-errors +@vindex mail-source-ignore-errors +非-@code{nil} だったら、メールソースからメールを読むときのエラーを無視し +ます。 + @item mail-source-directory @vindex mail-source-directory ファイルが (もしあれば) 保存されるディレクトリーです。初期値 diff --git a/texi/gnus.texi b/texi/gnus.texi index c1f5385..8aff37a 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -68,6 +68,8 @@ \newcommand{\gnusversion}[1]{{\small\textit{#1}}} \newcommand{\gnusauthor}[1]{{\large\textbf{#1}}} \newcommand{\gnusresult}[1]{\gnustt{=> #1}} +\newcommand{\gnusacronym}[1]{\textit{#1}} +\newcommand{\gnusemail}[1]{\textit{#1}} \newcommand{\gnusbullet}{{${\bullet}$}} \newcommand{\gnusdollar}{\$} @@ -8282,7 +8284,6 @@ is rumored to have employed this form of, uh, somewhat weak encryption. @item W m @kindex W m (Summary) @findex gnus-summary-morse-message -@c @icon{gnus-summary-morse-message} Morse decode the article buffer (@code{gnus-summary-morse-message}). @item W t @@ -11062,6 +11063,14 @@ really are mailing lists. Then, at least, followups to the mailing lists will work most of the time. Posting to these groups (@kbd{a}) is still a pain, though. +@item gnus-version-expose-system +@vindex gnus-version-expose-system + +Your system type (@code{system-configuration} variable, such as +@samp{i686-pc-linux}) is exposed in the auto-generated by default +User-Agent header. Sometimes, it may be desireable (mostly because of +aesthetic reasons) to turn it off. In this case, set it to @code{nil}. + @end table You may want to do spell-checking on messages that you send out. Or, if @@ -13299,6 +13308,10 @@ File where mail will be stored while processing it. The default is @vindex mail-source-delete-incoming If non-@code{nil}, delete incoming files after handling them. +@item mail-source-ignore-errors +@vindex mail-source-ignore-errors +If non-@code{nil}, ignore errors when reading mail from a mail source. + @item mail-source-directory @vindex mail-source-directory Directory where files (if any) will be stored. The default is diff --git a/texi/texi2latex.el b/texi/texi2latex.el index 42b0793..b9da0d4 100644 --- a/texi/texi2latex.el +++ b/texi/texi2latex.el @@ -262,7 +262,7 @@ (latexi-exchange-command (concat "gnus" command) arg)) ((member command '("sc" "file" "dfn" "emph" "kbd" "key" "uref" "code" "samp" "var" "strong" "i" - "result")) + "result" "acronym" "email")) (goto-char (match-beginning 0)) (delete-char 1) (insert "\\gnus")) -- 1.7.10.4