2002-01-05 ShengHuo ZHU <zsh@cs.rochester.edu>

	* gnus-sum.el (gnus-select-group-hook): Typo.

	* rfc2047.el (rfc2047-decode-string): Return immediately if there
	is no quoted-printable-encoded STRING.
	From: Jesper Harder <harder@ifa.au.dk>

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c7aef87..3698efd 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2002-01-05  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus-sum.el (gnus-select-group-hook): Typo.
+
+       * rfc2047.el (rfc2047-decode-string): Return immediately if there
+       is no quoted-printable-encoded STRING.
+       From: Jesper Harder <harder@ifa.au.dk>
+
 2002-01-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus.el (gnus-logo-color-alist): Added more colors from Luis. 

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 78a252b..e60c4e5 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -761,7 +761,7 @@ following hook:
                        header
                        (gnus-simplify-subject
                         (mail-header-subject header) 're-only)))
-                    gnus-newsgroup-headers)))
+                    gnus-newsgroup-headers)))"
   :group 'gnus-group-select
   :type 'hook)
 

diff --git a/lisp/rfc2047.el b/lisp/rfc2047.el
index 10eff84..e3eb8f4 100644 (file)
--- a/lisp/rfc2047.el
+++ b/lisp/rfc2047.el
@@ -1,5 +1,5 @@
 ;;; rfc2047.el --- Functions for encoding and decoding rfc2047 messages
-;; Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;     MORIOKA Tomohiko <morioka@jaist.ac.jp>
@@ -534,14 +534,16 @@ The buffer may be narrowed."
 
 (defun rfc2047-decode-string (string)
   "Decode the quoted-printable-encoded STRING and return the results."
-  (let ((m (mm-multibyte-p)))
-    (with-temp-buffer
-      (when m
-       (mm-enable-multibyte))
-      (insert string)
-      (inline
-       (rfc2047-decode-region (point-min) (point-max)))
-      (buffer-string))))
+  (if (string-match "=\\?" string)
+      (let ((m (mm-multibyte-p)))
+       (with-temp-buffer
+         (when m
+           (mm-enable-multibyte))
+         (insert string)
+         (inline
+           (rfc2047-decode-region (point-min) (point-max)))
+         (buffer-string)))
+    string))
 
 (defun rfc2047-parse-and-decode (word)
   "Decode WORD and return it if it is an encoded word.