merge from trunk, fix conflicts
[emacs.git] / lisp / international / uni-numeric.el
blob278ad683fe43bc553af50d891ccdedad6f22f5d2
1 ;; Copyright (C) 1991-2009, 2010 Unicode, Inc.
2 ;; This file was generated from the Unicode data file at
3 ;; http://www.unicode.org/Public/UNIDATA/UnicodeData.txt.
4 ;; See lisp/international/README for the copyright and permission notice.
5 (define-char-code-property 'numeric-value #^[nil nil char-code-property-table "