(direct_output_forward_char): Just give up

if region is being highlighted.

(direct_output_for_insert): Pass those args.

1 files changed, 5 insertions, 1 deletions

diff --git a/src/dispnew.c b/src/dispnew.c
index 963cc22cf44..30e1706a720 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -878,7 +878,7 @@ direct_output_for_insert (g)
   {
 #ifdef HAVE_X_WINDOWS
     int dummy;
-    int face = compute_char_face (frame, w, point, &dummy);
+    int face = compute_char_face (frame, w, point, -1, -1, &dummy);
 #else
     int face = 0;
 #endif
@@ -920,6 +920,10 @@ direct_output_forward_char (n)
       || cursor_in_echo_area)
     return 0;
 
+  /* Can't use direct output if highlighting a region.  */
+  if (!NILP (Vtransient_mark_mode) && !NILP (current_buffer->mark_active))
+    return 0;
+
   FRAME_CURSOR_X (frame) += n;
   XFASTINT (w->last_point_x) = FRAME_CURSOR_X (frame);
   XFASTINT (w->last_point) = point;