From: shuhei-k <shuhei-k>
Date: Fri, 19 Jun 1998 08:41:50 +0000 (+0000)
Subject: (message-check-news-header-syntax): Funcall
X-Git-Tag: semi-mule-199811302358~66
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ce248f94442e48b836c8e89bc79e3fa4959d161;p=elisp%2Fgnus.git-

(message-check-news-header-syntax): Funcall
`gnus-extract-address-components'.
(message-user-mail-address): Ditto.
(message-generate-headers): Ditto.
(message-buffer-name): Ditto.
(message-cancel-news): Ditto.
(message-supersede): Ditto.
---

diff --git a/lisp/message.el b/lisp/message.el
index 36b616f..c966dd5 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -2541,7 +2541,7 @@ to find out how to use this."
    (message-check 'from
      (let* ((case-fold-search t)
 	    (from (message-fetch-field "from"))
-	    (ad (nth 1 (mail-extract-address-components from))))
+	    (ad (nth 1 (funcall gnus-extract-address-components from))))
        (cond
 	((not from)
 	 (message "There is no From line.  Posting is denied.")
@@ -2942,7 +2942,7 @@ give as trustworthy answer as possible."
   "Return the pertinent part of `user-mail-address'."
   (when user-mail-address
     (if (string-match " " user-mail-address)
-	(nth 1 (mail-extract-address-components user-mail-address))
+	(nth 1 (funcall gnus-extract-address-components user-mail-address))
       user-mail-address)))
 
 (defun message-make-fqdn ()
@@ -3084,13 +3084,15 @@ Headers already prepared in the buffer are not modified."
 		   (not (message-check-element 'sender))
 		   (not (string=
 			 (downcase
-			  (cadr (mail-extract-address-components from)))
+			  (cadr (funcall gnus-extract-address-components
+					 from)))
 			 (downcase secure-sender)))
 		   (or (null sender)
 		       (not
 			(string=
 			 (downcase
-			  (cadr (mail-extract-address-components sender)))
+			  (cadr (funcall gnus-extract-address-components
+					 sender)))
 			 (downcase secure-sender)))))
 	  (goto-char (point-min))
 	  ;; Rename any old Sender headers to Original-Sender.
@@ -3204,7 +3206,7 @@ Headers already prepared in the buffer are not modified."
      (concat "*" type
 	     (if to
 		 (concat " to "
-			 (or (car (mail-extract-address-components to))
+			 (or (car (funcall gnus-extract-address-components to))
 			     to) "")
 	       "")
 	     (if (and group (not (string= group ""))) (concat " on " group) "")
@@ -3704,9 +3706,10 @@ that further discussion should take place only in "
  			  (downcase sender)
  			  (downcase (message-make-sender))))
  		    (string-equal
- 		     (downcase (cadr (mail-extract-address-components from)))
- 		     (downcase (cadr (mail-extract-address-components
- 				      (message-make-from))))))
+ 		     (downcase (cadr (funcall gnus-extract-address-components
+					      from)))
+ 		     (downcase (cadr (funcall gnus-extract-address-components
+					      (message-make-from))))))
 	  (error "This article is not yours"))
 	;; Make control message.
 	(setq buf (set-buffer (get-buffer-create " *message cancel*")))
@@ -3740,8 +3743,8 @@ header line with the old Message-ID."
     ;; Check whether the user owns the article that is to be superseded.
     (unless (string-equal
 	     (downcase (or (message-fetch-field "sender")
-			   (cadr (mail-extract-address-components
-				  (message-fetch-field "from")))))
+			   (cadr (funcall gnus-extract-address-components
+					  (message-fetch-field "from")))))
 	     (downcase (message-make-sender)))
       (error "This article is not yours"))
     ;; Get a normal message buffer.