summaryrefslogtreecommitdiff
path: root/lisp/files-x.el
diff options
context:
space:
mode:
authorArtur Malabarba <bruce.connor.am@gmail.com>2016-01-16 08:50:46 +0000
committerArtur Malabarba <bruce.connor.am@gmail.com>2016-01-16 08:53:33 +0000
commitf0b82b34536e6bafbecbd642eee0cb0f534f8647 (patch)
treec717d188a43e9166507111451700bff13194a551 /lisp/files-x.el
parent86e45139698fe773ffb4efbe59387f90201b80c8 (diff)
downloademacs-f0b82b34536e6bafbecbd642eee0cb0f534f8647.tar.gz
* lisp/files.el (dir-locals--all-files): Use completion instead of wildcards
(dir-locals-file) * lisp/files-x.el (modify-dir-local-variable) * lisp/dos-fns.el (dosified-file-name) * lisp/help-fns.el (describe-variable): Change accordingly.
Diffstat (limited to 'lisp/files-x.el')
-rw-r--r--lisp/files-x.el6
1 files changed, 2 insertions, 4 deletions
diff --git a/lisp/files-x.el b/lisp/files-x.el
index ed3d49df385..2e1a728356e 100644
--- a/lisp/files-x.el
+++ b/lisp/files-x.el
@@ -444,10 +444,8 @@ from the MODE alist ignoring the input argument VALUE."
(if (nth 2 variables-file)
(car (last (dir-locals--all-files (car variables-file))))
(cadr variables-file)))
- ;; Try to make a proper file-name. This doesn't cover all
- ;; wildcards, but it covers the default value of `dir-locals-file'.
- (t (replace-regexp-in-string
- "\\*" "" (replace-regexp-in-string "\\?" "-" dir-locals-file)))))
+ ;; Try to make a proper file-name.
+ (t (concat dir-locals-file ".el"))))
;; I can't be bothered to handle this case right now.
;; Dir locals were set directly from a class. You need to
;; directly modify the class in dir-locals-class-alist.