From: hayashi <hayashi>
Date: Fri, 30 Nov 2001 07:01:13 +0000 (+0000)
Subject: Now portable dumper somewhat works with XEmacs UTF-2000.
X-Git-Tag: r21-2-43-utf-2000-0_18-3~215
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=ab1dd06e0177737fcb5880921865f2c541dfca5f;p=chise%2Fxemacs-chise.git

Now portable dumper somewhat works with XEmacs UTF-2000.

* dumper.c (PDUMP_HASH_SIZE): Increase the size of hash table when
utf-2000.

* ioslated-char.el: Disable undo in temporary buffer.
Otherwise, pdump will complain about buffer being undumpable object.
---

diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog
index abb9f25..fe25b78 100644
--- a/lisp/utf-2000/ChangeLog
+++ b/lisp/utf-2000/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-30  Yoshiki Hayashi  <yoshiki@xemacs.org>
+
+	* ioslated-char.el: Disable undo in temporary buffer.
+	Otherwise, pdump will complain about buffer being undumpable object.
+
 2001-11-29  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
 	* Ideograph-R131-Minister.el (C3-2A5C): Separated from U+5367 and
diff --git a/lisp/utf-2000/isolated-char.el b/lisp/utf-2000/isolated-char.el
index c765135..22e6449 100644
--- a/lisp/utf-2000/isolated-char.el
+++ b/lisp/utf-2000/isolated-char.el
@@ -171,8 +171,9 @@
 
 ;; GT 2000
 
-(let ((buf (find-file-noselect "../etc/GT-RS.txt")))
-  (with-current-buffer buf
+(with-temp-buffer
+  (buffer-disable-undo)
+  (insert-file-contents "../etc/GT-RS.txt")
     (goto-char (point-min))
     (let (gt-code radical strokes plane code)
       (while (re-search-forward "\\([0-9]+\\),\\([0-9]+\\),\\([0-9]+\\),GT\\([0-9]+\\),....,\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]\\)" nil t)
@@ -183,7 +184,6 @@
 			    (intern (format "ideograph-gt-pj-%d" plane))
 			    code)
 	)))
-  (kill-buffer buf))
 
 (define-char
   '((ideograph-gt-pj-1	. #x3F6B)
diff --git a/src/ChangeLog b/src/ChangeLog
index ddb4bc9..0a455e6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-30  Yoshiki Hayashi  <yoshiki@xemacs.org>
+
+	* dumper.c (PDUMP_HASH_SIZE): Increase the size of hash table when
+	utf-2000.
+
 2001-11-20  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
 	* mule-charset.c (put_char_ccs_code_point): Return canonicalized
diff --git a/src/dumper.c b/src/dumper.c
index 137ce96..56787a1 100644
--- a/src/dumper.c
+++ b/src/dumper.c
@@ -246,7 +246,11 @@ static size_t max_size;
 static int pdump_fd;
 static void *pdump_buf;
 
+#ifdef UTF2000
+#define PDUMP_HASHSIZE 20000001
+#else
 #define PDUMP_HASHSIZE 200001
+#endif
 
 static pdump_entry_list_elmt **pdump_hash;