Commit dfea6d5a authored by Glenn Morris's avatar Glenn Morris

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.
parent 97b7e58c
......@@ -32,10 +32,9 @@
;; * Add texinfo lookup options.
;; * Add website
(eval-when-compile (require 'cl))
(require 'ede)
(require 'ede/make)
(eval-when-compile (require 'cl))
(declare-function semanticdb-file-table-object "semantic/db")
(declare-function semanticdb-needs-refresh-p "semantic/db")
......
......@@ -2225,6 +2225,8 @@ TYPE is the type of the wrapper to be added. Can be :before or :under."
(modify-syntax-entry char "_" table))
table))
(declare-function cl-set-difference "cl-seq" (cl-list1 cl-list2 &rest cl-keys))
(defun completion-lisp-mode-hook ()
(require 'cl-lib)
(setq completion-syntax-table completion-lisp-syntax-table)
......
......@@ -171,7 +171,7 @@
(defvar checkdoc-version "0.6.1"
"Release version of checkdoc you are currently running.")
(eval-when-compile (require 'cl-lib))
(require 'cl-lib)
(require 'help-mode) ;; for help-xref-info-regexp
(require 'thingatpt) ;; for handy thing-at-point-looking-at
......
......@@ -143,8 +143,8 @@
;;; Code:
(require 'cl-lib)
(eval-when-compile (require 'subr-x))
(eval-when-compile (require 'cl-lib))
(eval-when-compile (require 'epg)) ;For setf accessors.
(require 'seq)
......
......@@ -235,6 +235,8 @@ PREFIX is only used internally."
(radix-tree-iter-mappings tree (lambda (_k _v) (setq i (1+ i))))
i))
(declare-function map-apply "map" (function map))
(defun radix-tree-from-map (map)
;; Aka (cl-defmethod map-into (map (type (eql radix-tree)))) ...)
(require 'map)
......
......@@ -48,7 +48,7 @@
;;; Code:
(eval-when-compile (require 'cl-macs))
(require 'cl-lib)
(defmacro thunk-delay (&rest body)
"Delay the evaluation of BODY."
......
......@@ -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
......
......@@ -24,10 +24,7 @@
;;; Code:
(eval-when-compile
(require 'cl))
(defvar tool-bar-mode)
(require 'cl-lib)
(require 'gnus)
(require 'gnus-start)
(require 'nnmail)
......@@ -46,6 +43,8 @@
(unless (boundp 'gnus-cache-active-hashtb)
(defvar gnus-cache-active-hashtb nil)))
(defvar tool-bar-mode)
(autoload 'gnus-agent-total-fetched-for "gnus-agent")
(autoload 'gnus-cache-total-fetched-for "gnus-cache")
......
......@@ -24,7 +24,7 @@
;;; Code:
(eval-when-compile (require 'cl))
(require 'cl-lib)
(defvar tool-bar-mode)
(defvar gnus-tmp-header)
......
......@@ -28,8 +28,7 @@
;;; Code:
(eval-when-compile (require 'cl-lib))
(require 'cl-lib)
(require 'mailheader)
(require 'gmm-utils)
(require 'mail-utils)
......
......@@ -23,7 +23,7 @@
;;; Code:
(eval-when-compile (require 'cl))
(require 'cl-lib)
(require 'gnus-util)
(require 'epg)
......@@ -167,9 +167,9 @@ You can also customize or set `mml-signencrypt-style-alist' instead."
(if (or (eq style 'separate)
(eq style 'combined))
;; valid style setting?
(setf (second style-item) style)
(setf (cadr style-item) style)
;; otherwise, just return the current value
(second style-item))
(cadr style-item))
(message "Warning, attempt to set invalid signencrypt style"))))
;;; Security functions
......@@ -554,7 +554,7 @@ customized in this variable."
"For CONTEXT, USAGE, and NAME record fingerprint(s) of KEYS.
If optional SAVE is not nil, save customized fingerprints.
Return keys."
(assert keys)
(cl-assert keys)
(let* ((usage-prefs (mml-secure-cust-usage-lookup context usage))
(curr-fprs (cdr (assoc name (cdr usage-prefs))))
(key-fprs (mapcar 'mml-secure-fingerprint keys))
......
......@@ -30,7 +30,7 @@
;;; Code:
(eval-when-compile (require 'cl-lib))
(require 'cl-lib)
(eval-when-compile (require 'url)) ;For url-filename's setf handler.
(require 'browse-url)
(eval-when-compile (require 'subr-x))
......
......@@ -101,12 +101,12 @@
;;; Code:
(require 'cl-lib)
(eval-when-compile
(require 'vc)
(require 'vc-dir))
(require 'cl-lib)
(declare-function vc-compilation-mode "vc-dispatcher" (backend))
;;; Customization options
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment