Mercurial > emacs
changeset 85177:435ebb14becf
* vc.el (vc-deduce-fileset): Delete unused code.
(vc-next-action): Fix typos.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Thu, 11 Oct 2007 22:21:17 +0000 |
| parents | ecc5e7d7b8c6 |
| children | 8ff5c5a5cd7f |
| files | lisp/ChangeLog lisp/vc.el |
| diffstat | 2 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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 <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.
--- 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)