diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2022-02-18 10:38:47 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2022-02-18 10:38:49 +0200 |
| commit | 2ed240296c181cc677caeef1ec33befd8428aa98 (patch) | |
| tree | 8a7c5af3b20d468dadb6655b8a9827c6c9fc7813 /lisp/shell.el | |
| parent | b16aed76cb2e94dc5a8cb27ba574346a3931ca92 (diff) | |
| parent | c8442df581feb45d50530b372152beff9d23211d (diff) | |
| download | emacs-2ed240296c181cc677caeef1ec33befd8428aa98.tar.gz emacs-2ed240296c181cc677caeef1ec33befd8428aa98.tar.bz2 emacs-2ed240296c181cc677caeef1ec33befd8428aa98.zip | |
Merge from origin/emacs-28
c8442df ; Separate command and concept index in Transient manual
8aa052c ; Fix Transient manual
5b7752a Fix problem with popd for in remote shell buffers
38f6ea1 Import texi source file for transient manual
df34929 Update to Org 9.5.2-15-gc5ceb6
Diffstat (limited to 'lisp/shell.el')
| -rw-r--r-- | lisp/shell.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/shell.el b/lisp/shell.el index c0a82bca183..6198214abee 100644 --- a/lisp/shell.el +++ b/lisp/shell.el @@ -942,7 +942,7 @@ Environment variables are expanded, see function `substitute-in-file-name'." dir (if (file-name-absolute-p dir) ;; The name is absolute, so prepend the prefix. - (concat comint-file-name-prefix dir) + (concat comint-file-name-prefix (file-local-name dir)) ;; For relative name we assume default-directory already has the prefix. (expand-file-name dir)))) |