[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xdisp.c,v
From: |
Andreas Schwab |
Subject: |
[Emacs-diffs] Changes to emacs/src/xdisp.c,v |
Date: |
Sat, 05 Jul 2008 09:45:58 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Andreas Schwab <schwab> 08/07/05 09:45:57
Index: xdisp.c
===================================================================
RCS file: /sources/emacs/emacs/src/xdisp.c,v
retrieving revision 1.1228
retrieving revision 1.1229
diff -u -b -r1.1228 -r1.1229
--- xdisp.c 5 Jul 2008 05:31:12 -0000 1.1228
+++ xdisp.c 5 Jul 2008 09:45:56 -0000 1.1229
@@ -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.
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Miles Bader, 2008/07/01
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Jason Rumney, 2008/07/02
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Chong Yidong, 2008/07/05
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v,
Andreas Schwab <=
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Chong Yidong, 2008/07/05
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Chong Yidong, 2008/07/10
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Adrian Robert, 2008/07/15
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Jason Rumney, 2008/07/15
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Adrian Robert, 2008/07/15
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Chong Yidong, 2008/07/16
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Adrian Robert, 2008/07/17
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Jason Rumney, 2008/07/23
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Dan Nicolaescu, 2008/07/27
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Andreas Schwab, 2008/07/28