(file-name-sans-extension): Avoid expanding DIRECTORY.

1 files changed, 3 insertions, 2 deletions

diff --git a/lisp/files.el b/lisp/files.el
index ac1712229fd..3fe0fa479ee 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2468,8 +2468,9 @@ except that a leading `.', if any, doesn't count."
       (if (and (string-match "\\.[^.]*\\'" file)
                (not (eq 0 (match-beginning 0))))
           (if (setq directory (file-name-directory filename))
-              (expand-file-name (substring file 0 (match-beginning 0))
-                                directory)
+              ;; Don't use expand-file-name here; if DIRECTORY is relative,
+              ;; we don't want to expand it.
+              (concat directory (substring file 0 (match-beginning 0)))
             (substring file 0 (match-beginning 0)))
         filename))))