From: Mathias Dahl <mathias.dahl@gmail.com>
Date: Tue, 25 Jul 2006 15:02:14 +0000 (+0000)
Subject: (tumme-track-original-file): Add `buffer-live-p' check.
X-Git-Tag: emacs-pretest-22.0.90~1245
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a9f48c58ad74610957e41558cb36d4b015cc3d03;p=emacs.git

(tumme-track-original-file): Add `buffer-live-p' check.
(tumme-format-properties-string): Handle empty `buf'.
(tumme-get-comment): Change variable names inside `let'.  Add
missing `let' variable that cause font-lock problems.
(tumme-write-comments): Change variable names inside `let'.  Add
missing `let' variable that cause font-lock problems.
---

diff --git a/lisp/tumme.el b/lisp/tumme.el
index 1d313963d2a..d7b873d7cb4 100644
--- a/lisp/tumme.el
+++ b/lisp/tumme.el
@@ -2021,7 +2021,7 @@ function.  The result is a couple of new files in
 Write file comments to one or more files.  FILE-COMMENTS is an alist on
 the following form:
  ((FILE . COMMENT) ... )"
-  (let (end comment-beg file comment)
+  (let (end comment-beg-pos comment-end-pos file comment)
     (with-temp-file tumme-db-file
       (insert-file-contents tumme-db-file)
       (dolist (elt file-comments)
@@ -2034,13 +2034,13 @@ the following form:
 	      (beginning-of-line)
 	      ;; Delete old comment, if any
 	      (when (search-forward ";comment:" end t)
-		(setq comment-beg (match-beginning 0))
+		(setq comment-beg-pos (match-beginning 0))
 		;; Any tags after the comment?
 		(if (search-forward ";" end t)
-		    (setq comment-end (- (point) 1))
-		  (setq comment-end end))
+		    (setq comment-end-pos (- (point) 1))
+		  (setq comment-end-pos end))
 		;; Delete comment tag and comment
-		(delete-region comment-beg comment-end))
+		(delete-region comment-beg-pos comment-end-pos))
 	      ;; Insert new comment
 	      (beginning-of-line)
 	      (unless (search-forward ";" end t)
@@ -2092,7 +2092,7 @@ as initial value."
 (defun tumme-get-comment (file)
   "Get comment for file FILE."
   (save-excursion
-    (let (end buf comment-beg comment)
+    (let (end buf comment-beg-pos comment-end-pos comment)
       (setq buf (find-file tumme-db-file))
       (goto-char (point-min))
       (when (search-forward-regexp
@@ -2101,12 +2101,12 @@ as initial value."
         (setq end (point))
         (beginning-of-line)
         (cond ((search-forward ";comment:" end t)
-               (setq comment-beg (point))
+               (setq comment-beg-pos (point))
                (if (search-forward ";" end t)
-                   (setq comment-end (- (point) 1))
-                 (setq comment-end end))
+                   (setq comment-end-pos (- (point) 1))
+                 (setq comment-end-pos end))
                (setq comment (buffer-substring
-                              comment-beg comment-end)))))
+                              comment-beg-pos comment-end-pos)))))
       (kill-buffer buf)
       comment)))