From c7b6dfa6df76885853be8cadf06d8905e1310940 Mon Sep 17 00:00:00 2001
From: Karl Heuer <kwzh@gnu.org>
Date: Fri, 24 Mar 1995 22:46:42 +0000
Subject: [PATCH] (Fnext_property_change): Fix previous change.

---
 src/textprop.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/textprop.c b/src/textprop.c
index 7e92be8986..7f635777d0 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -618,7 +618,12 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT.")
      bother checking further intervals.  */
   if (EQ (limit, Qt))
     {
-      XSETFASTINT (pos, next->position - (STRINGP (object)));
+      if (NULL_INTERVAL_P (next))
+	XSETFASTINT (pos, (STRINGP (object)
+			   ? XSTRING (object)->size
+			   : BUF_ZV (XBUFFER (object))));
+      else
+	XSETFASTINT (pos, next->position - (STRINGP (object)));
       return pos;
     }
 
-- 
2.39.2