notmuch.el: Bring back the "End of search results." message.

[notmuch] / notmuch.el

diff --git a/notmuch.el b/notmuch.el
index 0eac1ccbed60efa586cdea6eafa223b2373127ac..592c5ab58da2329806e99cbd695c1d713080db38 100644 (file)
--- a/notmuch.el
+++ b/notmuch.el
@@ -408,7 +408,7 @@ which this thread was originally shown."
              (overlay-put overlay 'invisible 'notmuch-show-citation)
              (overlay-put overlay 'before-string
                           (concat "[" (number-to-string (count-lines beg-sub (point)))
-                                  " quoted lines.]\n")))))
+                                  "-line citation. Press 'c' to show.]\n")))))
       (if (looking-at "--[ ]?$")
          (let ((sig-lines (count-lines beg-sub end)))
            (if (<= sig-lines notmuch-show-signature-lines-max)
@@ -416,7 +416,7 @@ which this thread was originally shown."
                  (overlay-put (make-overlay beg-sub (+ beg-sub 1))
                               'before-string
                               (concat "[" (number-to-string sig-lines)
-                                      "-line signature.]"))
+                                      "-line signature. Press 's' to show.]"))
                  (overlay-put (make-overlay (+ beg-sub 2) end)
                               'invisible 'notmuch-show-signature)
                  (goto-char end)))))
@@ -674,15 +674,16 @@ global search.
   (save-excursion
     (beginning-of-line)
     (let ((beg (point)))
-      (re-search-forward "thread:[a-fA-F0-9]*")
+      (re-search-forward "thread:[a-fA-F0-9]*" nil t)
       (filter-buffer-substring beg (point)))))
 
 (defun notmuch-search-markup-this-thread-id ()
   (beginning-of-line)
   (let ((beg (point)))
-    (re-search-forward "thread:[a-fA-F0-9]*")
-    (forward-char)
-    (overlay-put (make-overlay beg (point)) 'invisible 'notmuch-search)))
+    (if (re-search-forward "thread:[a-fA-F0-9]*" nil t)
+       (progn
+         (forward-char)
+         (overlay-put (make-overlay beg (point)) 'invisible 'notmuch-search)))))
 
 (defun notmuch-search-markup-thread-ids ()
   (save-excursion