[PATCH v2 0/5] emacs: help: and remap keybindings

diff --git a/62/9faa587b6d7dfa7a223a7305cddd0637c5e6fc b/62/9faa587b6d7dfa7a223a7305cddd0637c5e6fc
new file mode 100644 (file)
index 0000000..be8e5af
--- /dev/null
+++ b/62/9faa587b6d7dfa7a223a7305cddd0637c5e6fc
@@ -0,0 +1,103 @@
+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 6C794429E2E\r
+       for <notmuch@notmuchmail.org>; Thu,  7 Nov 2013 16:29:26 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 2.7\r
+X-Spam-Level: **\r
+X-Spam-Status: No, score=2.7 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
+       FREEMAIL_REPLY=2.499, 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 ngaQBLKOhiZu for <notmuch@notmuchmail.org>;\r
+       Thu,  7 Nov 2013 16:29:19 -0800 (PST)\r
+Received: from mail-wi0-f175.google.com (mail-wi0-f175.google.com\r
+       [209.85.212.175]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id B2664429E26\r
+       for <notmuch@notmuchmail.org>; Thu,  7 Nov 2013 16:29:19 -0800 (PST)\r
+Received: by mail-wi0-f175.google.com with SMTP id hm2so216157wib.2\r
+       for <notmuch@notmuchmail.org>; Thu, 07 Nov 2013 16:29:18 -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;\r
+       bh=fLjTKfkRS26cK86KzmNyaFPXSzoBndeVNSVRwK6ZqmY=;\r
+       b=MO/mr8EbY3jpqvjE0I8X/7GmR0s4dXiAxcsF0keZnYd4RfuNceP92u94pkgD3I1kK1\r
+       SKpg/DS0AMJ4qe+vtCMzMsL+piISGgpjY65dWdR18293Zu3FN3N/yFNMebNsKVowJII9\r
+       gcWy0IcWTDL/avS+5apaBw+1awSfYpTa522f92jmZTM0EBVJUHY1wNkvnv4DlWCvzZx0\r
+       4JnYv6jsYXNpYMvTKOK4gZmzEbC6suMlY27m+svGnLFJtpj/z36J7OwK4wmtWO8tH/84\r
+       pH63LxBEq+2cAbVGccaHV6ULu4x6XpyOgKABcKYZTMzXrY19oZqZRmv9SUBIjLQXkleG\r
+       xY+Q==\r
+X-Received: by 10.180.13.142 with SMTP id h14mr102822wic.3.1383870101852;\r
+       Thu, 07 Nov 2013 16:21:41 -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 e1sm400551wij.6.2013.11.07.16.21.41\r
+       for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Thu, 07 Nov 2013 16:21:41 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 0/5] emacs: help: and remap keybindings\r
+Date: Fri,  8 Nov 2013 00:21:31 +0000\r
+Message-Id: <1383870096-14627-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, 08 Nov 2013 00:29:26 -0000\r
+\r
+This is version 2 of the series id:1382821479-23384-1-git-send-email-markwalters1009@gmail.com\r
+\r
+It fixes most of the comments Austin raised in his review. \r
+\r
+The first patch is now trivial and fixes a bug with unset keys in\r
+help. (This is Austin's solution which is obviously better than mine\r
+was)\r
+\r
+The second patch is unchanged. The third patch is new and just\r
+separates out a helper function. This will make the remapping help\r
+code clearer, but is probably good in its own right.\r
+\r
+The fourth patch deals with help for the remapping case. It is\r
+completely separate from the main help so does not clutter it up like\r
+it did before. The logic is slightly different from before: it now\r
+puts all remapped bindings in rather than just the first (if the\r
+command being remapped was bound to multiple keys).\r
+\r
+The fifth patch adds remappings to tree and is unchanged.\r
+\r
+It does not address Austin's query about passing down the base keymap\r
+for the remapping.\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+\r
+Mark Walters (5):\r
+  emacs: help: check for nil key binding\r
+  emacs: help: remove duplicate bindings\r
+  emacs: help: split out notmuch-describe-key as a function\r
+  emacs: help: add a special function to deal with remaps\r
+  emacs: tree: use remap for the over-ridden global bindings\r
+\r
+ emacs/notmuch-lib.el  |   76 +++++++++++++++++++++++++++++++++++-------------\r
+ emacs/notmuch-tree.el |    8 ++--\r
+ 2 files changed, 59 insertions(+), 25 deletions(-)\r
+\r
+-- \r
+1.7.9.1\r
+\r