[Emacs-diffs] Changes to emacs/lisp/vc.el

[Andre Spiegel]

Index: emacs/lisp/vc.el
diff -c emacs/lisp/vc.el:1.353 emacs/lisp/vc.el:1.354
*** emacs/lisp/vc.el:1.353      Sat May 17 22:53:24 2003
--- emacs/lisp/vc.el    Mon May 26 06:33:00 2003
***************
*** 7,13 ****
  ;; Maintainer: Andre Spiegel <address@hidden>
  ;; Keywords: tools
  
! ;; $Id: vc.el,v 1.353 2003/05/18 02:53:24 monnier Exp $
  
  ;; This file is part of GNU Emacs.
  
--- 7,13 ----
  ;; Maintainer: Andre Spiegel <address@hidden>
  ;; Keywords: tools
  
! ;; $Id: vc.el,v 1.354 2003/05/26 10:33:00 spiegel Exp $
  
  ;; This file is part of GNU Emacs.
  
***************
*** 2666,2674 ****
  (defun vc-delete-file (file)
    "Delete file and mark it as such in the version control system."
    (interactive "fVC delete file: ")
!   (let ((buf (get-file-buffer file)))
      (unless (vc-find-backend-function backend 'delete-file)
!       (error "Renaming files under %s is not supported in VC" backend))
      (if (and buf (buffer-modified-p buf))
        (error "Please save files before deleting them"))
      (unless (y-or-n-p (format "Really want to delete %s ? "
--- 2666,2678 ----
  (defun vc-delete-file (file)
    "Delete file and mark it as such in the version control system."
    (interactive "fVC delete file: ")
!   (let ((buf (get-file-buffer file))
!         (backend (vc-backend file)))
!     (unless backend
!       (error "File %s is not under version control" 
!              (file-name-nondirectory file)))
      (unless (vc-find-backend-function backend 'delete-file)
!       (error "Deleting files under %s is not supported in VC" backend))
      (if (and buf (buffer-modified-p buf))
        (error "Please save files before deleting them"))
      (unless (y-or-n-p (format "Really want to delete %s ? "
***************
*** 3079,3085 ****
        (set (make-local-variable 'vc-annotate-color-map) color-map))
    (set (make-local-variable 'vc-annotate-offset) offset)
    (font-lock-mode 1))
- (make-obsolete 'vc-annotate-display 'vc-annotate-display-select "21.4")
  
  (defvar vc-annotate-offset nil)
  
--- 3083,3088 ----