summaryrefslogtreecommitdiff
path: root/lisp/files.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/files.el')
-rw-r--r--lisp/files.el3
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/files.el b/lisp/files.el
index 46a105a36f0..bad2639fa62 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -4012,6 +4012,9 @@ This function returns either:
;; No cache entry.
locals-dir)))
+(declare-function map-merge-with "map" (type function &rest maps))
+(declare-function map-merge "map" (type &rest maps))
+
(defun dir-locals-read-from-dir (dir)
"Load all variables files in DIR and register a new class and instance.
DIR is the absolute name of a directory which must contain at