X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/a3e44e793796153ff1534be9c74fcab50b45de30..e71cebb3c3a3b2f7eb5a28178d9c4763a1a3edb0:/lisp/ps-samp.el

diff --git a/lisp/ps-samp.el b/lisp/ps-samp.el
index e85b0f4e8d..f719b08727 100644
--- a/lisp/ps-samp.el
+++ b/lisp/ps-samp.el
@@ -1,6 +1,6 @@
 ;;; ps-samp.el --- ps-print sample setup code
 
-;; Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2012 Free Software Foundation, Inc.
 
 ;; Author: Jim Thompson (was <thompson@wg2.waii.com>)
 ;;	Jacques Duthen (was <duthen@cegelec-red.fr>)
@@ -34,7 +34,7 @@
 ;;; Code:
 
 
-(eval-and-compile (require 'ps-print))
+(require 'ps-print)
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -237,7 +237,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;; If zeroconf is enabled, all CUPS printers can be detected.  The
-;; "Postscript printer" menu will be modified dynamically, as printers
+;; "PostScript printer" menu will be modified dynamically, as printers
 ;; are added or removed.
 
 ;; Preconditions:
@@ -254,11 +254,10 @@
 (eval-when-compile
   (require 'cl))
 
-(eval-and-compile
-  (require 'printing)
-  (require 'zeroconf))
+(require 'printing)
+(require 'zeroconf)
 
-;; Add a Postscript printer to the "Postscript printer" menu.
+;; Add a PostScript printer to the "PostScript printer" menu.
 (defun ps-add-printer (service)
   (let ((name (zeroconf-service-name service))
 	(text (zeroconf-service-txt service))
@@ -268,7 +267,7 @@
     ;; `text' is an array of key=value strings like ("Duplex=T" "Copies=T").
     (dolist (string text)
       (let ((split (split-string string "=" t)))
-	;; If it is a Postscript printer, there must be a string like
+	;; If it is a PostScript printer, there must be a string like
 	;; "pdl=application/postscript,application/vnd.hp-PCL,...".
 	(when (and (string-equal "pdl" (car split))
 		   (string-match "application/postscript" (cadr split)))
@@ -289,7 +288,7 @@
 				    "-H" (format "%s:%s" addr port))))
       (pr-update-menus t))))
 
-;; Remove a printer from the "Postscript printer" menu.
+;; Remove a printer from the "PostScript printer" menu.
 (defun ps-remove-printer (service)
   (setq pr-ps-printer-alist
 	(delete (assoc (intern (zeroconf-service-name service))