[Emacs-diffs] Changes to emacs/lisp/ps-print.el [emacs-unicode-2]

[Miles Bader]

Index: emacs/lisp/ps-print.el
diff -c emacs/lisp/ps-print.el:1.137.2.2 emacs/lisp/ps-print.el:1.137.2.3
*** emacs/lisp/ps-print.el:1.137.2.2    Fri Apr 16 12:50:08 2004
--- emacs/lisp/ps-print.el      Mon Jun 28 07:28:44 2004
***************
*** 1262,1268 ****
  ;;     N-up printing.
  ;;     Hook: `ps-print-begin-sheet-hook'.
  ;;
! ;; [keinichi] 19990509 Kein'ichi Handa <address@hidden>
  ;;
  ;;    `ps-print-region-function'
  ;;
--- 1262,1268 ----
  ;;     N-up printing.
  ;;     Hook: `ps-print-begin-sheet-hook'.
  ;;
! ;; [kenichi] 19990509 Ken'ichi Handa <address@hidden>
  ;;
  ;;    `ps-print-region-function'
  ;;
***************
*** 1275,1281 ****
  ;;     PostScript prologue header comment insertion.
  ;;     Skip invisible text better.
  ;;
! ;; [keinichi] 19980819 Kein'ichi Handa <address@hidden>
  ;;
  ;;    Multi-byte buffer handling.
  ;;
--- 1275,1281 ----
  ;;     PostScript prologue header comment insertion.
  ;;     Skip invisible text better.
  ;;
! ;; [kenichi] 19980819 Ken'ichi Handa <address@hidden>
  ;;
  ;;    Multi-byte buffer handling.
  ;;
***************
*** 1383,1389 ****
  ;; prologue code suggestion, for odd/even printing suggestion and for
  ;; `ps-prologue-file' enhancement.
  ;;
! ;; Thanks to Kein'ichi Handa <address@hidden> for multi-byte buffer handling.
  ;;
  ;; Thanks to Matthew O Persico <address@hidden> for line number on
  ;; empty columns.
--- 1383,1389 ----
  ;; prologue code suggestion, for odd/even printing suggestion and for
  ;; `ps-prologue-file' enhancement.
  ;;
! ;; Thanks to Ken'ichi Handa <address@hidden> for multi-byte buffer handling.
  ;;
  ;; Thanks to Matthew O Persico <address@hidden> for line number on
  ;; empty columns.
***************
*** 3501,3506 ****
--- 3501,3511 ----
       #'ps-print-quote
       (list
        (concat "\n;;; ps-print version " ps-print-version "\n")
+       ";; internal vars"
+       (ps-comment-string "ps-print-emacs-type" ps-print-emacs-type)
+       (ps-comment-string "ps-windows-system  " ps-windows-system)
+       (ps-comment-string "ps-lp-system       " ps-lp-system)
+       nil
        '(25 . ps-print-color-p)
        '(25 . ps-lpr-command)
        '(25 . ps-lpr-switches)
***************
*** 3657,3670 ****
              (if (> col len)
                  (make-string (- col len) ?\ )
                " ")
!             (cond ((null val) "nil")
!                   ((eq val t) "t")
!                   ((or (symbolp val) (listp val)) (format "'%S" val))
!                   (t          (format "%S" val))))))
     (t "")
     ))
  
  
  (defun ps-value (alist-sym key)
    "Return value from association list ALIST-SYM which car is `eq' to KEY."
    (cdr (assq key (symbol-value alist-sym))))
--- 3662,3689 ----
              (if (> col len)
                  (make-string (- col len) ?\ )
                " ")
!             (ps-value-string val))))
     (t "")
     ))
  
  
+ (defun ps-value-string (val)
+   "Return a string representation of VAL.  Used by `ps-print-quote'."
+   (cond ((null val)
+        "nil")
+       ((eq val t)
+        "t")
+       ((or (symbolp val) (listp val))
+        (format "'%S" val))
+       (t
+        (format "%S" val))))
+ 
+ 
+ (defun ps-comment-string (str value)
+   "Return a comment string like \";; STR = VALUE\"."
+   (format ";; %s = %s" str (ps-value-string value)))
+ 
+ 
  (defun ps-value (alist-sym key)
    "Return value from association list ALIST-SYM which car is `eq' to KEY."
    (cdr (assq key (symbol-value alist-sym))))
***************
*** 3718,3725 ****
    (format-time-string "%Y-%m-%d"))
  
  
! (defalias 'ps-time-stamp-iso8601 'ps-time-stamp-yyyy-mm-dd
!   "Alias for `ps-time-stamp-yyyy-mm-dd' (which see).")
  
  
  (defun ps-time-stamp-hh:mm:ss ()
--- 3737,3744 ----
    (format-time-string "%Y-%m-%d"))
  
  
! ;; Alias for `ps-time-stamp-yyyy-mm-dd' (which see).
! (defalias 'ps-time-stamp-iso8601 'ps-time-stamp-yyyy-mm-dd)
  
  
  (defun ps-time-stamp-hh:mm:ss ()