Mercurial > emacs
changeset 74327:78c65b1a07f6
Fix maintainer email. Emacs 20/21 compatibility.
| author | Vinicius Jose Latorre <viniciusjl@ig.com.br> |
|---|---|
| date | Thu, 30 Nov 2006 10:03:25 +0000 |
| parents | 43573f264b7f |
| children | 4d22eb834778 |
| files | lisp/ChangeLog lisp/ps-bdf.el lisp/ps-mule.el lisp/ps-print.el |
| diffstat | 4 files changed, 58 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Nov 30 09:18:25 2006 +0000 +++ b/lisp/ChangeLog Thu Nov 30 10:03:25 2006 +0000 @@ -1,3 +1,15 @@ +2006-11-29 Vinicius Jose Latorre <viniciusjl@ig.com.br> + + * ps-bdf.el : Fix maintainer email. + + * ps-mule.el : Fix maintainer email. Define functions for Emacs 20 + compatibility. + + * ps-print.el : Fix maintainer email. Define functions for Emacs 20 & + 21 compatibility. + (ps-print-quote): Replace '?\s' by '?\ ' to keep compatibility with + Emacs 20 & 21. + 2006-11-29 J.D. Smith <jdsmith@as.arizona.edu> * progmodes/idlwave.el (idlwave-auto-fill): Remove
--- a/lisp/ps-bdf.el Thu Nov 30 09:18:25 2006 +0000 +++ b/lisp/ps-bdf.el Thu Nov 30 10:03:25 2006 +0000 @@ -6,7 +6,7 @@ ;; Registration Number H14PRO021 ;; Keywords: wp, BDF, font, PostScript -;; Maintainer: Kenichi Handa <handa@etl.go.jp> +;; Maintainer: Kenichi Handa <handa@m17n.org> ;; Time-stamp: <2003/07/11 21:13:44 vinicius> ;; This file is part of GNU Emacs.
--- a/lisp/ps-mule.el Thu Nov 30 09:18:25 2006 +0000 +++ b/lisp/ps-mule.el Thu Nov 30 10:03:25 2006 +0000 @@ -3,12 +3,12 @@ ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. -;; Author: Vinicius Jose Latorre <vinicius@cpqd.com.br> -;; Kenichi Handa <handa@etl.go.jp> (multi-byte characters) -;; Maintainer: Kenichi Handa <handa@etl.go.jp> (multi-byte characters) -;; Vinicius Jose Latorre <vinicius@cpqd.com.br> +;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br> +;; Kenichi Handa <handa@m17n.org> (multi-byte characters) +;; Maintainer: Kenichi Handa <handa@m17n.org> (multi-byte characters) +;; Vinicius Jose Latorre <viniciusjl@ig.com.br> ;; Keywords: wp, print, PostScript, multibyte, mule -;; Time-stamp: <2003/05/14 22:19:41 vinicius> +;; Time-stamp: <2006/11/11 16:58:10 vinicius> ;; This file is part of GNU Emacs. @@ -163,7 +163,34 @@ (defalias 'string-make-multibyte 'copy-sequence)) (or (fboundp 'encode-char) (defun encode-char (ch ccs) - ch))) + ch)) + + ;; For Emacs 20 compatibility + (if (and (boundp 'mule-version) + (string< (symbol-value 'mule-version) "5.0")) + ;; mule package is loaded and mule version is lesser than 5.0 + (progn + (or (fboundp 'encode-composition-rule) + (defun encode-composition-rule (rule) + (if (= (car rule) 4) (setcar rule 10)) + (if (= (cdr rule) 4) (setcdr rule 10)) + (+ (* (car rule) 12) (cdr rule)))) + (or (fboundp 'find-composition) + (defun find-composition (pos &rest ignore) + (let ((ch (char-after pos))) + (and ch (eq (char-charset ch) 'composition) + (let ((components (decompose-composite-char ch 'vector t))) + (list pos (ps-mule-next-point pos) components + (integerp (aref components 1)) nil + (char-width ch)))))))) + ;; mule package isn't loaded + (or (fboundp 'encode-composition-rule) + (defun encode-composition-rule (rule) + 130)) + (or (fboundp 'find-composition) + (defun find-composition (pos &rest ignore) + nil)) + )) ;;;###autoload
--- a/lisp/ps-print.el Thu Nov 30 09:18:25 2006 +0000 +++ b/lisp/ps-print.el Thu Nov 30 10:03:25 2006 +0000 @@ -6,8 +6,8 @@ ;; Author: Jim Thompson (was <thompson@wg2.waii.com>) ;; Jacques Duthen (was <duthen@cegelec-red.fr>) ;; Vinicius Jose Latorre <viniciusjl@ig.com.br> -;; Kenichi Handa <handa@etl.go.jp> (multi-byte characters) -;; Maintainer: Kenichi Handa <handa@etl.go.jp> (multi-byte characters) +;; Kenichi Handa <handa@m17n.org> (multi-byte characters) +;; Maintainer: Kenichi Handa <handa@m17n.org> (multi-byte characters) ;; Vinicius Jose Latorre <viniciusjl@ig.com.br> ;; Keywords: wp, print, PostScript ;; Time-stamp: <2005/06/27 00:57:22 vinicius> @@ -1545,7 +1545,13 @@ (defun ps-face-background-name (face) (ps-xemacs-color-name (face-background face))) ) - (t ; emacs + ((<= emacs-major-version 21) ; emacs 20 & 21 + (defvar mark-active nil) + (defun ps-mark-active-p () + mark-active) + (defalias 'ps-face-foreground-name 'face-foreground) + (defalias 'ps-face-background-name 'face-background)) + (t ; emacs 22 or higher (defvar mark-active nil) (defun ps-mark-active-p () mark-active) @@ -3760,7 +3766,9 @@ "(setq ") key (if (> col len) - (make-string (- col len) ?\s) + ;; to keep compatibility with Emacs 20 & 21: + ;; DO NOT REPLACE `?\ ' BY `?\s' + (make-string (- col len) ?\ ) " ") (ps-value-string val)))) (t "")