[notmuch] [PATCH 3/4] emacs: Some cleanup.

[Kan-Ru Chen]

Signed-off-by: Kan-Ru Chen <kanru at kanru.info>
---
 notmuch.el |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/notmuch.el b/notmuch.el
index 1722474..db8f899 100644
--- a/notmuch.el
+++ b/notmuch.el
@@ -611,11 +611,10 @@ which this thread was originally shown."
                   (invis-spec (make-symbol "notmuch-citation-region")))
               (add-to-invisibility-spec invis-spec)
 	      (overlay-put overlay 'invisible invis-spec)
-              (let ((p (point-marker))
-                    (cite-button-text
+              (let ((cite-button-text
                      (concat "["  (number-to-string (count-lines beg-sub (point)))
                              "-line citation. Click/Enter to show.]")))
-                (goto-char (- beg-sub 1))
+                (goto-char (1- beg-sub))
                 (insert (concat "\n" indent))
                 (insert-button cite-button-text
                                'invisibility-spec invis-spec
@@ -624,7 +623,7 @@ which this thread was originally shown."
               ))))
       (move-to-column depth)
       (if (looking-at notmuch-show-signature-regexp)
-	  (let ((sig-lines (- (count-lines beg-sub end) 1)))
+	  (let ((sig-lines (1- (count-lines beg-sub end))))
 	    (if (<= sig-lines notmuch-show-signature-lines-max)
 		(progn
                   (let ((invis-spec (make-symbol "notmuch-signature-region")))
@@ -632,7 +631,7 @@ which this thread was originally shown."
                     (overlay-put (make-overlay beg-sub end)
                                  'invisible invis-spec)
                   
-                    (goto-char (- beg-sub 1))
+                    (goto-char (1- beg-sub))
                     (insert (concat "\n" indent))
                     (let ((sig-button-text (concat "[" (number-to-string sig-lines)
                                                    "-line signature. Click/Enter to show.]")))
-- 
1.6.5.5