[PATCH 0/4] emacs: help: and remap keybindings

diff --git a/e7/6d312a714f0d0cea178749e904d7066cf8a774 b/e7/6d312a714f0d0cea178749e904d7066cf8a774
new file mode 100644 (file)
index 0000000..627fe00
--- /dev/null
+++ b/e7/6d312a714f0d0cea178749e904d7066cf8a774
@@ -0,0 +1,109 @@
+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 88B61429E42\r
+       for <notmuch@notmuchmail.org>; Sat, 26 Oct 2013 14:04:54 -0700 (PDT)\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 rHPK8qOC6yhH for <notmuch@notmuchmail.org>;\r
+       Sat, 26 Oct 2013 14:04:47 -0700 (PDT)\r
+Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com\r
+       [209.85.212.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 62BE0431FD9\r
+       for <notmuch@notmuchmail.org>; Sat, 26 Oct 2013 14:04:47 -0700 (PDT)\r
+Received: by mail-wi0-f181.google.com with SMTP id ex4so20050wid.14\r
+       for <notmuch@notmuchmail.org>; Sat, 26 Oct 2013 14:04:43 -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=75uxND67qOFp94HOPwHU3ex8UVh3kTPPbZF5qvS38Z8=;\r
+       b=voVMaQsl/l5Rp7QrE4hJ667SUltOTnHv1GzEHNQ/zT0v3NUzcKnntiePGoab/ENY2H\r
+       i84bsA+BMyWFyrlNiRhaYs/e/kigvDpXrkjeFePkT8nJSTa372Jd8PGCOgRrFSs8n3SN\r
+       MzkQI44dfHgs2p6NLpw2hTn8sDn9kQz7bRIkauyr/gVTK8bu8fC6EZd2ovR7hYuUFJjQ\r
+       iZZScx7zh8qe7TJuZQtlEfEcyJGKDAXqMR6hAROmLQ5xv0X+byLMtetwtsU5rlkSVAH9\r
+       k7MNRJ6Av1ivoTpE7SKIKN9kxW51oE8hySxpalwRYLYYnopqNF5C+ZwLsfBzHC5/eXja\r
+       VTGQ==\r
+X-Received: by 10.181.9.66 with SMTP id dq2mr3382039wid.31.1382821483571;\r
+       Sat, 26 Oct 2013 14:04:43 -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 q3sm19392494wib.5.2013.10.26.14.04.42\r
+       for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Sat, 26 Oct 2013 14:04:43 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 0/4] emacs: help: and remap keybindings\r
+Date: Sat, 26 Oct 2013 22:04:35 +0100\r
+Message-Id: <1382821479-23384-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: Sat, 26 Oct 2013 21:04:54 -0000\r
+\r
+This series makes 3 tweaks to the emacs help. \r
+\r
+The first fixes a bug whereby if a user unsets a keybinding\r
+notmuch-help throws an error (function being nil) and does not work.\r
+\r
+The second removes duplicates from the list of returned keybindings;\r
+these occur if a user or mode overrides a keybinding in\r
+notmuch-common-keymap. This happens in pick. See\r
+id:1381498794-17000-1-git-send-email-markwalters1009@gmail.com for a\r
+different approach. I think this is probably neater but am happy\r
+either way.\r
+\r
+The third patch fixes some problems if a user or mode rebinds keys\r
+using remap. Currently they appear in help as "<remap><function> New\r
+function docstring". This patch replaces the <remap><function> with\r
+the actual key binding.\r
+\r
+The final patch is separate but is the actual motivation for the\r
+earlier ones. It switches pick to use remap for its over\r
+bindings. This means the over bindings will work correctly if the user\r
+customises the common-keymap. This approach was suggested by Austin in\r
+id:20130915153642.GY1426@mit.edu.\r
+\r
+All tests pass and it seems to work including modifications to the\r
+common-keymap.\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+PS Obviously the final patch will clash with a rename of pick to tree,\r
+but the rebase will be trivial.\r
+\r
+\r
+\r
+Mark Walters (4):\r
+  emacs: help: check for nil key binding\r
+  emacs: help: remove duplicate bindings\r
+  emacs: help: remap support\r
+  contrib: pick: use remap for the over-ridden global bindings\r
+\r
+ contrib/notmuch-pick/notmuch-pick.el |    8 ++--\r
+ emacs/notmuch.el                     |   58 +++++++++++++++++++++-------------\r
+ 2 files changed, 40 insertions(+), 26 deletions(-)\r
+\r
+-- \r
+1.7.9.1\r
+\r