Mercurial > emacs
comparison lisp/language/japanese.el @ 112330:56d3e9c28eb0
Merge from mainline.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Mon, 17 Jan 2011 11:01:01 -0800 |
| parents | ef719132ddfa |
| children |
comparison
equal
deleted
inserted
replaced
| 112329:e36b2f5d36cd | 112330:56d3e9c28eb0 |
|---|---|
| 272 (set-char-table-range composition-function-table '(#xFE00 . #xFE0F) elt) | 272 (set-char-table-range composition-function-table '(#xFE00 . #xFE0F) elt) |
| 273 (set-char-table-range composition-function-table '(#xE0100 . #xE01EF) elt)) | 273 (set-char-table-range composition-function-table '(#xE0100 . #xE01EF) elt)) |
| 274 | 274 |
| 275 (provide 'japanese) | 275 (provide 'japanese) |
| 276 | 276 |
| 277 ;; arch-tag: 450f5537-9d53-4d5e-b731-4cf116d8cbc9 | |
| 278 ;;; japanese.el ends here | 277 ;;; japanese.el ends here |