aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPo Lu2023-08-19 08:48:20 +0800
committerPo Lu2023-08-19 08:48:20 +0800
commit6a4b6c3e836ce06bb1f69615bbdcb6745d2aff6f (patch)
tree98ccf598e31c93f923f6acddeaf8902d002dd7a9 /src
parent4f1ce5db12639359822652673aa013345aa2991e (diff)
downloademacs-6a4b6c3e836ce06bb1f69615bbdcb6745d2aff6f.tar.gz
emacs-6a4b6c3e836ce06bb1f69615bbdcb6745d2aff6f.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/textconv.c5
1 files changed, 4 insertions, 1 deletions
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
2138 if (WINDOW_LIVE_P (f->old_selected_window) 2138 if (WINDOW_LIVE_P (f->old_selected_window)
2139 && FRAME_WINDOW_P (f) 2139 && FRAME_WINDOW_P (f)
2140 && EQ (XWINDOW (f->old_selected_window)->contents, 2140 && EQ (XWINDOW (f->old_selected_window)->contents,
2141 buffer)) 2141 buffer)
2142 /* Always reset the text conversion style of the
2143 selected frame. */
2144 || (f == SELECTED_FRAME ()))
2142 { 2145 {
2143 block_input (); 2146 block_input ();
2144 reset_frame_state (f); 2147 reset_frame_state (f);