From 45af066b0fa522e7f1f39399be3d7c8748bb083d Mon Sep 17 00:00:00 2001 From: yamaoka Date: Wed, 3 Mar 2004 05:57:01 +0000 Subject: [PATCH] Synch to No Gnus 200403030541. --- lisp/ChangeLog | 25 +++++++++++++++++++++++++ lisp/dgnushack.el | 4 +++- lisp/gnus-cus.el | 2 +- lisp/gnus-range.el | 22 +++++++++++++++++++--- lisp/gnus-sum.el | 3 ++- texi/ChangeLog | 20 ++++++++++++++++++++ texi/emacs-mime.texi | 4 +++- texi/gnus-ja.texi | 14 +++++++++++++- texi/gnus.texi | 20 +++++++++++++++++--- 9 files changed, 103 insertions(+), 11 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c57437f..a05b3bd 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,28 @@ +2004-03-03 Katsumi Yamaoka + + * gnus-cus.el (gnus-agent-customize-category): Mismatched paren. + +2004-03-02 Kevin Greiner + + * gnus-cus.el (gnus-agent-customize-category): Removed + ignore-errors macro reference that required cl to be loaded at + run-time. + + * gnus-range.el (gnus-sorted-range-intersection): Now accepts + single-interval range of the form (min . max). Previously the + range had to look like ((min . max)). Likewise, return + (min . max) rather than ((min . max)). + (gnus-range-map): Use gnus-range-normalize to accept + single-interval range. + + * gnus-sum.el (gnus-summary-highlight-line): Articles stored in + the cache, but not the agent, now appear with their usual face. + + * dgnushack.el (loaddir): New variable that is bound to the + directory containing the dgnushack.el file. Use loaddir, rather + than srcdir, to update load-path. Change lets dgnushack compile + code in directories other than GNUS/lisp. + 2004-03-01 Katsumi Yamaoka * lpath.el: Don't bind w3m-safe-url-regexp. diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el index 7dfc4ea..0562a62 100644 --- a/lisp/dgnushack.el +++ b/lisp/dgnushack.el @@ -56,6 +56,7 @@ (load "cl-macs" nil t)) (defvar srcdir (or (getenv "srcdir") ".")) +(defvar loaddir (and load-file-name (file-name-directory load-file-name))) (defvar dgnushack-w3-directory (let ((w3dir (getenv "W3DIR"))) (unless (zerop (length w3dir)) @@ -267,7 +268,8 @@ Try to re-configure with --with-addpath=FLIM_PATH and run make again. (set-syntax-table stab))))) (push srcdir load-path) -(load (expand-file-name "lpath.el" srcdir) nil t t) +(push loaddir load-path) +(load (expand-file-name "lpath.el" loaddir) nil t) (require 'custom) diff --git a/lisp/gnus-cus.el b/lisp/gnus-cus.el index 2b198d9..fac490b 100644 --- a/lisp/gnus-cus.el +++ b/lisp/gnus-cus.el @@ -985,7 +985,7 @@ articles in the thread. (widgets category-fields)) (while widgets (let* ((widget (pop widgets)) - (value (condition-case nil (widget-value widget) (error))))) + (value (condition-case nil (widget-value widget) (error)))) (eval `(setf (,(widget-get widget :accessor) ',info) ',value))))) (gnus-category-write) diff --git a/lisp/gnus-range.el b/lisp/gnus-range.el index ffe47c1..eea1737 100644 --- a/lisp/gnus-range.el +++ b/lisp/gnus-range.el @@ -189,9 +189,19 @@ LIST1 and LIST2 have to be sorted over <." RANGE1 and RANGE2 have to be sorted over <." (let* (out (min1 (car range1)) - (max1 (if (numberp min1) min1 (prog1 (cdr min1) (setq min1 (car min1))))) + (max1 (if (numberp min1) + (if (numberp (cdr range1)) + (prog1 (cdr range1) + (setq range1 nil)) min1) + (prog1 (cdr min1) + (setq min1 (car min1))))) (min2 (car range2)) - (max2 (if (numberp min2) min2 (prog1 (cdr min2) (setq min2 (car min2)))))) + (max2 (if (numberp min2) + (if (numberp (cdr range2)) + (prog1 (cdr range2) + (setq range2 nil)) min2) + (prog1 (cdr min2) + (setq min2 (car min2)))))) (setq range1 (cdr range1) range2 (cdr range2)) (while (and min1 min2) @@ -218,7 +228,12 @@ RANGE1 and RANGE2 have to be sorted over <." (setq min2 (car range2) max2 (if (numberp min2) min2 (prog1 (cdr min2) (setq min2 (car min2)))) range2 (cdr range2)))) - (nreverse out))) + (cond ((cdr out) + (nreverse out)) + ((numberp (car out)) + out) + (t + (car out))))) ;;;###autoload (defalias 'gnus-set-sorted-intersection 'gnus-sorted-nintersection) @@ -628,6 +643,7 @@ LIST is a sorted list." (defun gnus-range-map (func range) "Apply FUNC to each value contained by RANGE." + (setq range (gnus-range-normalize range)) (while range (let ((span (pop range))) (if (numberp span) diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index 9afefab..cf3f965 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -11412,7 +11412,8 @@ If REVERSE, save parts that do not match TYPE." (default-high gnus-summary-default-high-score) (default-low gnus-summary-default-low-score) (uncached (and gnus-summary-use-undownloaded-faces - (memq article gnus-newsgroup-undownloaded)))) + (memq article gnus-newsgroup-undownloaded) + (not (memq article gnus-newsgroup-cached))))) (let ((face (funcall (gnus-summary-highlight-line-0)))) (unless (eq face (get-text-property beg 'face)) (gnus-put-text-property-excluding-characters-with-faces diff --git a/texi/ChangeLog b/texi/ChangeLog index 3911955..d0da138 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,23 @@ +2004-03-03 Katsumi Yamaoka + + * gnus.texi: Enclose the iflatex section with iftex. + (Gnus Unplugged): Use pxref instead of xref. + + * emacs-mime.texi: Enclose the iflatex section with iftex. + +2004-03-02 Kevin Greiner + + * emacs-mime.texi: Wrapped documentencoding inside of iflatex as + documentencoding is not supported by infohack. + + * gnus.texi: Wrapped documentencoding inside of iflatex as + documentencoding is not supported by infohack. + Changed file's character coding to utf-8 as the file contains + characters that can not be encoded using iso-8859-1. + (Gnus Unplugged): Reference gnus-agent variable. + (Agent Variables): Added gnus-agent. + + 2004-02-17 Katsumi Yamaoka * gnus.texi (X-Face): Add uncompface-use-external. diff --git a/texi/emacs-mime.texi b/texi/emacs-mime.texi index e536993..25671f6 100644 --- a/texi/emacs-mime.texi +++ b/texi/emacs-mime.texi @@ -9,8 +9,10 @@ @direntry * Emacs MIME: (emacs-mime). The MIME de/composition library. @end direntry -@documentencoding ISO-8859-1 @iftex +@iflatex +@documentencoding ISO-8859-1 +@end iflatex @finalout @end iftex @setchapternewpage odd diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index 5f48af2..7929da4 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -16683,7 +16683,8 @@ gnus-namazu-update-all-indices} とする必要があるかもしれません。 に任せるようにすることは理にかなっています。 Gnus を ``オフライン'' のニュースリーダーとして仕立てるのは極めて簡単で -す。実際、あなたは何も設定する必要が無いのです。 +す。実際、エージェントは今やディフォルトで有効になっている (@pxref{Agent +Variables, gnus-agent}) ので、あなたは何も設定する必要が無いのです。 もちろん、これをオフラインニュースリーダーとして使うには、いくつか新しい 命令を覚えなくてはなりません。 @@ -17641,6 +17642,17 @@ Variables} 参照)。 @subsection エージェント変数 @table @code +@item gnus-agent +@vindex gnus-agent +エージェントが有効になっているかどうか。ディフォルトは @code{t} です。 +最初に有効にされると、いくつかのバックエンドをエージェント化するために、 +エージェントは @code{gnus-agent-auto-agentize-methods} を使います。サー +バーバッファでエージェントのコマンドを使うことによって、どのバックエン +ドをエージェント化するかを変更することができます。 + +サーバーバッファに入るには、グループバッファ +で @kbd{^} (@code{gnus-group-enter-server-mode}) を使って下さい。 + @item gnus-agent-directory @vindex gnus-agent-directory Gnus エージェントがファイルを格納する場所。初期設定値 diff --git a/texi/gnus.texi b/texi/gnus.texi index 7623e17..9795da5 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -9,8 +9,10 @@ @direntry * Gnus: (gnus). The newsreader Gnus. @end direntry -@documentencoding ISO-8859-1 @iftex +@iflatex +@documentencoding ISO-8859-1 +@end iflatex @finalout @end iftex @setchapternewpage odd @@ -17432,7 +17434,8 @@ functionality up to the newsreader makes sense if you're the only person reading news on a machine. Setting up Gnus as an ``offline'' newsreader is quite simple. In -fact, you don't even have to configure anything. +fact, you don't have to configure anything as the agent is now enabled +by default (@pxref{Agent Variables, gnus-agent}). Of course, to use it as such, you have to learn a few new commands. @@ -18420,6 +18423,17 @@ ask you to confirm your action (see @subsection Agent Variables @table @code +@item gnus-agent +@vindex gnus-agent +Is the agent enabled? The default is @code{t}. When first enabled, +the agent will use @code{gnus-agent-auto-agentize-methods} to +automatically mark some backends as agentized. You may change which +backends are agentized using the agent commands in the server buffer. + +To enter the server buffer, use the @kbd{^} +(@code{gnus-group-enter-server-mode}) command in the group buffer. + + @item gnus-agent-directory @vindex gnus-agent-directory Where the Gnus Agent will store its files. The default is @@ -28272,5 +28286,5 @@ former). The manual is unambiguous, but it can be confusing. @c Local Variables: @c mode: texinfo -@c coding: iso-8859-1 +@c coding: utf-8 @c End: -- 1.7.10.4