* lisp/net/tramp-sh.el (tramp-sh-handle-vc-registered): Don't modify

the global vc-handled-backends.

Fixes: debbugs:18535

2 files changed, 23 insertions, 32 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3ab2152406c..c87af7bd16a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-25  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* net/tramp-sh.el (tramp-sh-handle-vc-registered): Don't modify
+	the global vc-handled-backends (bug#18535).
+
 2014-09-24  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* find-cmd.el (find-cmd): Use grep's `find-program' (bug#18518).
@@ -6,29 +11,22 @@
 2014-09-24  Ulf Jasper  <ulf.jasper@web.de>
 
 	* net/newst-treeview.el (newsticker--treeview-do-get-node-by-id):
-	Renamed `newsticker--treeview-do-get-node' to
-	`newsticker--treeview-do-get-node-by-id'.
-	(newsticker--treeview-get-node-by-id): Renamed
-	`newsticker--treeview-get-node' to
-	`newsticker--treeview-get-node-by-id'.
-	(newsticker--treeview-get-current-node): Renamed `
-	`newsticker--treeview-get-node' to
-	`newsticker--treeview-get-node-by-id'.
+	Rename from `newsticker--treeview-do-get-node'.
+	(newsticker--treeview-get-node-by-id):
+	Rename from `newsticker--treeview-get-node'.
 	(newsticker--treeview-buffer-init)
 	(newsticker--treeview-buffer-init): Disable buffer undo.
-	(newsticker--treeview-unfold-node): Adapted to modified
+	(newsticker--treeview-unfold-node): Adapt to modified
 	`newsticker--group-find-parent-group'.
-	(newsticker--group-do-find-group): Renamed
-	`newsticker--group-do-find-group-for-feed' to
-	`newsticker--group-do-find-group'.  Now works for both, groups and
-	feeds.
-	(newsticker--group-find-parent-group): Renamed
-	`newsticker--group-find-group-for-feed' to
-	`newsticker--group-find-parent-group'.  Now works for both, groups
-	and feeds.
+	(newsticker--group-do-find-group):
+	Rename from `newsticker--group-do-find-group-for-feed'.
+	Now works for both, groups and feeds.
+	(newsticker--group-find-parent-group):
+	Rename from `newsticker--group-find-group-for-feed'.
+	Now works for both, groups and feeds.
 	(newsticker--group-do-get-parent-group)
-	(newsticker--group-get-parent-group): Removed.
-	(newsticker-group-add-group): Changed interactive prompts.
+	(newsticker--group-get-parent-group): Remove.
+	(newsticker-group-add-group): Change interactive prompts.
 	(newsticker-group-add-group): Finally jump to added group.
 	(newsticker-group-delete-group): Finally jump to current feed.
 	(newsticker--group-do-rename-group, newsticker-group-rename-group)
@@ -36,23 +34,16 @@
 	(newsticker-group-move-feed): Finally jump to moved feed.
 	(newsticker-group-shift-feed-down, newsticker-group-shift-feed-up)
 	(newsticker-group-shift-group-down)
-	(newsticker-group-shift-group-up, newsticker--group-shift): New
-	(newsticker--group-manage-orphan-feeds): Renamed
-	`newsticker--group-find-group-for-feed' to
-	`newsticker--group-find-parent-group'.
+	(newsticker-group-shift-group-up, newsticker--group-shift): New.
 	(newsticker-treeview-mode-map): New keybindings for new shift commands.
-	(newsticker-treeview-tree-do-click): Renamed
-	`newsticker--treeview-get-node' to
-	`newsticker--treeview-get-node-by-id'.
 
 	* net/newst-backend.el (newsticker--item-list)
 	(newsticker--item-position, newsticker--prev-message)
-	(newsticker--scrollable-text): Moved to newst-ticker.el.
+	(newsticker--scrollable-text): Move to newst-ticker.el.
 
 	* net/newst-ticker.el (newsticker--item-list)
 	(newsticker--item-position, newsticker--prev-message)
-	(newsticker--scrollable-text): Moved from newst-backend.el.
-
+	(newsticker--scrollable-text): Move from newst-backend.el.
 
 2014-09-22  Kan-Ru Chen  <kanru@kanru.info>
 
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index a01d173a783..a67ca32bbaa 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -3464,19 +3464,19 @@ the result will be a local, non-Tramp, file name."
 		     (not (with-tramp-connection-property v vc-bzr-program
 			    (tramp-find-executable
 			     v vc-bzr-program (tramp-get-remote-path v)))))
-	    (setq vc-handled-backends (delq 'Bzr vc-handled-backends)))
+	    (setq vc-handled-backends (remq 'Bzr vc-handled-backends)))
 	  (when (and (memq 'Git vc-handled-backends)
 		     (boundp 'vc-git-program)
 		     (not (with-tramp-connection-property v vc-git-program
 			    (tramp-find-executable
 			     v vc-git-program (tramp-get-remote-path v)))))
-	    (setq vc-handled-backends (delq 'Git vc-handled-backends)))
+	    (setq vc-handled-backends (remq 'Git vc-handled-backends)))
 	  (when (and (memq 'Hg vc-handled-backends)
 		     (boundp 'vc-hg-program)
 		     (not (with-tramp-connection-property v vc-hg-program
 			    (tramp-find-executable
 			     v vc-hg-program (tramp-get-remote-path v)))))
-	    (setq vc-handled-backends (delq 'Hg vc-handled-backends)))
+	    (setq vc-handled-backends (remq 'Hg vc-handled-backends)))
 	  ;; Run.
 	  (ignore-errors
 	    (tramp-run-real-handler 'vc-registered (list file))))))))