message.el (gnus-extract-address-components): Remove bogus declaration that was maski...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 10ab0a0..757eca8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-27  Glenn Morris  <rgm@gnu.org>
+
+       * message.el (gnus-extract-address-components):
+       Remove bogus declaration that was masking previous problem.
+
 2015-04-25  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * hashcash.el (hashcash-insert-payment-async-2): Save the mark when

diff --git a/lisp/message.el b/lisp/message.el
index b8a69b0..85b917d 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -4041,8 +4041,6 @@ This function uses `mail-citation-hook' if that is non-nil."
   "Cite function in the standard Message manner."
   (message-cite-original-1 nil))
 
-(defvar gnus-extract-address-components)
-
 (autoload 'format-spec "format-spec")
 (autoload 'gnus-date-get-time "gnus-util")
 
@@ -4064,7 +4062,7 @@ See `message-citation-line-format'."
     (unless from
       (setq from (mail-header-from message-reply-headers)))
     (let* ((data (condition-case ()
-                    (funcall (if (boundp gnus-extract-address-components)
+                    (funcall (if (boundp 'gnus-extract-address-components)
                                  gnus-extract-address-components
                                'mail-extract-address-components)
                              from)