[PATCH 3/3] completion: clean up top level completion

diff --git a/7e/5f1ed607fa4626d0495407aa3ee4a8941e2c18 b/7e/5f1ed607fa4626d0495407aa3ee4a8941e2c18
new file mode 100644 (file)
index 0000000..0dc9683
--- /dev/null
+++ b/7e/5f1ed607fa4626d0495407aa3ee4a8941e2c18
@@ -0,0 +1,97 @@
+Return-Path: <jani@nikula.org>\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 09A6B6DE19CE\r
+ for <notmuch@notmuchmail.org>; Sat, 17 Oct 2015 09:30:38 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.539\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.539 tagged_above=-999 required=5 tests=[AWL=0.181,\r
+  RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01]\r
+ 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 lvFmVd0nDFCu for <notmuch@notmuchmail.org>;\r
+ Sat, 17 Oct 2015 09:30:36 -0700 (PDT)\r
+Received: from mail-wi0-f180.google.com (mail-wi0-f180.google.com\r
+ [209.85.212.180])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id 170256DE02DD\r
+ for <notmuch@notmuchmail.org>; Sat, 17 Oct 2015 09:30:36 -0700 (PDT)\r
+Received: by wicll6 with SMTP id ll6so45288116wic.0\r
+ for <notmuch@notmuchmail.org>; Sat, 17 Oct 2015 09:30:34 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=1e100.net; s=20130820;\r
+ h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\r
+ :references;\r
+ bh=RiP6Gnm44jJ9B3u/lyIvwbZrL16/0k1jkxqrhcZpwJg=;\r
+ b=W5w1Y26Dl+Uvtct+OFIC47ClaBpRZHJkuIye7j7WakA+uSYCqPbOuQzz7BFS8wPaQH\r
+ wW+wiPhUViVptLc0rQwmp3f2OGkxLmA7+fVXqlcj0+CXjYA2sFtWqAaP3J7ejS8deu8Z\r
+ fdFkjIBNlZ3s7a0RtzVmHXDOpHPDkNDt2ubKpz+FblZcVhwQpABrqGsiFYfit2j1J0ol\r
+ o3+zSq0llWtW8qMkq24WcOqiTOMVz3FwClCXxz4/Kr0441qn4KR1uKo2hBwSTxkvSai5\r
+ +81V40L8llVyoXGPX5bfCjba0ENNB9wXyXI4e76vfqb2HCz7VejbcjK6Y+yv+RFJ6+mz\r
+ 7s8g==\r
+X-Gm-Message-State:\r
+ ALoCoQnCQrk8CYv1gat3Lv2y1bdvLfhzTSTl/ccatIxz3x9ahQ2VWBh7q6HG67ttCo9bnM8P2oeO\r
+X-Received: by 10.194.118.234 with SMTP id kp10mr3843296wjb.59.1445099434537; \r
+ Sat, 17 Oct 2015 09:30:34 -0700 (PDT)\r
+Received: from localhost (mobile-access-bcee43-111.dhcp.inet.fi.\r
+ [188.238.67.111])\r
+ by smtp.gmail.com with ESMTPSA id go5sm7682607wib.3.2015.10.17.09.30.33\r
+ (version=TLSv1/SSLv3 cipher=OTHER);\r
+ Sat, 17 Oct 2015 09:30:34 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 3/3] completion: clean up top level completion\r
+Date: Sat, 17 Oct 2015 19:30:03 +0300\r
+Message-Id: <1445099403-25998-3-git-send-email-jani@nikula.org>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <1445099403-25998-1-git-send-email-jani@nikula.org>\r
+References: <1443265970-9875-1-git-send-email-jani@nikula.org>\r
+ <1445099403-25998-1-git-send-email-jani@nikula.org>\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: Sat, 17 Oct 2015 16:30:38 -0000\r
+\r
+Add note about missing features.\r
+---\r
+ completion/notmuch-completion.bash | 11 ++++++++---\r
+ 1 file changed, 8 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/completion/notmuch-completion.bash b/completion/notmuch-completion.bash\r
+index 1356c4a40515..f24d9ecd337f 100644\r
+--- a/completion/notmuch-completion.bash\r
++++ b/completion/notmuch-completion.bash\r
+@@ -484,10 +484,15 @@ _notmuch()\r
+ \r
+     if [ -z "${arg}" ]; then\r
+       # top level completion\r
+-      local top_options="--help --version"\r
+       case "${cur}" in\r
+-          -*) COMPREPLY=( $(compgen -W "${top_options}" -- ${cur}) ) ;;\r
+-          *) COMPREPLY=( $(compgen -W "${_notmuch_commands}" -- ${cur}) ) ;;\r
++          -*)\r
++              # XXX: handle ${_notmuch_shared_options} and --config=\r
++              local options="--help --version"\r
++              COMPREPLY=( $(compgen -W "${options}" -- ${cur}) )\r
++              ;;\r
++          *)\r
++              COMPREPLY=( $(compgen -W "${_notmuch_commands}" -- ${cur}) )\r
++              ;;\r
+       esac\r
+     elif [ "${arg}" = "help" ]; then\r
+       # handle help command specially due to _notmuch_commands usage\r
+-- \r
+2.1.4\r
+\r