--- /dev/null
+Return-Path: <amdragon@mit.edu>\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 87478431FC2\r
+ for <notmuch@notmuchmail.org>; Tue, 15 Jul 2014 07:06:22 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[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 HEQw+xwK3ArC for <notmuch@notmuchmail.org>;\r
+ Tue, 15 Jul 2014 07:06:17 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-6.mit.edu (dmz-mailsec-scanner-6.mit.edu\r
+ [18.7.68.35])\r
+ (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 46E5E431FBD\r
+ for <notmuch@notmuchmail.org>; Tue, 15 Jul 2014 07:06:17 -0700 (PDT)\r
+X-AuditID: 12074423-f79bf6d000007580-ff-53c53556efd4\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+ (using TLS with cipher AES256-SHA (256/256 bits))\r
+ (Client did not present a certificate)\r
+ by dmz-mailsec-scanner-6.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 06.09.30080.65535C35; Tue, 15 Jul 2014 10:06:14 -0400 (EDT)\r
+Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
+ by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id s6FE6Dv1018297; \r
+ Tue, 15 Jul 2014 10:06:13 -0400\r
+Received: from drake.dyndns.org\r
+ (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+ [216.15.114.40]) (authenticated bits=0)\r
+ (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+ by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s6FE6AAu008823\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Tue, 15 Jul 2014 10:06:12 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1X73Mv-0000gx-2K; Tue, 15 Jul 2014 10:06:09 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 0/2] emacs: Shortcut keys to saved searches\r
+Date: Tue, 15 Jul 2014 10:06:04 -0400\r
+Message-Id: <1405433166-2198-1-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 2.0.0\r
+In-Reply-To: <1405353735-26244-1-git-send-email-amdragon@mit.edu>\r
+References: <1405353735-26244-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFrrAIsWRmVeSWpSXmKPExsUixCmqrRtmejTYoLnFyuJGazejxb47W5gs\r
+ Vs/lsbh+cyazA4vHrud/mTx2zrrL7vFs1S1mjy2H3jMHsERx2aSk5mSWpRbp2yVwZWyde4ip\r
+ oFm+4taDG4wNjGcluhg5OSQETCQOLpjFBGGLSVy4t56ti5GLQ0hgNpPE3bOzWCCcjYwSV1vn\r
+ MUE4d5gkml5fZQVpERKYyyhx4LItiM0moCGxbf9yRhBbREBaYufd2WA1zAK2Ep9a/4OtEBaw\r
+ k/i+/z0ziM0ioCpx/ctzdhCbV8BeYt69LlaIM+QkGm58YgOxOQUcJd68OAa1y0Fi05rPTBMY\r
+ +RcwMqxilE3JrdLNTczMKU5N1i1OTszLSy3SNdPLzSzRS00p3cQICjh2F+UdjH8OKh1iFOBg\r
+ VOLhlXh3OFiINbGsuDL3EKMkB5OSKG8x29FgIb6k/JTKjMTijPii0pzU4kOMEhzMSiK8kiZA\r
+ Od6UxMqq1KJ8mJQ0B4uSOO9ba6tgIYH0xJLU7NTUgtQimKwMB4eSBC8zSKNgUWp6akVaZk4J\r
+ QpqJgxNkOA/QcF6w4cUFibnFmekQ+VOMilLivCeMgRICIImM0jy4XlhCeMUoDvSKMO8VkCoe\r
+ YDKB634FNJgJaHB5zWGQwSWJCCmpBsasIGnusvAfOyodGNiZ3rMc+JvQnOvb+abr/Qtphpk3\r
+ 4rUWTVVczMe+veO5VEPKpYZfZ5NOPtJLtGcTdNnymrFc+JFw3r6TayStnVgPvmvv7LqUes2f\r
+ Iz2ZK7w458f5ZX9juz8+3DVXc83+y9k2h9iYJ997oz/rw9lvJ7494n+0pvSFRPu1MEclluKM\r
+ REMt5qLiRADCQO0m4wIAAA==\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, 15 Jul 2014 14:06:22 -0000\r
+\r
+This is version 2 of\r
+id:1405353735-26244-1-git-send-email-amdragon@mit.edu and addresses\r
+Mark's comments in id:87egxnd4aq.fsf@qmul.ac.uk.\r
+\r
+The diff from v1 is below.\r
+\r
+diff --git a/emacs/notmuch-jump.el b/emacs/notmuch-jump.el\r
+index cb1ae10..9cb1e6a 100644\r
+--- a/emacs/notmuch-jump.el\r
++++ b/emacs/notmuch-jump.el\r
+@@ -53,20 +53,19 @@ (defun notmuch-jump-search ()\r
+ (setq action-map (nreverse action-map))\r
+ \r
+ (if action-map\r
+- (notmuch-jump action-map "Search ")\r
+- (error "No shortcut keys for saved searches. Please customize notmuch-saved-searches."))))\r
++ (notmuch-jump action-map "Search: ")\r
++ (error "To use notmuch-jump, please customize shortcut keys in notmuch-saved-searches."))))\r
+ \r
+ (defvar notmuch-jump--action nil)\r
+ \r
+ (defun notmuch-jump (action-map prompt)\r
+ "Interactively prompt for one of the keys in ACTION-MAP.\r
+ \r
+-Displays a pop-up temporary buffer with a summary of all bindings\r
+-in ACTION-MAP, reads a key from the minibuffer, and performs the\r
+-corresponding action. The prompt can be canceled with C-g.\r
+-PROMPT must be a string to use for the prompt if this command was\r
+-not invoked directly by a key binding (e.g., it was invoked\r
+-through M-x). PROMPT should include a space at the end.\r
++Displays a summary of all bindings in ACTION-MAP in the\r
++minibuffer, reads a key from the minibuffer, and performs the\r
++corresponding action. The prompt can be canceled with C-g or\r
++RET. PROMPT must be a string to use for the prompt. PROMPT\r
++should include a space at the end.\r
+ \r
+ ACTION-MAP must be a list of triples of the form\r
+ (KEY LABEL ACTION)\r
+@@ -82,16 +81,9 @@ (defun notmuch-jump (action-map prompt)\r
+ (with-temp-buffer\r
+ (notmuch-jump--insert-items (window-body-width) items)\r
+ (buffer-string)))\r
+- (prompt-text\r
+- (if (eq this-original-command this-command)\r
+- ;; Make it look like we're just part of any regular\r
+- ;; submap prompt (like C-x, C-c, etc.)\r
+- (concat (format-kbd-macro (this-command-keys)) "-")\r
+- ;; We were invoked through something like M-x\r
+- prompt))\r
+ (full-prompt\r
+ (concat table "\n\n"\r
+- (propertize prompt-text 'face 'minibuffer-prompt)))\r
++ (propertize prompt 'face 'minibuffer-prompt)))\r
+ ;; By default, the minibuffer applies the minibuffer face to\r
+ ;; the entire prompt. However, we want to clearly\r
+ ;; distinguish bindings (which we put in the prompt face\r
+@@ -121,14 +113,14 @@ (defun notmuch-jump--format-actions (action-map)\r
+ \r
+ ;; Compute the maximum key description width\r
+ (let ((key-width 1))\r
+- (dolist (action action-map)\r
++ (dolist (entry action-map)\r
+ (setq key-width\r
+ (max key-width\r
+- (string-width (format-kbd-macro (first action))))))\r
++ (string-width (format-kbd-macro (first entry))))))\r
+ ;; Format each action\r
+- (mapcar (lambda (action)\r
+- (let ((key (format-kbd-macro (first action)))\r
+- (desc (second action)))\r
++ (mapcar (lambda (entry)\r
++ (let ((key (format-kbd-macro (first entry)))\r
++ (desc (second entry)))\r
+ (concat\r
+ (propertize key 'face 'minibuffer-prompt)\r
+ (make-string (- key-width (length key)) ? )\r
+diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+index 135422d..b338aaa 100644\r
+--- a/emacs/notmuch-lib.el\r
++++ b/emacs/notmuch-lib.el\r
+@@ -25,6 +25,9 @@\r
+ (require 'mm-decode)\r
+ (require 'cl)\r
+ \r
++(autoload 'notmuch-jump-search "notmuch-jump"\r
++ "Jump to a saved search by shortcut key." t)\r
++\r
+ (defvar notmuch-command "notmuch"\r
+ "Command to run the notmuch binary.")\r
+ \r
+@@ -134,8 +137,6 @@ (defvar notmuch-common-keymap\r
+ map)\r
+ "Keymap shared by all notmuch modes.")\r
+ \r
+-(autoload 'notmuch-jump-search "notmuch-jump" "Jump to a saved search by shortcut key." t)\r
+-\r
+ ;; By default clicking on a button does not select the window\r
+ ;; containing the button (as opposed to clicking on a widget which\r
+ ;; does). This means that the button action is then executed in the\r
+\r
+\r
projects / notmuch-archives.git / commitdiff