Synch to Oort Gnus 200305042241

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c656d29..27d2e12 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,7 @@
 
        * rfc2047.el (with-syntax-table): Define if necessary.
        (rfc2047-syntax-table): Fix last change for XEmacs.
+       (rfc2047-parse-and-decode): Revert last change.
 
 2003-05-03  Jesper Harder  <harder@ifa.au.dk>
 
@@ -138,10 +139,10 @@
 2003-05-01  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * spam-report.el (spam-report-gmane-regex): docstring fix.  From
-       Jon Ericson <Jon.Ericson@jpl.nasa.gov>
+       Jon Ericson <Jon.Ericson@jpl.nasa.gov> (tiny change)
 
        * gnus.el (gnus-install-group-spam-parameters): docstring fix.
-       From Jon Ericson <Jon.Ericson@jpl.nasa.gov>
+       From Jon Ericson <Jon.Ericson@jpl.nasa.gov> (tiny change)
 
        * gnus-registry.el (gnus-registry-fetch-extra) 
        (gnus-registry-store-extra, gnus-registry-group-count): new functions

diff --git a/lisp/rfc2047.el b/lisp/rfc2047.el
index b452e60..5b311a3 100644 (file)
--- a/lisp/rfc2047.el
+++ b/lisp/rfc2047.el
@@ -656,12 +656,14 @@ Return WORD if it is not not an encoded word or if the charset isn't
 decodable."
   (if (not (string-match rfc2047-encoded-word-regexp word))
       word
-    (condition-case nil
-       (rfc2047-decode
-        (match-string 1 word)
-        (upcase (match-string 2 word))
-        (match-string 3 word))
-      (error word))))
+    (or
+     (condition-case nil
+        (rfc2047-decode
+         (match-string 1 word)
+         (upcase (match-string 2 word))
+         (match-string 3 word))
+       (error word))
+     word)))                           ; un-decodable
 
 (defun rfc2047-pad-base64 (string)
   "Pad STRING to quartets."