Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-553

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 118-121)

   - Update from CVS
   - Merge from emacs--cvs-trunk--0

2005-09-16  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus.el (gnus-group-startup-message): Bind image-load-path.

2005-09-14  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-art.el (gnus-mime-display-part): Protect against broken
   MIME messages.

2005-09-15  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/gnus.texi (Finding the Parent): Fix description of how Gnus
   finds article.

2005-09-14  Jari Aalto  <jari.aalto@cante.net>

   * man/gnus.texi (Advanced Scoring Examples): New exmples to teach how
   to drop off non-answered articles.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index f6023ae23c26ddae131cc180ff6775839993aa4c..08fd723cf1f8d208c91852d6b125b3aa6bebee23 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -3,6 +3,15 @@
        * sieve.el (sieve-help): Fix `message' call: first arg should be a
        format spec.
        
+2005-09-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus.el (gnus-group-startup-message): Bind image-load-path.
+
+2005-09-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-art.el (gnus-mime-display-part): Protect against broken
+       MIME messages.
+
 2005-09-13  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-sum.el (gnus-summary-edit-article-done): Remove text props

diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 3bdc93935bc6dca674b33b5c5d69b0a719fcfe97..3821f9ecf1852f78772b4ea524eeed9ba3ee0b92 100644 (file)
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -4761,6 +4761,8 @@ If displaying \"text/html\" is discouraged \(see
 
 (defun gnus-mime-display-part (handle)
   (cond
+   ;; Maybe a broken MIME message.
+   ((null handle))
    ;; Single part.
    ((not (stringp (car handle)))
     (gnus-mime-display-single handle))

diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index d0e199e2d0625b13f57a9237bceb716a642d2859..5d35137aec68040eed2087d4b9b65f2c70295737 100644 (file)
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -1006,6 +1006,11 @@ be set in `.emacs' instead."
      (fboundp 'find-image)
      (display-graphic-p)
      (let* ((data-directory (nnheader-find-etc-directory "images/gnus"))
+           (image-load-path (cond (data-directory
+                                   (list data-directory))
+                                  ((boundp 'image-load-path)
+                                   (symbol-value 'image-load-path))
+                                  (t load-path)))
            (image (find-image
                    `((:type xpm :file "gnus.xpm"
                             :color-symbols

diff --git a/man/ChangeLog b/man/ChangeLog
index 48e63b03777592bb391420f07f34057667c7f3c7..73c842de77a729427d41c208a5da9dcd6bf2d4cc 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,13 @@
+2005-09-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus.texi (Finding the Parent): Fix description of how Gnus
+       finds article.
+
+2005-09-14  Jari Aalto  <jari.aalto@cante.net>
+
+       * gnus.texi (Advanced Scoring Examples): New exmples to teach how
+       to drop off non-answered articles.
+
 2005-09-19  Juanma Barranquero  <lekktu@gmail.com>
 
        * makefile.w32-in (newsticker.dvi): Fix erroneous use of curly

diff --git a/man/gnus.texi b/man/gnus.texi
index 8b70a6b15b3a9150f06c7890a2268675e41b4127..df3b4bf706b2d3e71a0b1922cb4909161c1799aa 100644 (file)
--- a/man/gnus.texi
+++ b/man/gnus.texi
@@ -9624,17 +9624,16 @@ by giving the @kbd{A T} command a numerical prefix.
 @kindex M-^ (Summary)
 @cindex Message-ID
 @cindex fetching by Message-ID
-You can also ask the @acronym{NNTP} server for an arbitrary article, no
-matter what group it belongs to.  @kbd{M-^}
-(@code{gnus-summary-refer-article}) will ask you for a
-@code{Message-ID}, which is one of those long, hard-to-read thingies
-that look something like @samp{<38o6up$6f2@@hymir.ifi.uio.no>}.  You
-have to get it all exactly right.  No fuzzy searches, I'm afraid.
-@end table
+You can also ask Gnus for an arbitrary article, no matter what group it
+belongs to.  @kbd{M-^} (@code{gnus-summary-refer-article}) will ask you
+for a @code{Message-ID}, which is one of those long, hard-to-read
+thingies that look something like @samp{<38o6up$6f2@@hymir.ifi.uio.no>}.
+You have to get it all exactly right.  No fuzzy searches, I'm afraid.
 
-The current select method will be used when fetching by
-@code{Message-ID} from non-news select method, but you can override this
-by giving this command a prefix.
+Gnus looks for the @code{Message-ID} in the headers that have already
+been fetched, but also tries all the select methods specified by
+@code{gnus-refer-article-method} if it is not found.
+@end table
 
 @vindex gnus-refer-article-method
 If the group you are reading is located on a back end that does not
@@ -20501,8 +20500,19 @@ very interesting:
  1000)
 @end example
 
-The possibilities are endless.
+Suppose you're reading a high volume group and you're only interested
+in replies. The plan is to score down all articles that don't have
+subject that begin with "Re:", "Fw:" or "Fwd:" and then score up all
+parents of articles that have subjects that begin with reply marks.
 
+@example
+((! ("subject" "re:\\|fwd?:" r))
+  -200)
+((1- ("subject" "re:\\|fwd?:" r))
+  200)
+@end example
+
+The possibilities are endless.
 
 @node Advanced Scoring Tips
 @subsection Advanced Scoring Tips