From: Jameson Graef Rollins Date: Sat, 14 Apr 2012 20:42:17 +0000 (+1700) Subject: [PATCH v5] emacs: Let the user choose where to compose new mails X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=6e305d8228922fc6389bad3dcf50e9194a53fe41;p=notmuch-archives.git [PATCH v5] emacs: Let the user choose where to compose new mails --- diff --git a/1b/705249ac486b16414ef927658d82ddbe77606e b/1b/705249ac486b16414ef927658d82ddbe77606e new file mode 100644 index 000000000..2c5049443 --- /dev/null +++ b/1b/705249ac486b16414ef927658d82ddbe77606e @@ -0,0 +1,165 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 91BFE431FAF + for ; Sat, 14 Apr 2012 13:42:20 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -2.3 +X-Spam-Level: +X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_MED=-2.3] 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 0SU9PyfyWMDj for ; + Sat, 14 Apr 2012 13:42:19 -0700 (PDT) +Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu + [131.215.239.19]) + by olra.theworths.org (Postfix) with ESMTP id CC493431FAE + for ; Sat, 14 Apr 2012 13:42:19 -0700 (PDT) +Received: from fire-doxen.imss.caltech.edu (localhost [127.0.0.1]) + by fire-doxen-postvirus (Postfix) with ESMTP id 7584A2E50E6E + for ; Sat, 14 Apr 2012 13:42:19 -0700 (PDT) +X-Spam-Scanned: at Caltech-IMSS on fire-doxen by amavisd-new +Received: from finestructure.net (unknown [76.89.193.65]) + (Authenticated sender: jrollins) + by fire-doxen-submit (Postfix) with ESMTP id 7A3722E50E76 + for ; Sat, 14 Apr 2012 13:42:17 -0700 (PDT) +Received: by finestructure.net (Postfix, from userid 1000) + id 2F8F945D; Sat, 14 Apr 2012 13:42:17 -0700 (PDT) +From: Jameson Graef Rollins +To: Notmuch Mail +Subject: [PATCH v5] emacs: Let the user choose where to compose new mails +Date: Sat, 14 Apr 2012 13:42:17 -0700 +Message-Id: <1334436137-6099-1-git-send-email-jrollins@finestructure.net> +X-Mailer: git-send-email 1.7.9.5 +In-Reply-To: <1334434815-7657-1-git-send-email-jrollins@finestructure.net> +References: <1334434815-7657-1-git-send-email-jrollins@finestructure.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: Sat, 14 Apr 2012 20:42:20 -0000 + +From: Thomas Jost + +Introduce a new defcustom notmuch-mua-compose-in that allows users to +specify where new mails are composed, either in the current window or +in a new window or frame. + +Signed-off-by: Jameson Rollins +--- +There was a small bug in the previous rebased version of this patch +that this new version fixes. Sorry about the noise. + +I also updated the subject line to indicate that this is in fact the +fifth version of this patch. + + emacs/notmuch-mua.el | 40 ++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 38 insertions(+), 2 deletions(-) + +diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el +index 87bd88d..1fb59de 100644 +--- a/emacs/notmuch-mua.el ++++ b/emacs/notmuch-mua.el +@@ -36,6 +36,21 @@ + :group 'notmuch-send + :group 'notmuch-hooks) + ++(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." +@@ -55,6 +70,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) +@@ -148,7 +180,8 @@ list." + collect pair))) + (notmuch-mua-mail (plist-get reply-headers :To) + (plist-get reply-headers :Subject) +- (notmuch-headers-plist-to-alist reply-headers)))) ++ (notmuch-headers-plist-to-alist reply-headers) ++ nil (notmuch-mua-get-switch-function)))) + + ;; Insert the message body - but put it in front of the signature + ;; if one is present +@@ -186,6 +219,7 @@ list." + (set-buffer-modified-p nil)) + + (defun notmuch-mua-forward-message () ++ (funcall (notmuch-mua-get-switch-function) (current-buffer)) + (message-forward) + + (when notmuch-mua-user-agent-function +@@ -195,6 +229,7 @@ list." + (message-sort-headers) + (message-hide-headers) + (set-buffer-modified-p nil) ++ (notmuch-mua-maybe-set-window-dedicated) + + (message-goto-to)) + +@@ -217,6 +252,7 @@ OTHER-ARGS are passed through to `message-mail'." + (message-sort-headers) + (message-hide-headers) + (set-buffer-modified-p nil) ++ (notmuch-mua-maybe-set-window-dedicated) + + (message-goto-to)) + +@@ -273,7 +309,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.9.5 +