From 33614d35a25b54c23171c360a61b913f0c1158ce Mon Sep 17 00:00:00 2001
From: Clément Pit--Claudel <clement.pitclaudel@live.com>
Date: Sat, 25 Feb 2017 19:06:26 -0500
Subject: Fix incorrect uses of defvar

It didn't really matter that these variables were defined and set to nil during
compilation, since we ran compilation in a clean Emacs in --batch mode; it does
matter now, however, since package.el compiles PG in the user's currently
running Emacs instance.
---
 generic/pg-pamacs.el  |  2 +-
 generic/proof-menu.el | 16 +++-------------
 generic/proof-site.el |  2 +-
 3 files changed, 5 insertions(+), 15 deletions(-)

(limited to 'generic')

diff --git a/generic/pg-pamacs.el b/generic/pg-pamacs.el
index 4958b360..4bc61c15 100644
--- a/generic/pg-pamacs.el
+++ b/generic/pg-pamacs.el
@@ -260,7 +260,7 @@ This macro also extends the `proof-assistant-settings' list."
   (eval-when-compile
     (if (boundp 'proof-assistant-symbol)
 	;; declare variable to compiler to prevent warnings
-	(eval `(defvar ,(proof-ass-sym name) nil "Dummy for compilation."))))
+	(eval `(defvar ,(proof-ass-sym name)))))
   `(proof-defpacustom-fn (quote ,name) (quote ,val) (quote ,args)))
 
 
diff --git a/generic/proof-menu.el b/generic/proof-menu.el
index df617347..f029afcb 100644
--- a/generic/proof-menu.el
+++ b/generic/proof-menu.el
@@ -10,23 +10,13 @@
 (require 'cl)				; mapcan
 
 ;;; Code:
-(eval-when (compile)
-  (defvar proof-assistant-menu nil) ; defined by macro in proof-menu-define-specific
-  (defvar proof-mode-map nil))
-
-(require 'proof-utils)    ; proof-deftoggle, proof-eval-when-ready-for-assistant
-(require 'proof-useropts)
-(require 'proof-config)
-
-
-    
-
-
 (eval-when-compile
   (defvar proof-assistant-menu)	  ; defined by macro in proof-menu-define-specific
   (defvar proof-mode-map))
-    
 
+(require 'proof-utils)    ; proof-deftoggle, proof-eval-when-ready-for-assistant
+(require 'proof-useropts)
+(require 'proof-config)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;
diff --git a/generic/proof-site.el b/generic/proof-site.el
index 671c3c82..17ca325c 100644
--- a/generic/proof-site.el
+++ b/generic/proof-site.el
@@ -163,7 +163,7 @@ You can use customize to set this variable."
 (require 'proof-autoloads)
 
 (eval-when-compile
-  (defvar Info-dir-contents nil))
+  (defvar Info-dir-contents))
 
 ;; Add the info directory to the Info path
 (if (file-exists-p proof-info-directory) ; for safety
-- 
cgit v1.2.3