From 5240c438f5f6212fbce811ea4fd55ae964c97d99 Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Sat, 7 Mar 2015 16:30:19 +0200 Subject: [PATCH] notmuch-emacs-mua: remove -C to keep short options compatible with mutt Notmuch uses long options exclusively all around. The short options in notmuch-emacs-mua are intentionally just a compatible subset of mutt(1). Keep it this way, if only to make documenting the fact easy! The Notmuch style --client long option remains, of course. --- doc/man1/notmuch-emacs-mua.rst | 2 +- notmuch-emacs-mua | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/man1/notmuch-emacs-mua.rst b/doc/man1/notmuch-emacs-mua.rst index eb47098e..32b72863 100644 --- a/doc/man1/notmuch-emacs-mua.rst +++ b/doc/man1/notmuch-emacs-mua.rst @@ -18,7 +18,7 @@ Supported options for **notmuch-emacs-mua** include ``-h, --help`` Display help. - ``-C, --client`` + ``--client`` Use emacsclient, rather than emacs. This will start an emacs daemon process if necessary. diff --git a/notmuch-emacs-mua b/notmuch-emacs-mua index b8cbc822..13f67bee 100755 --- a/notmuch-emacs-mua +++ b/notmuch-emacs-mua @@ -38,7 +38,8 @@ CLIENT_TYPE="-c" ELISP="(prog1 'done (require 'notmuch) (notmuch-mua-new-mail)" ELISP="${ELISP} (setq message-exit-actions (list #'save-buffers-kill-terminal))" -while getopts :s:c:b:i:hC opt; do +# Short options compatible with mutt(1). +while getopts :s:c:b:i:h opt; do # Handle errors and long options. case "${opt}" in :) @@ -79,7 +80,7 @@ while getopts :s:c:b:i:hC opt; do --help|h) exec man notmuch-emacs-mua ;; - --client|C) + --client) USE_EMACSCLIENT="yes" ;; --subject|s)