[Emacs-diffs] Changes to emacs/lisp/lpr.el,v

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Eli Zaretskii <eliz>    06/09/09 10:39:45

Index: lpr.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/lpr.el,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- lpr.el      6 Feb 2006 14:33:34 -0000       1.69
+++ lpr.el      9 Sep 2006 10:39:45 -0000       1.70
@@ -140,8 +140,9 @@
 
 ;; 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 '("-F")
-  "*List of strings to use as options for the page-header-generating program.
+(defcustom lpr-page-header-switches '("-h %s" "-F")
+  "List of strings to use as options for the page-header-generating program.
+If `%s' appears in one of the strings, it is substituted by the page title.
 The variable `lpr-page-header-program' specifies the program to use."
   :type '(repeat string)
   :group 'lpr)
@@ -243,7 +244,7 @@
            (let ((new-coords (print-region-new-buffer start end)))
              (apply 'call-process-region (car new-coords) (cdr new-coords)
                     lpr-page-header-program t t nil
-                    (nconc (list "-h" title)
+                    (mapcar (lambda (e) (format e title))
                            lpr-page-header-switches)))
            (setq start (point-min)
                  end   (point-max))))