diff options
| author |  Stefan Monnier <monnier@iro.umontreal.ca> | 2018-12-12 15:20:08 -0500 |
|---|---|---|
| committer |  Clément Pit-Claudel <clement.pitclaudel@live.com> | 2018-12-13 10:35:04 -0500 |
| commit | 632a3d7f9ded16faaf58e1c0769bcd4f7c8193e3 (patch) | |
| tree | 048f2e695817a901b1e0ef70c7049813f61772b9 /generic/proof-tree.el | |
| parent | a921439a4eb5b0d96182748e779c78e2f6a41a5f (diff) | |
Use `cl-lib` instead of `cl` everywhere
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.
Diffstat (limited to 'generic/proof-tree.el')
| -rw-r--r-- | generic/proof-tree.el | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/generic/proof-tree.el b/generic/proof-tree.el index cb85952d..c7afe212 100644 --- a/generic/proof-tree.el +++ b/generic/proof-tree.el @@ -3,7 +3,7 @@ ;; This file is part of Proof General. ;; Portions © Copyright 1994-2012 David Aspinall and University of Edinburgh -;; Portions © Copyright 2003, 2012, 2014 Free Software Foundation, Inc. +;; Portions © Copyright 2003-2018 Free Software Foundation, Inc. ;; Portions © Copyright 2001-2017 Pierre Courtieu ;; Portions © Copyright 2010, 2016 Erik Martin-Dorel ;; Portions © Copyright 2011-2013, 2016-2017 Hendrik Tews @@ -93,8 +93,7 @@ ;;; Code: -(require 'cl) - +(eval-when-compile (require 'cl-lib)) ;cl-assert (eval-when-compile (require 'proof-shell)) @@ -622,7 +621,7 @@ primitives is changed.") Send a message with command line SECOND-LINE and all strings in DATA as data sections to Prooftree." (let ((second-line-len (string-bytes second-line))) - (assert (< second-line-len 999)) + (cl-assert (< second-line-len 999)) (process-send-string proof-tree-process (format "second line %03d\n%s\n%s%s" @@ -1157,7 +1156,7 @@ entry that is now finally retired. CMD is the command, FLAGS are the flags and SPAN is the span." ;; (message "PTHDO cmd %s flags %s span %s-%s" cmd flags ;; (if span (span-start span)) (if span (span-end span))) - (assert proof-tree-external-display) + (cl-assert proof-tree-external-display) (unless (or (memq 'invisible flags) (memq 'proof-tree-show-subgoal flags)) (let* ((proof-info (funcall proof-tree-get-proof-info)) (current-proof-name (cadr proof-info))) @@ -1226,7 +1225,7 @@ position of the current proof." (error "Enabling prooftree inside a proof outside the current scripting buffer")) (proof-shell-ready-prover) - (assert proof-locked-span) + (cl-assert proof-locked-span) (message "Start proof-tree display for current proof") (save-excursion (save-window-excursion |