comparison src/keyboard.c @ 10701:358030fd130c

(command_loop_1): Put back cancel_echoing call, if there's a perdisplay for it to apply to. (init_perdisplay): Initialize echo vars.

10700:f6f235bc26ba

  struct buffer *prev_buffer;
  PERDISPLAY *global_perdisplay = current_perdisplay;

  Vdeactivate_mark = Qnil;
  waiting_for_input = 0;

  nonundocount = 0;
  no_redisplay = 0;
  this_command_key_count = 0;

  /* This means that command_loop_1 won't try to select anything the first
     time through.  */
  perd->internal_last_event_frame = Qnil;
#endif
  perd->Vlast_event_frame = Qnil;
}

/*
 * Destroy the contents of a perdisplay object, but not the object itself.
 * We use this just before deleteing it, or if we're going to initialize

10701:358030fd130c

  struct buffer *prev_buffer;
  PERDISPLAY *global_perdisplay = current_perdisplay;

  Vdeactivate_mark = Qnil;
  waiting_for_input = 0;
  if (current_perdisplay)
    cancel_echoing ();

  nonundocount = 0;
  no_redisplay = 0;
  this_command_key_count = 0;

  /* This means that command_loop_1 won't try to select anything the first
     time through.  */
  perd->internal_last_event_frame = Qnil;
#endif
  perd->Vlast_event_frame = Qnil;
  perd->immediate_echo = 0;
  perd->echoptr = perd->echobuf;
  perd->echo_after_prompt = -1;
}

/*
 * Destroy the contents of a perdisplay object, but not the object itself.
 * We use this just before deleteing it, or if we're going to initialize