From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Fri, 13 Feb 2015 07:28:23 +0000 (+1100)
Subject: Buffer-local warning fix
X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=99b7b0ddf235365e9becb0bd97879367874f66e7

Buffer-local warning fix

* gnus-msg.el (gnus-msg-mail): Don't let-bind `gnus-newsgroup-name' so
that we don't get a warning when setting the buffer-local variable
(bug#19573).
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 070b970f9..8110accac 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2015-02-13  Lars Ingebrigtsen  <larsi@gnus.org>
 
+	* gnus-msg.el (gnus-msg-mail): Don't let-bind `gnus-newsgroup-name' so
+	that we don't get a warning when setting the buffer-local variable
+	(bug#19573).
+
 	* nnmail.el (nnmail-expiry-target-group): Supply the info structure to
 	`gnus-request-group'.
 
diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index 6c80c0dac..bfd3da2e6 100644
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -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)