Move imagep compat code to splash

2 files changed, 12 insertions, 14 deletions

diff --git a/generic/proof-compat.el b/generic/proof-compat.el
index 3ce175e3..0a228b2f 100644
--- a/generic/proof-compat.el
+++ b/generic/proof-compat.el
@@ -41,20 +41,6 @@ with `path-separator'."
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;
-;;; GNU Emacs compatibility with XEmacs
-;;;
-
-(if proof-running-on-Emacs21
-    (defun proof-emacs-imagep (img)
-      "See if IMG is an Emacs 21 image descriptor."
-      (and (listp img) (eq (car img) 'image)))
-  ;; Otherwise, constant nil function
-  (defun proof-emacs-imagep (img)
-    "See if IMG is an Emacs 21 image descriptor (returns nil since not E21)."
-    nil))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;
 ;;; XEmacs compatibility with GNU Emacs
 ;;;
 
diff --git a/generic/proof-splash.el b/generic/proof-splash.el
index b02d014c..0d00b633 100644
--- a/generic/proof-splash.el
+++ b/generic/proof-splash.el
@@ -78,6 +78,18 @@ These are evaluated and appended to `proof-splash-contents'."
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+
+;; Compatibility between Emacs/XEmacs.
+(if (string-match "XEmacs" emacs-version)
+  ;; Constant nil function
+  (defun proof-emacs-imagep (img)
+    "See if IMG is an Emacs 21 image descriptor (returns nil since not E21)."
+    nil)
+  (defun proof-emacs-imagep (img)
+    "See if IMG is an Emacs 21 image descriptor."
+    (and (listp img) (eq (car img) 'image))))
+
+
 (defun proof-splash-display-image (name &optional nojpeg)
   "Construct an image instantiator for an image, or string failing that.
 Different formats are chosen from according to what can be displayed.