From 632a3d7f9ded16faaf58e1c0769bcd4f7c8193e3 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 12 Dec 2018 15:20:08 -0500 Subject: Use `cl-lib` instead of `cl` everywhere MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use lexical-binding in a few files where it was easy. Don't require `proof-compat` when it's not used. * coq/coq-db.el: Use lexical-binding. * coq/coq-system.el: Use lexical-binding. (coq--extract-prog-args): Use concatenated-args rather than recomputing it. * coq/coq.el: Require `span` to silence some warnings. * generic/pg-user.el: Use lexical-binding. (complete, add-completion, completion-min-length): Silence warnings. * generic/pg-xml.el: Use lexical-binding. (pg-xml-string-of): Prefer mapconcat to reduce+concat. * generic/proof-depends.el: Use lexical-binding. (proof-dep-split-deps): Use `push`. * generic/proof-shell.el: Require `span` to silence some warnings. (proof-shell-invisible-command): Don't use lexical-let just to build a wasteful η-redex! * lib/holes.el: Use lexical-binding. Remove redundant :group args. * lib/span.el: Use lexical-binding. (span-read-only-hook): Use user-error. (span-raise): Remove, unused. --- isar/isar-syntax.el | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'isar/isar-syntax.el') 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 -- cgit v1.2.3