From: Chong Yidong <cyd@stupidchicken.com>
Date: Sun, 7 Aug 2011 19:40:08 +0000 (-0400)
Subject: * composite.c (autocmp_chars): Don't reset point.
X-Git-Tag: emacs-pretest-24.0.90~104^2~124^2~62^2~23
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=588728344d5fe74ed583f764a458603913f68c31;p=emacs.git

* composite.c (autocmp_chars): Don't reset point.
That is done by restore_point_unwind (Bug#5984).
---

diff --git a/src/ChangeLog b/src/ChangeLog
index ef4efb0ad35..ddd580fcc4c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-07  Chong Yidong  <cyd@stupidchicken.com>
+
+	* composite.c (autocmp_chars): Don't reset point.  That is done by
+	restore_point_unwind (Bug#5984).
+
 2011-08-07  Juri Linkov  <juri@jurta.org>
 
 	* editfns.c (Fformat_time_string): Doc fix, add tag `usage:'
diff --git a/src/composite.c b/src/composite.c
index d402d5ad0c4..3308a028042 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -960,8 +960,6 @@ autocmp_chars (Lisp_Object rule, EMACS_INT charpos, EMACS_INT bytepos, EMACS_INT
       args[4] = font_object;
       args[5] = string;
       lgstring = safe_call (6, args);
-      if (NILP (string))
-	TEMP_SET_PT_BOTH (pt, pt_byte);
     }
   return unbind_to (count, lgstring);
 }