From: Andreas Schwab <schwab@suse.de>
Date: Sat, 5 Jul 2008 09:45:56 +0000 (+0000)
Subject: (get_it_property): Move out of HAVE_WINDOW_SYSTEM
X-Git-Tag: emacs-pretest-23.0.90~4321
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6c95e70d30da7a988b20d628d058269c97d0d583;p=emacs.git

(get_it_property): Move out of HAVE_WINDOW_SYSTEM
section.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 58b2538093b..c04d96629e3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-05  Andreas Schwab  <schwab@suse.de>
+
+	* xdisp.c (get_it_property): Move out of HAVE_WINDOW_SYSTEM
+	section.
+
 2008-07-05  Chong Yidong  <cyd@stupidchicken.com>
 
 	* xdisp.c (IT_OVERFLOW_NEWLINE_INTO_FRINGE): Turn it off if
diff --git a/src/xdisp.c b/src/xdisp.c
index 28a5c4e0c0a..4b4fd77d280 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -16386,6 +16386,25 @@ push_display_prop (struct it *it, Lisp_Object prop)
     }
 }
 
+/* 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 @@ produce_stretch_glyph (it)
   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.