aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorMichael Albinus2013-07-14 20:45:50 +0200
committerMichael Albinus2013-07-14 20:45:50 +0200
commitf6dd8b3647e7c0d32fc142a77cc6ad4c18deb916 (patch)
tree876bb347d0eb07853bdf21a0e99e9339f6f75d62 /lisp
parent3af1c8684ed6e48fbc21481d129e9aa164752c6e (diff)
downloademacs-f6dd8b3647e7c0d32fc142a77cc6ad4c18deb916.tar.gz
emacs-f6dd8b3647e7c0d32fc142a77cc6ad4c18deb916.zip
* net/tramp-sh.el (tramp-sh-handle-vc-registered): Use `ignore-error'.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/net/tramp-sh.el3
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5451abc2119..25d666f8f40 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12013-07-14 Michael Albinus <michael.albinus@gmx.de>
2
3 * net/tramp-sh.el (tramp-sh-handle-vc-registered): Use `ignore-error'.
4
12013-07-13 Dmitry Gutov <dgutov@yandex.ru> 52013-07-13 Dmitry Gutov <dgutov@yandex.ru>
2 6
3 * progmodes/ruby-mode.el (ruby-font-lock-keywords): Highlight 7 * progmodes/ruby-mode.el (ruby-font-lock-keywords): Highlight
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 281f497692d..c92eacd4473 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -3334,7 +3334,8 @@ Returns a file name in `tramp-auto-save-directory' for autosaving this file."
3334 ;; `process-file-side-effects' in order to keep the cache when 3334 ;; `process-file-side-effects' in order to keep the cache when
3335 ;; `process-file' calls appear. 3335 ;; `process-file' calls appear.
3336 (let (process-file-side-effects) 3336 (let (process-file-side-effects)
3337 (tramp-run-real-handler 'vc-registered (list file))))))) 3337 (ignore-errors
3338 (tramp-run-real-handler 'vc-registered (list file))))))))
3338 3339
3339;;;###tramp-autoload 3340;;;###tramp-autoload
3340(defun tramp-sh-file-name-handler (operation &rest args) 3341(defun tramp-sh-file-name-handler (operation &rest args)