Skip to content

Commit

Permalink
* tramp.el (tramp-file-name-for-operation): Remove
Browse files Browse the repository at this point in the history
`executable-find', `start-process', `call-process' and
`call-process-region'.

* tramp-sh.el (top): Remove `tramp-sh-handle-call-process-region'.
  • Loading branch information
albinus committed Dec 6, 2012
1 parent e51fff2 commit ece1338
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 14 deletions.
8 changes: 8 additions & 0 deletions lisp/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
2012-12-06 Michael Albinus <michael.albinus@gmx.de>

* tramp.el (tramp-file-name-for-operation): Remove
`executable-find', `start-process', `call-process' and
`call-process-region'.

* tramp-sh.el (top): Remove `tramp-sh-handle-call-process-region'.

2012-12-05 Michael Albinus <michael.albinus@gmx.de>

* tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Check
Expand Down
10 changes: 0 additions & 10 deletions lisp/tramp-sh.el
Original file line number Diff line number Diff line change
Expand Up @@ -2932,16 +2932,6 @@ the result will be a local, non-Tramp, filename."
(keyboard-quit)
ret))))

(defun tramp-sh-handle-call-process-region
(start end program &optional delete buffer display &rest args)
"Like `call-process-region' for Tramp files."
(let ((tmpfile (tramp-compat-make-temp-file "")))
(write-region start end tmpfile)
(when delete (delete-region start end))
(unwind-protect
(apply 'call-process program tmpfile buffer display args)
(delete-file tmpfile))))

(defun tramp-sh-handle-file-local-copy (filename)
"Like `file-local-copy' for Tramp files."
(with-parsed-tramp-file-name filename nil
Expand Down
5 changes: 1 addition & 4 deletions lisp/tramp.el
Original file line number Diff line number Diff line change
Expand Up @@ -1928,10 +1928,7 @@ ARGS are the arguments OPERATION has been called with."
;; Emacs 23+ only.
'start-file-process
;; XEmacs only.
'dired-print-file 'dired-shell-call-process
;; nowhere yet.
'executable-find 'start-process
'call-process 'call-process-region))
'dired-print-file 'dired-shell-call-process))
default-directory)
;; Unknown file primitive.
(t (error "unknown file I/O primitive: %s" operation))))
Expand Down

0 comments on commit ece1338

Please sign in to comment.