[PATCH v4 6/7] emacs: help: add a special function to deal with remaps

diff --git a/e8/7efe39a93845e0b6792a33ec4a5cfd8d18052d b/e8/7efe39a93845e0b6792a33ec4a5cfd8d18052d
new file mode 100644 (file)
index 0000000..32ffda5
--- /dev/null
+++ b/e8/7efe39a93845e0b6792a33ec4a5cfd8d18052d
@@ -0,0 +1,114 @@
+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 1D917431FCF\r
+       for <notmuch@notmuchmail.org>; Tue, 12 Nov 2013 12:18:56 -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 oPLmOAl2Dufm for <notmuch@notmuchmail.org>;\r
+       Tue, 12 Nov 2013 12:18:50 -0800 (PST)\r
+Received: from mail-wg0-f54.google.com (mail-wg0-f54.google.com\r
+ [74.125.82.54])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ 02317429E31   for <notmuch@notmuchmail.org>; Tue, 12 Nov 2013 12:18:43 -0800\r
+ (PST)\r
+Received: by mail-wg0-f54.google.com with SMTP id y10so3049234wgg.9\r
+       for <notmuch@notmuchmail.org>; Tue, 12 Nov 2013 12:18: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=0N5rkZ+LVFKyfSYWkgjwKM8KZWEoiYd5aKylNLATPuU=;\r
+       b=wM/uqFu1ueFktwYdDEcfh+A+QMFfUwaKxsMMdY3TEIUVSsZkKy96LbnLQ9jklGP80w\r
+       U5yZCBeSapfHOstU+qHOzCQ8TImCdB0h/hrhXQt92bxZCv5J4NtadEteaOH1GGWbxnb7\r
+       v276QQ/qPwt5oskClu8Npg2EojHhpqmknRSRwyF5YcBC/+nQqvjBpnU9RdaZCO4qB48C\r
+       a7x2sN5NlEvaUqe8rSBoV9YgvuA7fB680K+Xohc3RdNoer+fRxf/7DROTglLFIifksba\r
+       i+fqbVpo7pMhe4CIpM/FaTvZ36VPtFfjmJX26oa9W8NaAlMmZRf2MLnn+3DNcwbdYv5x\r
+       vXCg==\r
+X-Received: by 10.194.88.225 with SMTP id bj1mr3060539wjb.50.1384287074829;\r
+       Tue, 12 Nov 2013 12:11:14 -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\r
+       qc10sm48003836wic.9.2013.11.12.12.11.14 for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Tue, 12 Nov 2013 12:11:14 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v4 6/7] emacs: help: add a special function to deal with\r
+ remaps\r
+Date: Tue, 12 Nov 2013 20:10:58 +0000\r
+Message-Id: <1384287059-3525-7-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1384287059-3525-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1384287059-3525-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: Tue, 12 Nov 2013 20:18:56 -0000\r
+\r
+remaps are a rather unusual keymap consisting of "first key" 'remap\r
+and then "second-key" the remapped-function. Thus we do the\r
+documentation for it separately.\r
+---\r
+ emacs/notmuch-lib.el |   22 ++++++++++++++++++++--\r
+ 1 files changed, 20 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+index 7b1fc33..33211c8 100644\r
+--- a/emacs/notmuch-lib.el\r
++++ b/emacs/notmuch-lib.el\r
+@@ -261,6 +261,21 @@ It does not prepend if ACTUAL-KEY is already listed in TAIL."\r
+           tail)))\r
+     tail)\r
+ \r
++(defun notmuch-describe-remaps (remap-keymap ua-keys base-keymap prefix tail)\r
++  ;; Remappings are represented as a binding whose first "event" is\r
++  ;; 'remap.  Hence, if the keymap has any remappings, it will have a\r
++  ;; binding whose "key" is 'remap, and whose "binding" is itself a\r
++  ;; keymap that maps not from keys to commands, but from old (remapped)\r
++  ;; functions to the commands to use in their stead.\r
++  (map-keymap\r
++   (lambda (command binding)\r
++     (mapc\r
++      (lambda (actual-key)\r
++      (setq tail (notmuch-describe-key actual-key binding prefix ua-keys tail)))\r
++      (where-is-internal command base-keymap)))\r
++   remap-keymap)\r
++  tail)\r
++\r
+ (defun notmuch-describe-keymap (keymap ua-keys base-keymap &optional prefix tail)\r
+   "Return a list of cons cells, each describing one binding in KEYMAP.\r
+ \r
+@@ -277,8 +292,11 @@ prefix argument.  PREFIX and TAIL are used internally."\r
+      (cond ((mouse-event-p key) nil)\r
+          ((keymapp binding)\r
+           (setq tail\r
+-                (notmuch-describe-keymap\r
+-                 binding ua-keys base-keymap (notmuch-prefix-key-description key) tail)))\r
++                (if (eq key 'remap)\r
++                    (notmuch-describe-remaps\r
++                     binding ua-keys base-keymap prefix tail)\r
++                  (notmuch-describe-keymap\r
++                   binding ua-keys base-keymap (notmuch-prefix-key-description key) tail))))\r
+          (binding\r
+           (setq tail (notmuch-describe-key (vector key) binding prefix ua-keys tail)))))\r
+    keymap)\r
+-- \r
+1.7.9.1\r
+\r