diff lisp/gnus/gnus-sum.el @ 90599:c358d0861b16

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 414-422) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 128-130) - Update from CVS - Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-108
author Miles Bader <miles@gnu.org>
date Tue, 05 Sep 2006 02:54:22 +0000
parents 858cb33ae39d de654a6735da
children 8dd8c8286063
line wrap: on
line diff
--- a/lisp/gnus/gnus-sum.el	Thu Aug 31 07:43:01 2006 +0000
+++ b/lisp/gnus/gnus-sum.el	Tue Sep 05 02:54:22 2006 +0000
@@ -992,7 +992,11 @@
   :group 'gnus-summary)
 
 (defvar gnus-decode-encoded-word-function 'mail-decode-encoded-word-string
-  "Variable that says which function should be used to decode a string with encoded words.")
+  "Function used to decode a string with encoded words.")
+
+(defvar gnus-decode-encoded-address-function
+  'mail-decode-encoded-address-string
+  "Function used to decode addresses with encoded words.")
 
 (defcustom gnus-extra-headers '(To Newsgroups)
   "*Extra headers to parse."
@@ -1001,7 +1005,7 @@
   :type '(repeat symbol))
 
 (defcustom gnus-ignored-from-addresses
-  (and user-mail-address  
+  (and user-mail-address
        (not (string= user-mail-address ""))
        (regexp-quote user-mail-address))
   "*Regexp of From headers that may be suppressed in favor of To headers."
@@ -3436,7 +3440,7 @@
 	      (concat "-> "
 		      (inline
 			(gnus-summary-extract-address-component
-			 (funcall gnus-decode-encoded-word-function to)))))
+			 (funcall gnus-decode-encoded-address-function to)))))
 	     ((setq newsgroups (cdr (assq 'Newsgroups extra-headers)))
 	      (concat "=> " newsgroups)))))
      (inline (gnus-summary-extract-address-component gnus-tmp-from)))))
@@ -4182,7 +4186,7 @@
 		   (error x))
 		 (condition-case ()	; from
 		     (gnus-remove-odd-characters
-		      (funcall gnus-decode-encoded-word-function
+		      (funcall gnus-decode-encoded-address-function
 			       (setq x (nnheader-nov-field))))
 		   (error x))
 		 (nnheader-nov-field)	; date
@@ -5956,7 +5960,7 @@
 	    (progn
 	      (goto-char p)
 	      (if (search-forward "\nfrom:" nil t)
-		  (funcall gnus-decode-encoded-word-function
+		  (funcall gnus-decode-encoded-address-function
 			   (nnheader-header-value))
 		"(nobody)"))
 	    ;; Date.
@@ -8449,10 +8453,11 @@
 	;; the parent article.
 	(when (setq to-address (or (gnus-fetch-field "reply-to")
 				   (gnus-fetch-field "from")))
-	  (setq params (append
-			(list (cons 'to-address
-				    (funcall gnus-decode-encoded-word-function
-					     to-address))))))
+	  (setq params
+		(append
+		 (list (cons 'to-address
+			     (funcall gnus-decode-encoded-address-function
+				      to-address))))))
 	(setq dig (nnheader-set-temp-buffer " *gnus digest buffer*"))
 	(insert-buffer-substring gnus-original-article-buffer)
 	;; Remove lines that may lead nndoc to misinterpret the