* vc.el (vc-deduce-fileset): Delete unused code.

(vc-next-action): Fix typos.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c1ac13dfff7b60db811037af8646b2f04b9c5640..3faf83b6e61e8c1445761359059f16210b59dd09 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-11  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * vc.el (vc-deduce-fileset): Delete unused code.
+       (vc-next-action): Fix typos.
+
 2007-10-11  Juanma Barranquero  <lekktu@gmail.com>
 
        * bs.el (bs--mark-unmark): New function.

diff --git a/lisp/vc.el b/lisp/vc.el
index 9c2a5097498d24962f3d4594e5dd2e40b0236a52..77d85352a7732852459521e8a30424eb3d2dcfd7 100644 (file)
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -1288,7 +1288,6 @@ Otherwise, throw an error.
        ;; confirmation prompts.
        (allow-directory-wildcard
         (progn
-          (setq marked (list default-directory))
           (message "All version-controlled files below %s selected."
                    default-directory)
           (list default-directory)))
@@ -1441,7 +1440,7 @@ merge in the changes into your working copy."
          (if (not (file-writable-p file))
              (progn
                ;; Make the file+buffer read-write.
-               (unless (y-or-no-p (format "%s is edited but read-only; make it writable and continue?" file))
+               (unless (y-or-n-p (format "%s is edited but read-only; make it writable and continue?" file))
                  (error "Aborted"))
                (set-file-modes file (logior (file-modes file) 128))
                (let ((visited (get-file-buffer file)))
@@ -1481,9 +1480,9 @@ merge in the changes into your working copy."
      ((stringp state)
       (let ((revision 
             (if verbose 
-                (read-string "Revision to steal: ")
-              (vc-working-revision file))))
-       (mapc (lambda (file) (vc-steal-lock file revision) state) files)))
+                (read-string "Version to steal: ")
+              (vc-workfile-version file))))
+       (mapc (lambda (file) (vc-steal-lock file version state) files))))
        ;; needs-patch
      ((eq state 'needs-patch)
       (dolist (file files)