merge from trunk, fix conflicts
[emacs.git] / lisp / international / uni-combining.el
blob1aca7ee1d116436537e50712a10d74a965de1938
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 'canonical-combining-class #^[nil nil char-code-property-table 0 #^^[1 0 #^^[2 0 0 0 0 0 0 0 "\x02•\x03\x04„\x03\x05\x04…\x06\x06\x04„\x06\x06\x04‹\a…\x04„\x02ˆ\b\x02\x04ƒ\x02ƒ\x04\x04\x01\x02ƒ\x04„\x02\x03\x04\x04\x02
9 \x02\x01ˆ