[PATCH 1/2] notmuch-emacs-mua: remove -C to keep short options compatible with mutt

[Tomi Ollila]

On Sat, Mar 07 2015, Jani Nikula <jani at nikula.org> wrote:

> 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.

Series LGTM.

Tomi

> ---
>  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 eb47098e11ca..32b728639188 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 b8cbc822fe89..13f67bee4417 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)
> -- 
> 2.1.4
>
> _______________________________________________
> notmuch mailing list
> notmuch at notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch