* net/tramp.el (tramp-replace-environment-variables): New defun.

[gnu-emacs] / lisp / ps-def.el

diff --git a/lisp/ps-def.el b/lisp/ps-def.el
index 30453f8746301c51f2f1ceed1896add47be2ff37..9a972c678777ce3de433d4fa5e00c84ed1646119 100644 (file)
--- a/lisp/ps-def.el
+++ b/lisp/ps-def.el
@@ -31,6 +31,15 @@
 
 ;;; Code:
 
+(eval-and-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
+
+(declare-function ps-plot-with-face "ps-print" (from to face))
+(declare-function ps-plot-string    "ps-print" (string))
+
+(defvar ps-bold-faces)                  ; in ps-print.el
+(defvar ps-italic-faces)
+
 
 \f
 ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -169,17 +178,8 @@
 
   ;; Return t if the device (which can be changed during an emacs session)
   ;; can handle colors.
-  ;; XEmacs change: Need to check for emacs-major-version too.
-  (if (or (> emacs-major-version 19)
-         (and (= emacs-major-version 19)
-              (>= emacs-minor-version 12)))
-      ;; xemacs >= 19.12
-      (defun ps-color-device ()
-       (eq (device-class) 'color))
-    ;; xemacs < 19.12
-    (setq ps-print-color-p nil)
-    (defalias 'ps-color-device 'ignore))
-
+  (defun ps-color-device ()
+    (eq (device-class) 'color))
 
   (defun ps-mapper (extent list)
     (nconc list