summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--init.org6
-rw-r--r--notmuch.org5
2 files changed, 7 insertions, 4 deletions
diff --git a/init.org b/init.org
index 4fbd7c5..4bd913f 100644
--- a/init.org
+++ b/init.org
@@ -135,10 +135,10 @@
(setq visible-bell t)
#+END_SRC
*** Server
- #+BEGIN_SRC emacs-lisp
+ #+begin_src emacs-lisp
(setenv "EDITOR" "emacsclient")
- (when (not (daemonp)) (server-start))
- #+END_SRC
+ (when (and window-system (not (daemonp))) (server-start))
+ #+end_src
* System utilities
*** Tramp
#+begin_src emacs-lisp
diff --git a/notmuch.org b/notmuch.org
index 05d3f8f..c134710 100644
--- a/notmuch.org
+++ b/notmuch.org
@@ -119,7 +119,7 @@
(if widen jao-notmuch-widened-searches notmuch-saved-searches)))
(notmuch-jump-search)))
- (setq nnnotmuch-saved-searches
+ (setq nnnm-saved-searches
(mapcar (lambda (s)
(list :query (plist-get s :query) :name (plist-get s :name)))
jao-notmuch-widened-searches))
@@ -311,6 +311,9 @@
("=" . jao-notmuch-tree-toggle-message)
("RET" . jao-notmuch-tree-show-or-scroll)
("SPC" . jao-notmuch-tree-scroll-or-next))
+ :map notmuch-search-mode-map
+ (("RET" . notmuch-tree-from-search-thread)
+ ("M-RET" . notmuch-search-show-thread))
:map notmuch-show-mode-map
(("h" . jao-notmuch-goto-tree-buffer)
("TAB" . jao-notmuch-show-next-button)