From: Jani Nikula Date: Sat, 7 Mar 2015 14:30:19 +0000 (+0200) Subject: [PATCH 1/2] notmuch-emacs-mua: remove -C to keep short options compatible with mutt X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f7cce1f10253f5d332dfe0deaa8fd7dfa0fa2e70;p=notmuch-archives.git [PATCH 1/2] notmuch-emacs-mua: remove -C to keep short options compatible with mutt --- diff --git a/f4/5ab83508caefd6b9914a671cfda13f3ceb6dcf b/f4/5ab83508caefd6b9914a671cfda13f3ceb6dcf new file mode 100644 index 000000000..9c6299881 --- /dev/null +++ b/f4/5ab83508caefd6b9914a671cfda13f3ceb6dcf @@ -0,0 +1,113 @@ +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 51652431FBD + for ; Sat, 7 Mar 2015 06:30:07 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 1.738 +X-Spam-Level: * +X-Spam-Status: No, score=1.738 tagged_above=-999 required=5 + tests=[DNS_FROM_AHBL_RHSBL=2.438, RCVD_IN_DNSWL_LOW=-0.7] + 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 J+GzkJWhB8w0 for ; + Sat, 7 Mar 2015 06:30:03 -0800 (PST) +Received: from mail-wi0-f170.google.com (mail-wi0-f170.google.com + [209.85.212.170]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 17D7C431FAE + for ; Sat, 7 Mar 2015 06:30:02 -0800 (PST) +Received: by wibbs8 with SMTP id bs8so9848235wib.4 + for ; Sat, 07 Mar 2015 06:30:02 -0800 (PST) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20130820; + h=x-gm-message-state:from:to:cc:subject:date:message-id; + bh=D7oMCs2EZ5G8HthJ3BSVYKNq85MDb4YrkHe0586zmSI=; + b=Y/I6rvKsMPscqk6TUcP8pOGW7VEIp1ZmZJ3Ck8+9OEAgqjQvEdW/I1XBKJ05JeyGTM + pbzKEpfQScOmo8IkymgdsZgtzTgh5B2NoLO0MkNYOlA5BzTXGAU4DDU3lT9owJmWm0El + rkGnj19kT8gbvXaVPtZyEFYMnM3nem5m7qwMGXJja077ufBXCiehhZdAbDLnFy7FxVM9 + OGkXbd4NoBjfv5zPhhV//KUJEVKpyI0nUJmhVcUZEm8y98LNoeQdc4P4VfeysXSq56wJ + uT0lLXyaoo13VJvTcr1LGQo+TtzE6/CDlQ1AyweGnoM5Y5qX68pjw5cWVCfngZbk1vWd + cXbg== +X-Gm-Message-State: + ALoCoQlOCJIudt29StkAMqxIKnkUYaDtB+4J0kd/3/otx8aDkrGHTsMjJd0FDfDy4PY6L70UgvTS +X-Received: by 10.180.8.165 with SMTP id s5mr42826249wia.16.1425738602115; + Sat, 07 Mar 2015 06:30:02 -0800 (PST) +Received: from localhost (mobile-internet-bcee3b-76.dhcp.inet.fi. + [188.238.59.76]) by mx.google.com with ESMTPSA id + bo1sm19590030wjb.15.2015.03.07.06.30.00 + (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); + Sat, 07 Mar 2015 06:30:01 -0800 (PST) +From: Jani Nikula +To: notmuch@notmuchmail.org +Subject: [PATCH 1/2] notmuch-emacs-mua: remove -C to keep short options + compatible with mutt +Date: Sat, 7 Mar 2015 16:30:19 +0200 +Message-Id: <1425738620-6972-1-git-send-email-jani@nikula.org> +X-Mailer: git-send-email 2.1.4 +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, 07 Mar 2015 14:30:07 -0000 + +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 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 +