master 449008a60f1 2/2: Disable text conversion inside read-char-exclusive

[Po Lu]

branch: master
commit 449008a60f1d72fb1ec8cff356b6743619796b6b
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Disable text conversion inside read-char-exclusive
    
    * src/lread.c (read_filtered_event): Disable text conversion if
    merely ascii_required.  (bug#65370)
---
 src/lread.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/lread.c b/src/lread.c
index 251da5670d0..255b6e914d9 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -800,9 +800,9 @@ static void substitute_in_interval (INTERVAL, void *);
    If SECONDS is a number, wait that many seconds for input, and
    return Qnil if no input arrives within that time.
 
-   If text conversion is enabled and ASCII_REQUIRED && ERROR_NONASCII,
-   temporarily disable any input method which wants to perform
-   edits, unless `disable-inhibit-text-conversion'.  */
+   If text conversion is enabled and ASCII_REQUIRED, temporarily
+   disable any input method which wants to perform edits, unless
+   `disable-inhibit-text-conversion'.  */
 
 static Lisp_Object
 read_filtered_event (bool no_switch_frame, bool ascii_required,
@@ -825,8 +825,7 @@ read_filtered_event (bool no_switch_frame, bool 
ascii_required,
   /* Don't use text conversion when trying to just read a
      character.  */
 
-  if (ascii_required && error_nonascii
-      && !disable_inhibit_text_conversion)
+  if (ascii_required && !disable_inhibit_text_conversion)
     {
       disable_text_conversion ();
       record_unwind_protect_void (resume_text_conversion);