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

[Andre Spiegel]

Index: emacs/lisp/vc-hooks.el
diff -c emacs/lisp/vc-hooks.el:1.153 emacs/lisp/vc-hooks.el:1.154
*** emacs/lisp/vc-hooks.el:1.153        Sun Jul  6 13:26:48 2003
--- emacs/lisp/vc-hooks.el      Sat Jul 26 09:05:10 2003
***************
*** 6,12 ****
  ;; Author:     FSF (see vc.el for full credits)
  ;; Maintainer: Andre Spiegel <address@hidden>
  
! ;; $Id: vc-hooks.el,v 1.153 2003/07/06 17:26:48 monnier Exp $
  
  ;; This file is part of GNU Emacs.
  
--- 6,12 ----
  ;; Author:     FSF (see vc.el for full credits)
  ;; Maintainer: Andre Spiegel <address@hidden>
  
! ;; $Id: vc-hooks.el,v 1.154 2003/07/26 13:05:10 spiegel Exp $
  
  ;; This file is part of GNU Emacs.
  
***************
*** 478,484 ****
                                (and (consp template)
                                     (eq (cdr template) backend)
                                     (car template)))
!                             vc-master-templates))
                       (symbol-value sym))))
      (let ((result (vc-check-master-templates file (symbol-value sym))))
        (if (stringp result)
--- 478,485 ----
                                (and (consp template)
                                     (eq (cdr template) backend)
                                     (car template)))
!                               (with-no-warnings
!                                vc-master-templates)))
                       (symbol-value sym))))
      (let ((result (vc-check-master-templates file (symbol-value sym))))
        (if (stringp result)
***************
*** 582,588 ****
    "Make a backup copy of FILE, which is assumed in sync with the repository.
  Before doing that, check if there are any old backups and get rid of them."
    (unless (and (fboundp 'msdos-long-file-names)
!                (not (msdos-long-file-names)))
      (vc-delete-automatic-version-backups file)
      (copy-file file (vc-version-backup-file-name file)
                 nil 'keep-date)))
--- 583,589 ----
    "Make a backup copy of FILE, which is assumed in sync with the repository.
  Before doing that, check if there are any old backups and get rid of them."
    (unless (and (fboundp 'msdos-long-file-names)
!                (not (with-no-warnings msdos-long-file-names)))
      (vc-delete-automatic-version-backups file)
      (copy-file file (vc-version-backup-file-name file)
                 nil 'keep-date)))
***************
*** 754,760 ****
        (setq default-directory (file-name-directory buffer-file-name))
        (not (vc-error-occurred (vc-checkout buffer-file-name))))))
  
! (add-hook 'find-file-not-found-hook 'vc-file-not-found-hook)
  
  (defun vc-kill-buffer-hook ()
    "Discard VC info about a file when we kill its buffer."
--- 755,761 ----
        (setq default-directory (file-name-directory buffer-file-name))
        (not (vc-error-occurred (vc-checkout buffer-file-name))))))
  
! (add-hook 'find-file-not-found-functions 'vc-file-not-found-hook)
  
  (defun vc-kill-buffer-hook ()
    "Discard VC info about a file when we kill its buffer."