pr-setup & lpr-setup

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d6a7617579b535d10334fbb064dc2d1ed368c093..11ab880f1ab27f1404145810caf3829cf7e11d13 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -6,6 +6,8 @@
        (ps-insert-file): Use insert-file-contents instead of insert-file.
        (ps-setup): Code fix.
 
+       * printing.el (pr-setup, lpr-setup): Code fix.
+
 2004-11-21  Jay Belanger  <belanger@truman.edu>
 
        * calc/calc-prog.el (math-integral-cache-state, calc-lang)

diff --git a/lisp/printing.el b/lisp/printing.el
index 639ecbbbdf2c751d767c74870c263d5f345e7815..b70c55b3f98b7961d7ebc211482fe8acf680032c 100644 (file)
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -5,7 +5,7 @@
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
-;; Time-stamp: <2004/11/17 19:27:57 vinicius>
+;; Time-stamp: <2004/11/21 20:56:53 vinicius>
 ;; Keywords: wp, print, PostScript
 ;; Version: 6.8.3
 ;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/
@@ -4280,6 +4280,7 @@ Or choose the menu option Printing/Show Settings/printing."
      (list
       (concat "\n;;; printing.el version " pr-version "\n")
       ";; internal vars"
+      (ps-comment-string "emacs-version       " emacs-version)
       (ps-comment-string "pr-txt-command      " pr-txt-command)
       (ps-comment-string "pr-txt-switches     "
                         (pr-switches-string pr-txt-switches "pr-txt-switches"))
@@ -4355,16 +4356,19 @@ Or choose the menu option Printing/Show Settings/lpr."
   (let (ps-prefix-quote)
     (mapconcat
      #'ps-print-quote
-     '("\n;;; lpr.el settings\n"
-       (25 . printer-name)
-       (25 . lpr-switches)
-       (25 . lpr-add-switches)
-       (25 . lpr-command)
-       (25 . lpr-headers-switches)
-       (25 . print-region-function)
-       (25 . lpr-page-header-program)
-       (25 . lpr-page-header-switches)
-       ")\n\n;;; lpr.el - end of settings\n")
+     (list
+      "\n;;; lpr.el settings\n"
+      (ps-comment-string "emacs-version" emacs-version)
+      nil
+      '(25 . printer-name)
+      '(25 . lpr-switches)
+      '(25 . lpr-add-switches)
+      '(25 . lpr-command)
+      '(25 . lpr-headers-switches)
+      '(25 . print-region-function)
+      '(25 . lpr-page-header-program)
+      '(25 . lpr-page-header-switches)
+      ")\n\n;;; lpr.el - end of settings\n")
      "\n")))