diff options
| author | Glenn Morris <rgm@gnu.org> | 2020-02-01 07:50:10 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2020-02-01 07:50:10 -0800 |
| commit | 0ceb5d0b23e64712d5a2c29b642489524cdbd6d4 (patch) | |
| tree | e6180c252e0dab1f8992bac997c361a39426ba8c /src/minibuf.c | |
| parent | fcac8fcf17ddfef218bb97db4322083077ec7306 (diff) | |
| parent | 5bf2ef3871b0f42266f6bde7c0d2d607e9625770 (diff) | |
| download | emacs-0ceb5d0b23e64712d5a2c29b642489524cdbd6d4.tar.gz emacs-0ceb5d0b23e64712d5a2c29b642489524cdbd6d4.tar.bz2 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/minibuf.c')
| -rw-r--r-- | src/minibuf.c | 8 |
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, else histstring = Qnil; - /* If Lisp form desired instead of string, parse it. */ - if (expflag) - val = string_to_object (val, defalt); - /* The appropriate frame will get selected in set-window-configuration. */ unbind_to (count, Qnil); @@ -711,6 +707,10 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt, if (! (NILP (Vhistory_add_new_input) || NILP (histstring))) call2 (intern ("add-to-history"), histvar, histstring); + /* If Lisp form desired instead of string, parse it. */ + if (expflag) + val = string_to_object (val, defalt); + return val; } |