From 6a4b6c3e836ce06bb1f69615bbdcb6745d2aff6f Mon Sep 17 00:00:00 2001
From: Po Lu
Date: Sat, 19 Aug 2023 08:48:20 +0800
Subject: Disable text conversion within read-char-from-minibuffer

* lisp/subr.el (read-char-from-minibuffer): Disable text
conversion.  (bug#65370)
(y-or-n-p): Remove redundant binding of
`override-text-conversion-style', given that read-key already
disables text conversion.

* src/textconv.c (Fset_text_conversion_style): Always reset text
conversion for the selected frame in addition to any displaying
current_buffer.
---
 src/textconv.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/textconv.c b/src/textconv.c
index 60f3ba80577..a4de991ef02 100644
--- a/src/textconv.c
+++ b/src/textconv.c
@@ -2138,7 +2138,10 @@ replacement key sequence returned starts a new key sequence and makes
 	  if (WINDOW_LIVE_P (f->old_selected_window)
 	      && FRAME_WINDOW_P (f)
 	      && EQ (XWINDOW (f->old_selected_window)->contents,
-		     buffer))
+		     buffer)
+	      /* Always reset the text conversion style of the
+		 selected frame.  */
+	      || (f == SELECTED_FRAME ()))
 	    {
 	      block_input ();
 	      reset_frame_state (f);
-- 
cgit v1.2.1