[Emacs-diffs] trunk r117948: * lisp/net/tramp-sh.el (tramp-sh-handle-vc-registered): Don't modify

[Stefan Monnier]

------------------------------------------------------------
revno: 117948
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=18535
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2014-09-25 09:07:28 -0400
message:
  * lisp/net/tramp-sh.el (tramp-sh-handle-vc-registered): Don't modify
  the global vc-handled-backends.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/tramp-sh.el           trampsh.el-20100913133439-a1faifh29eqoi4nh-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-09-24 19:23:13 +0000
+++ b/lisp/ChangeLog    2014-09-25 13:07:28 +0000
@@ -1,3 +1,8 @@
+2014-09-25  Stefan Monnier  <address@hidden>
+
+       * net/tramp-sh.el (tramp-sh-handle-vc-registered): Don't modify
+       the global vc-handled-backends (bug#18535).
+
 2014-09-24  Stefan Monnier  <address@hidden>
 
        * find-cmd.el (find-cmd): Use grep's `find-program' (bug#18518).
@@ -6,29 +11,22 @@
 2014-09-24  Ulf Jasper  <address@hidden>
 
        * 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  <address@hidden>
 

=== modified file 'lisp/net/tramp-sh.el'
--- a/lisp/net/tramp-sh.el      2014-09-05 14:12:48 +0000
+++ b/lisp/net/tramp-sh.el      2014-09-25 13:07:28 +0000
@@ -3464,19 +3464,19 @@
                     (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))))))))