(shell-prefixed-directory-name): Do nothing if

comint-file-name-prefix is empty. Do not inline.

(shell-prefixed-directory-name): Do nothing if
comint-file-name-prefix is empty. Do not inline.
4a02b552 · Richard M. Stallman · dc0825db · 4a02b552
Commit 4a02b552 authored Jun 23, 1994 by Richard M. Stallman
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 6 deletions

lisp/shell.el lisp/shell.el +8 -6

No files found.
--- 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)