(Fprevious_single_property_change): Check for null interval after correcting

for edge effects.

1 files changed, 4 insertions, 3 deletions

diff --git a/src/textprop.c b/src/textprop.c
index 8778e8d1438..1f8a0503c93 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -763,13 +763,14 @@ back past position LIMIT; return LIMIT if nothing is found until LIMIT.")
     CHECK_NUMBER_COERCE_MARKER (limit, 0);
 
   i = validate_interval_range (object, &pos, &pos, soft);
-  if (NULL_INTERVAL_P (i))
-    return limit;
 
   /* Start with the interval containing the char before point.  */
-  if (i->position == XFASTINT (pos))
+  if (! NULL_INTERVAL_P (i) && i->position == XFASTINT (pos))
     i = previous_interval (i);
 
+  if (NULL_INTERVAL_P (i))
+    return limit;
+
   here_val = textget (i->plist, prop);
   previous = previous_interval (i);
   while (! NULL_INTERVAL_P (previous)