From: tomo <tomo>
Date: Mon, 29 Sep 2003 12:37:43 +0000 (+0000)
Subject: Sync up with r21-4-12-chise-0_21-pre7.
X-Git-Tag: r21-4-12-chise-0_21-pre7-a2-for-libchise-b1
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b4e8aed21a6f366f7728326029aa1b28109e60e;p=chise%2Fxemacs-chise.git-

Sync up with r21-4-12-chise-0_21-pre7.
---

diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog
index fe929de..b14579a 100644
--- a/lisp/utf-2000/ChangeLog
+++ b/lisp/utf-2000/ChangeLog
@@ -2,6 +2,16 @@
 
 	* close-cdb.el: Call `close-char-data-source'.
 
+2003-09-27  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R108-Dish.el (U-00025085): Separated from M-23493 and
+	copied from Ideograph-R109-Eye.el; use `ideographic-radical@cns'
+	instead of `ideographic-radical'; add `ideographic-radical@ucs'
+	for R108-Dish.
+
+	* Ideograph-R109-Eye.el (M-23493): Unify U-00025204 instead of
+	C6-5F4B and U-00025085.
+
 2003-08-23  MORIOKA Tomohiko  <tomo@mousai.as.wakwak.ne.jp>
 
 	* Ideograph-R167-Gold.el (M-40693): Separate J0-3379, C2-637E and
