X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lisp%2Futf-2000%2Fchar-db-util.el;h=104f52d8b6d41e4ad6a201863a0f895d7fd53baa;hb=9279e5e6f882d49e7c3143c33129f078408ccb68;hp=3495f53934dd7cab64512a993a95a545ea00aa11;hpb=ef816a94496b753bc4b4efaf6844378923d2189c;p=chise%2Fxemacs-chise.git.1 diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el index 3495f53..104f52d 100644 --- a/lisp/utf-2000/char-db-util.el +++ b/lisp/utf-2000/char-db-util.el @@ -909,7 +909,9 @@ ) ((and (not readable) (or (eq name '<-identical) - (string-match "^->simplified" (symbol-name name)))) + (string-match "^->simplified" (symbol-name name)) + (string-match "^->vulgar" (symbol-name name)) + )) ) ((or (eq name 'ideographic-structure) (eq name 'ideographic-) @@ -946,11 +948,8 @@ (setq required-features nil) (dolist (source sources) (cond - ((find-charset - (setq ret (intern (format "=%s" source)))) - (setq required-features - (cons ret required-features))) - ((memq source '(JP JP/Jouyou)) + ((memq source '(JP JP/Jouyou + shinjigen-1)) (setq required-features (union required-features '(=jis-x0208 @@ -965,7 +964,12 @@ (union required-features '(=gb2312 =gb12345 - =iso-ir165)))) + =iso-ir165))))) + (cond + ((find-charset + (setq ret (intern (format "=%s" source)))) + (setq required-features + (cons ret required-features))) (t (setq required-features (cons source required-features))))) (cond ((string-match "@JP" (symbol-name name))