From: OKAZAKI Tetsurou Date: Fri, 30 Nov 2012 04:44:52 +0000 (+0800) Subject: Relax existing-registration check in vc-register (tiny change). X-Git-Tag: emacs-24.3.90~173^2~9^2~127 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=171b09490b57815f4c0aeec32ff2a049f6a67393;p=emacs.git Relax existing-registration check in vc-register (tiny change). * vc/vc.el (vc-register): Allow registering a file which is already registered with a different backend. Fixes: debbugs:10589 --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 73a58600ba2..6c96213a71f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-11-30 OKAZAKI Tetsurou (tiny change) + + * vc/vc.el (vc-register): Allow registering a file which is + already registered with a different backend (Bug#10589). + 2012-11-29 Jambunathan K Stefan Monnier diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index a909aca5bca..0224211e6cf 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -1271,12 +1271,10 @@ first backend that could register the file is used." ;; many VCS allow that as well. (dolist (fname files) (let ((bname (get-file-buffer fname))) - (unless fname (setq fname buffer-file-name)) - (when (vc-backend fname) - (if (vc-registered fname) - (error "This file is already registered") - (unless (y-or-n-p "Previous master file has vanished. Make a new one? ") - (error "Aborted")))) + (unless fname + (setq fname buffer-file-name)) + (when (vc-call-backend backend 'registered fname) + (error "This file is already registered")) ;; Watch out for new buffers of size 0: the corresponding file ;; does not exist yet, even though buffer-modified-p is nil. (when bname