Skip to content

Commit

Permalink
Change (eval-when (compile) ...) to (eval-when-compile ...)
Browse files Browse the repository at this point in the history
This fixes a bunch of compilation warnings
  • Loading branch information
cpitclaudel committed May 5, 2017
1 parent 409a116 commit 574b099
Show file tree
Hide file tree
Showing 19 changed files with 28 additions and 27 deletions.
2 changes: 1 addition & 1 deletion coq/coq-compile-common.el
Expand Up @@ -17,7 +17,7 @@
(require 'coq-system)
(require 'compile)

(eval-when (compile)
(eval-when-compile
;;(defvar coq-pre-v85 nil)
(defvar coq-confirm-external-compilation); defpacustom
(defvar coq-compile-parallel-in-background)) ; defpacustom
Expand Down
2 changes: 1 addition & 1 deletion coq/coq-local-vars.el
Expand Up @@ -14,7 +14,7 @@
(eval-when-compile
(require 'cl))

(eval-when (compile)
(eval-when-compile
(defvar coq-prog-name)
(defvar coq-load-path))

Expand Down
2 changes: 1 addition & 1 deletion coq/coq-par-compile.el
Expand Up @@ -27,7 +27,7 @@
(eval-when-compile
(require 'proof-compat))

(eval-when (compile)
(eval-when-compile
(defvar queueitems)) ; dynamic scope in p-s-extend-queue-hook

(require 'coq-compile-common)
Expand Down
2 changes: 1 addition & 1 deletion coq/coq-seq-compile.el
Expand Up @@ -18,7 +18,7 @@
(eval-when-compile
(require 'proof-compat))

(eval-when (compile)
(eval-when-compile
(defvar queueitems)) ; dynamic scope in p-s-extend-queue-hook

(require 'coq-compile-common)
Expand Down
2 changes: 1 addition & 1 deletion coq/coq-system.el
Expand Up @@ -18,7 +18,7 @@
(require 'cl)
(require 'proof-compat))

(eval-when (compile)
(eval-when-compile
(defvar coq-prog-args)
(defvar coq-debug))

Expand Down
9 changes: 5 additions & 4 deletions coq/coq.el
Expand Up @@ -12,7 +12,7 @@
(require 'cl)
(require 'proof-compat))

(eval-when (compile)
(eval-when-compile
(require 'proof-utils)
(require 'span)
(require 'outline)
Expand All @@ -25,10 +25,11 @@
(defvar action) ; dynamic scope in coq-insert-as stuff
(defvar string) ; dynamic scope in coq-insert-as stuff
(defvar old-proof-marker)
; dynamic scoq in coq-proof-tree-enable-evar-callback
(defvar coq-keymap)
(defvar coq-one-command-per-line)
(defvar coq-auto-insert-as) ; defpacustom
(defvar coq-time-commands) ; defpacustom
(defvar coq-use-project-file t) ; defpacustom
(defvar coq-use-project-file) ; defpacustom
(defvar coq-use-editing-holes) ; defpacustom
(defvar coq-hide-additional-subgoals))

Expand Down Expand Up @@ -1193,7 +1194,7 @@ flag Printing All set."
(coq-ask-do-show-all "Show goal number" "Show" t))

;; Check
(eval-when (compile)
(eval-when-compile
(defvar coq-auto-adapt-printing-width)); defpacustom

;; Since Printing Width is a synchronized option in coq (?) it is retored
Expand Down
2 changes: 1 addition & 1 deletion generic/proof-autoloads.el
Expand Up @@ -7,7 +7,7 @@
(eval-when-compile
(require 'cl))

(eval-when (compile)
(eval-when-compile
(require 'pg-vars)
(require 'proof-config)
(require 'scomint))
Expand Down
2 changes: 1 addition & 1 deletion generic/proof-maths-menu.el
Expand Up @@ -23,7 +23,7 @@
(eval-when-compile
(require 'cl))

(eval-when (compile)
(eval-when-compile
(require 'proof-auxmodes) ; loaded by proof.el
(require 'maths-menu)) ; loaded dynamically in proof-auxmodes

Expand Down
2 changes: 1 addition & 1 deletion generic/proof-mmm.el
Expand Up @@ -28,7 +28,7 @@
(eval-when-compile
(require 'cl))

(eval-when (compile)
(eval-when-compile
(require 'proof-auxmodes) ; will be loaded
(require 'mmm-auto)) ; loaded dynamically by proof-auxmodes

Expand Down
2 changes: 1 addition & 1 deletion generic/proof-shell.el
Expand Up @@ -27,7 +27,7 @@
(declare-function proof-tree-urgent-action "proof-tree" (flags))
(declare-function proof-tree-handle-delayed-output "proof-tree"
(old-proof-marker cmd flags span))
(eval-when (compile)
(eval-when-compile
;; without the nil initialization the compiler still warns about this variable
(defvar proof-tree-external-display nil))

Expand Down
2 changes: 1 addition & 1 deletion generic/proof-tree.el
Expand Up @@ -88,7 +88,7 @@

(require 'cl)

(eval-when (compile)
(eval-when-compile
(require 'proof-shell))


Expand Down
8 changes: 4 additions & 4 deletions generic/proof-unicode-tokens.el
Expand Up @@ -21,10 +21,10 @@
(eval-when-compile
(require 'cl))

(eval-when (compile)
(require 'scomint)
(require 'proof-auxmodes) ; loaded by proof.el, autoloads us
(require 'unicode-tokens)) ; it will be loaded by proof-auxmodes
(eval-when-compile
(require 'scomint)
(require 'proof-auxmodes) ; loaded by proof.el, autoloads us
(require 'unicode-tokens)) ; it will be loaded by proof-auxmodes

(require 'proof-config) ; config variables

Expand Down
6 changes: 3 additions & 3 deletions hol-light/hol-light.el
Expand Up @@ -16,9 +16,9 @@
(or (proof-try-require 'caml-font) ; use OCaml Emacs mode syntax
(defvar caml-font-lock-keywords nil)) ;

(eval-when (compile)
(require 'proof-tree)
(defvar caml-font-lock-keywords nil))
(eval-when-compile
(require 'proof-tree)
(defvar caml-font-lock-keywords nil))

(defcustom hol-light-home
(or (getenv "HOLLIGHT_HOME")
Expand Down
2 changes: 1 addition & 1 deletion isar/isabelle-system.el
Expand Up @@ -15,7 +15,7 @@
(eval-when-compile
(require 'cl)) ; mapcan, eval-when

(eval-when (compile)
(eval-when-compile
(require 'span)
(require 'scomint)
(require 'proof-site)
Expand Down
2 changes: 1 addition & 1 deletion isar/isar-autotest.el
Expand Up @@ -10,7 +10,7 @@

(require 'pg-autotest)

(eval-when (compile)
(eval-when-compile
(require 'cl))

(require 'proof-site)
Expand Down
2 changes: 1 addition & 1 deletion isar/isar-unicode-tokens.el
Expand Up @@ -14,7 +14,7 @@

(require 'cl) ; for-loop

(eval-when (compile)
(eval-when-compile
(require 'unicode-tokens) ; it's loaded dynamically at runtime
(require 'proof-unicode-tokens)) ; that file loads us at runtime

Expand Down
2 changes: 1 addition & 1 deletion isar/isar.el
Expand Up @@ -19,7 +19,7 @@
(eval-when-compile
(require 'cl))

(eval-when (compile)
(eval-when-compile
(require 'span)
(require 'proof-syntax)
(require 'pg-goals)
Expand Down
2 changes: 1 addition & 1 deletion lib/pg-dev.el
Expand Up @@ -19,7 +19,7 @@
(eval-when-compile
(require 'cl))

(eval-when (compile)
(eval-when-compile
(require 'proof-site))

(with-no-warnings
Expand Down
2 changes: 1 addition & 1 deletion phox/phox-extraction.el
Expand Up @@ -9,7 +9,7 @@

(require 'cl)

(eval-when (compile)
(eval-when-compile
(defvar phox-prog-name nil))

(declare-function proof-shell-invisible-command "proof-shell" (str))
Expand Down

0 comments on commit 574b099

Please sign in to comment.