Merge pull request #157 from ProofGeneral/elpa

[WIP] ELPA/MELPA support

4 files changed, 4 insertions, 13 deletions

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/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."
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)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
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