lib: Treat NULL as a valid (and empty) notmuch_filenames_t iterator.

[notmuch] / notmuch.el

diff --git a/notmuch.el b/notmuch.el
index 9ec89ca0068ec2126e54d5a18c26300c265348b8..97914f2cba68b6c879520c9ba7491ec2a0338135 100644 (file)
--- a/notmuch.el
+++ b/notmuch.el
@@ -599,11 +599,13 @@ which this thread was originally shown."
   (while (< (point) end)
     (let ((beg-sub (point-marker))
          (indent (make-string depth ? ))
-         (citation "[[:space:]]*>"))
+         (citation ">"))
+      (move-to-column depth)
       (if (looking-at citation)
          (progn
            (while (looking-at citation)
-             (forward-line))
+             (forward-line)
+             (move-to-column depth))
            (let ((overlay (make-overlay beg-sub (point)))
                   (invis-spec (make-symbol "notmuch-citation-region")))
               (add-to-invisibility-spec invis-spec)
@@ -611,14 +613,13 @@ which this thread was originally shown."
               (let ((p (point-marker))
                     (cite-button-text
                      (concat "["  (number-to-string (count-lines beg-sub (point)))
-                             "-line citation.]")))
+                             "-line citation. Click/Enter to show.]")))
                 (goto-char (- beg-sub 1))
                 (insert (concat "\n" indent))
                 (insert-button cite-button-text
                                'invisibility-spec invis-spec
                                :type 'notmuch-button-citation-toggle-type)
-                (insert "\n")
-                (goto-char (+ (length cite-button-text) p))
+                (forward-line)
               ))))
       (move-to-column depth)
       (if (looking-at notmuch-show-signature-regexp)