(dired-do-create-files): On DOS/Windows, allow to

[gnu-emacs] / lisp / ps-mule.el

diff --git a/lisp/ps-mule.el b/lisp/ps-mule.el
index fa6a1ac55cc5297e04e6080dec7646e4932a8f95..7cf3c781242d91a94fa57db67232bcbf0bdacfc9 100644 (file)
--- a/lisp/ps-mule.el
+++ b/lisp/ps-mule.el
@@ -1,13 +1,13 @@
 ;;; ps-mule.el --- Provide multi-byte character facility to ps-print.
 
-;; Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
 
 ;; Author:     Vinicius Jose Latorre <vinicius@cpqd.com.br>
 ;; Author:     Kenichi Handa <handa@etl.go.jp> (multi-byte characters)
 ;; Maintainer: Kenichi Handa <handa@etl.go.jp> (multi-byte characters)
 ;; Maintainer: Vinicius Jose Latorre <vinicius@cpqd.com.br>
 ;; Keywords:   wp, print, PostScript, multibyte, mule
-;; Time-stamp: <99/12/11 20:09:24 vinicius>
+;; Time-stamp: <2000/08/01 11:17:35 vinicius>
 
 ;; This file is part of GNU Emacs.
 
@@ -136,8 +136,8 @@ Valid values are:
                          `ps-header-font-family' and `ps-font-info-database'.
 
 Any other value is treated as nil."
-  :type '(choice (const non-latin-printer) (const bdf-font)
-                (const bdf-font-except-latin) (other :tag "nil" nil))
+  :type '(choice (const non-latin-printer)     (const bdf-font)
+                (const bdf-font-except-latin) (const :tag "nil" nil))
   :group 'ps-print-font)
 
 
@@ -226,20 +226,8 @@ See also the variable `ps-font-info-database'.")
 
 (defcustom ps-mule-font-info-database-default
   ps-mule-font-info-database-latin
-  "*The default setting to use if `ps-multibyte-buffer' is nil."
-  :type '(repeat :tag "Multi-Byte Buffer Database Font Default"
-                (list (symbol :tag "Charset")
-                      (repeat :inline t
-                              (list (choice :tag "Font Type"
-                                            (const normal) (const bold)
-                                            (const italic) (const bold-italic))
-                                    (choice :tag "Font Source"
-                                            (const builtin) (const ps-bdf)
-                                            (const vflib)
-                                            (other :tag "nil" nil))
-                                    (list (string :tag "Font Name"))
-                                    (function :tag "Encoding")
-                                    (integer :tag "Bytes")))))
+  "*The default setting to use when `ps-multibyte-buffer' is nil."
+  :type '(symbol :tag "Multi-Byte Buffer Database Font Default")
   :group 'ps-print-font)
 
 (defconst ps-mule-font-info-database-ps
@@ -349,7 +337,8 @@ Currently, data for Japanese and Korean PostScript printers are listed.")
     (indian-2-column
      (normal bdf ("ind24-mule.bdf" "mule-indian-24.bdf") ps-mule-encode-7bit 2))
     (tibetan
-     (normal bdf ("tib24-mule.bdf" "mule-tibmdx-24.bdf") ps-mule-encode-7bit 2)))
+     (normal bdf ("tib24p-mule.bdf" "tib24-mule.bdf" "mule-tibmdx-24.bdf")
+            ps-mule-encode-7bit 2)))
   "Sample setting of the `ps-mule-font-info-database' to use BDF fonts.
 BDF (Bitmap Distribution Format) is a format used for distributing X's font
 source file.