2 files changed, 8 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d6decb7b40e..40ad7a9f507 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-04  Eli Zaretskii  <eliz@gnu.org>
+
+        * keyboard.c (adjust_point_for_property): Don't position point
+        before BEGV.  (Bug#10696)
+
 2012-02-03  Paul Eggert  <eggert@cs.ucla.edu>
 
         Handle overflow when computing char display width (Bug#9496).
diff --git a/src/keyboard.c b/src/keyboard.c
index c92f8f3f806..d4ff3c58f9b 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1749,7 +1749,9 @@ adjust_point_for_property (EMACS_INT last_pt, int modified)
         {
           xassert (end > PT);
           SET_PT (PT < last_pt
-                  ? (STRINGP (val) && SCHARS (val) == 0 ? beg - 1 : beg)
+                  ? (STRINGP (val) && SCHARS (val) == 0
+                     ? max (beg - 1, BEGV)
+                     : beg)
                   : end);
           check_composition = check_invisible = 1;
         }