From 6cbda2f48e7a40dc9e99310dc6f10a602e11dc28 Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Sun, 22 Mar 2015 22:35:12 +0200 Subject: [PATCH] Re: [PATCH] notmuch-emacs-mua: do not create a frame by default with --client --- 5d/7e14b00e496860fe2d907f5ca42f2bc459a1a2 | 189 ++++++++++++++++++++++ 1 file changed, 189 insertions(+) create mode 100644 5d/7e14b00e496860fe2d907f5ca42f2bc459a1a2 diff --git a/5d/7e14b00e496860fe2d907f5ca42f2bc459a1a2 b/5d/7e14b00e496860fe2d907f5ca42f2bc459a1a2 new file mode 100644 index 000000000..e3a5a7e4a --- /dev/null +++ b/5d/7e14b00e496860fe2d907f5ca42f2bc459a1a2 @@ -0,0 +1,189 @@ +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 25915431FC2 + for ; Sun, 22 Mar 2015 13:35:41 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 2.438 +X-Spam-Level: ** +X-Spam-Status: No, score=2.438 tagged_above=-999 required=5 + tests=[DNS_FROM_AHBL_RHSBL=2.438] 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 N711mikhzvfh for ; + Sun, 22 Mar 2015 13:35:37 -0700 (PDT) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id 33A31431FBF + for ; Sun, 22 Mar 2015 13:35:37 -0700 (PDT) +Received: from guru.guru-group.fi (localhost [IPv6:::1]) + by guru.guru-group.fi (Postfix) with ESMTP id 6D6A7100086; + Sun, 22 Mar 2015 22:35:12 +0200 (EET) +From: Tomi Ollila +To: Jani Nikula , notmuch@notmuchmail.org +Subject: Re: [PATCH] notmuch-emacs-mua: do not create a frame by default + with --client +In-Reply-To: <1427055269-4742-1-git-send-email-jani@nikula.org> +References: <1427055269-4742-1-git-send-email-jani@nikula.org> +User-Agent: Notmuch/0.19+92~g61c04e8 (http://notmuchmail.org) Emacs/24.3.1 + (x86_64-unknown-linux-gnu) +X-Face: HhBM'cA~ +MIME-Version: 1.0 +Content-Type: text/plain +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: Sun, 22 Mar 2015 20:35:41 -0000 + +On Sun, Mar 22 2015, Jani Nikula wrote: + +> Make the default behaviour for --client the same as emacsclient +> default: do not create a new frame. Add a new option --create-frame, +> passing the same option to emacsclient to create a frame. +> +> --- + +Changes LGTM. + +Tomi + +> +> With this, 'notmuch-emacs-mua --client' does what I want, which was +> not possible with any combination of options before. Please see if you +> can still do what you want! +> --- +> doc/man1/notmuch-emacs-mua.rst | 14 +++++++++----- +> notmuch-emacs-mua | 29 ++++++++++++++++++++--------- +> 2 files changed, 29 insertions(+), 14 deletions(-) +> +> diff --git a/doc/man1/notmuch-emacs-mua.rst b/doc/man1/notmuch-emacs-mua.rst +> index 36b51cdc3b18..e39d9e5fba1f 100644 +> --- a/doc/man1/notmuch-emacs-mua.rst +> +++ b/doc/man1/notmuch-emacs-mua.rst +> @@ -18,10 +18,6 @@ Supported options for **notmuch-emacs-mua** include +> ``-h, --help`` +> Display help. +> +> - ``--client`` +> - Use emacsclient, rather than emacs. This will start +> - an emacs daemon process if necessary. +> - +> ``-s, --subject=``\ +> Specify the subject of the message. +> +> @@ -38,7 +34,15 @@ Supported options for **notmuch-emacs-mua** include +> Specify a file to include into the body of the message. +> +> ``--no-window-system`` +> - Even if a window system is available, use the current terminal +> + Even if a window system is available, use the current terminal. +> + +> + ``--client`` +> + Use **emacsclient**, rather than **emacs**. This will start +> + an emacs daemon process if necessary. +> + +> + ``--create-frame`` +> + When --client is specified, create a new frame instead of trying +> + to use the current Emacs frame. +> +> ``--print`` +> Output the resulting elisp to stdout instead of evaluating it. +> diff --git a/notmuch-emacs-mua b/notmuch-emacs-mua +> index 13f67bee4417..68c2643df581 100755 +> --- a/notmuch-emacs-mua +> +++ b/notmuch-emacs-mua +> @@ -31,12 +31,12 @@ EMACS=${EMACS-emacs} +> EMACSCLIENT=${EMACSCLIENT-emacsclient} +> +> PRINT_ONLY= +> +NO_WINDOW= +> USE_EMACSCLIENT= +> -CLIENT_TYPE="-c" +> +CREATE_FRAME= +> +> # The crux of it all: construct an elisp progn and eval it. +> ELISP="(prog1 'done (require 'notmuch) (notmuch-mua-new-mail)" +> -ELISP="${ELISP} (setq message-exit-actions (list #'save-buffers-kill-terminal))" +> +> # Short options compatible with mutt(1). +> while getopts :s:c:b:i:h opt; do +> @@ -60,7 +60,7 @@ while getopts :s:c:b:i:h opt; do +> opt=${opt%%=*} +> ;; +> # Long options without arguments. +> - --help|--print|--no-window-system|--client) +> + --help|--print|--no-window-system|--client|--create-frame) +> ;; +> *) +> echo "$0: unknown long option ${opt}, or argument mismatch." >&2 +> @@ -80,9 +80,6 @@ while getopts :s:c:b:i:h opt; do +> --help|h) +> exec man notmuch-emacs-mua +> ;; +> - --client) +> - USE_EMACSCLIENT="yes" +> - ;; +> --subject|s) +> ELISP="${ELISP} (message-goto-subject) (insert \"${OPTARG}\")" +> ;; +> @@ -102,7 +99,13 @@ while getopts :s:c:b:i:h opt; do +> PRINT_ONLY=1 +> ;; +> --no-window-system) +> - CLIENT_TYPE="-t" +> + NO_WINDOW="-nw" +> + ;; +> + --client) +> + USE_EMACSCLIENT="yes" +> + ;; +> + --create-frame) +> + CREATE_FRAME="--create-frame" +> ;; +> *) +> # We should never end up here. +> @@ -121,6 +124,14 @@ for arg; do +> ELISP="${ELISP} (message-goto-to) (insert \"${arg}, \")" +> done +> +> +# If reusing a frame in emacsclient, don't kill the buffer. +> +if [ -z "$CREATE_FRAME" ]; then +> + ELISP="${ELISP} (setq message-exit-actions (list #'save-buffers-kill-terminal))" +> +elif [ -z "$USE_EMACSCLIENT" ]; then +> + echo "$0: --create-frame is only applicable with --client." >&2 +> + exit 1 +> +fi +> + +> # End progn. +> ELISP="${ELISP})" +> +> @@ -131,7 +142,7 @@ fi +> +> if [ -n "$USE_EMACSCLIENT" ]; then +> # Evaluate the progn. +> - exec ${EMACSCLIENT} ${CLIENT_TYPE} -a '' --eval "${ELISP}" +> + exec ${EMACSCLIENT} ${CREATE_FRAME} ${NO_WINDOW} -a '' --eval "${ELISP}" +> else +> - exec ${EMACS} --eval "${ELISP}" +> + exec ${EMACS} ${NO_WINDOW} --eval "${ELISP}" +> fi +> -- +> 2.1.4 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch -- 2.26.2