mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-15 10:30:25 -08:00
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.
This commit is contained in:
parent
dfa96edd13
commit
f58e0fd503
62 changed files with 753 additions and 758 deletions
|
|
@ -118,7 +118,6 @@
|
|||
|
||||
;;; Code:
|
||||
|
||||
(eval-when-compile (require 'cl))
|
||||
(require 'comint)
|
||||
|
||||
(defgroup pcomplete nil
|
||||
|
|
@ -875,9 +874,9 @@ component, `default-directory' is used as the basis for completion."
|
|||
;; The env-var is "out of bounds".
|
||||
(if (eq action t)
|
||||
(complete-with-action action table newstring pred)
|
||||
(list* 'boundaries
|
||||
(+ (car bounds) (- orig-length (length newstring)))
|
||||
(cdr bounds)))
|
||||
`(boundaries
|
||||
,(+ (car bounds) (- orig-length (length newstring)))
|
||||
. ,(cdr bounds)))
|
||||
;; The env-var is in the file bounds.
|
||||
(if (eq action t)
|
||||
(let ((comps (complete-with-action
|
||||
|
|
@ -886,9 +885,9 @@ component, `default-directory' is used as the basis for completion."
|
|||
;; Strip the part of each completion that's actually
|
||||
;; coming from the env-var.
|
||||
(mapcar (lambda (s) (substring s len)) comps))
|
||||
(list* 'boundaries
|
||||
(+ envpos (- orig-length (length newstring)))
|
||||
(cdr bounds))))))))))
|
||||
`(boundaries
|
||||
,(+ envpos (- orig-length (length newstring)))
|
||||
. ,(cdr bounds))))))))))
|
||||
|
||||
(defsubst pcomplete-all-entries (&optional regexp predicate)
|
||||
"Like `pcomplete-entries', but doesn't ignore any entries."
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue