This commit was generated by cvs2svn to compensate for changes in r5670,

[chise/xemacs-chise.git.1] / lisp / printer.el

diff --git a/lisp/printer.el b/lisp/printer.el
index 8a12a5a..ed1ce4d 100644 (file)
--- a/lisp/printer.el
+++ b/lisp/printer.el
@@ -60,11 +60,10 @@
   "Generic printing support."
   :group 'wp)
 
-(defcustom printer-name nil
+(defcustom printer-name nil ; "Okidata OL610e/PS PostScript"
   "*Name of printer to print to.
 If nil, use default.
-Under Windows, use `mswindows-printer-list' to get names of installed
-printers."
+Under MS Windows, this can have the form `\\\\STOLI\\HP-345-PS'."
   :type 'string
   :group 'printing)
 
@@ -152,23 +151,23 @@ Under Unix, `lpr' is normally used to spool out a no-frills version of the
 buffer, or the `ps-print' package is used to pretty-print the buffer to a
 PostScript printer.  Under MS Windows, the built-in printing support is used."
   (cond ((valid-specifier-tag-p 'msprinter)
+        (or (stringp printer-name)
+            (error "Please set `printer-name'"))
         (let (d f)
           (setq buf (decode-buffer buf))
           (unwind-protect
               (progn
                 (setq d (make-device 'msprinter printer-name))
                 (setq f (make-frame
-                         (list* 'name (concat (substitute ?_ ?. 
-                                                          (buffer-name buf))
-                                              " - XEmacs")
-                                '(menubar-visible-p nil
-                                  has-modeline-p nil
-                                  default-toolbar-visible-p nil
-                                  default-gutter-visible-p nil
-                                  minibuffer none
-                                  modeline-shadow-thickness 0
-                                  vertical-scrollbar-visible-p nil
-                                  horizontal-scrollbar-visible-p nil))
+                         '(name "Test!"
+                                menubar-visible-p nil
+                                has-modeline-p nil
+                                default-toolbar-visible-p nil
+                                default-gutter-visible-p nil
+                                minibuffer none
+                                modeline-shadow-thickness 0
+                                vertical-scrollbar-visible-p nil
+                                horizontal-scrollbar-visible-p nil)
                          d))
                 (let* ((w (frame-root-window f))
                        (vertdpi (cdr (device-system-metric d 'device-dpi)))