diff options
| author | Vinicius Jose Latorre <viniciusjl@ig.com.br> | 2005-03-19 04:11:54 +0000 |
|---|---|---|
| committer | Vinicius Jose Latorre <viniciusjl@ig.com.br> | 2005-03-19 04:11:54 +0000 |
| commit | a3eb49580b8baf3a4639711c078676d80670f3c9 (patch) | |
| tree | 68efb756847d68127a03d83d2e23e84ced21ea5b | |
| parent | 3e15845a51a094ddee68d4726411064db397e1ab (diff) | |
| download | emacs-a3eb49580b8baf3a4639711c078676d80670f3c9.tar.gz | |
Use functionp instead symbolp and fboundp.
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/ps-print.el | 14 |
2 files changed, 14 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 43dc9d7bfbc..740c82b9059 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2005-03-19 Vinicius Jose Latorre <viniciusjl@ig.com.br> + + * ps-print.el (ps-generate-string-list, ps-generate-header-line): Use + functionp instead of symbolp and fboundp. Reported by Drkm + <darkman_spam@yahoo.fr>. + (ps-print-version): New version 6.6.6. + 2005-03-18 Tak Ota <Takaaki.Ota@am.sony.com> * textmodes/table.el (table--line-column-position): New idiom. diff --git a/lisp/ps-print.el b/lisp/ps-print.el index d8c8f1f6ded..c99b12acc0e 100644 --- a/lisp/ps-print.el +++ b/lisp/ps-print.el @@ -1,7 +1,7 @@ ;;; ps-print.el --- print text from the buffer as PostScript ;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -;; 2003, 2004 Free Software Foundation, Inc. +;; 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Jim Thompson (was <thompson@wg2.waii.com>) ;; Jacques Duthen (was <duthen@cegelec-red.fr>) @@ -10,12 +10,12 @@ ;; Maintainer: Kenichi Handa <handa@etl.go.jp> (multi-byte characters) ;; Vinicius Jose Latorre <viniciusjl@ig.com.br> ;; Keywords: wp, print, PostScript -;; Time-stamp: <2004/07/21 23:12:05 vinicius> -;; Version: 6.6.5 +;; Time-stamp: <2005/03/19 00:40:12 vinicius> +;; Version: 6.6.6 ;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/ -(defconst ps-print-version "6.6.5" - "ps-print.el, v 6.6.5 <2004/07/21 vinicius> +(defconst ps-print-version "6.6.6" + "ps-print.el, v 6.6.6 <2004/07/21 vinicius> Vinicius's last change version -- this file may have been edited as part of Emacs without changes to the version number. When reporting bugs, please also @@ -4831,7 +4831,7 @@ page-height == ((floor print-height ((th + ls) * zh)) * ((th + ls) * zh)) - th ((stringp (car content)) (car content)) ;; function symbol - ((and (symbolp (car content)) (fboundp (car content))) + ((functionp (car content)) (concat "(" (funcall (car content)) ")")) ;; variable symbol ((and (symbolp (car content)) (boundp (car content))) @@ -4869,7 +4869,7 @@ page-height == ((floor print-height ((th + ls) * zh)) * ((th + ls) * zh)) - th ;; Functions are called -- they should return strings; they will be inserted ;; as strings and the PS string delimiters added. - ((and (symbolp content) (fboundp content)) + ((functionp content) (ps-output-string (ps-mule-encode-header-string (funcall content) fonttag))) |