[Emacs-diffs] Changes to emacs/lisp/vc.el,v

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   07/10/11 22:21:19

Index: vc.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc.el,v
retrieving revision 1.469
retrieving revision 1.470
diff -u -b -r1.469 -r1.470
--- vc.el       11 Oct 2007 16:53:58 -0000      1.469
+++ vc.el       11 Oct 2007 22:21:17 -0000      1.470
@@ -1288,7 +1288,6 @@
        ;; 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 @@
          (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 @@
      ((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)