[Emacs-diffs] /srv/bzr/emacs/trunk r105418: * composite.c (autocmp_chars): Don't reset point.

[Chong Yidong]

------------------------------------------------------------
revno: 105418
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sun 2011-08-07 15:40:08 -0400
message:
  * composite.c (autocmp_chars): Don't reset point.
  That is done by restore_point_unwind (Bug#5984).
modified:
  src/ChangeLog
  src/composite.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-08-07 14:14:54 +0000
+++ b/src/ChangeLog     2011-08-07 19:40:08 +0000
@@ -1,3 +1,8 @@
+2011-08-07  Chong Yidong  <address@hidden>
+
+       * composite.c (autocmp_chars): Don't reset point.  That is done by
+       restore_point_unwind (Bug#5984).
+
 2011-08-07  Juri Linkov  <address@hidden>
 
        * editfns.c (Fformat_time_string): Doc fix, add tag `usage:'

=== modified file 'src/composite.c'
--- a/src/composite.c   2011-07-09 06:28:40 +0000
+++ b/src/composite.c   2011-08-07 19:40:08 +0000
@@ -960,8 +960,6 @@
       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);
 }