6 files changed, 20 insertions, 28 deletions
diff --git a/isar/isabelle-system.el b/isar/isabelle-system.el
index e399474b..4fb2bcde 100644
--- a/isar/isabelle-system.el
+++ b/isar/isabelle-system.el
@@ -1,6 +1,7 @@
 ;; isabelle-system.el --- Interface with Isabelle system
 ;;
 ;; Copyright (C) 2000 LFCS Edinburgh, David Aspinall.
+;; Copyright (C) 2018  Free Software Foundation, Inc.
 ;;
 ;; Author:      David Aspinall <da@dcs.ed.ac.uk>
 ;; Maintainer:  Proof General maintainer <proofgen@dcs.ed.ac.uk>
@@ -12,16 +13,15 @@
 ;;
 
 ;;; Code:
-(eval-when-compile
-  (require 'cl))			;  mapcan, eval-when
 
+(require 'cl-lib)                       ;cl-mapcan
 (eval-when-compile
   (require 'span)
   (require 'scomint)
   (require 'proof-site)
   (require 'proof-menu)
-  (require 'proof-syntax)
-  (defvar proof-assistant-menu))
+  (require 'proof-syntax))
+(defvar proof-assistant-menu)
 
 (declare-function mapcan "cl-extra")	; spurious bytecomp warning
 
@@ -233,7 +233,7 @@ passed to isa-tool-doc-command, DOCNAME will be viewed."
       (let ((docs (isa-shell-command-to-string
 		   (concat "\"" isa-isabelle-command "\" doc"))))
 	(unless (string-equal docs "")
-	  (mapcan
+	  (cl-mapcan
 	   (function (lambda (docdes)
 		       (if (proof-string-match "^[ \t]+\\(\\S-+\\)[ \t]+" docdes)
 			   (list (list
diff --git a/isar/isar-autotest.el b/isar/isar-autotest.el
index f8784bc2..8e098a29 100644
--- a/isar/isar-autotest.el
+++ b/isar/isar-autotest.el
@@ -10,9 +10,6 @@
 
 (require 'pg-autotest)
 
-(eval-when-compile
-  (require 'cl))
-
 (require 'proof-site)
 (proof-ready-for-assistant 'isar)
 
diff --git a/isar/isar-profiling.el b/isar/isar-profiling.el
index 0cf19348..ae8a8f8c 100644
--- a/isar/isar-profiling.el
+++ b/isar/isar-profiling.el
@@ -5,9 +5,6 @@
 ;; $Id$
 ;;
 
-(eval-when-compile
-  (require 'cl))
-
 (require 'proof-site)
 (proof-ready-for-assistant 'isar)
 
diff --git a/isar/isar-syntax.el b/isar/isar-syntax.el
index 7fa6f55d..095b108c 100644
--- a/isar/isar-syntax.el
+++ b/isar/isar-syntax.el
@@ -8,7 +8,7 @@
 ;; $Id$
 ;;
 
-(require 'cl)				; remove-if, remove-if-not
+(eval-when-compile (require 'cl-lib))
 
 (require 'proof-syntax)
 (require 'isar-keywords)		; NB: we want to load isar-keywords at runtime
@@ -271,18 +271,18 @@ matches contents of quotes for quoted identifiers.")
       (while (proof-re-search-forward isar-nesting-regexp limit t)
 	(cond
 	 ((proof-buffer-syntactic-context))
-	 ((equal (match-string 0) isar-keyword-begin) (incf nesting))
-	 ((equal (match-string 0) isar-keyword-end) (decf nesting)))))
+	 ((equal (match-string 0) isar-keyword-begin) (cl-incf nesting))
+	 ((equal (match-string 0) isar-keyword-end) (cl-decf nesting)))))
     nesting))
 
 (defun isar-match-nesting (limit)
-  (block nil
+  (cl-block nil
     (while (proof-re-search-forward isar-nesting-regexp limit t)
       (and (not (proof-buffer-syntactic-context))
 	   (if (equal (match-string 0) isar-keyword-begin)
 	       (> (isar-nesting) 1)
 	     (> (isar-nesting) 0))
-	   (return t)))))
+	   (cl-return t)))))
 
 
 ;; ----- Isabelle inner syntax highlight
diff --git a/isar/isar-unicode-tokens.el b/isar/isar-unicode-tokens.el
index c6f58452..725bc544 100644
--- a/isar/isar-unicode-tokens.el
+++ b/isar/isar-unicode-tokens.el
@@ -12,7 +12,7 @@
 ;;
 
 
-(require 'cl)				; for-loop
+(eval-when-compile (require 'cl-lib))   ; cl-loop
 
 (eval-when-compile
   (require 'unicode-tokens)	    ; it's loaded dynamically at runtime
@@ -481,10 +481,10 @@ tokens."
   :set 'isar-set-and-restart-tokens)
 
 (defun isar-map-letters (f1 f2 &rest symbs)
-  (loop for x below 26
-	for c = (+ 65 x)
-	collect
-	(cons (funcall f1 c) (cons (funcall f2 c) symbs))))
+  (cl-loop for x below 26
+	   for c = (+ 65 x)
+	   collect
+	   (cons (funcall f1 c) (cons (funcall f2 c) symbs))))
 
 (defconst isar-script-letters-tokens ; \<A> \<B> ...
   (isar-map-letters (lambda (x) (format "%c" x))
diff --git a/isar/isar.el b/isar/isar.el
index bb755d4f..9deed7c1 100644
--- a/isar/isar.el
+++ b/isar/isar.el
@@ -1,6 +1,7 @@
 ;; isar.el --- Major mode for Isabelle/Isar proof assistant
 ;;
 ;; Copyright (C) 1994-2010 LFCS Edinburgh.
+;; Copyright (C) 2018  Free Software Foundation, Inc.
 ;;
 ;; License:   GPL (GNU GENERAL PUBLIC LICENSE)
 ;;
@@ -16,18 +17,15 @@
 
 ;;; Code:
 
-(eval-when-compile 
-  (require 'cl))
-
 (eval-when-compile
   (require 'span)
   (require 'proof-syntax)
   (require 'pg-goals)
   (require 'pg-vars)
-  (require 'outline)
-  (defvar comment-quote-nested)
-  (defvar isar-use-find-theorems-form)
-  (defvar isar-use-linear-undo))
+  (require 'outline))
+(defvar comment-quote-nested)
+(defvar isar-use-find-theorems-form)
+(defvar isar-use-linear-undo)
 
 (require 'proof)
 (require 'isabelle-system)		; system code