Index: lisp/tramp-util.el
===================================================================
RCS file: /cvsroot/tramp/tramp/lisp/tramp-util.el,v
retrieving revision 2.31
retrieving revision 2.32
diff -c -r2.31 -r2.32
*** lisp/tramp-util.el	25 Oct 2006 05:47:09 -0000	2.31
--- lisp/tramp-util.el	26 Dec 2006 21:42:55 -0000	2.32
***************
*** 83,89 ****
  ;; is, that commands which should run locally anyway, would also run
  ;; remotely, like the commands called by `gnus'.  This implementation
  ;; is an experimental one as proof of concept, it will change after
! ;; iscussion with (X)Emacs maintainers.
  
  ;; In Emacs 22, there is already `process-file', which is similar to
  ;; `call-process'.
--- 83,89 ----
  ;; is, that commands which should run locally anyway, would also run
  ;; remotely, like the commands called by `gnus'.  This implementation
  ;; is an experimental one as proof of concept, it will change after
! ;; discussion with (X)Emacs maintainers.
  
  ;; In Emacs 22, there is already `process-file', which is similar to
  ;; `call-process'.
***************
*** 93,101 ****
  ;; assumed that the shell on a remote host is equal to the one of the
  ;; local host.
  
! ;; `call-process-on-region' does not work (yet) this way, it needs mor
! ;; investigation.  The same is true for synchronous `shell-command',
! ;; which applies `call-process-on-region' internally.
  
  ;; Other open problems are `setenv'/`getenv'.
  
--- 93,101 ----
  ;; assumed that the shell on a remote host is equal to the one of the
  ;; local host.
  
! ;; `call-process-on-region' does not work (yet) this way, it needs
! ;; more investigation.  The same is true for synchronous
! ;; `shell-command', which applies `call-process-on-region' internally.
  
  ;; Other open problems are `setenv'/`getenv'.
  
***************
*** 127,136 ****
  	      (apply 'tramp-handle-start-process (ad-get-args 0)))
        ad-do-it))
    (add-hook 'tramp-util-unload-hook
! 	    '(lambda () (ad-unadvise 'start-process))))
  
- (unless (tramp-exists-file-name-handler
- 	 'start-process-shell-command "" nil "ls")
    (defadvice start-process-shell-command
      (around tramp-advice-start-process-shell-command activate)
      "Invoke `tramp-handle-start-process-shell-command' for Tramp files."
--- 127,134 ----
  	      (apply 'tramp-handle-start-process (ad-get-args 0)))
        ad-do-it))
    (add-hook 'tramp-util-unload-hook
! 	    '(lambda () (ad-unadvise 'start-process)))
  
    (defadvice start-process-shell-command
      (around tramp-advice-start-process-shell-command activate)
      "Invoke `tramp-handle-start-process-shell-command' for Tramp files."
***************
*** 157,165 ****
  		   (apply 'tramp-fish-handle-call-process (ad-get-args 0))))
  	    (t ad-do-it))))
    (add-hook 'tramp-util-unload-hook
! 	    '(lambda () (ad-unadvise 'call-process))))
  
- (unless (tramp-exists-file-name-handler 'call-process-shell-command "ls")
    (defadvice call-process-shell-command
      (around tramp-advice-call-process-shell-command activate)
      "Invoke `tramp-handle-call-process-shell-command' for Tramp files."
--- 155,162 ----
  		   (apply 'tramp-fish-handle-call-process (ad-get-args 0))))
  	    (t ad-do-it))))
    (add-hook 'tramp-util-unload-hook
! 	    '(lambda () (ad-unadvise 'call-process)))
  
    (defadvice call-process-shell-command
      (around tramp-advice-call-process-shell-command activate)
      "Invoke `tramp-handle-call-process-shell-command' for Tramp files."