Fix ps-print-preprint-region code

2 files changed, 13 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f9ae2f49158..b1878cef3f5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-27  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+
+        * ps-print.el (ps-mark-active-p): Fun returned back.
+        (ps-print-preprint-region): Use `ps-mark-active-p' instead of
+        `region-active-p' for error checking.
+
 2007-12-27  Eric S. Raymond  <esr@snark.thyrsus.com>
 
         * (vc.el, vc-sccs.el, vc-rcs.el, vc-cs.el, vc-mcvs.el): Put
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index 2cdb50e76ef..0e442f3b104 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -1501,6 +1501,12 @@ Please send all bug fixes and enhancements to
 (defalias 'ps-frame-parameter
   (if (fboundp 'frame-parameter) 'frame-parameter 'frame-property))
 
+(defalias 'ps-mark-active-p
+  (if (featurep 'xemacs)
+      'region-active-p                  ; XEmacs
+    (defvar mark-active)                ; To shup up XEmacs's byte compiler.
+    (lambda () mark-active)))           ; Emacs
+
 (defun ps-face-foreground-name (face)
   (if (featurep 'xemacs)
       (ps-xemacs-color-name (face-foreground face))
@@ -4695,7 +4701,7 @@ page-height == ((floor print-height ((th + ls) * zh)) * ((th + ls) * zh)) - th
 
 
 (defun ps-print-preprint-region (prefix-arg)
-  (or (region-active-p)
+  (or (ps-mark-active-p)
       (error "The mark is not set now"))
   (list (point) (mark) (ps-print-preprint prefix-arg)))