From: Glenn Morris <rgm@gnu.org>
Date: Sun, 24 Feb 2008 22:51:00 +0000 (+0000)
Subject: (vc-mcvs-register): Fix let-binding (for use of `file').
X-Git-Tag: emacs-pretest-23.0.90~7702
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=59e9dbbc6395b3364e96049eef8ee0f96e1a8343;p=emacs.git

(vc-mcvs-register): Fix let-binding (for use of `file').
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e7f16811201..b7d40b19998 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-24  Glenn Morris  <rgm@gnu.org>
+
+	* vc-mcvs.el (vc-mcvs-register): Fix let-binding (for use of `file').
+
 2008-02-24  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* progmodes/compile.el (compilation-start): Specify a face for
diff --git a/lisp/vc-mcvs.el b/lisp/vc-mcvs.el
index 73fe7457dfa..6be69e47bd8 100644
--- a/lisp/vc-mcvs.el
+++ b/lisp/vc-mcvs.el
@@ -216,7 +216,7 @@ COMMENT can be used to provide an initial description of FILE.
 the Meta-CVS command (in that order)."
   ;; FIXME: multiple-file case should be made to work
   (if (> (length files) 1) (error "Registering filesets is not yet supported."))
-  (let* ((file (car files)) 
+  (let* ((file (car files))
 	 (filename (file-name-nondirectory file))
 	 (extpos (string-match "\\." filename))
 	 (ext (if extpos (substring filename (1+ extpos))))
@@ -245,19 +245,19 @@ the Meta-CVS command (in that order)."
 	  (pp types (current-buffer))
 	  (save-buffer)
 	  (unless (get-buffer-window (current-buffer) t)
-	    (kill-buffer (current-buffer)))))))
-  ;; Now do the ADD.
-  (prog1 (apply 'vc-mcvs-command nil 0 file
-		"add"
-		(and comment (string-match "[^\t\n ]" comment)
-		     (concat "-m" comment))
-		(vc-switches 'MCVS 'register))
-    ;; I'm not sure exactly why, but if we don't setup the inode and root
-    ;; prop of the file, things break later on in vc-mode-line that
-    ;; ends up calling vc-mcvs-working-revision.
-    ;; We also need to set vc-checkout-time so that vc-workfile-unchanged-p
-    ;; doesn't try to call `mcvs diff' on the file.
-    (vc-mcvs-registered file)))
+	    (kill-buffer (current-buffer))))))
+    ;; Now do the ADD.
+    (prog1 (apply 'vc-mcvs-command nil 0 file
+                  "add"
+                  (and comment (string-match "[^\t\n ]" comment)
+                       (concat "-m" comment))
+                  (vc-switches 'MCVS 'register))
+      ;; I'm not sure exactly why, but if we don't setup the inode and root
+      ;; prop of the file, things break later on in vc-mode-line that
+      ;; ends up calling vc-mcvs-working-revision.
+      ;; We also need to set vc-checkout-time so that vc-workfile-unchanged-p
+      ;; doesn't try to call `mcvs diff' on the file.
+      (vc-mcvs-registered file))))
 
 (defalias 'vc-mcvs-responsible-p 'vc-mcvs-root
   "Return non-nil if CVS thinks it is responsible for FILE.")