diff options
| author | André Spiegel | 2003-07-26 13:05:10 +0000 |
|---|---|---|
| committer | André Spiegel | 2003-07-26 13:05:10 +0000 |
| commit | 3756d48129ee8d054b3d452668d6feb88ba471d8 (patch) | |
| tree | e7a579788c834f054db429f34f26414c853c7009 | |
| parent | 53e89326a11345c28e6962b205af3bdce6cbf515 (diff) | |
| download | emacs-3756d48129ee8d054b3d452668d6feb88ba471d8.tar.gz emacs-3756d48129ee8d054b3d452668d6feb88ba471d8.zip | |
(vc-default-registered, vc-make-version-backup): Use with-no-warnings.
(vc-file-not-found-hook): Add this to find-file-not-found-functions,
rather than to find-file-not-found-hook, which doesn't exist.
| -rw-r--r-- | lisp/vc-hooks.el | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el index 7eecaa25fd3..6ad999b3e66 100644 --- a/lisp/vc-hooks.el +++ b/lisp/vc-hooks.el | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | ;; Author: FSF (see vc.el for full credits) | 6 | ;; Author: FSF (see vc.el for full credits) |
| 7 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> | 7 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> |
| 8 | 8 | ||
| 9 | ;; $Id: vc-hooks.el,v 1.152 2003/06/05 11:34:06 fx Exp $ | 9 | ;; $Id: vc-hooks.el,v 1.153 2003/07/06 17:26:48 monnier Exp $ |
| 10 | 10 | ||
| 11 | ;; This file is part of GNU Emacs. | 11 | ;; This file is part of GNU Emacs. |
| 12 | 12 | ||
| @@ -478,7 +478,8 @@ If FILE is not registered, this function always returns nil." | |||
| 478 | (and (consp template) | 478 | (and (consp template) |
| 479 | (eq (cdr template) backend) | 479 | (eq (cdr template) backend) |
| 480 | (car template))) | 480 | (car template))) |
| 481 | vc-master-templates)) | 481 | (with-no-warnings |
| 482 | vc-master-templates))) | ||
| 482 | (symbol-value sym)))) | 483 | (symbol-value sym)))) |
| 483 | (let ((result (vc-check-master-templates file (symbol-value sym)))) | 484 | (let ((result (vc-check-master-templates file (symbol-value sym)))) |
| 484 | (if (stringp result) | 485 | (if (stringp result) |
| @@ -582,7 +583,7 @@ a regexp for matching all such backup files, regardless of the version." | |||
| 582 | "Make a backup copy of FILE, which is assumed in sync with the repository. | 583 | "Make a backup copy of FILE, which is assumed in sync with the repository. |
| 583 | Before doing that, check if there are any old backups and get rid of them." | 584 | Before doing that, check if there are any old backups and get rid of them." |
| 584 | (unless (and (fboundp 'msdos-long-file-names) | 585 | (unless (and (fboundp 'msdos-long-file-names) |
| 585 | (not (msdos-long-file-names))) | 586 | (not (with-no-warnings msdos-long-file-names))) |
| 586 | (vc-delete-automatic-version-backups file) | 587 | (vc-delete-automatic-version-backups file) |
| 587 | (copy-file file (vc-version-backup-file-name file) | 588 | (copy-file file (vc-version-backup-file-name file) |
| 588 | nil 'keep-date))) | 589 | nil 'keep-date))) |
| @@ -754,7 +755,7 @@ Used in `find-file-not-found-hook'." | |||
| 754 | (setq default-directory (file-name-directory buffer-file-name)) | 755 | (setq default-directory (file-name-directory buffer-file-name)) |
| 755 | (not (vc-error-occurred (vc-checkout buffer-file-name)))))) | 756 | (not (vc-error-occurred (vc-checkout buffer-file-name)))))) |
| 756 | 757 | ||
| 757 | (add-hook 'find-file-not-found-hook 'vc-file-not-found-hook) | 758 | (add-hook 'find-file-not-found-functions 'vc-file-not-found-hook) |
| 758 | 759 | ||
| 759 | (defun vc-kill-buffer-hook () | 760 | (defun vc-kill-buffer-hook () |
| 760 | "Discard VC info about a file when we kill its buffer." | 761 | "Discard VC info about a file when we kill its buffer." |