# HG changeset patch # User Dan Nicolaescu # Date 1192141277 0 # Node ID 435ebb14becf0a9e72a875efd08fc2f03738c26e # Parent ecc5e7d7b8c69ce74080d5c479069e5c1ba6f303 * vc.el (vc-deduce-fileset): Delete unused code. (vc-next-action): Fix typos. diff -r ecc5e7d7b8c6 -r 435ebb14becf lisp/ChangeLog --- a/lisp/ChangeLog Thu Oct 11 17:07:59 2007 +0000 +++ b/lisp/ChangeLog Thu Oct 11 22:21:17 2007 +0000 @@ -1,3 +1,8 @@ +2007-10-11 Dan Nicolaescu + + * vc.el (vc-deduce-fileset): Delete unused code. + (vc-next-action): Fix typos. + 2007-10-11 Juanma Barranquero * bs.el (bs--mark-unmark): New function. diff -r ecc5e7d7b8c6 -r 435ebb14becf lisp/vc.el --- a/lisp/vc.el Thu Oct 11 17:07:59 2007 +0000 +++ b/lisp/vc.el Thu Oct 11 22:21:17 2007 +0000 @@ -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)