Reduce use of (require 'cl).

* admin/bzrmerge.el: Use cl-lib.
* leim/quail/hangul.el: Don't require CL.
* leim/quail/ipa.el: Use cl-lib.
* vc/smerge-mode.el, vc/pcvs.el, vc/pcvs-util.el, vc/pcvs-info.el:
* vc/diff-mode.el, vc/cvs-status.el, uniquify.el, scroll-bar.el:
* register.el, progmodes/sh-script.el, net/gnutls.el, net/dbus.el:
* msb.el, mpc.el, minibuffer.el, international/ucs-normalize.el:
* international/quail.el, info-xref.el, imenu.el, image-mode.el:
* font-lock.el, filesets.el, edmacro.el, doc-view.el, bookmark.el:
* battery.el, avoid.el, abbrev.el: Use cl-lib.
* vc/pcvs-parse.el, vc/pcvs-defs.el, vc/log-view.el, vc/log-edit.el:
* vc/diff.el, simple.el, pcomplete.el, lpr.el, comint.el, loadhist.el:
* jit-lock.el, international/iso-ascii.el, info.el, frame.el, bs.el:
* emulation/crisp.el, electric.el, dired.el, cus-dep.el, composite.el:
* calculator.el, autorevert.el, apropos.el: Don't require CL.
* emacs-bytecomp.el (byte-recompile-directory, display-call-tree)
(byte-compile-unfold-bcf, byte-compile-check-variable):
* emacs-byte-opt.el (byte-compile-trueconstp)
(byte-compile-nilconstp):
* emacs-autoload.el (make-autoload): Use pcase.
* face-remap.el (text-scale-adjust): Simplify pcase patterns.

1 files changed, 6 insertions, 8 deletions

diff --git a/lisp/loadhist.el b/lisp/loadhist.el
index d5099340a17..88aa9f53b75 100644
--- a/lisp/loadhist.el
+++ b/lisp/loadhist.el
@@ -29,8 +29,6 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'cl))
-
 (defun feature-symbols (feature)
   "Return the file and list of definitions associated with FEATURE.
 The value is actually the element of `load-history'
@@ -254,11 +252,11 @@ something strange, such as redefining an Emacs function."
 
       (dolist (x unload-function-defs-list)
 	(if (consp x)
-	    (case (car x)
+	    (pcase (car x)
 	      ;; Remove any feature names that this file provided.
-	      (provide
+	      (`provide
 	       (setq features (delq (cdr x) features)))
-	      ((defun autoload)
+	      ((or `defun `autoload)
 	       (let ((fun (cdr x)))
 		 (when (fboundp fun)
 		   (when (fboundp 'ad-unadvise)
@@ -270,9 +268,9 @@ something strange, such as redefining an Emacs function."
 	      ;; (t . SYMBOL) comes before (defun . SYMBOL)
 	      ;; and says we should restore SYMBOL's autoload
 	      ;; when we undefine it.
-	      ((t) (setq restore-autoload (cdr x)))
-	      ((require defface) nil)
-	      (t (message "Unexpected element %s in load-history" x)))
+	      (`t (setq restore-autoload (cdr x)))
+	      ((or `require `defface) nil)
+	      (_ (message "Unexpected element %s in load-history" x)))
 	  ;; Kill local values as much as possible.
 	  (dolist (buf (buffer-list))
 	    (with-current-buffer buf