merge trunk

diff --git a/admin/ChangeLog b/admin/ChangeLog
index cc734d1393cb9a86382ed1fc91c4cbc1eb950d80..c7bfc0ddc6e714bd94eecdaf6282544773631361 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-16  Kenichi Handa  <handa@m17n.org>
+
+       * unidata/unidata-gen.el (unidata-prop-alist): Change the default
+       values of name and old-name to nil.
+       (unidata-get-name): Return nil for the default value.
+
 2012-02-11  Glenn Morris  <rgm@gnu.org>
 
        * admin.el (cusver-find-files, cusver-scan, cusver-goto-xref)

diff --git a/admin/unidata/unidata-gen.el b/admin/unidata/unidata-gen.el
index 713b0512e092414a395a16c1d4238b26cb782088..d9277217f0e30688b98c96c411b3f1d856c15d2c 100644 (file)
--- a/admin/unidata/unidata-gen.el
+++ b/admin/unidata/unidata-gen.el
@@ -166,9 +166,10 @@
   '((name
      1 unidata-gen-table-name "uni-name.el"
      "Unicode character name.
-Property value is a string."
+Property value is a string or nil.
+The value nil stands for the default value \"null string\")."
      nil
-     "")
+     nil)
     (general-category
      2 unidata-gen-table-symbol "uni-category.el"
      "Unicode general category.
@@ -235,7 +236,8 @@ Property value is a symbol `Y' or `N'.  See also the property `mirroring'."
     (old-name
      10 unidata-gen-table-name "uni-old-name.el"
      "Unicode old names as published in Unicode 1.0.
-Property value is a string.")
+Property value is a string or nil.
+The value nil stands for the default value \"null string\").")
     (iso-10646-comment
      11 unidata-gen-table-name "uni-comment.el"
      "Unicode ISO 10646 comment.
@@ -712,7 +714,7 @@ is the character itself.")))
            (aset table c name)
            (if (= c char)
                (setq val name))))
-       (or val ""))))
+       val)))
 
    ((and (integerp val) (> val 0))
     (let* ((symbol-table (aref (char-table-extra-slot table 4) 1))
@@ -738,9 +740,7 @@ is the character itself.")))
            ((eq sym 'CJK\ COMPATIBILITY\ IDEOGRAPH)
             (format "%s-%04X" sym char))
            ((eq sym 'VARIATION\ SELECTOR)
-            (format "%s-%d" sym (+ (- char #xe0100) 17))))))
-
-   (t "")))
+            (format "%s-%d" sym (+ (- char #xe0100) 17))))))))
 
 ;; Store VAL as the name of CHAR in TABLE.
 

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2e16e59c2d5c4c202492f0039ffd12b71c9af033..e2e45bf15354826bfa0ba2ed7e5fa6cabdd6707b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2012-02-17  Kenichi Handa  <handa@m17n.org>
+
+       * international/charprop.el:
+       * international/uni-name.el:
+       * international/uni-old-name.el:
+       * international/uni-comment.el: Regenerate.
+
 2012-02-16  Glenn Morris  <rgm@gnu.org>
 
        * calendar/cal-hebrew.el (calendar-hebrew-list-yahrzeits):

diff --git a/lisp/international/charprop.el b/lisp/international/charprop.el
index 2424e87ae4472a182be52b76a6efd957b2cf8506..50226b1b7736c634d374fd1605fcebf0fd2a93ab 100644 (file)
--- a/lisp/international/charprop.el
+++ b/lisp/international/charprop.el
@@ -2,7 +2,8 @@
 ;; FILE: uni-name.el
 (define-char-code-property 'name "uni-name.el"
   "Unicode character name.
-Property value is a string.")
+Property value is a string or nil.
+The value nil stands for the default value \"null string\").")
 ;; FILE: uni-category.el
 (define-char-code-property 'general-category "uni-category.el"
   "Unicode general category.
@@ -48,7 +49,8 @@ Property value is a symbol `Y' or `N'.  See also the property `mirroring'.")
 ;; FILE: uni-old-name.el
 (define-char-code-property 'old-name "uni-old-name.el"
   "Unicode old names as published in Unicode 1.0.
-Property value is a string.")
+Property value is a string or nil.
+The value nil stands for the default value \"null string\").")
 ;; FILE: uni-comment.el
 (define-char-code-property 'iso-10646-comment "uni-comment.el"
   "Unicode ISO 10646 comment.

diff --git a/lisp/international/uni-comment.el b/lisp/international/uni-comment.el
index 21ccfe3ffe796615789e624a8dff14f3d24e2dd0..c9743064bd4751703bdd5e1a27e84305743e0f5f 100644 (file)
Binary files a/lisp/international/uni-comment.el and b/lisp/international/uni-comment.el differ

diff --git a/lisp/international/uni-name.el b/lisp/international/uni-name.el
index 8b6816310672556fb0205b845f2f71fc6edbcd7e..c3e5f2e5907209828794f13b0b5b04c7b96c6a66 100644 (file)
Binary files a/lisp/international/uni-name.el and b/lisp/international/uni-name.el differ

diff --git a/lisp/international/uni-old-name.el b/lisp/international/uni-old-name.el
index de2d67b9450eb80f6203f5f09bf8e632fc63db95..6165eba61cc10d6443bb26c7ea9bacc223b95fde 100644 (file)
Binary files a/lisp/international/uni-old-name.el and b/lisp/international/uni-old-name.el differ