From: martin rudalics <rudalics@gmx.at>
To: Anders Lindgren <andlind@gmail.com>
Cc: 19576@debbugs.gnu.org
Subject: bug#19576: write-file writes the wrong buffer
Date: Tue, 17 Nov 2015 09:34:26 +0100 [thread overview]
Message-ID: <564AE692.2040303@gmx.at> (raw)
In-Reply-To: <CABr8ebbZDeOLb9O64RwQNLW235PckMB=k2H2WV9V2kKvPCEg=Q@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 256 bytes --]
>> I'll try to get the fix of this bug applied there too.
I attach a fix for restoring current buffer and selected window (the
latter hopefully taking care of selecting the right frame). Please tell
me whether it's sufficient for your purposes.
martin
[-- Attachment #2: bug#19576.diff --]
[-- Type: text/plain, Size: 1536 bytes --]
diff --git a/src/window.c b/src/window.c
index 7c95ff9..06066fd 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3142,14 +3142,14 @@ run_funs (Lisp_Object funs)
call0 (XCAR (funs));
}
-static void
+void
select_window_norecord (Lisp_Object window)
{
if (WINDOW_LIVE_P (window))
Fselect_window (window, Qt);
}
-static void
+void
select_frame_norecord (Lisp_Object frame)
{
if (FRAME_LIVE_P (XFRAME (frame)))
diff --git a/src/window.h b/src/window.h
index 135f5de..9ee3f81 100644
--- a/src/window.h
+++ b/src/window.h
@@ -1013,6 +1013,8 @@ extern void grow_mini_window (struct window *, int, bool);
extern void shrink_mini_window (struct window *, bool);
extern int window_relative_x_coord (struct window *, enum window_part, int);
+void select_window_norecord (Lisp_Object);
+void select_frame_norecord (Lisp_Object);
void run_window_configuration_change_hook (struct frame *f);
/* Make WINDOW display BUFFER. RUN_HOOKS_P means it's allowed
diff --git a/src/xdisp.c b/src/xdisp.c
index dbc2d84..5e0d4ca 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -11739,8 +11739,16 @@ prepare_menu_bars (void)
while (CONSP (functions))
{
+ ptrdiff_t count = SPECPDL_INDEX ();
+
+ record_unwind_current_buffer ();
+ record_unwind_protect (select_window_norecord, selected_window);
+
if (!EQ (XCAR (functions), Qt))
call1 (XCAR (functions), frame);
+
+ unbind_to (count, Qnil);
+
functions = XCDR (functions);
}
}
next prev parent reply other threads:[~2015-11-17 8:34 UTC|newest]
Thread overview: 77+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-12 23:37 bug#19576: 24.4; Broken function in `window-size-change-functions' cause `write-file' to write the wrong buffer Anders Lindgren
2015-11-16 19:18 ` bug#19576: write-file writes " Anders Lindgren
2015-11-16 19:46 ` martin rudalics
2015-11-16 20:05 ` Anders Lindgren
2015-11-17 0:55 ` Juri Linkov
2015-11-17 20:02 ` Alan Mackenzie
2015-11-17 21:52 ` Anders Lindgren
2015-11-18 0:27 ` Juri Linkov
2015-11-18 1:37 ` Drew Adams
2015-11-18 7:54 ` Anders Lindgren
2015-11-18 17:45 ` Eli Zaretskii
2015-11-18 23:23 ` Alan Mackenzie
2015-11-19 16:03 ` Eli Zaretskii
2015-11-20 8:22 ` martin rudalics
2015-11-20 10:17 ` Eli Zaretskii
2015-11-20 10:48 ` martin rudalics
2015-11-20 11:16 ` Eli Zaretskii
2015-11-20 11:25 ` martin rudalics
2015-11-20 11:40 ` Eli Zaretskii
2015-11-20 14:21 ` martin rudalics
2015-11-20 14:54 ` Eli Zaretskii
2015-11-21 11:35 ` Eli Zaretskii
2015-11-21 15:56 ` Alan Mackenzie
2015-11-21 16:01 ` Eli Zaretskii
2015-11-21 16:49 ` Anders Lindgren
2015-11-21 17:10 ` Eli Zaretskii
2015-11-21 18:27 ` martin rudalics
2015-11-21 18:33 ` Eli Zaretskii
2015-11-21 18:44 ` martin rudalics
2015-11-21 19:08 ` Eli Zaretskii
2015-11-21 20:33 ` Anders Lindgren
2015-11-22 10:44 ` martin rudalics
2015-11-22 15:36 ` Eli Zaretskii
2015-11-21 16:02 ` bug#21333: " Eli Zaretskii
2015-11-22 11:08 ` martin rudalics
2015-11-22 15:39 ` Eli Zaretskii
2015-11-22 17:46 ` martin rudalics
2015-11-23 18:21 ` Eli Zaretskii
2015-11-23 18:28 ` Alan Mackenzie
2015-11-24 8:27 ` martin rudalics
2015-11-24 16:19 ` Eli Zaretskii
2015-11-28 10:26 ` martin rudalics
2015-11-28 11:27 ` Eli Zaretskii
2015-11-30 13:30 ` martin rudalics
2015-11-30 16:28 ` Eli Zaretskii
2015-11-30 17:27 ` martin rudalics
2015-11-19 8:13 ` martin rudalics
2015-11-19 15:45 ` Eli Zaretskii
2015-11-20 8:22 ` martin rudalics
2015-11-20 8:34 ` Eli Zaretskii
2015-11-20 10:25 ` martin rudalics
2015-11-20 11:15 ` Eli Zaretskii
2015-11-20 11:25 ` martin rudalics
2015-11-20 11:39 ` Eli Zaretskii
2015-11-20 14:21 ` martin rudalics
2015-11-20 11:32 ` Alan Mackenzie
2015-11-20 11:41 ` Eli Zaretskii
2015-11-17 21:15 ` Anders Lindgren
2015-11-18 17:52 ` Eli Zaretskii
2015-11-18 19:23 ` Anders Lindgren
2015-11-18 20:52 ` Eli Zaretskii
2015-11-19 2:06 ` John Wiegley
2015-11-19 6:54 ` Anders Lindgren
2015-11-19 15:31 ` Eli Zaretskii
2015-11-22 18:44 ` Johan Bockgård
2015-11-22 18:55 ` Johan Bockgård
2015-11-22 19:02 ` Eli Zaretskii
2015-11-17 8:34 ` martin rudalics [this message]
2015-11-17 19:08 ` Anders Lindgren
2015-11-18 17:24 ` Eli Zaretskii
2015-11-19 8:12 ` martin rudalics
2015-11-19 15:44 ` Eli Zaretskii
2015-11-20 8:22 ` martin rudalics
2015-11-20 8:32 ` Eli Zaretskii
[not found] ` <mailman.9.1447720293.31583.bug-gnu-emacs@gnu.org>
2015-11-17 22:10 ` Alan Mackenzie
2015-11-18 7:09 ` martin rudalics
2015-11-20 20:17 ` bug#19576: Fixed: " Anders Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=564AE692.2040303@gmx.at \
--to=rudalics@gmx.at \
--cc=19576@debbugs.gnu.org \
--cc=andlind@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.