Use find-file-hook instead of find-file-hooks.

[bpt/emacs.git] / lisp / ps-def.el

diff --git a/lisp/ps-def.el b/lisp/ps-def.el
index f11d716..30453f8 100644 (file)
--- a/lisp/ps-def.el
+++ b/lisp/ps-def.el
@@ -1,20 +1,19 @@
 ;;; ps-def.el --- XEmacs and Emacs definitions for ps-print
 
-;; Copyright (C) 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2007, 2008 Free Software Foundation, Inc.
 
 ;; 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
-;; Version: 7.2
 ;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
 
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify it under
 ;; the terms of the GNU General Public License as published by the Free
-;; Software Foundation; either version 2, or (at your option) any later
+;; Software Foundation; either version 3, or (at your option) any later
 ;; version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful, but WITHOUT ANY
@@ -40,14 +39,14 @@
 
 
 (cond
- ((featurep 'xemacs)                   ; xemacs
+ ((featurep 'xemacs)                   ; XEmacs
 
 
   ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
   ;; ps-bdf
 
   (defvar installation-directory nil)
-  (defvar coding-system-for-read nil)
+  (defvar coding-system-for-read)
 
 
   ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -165,8 +164,7 @@
     (ps-xemacs-color-name (face-background face)))
 
 
-  (defun ps-frame-parameter (param)
-    (frame-property nil param))
+  (defalias 'ps-frame-parameter 'frame-property)
 
 
   ;; Return t if the device (which can be changed during an emacs session)
@@ -207,9 +205,8 @@
 
 
   ;; to avoid XEmacs compilation gripes
-  (defvar coding-system-for-write   nil)
-  (defvar coding-system-for-read    nil)
-  (defvar buffer-file-coding-system nil)
+  (defvar coding-system-for-write)
+  (defvar buffer-file-coding-system)
 
 
   (and (fboundp 'find-coding-system)
@@ -243,6 +240,15 @@
        (memq face ps-italic-faces)))   ; Kludge-compatible
 
 
+  (defalias 'ps-face-strikeout-p 'ignore)
+
+
+  (defalias 'ps-face-overline-p 'ignore)
+
+
+  (defalias 'ps-face-box-p 'ignore)
+
+
   ;; XEmacs will have to make do with %s (princ) for floats.
   (defvar ps-color-format "%s %s %s")
   (defvar ps-float-format "%s ")
@@ -299,7 +305,7 @@
       (ps-plot-with-face from to face)))
 
   )
- (t                                    ; emacs
+ (t                                    ; Emacs
   ;; Do nothing
   ))                                   ; end cond featurep
 
@@ -311,17 +317,15 @@
 
 
 (cond
- ((featurep 'xemacs)                   ; xemacs
+ ((featurep 'xemacs)                   ; XEmacs
   ;; Do nothing
   )
- (t                                    ; emacs
+ (t                                    ; Emacs
 
 
   ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
   ;; ps-print
 
-  (defvar mark-active nil)
-
 
   (defun ps-mark-active-p ()
     mark-active)
@@ -335,8 +339,7 @@
     (face-background face nil t))
 
 
-  (defun ps-frame-parameter (param)
-    (frame-parameter nil param))
+  (defalias 'ps-frame-parameter 'frame-parameter)
 
 
   ;; Return t if the device (which can be changed during an emacs session) can
@@ -367,6 +370,18 @@
        (memq face ps-italic-faces)))
 
 
+  (defun ps-face-strikeout-p (face)
+    (eq (face-attribute face :strike-through) t))
+
+
+  (defun ps-face-overline-p (face)
+    (eq (face-attribute face :overline) t))
+
+
+  (defun ps-face-box-p (face)
+    (not (memq (face-attribute face :box) '(nil unspecified))))
+
+
   ;; Emacs understands the %f format; we'll use it to limit color RGB values
   ;; to three decimals to cut down some on the size of the PostScript output.
   (defvar ps-color-format "%0.3f %0.3f %0.3f")