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.

2 files changed, 23 insertions, 20 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 5ae49cd4b7a..6c5b1342d32 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* bzrmerge.el: Use cl-lib.
+
 2012-07-09  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Rename configure.in to configure.ac (Bug#11603).
@@ -30,8 +34,8 @@
 	* coccinelle: New subdirectory
 	* coccinelle/README: Documentation stub.
 	* coccinelle/vector_contents.cocci: Semantic patch to replace direct
-        access to `contents' member of Lisp_Vector objects with AREF and ASET
-        where appropriate.
+	access to `contents' member of Lisp_Vector objects with AREF and ASET
+	where appropriate.
 
 2012-06-22  Paul Eggert  <eggert@cs.ucla.edu>
 
@@ -50,9 +54,9 @@
 
 2012-06-13  Andreas Schwab  <schwab@linux-m68k.org>
 
-	* make-emacs: Rename --union-type to --check-lisp-type.  Define
-	CHECK_LISP_OBJECT_TYPE insted of USE_LISP_UNION_TYPE.
-	* CPP-DEFINES (DEBUG_LISP_OBJECT_TYPE): Renamed from
+	* make-emacs: Rename --union-type to --check-lisp-type.
+	Define CHECK_LISP_OBJECT_TYPE insted of USE_LISP_UNION_TYPE.
+	* CPP-DEFINES (DEBUG_LISP_OBJECT_TYPE): Rename from
 	USE_LISP_UNION_TYPE.
 
 2012-06-03  Glenn Morris  <rgm@gnu.org>
@@ -223,11 +227,11 @@
 
 	* unidata/makefile.w32-in (all): Remove src/biditype.h and
 	src/bidimirror.h.
-	(../../src/biditype.h, ../../src/bidimirror.h): Deleted.
+	(../../src/biditype.h, ../../src/bidimirror.h): Delete.
 
 	* unidata/Makefile.in (all): Remove src/biditype.h and
 	src/bidimirror.h.
-	(../../src/biditype.h, ../../src/bidimirror.h): Deleted.
+	(../../src/biditype.h, ../../src/bidimirror.h): Delete.
 
 2011-07-07  Juanma Barranquero  <lekktu@gmail.com>
 
@@ -238,8 +242,8 @@
 
 	* unidata/unidata-gen.el (unidata-dir): New variable.
 	(unidata-setup-list): Expand unidata-text-file in unidata-dir.
-	(unidata-prop-alist): INDEX element may be a function.  New
-	optional element VAL-LIST (for general-category and bidi-class).
+	(unidata-prop-alist): INDEX element may be a function.
+	New optional element VAL-LIST (for general-category and bidi-class).
 	New entry `mirroring'.
 	(unidata-prop-default, unidata-prop-val-list): New subst.
 	(unidata-get-character, unidata-put-character): Delete them.
@@ -595,13 +599,13 @@
 
 2009-04-17  Kenichi Handa  <handa@m17n.org>
 
-	* unidata/unidata-gen.el (unidata-get-decomposition): Adjust
-	Hangle decomposition rule to Unicode.
+	* unidata/unidata-gen.el (unidata-get-decomposition):
+	Adjust Hangle decomposition rule to Unicode.
 
 2009-04-09  Kenichi Handa  <handa@m17n.org>
 
-	* unidata/unidata-gen.el (unidata-describe-decomposition): Return
-	a string with a composition property to disable combining
+	* unidata/unidata-gen.el (unidata-describe-decomposition):
+	Return a string with a composition property to disable combining
 	characters being composed.
 
 2009-03-11  Miles Bader  <miles@gnu.org>
@@ -1096,7 +1100,7 @@
 
 2005-10-17  Bill Wohler  <wohler@newt.com>
 
-	* FOR-RELEASE (DOCUMENTATION): Removed lisp/toolbar from list
+	* FOR-RELEASE (DOCUMENTATION): Remove lisp/toolbar from list
 	since it's gone.  Also marked mh-e as done.
 
 2005-10-11  Juanma Barranquero  <lekktu@gmail.com>
@@ -1143,7 +1147,7 @@
 
 2005-03-30  Marcelo Toledo  <marcelo@marcelotoledo.org>
 
-	* FOR-RELEASE (Documentation): Added check the Emacs Tutorial.
+	* FOR-RELEASE (Documentation): Add check the Emacs Tutorial.
 	The first line of every tutorial must begin with a sentence saying
 	"Emacs Tutorial" in the respective language.  This should be
 	followed by "See end for copying conditions", likewise in the
diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el
index 15238f44d9d..4f5cee14737 100644
--- a/admin/bzrmerge.el
+++ b/admin/bzrmerge.el
@@ -24,8 +24,7 @@
 
 ;;; Code:
 
-(eval-when-compile
-  (require 'cl))                        ; assert
+(eval-when-compile (require 'cl-lib))
 
 (defvar bzrmerge-skip-regexp
   "back[- ]?port\\|merge\\|sync\\|re-?generate\\|bump version\\|from trunk\\|\
@@ -256,17 +255,17 @@ Does not make other difference."
           ;; Do a "skip" (i.e. merge the meta-data only).
           (setq beg (1- (car skip)))
           (while (and skip (or (null merge) (< (car skip) (car merge))))
-            (assert (> (car skip) (or end beg)))
+            (cl-assert (> (car skip) (or end beg)))
             (setq end (pop skip)))
           (message "Skipping %s..%s" beg end)
           (bzrmerge-add-metadata from end))
 
          (t
           ;; Do a "normal" merge.
-          (assert (or (null skip) (< (car merge) (car skip))))
+          (cl-assert (or (null skip) (< (car merge) (car skip))))
           (setq beg (1- (car merge)))
           (while (and merge (or (null skip) (< (car merge) (car skip))))
-            (assert (> (car merge) (or end beg)))
+            (cl-assert (> (car merge) (or end beg)))
             (setq end (pop merge)))
           (message "Merging %s..%s" beg end)
           (if (with-temp-buffer