X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=lisp%2Fgnus-msg.el;h=b95bec2ace6879cce2fc082b11a37ed43fe36f82;hp=87eb6af9e3c060b9f6f08fdb906322b57c70fd2f;hb=b8d320e51cd2b549ab453682da8b00119e051c3d;hpb=23c6fe6e28b8b6f356bae60e2fc773c41cd8b540

diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index 87eb6af9e..b95bec2ac 100644
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -1,6 +1,6 @@
 ;;; gnus-msg.el --- mail and post interface for Gnus
 
-;; Copyright (C) 1995-2013 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2016 Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;;	Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -541,11 +541,15 @@ instead."
 		      nil yank-action send-actions return-action))
     (let ((buf (current-buffer))
 	  ;; Don't use posting styles corresponding to any existing group.
-	  (gnus-newsgroup-name "")
+	  (group-name gnus-newsgroup-name)
 	  mail-buf)
-      (gnus-setup-message 'message
-	(message-mail to subject other-headers continue
-		      nil yank-action send-actions return-action))
+      (unwind-protect
+	  (progn
+	    (setq gnus-newsgroup-name "")
+	    (gnus-setup-message 'message
+	      (message-mail to subject other-headers continue
+			    nil yank-action send-actions return-action)))
+	(setq gnus-newsgroup-name group-name))
       (when switch-action
 	(setq mail-buf (current-buffer))
 	(switch-to-buffer buf)
@@ -862,7 +866,7 @@ post using the current select method."
   (let ((message-post-method
 	 `(lambda (arg)
 	    (gnus-post-method (eq ',symp 'a) ,gnus-newsgroup-name)))
-	(user-mail-address user-mail-address))
+	(custom-address user-mail-address))
     (dolist (article (gnus-summary-work-articles n))
       (when (gnus-summary-select-article t nil nil article)
 	;; Pretend that we're doing a followup so that we can see what
@@ -872,12 +876,13 @@ post using the current select method."
 	    (gnus-summary-followup nil)
 	    (let ((from (message-fetch-field "from")))
 	      (when from
-		(setq user-mail-address
+		(setq custom-address
 		      (car (mail-header-parse-address from)))))
 	    (kill-buffer (current-buffer))))
 	;; Now cancel the article using the From header we got.
 	(when (gnus-eval-in-buffer-window gnus-original-article-buffer
-		(message-cancel-news))
+		(let ((user-mail-address (or custom-address user-mail-address)))
+		  (message-cancel-news)))
 	  (gnus-summary-mark-as-read article gnus-canceled-mark)
 	  (gnus-cache-remove-article 1))
 	(gnus-article-hide-headers-if-wanted))
@@ -1725,7 +1730,20 @@ this is a reply."
          (var (or gnus-outgoing-message-group gnus-message-archive-group))
 	 (gcc-self-val
 	  (and group (not (gnus-virtual-group-p group))
-	       (gnus-group-find-parameter group 'gcc-self)))
+	       (gnus-group-find-parameter group 'gcc-self t)))
+	 (gcc-self-get (lambda (gcc-self-val group)
+			 (if (stringp gcc-self-val)
+			     (if (string-match " " gcc-self-val)
+				 (concat "\"" gcc-self-val "\"")
+			       gcc-self-val)
+			   ;; In nndoc groups, we use the parent group name
+			   ;; instead of the current group.
+			   (let ((group (or (gnus-group-find-parameter
+					     gnus-newsgroup-name 'parent-group)
+					    group)))
+			     (if (string-match " " group)
+				 (concat "\"" group "\"")
+			       group)))))
 	 result
 	 (groups
 	  (cond
@@ -1776,19 +1794,11 @@ this is a reply."
 	  (if gcc-self-val
 	      ;; Use the `gcc-self' param value instead.
 	      (progn
-		(insert
-		 (if (stringp gcc-self-val)
-		     (if (string-match " " gcc-self-val)
-			 (concat "\"" gcc-self-val "\"")
-		       gcc-self-val)
-		   ;; In nndoc groups, we use the parent group name
-		   ;; instead of the current group.
-		   (let ((group (or (gnus-group-find-parameter
-				     gnus-newsgroup-name 'parent-group)
-				    group)))
-		     (if (string-match " " group)
-			 (concat "\"" group "\"")
-		       group))))
+		(insert (if (listp gcc-self-val)
+			    (mapconcat (lambda (val)
+					 (funcall gcc-self-get val group))
+				       gcc-self-val ", ")
+			    (funcall gcc-self-get gcc-self-val group)))
 		(if (not (eq gcc-self-val 'none))
 		    (insert "\n")
 		  (gnus-delete-line)))
@@ -1825,7 +1835,7 @@ this is a reply."
 		      (with-current-buffer gnus-summary-buffer
 			gnus-posting-styles)
 		    gnus-posting-styles))
-	  style match attribute value v results
+	  style match attribute value v results matched-string
 	  filep name address element)
       ;; If the group has a posting-style parameter, add it at the end with a
       ;; regexp matching everything, to be sure it takes precedence over all
@@ -1845,7 +1855,9 @@ this is a reply."
 	(when (cond
 	       ((stringp match)
 		;; Regexp string match on the group name.
-		(string-match match group))
+		(when (string-match match group)
+                  (setq matched-string group)
+                  t))
 	       ((eq match 'header)
 		;; Obsolete format of header match.
 		(and (gnus-buffer-live-p gnus-article-copy)
@@ -1874,7 +1886,8 @@ this is a reply."
 			   (nnheader-narrow-to-headers)
 			   (let ((header (message-fetch-field (nth 1 match))))
 			     (and header
-				  (string-match (nth 2 match) header)))))))
+				  (string-match (nth 2 match) header)
+				  (setq matched-string header)))))))
 		 (t
 		  ;; This is a form to be evalled.
 		  (eval match)))))
@@ -1895,10 +1908,11 @@ this is a reply."
 	    (setq v
 		  (cond
 		   ((stringp value)
-		    (if (and (stringp match)
+		    (if (and matched-string
 			     (gnus-string-match-p "\\\\[&[:digit:]]" value)
 			     (match-beginning 1))
-			(gnus-match-substitute-replacement value nil nil group)
+			(gnus-match-substitute-replacement value nil nil
+							   matched-string)
 		      value))
 		   ((or (symbolp value)
 			(functionp value))