diff options
| author | Stefan Monnier | 2007-07-13 04:46:37 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2007-07-13 04:46:37 +0000 |
| commit | fc8b8d0fb5751ee5e4363648519f2ec85e0132af (patch) | |
| tree | cbca52732e036d1d37e9b4fd3f4c935e99349064 | |
| parent | be436d23c712135e935bd7af3950d8de15b150e8 (diff) | |
| download | emacs-fc8b8d0fb5751ee5e4363648519f2ec85e0132af.tar.gz emacs-fc8b8d0fb5751ee5e4363648519f2ec85e0132af.zip | |
(vc-find-file-hook): Use with-demoted-errors.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/vc-hooks.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2e3d60d70e1..a353b168976 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2007-07-13 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * vc-hooks.el (vc-find-file-hook): Use with-demoted-errors. | ||
| 4 | |||
| 1 | 2007-07-12 Davis Herring <herring@lanl.gov> | 5 | 2007-07-12 Davis Herring <herring@lanl.gov> |
| 2 | 6 | ||
| 3 | * desktop.el (desktop-buffer-info, desktop-save): | 7 | * desktop.el (desktop-buffer-info, desktop-save): |
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el index 6ab95b333c6..02679136bc6 100644 --- a/lisp/vc-hooks.el +++ b/lisp/vc-hooks.el | |||
| @@ -793,7 +793,7 @@ current, and kill the buffer that visits the link." | |||
| 793 | (when buffer-file-name | 793 | (when buffer-file-name |
| 794 | (vc-file-clearprops buffer-file-name) | 794 | (vc-file-clearprops buffer-file-name) |
| 795 | (cond | 795 | (cond |
| 796 | ((vc-backend buffer-file-name) | 796 | ((with-demoted-errors (vc-backend buffer-file-name)) |
| 797 | ;; Compute the state and put it in the modeline. | 797 | ;; Compute the state and put it in the modeline. |
| 798 | (vc-mode-line buffer-file-name) | 798 | (vc-mode-line buffer-file-name) |
| 799 | (unless vc-make-backup-files | 799 | (unless vc-make-backup-files |