aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Albinus2023-06-17 18:16:24 +0200
committerMichael Albinus2023-06-17 18:16:24 +0200
commit0154f5885e330b328f047e7c49acf050b7c4bf46 (patch)
treedb49cac392114c8516e32b35742e5cbe7f745bf1 /src
parent111efb0dd7f33dbc4c19706ecca705cae7b7eff9 (diff)
parent90c03ffcd4b3744ae149dcede9179b0cbf9d7547 (diff)
downloademacs-0154f5885e330b328f047e7c49acf050b7c4bf46.tar.gz
emacs-0154f5885e330b328f047e7c49acf050b7c4bf46.zip
Merge branch 'emacs-29' of git.sv.gnu.org:/srv/git/emacs into emacs-29
Diffstat (limited to 'src')
-rw-r--r--src/minibuf.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/minibuf.c b/src/minibuf.c
index d5f95968ae1..bcb7eb9375d 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1266,9 +1266,6 @@ minibuffer_unwind (void)
1266 set_window_buffer (window, Fcar (entry), 0, 0); 1266 set_window_buffer (window, Fcar (entry), 0, 0);
1267 Fset_window_start (window, Fcar (Fcdr (entry)), Qnil); 1267 Fset_window_start (window, Fcar (Fcdr (entry)), Qnil);
1268 Fset_window_point (window, Fcar (Fcdr (Fcdr (entry)))); 1268 Fset_window_point (window, Fcar (Fcdr (Fcdr (entry))));
1269 /* set-window-configuration may/will have unselected the
1270 mini-window as the selected window. Restore it. */
1271 Fset_frame_selected_window (exp_MB_frame, window, Qnil);
1272 } 1269 }
1273 else 1270 else
1274 set_window_buffer (window, nth_minibuffer (0), 0, 0); 1271 set_window_buffer (window, nth_minibuffer (0), 0, 0);