branch: elpa/with-editor
commit 9fc047751b537178b5123fead9426d72b794b4d3
Author: Kyle Meyer <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
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.
---
with-editor.el | 8 ++------
1 file 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)
