summaryrefslogtreecommitdiff
path: root/lisp/files.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2018-03-22 21:40:24 -0700
committerGlenn Morris <rgm@gnu.org>2018-03-22 21:40:24 -0700
commitdfea6d5a4aac5fd1679a917c5e84ce17a6c6a3d8 (patch)
treea45928650165acb6e449df72755875da993a7492 /lisp/files.el
parent97b7e58c4d34722e8b0eb73b3ed315fdc9671264 (diff)
downloademacs-dfea6d5a4aac5fd1679a917c5e84ce17a6c6a3d8.tar.gz
emacs-dfea6d5a4aac5fd1679a917c5e84ce17a6c6a3d8.tar.bz2
emacs-dfea6d5a4aac5fd1679a917c5e84ce17a6c6a3d8.zip
Quieten cl-lib related compiler warnings
* lisp/completion.el (cl-set-difference): * lisp/files.el (map-merge-with, map-merge): * lisp/emacs-lisp/radix-tree.el (map-apply): Declare. * lisp/emacs-lisp/thunk.el: Load cl-lib at run-time, not cl-macs at compile. * lisp/gnus/gnus-group.el: Load cl-lib at run-time, not cl at compile. * lisp/emacs-lisp/checkdoc.el, lisp/emacs-lisp/package.el * lisp/gnus/gnus-sum.el, lisp/gnus/message.el, lisp/net/shr.el: Load cl-lib at run-time. * lisp/gnus/mml-sec.el (mml-signencrypt-style) (mml-secure-cust-record-keys): Replace cl with cl-lib, and load it at run-time. * lisp/cedet/ede/linux.el, lisp/vc/vc-hg.el: Reorder requires.
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