Explicitly require cl-lib where needed

Rather than relying on the byte-compiler happening to use it.
* lisp/completion.el, lisp/ffap.el, lisp/loadhist.el:
* lisp/userlock.el, lisp/emacs-lisp/debug.el, lisp/emacs-lisp/rx.el:
* lisp/emacs-lisp/testcover.el, lisp/mail/rfc2231.el:
* lisp/net/newst-treeview.el, lisp/net/puny.el:
* lisp/net/tramp-archive.el, lisp/net/tramp-gvfs.el:
* lisp/net/tramp-sh.el, lisp/net/tramp-smb.el, lisp/org/org-ctags.el:
* lisp/org/org-macs.el, lisp/progmodes/grep.el:
* lisp/progmodes/perl-mode.el, lisp/progmodes/ruby-mode.el:
* lisp/textmodes/dns-mode.el, lisp/textmodes/mhtml-mode.el:
* lisp/vc/pcvs-parse.el: Explicitly require cl-lib as needed.

diff --git a/lisp/completion.el b/lisp/completion.el
index a5c8158d1b3b94710db6a4ba55640db9e0397293..9666ca60b044cc5d8258c7e5782d137c62485479 100644 (file)
--- a/lisp/completion.el
+++ b/lisp/completion.el
@@ -2226,6 +2226,7 @@ TYPE is the type of the wrapper to be added.  Can be :before or :under."
     table))
 
 (defun completion-lisp-mode-hook ()
+  (require 'cl-lib)
   (setq completion-syntax-table completion-lisp-syntax-table)
   ;; Lisp Mode diffs
   (setq-local completion-separator-chars

diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index 4624da3026749b110d5dcddc4c4979528264cd29..f3a927f31cd82c9aacfcdb5ba1b82968250a3e82 100644 (file)
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -27,6 +27,7 @@
 
 ;;; Code:
 
+(require 'cl-lib)
 (require 'button)
 
 (defgroup debugger nil

diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el
index c4f6d4f70ea3413d7213f165a9bd0ef309764e3b..8059bf2a6e1103cc2fe8ecfd43b9e5d27ccbc3cb 100644 (file)
--- a/lisp/emacs-lisp/rx.el
+++ b/lisp/emacs-lisp/rx.el
@@ -106,6 +106,8 @@
 
 ;;; Code:
 
+(require 'cl-lib)
+
 ;; FIXME: support macros.
 
 (defvar rx-constituents              ;Not `const' because some modes extend it.

diff --git a/lisp/emacs-lisp/testcover.el b/lisp/emacs-lisp/testcover.el
index 613f69c4f6265e0c0f0048d3a07af7d7b3ffd1e2..e0d2797c0cdda1c71008e07101827fc90bbc8c2f 100644 (file)
--- a/lisp/emacs-lisp/testcover.el
+++ b/lisp/emacs-lisp/testcover.el
@@ -63,6 +63,7 @@
 ;;   error if these "potentially" 1-valued forms actually return differing
 ;;   values.
 
+(eval-when-compile (require 'cl-lib))
 (require 'edebug)
 (provide 'testcover)
 

diff --git a/lisp/ffap.el b/lisp/ffap.el
index 22be2f85369ac98881754f7ff21026e820fabb69..b51929d2602ba3466bbaa3a2627db3c23dfd762a 100644 (file)
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -104,6 +104,7 @@
 \f
 ;;; Code:
 
+(eval-when-compile (require 'cl-lib))
 (require 'url-parse)
 (require 'thingatpt)
 

diff --git a/lisp/loadhist.el b/lisp/loadhist.el
index b8d9e2de0dbf3b4a584c61c9640809f60ceaf851..566d51a319c4bd9499925a594c8e648932eb6800 100644 (file)
--- a/lisp/loadhist.el
+++ b/lisp/loadhist.el
@@ -29,6 +29,8 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl-lib))
+
 (defun feature-symbols (feature)
   "Return the file and list of definitions associated with FEATURE.
 The value is actually the element of `load-history'

diff --git a/lisp/mail/rfc2231.el b/lisp/mail/rfc2231.el
index 4da3641893ba0737993ddf25840b79d3e6f911e0..103af55248a5f22934debc00e78fac2f456b5057 100644 (file)
--- a/lisp/mail/rfc2231.el
+++ b/lisp/mail/rfc2231.el
@@ -22,6 +22,7 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl-lib))
 (require 'ietf-drums)
 (require 'rfc2047)
 (autoload 'mm-encode-body "mm-bodies")

diff --git a/lisp/net/newst-treeview.el b/lisp/net/newst-treeview.el
index 7f3d5d75fdb7b07cb796b2b5825edf9ac49b05e1..b2997d71b199ed914ced1cc0906c932d3bd6ebe6 100644 (file)
--- a/lisp/net/newst-treeview.el
+++ b/lisp/net/newst-treeview.el
@@ -36,6 +36,7 @@
 
 ;; ======================================================================
 ;;; Code:
+(require 'cl-lib)
 (require 'newst-reader)
 (require 'widget)
 (require 'tree-widget)

diff --git a/lisp/net/puny.el b/lisp/net/puny.el
index 4bf1a372cb49ddf58dc94dea86b2cc1939c462c2..efa11cf178d341aad865b8d67d9faea51458da16 100644 (file)
--- a/lisp/net/puny.el
+++ b/lisp/net/puny.el
@@ -27,6 +27,7 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl-lib))
 (require 'seq)
 
 (defun puny-encode-domain (domain)

diff --git a/lisp/net/tramp-archive.el b/lisp/net/tramp-archive.el
index 0b5a351deaa9de42c9805bc5e215c929ca205dde..0b8e8da976190bf405ecd724da3b210a8c50806e 100644 (file)
--- a/lisp/net/tramp-archive.el
+++ b/lisp/net/tramp-archive.el
@@ -107,6 +107,7 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl-lib))
 (require 'tramp-gvfs)
 
 (autoload 'dired-uncache "dired")

diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index eb3dddcd6c5383415f5f2815519cf24771a909ca..d0385f3ba28a1c024eeef751ebfbe3a0cb0d3ec1 100644 (file)
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -103,6 +103,7 @@
 ;; option "--without-dbus".  Declare used subroutines and variables.
 (declare-function dbus-get-unique-name "dbusbind.c")
 
+(eval-when-compile (require 'cl-lib))
 (require 'tramp)
 
 (require 'dbus)

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 0cdf42de68a24a6d794d8fa043b779c3229f7672..4d7359a4c9c22f3f0495f79bb204f35b925840d8 100644 (file)
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -27,6 +27,7 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl-lib))
 (require 'tramp)
 
 ;; Pacify byte-compiler.

diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el
index eab0da54b6d12da38db17fe4b750097732ec940a..69827870d3c6988424dcb8913f6e65f3018e4000 100644 (file)
--- a/lisp/net/tramp-smb.el
+++ b/lisp/net/tramp-smb.el
@@ -27,6 +27,7 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl-lib))
 (require 'tramp)
 
 ;; Define SMB method ...

diff --git a/lisp/org/org-ctags.el b/lisp/org/org-ctags.el
index 72ea76fe751b8dca59fed7060dfddd09765230f3..792f3fe1a3c4b48972149d59bd172adb797ce070 100644 (file)
--- a/lisp/org/org-ctags.el
+++ b/lisp/org/org-ctags.el
@@ -137,6 +137,7 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl-lib))
 (require 'org)
 
 (defgroup org-ctags nil

diff --git a/lisp/org/org-macs.el b/lisp/org/org-macs.el
index 79d09e37970c5092fe4af136afe6f138c6bed190..f56672680f209b7c0482a6cb43d41ede3f523d7d 100644 (file)
--- a/lisp/org/org-macs.el
+++ b/lisp/org/org-macs.el
@@ -31,6 +31,8 @@
 
 ;;; Code:
 
+(require 'cl-lib)
+
 (defmacro org-with-gensyms (symbols &rest body)
   (declare (debug (sexp body)) (indent 1))
   `(let ,(mapcar (lambda (s)

diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 8c0e46f35aea3b149f62c5cfd0f7b5a3991925c9..ee8886a4e16aa2c1c10621aa3b309d67abee7f75 100644 (file)
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -29,6 +29,7 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl-lib))
 (require 'compile)
 
 (defgroup grep nil

diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index e667a970152e1afee3f6136b9b2f87b376d25e09..b96aad7a6efcedf87fe88d45d010fbc318f70e4d 100644 (file)
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -87,6 +87,8 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl-lib))
+
 (defgroup perl nil
   "Major mode for editing Perl code."
   :link '(custom-group-link :tag "Font Lock Faces group" font-lock-faces)

diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 5abc29a66453c24d05dce918b7e8db40facc546f..1f5d8865a735cb82463a82fc3d93605de90e7156 100644 (file)
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -39,6 +39,8 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl-lib))
+
 (defgroup ruby nil
   "Major mode for editing Ruby code."
   :prefix "ruby-"

diff --git a/lisp/textmodes/dns-mode.el b/lisp/textmodes/dns-mode.el
index 7223d525fa2d1c81f55800627793297e010dceb2..87ae35d17beba8b2177a056d443a917357f686ae 100644 (file)
--- a/lisp/textmodes/dns-mode.el
+++ b/lisp/textmodes/dns-mode.el
@@ -45,6 +45,8 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl-lib))
+
 (defgroup dns-mode nil
   "DNS master file mode configuration."
   :group 'data)

diff --git a/lisp/textmodes/mhtml-mode.el b/lisp/textmodes/mhtml-mode.el
index 28c248fb0c4a3ff30fc603b88f94ae6ccb391b68..552fcd38b0413cc52e95a5ea065f136f873fc03a 100644 (file)
--- a/lisp/textmodes/mhtml-mode.el
+++ b/lisp/textmodes/mhtml-mode.el
@@ -22,6 +22,7 @@
 ;;; Code:
 
 (eval-and-compile
+  (require 'cl-lib)
   (require 'flyspell)
   (require 'sgml-mode))
 (require 'js)

diff --git a/lisp/userlock.el b/lisp/userlock.el
index 5ba971ba6c859b020002bb02737329bdb4c8b301..73bb0d2aae0155a70d3282110f86bcf11d0c550e 100644 (file)
--- a/lisp/userlock.el
+++ b/lisp/userlock.el
@@ -32,6 +32,8 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl-lib))
+
 (define-error 'file-locked "File is locked" 'file-error)
 
 ;;;###autoload

diff --git a/lisp/vc/pcvs-parse.el b/lisp/vc/pcvs-parse.el
index 8db2fe5e83663b356c1a6d10cbafb27da19de574..dbd25d93a1e1dab90bd59defd3c21a64b616a313 100644 (file)
--- a/lisp/vc/pcvs-parse.el
+++ b/lisp/vc/pcvs-parse.el
@@ -32,6 +32,7 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl-lib))
 (require 'pcvs-util)
 (require 'pcvs-info)