diff options
| author | Stefan Monnier | 2007-08-09 14:42:00 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2007-08-09 14:42:00 +0000 |
| commit | a37737301211b72450b98033f5f2786bc871bc7a (patch) | |
| tree | 4f2e4c4326b1eb9e042faef33250ebece971ce04 | |
| parent | 9d8f43bfbf6cda54e39a060c3626e52fed973e01 (diff) | |
| download | emacs-a37737301211b72450b98033f5f2786bc871bc7a.tar.gz emacs-a37737301211b72450b98033f5f2786bc871bc7a.zip | |
(vc-default-find-file-not-found-hook): Do nothing.
| -rw-r--r-- | lisp/ChangeLog | 11 | ||||
| -rw-r--r-- | lisp/vc-hooks.el | 10 |
2 files changed, 12 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 07e268e5036..7a9b0933d5b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,7 +1,14 @@ | |||
| 1 | 2007-08-09 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * vc-hooks.el (vc-default-find-file-not-found-hook): Do nothing. | ||
| 4 | |||
| 5 | * vc-rcs.el (vc-rcs-find-file-not-found-hook): | ||
| 6 | Move from vc-default-find-file-not-found-hook. | ||
| 7 | |||
| 1 | 2007-08-09 Edward O'Connor <hober0@gmail.com> (tiny change) | 8 | 2007-08-09 Edward O'Connor <hober0@gmail.com> (tiny change) |
| 2 | 9 | ||
| 3 | * url/url-auth.el (url-basic-auth): When prompting for username | 10 | * url/url-auth.el (url-basic-auth): When prompting for username |
| 4 | and password, default to the username and password in the URL. | 11 | and password, default to the username and password in the URL. |
| 5 | 12 | ||
| 6 | 2007-08-08 Stefan Monnier <monnier@iro.umontreal.ca> | 13 | 2007-08-08 Stefan Monnier <monnier@iro.umontreal.ca> |
| 7 | 14 | ||
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el index 052365945f2..0356e10fe5c 100644 --- a/lisp/vc-hooks.el +++ b/lisp/vc-hooks.el | |||
| @@ -838,13 +838,9 @@ Used in `find-file-not-found-functions'." | |||
| 838 | (if backend (vc-call-backend backend 'find-file-not-found-hook)))) | 838 | (if backend (vc-call-backend backend 'find-file-not-found-hook)))) |
| 839 | 839 | ||
| 840 | (defun vc-default-find-file-not-found-hook (backend) | 840 | (defun vc-default-find-file-not-found-hook (backend) |
| 841 | (if (yes-or-no-p | 841 | ;; This used to do what vc-rcs-find-file-not-found-hook does, but it only |
| 842 | (format "File %s was lost; check out from version control? " | 842 | ;; really makes sense for RCS. For other backends, better not do anything. |
| 843 | (file-name-nondirectory buffer-file-name))) | 843 | nil) |
| 844 | (save-excursion | ||
| 845 | (require 'vc) | ||
| 846 | (setq default-directory (file-name-directory buffer-file-name)) | ||
| 847 | (not (vc-error-occurred (vc-checkout buffer-file-name)))))) | ||
| 848 | 844 | ||
| 849 | (add-hook 'find-file-not-found-functions 'vc-file-not-found-hook) | 845 | (add-hook 'find-file-not-found-functions 'vc-file-not-found-hook) |
| 850 | 846 | ||