[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 07e340d 4/5: Replace cl in some obsolete files
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master 07e340d 4/5: Replace cl in some obsolete files |
Date: |
Fri, 23 Mar 2018 16:15:02 -0400 (EDT) |
branch: master
commit 07e340daaf34504db5f5f71f88505eb524006819
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
Replace cl in some obsolete files
* lisp/obsolete/assoc.el, lisp/obsolete/fast-lock.el:
* lisp/obsolete/mouse-sel.el: No need for cl.
* lisp/obsolete/lazy-lock.el, lisp/obsolete/pgg-gpg.el:
* lisp/obsolete/pgg-parse.el, lisp/obsolete/pgg-pgp.el:
* lisp/obsolete/pgg-pgp5.el, lisp/obsolete/pgg.el:
* lisp/obsolete/sregex.el: Replace cl with cl-lib.
---
lisp/obsolete/assoc.el | 1 -
lisp/obsolete/fast-lock.el | 4 ----
lisp/obsolete/lazy-lock.el | 6 ++----
lisp/obsolete/mouse-sel.el | 3 ---
lisp/obsolete/pgg-gpg.el | 5 ++---
lisp/obsolete/pgg-parse.el | 9 +++------
lisp/obsolete/pgg-pgp.el | 3 +--
lisp/obsolete/pgg-pgp5.el | 3 +--
lisp/obsolete/pgg.el | 8 ++------
lisp/obsolete/sregex.el | 4 ++--
10 files changed, 13 insertions(+), 33 deletions(-)
diff --git a/lisp/obsolete/assoc.el b/lisp/obsolete/assoc.el
index 899c9d7..66cf677 100644
--- a/lisp/obsolete/assoc.el
+++ b/lisp/obsolete/assoc.el
@@ -27,7 +27,6 @@
;; fetching off key-value pairs in association lists.
;;; Code:
-(eval-when-compile (require 'cl))
(defun asort (alist-symbol key)
"Move a specified key-value pair to the head of an alist.
diff --git a/lisp/obsolete/fast-lock.el b/lisp/obsolete/fast-lock.el
index e15dfd6..41e48c3 100644
--- a/lisp/obsolete/fast-lock.el
+++ b/lisp/obsolete/fast-lock.el
@@ -190,10 +190,6 @@
(defvar font-lock-face-list)
(eval-when-compile
- ;;
- ;; We don't do this at the top-level as we only use non-autoloaded macros.
- (require 'cl)
- ;;
;; We use this to preserve or protect things when modifying text properties.
(defmacro save-buffer-state (varlist &rest body)
"Bind variables according to VARLIST and eval BODY restoring buffer state."
diff --git a/lisp/obsolete/lazy-lock.el b/lisp/obsolete/lazy-lock.el
index 010b7ae..54dc799 100644
--- a/lisp/obsolete/lazy-lock.el
+++ b/lisp/obsolete/lazy-lock.el
@@ -267,11 +267,9 @@
;;; Code:
(require 'font-lock)
+(eval-when-compile (require 'cl-lib))
(eval-when-compile
- ;; We don't do this at the top-level as we only use non-autoloaded macros.
- (require 'cl)
- ;;
;; We use this to preserve or protect things when modifying text properties.
(defmacro save-buffer-state (varlist &rest body)
"Bind variables according to VARLIST and eval BODY restoring buffer state."
@@ -977,7 +975,7 @@ verbosity is controlled via the variable
`lazy-lock-stealth-verbose'."
(while (setq beg (text-property-any beg (point-max) 'lazy-lock t))
(setq next (or (text-property-any beg (point-max) 'lazy-lock nil)
(point-max)))
- (incf size (- next beg))
+ (cl-incf size (- next beg))
(setq beg next))
;; Float because using integer multiplication will frequently overflow.
(truncate (* (/ (float size) (point-max)) 100)))))
diff --git a/lisp/obsolete/mouse-sel.el b/lisp/obsolete/mouse-sel.el
index 6caaea2..52e84f2 100644
--- a/lisp/obsolete/mouse-sel.el
+++ b/lisp/obsolete/mouse-sel.el
@@ -135,9 +135,6 @@
(require 'mouse)
(require 'thingatpt)
-(eval-when-compile
- (require 'cl))
-
;;=== User Variables ======================================================
(defgroup mouse-sel nil
diff --git a/lisp/obsolete/pgg-gpg.el b/lisp/obsolete/pgg-gpg.el
index 1bc23ca..3b89072 100644
--- a/lisp/obsolete/pgg-gpg.el
+++ b/lisp/obsolete/pgg-gpg.el
@@ -27,8 +27,7 @@
;;; Code:
-(eval-when-compile
- (require 'cl))
+(eval-when-compile (require 'cl-lib))
(require 'pgg)
@@ -303,7 +302,7 @@ passphrase cache or user."
(defun pgg-gpg-select-matching-key (message-keys secret-keys)
"Choose a key from MESSAGE-KEYS that matches one of the keys in SECRET-KEYS."
- (loop for message-key in message-keys
+ (cl-loop for message-key in message-keys
for message-key-id = (and (equal (car message-key) 1)
(cdr (assq 'key-identifier
(cdr message-key))))
diff --git a/lisp/obsolete/pgg-parse.el b/lisp/obsolete/pgg-parse.el
index e29dfce..34ec96e 100644
--- a/lisp/obsolete/pgg-parse.el
+++ b/lisp/obsolete/pgg-parse.el
@@ -35,10 +35,7 @@
;;; Code:
-(eval-when-compile
- ;; For Emacs <22.2 and XEmacs.
- (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))
- (require 'cl))
+(eval-when-compile (require 'cl-lib))
(defgroup pgg-parse ()
"OpenPGP packet parsing."
@@ -229,7 +226,7 @@
(list content-tag packet-bytes header-bytes)))
(defun pgg-parse-packet (ptag)
- (case (car ptag)
+ (cl-case (car ptag)
(1 ;Public-Key Encrypted Session Key Packet
(pgg-parse-public-key-encrypted-session-key-packet ptag))
(2 ;Signature Packet
@@ -282,7 +279,7 @@
(1+ (cdr length-type)))))
(defun pgg-parse-signature-subpacket (ptag)
- (case (car ptag)
+ (cl-case (car ptag)
(2 ;signature creation time
(cons 'creation-time
(let ((bytes (pgg-read-bytes 4)))
diff --git a/lisp/obsolete/pgg-pgp.el b/lisp/obsolete/pgg-pgp.el
index 7f9e764..ae75377 100644
--- a/lisp/obsolete/pgg-pgp.el
+++ b/lisp/obsolete/pgg-pgp.el
@@ -25,8 +25,7 @@
;;; Code:
-(eval-when-compile
- (require 'cl))
+(eval-when-compile (require 'cl-lib))
(require 'pgg)
diff --git a/lisp/obsolete/pgg-pgp5.el b/lisp/obsolete/pgg-pgp5.el
index c6294f4..af82055 100644
--- a/lisp/obsolete/pgg-pgp5.el
+++ b/lisp/obsolete/pgg-pgp5.el
@@ -25,8 +25,7 @@
;;; Code:
-(eval-when-compile
- (require 'cl))
+(eval-when-compile (require 'cl-lib))
(require 'pgg)
diff --git a/lisp/obsolete/pgg.el b/lisp/obsolete/pgg.el
index 57e9197..fd35f7d 100644
--- a/lisp/obsolete/pgg.el
+++ b/lisp/obsolete/pgg.el
@@ -29,11 +29,7 @@
(require 'pgg-parse)
(autoload 'run-at-time "timer")
-;; Don't merge these two `eval-when-compile's.
-(eval-when-compile
- ;; For Emacs <22.2 and XEmacs.
- (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))
- (require 'cl))
+(eval-when-compile (require 'cl-lib))
;;; @ utility functions
;;;
@@ -258,7 +254,7 @@ regulate cache behavior."
(defmacro pgg-convert-lbt-region (start end lbt)
`(let ((pgg-conversion-end (set-marker (make-marker) ,end)))
(goto-char ,start)
- (case ,lbt
+ (cl-case ,lbt
(CRLF
(while (progn
(end-of-line)
diff --git a/lisp/obsolete/sregex.el b/lisp/obsolete/sregex.el
index 6ff5133..1099b87 100644
--- a/lisp/obsolete/sregex.el
+++ b/lisp/obsolete/sregex.el
@@ -240,7 +240,7 @@
;;; Code:
-(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cl-lib))
;; Compatibility code for when we didn't have shy-groups
(defvar sregex--current-sregex nil)
@@ -487,7 +487,7 @@ has one of the following forms:
(concat "\\(?:" (regexp-quote exp) "\\)")
(regexp-quote exp)))
((symbolp exp)
- (ecase exp
+ (cl-ecase exp
(any ".")
(bol "^")
(eol "$")
- [Emacs-diffs] master updated (901f131 -> c5a3630), Glenn Morris, 2018/03/23
- [Emacs-diffs] master aa83340 1/5: * lisp/gnus/gnus-vm.el (vm-mode, vm-save-message):, Glenn Morris, 2018/03/23
- [Emacs-diffs] master 3a34c07 3/5: cedet: replace cl with cl-lib, Glenn Morris, 2018/03/23
- [Emacs-diffs] master 07e340d 4/5: Replace cl in some obsolete files,
Glenn Morris <=
- [Emacs-diffs] master c5a3630 5/5: Replace some uses of cl with cl-lib, Glenn Morris, 2018/03/23
- [Emacs-diffs] master 4a05f85 2/5: gnus: replace cl with cl-lib, Glenn Morris, 2018/03/23