From 4a02b552f18955eca58e1935334f09b9db49c8f5 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Thu, 23 Jun 1994 23:12:13 +0000 Subject: [PATCH] (shell-prefixed-directory-name): Do nothing if comint-file-name-prefix is empty. Do not inline. --- lisp/shell.el | 14 ++++++++------ 1 file 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) -- 2.39.5