aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2000-11-17 22:50:15 +0000
committerGerd Moellmann2000-11-17 22:50:15 +0000
commit08ea6f1714f0fff2abd1db1889ef8b5ea95bc671 (patch)
treea6916626122d35fe856aa235f863fb03367243c0
parentc9a6f68fec73f72f84307634f576e42137d8c0e9 (diff)
downloademacs-08ea6f1714f0fff2abd1db1889ef8b5ea95bc671.tar.gz
emacs-08ea6f1714f0fff2abd1db1889ef8b5ea95bc671.zip
Minor fixes from author.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/ps-print.el10
2 files changed, 10 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d33385e89df..9a5995880b7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12000-11-17 Gerd Moellmann <gerd@gnu.org>
2
3 * ps-print.el: Minor fixes from author.
4
12000-11-16 Stefan Monnier <monnier@cs.yale.edu> 52000-11-16 Stefan Monnier <monnier@cs.yale.edu>
2 6
3 * vc.el (vc-version-diff): Bind inhibit-read-only when inserting text. 7 * vc.el (vc-version-diff): Bind inhibit-read-only when inserting text.
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index fc27c966ea8..75fa9aa8eab 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -1,6 +1,6 @@
1;;; ps-print.el --- Print text from the buffer as PostScript 1;;; ps-print.el --- Print text from the buffer as PostScript
2 2
3;; Copyright (C) 1993, 2000 Free Software Foundation, Inc. 3;; Copyright (C) 1993-2000 Free Software Foundation, Inc.
4 4
5;; Author: Jim Thompson (was <thompson@wg2.waii.com>) 5;; Author: Jim Thompson (was <thompson@wg2.waii.com>)
6;; Author: Jacques Duthen (was <duthen@cegelec-red.fr>) 6;; Author: Jacques Duthen (was <duthen@cegelec-red.fr>)
@@ -14,7 +14,7 @@
14;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/ 14;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/
15 15
16(defconst ps-print-version "6.3.1" 16(defconst ps-print-version "6.3.1"
17 "ps-print.el, v 6.3.1 <2000/10/30 vinicius> 17 "ps-print.el, v 6.3.1 <2000/11/01 vinicius>
18 18
19Vinicius's last change version -- this file may have been edited as part of 19Vinicius's last change version -- this file may have been edited as part of
20Emacs without changes to the version number. When reporting bugs, please also 20Emacs without changes to the version number. When reporting bugs, please also
@@ -2962,6 +2962,7 @@ The table depends on the current ps-print setup."
2962 (require 'faces)) ; face-font, face-underline-p, 2962 (require 'faces)) ; face-font, face-underline-p,
2963 ; x-font-regexp 2963 ; x-font-regexp
2964 2964
2965
2965 ;; Return t if the device (which can be changed during an emacs session) 2966 ;; Return t if the device (which can be changed during an emacs session)
2966 ;; can handle colors. 2967 ;; can handle colors.
2967 ;; This function is not yet implemented for GNU emacs. 2968 ;; This function is not yet implemented for GNU emacs.
@@ -3028,8 +3029,9 @@ The table depends on the current ps-print setup."
3028 ; lucid 3029 ; lucid
3029 (t ; epoch 3030 (t ; epoch
3030 3031
3031 (or (ps-x-find-coding-system 'raw-text-unix) 3032 (and (fboundp 'find-coding-system)
3032 (ps-x-copy-coding-system 'no-conversion-unix 'raw-text-unix)) 3033 (or (ps-x-find-coding-system 'raw-text-unix)
3034 (ps-x-copy-coding-system 'no-conversion-unix 'raw-text-unix)))
3033 3035
3034 (defun ps-color-values (x-color) 3036 (defun ps-color-values (x-color)
3035 (let ((color (ps-xemacs-color-name x-color))) 3037 (let ((color (ps-xemacs-color-name x-color)))