From 33614d35a25b54c23171c360a61b913f0c1158ce Mon Sep 17 00:00:00 2001
From: Clément Pit--Claudel
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.
---
 lib/holes.el        | 4 +---
 lib/proof-compat.el | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/holes.el b/lib/holes.el
index 09eb9dde..c0a864b0 100644
--- a/lib/holes.el
+++ b/lib/holes.el
@@ -30,9 +30,7 @@
 ;;
 ;; See documentation of `holes-mode'.
 
-
-(eval-when-compile 
-  (require 'span))
+(require 'span)
 (require 'cl)
 
 ;;; Code:
diff --git a/lib/proof-compat.el b/lib/proof-compat.el
index 1816ed0e..4eb942cb 100644
--- a/lib/proof-compat.el
+++ b/lib/proof-compat.el
@@ -17,9 +17,7 @@
 ;; Since Proof General 4.0, XEmacs is not supported at all.
 ;;
 
-(eval-when-compile
-  (require 'easymenu))
-
+(require 'easymenu)
 (require 'cl)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-- 
cgit v1.2.3


From 5b85cc7793fbedd656d118454682e43d71dd05dc Mon Sep 17 00:00:00 2001
From: Clément Pit--Claudel
Date: Sat, 25 Feb 2017 19:09:32 -0500
Subject: Remove some Emacs <24.1 compatibility cruft

---
 lib/unicode-tokens.el | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/unicode-tokens.el b/lib/unicode-tokens.el
index ba3d036a..d05bfc1e 100644
--- a/lib/unicode-tokens.el
+++ b/lib/unicode-tokens.el
@@ -45,11 +45,7 @@
 (require 'quail)
 
 (eval-when-compile
-  (require 'maths-menu)		; nuke compile warnings
-  ;; Emacs <24 compatibility
-  (when (and (fboundp 'flet)
-	     (not (get 'flet 'byte-obsolete-info)))
-    (defalias 'cl-flet 'flet)))
+  (require 'maths-menu))		; nuke compile warnings
 
 ;;
 ;; Customizable user options
-- 
cgit v1.2.3


From 673082b2bee3ca327db56bdc559f7f925259d1c8 Mon Sep 17 00:00:00 2001
From: Clément Pit--Claudel
Date: Sat, 25 Feb 2017 19:18:16 -0500
Subject: Remove unnecessary calls to 'eval-and-compile'

---
 lib/pg-fontsets.el | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/pg-fontsets.el b/lib/pg-fontsets.el
index 2c0528cc..c4d76efc 100644
--- a/lib/pg-fontsets.el
+++ b/lib/pg-fontsets.el
@@ -21,8 +21,7 @@
 
 ;;; Code:
 
-(eval-and-compile
-  (require 'fontset))			; needed for some emacsen without X
+(require 'fontset)
 
 (defcustom pg-fontsets-default-fontset nil
   "*Name of default fontset to use with Proof General."
-- 
cgit v1.2.3