From f0b82b34536e6bafbecbd642eee0cb0f534f8647 Mon Sep 17 00:00:00 2001
From: Artur Malabarba <bruce.connor.am@gmail.com>
Date: Sat, 16 Jan 2016 08:50:46 +0000
Subject: * 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.
---
lisp/files-x.el | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
(limited to 'lisp/files-x.el')
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.
--
cgit v1.2.3