aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2005-11-14 04:33:03 +0000
committerStefan Monnier2005-11-14 04:33:03 +0000
commit1508b91a6c2b6b696849e80d80a7bc8f5fcee266 (patch)
treea794284362896192845a0aec56244aeb53aeb7df
parent1c32c9d6dc35fe78b049e145a6bb533ec7950aac (diff)
downloademacs-1508b91a6c2b6b696849e80d80a7bc8f5fcee266.tar.gz
emacs-1508b91a6c2b6b696849e80d80a7bc8f5fcee266.zip
(vc-svn-registered): Catch all errors.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/vc-svn.el7
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1439ff2285a..d7a015043f2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12005-11-13 Stefan Monnier <monnier@iro.umontreal.ca> 12005-11-13 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * vc-svn.el (vc-svn-registered): Catch all errors.
4
3 * cus-dep.el (custom-make-dependencies): Typo. 5 * cus-dep.el (custom-make-dependencies): Typo.
4 6
52005-11-13 Michael Albinus <michael.albinus@gmx.de> 72005-11-13 Michael Albinus <michael.albinus@gmx.de>
diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el
index de34fa847e2..8480d61c843 100644
--- a/lisp/vc-svn.el
+++ b/lisp/vc-svn.el
@@ -116,8 +116,11 @@ This is only meaningful if you don't use the implicit checkout model
116 (cd (file-name-directory file)) 116 (cd (file-name-directory file))
117 (condition-case nil 117 (condition-case nil
118 (vc-svn-command t 0 file "status" "-v") 118 (vc-svn-command t 0 file "status" "-v")
119 ;; We can't find an `svn' executable. We could also deregister SVN. 119 ;; Some problem happened. E.g. We can't find an `svn' executable.
120 (file-error nil)) 120 ;; We used to only catch `file-error' but when the process is run on
121 ;; a remote host via Tramp, the error is only reported via the
122 ;; exit status which is turned into an `error' by vc-do-command.
123 (error nil))
121 (vc-svn-parse-status t) 124 (vc-svn-parse-status t)
122 (eq 'SVN (vc-file-getprop file 'vc-backend))))) 125 (eq 'SVN (vc-file-getprop file 'vc-backend)))))
123 126