Mercurial > emacs
changeset 60129:cd9e37256a95
(enum it_method): New enum.
(GET_FROM_*): Its members.
(struct it): Change member method from function pointer to enum.
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Wed, 16 Feb 2005 23:44:48 +0000 |
parents | d5150d6da58f |
children | f513e6d34868 |
files | src/dispextern.h |
diffstat | 1 files changed, 12 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/dispextern.h Wed Feb 16 23:44:28 2005 +0000 +++ b/src/dispextern.h Wed Feb 16 23:44:48 2005 +0000 @@ -1786,6 +1786,16 @@ Lisp_Object height; }; +enum it_method { + GET_FROM_BUFFER = 0, + GET_FROM_DISPLAY_VECTOR, + GET_FROM_COMPOSITION, + GET_FROM_STRING, + GET_FROM_C_STRING, + GET_FROM_IMAGE, + GET_FROM_STRETCH, + NUM_IT_METHODS +}; struct it { @@ -1796,9 +1806,8 @@ /* The window's frame. */ struct frame *f; - /* Function to call to load this structure with the next display - element. */ - int (* method) P_ ((struct it *it)); + /* Method to use to load this structure with the next display element. */ + enum it_method method; /* The next position at which to check for face changes, invisible text, overlay strings, end of text etc., which see. */