From f58e0fd503567288bb30e243595acaa589034929 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Tue, 10 Jul 2012 07:51:54 -0400 Subject: 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. --- leim/quail/hangul.el | 1 - leim/quail/ipa.el | 18 +++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) (limited to 'leim/quail') diff --git a/leim/quail/hangul.el b/leim/quail/hangul.el index 2ce55a57107..d30957ae7e6 100644 --- a/leim/quail/hangul.el +++ b/leim/quail/hangul.el @@ -30,7 +30,6 @@ ;;; Code: (require 'quail) -(eval-when-compile (require 'cl)) ; for setf (require 'hanja-util) ;; Hangul double Jamo table. diff --git a/leim/quail/ipa.el b/leim/quail/ipa.el index 72db819fa23..b29a6ffc113 100644 --- a/leim/quail/ipa.el +++ b/leim/quail/ipa.el @@ -29,7 +29,7 @@ ;;; Code: (require 'quail) -(eval-when-compile (require 'cl)) +(eval-when-compile (require 'cl-lib)) (quail-define-package "ipa" "IPA" "IPA" t @@ -277,13 +277,13 @@ string." (setq quail-keymap (list (string quail-keymap))) (if (stringp quail-keymap) (setq quail-keymap (list quail-keymap)) - (assert (vectorp quail-keymap) t) + (cl-assert (vectorp quail-keymap) t) (setq quail-keymap (append quail-keymap nil)))) (list (apply 'vector (mapcar #'(lambda (entry) - (assert (char-or-string-p entry) t) + (cl-assert (char-or-string-p entry) t) (format "%s%s" to-prepend (if (integerp entry) (string entry) entry))) quail-keymap)))) @@ -318,18 +318,18 @@ particular sequence of keys, and the result will be cached by Quail." (dolist (underscoring underscore-map) (cond ((null underscoring)) ((eq (length underscoring) 2) - (setq underscore-map-entry (second underscoring)) + (setq underscore-map-entry (cl-second underscoring)) (setcdr underscoring (ipa-x-sampa-prepend-to-keymap-entry pre-underscore-map underscore-map-entry))) ((eq (length underscoring) 3) - (setq underscore-map-entry (second (third underscoring))) - (setcdr (third underscoring) + (setq underscore-map-entry (cl-second (cl-third underscoring))) + (setcdr (cl-third underscoring) (ipa-x-sampa-prepend-to-keymap-entry pre-underscore-map underscore-map-entry))) (t - (assert (null t) t - "Can't handle subtrees of this level right now.")))) - (append underscore-map (list (list ?< (second x-sampa-submap-entry)))))) + (cl-assert (null t) t + "Can't handle subtrees of this level right now.")))) + (append underscore-map (list (list ?< (cl-second x-sampa-submap-entry)))))) (quail-define-package "ipa-x-sampa" "IPA" "IPA-X" t -- cgit v1.2.1