[PATCH v2 1/5] emacs: help: check for nil key binding

diff --git a/96/b33209c7e5effbb225bab882a912eb21fde2b6 b/96/b33209c7e5effbb225bab882a912eb21fde2b6
new file mode 100644 (file)
index 0000000..40d4919
--- /dev/null
+++ b/96/b33209c7e5effbb225bab882a912eb21fde2b6
@@ -0,0 +1,89 @@
+Return-Path: <markwalters1009@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 9739F429E2E\r
+       for <notmuch@notmuchmail.org>; Thu,  7 Nov 2013 16:21:52 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+       RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id i2dHXoa92Ckt for <notmuch@notmuchmail.org>;\r
+       Thu,  7 Nov 2013 16:21:45 -0800 (PST)\r
+Received: from mail-we0-f179.google.com (mail-we0-f179.google.com\r
+       [74.125.82.179]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id D0566431FD5\r
+       for <notmuch@notmuchmail.org>; Thu,  7 Nov 2013 16:21:44 -0800 (PST)\r
+Received: by mail-we0-f179.google.com with SMTP id w61so1269858wes.38\r
+       for <notmuch@notmuchmail.org>; Thu, 07 Nov 2013 16:21:43 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:in-reply-to:references;\r
+       bh=xDDQSNwLsLqTF5/Zqcw1bxW3Ho9rooKvpKamKJLI6xc=;\r
+       b=bVSisxvll0gSILUy5QBxgI/GCqQBBRxvDq//cCWb1gWZou4YcqpNGaqcQZw+B202kW\r
+       JhJjyouB+WcqWUjibZqLh+hENa1u75JdyfM3MeD0RFY1sLTua7oSoz0VCgSexid8FFEQ\r
+       Bgi79wbnUCXsfXoJsNuHvm2YKoytl5Kv+OC838h7PP5UO6PoZeCQAGMPBuk6mDIcv5Pe\r
+       ZL+avtT2exv03MIseSFOCik9fUs7H7SSYsRrc3qZOClMVndvip2ZnVdMZD6sNv7xfW+x\r
+       sIfaJJ+YzxnmoRSy+7Hx13XD+p5nkPGmj269anuu5VswHF8RC+sqfxt9y6/O3aIJY4I3\r
+       0XlA==\r
+X-Received: by 10.180.160.240 with SMTP id xn16mr108303wib.62.1383870103409;\r
+       Thu, 07 Nov 2013 16:21:43 -0800 (PST)\r
+Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])\r
+       by mx.google.com with ESMTPSA id ey4sm365102wic.11.2013.11.07.16.21.42\r
+       for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Thu, 07 Nov 2013 16:21:43 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 1/5] emacs: help: check for nil key binding\r
+Date: Fri,  8 Nov 2013 00:21:32 +0000\r
+Message-Id: <1383870096-14627-2-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1383870096-14627-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1383870096-14627-1-git-send-email-markwalters1009@gmail.com>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\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: Fri, 08 Nov 2013 00:21:52 -0000\r
+\r
+A standard way to unset a key binding is local-unset-key which is equivalent to\r
+  (define-key (current-local-map) key nil)\r
+\r
+Currently notmuch-help gives an error and fails if a user has done this.\r
+\r
+To fix this we only add a help line if the binding is non-nil.\r
+---\r
+ emacs/notmuch-lib.el |    2 +-\r
+ 1 files changed, 1 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+index 921ed20..ec5a2cb 100644\r
+--- a/emacs/notmuch-lib.el\r
++++ b/emacs/notmuch-lib.el\r
+@@ -254,7 +254,7 @@ prefix argument.  PREFIX and TAIL are used internally."\r
+           (setq tail\r
+                 (notmuch-describe-keymap\r
+                  binding ua-keys (notmuch-prefix-key-description key) tail)))\r
+-         (t\r
++         (binding\r
+           (when (and ua-keys (symbolp binding)\r
+                      (get binding 'notmuch-prefix-doc))\r
+             ;; Documentation for prefixed command\r
+-- \r
+1.7.9.1\r
+\r