Merge from trunk.

[gnu-emacs] / lisp / ps-print.el

diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index 19431c30d68def8a852536ccb3fbfd23788e5199..da804d99ae08e1167227049b468ed3d9a7006d91 100644 (file)
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -975,7 +975,7 @@ Please send all bug fixes and enhancements to
 ;;     (setq ps-font-info-database '(<your stuff> <the standard stuff>))
 ;;   or, use `ps-print-hook' (see section Hooks):
 ;;     (add-hook 'ps-print-hook
-;;               '(lambda ()
+;;               (lambda ()
 ;;                  (or (assq 'Helvetica ps-font-info-database)
 ;;                      (setq ps-font-info-database (append ...)))))
 ;;
@@ -4592,16 +4592,16 @@ page-height == ((floor print-height ((th + ls) * zh)) * ((th + ls) * zh)) - th
                     ps-print-height))))))
 
 
-(defun ps-print-preprint-region (prefix-arg)
+(defun ps-print-preprint-region (prefix)
   (or (ps-mark-active-p)
       (error "The mark is not set now"))
-  (list (point) (mark) (ps-print-preprint prefix-arg)))
+  (list (point) (mark) (ps-print-preprint prefix)))
 
 
-(defun ps-print-preprint (prefix-arg)
-  (and prefix-arg
-       (or (numberp prefix-arg)
-          (listp prefix-arg))
+(defun ps-print-preprint (prefix)
+  (and prefix
+       (or (numberp prefix)
+          (listp prefix))
        (let* ((name   (concat (file-name-nondirectory (or (buffer-file-name)
                                                          (buffer-name)))
                              ".ps"))
@@ -5372,9 +5372,9 @@ Where:
 KIND is a valid value of `ps-n-up-filling'.
 XCOL YCOL are the relative position for the next column.
 XLIN YLIN are the relative position for the beginning of next line.
-REPEAT is the number of repetions for external loop.
-END is the number of repetions for internal loop and also the number of pages in
-    a row.
+REPEAT is the number of repetitions for external loop.
+END is the number of repetitions for internal loop and also the number
+    of pages in a row.
 XSTART YSTART are the relative position for the first page in a sheet.")
 
 
@@ -6020,7 +6020,7 @@ XSTART YSTART are the relative position for the first page in a sheet.")
     (ps-output " S\n")
     wrappoint))
 
-(defun ps-basic-plot-string (from to &optional bg-color)
+(defun ps-basic-plot-string (from to &optional _bg-color)
   (let* ((wrappoint (ps-find-wrappoint from to
                                       (ps-avg-char-width 'ps-font-for-text)))
         (to (car wrappoint))
@@ -6029,7 +6029,7 @@ XSTART YSTART are the relative position for the first page in a sheet.")
     (ps-output " S\n")
     wrappoint))
 
-(defun ps-basic-plot-whitespace (from to &optional bg-color)
+(defun ps-basic-plot-whitespace (from to &optional _bg-color)
   (let* ((wrappoint (ps-find-wrappoint from to
                                       (ps-space-width 'ps-font-for-text)))
         (to (car wrappoint)))
@@ -6645,7 +6645,8 @@ If FACE is not a valid face name, use default face."
         (error "Unprinted PostScript"))))
 
 (cond ((fboundp 'add-hook)
-       (funcall 'add-hook 'kill-emacs-hook 'ps-kill-emacs-check))
+       (unless noninteractive
+         (funcall 'add-hook 'kill-emacs-hook 'ps-kill-emacs-check)))
       (kill-emacs-hook
        (message "Won't override existing `kill-emacs-hook'"))
       (t
@@ -6657,7 +6658,7 @@ If FACE is not a valid face name, use default face."
 ;; But autoload them here to make the separation invisible.
 \f
 ;;;### (autoloads (ps-mule-end-job ps-mule-begin-job ps-mule-initialize
-;;;;;;  ps-multibyte-buffer) "ps-mule" "ps-mule.el" "14536f28e0dcaa956901bb59ad86a875")
+;;;;;;  ps-multibyte-buffer) "ps-mule" "ps-mule.el" "01641c7c3af4e45e1c3afeb75a73120c")
 ;;; Generated autoloads from ps-mule.el
 
 (defvar ps-multibyte-buffer nil "\