(file-name-sans-extension): Avoid expanding DIRECTORY.
This commit is contained in:
parent
01af8a38f4
commit
6ee24f1e72
1 changed files with 3 additions and 2 deletions
|
@ -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))))
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue