From 6cdd8f7153b553c6dc02be47e04a2e75117b6fe4 Mon Sep 17 00:00:00 2001 From: Phillip Lord Date: Mon, 20 Jun 2016 14:26:02 +0100 Subject: [PATCH] Ensure undo-boundary after insert-file-contents. * src/fileio.c: Record undoable change during insert-file-contents. Addresses Bug #23785. --- src/fileio.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/fileio.c b/src/fileio.c index b11f9233ab4..746aac42a9c 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -4047,8 +4047,14 @@ by calling `format-decode', which see. */) being called in insert_from_buffer (via in prepare_to_modify_buffer). */ specbind (intern ("buffer-file-name"), Qnil); + + /* Temporarily enable the undo-buffer to ensure that the change + is marked as an undoable one. Bug #23785. */ + bset_undo_list(current_buffer,Qnil); insert_from_buffer (XBUFFER (conversion_buffer), same_at_start_charpos, inserted_chars, 0); + bset_undo_list(current_buffer,Qt); + /* Set `inserted' to the number of inserted characters. */ inserted = PT - temp; /* Set point before the inserted characters. */ -- 2.11.4.GIT