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

diff --git a/lisp/lpr.el b/lisp/lpr.el
index 9775abc74f..51b68c1ab4 100644
--- a/lisp/lpr.el
+++ b/lisp/lpr.el
@@ -1,17 +1,17 @@
 ;;; lpr.el --- print Emacs buffer on line printer
 
 ;; Copyright (C) 1985, 1988, 1992, 1994, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: unix
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,9 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -33,11 +31,11 @@
 
 ;;;###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
-  (memq system-type '(usg-unix-v dgux hpux irix)))
+  (memq system-type '(usg-unix-v hpux irix)))
 
 
 (defgroup lpr nil
@@ -47,8 +45,8 @@
 
 ;;;###autoload
 (defcustom printer-name
-  (and lpr-windows-system "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
@@ -70,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'."
@@ -78,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."
@@ -89,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"
@@ -99,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'.
@@ -121,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"))
@@ -134,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."
@@ -328,5 +327,5 @@ The characters tab, linefeed, space, return and formfeed are not affected."
 
 (provide 'lpr)
 
-;;; arch-tag: 21c3f821-ebec-4ca9-ac67-a81e4b75c62a
+;; arch-tag: 21c3f821-ebec-4ca9-ac67-a81e4b75c62a
 ;;; lpr.el ends here