(select-safe-coding-system): Check coding-category-list more rigidly.

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

diff --git a/lisp/ps-bdf.el b/lisp/ps-bdf.el
index 93e716c..4415846 100644 (file)
--- a/lisp/ps-bdf.el
+++ b/lisp/ps-bdf.el
@@ -1,11 +1,11 @@
 ;;; ps-bdf.el --- BDF font file handler for ps-print.
 
-;; Copyright (C) 1998 Electrotechnical Laboratory, JAPAN.
+;; Copyright (C) 1998, 1999 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
 
-;; Keywords: BDF, font, PostScript
+;; Keywords: wp, BDF, font, PostScript
 ;; Maintainer: Kenichi Handa <handa@etl.go.jp>
-;; Time-stamp: <98/11/26 15:09:23 kenichi>
+;; Time-stamp: <99/02/27 11:14:07 kenichi>
 
 ;; This file is part of GNU Emacs.
 
@@ -35,8 +35,17 @@
 
 ;;;###autoload
 (defvar bdf-directory-list
-  nil
-  "*List of directories to search for `BDF' font files.")
+  (if (eq system-type 'ms-dos)
+      (list (expand-file-name "fonts/bdf" installation-directory))
+    '("/usr/local/share/emacs/fonts/bdf"))
+  "*List of directories to search for `BDF' font files.
+The default value is '(\"/usr/local/share/emacs/fonts/bdf\").")
+
+;; MS-DOS users like to move the binary around after it's built, but
+;; the value above is computed at loadup time.
+(and (eq system-type 'ms-dos)
+     (setq bdf-directory-list
+          (list (expand-file-name "fonts/bdf" installation-directory))))
 
 (defun bdf-expand-file-name (bdfname)
   "Return an abosolute path name of a `BDF' font file BDFNAME.
@@ -231,7 +240,7 @@ CODE, where N and CODE are in the following relation:
          (setq size (read (current-buffer)))
          ;; The following kludgy code is t avoid bugs of several
          ;; fonts which have wrong SIZE record.
-         (and (<= size (/ (aref font-bounding-box 1) 2))
+         (and (<= size (/ (aref font-bounding-box 1) 3))
               (setq size (aref font-bounding-box 1)))
 
          (setq default-char (bdf-search-and-read "\nDEFAULT_CHAR" nil))