From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Sun, 29 May 2011 00:09:44 +0000 (-0700)
Subject: emacs: Unbind M-RET as display of thread with crypto switch.
X-Git-Tag: 0.10_rc1~21
X-Git-Url: https://git.cworth.org/git?p=notmuch;a=commitdiff_plain;h=07022714ebd7e54aaa276d1c6f395fb8347a0710

emacs: Unbind M-RET as display of thread with crypto switch.

Use prefix argument instead to set switch.
---

diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index c5741b7f..c1827cc2 100644
--- a/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@ -221,7 +221,6 @@ For a mouse binding, return nil."
     (define-key map "-" 'notmuch-search-remove-tag)
     (define-key map "+" 'notmuch-search-add-tag)
     (define-key map (kbd "RET") 'notmuch-search-show-thread)
-    (define-key map (kbd "M-RET") 'notmuch-search-show-thread-crypto-switch)
     map)
   "Keymap for \"notmuch search\" buffers.")
 (fset 'notmuch-search-mode-map notmuch-search-mode-map)
@@ -421,13 +420,9 @@ Complete list of currently available key bindings:
   "Return a list of authors for the current region"
   (notmuch-search-properties-in-region 'notmuch-search-subject beg end))
 
-(defun notmuch-search-show-thread-crypto-switch ()
-  (interactive)
-  (notmuch-search-show-thread t))
-
 (defun notmuch-search-show-thread (&optional crypto-switch)
   "Display the currently selected thread."
-  (interactive)
+  (interactive "P")
   (let ((thread-id (notmuch-search-find-thread-id))
 	(subject (notmuch-search-find-subject)))
     (if (> (length thread-id) 0)