Merge from trunk.

[gnu-emacs] / src / composite.c

diff --git a/src/composite.c b/src/composite.c
index 738fcd3774c00ff9e4b494614e10c35ec8d3122b..2a3fbe295522a72ffff51dafb2d88d8d817bee2c 100644 (file)
--- a/src/composite.c
+++ b/src/composite.c
@@ -965,8 +965,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);
 }