diff options
| author | Glenn Morris | 2018-12-30 17:02:40 -0800 |
|---|---|---|
| committer | Glenn Morris | 2018-12-30 17:02:40 -0800 |
| commit | 433b6a74ec73608ff06106daee4f53c5175d5297 (patch) | |
| tree | 1be58fb0808c683eb4b488a95555e2e24206ea61 /lisp/eshell | |
| parent | f23b1db37a816ab88a5970e67d1aaeb7f68ca47c (diff) | |
| parent | 82c82b1c773f441fe424b7ed1757c8eda31814c0 (diff) | |
| download | emacs-433b6a74ec73608ff06106daee4f53c5175d5297.tar.gz emacs-433b6a74ec73608ff06106daee4f53c5175d5297.zip | |
Merge from origin/emacs-26
82c82b1 (origin/emacs-26) In user manual fix value of default frame h...
2e8825d Improve documentation of 'file-local-name' and related APIs
11f0635 ; Remove comment in esh-proc.el
# Conflicts:
# lisp/simple.el
Diffstat (limited to 'lisp/eshell')
| -rw-r--r-- | lisp/eshell/esh-proc.el | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lisp/eshell/esh-proc.el b/lisp/eshell/esh-proc.el index 3735f30c304..384846c7a3c 100644 --- a/lisp/eshell/esh-proc.el +++ b/lisp/eshell/esh-proc.el | |||
| @@ -282,7 +282,6 @@ See `eshell-needs-pipe'." | |||
| 282 | (let ((process-connection-type | 282 | (let ((process-connection-type |
| 283 | (unless (eshell-needs-pipe-p command) | 283 | (unless (eshell-needs-pipe-p command) |
| 284 | process-connection-type)) | 284 | process-connection-type)) |
| 285 | ;; `start-process' can't deal with relative filenames. | ||
| 286 | (command (file-local-name (expand-file-name command)))) | 285 | (command (file-local-name (expand-file-name command)))) |
| 287 | (apply 'start-file-process | 286 | (apply 'start-file-process |
| 288 | (file-name-nondirectory command) nil command args))) | 287 | (file-name-nondirectory command) nil command args))) |