(ps-print-emacs-type): Move into the

eval-and-compile.

2 files changed, 16 insertions, 12 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2272474cb54..ddb10778824 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-19  Gerd Moellmann  <gerd@gnu.org>
+
+        * ps-print.el (ps-print-emacs-type): Move into the
+        eval-and-compile.
+
 2000-10-19  Vinicius Jose Latorre  <vinicius@cpqd.com.br>
 
         * ps-print.el: Even/odd pages fix.  Fix little bug on XEmacs.  Avoid
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index 0e88614c847..834ad7d2855 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -2896,20 +2896,19 @@ The table depends on the current ps-print setup."
          sym)))
 
 
-(defvar ps-print-emacs-type
-  (cond ((string-match "XEmacs" emacs-version) 'xemacs)
-        ((string-match "Lucid" emacs-version) 'lucid)
-        ((string-match "Epoch" emacs-version) 'epoch)
-        (t 'emacs)))
-
-(if (memq ps-print-emacs-type '(lucid xemacs))
-    (if (< emacs-minor-version 12)
-        (setq ps-print-color-p nil))
-  (require 'faces))                     ; face-font, face-underline-p,
+(eval-and-compile
+  (defvar ps-print-emacs-type
+    (cond ((string-match "XEmacs" emacs-version) 'xemacs)
+          ((string-match "Lucid" emacs-version) 'lucid)
+          ((string-match "Epoch" emacs-version) 'epoch)
+          (t 'emacs)))
+
+  (if (memq ps-print-emacs-type '(lucid xemacs))
+      (if (< emacs-minor-version 12)
+          (setq ps-print-color-p nil))
+    (require 'faces))                   ; face-font, face-underline-p,
                                         ; x-font-regexp
 
-
-(eval-and-compile
   ;; Return t if the device (which can be changed during an emacs session)
   ;; can handle colors.
   ;; This is function is not yet implemented for GNU emacs.