diff options
| author | Richard M. Stallman <rms@gnu.org> | 1994-06-23 23:12:13 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1994-06-23 23:12:13 +0000 |
| commit | 4a02b552f18955eca58e1935334f09b9db49c8f5 (patch) | |
| tree | f284280047412e99ece5f37765c16ae435f035a5 | |
| parent | dc0825dbe3f86a9d4f09c7b1bc6a0928e590770a (diff) | |
| download | emacs-4a02b552f18955eca58e1935334f09b9db49c8f5.tar.gz | |
(shell-prefixed-directory-name): Do nothing if
comint-file-name-prefix is empty. Do not inline.
| -rw-r--r-- | lisp/shell.el | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lisp/shell.el b/lisp/shell.el index 85db10b4fd7..8c38328b82f 100644 --- a/lisp/shell.el +++ b/lisp/shell.el @@ -480,12 +480,14 @@ Environment variables are expanded, see function `substitute-in-file-name'." (error "Couldn't popd"))))) ;; Return DIR prefixed with comint-file-name-prefix as appropriate. -(defsubst shell-prefixed-directory-name (dir) - (if (file-name-absolute-p dir) - ;; The name is absolute, so prepend the prefix. - (concat comint-file-name-prefix dir) - ;; For a relative name we assume default-directory already has the prefix. - (expand-file-name dir))) +(defun shell-prefixed-directory-name (dir) + (if (= (length comint-file-name-prefix) 0) + dir + (if (file-name-absolute-p dir) + ;; The name is absolute, so prepend the prefix. + (concat comint-file-name-prefix dir) + ;; For a relative name we assume default-directory already has the prefix. + (expand-file-name dir)))) ;;; cd [dir] (defun shell-process-cd (arg) |