aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2020-02-01 07:50:10 -0800
committerGlenn Morris2020-02-01 07:50:10 -0800
commit0ceb5d0b23e64712d5a2c29b642489524cdbd6d4 (patch)
treee6180c252e0dab1f8992bac997c361a39426ba8c /src
parentfcac8fcf17ddfef218bb97db4322083077ec7306 (diff)
parent5bf2ef3871b0f42266f6bde7c0d2d607e9625770 (diff)
downloademacs-0ceb5d0b23e64712d5a2c29b642489524cdbd6d4.tar.gz
emacs-0ceb5d0b23e64712d5a2c29b642489524cdbd6d4.zip
Merge from origin/emacs-27
5bf2ef3871 Add more blackboard bold characters to TeX input method c362a624d8 ; * lisp/progmodes/gdb-mi.el (gdb-handle-reply): Fix comme... 2b1e18ae85 Protect against errors in gdb-mi.el handlers baceb8e84d Allow exiting the Python interpreter of a GDB session 2e66013dcf Ensure minibuffer input is added to history in read_minibuf de41161534 Tab-bar related fixes. 247f2cfa02 ; ChangeLog.3 fixes. e1a712bb3f * admin/authors.el: Add missing entries.
Diffstat (limited to 'src')
-rw-r--r--src/minibuf.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/minibuf.c b/src/minibuf.c
index 8ebdff12527..9d870ce3640 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -697,10 +697,6 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt,
697 else 697 else
698 histstring = Qnil; 698 histstring = Qnil;
699 699
700 /* If Lisp form desired instead of string, parse it. */
701 if (expflag)
702 val = string_to_object (val, defalt);
703
704 /* The appropriate frame will get selected 700 /* The appropriate frame will get selected
705 in set-window-configuration. */ 701 in set-window-configuration. */
706 unbind_to (count, Qnil); 702 unbind_to (count, Qnil);
@@ -711,6 +707,10 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt,
711 if (! (NILP (Vhistory_add_new_input) || NILP (histstring))) 707 if (! (NILP (Vhistory_add_new_input) || NILP (histstring)))
712 call2 (intern ("add-to-history"), histvar, histstring); 708 call2 (intern ("add-to-history"), histvar, histstring);
713 709
710 /* If Lisp form desired instead of string, parse it. */
711 if (expflag)
712 val = string_to_object (val, defalt);
713
714 return val; 714 return val;
715} 715}
716 716