diff options
Diffstat (limited to 'lisp')
-rw-r--r-- | lisp/vc/vc.el | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 5b259fcdb33..67003c83926 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -2864,6 +2864,7 @@ permanent, only for the current session. This function only changes VC's perspective on FILE, it does not register or unregister it. By default, this command cycles through the registered backends. To get a prompt, use a prefix argument." + (declare (obsolete nil "28.1")) (interactive (list (or buffer-file-name @@ -2918,7 +2919,8 @@ backend to NEW-BACKEND, and unregister FILE from the current backend. (if registered (set-file-modes file (logior (file-modes file) 128)) ;; `registered' might have switched under us. - (vc-switch-backend file old-backend) + (with-suppressed-warnings ((obsolete vc-switch-backend)) + (vc-switch-backend file old-backend)) (let* ((rev (vc-working-revision file)) (modified-file (and edited (make-temp-file file))) (unmodified-file (and modified-file (vc-version-backup-file file)))) @@ -2937,16 +2939,19 @@ backend to NEW-BACKEND, and unregister FILE from the current backend. (vc-revert-file file)))) (vc-call-backend new-backend 'receive-file file rev)) (when modified-file - (vc-switch-backend file new-backend) + (with-suppressed-warnings ((obsolete vc-switch-backend)) + (vc-switch-backend file new-backend)) (unless (eq (vc-checkout-model new-backend (list file)) 'implicit) (vc-checkout file)) (rename-file modified-file file 'ok-if-already-exists) (vc-file-setprop file 'vc-checkout-time nil))))) (when move - (vc-switch-backend file old-backend) + (with-suppressed-warnings ((obsolete vc-switch-backend)) + (vc-switch-backend file old-backend)) (setq comment (vc-call-backend old-backend 'comment-history file)) (vc-call-backend old-backend 'unregister file)) - (vc-switch-backend file new-backend) + (with-suppressed-warnings ((obsolete vc-switch-backend)) + (vc-switch-backend file new-backend)) (when (or move edited) (vc-file-setprop file 'vc-state 'edited) (vc-mode-line file new-backend) |