From a84297ba44892db20dd7790634fffd9f30010052 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Mon, 21 Feb 2011 18:59:44 -0800 Subject: [PATCH] (gnus-inews-add-send-actions): Restore the winconf name after exit. --- lisp/ChangeLog | 3 +++ lisp/gnus-msg.el | 12 ++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3b01f9503..2fb29bc52 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2011-02-22 Lars Ingebrigtsen + * gnus-msg.el (gnus-inews-add-send-actions): Restore the winconf name + after exit. + * gnus-sum.el (gnus-summary-show-article): When called with t as the value, show the raw article. diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el index b199dcc57..29ac43115 100644 --- a/lisp/gnus-msg.el +++ b/lisp/gnus-msg.el @@ -388,6 +388,7 @@ Thank you for your help in stamping out bugs. (yanked (make-symbol "gnus-setup-yanked-articles")) (group (make-symbol "gnus-setup-message-group"))) `(let ((,winconf (current-window-configuration)) + (,winconf-name gnus-current-window-configuration) (,buffer (buffer-name (current-buffer))) (,article gnus-article-reply) (,yanked gnus-article-yanked-articles) @@ -432,7 +433,7 @@ Thank you for your help in stamping out bugs. (progn ,@forms) (gnus-inews-add-send-actions ,winconf ,buffer ,article ,config - ,yanked) + ,yanked ,winconf-name) (setq gnus-message-buffer (current-buffer)) (set (make-local-variable 'gnus-message-group-art) (cons ,group ,article)) @@ -527,7 +528,8 @@ Gcc: header for archiving purposes." (throw 'found (cons (cadr elem) (caddr elem))))))))) (defun gnus-inews-add-send-actions (winconf buffer article - &optional config yanked) + &optional config yanked + winconf-name) (gnus-make-local-hook 'message-sent-hook) (add-hook 'message-sent-hook (if gnus-agent 'gnus-agent-possibly-do-gcc 'gnus-inews-do-gcc) nil t) @@ -538,8 +540,10 @@ Gcc: header for archiving purposes." `(lambda (&optional arg) (gnus-post-method arg ,gnus-newsgroup-name))) (message-add-action - `(when (gnus-buffer-exists-p ,buffer) - (set-window-configuration ,winconf)) + `(progn + (setq gnus-current-window-configuration ,winconf-name) + (when (gnus-buffer-exists-p ,buffer) + (set-window-configuration ,winconf))) 'exit 'postpone 'kill) (let ((to-be-marked (cond (yanked -- 2.25.1