* lisp/emacs-lisp/package.el: Include obsolete packages from archives.

[gnu-emacs] / lisp / lpr.el

diff --git a/lisp/lpr.el b/lisp/lpr.el
index 296063549fc9a95f42aeee2f968502f227c1b410..0b860ed07f193ba0e714ec950755ecd3b9d70ad0 100644 (file)
--- 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-2011
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1988, 1992, 1994, 2001-2013 Free Software
+;; Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: unix
@@ -29,8 +29,6 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'cl))
-
 ;;;###autoload
 (defvar lpr-windows-system
   (memq system-type '(ms-dos windows-nt))
@@ -127,7 +125,9 @@ argument."
   "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"))
+  :type '(choice (const nil)
+                (string :tag "Single argument")
+                (repeat :tag "Multiple arguments" (string :tag "Argument")))
   :group 'lpr)
 
 (defcustom print-region-function nil
@@ -281,10 +281,10 @@ for further customization of the printer command."
           (if (markerp end)
               (set-marker end nil))
           (message "Spooling%s...done%s%s" switch-string
-                   (case (count-lines (point-min) (point-max))
+                   (pcase (count-lines (point-min) (point-max))
                      (0 "")
                      (1 ": ")
-                     (t ":\n"))
+                     (_ ":\n"))
                    (buffer-string)))))))
 
 ;; This function copies the text between start and end