Buffer-local warning fix
authorLars Magne Ingebrigtsen <larsi@gnus.org>
Fri, 13 Feb 2015 07:28:23 +0000 (18:28 +1100)
committerLars Magne Ingebrigtsen <larsi@gnus.org>
Fri, 13 Feb 2015 07:28:23 +0000 (18:28 +1100)
* 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).

lisp/ChangeLog
lisp/gnus-msg.el

index 070b970..8110acc 100644 (file)
@@ -1,5 +1,9 @@
 2015-02-13  Lars Ingebrigtsen  <larsi@gnus.org>
 
 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'.
 
        * nnmail.el (nnmail-expiry-target-group): Supply the info structure to
        `gnus-request-group'.
 
index 6c80c0d..bfd3da2 100644 (file)
@@ -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.
                      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)
          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)
       (when switch-action
        (setq mail-buf (current-buffer))
        (switch-to-buffer buf)