Re: [PATCH v2] notmuch-emacs-mua: do not create a frame by default with --client

diff --git a/b5/d9e5a88d577ae2e33172011be8db19777295cd b/b5/d9e5a88d577ae2e33172011be8db19777295cd
new file mode 100644 (file)
index 0000000..344deb0
--- /dev/null
+++ b/b5/d9e5a88d577ae2e33172011be8db19777295cd
@@ -0,0 +1,95 @@
+Return-Path: <tomi.ollila@iki.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id D8A806DE1919\r
+ for <notmuch@notmuchmail.org>; Mon,  6 Apr 2015 06:04:39 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 1.214\r
+X-Spam-Level: *\r
+X-Spam-Status: No, score=1.214 tagged_above=-999 required=5 tests=[AWL=0.562, \r
+ SPF_NEUTRAL=0.652] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id EqHDSzkpeMUe for <notmuch@notmuchmail.org>;\r
+ Mon,  6 Apr 2015 06:04:36 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+ by arlo.cworth.org (Postfix) with ESMTP id C0CCD6DE17BF\r
+ for <notmuch@notmuchmail.org>; Mon,  6 Apr 2015 06:04:35 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+ by guru.guru-group.fi (Postfix) with ESMTP id 3D91210019F;\r
+ Mon,  6 Apr 2015 16:04:13 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v2] notmuch-emacs-mua: do not create a frame by default\r
+ with --client\r
+In-Reply-To: <1428132606-8624-1-git-send-email-jani@nikula.org>\r
+References: <87d23o4gzd.fsf@maritornes.cs.unb.ca>\r
+ <1428132606-8624-1-git-send-email-jani@nikula.org>\r
+User-Agent: Notmuch/0.19+107~gab55bdb (http://notmuchmail.org) Emacs/24.3.1\r
+ (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+ $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+ !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Mon, 06 Apr 2015 16:04:13 +0300\r
+Message-ID: <m2twwt9zn6.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.18\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 06 Apr 2015 13:04:40 -0000\r
+\r
+On Sat, Apr 04 2015, Jani Nikula <jani@nikula.org> wrote:\r
+\r
+> Make the default behaviour for --client the same as emacsclient\r
+> default: do not create a new frame. Add a new option --create-frame,\r
+> passing the same option to emacsclient to create a frame.\r
+>\r
+> ---\r
+>\r
+> v2: fix killing frame with --create-frame\r
+> ---\r
+>  doc/man1/notmuch-emacs-mua.rst | 14 +++++++++-----\r
+>  notmuch-emacs-mua              | 29 ++++++++++++++++++++---------\r
+>  2 files changed, 29 insertions(+), 14 deletions(-)\r
+>\r
+> diff --git a/doc/man1/notmuch-emacs-mua.rst b/doc/man1/notmuch-emacs-mua.rst\r
+> index 36b51cdc3b18..e39d9e5fba1f 100644\r
+> --- a/doc/man1/notmuch-emacs-mua.rst\r
+> +++ b/doc/man1/notmuch-emacs-mua.rst\r
+> @@ -122,6 +125,14 @@ for arg; do\r
+>      ELISP="${ELISP} (message-goto-to) (insert \"${arg}, \")"\r
+>  done\r
+>  \r
+> +# If reusing a frame in emacsclient, don't kill the buffer.\r
+> +if [ -n "$CREATE_FRAME" ]; then\r
+> +    ELISP="${ELISP} (setq message-exit-actions (list #'save-buffers-kill-terminal))"\r
+> +elif [ -z "$USE_EMACSCLIENT" ]; then\r
+> +    echo "$0: --create-frame is only applicable with --client." >&2\r
+> +    exit 1\r
+> +fi\r
+> +\r
+\r
+# If reusing a frame in emacsclient, don't kill the buffer.\r
+if [ -n "$CREATE_FRAME" ]; then\r
+    if [ -z "$USE_EMACSCLIENT" ]; then\r
+        echo "$0: --create-frame is only applicable with --client." >&2\r
+        exit 1\r
+    fi\r
+    ELISP="${ELISP} (setq message-exit-actions (list #'save-buffers-kill-terminal))"\r
+fi\r
+\r
+should work better...\r
+\r
+Tomi\r