(mailcap-print-command): lpr-command might be

unbound in XEmacs.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9bcefc6..c40208a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-20  Jesper Harder  <harder@ifa.au.dk>
+
+       * mailcap.el (mailcap-print-command): lpr-command might be
+       unbound in XEmacs.
+
 2002-01-18  Kevin Greiner  <kgreiner@xpediantsolutions.com>
 
        * gnus-agent.el (gnus-agent-regenerate-group): Added interactive form.

diff --git a/lisp/mailcap.el b/lisp/mailcap.el
index 53ec822..ab16136 100644 (file)
--- a/lisp/mailcap.el
+++ b/lisp/mailcap.el
@@ -51,10 +51,13 @@
 
 (defvar mailcap-print-command
   (mapconcat 'identity
-            (cons lpr-command
-                  (if (stringp lpr-switches)
-                      (list lpr-switches)
-                    lpr-switches))
+            (cons (if (boundp 'lpr-command)
+                      lpr-command
+                    "lpr")
+                  (when (boundp 'lpr-switches)
+                    (if (stringp lpr-switches)
+                        (list lpr-switches)
+                      lpr-switches)))
             " ")
   "Shell command (including switches) used to print Postscript files.")