nits

2 files changed, 23 insertions, 17 deletions

diff --git a/init.org b/init.org
index c9a2f74..251c7c2 100644
--- a/init.org
+++ b/init.org
@@ -309,19 +309,19 @@
       See [[https://emacs.stackexchange.com/questions/251/line-height-with-unicode-characters/5386#5386][fonts - Line height with unicode characters]] for a good
       discussion.
       #+begin_src emacs-lisp
-        (defun jao--set-fontsets (frame)
-          (set-fontset-font t 64257 "Quivira")
-          (set-fontset-font t 'egyptian "Noto Sans Egyptian Hieroglyphs")
-          (set-fontset-font t 'hangul "NanumGothicCoding")
-          (set-fontset-font t 'unicode (face-attribute 'default :family))
-          (set-fontset-font t 'unicode-bmp (face-attribute 'default :family))
-          (set-fontset-font t 'symbol "Symbola-10")
-          (set-fontset-font t 'greek "GFS Didot")
-          (set-fontset-font t 'mathematical "FreeSerif")
+        (defun jao--set-fontsets (f)
+          (set-fontset-font t 64257 "Quivira" f)
+          (set-fontset-font t 'egyptian "Noto Sans Egyptian Hieroglyphs" f)
+          (set-fontset-font t 'hangul "NanumGothicCoding" f)
+          (set-fontset-font t 'unicode (face-attribute 'default :family) f)
+          (set-fontset-font t 'unicode-bmp (face-attribute 'default :family) f)
+          (set-fontset-font t 'symbol "Symbola-10" f)
+          (set-fontset-font t 'greek "GFS Didot" f)
+          (set-fontset-font t 'mathematical "FreeSerif" f)
           ;; boxes
-          (set-fontset-font t '(9472 . 9599) "Source Code Pro")
+          (set-fontset-font t '(9472 . 9599) "Source Code Pro" f)
           ;; variation selector-16
-          (set-fontset-font t 65039 "BabelStone Modern-1"))
+          (set-fontset-font t 65039 "BabelStone Modern-1" f))
 
         (jao--set-fontsets nil)
         (add-to-list 'after-make-frame-functions 'jao--set-fontsets)
@@ -1472,7 +1472,7 @@
         (with-current-buffer (find-file-noselect "~/.config/rss2email.cfg")
           (goto-char (point-max))
           (insert "[feed." name "]\nurl = " url)
-          (insert "\nto = jao+feeds_" mbox "@localhost")
+          (insert "\nto = " mbox "+" name "@localhost")
           (insert "\nmaildir-mailbox = " mbox "\n\n")
           (save-buffer)))
 
@@ -2893,7 +2893,8 @@
          (("b" jao-player-browse "browse")
           ("l" jao-player-list "show play list")
           ("L" jao-show-lyrics "show lyrics")
-          ("w" jao-player-echo "now playing (text)"))
+          ("w" (let ((jao-notify-use-messages-p t)) (jao-player-echo))
+           "now playing"))
          "Master volume"
          (("d" jao-mixer-master-down "master down" :color red)
           ("u" jao-mixer-master-up "master up" :color red)
diff --git a/notmuch.org b/notmuch.org
index 1e921bc..eaf488e 100644
--- a/notmuch.org
+++ b/notmuch.org
@@ -267,22 +267,27 @@
       (add-hook 'notmuch-show-hook #'jao-notmuch--adjust-header)
 
       :bind (:map notmuch-tree-mode-map
-                  (("." . jao-notmuch-toggle-mime-parts)
-                   ("C" . jao-notmuch-echo-count)
+                  (("C" . jao-notmuch-echo-count)
                    ("d" . jao-notmuch-tree-delete-message)
                    ("D" . jao-notmuch-tree-delete-thread)
                    ("h" . jao-notmuch-goto-message-buffer)
                    ("H" . jao-notmuch-click-message-buffer)
                    ("i" . jao-notmuch-show-images)
-                   ("k" . jao-notmuch-tag-jump-and-next)
-                   ("K" . jao-notmuch-tree-read-thread)
+                   ("K" . jao-notmuch-tag-jump-and-next)
+                   ("k" . jao-notmuch-tree-read-thread)
                    ("M" . jao-notmuch-move-message)
                    ("n" . jao-notmuch-tree-next)
+                   ("O" . notmuch-tree-toggle-order)
+                   ("o" . jao-notmuch-tree-widen-search)
                    ("s" . jao-notmuch-tree-spam)
                    ("u" . jao-notmuch-tree-flag)
                    ("v" . notmuch-tree-scroll-message-window)
                    ("V" . notmuch-tree-scroll-message-window-back)
+                   ("<" . jao-notmuch-tree-beginning-of-buffer)
+                   (">" . jao-notmuch-tree-end-of-buffer)
                    ("/" . notmuch-tree-view-raw-message)
+                   ("." . jao-notmuch-toggle-mime-parts)
+                   ("=" . jao-notmuch-tree-toggle-message)
                    ("RET" . jao-notmuch-tree-show-or-scroll)
                    ("SPC" . jao-notmuch-tree-scroll-or-next))
                   :map notmuch-show-mode-map