Mercurial > emacs
diff src/xdisp.c @ 96516:081de60dd1a7
(get_it_property): Move out of HAVE_WINDOW_SYSTEM
section.
author | Andreas Schwab <schwab@suse.de> |
---|---|
date | Sat, 05 Jul 2008 09:45:56 +0000 |
parents | a8382026762a |
children | 77765b604664 |
line wrap: on
line diff
--- a/src/xdisp.c Sat Jul 05 09:36:39 2008 +0000 +++ b/src/xdisp.c Sat Jul 05 09:45:56 2008 +0000 @@ -16386,6 +16386,25 @@ } } +/* Return the character-property PROP at the current position in IT. */ + +static Lisp_Object +get_it_property (it, prop) + struct it *it; + Lisp_Object prop; +{ + Lisp_Object position; + + if (STRINGP (it->object)) + position = make_number (IT_STRING_CHARPOS (*it)); + else if (BUFFERP (it->object)) + position = make_number (IT_CHARPOS (*it)); + else + return Qnil; + + return Fget_char_property (position, prop, it->object); +} + /* See if there's a line- or wrap-prefix, and if so, push it on IT. */ static void @@ -20879,25 +20898,6 @@ take_vertical_position_into_account (it); } -/* Return the character-property PROP at the current position in IT. */ - -static Lisp_Object -get_it_property (it, prop) - struct it *it; - Lisp_Object prop; -{ - Lisp_Object position; - - if (STRINGP (it->object)) - position = make_number (IT_STRING_CHARPOS (*it)); - else if (BUFFERP (it->object)) - position = make_number (IT_CHARPOS (*it)); - else - return Qnil; - - return Fget_char_property (position, prop, it->object); -} - /* Calculate line-height and line-spacing properties. An integer value specifies explicit pixel value. A float value specifies relative value to current face height.