Show
Ignore:
Timestamp:
09/18/06 20:48:14 (2 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/lisp/lpr.el

    r4037 r4166  
    141141;; Berkeley systems support -F, and GNU pr supports both -f and -F, 
    142142;; So it looks like -F is a better default. 
    143 (defcustom lpr-page-header-switches '("-F") 
    144   "*List of strings to use as options for the page-header-generating program. 
     143(defcustom lpr-page-header-switches '("-h %s" "-F") 
     144  "List of strings to use as options for the page-header-generating program. 
     145If `%s' appears in one of the strings, it is substituted by the page title. 
    145146The variable `lpr-page-header-program' specifies the program to use." 
    146147  :type '(repeat string) 
     
    244245              (apply 'call-process-region (car new-coords) (cdr new-coords) 
    245246                     lpr-page-header-program t t nil 
    246                      (nconc (list "-h" title
    247                             lpr-page-header-switches))) 
     247                     (mapcar (lambda (e) (format e title)
     248                            lpr-page-header-switches))) 
    248249            (setq start (point-min) 
    249250                  end   (point-max))))