X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/4787a496a05fdc03241850b45911dd283d4b06b8..b336bfcdf39f1e4d35bff4a7bd01d3b4bca8f516:/lisp/lpr.el

diff --git a/lisp/lpr.el b/lisp/lpr.el
index 04b77a30a0..51b68c1ab4 100644
--- a/lisp/lpr.el
+++ b/lisp/lpr.el
@@ -1,7 +1,7 @@
 ;;; lpr.el --- print Emacs buffer on line printer
 
 ;; Copyright (C) 1985, 1988, 1992, 1994, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: unix
@@ -31,7 +31,7 @@
 
 ;;;###autoload
 (defvar lpr-windows-system
-  (memq system-type '(emx win32 w32 mswindows ms-dos windows-nt)))
+  (memq system-type '(ms-dos windows-nt)))
 
 ;;;###autoload
 (defvar lpr-lp-system
@@ -45,8 +45,8 @@
 
 ;;;###autoload
 (defcustom printer-name
-  (and (memq system-type '(emx ms-dos)) "PRN")
-  "*The name of a local printer to which data is sent for printing.
+  (and (eq system-type 'ms-dos) "PRN")
+  "The name of a local printer to which data is sent for printing.
 \(Note that PostScript files are sent to `ps-printer-name', which see.\)
 
 On Unix-like systems, a string value should be a name understood by
@@ -68,7 +68,7 @@ file.  If you want to discard the printed output, set this to \"NUL\"."
 
 ;;;###autoload
 (defcustom lpr-switches nil
-  "*List of strings to pass as extra options for the printer program.
+  "List of strings to pass as extra options for the printer program.
 It is recommended to set `printer-name' instead of including an explicit
 switch on this list.
 See `lpr-command'."
@@ -76,7 +76,7 @@ See `lpr-command'."
   :group 'lpr)
 
 (defcustom lpr-add-switches (memq system-type '(berkeley-unix gnu/linux))
-  "*Non-nil means construct `-T' and `-J' options for the printer program.
+  "Non-nil means construct `-T' and `-J' options for the printer program.
 These are made assuming that the program is `lpr';
 if you are using some other incompatible printer program,
 this variable should be nil."
@@ -87,7 +87,7 @@ this variable should be nil."
   (if lpr-lp-system
       "-d "
     "-P")
-  "*Printer switch, that is, something like \"-P\", \"-d \", \"/D:\", etc.
+  "Printer switch, that is, something like \"-P\", \"-d \", \"/D:\", etc.
 This switch is used in conjunction with `printer-name'."
   :type '(choice :menu-tag "Printer Name Switch"
 		 :tag "Printer Name Switch"
@@ -97,14 +97,15 @@ This switch is used in conjunction with `printer-name'."
 
 ;;;###autoload
 (defcustom lpr-command
+ (purecopy
   (cond
    (lpr-windows-system
     "")
    (lpr-lp-system
     "lp")
    (t
-    "lpr"))
-  "*Name of program for printing a file.
+    "lpr")))
+  "Name of program for printing a file.
 
 On MS-DOS and MS-Windows systems, if the value is an empty string then
 Emacs will write directly to the printer port named by `printer-name'.
@@ -119,7 +120,7 @@ argument."
 ;; Default is nil, because that enables us to use pr -f
 ;; which is more reliable than pr with no args, which is what lpr -p does.
 (defcustom lpr-headers-switches nil
-  "*List of strings of options to request page headings in the printer program.
+  "List of strings of options to request page headings in the printer program.
 If nil, we run `lpr-page-header-program' to make page headings
 and print the result."
   :type '(repeat (string :tag "Argument"))
@@ -132,14 +133,14 @@ See definition of `print-region-1' for calling conventions."
   :group 'lpr)
 
 (defcustom lpr-page-header-program "pr"
-  "*Name of program for adding page headers to a file."
+  "Name of program for adding page headers to a file."
   :type 'string
   :group 'lpr)
 
 ;; Berkeley systems support -F, and GNU pr supports both -f and -F,
 ;; So it looks like -F is a better default.
 (defcustom lpr-page-header-switches '("-h" "%s" "-F")
-  "*List of strings to use as options for the page-header-generating program.
+  "List of strings to use as options for the page-header-generating program.
 If `%s' appears in any of the strings, it is substituted by the page title.
 Note that for correct quoting, `%s' should normally be a separate element.
 The variable `lpr-page-header-program' specifies the program to use."