diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2017-06-11 03:14:02 -0400 |
|---|---|---|
| committer | Jonas Bernoulli <jonas@bernoul.li> | 2017-07-02 13:42:48 +0200 |
| commit | 9fc047751b537178b5123fead9426d72b794b4d3 (patch) | |
| tree | 9ab87b22f51753d2d3d3c55e3f57feb9458b881f /with-editor.el | |
| parent | 0a8d9cea6f4c34f25342767f8e6ec2203a9d28d8 (diff) | |
with-editor-output-filter: don't use tramp-make-tramp-file-name
As of Emacs's dca22e86e0 (Introduce a defstruct `tramp-file-name' as
central data structure, 2017-05-24), tramp-make-tramp-file-name takes
two more positional arguments. Instead of adding a compatibility
kludge, use file-remote-p to construct the file name.
Fixes #29.
Diffstat (limited to 'with-editor.el')
| -rw-r--r-- | with-editor.el | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/with-editor.el b/with-editor.el index 13e0c6a..7cb5e7b 100644 --- a/with-editor.el +++ b/with-editor.el @@ -82,8 +82,7 @@ (require 'cl-lib) (require 'dash) (require 'server) -(require 'tramp) -(require 'tramp-sh nil t) +(require 'shell) (and (require 'async-bytecomp nil t) (memq 'magit (bound-and-true-p async-bytecomp-allowed-packages)) @@ -516,10 +515,7 @@ which may or may not insert the text into the PROCESS' buffer." (with-current-buffer (find-file-noselect (if (file-name-absolute-p file) - (if (tramp-tramp-file-p default-directory) - (with-parsed-tramp-file-name default-directory nil - (tramp-make-tramp-file-name method user host file hop)) - file) + (concat (file-remote-p default-directory) file) (expand-file-name file))) (with-editor-mode 1) (setq with-editor--pid pid) |