* 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 ef4efb0ad35e6aac8379f93203083ccb7d9f550f..ddd580fcc4c55f80332f4f6c655730eab5da2944 100644 (file)
--- 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 d402d5ad0c4b14609b1862749df58d8cce38b04d..3308a028042a3e293bf4f983b7a47daed4640de7 100644 (file)
--- 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);
 }