Synch to Gnus 200306031138.

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index e290ca9..522abbf 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,7 @@
+2003-06-03  Kai Gro\e,A_\e(Bjohann  <kai.grossjohann@gmx.net>
+
+       * README: Explain purpose of each file (well, most files).
+
 2003-05-01  Vasily Korytov  <deskpot@despammed.com>
 
        * gpg.el (gpg-passphrase-forget): Check that gpg-passphrase is

diff --git a/contrib/README b/contrib/README
index 76d0e5c..7c3c3fc 100644 (file)
--- a/contrib/README
+++ b/contrib/README
@@ -1,3 +1,59 @@
-The files in this directory are not (yet) part of the
-Gnus distribution proper.  They may later become part
-of the distribution, or they may disappear altogether.
+The files in this directory are not (yet) part of the Gnus
+distribution proper.  They may later become part of the distribution,
+or they may disappear altogether.
+
+Please note that it is not good to just add this directory to
+load-path: a number of files in this directory will become part of
+more recent Emacs versions, so that you might be running obsolete
+libraries with all kinds of ill effects.
+
+The suggested method for installation is to copy those files that you
+need to a directory which is in load-path.
+
+Here is an overview of the files:
+
+base64.el
+
+        As of Emacs 21, base64 encoding and decoding is available
+        natively.  So this file appears to be needed for Emacs 20
+        only.
+
+gpg-ring.el
+gpg.el
+
+hashcash.el
+
+md5.el
+
+       MD5 encoding is part of Emacs as of Emacs 21.2.  Hence, this
+       file is not needed for those Emacs versions.
+
+one-line-cookie.diff
+
+ssl.el
+
+ucs-tables.el
+
+       This file provides improved Unicode functionality.  It defines
+       functions unify-8859-on-encoding-mode and
+       unify-8859-on-decoding-mode which unify the Latin-N charsets.
+       Without unify-8859-on-encoding-mode, composing a Latin-9 reply
+       to a Latin-1 posting, say, will produce a multipart posting (a
+       Latin-1 part and a Latin-9 part), or perhaps UTF-8.  With
+       unify-8859-on-encoding-mode, the outgoing posting can be all
+       Latin-1 or all Latin-9 in most cases.
+
+       It is harmless to turn on unify-8859-on-encoding-mode, but
+       unify-8859-on-decoding-mode may unexpectedly change files in
+       certain situations.  (If the file contains different Latin-N
+       charsets which should not be unified.)
+
+       This is part of Emacs 21.3 and later, which also turns on
+       unify-8859-on-encoding-mode by default.
+
+vcard.el
+
+xml.el
+
+       This is used for parsing RSS feeds.  Part of Emacs 21.3 and
+       later.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bb66feb..cca493e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,18 @@
+2003-06-03  Kai Gro\e,A_\e(Bjohann  <kai.grossjohann@gmx.net>
+
+       * nnmail.el (nnmail-split-fancy-match-partial-words): New user
+       option.
+       (nnmail-split-it): Obey it.  Don't let-bind regexp twice.
+
+       * message.el (message-fetch-field): Mention narrow-to-headers
+       requirement.
+
+2003-06-03  Jesper Harder  <harder@ifa.au.dk>
+
+       * gnus-xmas.el (gnus-xmas-create-image): Use
+       insert-file-contents-literally.  From: Eric Eide
+       <eeide@cs.utah.edu>
+
 2003-06-02  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * gnus-registry.el (gnus-registry-fetch-group): always return the

diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el
index 0cdf905..2139537 100644 (file)
--- a/lisp/gnus-xmas.el
+++ b/lisp/gnus-xmas.el
@@ -889,7 +889,7 @@ XEmacs compatibility workaround."
       (with-temp-buffer
        (if data-p
            (insert file)
-         (insert-file-contents file))
+         (insert-file-contents-literally file))
        (shell-command-on-region (point-min) (point-max)
                                 "ppmtoxpm 2>/dev/null" t)
        (setq file (buffer-string)
@@ -901,7 +901,7 @@ XEmacs compatibility workaround."
            (with-temp-buffer
              (if data-p
                  (insert file)
-               (insert-file-contents file))
+               (insert-file-contents-literally file))
              (make-glyph
               (vector
                (or (intern type)

diff --git a/lisp/message.el b/lisp/message.el
index 9430c6c..d6e2ad6 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1767,7 +1767,9 @@ is used by default."
       (looking-at message-unix-mail-delimiter))))
 
 (defun message-fetch-field (header &optional not-all)
-  "The same as `mail-fetch-field', only remove all newlines."
+  "The same as `mail-fetch-field', only remove all newlines.
+Note that the buffer should be narrowed to the headers; see
+function `message-narrow-to-headers-or-head'."
   (let* ((inhibit-point-motion-hooks t)
         (case-fold-search t)
         (value (mail-fetch-field header nil (not not-all))))

diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index 06ee776..2312d2c 100644 (file)
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -502,6 +502,14 @@ parameter.  It should return nil, `warn' or `delete'."
   :group 'nnmail
   :type 'boolean)
 
+(defcustom nnmail-split-fancy-match-partial-words nil
+  "Whether to match partial words when fancy splitting.
+Normally, regexes given in `nnmail-split-fancy' are implicitly surrounded
+by \"\\<...\\>\".  If this is true, they are not implicitly surrounded by
+anything."
+  :group 'nnmail
+  :type 'boolean)
+
 ;;; Internal variables.
 
 (defvar nnmail-article-buffer " *nnmail incoming*"
@@ -1343,8 +1351,9 @@ See the documentation for the variable `nnmail-split-fancy' for details."
      (t
       (let* ((field (nth 0 split))
             (value (nth 1 split))
-            partial-front regexp
-            partial-rear  regexp)
+            partial-front
+            partial-rear
+            regexp)
        (if (symbolp value)
            (setq value (cdr (assq value nnmail-split-abbrev-alist))))
        (if (and (>= (length value) 2)
@@ -1356,6 +1365,9 @@ See the documentation for the variable `nnmail-split-fancy' for details."
                 (string= ".*" (substring value -2)))
            (setq value (substring value 0 -2)
                  partial-rear ""))
+       (when nnmail-split-fancy-match-partial-words
+         (setq partial-front ""
+               partial-rear ""))
        (setq regexp (concat "^\\(\\("
                             (if (symbolp field)
                                 (cdr (assq field nnmail-split-abbrev-alist))