diff --git a/lisp/utf-2000/Ideograph-R108-Dish.el b/lisp/utf-2000/Ideograph-R108-Dish.el
index 49c6908..48a4896 100644
--- a/lisp/utf-2000/Ideograph-R108-Dish.el
+++ b/lisp/utf-2000/Ideograph-R108-Dish.el
@@ -1072,6 +1072,15 @@
     (=ucs		. #x76E3)	; 監
     ))
 (define-char
+  '((morohashi-daikanwa	23493 0 9)
+    (ideographic-radical@ucs . 108)	; ⽫
+    (ideographic-radical@cns . 109)	; ⽬
+    (ideographic-strokes . 9)
+    (total-strokes	 . 14)
+    (=cns11643-6	. #x5F4B)	; ø»ž
+    (=ucs		. #x25085)	; 𥂅
+    ))
+(define-char
   '((ideographic-radical . 108)	; ⽫
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
diff --git a/lisp/utf-2000/Ideograph-R109-Eye.el b/lisp/utf-2000/Ideograph-R109-Eye.el
index 2ddb780..de98898 100644
--- a/lisp/utf-2000/Ideograph-R109-Eye.el
+++ b/lisp/utf-2000/Ideograph-R109-Eye.el
@@ -4770,26 +4770,34 @@
     (ideographic-radical . 109)	; ⽬
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
-    (hanyu-dazidian	4 2500 11)
     (=cns11643-4	. #x4542)	; ø»˜–
     (=daikanwa		. 23492)	; ø¸…¯„
-    (=hanziku-7		. #xAEDC)	; ý¢º»œ
+    (=jef-china3	. #x5BD6)	; øº…¯–
     ))
 (define-char
   '((morohashi-daikanwa	23492 0 1)
     (ideographic-radical . 109)	; ⽬
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
+    (hanyu-dazidian	4 2500 11)
     (=jis-x0212		. #x4F25)	; ø»‹§¸
-    (=jef-china3	. #x5BD6)	; øº…¯–
+    (=hanziku-7		. #xAEDC)	; ý¢º»œ
     (=ucs		. #x7770)	; 睰
     ))
 (define-char
   '((ideographic-radical . 109)	; ⽬
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
-    (=cns11643-6	. #x5F4B)	; ø»ž
     (=daikanwa		. 23493)	; ø¸…¯…
+    (=ucs		. #x25204)	; 𥈄
+    ))
+(define-char
+  '((morohashi-daikanwa	23493 0 9)
+    (ideographic-radical@ucs . 108)	; ⽫
+    (ideographic-radical@cns . 109)	; ⽬
+    (ideographic-strokes . 9)
+    (total-strokes	 . 14)
+    (=cns11643-6	. #x5F4B)	; ø»ž
     (=ucs		. #x25085)	; 𥂅
     ))
 (define-char
diff --git a/lock/.precious b/lock/.precious
new file mode 100644
index 0000000..1650a2e
--- /dev/null
+++ b/lock/.precious
@@ -0,0 +1 @@
+Dummy file to keep CVS happy.
diff --git a/src/s/cygwin.sc b/src/s/cygwin.sc
new file mode 100755
index 0000000..ad54ac7
--- /dev/null
+++ b/src/s/cygwin.sc
@@ -0,0 +1,112 @@
+/* Default linker script, for normal executables */
+OUTPUT_FORMAT(pei-i386)
+SEARCH_DIR("/usr/i686-pc-cygwin/lib"); SEARCH_DIR("/usr/lib"); SEARCH_DIR("/usr/lib/w32api");
+ENTRY(_mainCRTStartup)
+SECTIONS
+{
+  .text  __image_base__ + __section_alignment__  :
+  {
+     *(.init)
+    *(.text)
+    *(SORT(.text$*))
+    *(.glue_7t)
+    *(.glue_7)
+     ___CTOR_LIST__ = .; __CTOR_LIST__ = . ;
+			LONG (-1); *(SORT(.ctors.*)); *(.ctors); *(.ctor); LONG (0);
+     ___DTOR_LIST__ = .; __DTOR_LIST__ = . ;
+			LONG (-1); *(SORT(.dtors.*)); *(.dtors); *(.dtor);  LONG (0);
+     *(.fini)
+    /* ??? Why is .gcc_exc here?  */
+     *(.gcc_exc)
+     etext = .;
+    *(.gcc_except_table)
+  }
+  /* The Cygwin32 library uses a section to avoid copying certain data
+     on fork.  This used to be named ".data".  The linker used
+     to include this between __data_start__ and __data_end__, but that
+     breaks building the cygwin32 dll.  Instead, we name the section
+     ".data_cygwin_nocopy" and explictly include it after __data_end__. */
+  .data BLOCK(__section_alignment__) :
+  {
+    __data_start__ = . ;
+    *(.data)
+    *(.data2)
+    *(SORT(.data$*))
+    __data_end__ = . ;
+    *(.data_cygwin_nocopy)
+  }
+  .bss BLOCK(__section_alignment__) :
+  {
+    __bss_start__ = . ;
+    *(.bss)
+    *(COMMON)
+    __bss_end__ = . ;
+  }
+  .rdata BLOCK(__section_alignment__) :
+  {
+    *(.rdata)
+    *(SORT(.rdata$*))
+    *(.eh_frame)
+    ___RUNTIME_PSEUDO_RELOC_LIST__ = .;
+    __RUNTIME_PSEUDO_RELOC_LIST__ = .;
+    *(.rdata_runtime_pseudo_reloc)
+    ___RUNTIME_PSEUDO_RELOC_LIST_END__ = .;
+    __RUNTIME_PSEUDO_RELOC_LIST_END__ = .;
+  }
+  .pdata BLOCK(__section_alignment__) :
+  {
+    *(.pdata)
+  }
+  .edata BLOCK(__section_alignment__) :
+  {
+    *(.edata)
+  }
+  /DISCARD/ :
+  {
+    *(.debug$S)
+    *(.debug$T)
+    *(.debug$F)
+    *(.drectve)
+  }
+  .idata BLOCK(__section_alignment__) :
+  {
+    /* This cannot currently be handled with grouped sections.
+	See pe.em:sort_sections.  */
+    SORT(*)(.idata$2)
+    SORT(*)(.idata$3)
+    /* These zeroes mark the end of the import list.  */
+    LONG (0); LONG (0); LONG (0); LONG (0); LONG (0);
+    SORT(*)(.idata$4)
+    SORT(*)(.idata$5)
+    SORT(*)(.idata$6)
+    SORT(*)(.idata$7)
+  }
+  .CRT BLOCK(__section_alignment__) :
+  {
+    *(SORT(.CRT$*))
+  }
+  .endjunk BLOCK(__section_alignment__) :
+  {
+    /* end is deprecated, don't use it */
+     end = .;
+     _end = .;
+     __end__ = .;
+  }
+  .rsrc BLOCK(__section_alignment__) :
+  {
+    *(.rsrc)
+    *(SORT(.rsrc$*))
+  }
+  .reloc BLOCK(__section_alignment__) :
+  {
+    *(.reloc)
+  }
+  .stab BLOCK(__section_alignment__) (NOLOAD) :
+  {
+    [ .stab ]
+  }
+  .stabstr BLOCK(__section_alignment__) (NOLOAD) :
+  {
+    [ .stabstr ]
+  }
+}