[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 3a34c07 3/5: cedet: replace cl with cl-lib
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master 3a34c07 3/5: cedet: replace cl with cl-lib |
Date: |
Fri, 23 Mar 2018 16:15:02 -0400 (EDT) |
branch: master
commit 3a34c076b9986b1b09fa8c56e9dbda19819da381
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
cedet: replace cl with cl-lib
* lisp/cedet/ede/linux.el, lisp/cedet/semantic/decorate/mode.el:
* lisp/cedet/semantic/wisent/comp.el: Replace cl with cl-lib.
* lisp/cedet/cedet.el, lisp/cedet/mode-local.el:
* lisp/cedet/ede/dired.el, lisp/cedet/ede/pmake.el:
* lisp/cedet/ede/proj-comp.el, lisp/cedet/ede/proj-misc.el:
* lisp/cedet/ede/proj-obj.el, lisp/cedet/ede/proj-prog.el:
* lisp/cedet/ede/speedbar.el, lisp/cedet/semantic/analyze.el:
* lisp/cedet/semantic/complete.el:
* lisp/cedet/semantic/mru-bookmark.el, lisp/cedet/semantic/debug.el:
* lisp/cedet/semantic/wisent/python.el:
* lisp/cedet/srecode/compile.el, lisp/cedet/srecode/dictionary.el:
* lisp/cedet/srecode/srt.el: No need for cl.
---
lisp/cedet/cedet.el | 3 ---
lisp/cedet/ede/dired.el | 5 +++--
lisp/cedet/ede/linux.el | 8 ++++----
lisp/cedet/ede/pmake.el | 1 -
lisp/cedet/ede/proj-comp.el | 1 -
lisp/cedet/ede/proj-misc.el | 1 -
lisp/cedet/ede/proj-obj.el | 1 -
lisp/cedet/ede/proj-prog.el | 1 -
lisp/cedet/ede/speedbar.el | 1 -
lisp/cedet/mode-local.el | 2 --
lisp/cedet/semantic/analyze.el | 1 -
lisp/cedet/semantic/complete.el | 1 -
lisp/cedet/semantic/debug.el | 1 -
lisp/cedet/semantic/decorate/mode.el | 12 ++++++------
lisp/cedet/semantic/mru-bookmark.el | 1 -
lisp/cedet/semantic/wisent/comp.el | 6 +++---
lisp/cedet/semantic/wisent/python.el | 5 +----
lisp/cedet/srecode/compile.el | 1 -
lisp/cedet/srecode/dictionary.el | 1 -
lisp/cedet/srecode/srt.el | 1 -
20 files changed, 17 insertions(+), 37 deletions(-)
diff --git a/lisp/cedet/cedet.el b/lisp/cedet/cedet.el
index 216b0ed..34a4d99 100644
--- a/lisp/cedet/cedet.el
+++ b/lisp/cedet/cedet.el
@@ -30,9 +30,6 @@
;; load them all by doing (require 'cedet). This is mostly for
;; compatibility with the upstream, stand-alone CEDET distribution.
-(eval-when-compile
- (require 'cl))
-
(declare-function inversion-find-version "inversion")
(defconst cedet-version "2.0"
diff --git a/lisp/cedet/ede/dired.el b/lisp/cedet/ede/dired.el
index 4c21cf4..33afc7e 100644
--- a/lisp/cedet/ede/dired.el
+++ b/lisp/cedet/ede/dired.el
@@ -27,12 +27,13 @@
;; This provides a dired interface to EDE, allowing users to modify
;; their project file by adding files (or whatever) directly from a
;; dired buffer.
-(eval-when-compile (require 'cl))
+
+;;; Code:
+
(require 'easymenu)
(require 'dired)
(require 'ede)
-;;; Code:
(defvar ede-dired-keymap
(let ((map (make-sparse-keymap)))
(define-key map ".a" 'ede-dired-add-to-target)
diff --git a/lisp/cedet/ede/linux.el b/lisp/cedet/ede/linux.el
index 84ce7ee..cb5e739 100644
--- a/lisp/cedet/ede/linux.el
+++ b/lisp/cedet/ede/linux.el
@@ -34,7 +34,7 @@
(require 'ede)
(require 'ede/make)
-(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cl-lib))
(declare-function semanticdb-file-table-object "semantic/db")
(declare-function semanticdb-needs-refresh-p "semantic/db")
@@ -115,7 +115,7 @@ If DIR has not been used as a build directory, fall back to
;; detected build on source directory
(and (file-exists-p (expand-file-name ".config" dir)) dir)
;; use configuration
- (case project-linux-build-directory-default
+ (cl-case project-linux-build-directory-default
(same dir)
(ask (read-directory-name "Select Linux' build directory: " dir)))))
@@ -164,7 +164,7 @@ Uses `ede-linux--detect-architecture' for the
auto-detection. If
the result is `ask', let the user choose from architectures found
in DIR."
(let ((arch (ede-linux--detect-architecture bdir)))
- (case arch
+ (cl-case arch
(ask
(completing-read "Select target architecture: "
(ede-linux--get-archs dir)))
@@ -175,7 +175,7 @@ in DIR."
"Returns a list with include directories.
Returned directories might not exist, since they are not created
until Linux is built for the first time."
- (map 'list
+ (cl-map 'list
(lambda (elem) (format (concat (car elem) "/" (cdr elem)) arch))
;; XXX: taken from the output of "make V=1"
(list (cons dir "arch/%s/include")
diff --git a/lisp/cedet/ede/pmake.el b/lisp/cedet/ede/pmake.el
index 22aa25a..f0f07e9 100644
--- a/lisp/cedet/ede/pmake.el
+++ b/lisp/cedet/ede/pmake.el
@@ -43,7 +43,6 @@
;; 1) Insert distribution source variables for targets
;; 2) Insert user requested rules
-(eval-when-compile (require 'cl))
(require 'ede/proj)
(require 'ede/proj-obj)
(require 'ede/proj-comp)
diff --git a/lisp/cedet/ede/proj-comp.el b/lisp/cedet/ede/proj-comp.el
index 3d390bd..fc7205f 100644
--- a/lisp/cedet/ede/proj-comp.el
+++ b/lisp/cedet/ede/proj-comp.el
@@ -44,7 +44,6 @@
;; To write a method that inserts a variable or rule for a compiler
;; based object, wrap the body of your call in `ede-compiler-only-once'
-(eval-when-compile (require 'cl))
(require 'ede) ;source object
(require 'ede/autoconf-edit)
diff --git a/lisp/cedet/ede/proj-misc.el b/lisp/cedet/ede/proj-misc.el
index 7bc02fa..d1a8fce 100644
--- a/lisp/cedet/ede/proj-misc.el
+++ b/lisp/cedet/ede/proj-misc.el
@@ -26,7 +26,6 @@
;; This misc target lets the user link in custom makefiles to an EDE
;; project.
-(eval-when-compile (require 'cl))
(require 'ede/pmake)
(require 'ede/proj-comp)
diff --git a/lisp/cedet/ede/proj-obj.el b/lisp/cedet/ede/proj-obj.el
index b087c29..c6c52ed 100644
--- a/lisp/cedet/ede/proj-obj.el
+++ b/lisp/cedet/ede/proj-obj.el
@@ -26,7 +26,6 @@
;; Handles a superclass of target types which create object code in
;; and EDE Project file.
-(eval-when-compile (require 'cl))
(require 'ede/proj)
(declare-function ede-pmake-varname "ede/pmake")
diff --git a/lisp/cedet/ede/proj-prog.el b/lisp/cedet/ede/proj-prog.el
index ce1978c..215b791 100644
--- a/lisp/cedet/ede/proj-prog.el
+++ b/lisp/cedet/ede/proj-prog.el
@@ -25,7 +25,6 @@
;;
;; Handle building programs from object files in and EDE Project file.
-(eval-when-compile (require 'cl))
(require 'ede/pmake)
(require 'ede/proj-obj)
diff --git a/lisp/cedet/ede/speedbar.el b/lisp/cedet/ede/speedbar.el
index 99fe4a5..353bec2 100644
--- a/lisp/cedet/ede/speedbar.el
+++ b/lisp/cedet/ede/speedbar.el
@@ -28,7 +28,6 @@
;;; Code:
-(eval-when-compile (require 'cl))
(require 'speedbar)
(require 'eieio-speedbar)
(require 'ede)
diff --git a/lisp/cedet/mode-local.el b/lisp/cedet/mode-local.el
index 7f175f2..1cd306b 100644
--- a/lisp/cedet/mode-local.el
+++ b/lisp/cedet/mode-local.el
@@ -46,8 +46,6 @@
;;; Code:
-(eval-when-compile (require 'cl))
-
(require 'find-func)
;; For find-function-regexp-alist. It is tempting to replace this
;; ‘require’ by (defvar find-function-regexp-alist) and
diff --git a/lisp/cedet/semantic/analyze.el b/lisp/cedet/semantic/analyze.el
index 625982f..2c50722 100644
--- a/lisp/cedet/semantic/analyze.el
+++ b/lisp/cedet/semantic/analyze.el
@@ -63,7 +63,6 @@
;; constant. These need to be returned as there would be no
;; other possible completions.
-(eval-when-compile (require 'cl))
(require 'semantic)
(require 'semantic/format)
(require 'semantic/ctxt)
diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el
index baea226..eb25f11 100644
--- a/lisp/cedet/semantic/complete.el
+++ b/lisp/cedet/semantic/complete.el
@@ -106,7 +106,6 @@
;; `semantic-complete-inline-tag-engine' will complete text in
;; a buffer.
-(eval-when-compile (require 'cl))
(require 'semantic)
(require 'eieio-opt)
(require 'semantic/analyze)
diff --git a/lisp/cedet/semantic/debug.el b/lisp/cedet/semantic/debug.el
index 4f05e59..3c71c20 100644
--- a/lisp/cedet/semantic/debug.el
+++ b/lisp/cedet/semantic/debug.el
@@ -36,7 +36,6 @@
;; Each parser must implement the interface and override any methods as needed.
;;
-(eval-when-compile (require 'cl))
(require 'semantic)
(require 'eieio)
(require 'cl-generic)
diff --git a/lisp/cedet/semantic/decorate/mode.el
b/lisp/cedet/semantic/decorate/mode.el
index ea3d63d..100e221 100644
--- a/lisp/cedet/semantic/decorate/mode.el
+++ b/lisp/cedet/semantic/decorate/mode.el
@@ -35,7 +35,7 @@
;;
;;; Code:
-(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cl-lib))
(require 'semantic)
(require 'semantic/decorate)
(require 'semantic/tag-ls)
@@ -82,13 +82,13 @@ add items to this list."
(defsubst semantic-decoration-set-property (deco property value)
"Set the DECO decoration's PROPERTY to VALUE.
Return DECO."
- (assert (semantic-decoration-p deco))
+ (cl-assert (semantic-decoration-p deco))
(semantic-overlay-put deco property value)
deco)
(defsubst semantic-decoration-get-property (deco property)
"Return the DECO decoration's PROPERTY value."
- (assert (semantic-decoration-p deco))
+ (cl-assert (semantic-decoration-p deco))
(semantic-overlay-get deco property))
(defsubst semantic-decoration-set-face (deco face)
@@ -103,7 +103,7 @@ Return DECO."
(defsubst semantic-decoration-set-priority (deco priority)
"Set the priority of the decoration DECO to PRIORITY.
Return DECO."
- (assert (natnump priority))
+ (cl-assert (natnump priority))
(semantic-decoration-set-property deco 'priority priority))
(defsubst semantic-decoration-priority (deco)
@@ -113,7 +113,7 @@ Return DECO."
(defsubst semantic-decoration-move (deco begin end)
"Move the decoration DECO on the region between BEGIN and END.
Return DECO."
- (assert (semantic-decoration-p deco))
+ (cl-assert (semantic-decoration-p deco))
(semantic-overlay-move deco begin end)
deco)
@@ -135,7 +135,7 @@ Return the overlay that makes up the new decoration."
(defun semantic-decorate-clear-tag (tag &optional deco)
"Remove decorations from TAG.
If optional argument DECO is non-nil, remove only that decoration."
- (assert (or (null deco) (semantic-decoration-p deco)))
+ (cl-assert (or (null deco) (semantic-decoration-p deco)))
;; Clear primary decorations.
;; For now, just unhighlight the tag. How to deal with other
;; primary decorations like invisibility, etc. ? Maybe just
diff --git a/lisp/cedet/semantic/mru-bookmark.el
b/lisp/cedet/semantic/mru-bookmark.el
index 8084449..ad63014 100644
--- a/lisp/cedet/semantic/mru-bookmark.el
+++ b/lisp/cedet/semantic/mru-bookmark.el
@@ -45,7 +45,6 @@
;;; Code:
-(eval-when-compile (require 'cl))
(require 'semantic)
(require 'eieio-base)
(require 'ring)
diff --git a/lisp/cedet/semantic/wisent/comp.el
b/lisp/cedet/semantic/wisent/comp.el
index 1902006..837222a 100644
--- a/lisp/cedet/semantic/wisent/comp.el
+++ b/lisp/cedet/semantic/wisent/comp.el
@@ -41,7 +41,7 @@
;;; Code:
(require 'semantic/wisent)
-(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cl-lib))
;;;; -------------------
;;;; Misc. useful things
@@ -2906,7 +2906,7 @@ references found in BODY, and XBODY is BODY expression
with
(progn
(if (wisent-check-$N body n)
;; Accumulate $i symbol
- (pushnew body found :test #'equal))
+ (cl-pushnew body found :test #'equal))
(cons found body))
;; BODY is a list, expand inside it
(let (xbody sexpr)
@@ -2926,7 +2926,7 @@ references found in BODY, and XBODY is BODY expression
with
;; $i symbol
((wisent-check-$N sexpr n)
;; Accumulate $i symbol
- (pushnew sexpr found :test #'equal))
+ (cl-pushnew sexpr found :test #'equal))
)
;; Accumulate expanded forms
(setq xbody (nconc xbody (list sexpr))))
diff --git a/lisp/cedet/semantic/wisent/python.el
b/lisp/cedet/semantic/wisent/python.el
index db2d7c9..f7944fe 100644
--- a/lisp/cedet/semantic/wisent/python.el
+++ b/lisp/cedet/semantic/wisent/python.el
@@ -41,9 +41,6 @@
(require 'semantic/ctxt)
(require 'semantic/format)
-(eval-when-compile
- (require 'cl))
-
;;; Customization
;;
@@ -358,7 +355,7 @@ Set attributes for constructors, special, private and
static methods."
;; + first argument is self
(when (and (> (length (semantic-tag-function-arguments tag)) 0)
(string= (semantic-tag-name
- (first (semantic-tag-function-arguments tag)))
+ (car (semantic-tag-function-arguments tag)))
"self"))
(semantic-tag-put-attribute tag :parent "dummy"))
diff --git a/lisp/cedet/srecode/compile.el b/lisp/cedet/srecode/compile.el
index 69282c1..a0a53a6 100644
--- a/lisp/cedet/srecode/compile.el
+++ b/lisp/cedet/srecode/compile.el
@@ -31,7 +31,6 @@
;; The output are a series of EIEIO objects which represent the
;; templates in a way that could be inserted later.
-(eval-when-compile (require 'cl))
(require 'semantic)
(require 'eieio)
(require 'cl-generic)
diff --git a/lisp/cedet/srecode/dictionary.el b/lisp/cedet/srecode/dictionary.el
index f1287f6..a2410be 100644
--- a/lisp/cedet/srecode/dictionary.el
+++ b/lisp/cedet/srecode/dictionary.el
@@ -28,7 +28,6 @@
;;; CLASSES
-(eval-when-compile (require 'cl))
(require 'eieio)
(require 'cl-generic)
(require 'srecode)
diff --git a/lisp/cedet/srecode/srt.el b/lisp/cedet/srecode/srt.el
index 3bae20e..fdabdc4 100644
--- a/lisp/cedet/srecode/srt.el
+++ b/lisp/cedet/srecode/srt.el
@@ -25,7 +25,6 @@
;;; Code:
-(eval-when-compile (require 'cl))
(require 'eieio)
(require 'srecode/dictionary)
(require 'srecode/insert)
- [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 <=
- [Emacs-diffs] master 07e340d 4/5: Replace cl in some obsolete files, Glenn Morris, 2018/03/23
- [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