From: tomo <tomo>
Date: Tue, 14 Dec 2004 07:50:51 +0000 (+0000)
Subject: (Vdisplay_coded_charset_priority_use_inheritance): New variable.
X-Git-Tag: r21-4-15-chise-0_21-32^2~105
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=2213c18b762e5c57b1b9e046da6d949e0dd9182f;p=chise%2Fxemacs-chise.git.1

(Vdisplay_coded_charset_priority_use_inheritance): New variable.
(Vdisplay_coded_charset_priority_use_hierarchy_order): Likewise.
(vars_of_mule_charset): Add new variable
`display-coded-charset-priority-use-inheritance' and
`display-coded-charset-priority-use-hierarchy-order'.
---

diff --git a/src/mule-charset.c b/src/mule-charset.c
index 0766df4..aa09e70 100644
--- a/src/mule-charset.c
+++ b/src/mule-charset.c
@@ -1344,6 +1344,8 @@ encode_builtin_char_1 (Emchar c, Lisp_Object* charset)
 }
 
 Lisp_Object Vdefault_coded_charset_priority_list;
+Lisp_Object Vdisplay_coded_charset_priority_use_inheritance;
+Lisp_Object Vdisplay_coded_charset_priority_use_hierarchy_order;
 #endif
 
 
@@ -3009,6 +3011,16 @@ Leading-code of private TYPE9N charset of column-width 1.
 	       &Vdefault_coded_charset_priority_list /*
 Default order of preferred coded-character-sets.
 */ );
+  Vdisplay_coded_charset_priority_use_inheritance = Qt;
+  DEFVAR_LISP ("display-coded-charset-priority-use-inheritance",
+	       &Vdisplay_coded_charset_priority_use_inheritance /*
+If non-nil, use character inheritance.
+*/ );
+  Vdisplay_coded_charset_priority_use_hierarchy_order = Qt;
+  DEFVAR_LISP ("display-coded-charset-priority-use-hierarchy-order",
+	       &Vdisplay_coded_charset_priority_use_hierarchy_order /*
+If non-nil, prefer nearest character in hierarchy order.
+*/ );
 #endif
 }