From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 3697E431FD0 for ; Wed, 9 Nov 2011 12:06:57 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.1 X-Spam-Level: X-Spam-Status: No, score=-0.1 tagged_above=-999 required=5 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id N5Ur8tcvqtwo for ; Wed, 9 Nov 2011 12:06:56 -0800 (PST) Received: from ks3536.kimsufi.com (schnouki.net [87.98.217.222]) by olra.theworths.org (Postfix) with ESMTP id 5A56D431FB6 for ; Wed, 9 Nov 2011 12:06:56 -0800 (PST) Received: from localhost.localdomain (4va54-1-87-88-247-156.dsl.sta.abo.bbox.fr [87.88.247.156]) by ks3536.kimsufi.com (Postfix) with ESMTPSA id 4DBC96A0026; Wed, 9 Nov 2011 21:06:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=schnouki.net; s=key-schnouki; t=1320869215; bh=iWXcLqcIVX/b4xYt46X5V09FIcXu4egn2h7O0X1qt6M=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References; b=PZWtt6xuTYeJ+tz0JTVOR60uU5EHSyEJ9nS8xx3+eG3xNPEatS7AUVXzAu3+xTPMk YMylxe1GkCpABZE3JfgzVP8PxCG8OWrJgDktiT4QG8WP+ViaKoWYjWql1eHqOdOLYP liDIUj72jSP24xDFHJSA1lkLXdkZztwYvEePlh50= From: Thomas Jost To: notmuch@notmuchmail.org Subject: [PATCH v2] emacs: Let the user choose where to compose new mails Date: Wed, 9 Nov 2011 21:06:09 +0100 Message-Id: <1320869169-32596-1-git-send-email-schnouki@schnouki.net> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <87ipmt8700.fsf@schnouki.net> References: <87ipmt8700.fsf@schnouki.net> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Nov 2011 20:06:57 -0000 --- emacs/notmuch-mua.el | 40 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 38 insertions(+), 2 deletions(-) diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el index 8824b08..90834d6 100644 --- a/emacs/notmuch-mua.el +++ b/emacs/notmuch-mua.el @@ -31,6 +31,21 @@ :group 'notmuch :type 'hook) +(defcustom notmuch-mua-compose-in 'current-window + "Where to create the mail buffer used to compose a new message. + Possible values are `current-window' (default), `new-window' + and `new-frame'. If set to `current-window', the mail buffer + will be displayed in the current window, so the old buffer will + be restored when the mail buffer is killed. If set to + `new-window' or `new-frame', the mail buffer will be displayed + in a new window/frame that will be destroyed when the buffer is + killed. You may want to customize `message-kill-buffer-on-exit' + accordingly." + :group 'notmuch + :type '(choice (const :tag "Compose in the current window" current-window) + (const :tag "Compose mail in a new window" new-window) + (const :tag "Compose mail in a new frame" new-frame))) + (defcustom notmuch-mua-user-agent-function 'notmuch-mua-user-agent-full "Function used to generate a `User-Agent:' string. If this is `nil' then no `User-Agent:' will be generated." @@ -48,6 +63,23 @@ list." ;; +(defun notmuch-mua-get-switch-function () + "Get a switch function according to `notmuch-mua-compose-in'." + (cond ((eq notmuch-mua-compose-in 'current-window) + 'switch-to-buffer) + ((eq notmuch-mua-compose-in 'new-window) + 'switch-to-buffer-other-window) + ((eq notmuch-mua-compose-in 'new-frame) + 'switch-to-buffer-other-frame) + (t (error "Invalid value for `notmuch-mua-compose-in'")))) + +(defun notmuch-mua-maybe-set-window-dedicated () + "Set the selected window as dedicated according to +`notmuch-mua-compose-in'." + (when (or (eq notmuch-mua-compose-in 'new-frame) + (eq notmuch-mua-compose-in 'new-window)) + (set-window-dedicated-p (selected-window) t))) + (defun notmuch-mua-user-agent-full () "Generate a `User-Agent:' string suitable for notmuch." (concat (notmuch-mua-user-agent-notmuch) @@ -99,7 +131,8 @@ list." ((same-window-regexps '("\\*mail .*"))) (notmuch-mua-mail (mail-header 'to headers) (mail-header 'subject headers) - (message-headers-to-generate headers t '(to subject)))) + (message-headers-to-generate headers t '(to subject)) + nil (notmuch-mua-get-switch-function))) ;; insert the message body - but put it in front of the signature ;; if one is present (goto-char (point-max)) @@ -112,6 +145,7 @@ list." (message-goto-body)) (defun notmuch-mua-forward-message () + (funcall (notmuch-mua-get-switch-function) (current-buffer)) (message-forward) (when notmuch-mua-user-agent-function @@ -121,6 +155,7 @@ list." (message-sort-headers) (message-hide-headers) (set-buffer-modified-p nil) + (notmuch-mua-maybe-set-window-dedicated) (message-goto-to)) @@ -143,6 +178,7 @@ list." (message-sort-headers) (message-hide-headers) (set-buffer-modified-p nil) + (notmuch-mua-maybe-set-window-dedicated) (message-goto-to)) @@ -199,7 +235,7 @@ the From: address first." (let ((other-headers (when (or prompt-for-sender notmuch-always-prompt-for-sender) (list (cons 'from (notmuch-mua-prompt-for-sender)))))) - (notmuch-mua-mail nil nil other-headers))) + (notmuch-mua-mail nil nil other-headers nil (notmuch-mua-get-switch-function)))) (defun notmuch-mua-new-forward-message (&optional prompt-for-sender) "Invoke the notmuch message forwarding window. -- 1.7.7.3