[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 4f9ed518e79 2/3: Merge branch 'master' of git.savannah.gnu.org:/s
From: |
Eli Zaretskii |
Subject: |
master 4f9ed518e79 2/3: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs |
Date: |
Thu, 19 Dec 2024 09:30:48 -0500 (EST) |
branch: master
commit 4f9ed518e792c00f6a1b27bebf9cb83779e01447
Merge: a4f176ea6e5 a61b968ccfe
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
---
src/pgtkfns.c | 3 ---
src/pgtkterm.c | 1 -
src/xfns.c | 3 ---
src/xterm.c | 1 -
4 files changed, 8 deletions(-)
diff --git a/src/pgtkfns.c b/src/pgtkfns.c
index f0fd3000965..0ff3262cd11 100644
--- a/src/pgtkfns.c
+++ b/src/pgtkfns.c
@@ -3668,10 +3668,7 @@ visible. */)
frames = Fnreverse (tmp);
/* Make sure the current matrices are up-to-date. */
- specpdl_ref count = SPECPDL_INDEX ();
- specbind (Qredisplay_dont_pause, Qt);
redisplay_preserve_echo_area (32);
- unbind_to (count, Qnil);
block_input ();
xg_print_frames_dialog (frames);
diff --git a/src/pgtkterm.c b/src/pgtkterm.c
index 079945126e0..9bb2ea3c1b0 100644
--- a/src/pgtkterm.c
+++ b/src/pgtkterm.c
@@ -7632,7 +7632,6 @@ pgtk_cr_export_frames (Lisp_Object frames,
cairo_surface_type_t surface_type)
Lisp_Object acc = Qnil;
specpdl_ref count = SPECPDL_INDEX ();
- specbind (Qredisplay_dont_pause, Qt);
redisplay_preserve_echo_area (31);
f = XFRAME (XCAR (frames));
diff --git a/src/xfns.c b/src/xfns.c
index 3f0d8f3fcd0..23b5164b751 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -9963,10 +9963,7 @@ Note: Text drawn with the `x' font backend is shown with
hollow boxes. */)
frames = Fnreverse (tmp);
/* Make sure the current matrices are up-to-date. */
- specpdl_ref count = SPECPDL_INDEX ();
- specbind (Qredisplay_dont_pause, Qt);
redisplay_preserve_echo_area (32);
- unbind_to (count, Qnil);
block_input ();
xg_print_frames_dialog (frames);
diff --git a/src/xterm.c b/src/xterm.c
index 0c20d38b0f7..fa24b7c1cee 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -6369,7 +6369,6 @@ x_cr_export_frames (Lisp_Object frames,
cairo_surface_type_t surface_type)
Lisp_Object acc = Qnil;
specpdl_ref count = SPECPDL_INDEX ();
- specbind (Qredisplay_dont_pause, Qt);
redisplay_preserve_echo_area (31);
f = XFRAME (XCAR (frames));