From: Kenichi Handa <handa@m17n.org>
Date: Fri, 25 Dec 2009 05:27:03 +0000 (+0000)
Subject: (command_loop_1): Fix previous change.
X-Git-Tag: emacs-pretest-23.1.91~34
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=31f9c37613cdc7eeffc751025c75f2635fe41dc6;p=emacs.git

(command_loop_1): Fix previous change.
---

diff --git a/src/keyboard.c b/src/keyboard.c
index 37f0ca8c83a..7a137ea0dca 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1978,9 +1978,11 @@ command_loop_1 ()
 	  && NILP (Vdisable_point_adjustment)
 	  && NILP (Vglobal_disable_point_adjustment))
 	{
-	  if (composition_adjust_point (last_point_position,
-					last_point_position)
-	      != last_point_position)
+	  if (last_point_position > BEGV
+	      && last_point_position < ZV
+	      && (composition_adjust_point (last_point_position,
+					    last_point_position)
+		  != last_point_position))
 	    /* The last point was temporarily set within a grapheme
 	       cluster to prevent automatic composition.  To recover
 	       the automatic composition, we must update the