From c406be4337317c4ff4e60dc74a10921bd1102cac Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Thu, 16 Feb 2012 22:55:03 +0900 Subject: [PATCH] Make the default values of character properties name, old-name, and iso-10646-comment to nil. --- admin/ChangeLog | 6 ++++++ admin/unidata/unidata-gen.el | 14 +++++++------- lisp/ChangeLog | 7 +++++++ lisp/international/charprop.el | 6 ++++-- lisp/international/uni-comment.el | Bin 2407 -> 2386 bytes lisp/international/uni-name.el | Bin 158786 -> 158833 bytes lisp/international/uni-old-name.el | Bin 19713 -> 19760 bytes 7 files changed, 24 insertions(+), 9 deletions(-) diff --git a/admin/ChangeLog b/admin/ChangeLog index cc734d1393c..c7bfc0ddc6e 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,9 @@ +2012-02-16 Kenichi Handa + + * 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 * 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 713b0512e09..d9277217f0e 100644 --- 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 d8fdedfdbbd..f7ecfb529f2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2012-02-16 Kenichi Handa + + * international/charprop.el: + * international/uni-name.el: + * international/uni-old-name.el: + * international/uni-comment.el: Regenerate. + 2012-02-14 Glenn Morris * mail/smtpmail.el (smtpmail-query-smtp-server): Give it a doc. diff --git a/lisp/international/charprop.el b/lisp/international/charprop.el index 2424e87ae44..50226b1b773 100644 --- 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 GIT binary patch delta 322 zcmZ`!L2AP=5X7Q!5<&zGxToTSlVfP4T}iIv7y`NI9@;}#N*+?kBYfzsZz$v^{Y3uI zQ+FK z(87c-q=FD_%-3U{a3HYukr5I&FO-15)AfXakk|PpZ)RiP>bv2&fIH3E`gSsQ5$Uf`k Uc9&-DG5u=)(rr?lUxzF84@JU9w*UYD delta 358 zcmZ{eO-{ow5QSBXmQ)B!RALb!Ws%S>5Fp!QJ8IJ`y2AU4F2Y;|^$=MiaR#K`gd4Ep z8oUXu#DFM1zfwWAZeT98S>9Hr?Kfnk&78V~*$6a;|LhRxhX3pM)C{nfk{j ku|s~cbB}gR2_2ruT;0L0(QEpr$(t(6{%f*1%+DXx56HJqSO5S3 diff --git a/lisp/international/uni-name.el b/lisp/international/uni-name.el index 8b6816310672556fb0205b845f2f71fc6edbcd7e..c3e5f2e5907209828794f13b0b5b04c7b96c6a66 100644 GIT binary patch delta 419 zcmX?fgY)AJ&W0_FMROQywwKLeoW~@i#~Wj0V9pU^WNH9pn2IrR#26cxg@M`At>!Z- z*BjUZImR)@CMJwA#)d}RK*BgiDaP2?&_m9O6G$6H#TXeH3IbWiF-9h)AR!RL3`m>6 z1V9WkIcqr^Ia{ExDG;0SS%GZw;Is7rnh#WLUEmXyUY5M>v^JH$opf^fw}EJS5@XZMcea)sUYf<+h*dn>Ia{sYS^3?}{uA-$!I zZT^O(oo@~UHa0tN-^a}RTIcWU{P9iQ&9~TFySksN7kvy^Jt!u!=exjl#y(mAI@B4H zt*(09oh{UG=34nMMT>y*J9vmoWPK{eIVMfnJGT!M*oP>TfC@8i2mw{m6qBL_EmCd9 zaw(ZMVLuq>`a(jxkjx~RMhxBOLT%58dJ#^~6iA5+1x$09j!uOgXfuLhf6LZVR_+96 zM)~lM!}pF%|09#gaj=mC(pYj3r+6#o;R)m#S=(JN)w3?k?t7^&R_&{L`sns<_010~ C`dEtq diff --git a/lisp/international/uni-old-name.el b/lisp/international/uni-old-name.el index de2d67b9450eb80f6203f5f09bf8e632fc63db95..6165eba61cc10d6443bb26c7ea9bacc223b95fde 100644 GIT binary patch delta 411 zcmZ`!%Syvg5GA3DR`Eg??Ls7k#El{)_ZiwG(uIpG-1%6P*#w$uAw*~sS3=QW$WFy? z5c)fQj5E=K8{yuWGv}N;Gxzz``ot4+>uEdXANJAc07MXWLFfR19@<@yfw^sQ(^38= zNDxbqN?9Pe*vBBj11WjxOnR8b3}h+Ghzoe8{?L{bq%dclN4v;p8v-o z+7ET?e`HCr9_-}4!spmU&oCGO|Fk*RZ_SsUTHf~1ybLeghm~6{i_zZoeeOPHMV(XW kuB)t^uiXWz6$e z6%ES5!6HxY1P@D%R+p;943(GSh|WM>oDV7~MAUE)6k^p?eKkN67U+uzLDg&pg@qIAPD3=5T`P9@FKms%38GaP057t)8o!Jem2d`IB%{qR9WT pS?y3B?9!thQ^FEY6lrc?x9GLwb@<5Zdi)Ca+vE6lK7K#E>;XtYQ@sEH -- 2.39.2