notmuch.el: Avoid warning about referencing free variable `button'.

[notmuch] / notmuch.el

diff --git a/notmuch.el b/notmuch.el
index a6b71b777795d3c6b8b53a2dc75cf16b402c7fc6..94a6384419ad1a46cb744e6820f603c56c1b2ef1 100644 (file)
--- a/notmuch.el
+++ b/notmuch.el
@@ -158,7 +158,7 @@ Unlike builtin `next-line' this version accepts no arguments."
 
 By advancing forward until reaching a visible character.
 
-Unlike builtin `next-line' this version accepts no arguments."
+Unlike builtin `previous-line' this version accepts no arguments."
   (interactive)
   (set 'this-command 'previous-line)
   (call-interactively 'previous-line)
@@ -545,7 +545,7 @@ which this thread was originally shown."
   (goto-char (button-start (previous-button (point)))))
 
 (defun notmuch-toggle-invisible-action (cite-button)
-  (let ((invis-spec (button-get button 'invisibility-spec)))
+  (let ((invis-spec (button-get cite-button 'invisibility-spec)))
         (if (invisible-p invis-spec)
             (remove-from-invisibility-spec invis-spec)
           (add-to-invisibility-spec invis-spec)
@@ -826,9 +826,13 @@ For a mouse binding, return nil."
 (defun notmuch-help ()
   "Display help for the current notmuch mode."
   (interactive)
-  (let ((mode major-mode))
-    (with-help-window (help-buffer)
-      (princ (substitute-command-keys (notmuch-substitute-command-keys (documentation mode t)))))))
+  (let* ((mode major-mode)
+        (doc (substitute-command-keys (notmuch-substitute-command-keys (documentation mode t)))))
+    (with-current-buffer (generate-new-buffer "*notmuch-help*")
+      (insert doc)
+      (goto-char (point-min))
+      (set-buffer-modified-p nil)
+      (view-buffer (current-buffer) 'kill-buffer-if-not-modified))))
 
 ;;;###autoload
 (defun notmuch-show-mode ()
@@ -1003,12 +1007,12 @@ thread from that buffer can be show when done with this one)."
 (defun notmuch-search-next-thread ()
   "Select the next thread in the search results."
   (interactive)
-  (next-line))
+  (forward-line 1))
 
 (defun notmuch-search-previous-thread ()
   "Select the previous thread in the search results."
   (interactive)
-  (previous-line))
+  (forward-line -1))
 
 (defun notmuch-search-last-thread ()
   "Select the last thread in the search results."