Avoid moving point while analyzing text conversion

* lisp/simple.el (analyze-text-conversion): If neither calling
p-s-i-h nor calling p-t-c-h yields a change to point, return it
to its location before analyze-text-conversion was called.

* src/keyboard.c (kbd_buffer_get_event): See that text
conversion events are uniformly delivered prior to keyboard
events arriving in unison.

1 files changed, 13 insertions, 7 deletions

diff --git a/src/keyboard.c b/src/keyboard.c
index 003340c3e58..13cb7835dff 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -3993,6 +3993,19 @@ kbd_buffer_get_event (KBOARD **kbp,
       if (CONSP (Vunread_command_events))
         break;
 
+#ifdef HAVE_TEXT_CONVERSION
+      /* That text conversion events take priority over keyboard
+         events, since input methods frequently send them immediately
+         after edits, with the assumption that this order of events
+         will be observed.  */
+
+      if (detect_conversion_events ())
+        {
+          had_pending_conversion_events = true;
+          break;
+        }
+#endif /* HAVE_TEXT_CONVERSION */
+
       if (kbd_fetch_ptr != kbd_store_ptr)
         break;
       if (some_mouse_moved ())
@@ -4021,13 +4034,6 @@ kbd_buffer_get_event (KBOARD **kbp,
           break;
         }
 #endif
-#ifdef HAVE_TEXT_CONVERSION
-      if (detect_conversion_events ())
-        {
-          had_pending_conversion_events = true;
-          break;
-        }
-#endif
       if (end_time)
         {
           struct timespec now = current_timespec ();