aboutsummaryrefslogtreecommitdiffstats
path: root/src/textprop.c
diff options
context:
space:
mode:
authorGlenn Morris2011-05-12 00:07:06 -0700
committerGlenn Morris2011-05-12 00:07:06 -0700
commitd2fc7e3d0f6f57f962cbd94df3bf4fd15a37bb68 (patch)
treee6d877c35b4396bd5092a7be244b1527374d4a0e /src/textprop.c
parentd45885f7e0025fb5bd0756ba78c511a981d64533 (diff)
parente531bdfff1ee57a0ba4af6c8575ed7856e4c86d2 (diff)
downloademacs-d2fc7e3d0f6f57f962cbd94df3bf4fd15a37bb68.tar.gz
emacs-d2fc7e3d0f6f57f962cbd94df3bf4fd15a37bb68.zip
Merge from emacs-23; up to 2010-06-10T12:56:11Z!michael.albinus@gmx.de.
Diffstat (limited to 'src/textprop.c')
-rw-r--r--src/textprop.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/textprop.c b/src/textprop.c
index aad090c5b41..566b2962a63 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -838,8 +838,8 @@ In a buffer, it runs to (point-min), and the value cannot be less than that.
838The property values are compared with `eq'. 838The property values are compared with `eq'.
839If the property is constant all the way to the start of OBJECT, return the 839If the property is constant all the way to the start of OBJECT, return the
840first valid position in OBJECT. 840first valid position in OBJECT.
841If the optional fourth argument LIMIT is non-nil, don't search 841If the optional fourth argument LIMIT is non-nil, don't search back past
842back past position LIMIT; return LIMIT if nothing is found before LIMIT. */) 842position LIMIT; return LIMIT if nothing is found before reaching LIMIT. */)
843 (Lisp_Object position, Lisp_Object prop, Lisp_Object object, Lisp_Object limit) 843 (Lisp_Object position, Lisp_Object prop, Lisp_Object object, Lisp_Object limit)
844{ 844{
845 if (STRINGP (object)) 845 if (STRINGP (object))