Fix for Bug#5984.

* composite.c (autocmp_chars): Save point as marker before calling
auto-composition-function.

* lisp.h (restore_point_unwind): Add prototype.

* fileio.c (restore_point_unwind): Remove static attribute.

1 files changed, 12 insertions, 2 deletions

diff --git a/src/composite.c b/src/composite.c
index 632c9f90d12..1295a03e9f6 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -990,6 +990,14 @@ autocmp_chars (cft_element, charpos, bytepos, limit, win, face, string)
             {
               Lisp_Object args[6];
 
+              /* Save point as marker before calling out to lisp.  */
+              if (NILP (string))
+                {
+                  Lisp_Object m = Fmake_marker ();
+                  set_marker_both (m, Qnil, pt, pt_byte);
+                  record_unwind_protect (restore_point_unwind, m);
+                }
+
               args[0] = Vauto_composition_function;
               args[1] = AREF (elt, 2);
               args[2] = pos;
@@ -998,8 +1006,10 @@ autocmp_chars (cft_element, charpos, bytepos, limit, win, face, string)
               args[5] = string;
               gstring = safe_call (6, args);
             }
-          if (NILP (string))
-            TEMP_SET_PT_BOTH (pt, pt_byte);
+          else if (NILP (string))
+            {
+              TEMP_SET_PT_BOTH (pt, pt_byte);
+            }
           return unbind_to (count, gstring);
         }
     }