[PATCH 0/1] emacs: don't show duplicate keys in help.

diff --git a/32/fa05e0e7eefe6d1a192cc2b8aca0d38472dd0e b/32/fa05e0e7eefe6d1a192cc2b8aca0d38472dd0e
new file mode 100644 (file)
index 0000000..eb5c36a
--- /dev/null
+++ b/32/fa05e0e7eefe6d1a192cc2b8aca0d38472dd0e
@@ -0,0 +1,119 @@
+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 9192D431FB6\r
+       for <notmuch@notmuchmail.org>; Fri, 11 Oct 2013 06:40:07 -0700 (PDT)\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 hlxEI1BzFSrf for <notmuch@notmuchmail.org>;\r
+       Fri, 11 Oct 2013 06:40:02 -0700 (PDT)\r
+Received: from mail-wg0-f52.google.com (mail-wg0-f52.google.com\r
+ [74.125.82.52])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ DE450431FAE   for <notmuch@notmuchmail.org>; Fri, 11 Oct 2013 06:40:01 -0700\r
+ (PDT)\r
+Received: by mail-wg0-f52.google.com with SMTP id m15so4249754wgh.19\r
+       for <notmuch@notmuchmail.org>; Fri, 11 Oct 2013 06:39:59 -0700 (PDT)\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;\r
+       bh=PpobWoEVDpgygEquqhqB/U17yvcRxa4jYA6eNVTwUPY=;\r
+       b=d0CURVMa+11u9PGx+8GWUXKZGzD50zA92jdkSbY/QkWocdswR1pS49gT7/JXb7UWzH\r
+       LpEIYNJahtYD4dhXmfPoIOlV49JKHdd/RSc6bVmq6JWYm+5jyGzOVL1R9a8YDUX9sADy\r
+       KD1gLanBUrIz8VLCQDsZZZEkS2keAMfS405fiRTU8nAGdskvZXeuVsltfRUoJwOuVDhz\r
+       nXqo0O/shF2/egFs6wZ0/KQvj4Snl2smB3U0BuYODWhuJHXuiYGzq2MDXBZ0J9aCsYDi\r
+       e8d6NYgQd1oJoEYEh6BPeqGvnZs0cpWdDCxlIR9orGAZmYS/qKdyHp6SGsD+0oEG8Qak\r
+       JnWw==\r
+X-Received: by 10.180.20.77 with SMTP id l13mr3322646wie.40.1381498797939;\r
+       Fri, 11 Oct 2013 06:39:57 -0700 (PDT)\r
+Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])\r
+       by mx.google.com with ESMTPSA id d11sm5837466wic.4.2013.10.11.06.39.56\r
+       for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Fri, 11 Oct 2013 06:39:57 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 0/1] emacs: don't show duplicate keys in help. \r
+Date: Fri, 11 Oct 2013 14:39:53 +0100\r
+Message-Id: <1381498794-17000-1-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\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, 11 Oct 2013 13:40:07 -0000\r
+\r
+Previously notmuch-help would show two entries for keys in a parent\r
+keymap that were over-ridden in the local keymap.  This keeps track of\r
+which keys have been seen and thus avoids these spurious duplicate\r
+entries.\r
+\r
+Currently only pick does this but I think we might easily have the\r
+problem elsewhere in the future.\r
+\r
+Since most of the diff is indentation I include a word-diff below\r
+(which is why there is a cover letter and single patch).\r
+\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+\r
+\r
+Mark Walters (1):\r
+  emacs: don't show duplicate keys in help.\r
+\r
+ emacs/notmuch.el |   45 ++++++++++++++++++++++++---------------------\r
+ 1 files changed, 24 insertions(+), 21 deletions(-)\r
+\r
+word-diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+index c47c6b5..4f4e2e7 100644\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -150,8 +150,11 @@ for an overview of how this documentation is extracted.\r
+ UA-KEYS should be a key sequence bound to `universal-argument'.\r
+ It will be used to describe bindings of commands that support a\r
+ prefix argument.  PREFIX and TAIL are used internally."\r
++  (let (keys-seen)\r
+   (map-keymap\r
+    (lambda (key binding)\r
++       (unless (memq key keys-seen)\r
++       (push key keys-seen)\r
+      (cond ((mouse-event-p key) nil)\r
+          ((keymapp binding)\r
+           (setq tail\r
+@@ -169,8 +172,8 @@ prefix argument.  PREFIX and TAIL are used internally."\r
+           (push (concat prefix (format-kbd-macro (vector key)) "\t"\r
+                         (or (and (symbolp binding) (get binding 'notmuch-doc))\r
+                             (notmuch-documentation-first-line binding)))\r
+-                tail))))\r
+-   keymap)\r
++                    tail)))))\r
++     keymap))\r
+   tail)\r
+ \r
+ (defun notmuch-substitute-command-keys (doc)\r
+\r
+\r
+\r
+\r
+-- \r
+1.7.9.1\r
+\r