[Emacs-diffs] /srv/bzr/emacs/trunk r111033: Relax existing-registration check in vc-register (tiny change).

[Chong Yidong]

------------------------------------------------------------
revno: 111033
fixes bug: http://debbugs.gnu.org/10589
author: OKAZAKI Tetsurou <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Fri 2012-11-30 12:44:52 +0800
message:
  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.
modified:
  lisp/ChangeLog
  lisp/vc/vc.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-11-29 21:32:24 +0000
+++ b/lisp/ChangeLog    2012-11-30 04:44:52 +0000
@@ -1,3 +1,8 @@
+2012-11-30  OKAZAKI Tetsurou  <address@hidden>  (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  <address@hidden>
             Stefan Monnier  <address@hidden>
 

=== modified file 'lisp/vc/vc.el'
--- a/lisp/vc/vc.el     2012-10-20 12:04:45 +0000
+++ b/lisp/vc/vc.el     2012-11-30 04:44:52 +0000
@@ -1271,12 +1271,10 @@
     ;; 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