diff options
author | Pierre Courtieu <Pierre.Courtieu@cnam.fr> | 2018-12-14 15:44:32 +0100 |
---|---|---|
committer | Pierre Courtieu <Pierre.Courtieu@cnam.fr> | 2018-12-14 15:44:32 +0100 |
commit | ed4ffd4a653ae792aefeacbb0daa967fd4cb2524 (patch) | |
tree | 60a407c7f8ee7f2eb7a0dfd21230f47b1295d6b1 /isar/isabelle-system.el | |
parent | bfcb1a442b225394edc5e61ff8b3216e8f0efe83 (diff) | |
parent | 632a3d7f9ded16faaf58e1c0769bcd4f7c8193e3 (diff) |
Merge branch 'master' of github.com:ProofGeneral/PG
Diffstat (limited to 'isar/isabelle-system.el')
-rw-r--r-- | isar/isabelle-system.el | 10 |
1 files changed, 5 insertions, 5 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 |