Synch to No Gnus 200403032326.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dc1c752..1cec34c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-04  Jesper Harder  <harder@ifa.au.dk>
+
+       * rfc2047.el (rfc2047-encoded-word-regexp): Support RFC 2231
+       language tags.
+
 2004-03-03  Per Abrahamsen  <abraham@dina.kvl.dk>
 
        * gnus-agent.el (gnus-agent-read-local, gnus-agent-save-local):

diff --git a/lisp/rfc2047.el b/lisp/rfc2047.el
index f8796d5..e14d020 100644 (file)
--- a/lisp/rfc2047.el
+++ b/lisp/rfc2047.el
@@ -607,8 +607,8 @@ By default, the region is treated as containing addresses (see
 
 (eval-and-compile
   (defconst rfc2047-encoded-word-regexp
-    "=\\?\\([^][\000-\040()<>@,\;:\\\"/?.=]+\\)\\?\\(B\\|Q\\)\
-\\?\\([!->@-~ +]*\\)\\?="))
+    "=\\?\\([^][\000-\040()<>@,\;:*\\\"/?.=]+\\)(?:\\*[^?]+\\)?\
+\\?\\(B\\|Q\\)\\?\\([!->@-~ +]*\\)\\?="))
 
 ;; Fixme: This should decode in place, not cons intermediate strings.
 ;; Also check whether it needs to worry about delimiting fields like