Mercurial > emacs
comparison src/dispextern.h @ 110990:7b9f631537db
merge emacs-23
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Thu, 14 Oct 2010 11:06:31 +0900 |
parents | e0f89e89ed02 |
children | a9fb26c764e7 |
comparison
equal
deleted
inserted
replaced
110984:287d5a665560 | 110990:7b9f631537db |
---|---|
1871 EMACS_INT stop_pos; | 1871 EMACS_INT stop_pos; |
1872 /* ID number of the composition or glyph-string. If negative, we | 1872 /* ID number of the composition or glyph-string. If negative, we |
1873 are not iterating over a composition now. */ | 1873 are not iterating over a composition now. */ |
1874 int id; | 1874 int id; |
1875 /* If non-negative, character that triggers the automatic | 1875 /* If non-negative, character that triggers the automatic |
1876 composition at `stop_pos', and this is an automatic compositoin. | 1876 composition at `stop_pos', and this is an automatic composition. |
1877 If negative, this is a static composition. This is set to -2 | 1877 If negative, this is a static composition. This is set to -2 |
1878 temporarily if searching of composition reach a limit or a | 1878 temporarily if searching of composition reach a limit or a |
1879 newline. */ | 1879 newline. */ |
1880 int ch; | 1880 int ch; |
1881 /* If this an automatic composition, how many characters to look back | 1881 /* If this an automatic composition, how many characters to look back |