aboutsummaryrefslogtreecommitdiffstats
path: root/src/fileio.c
diff options
context:
space:
mode:
authorPhillip Lord2016-06-22 09:42:49 +0100
committerPhillip Lord2016-06-22 09:42:49 +0100
commit829733104db073f8abd67765eae162e7360281fa (patch)
tree240dc74bace5ee4134563724877b47811eabeddb /src/fileio.c
parentdc5e65b5deb2f5b67f6c3a06ae81c6b074bd4b56 (diff)
downloademacs-829733104db073f8abd67765eae162e7360281fa.tar.gz
emacs-829733104db073f8abd67765eae162e7360281fa.zip
; Revert "Ensure undo-boundary after insert-file-contents."
This reverts commit 6cdd8f7153b553c6dc02be47e04a2e75117b6fe4. The original commit did not address the problem it was claiming to.
Diffstat (limited to 'src/fileio.c')
-rw-r--r--src/fileio.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/fileio.c b/src/fileio.c
index 746aac42a9c..b11f9233ab4 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4047,14 +4047,8 @@ by calling `format-decode', which see. */)
4047 being called in insert_from_buffer (via in 4047 being called in insert_from_buffer (via in
4048 prepare_to_modify_buffer). */ 4048 prepare_to_modify_buffer). */
4049 specbind (intern ("buffer-file-name"), Qnil); 4049 specbind (intern ("buffer-file-name"), Qnil);
4050
4051 /* Temporarily enable the undo-buffer to ensure that the change
4052 is marked as an undoable one. Bug #23785. */
4053 bset_undo_list(current_buffer,Qnil);
4054 insert_from_buffer (XBUFFER (conversion_buffer), 4050 insert_from_buffer (XBUFFER (conversion_buffer),
4055 same_at_start_charpos, inserted_chars, 0); 4051 same_at_start_charpos, inserted_chars, 0);
4056 bset_undo_list(current_buffer,Qt);
4057
4058 /* Set `inserted' to the number of inserted characters. */ 4052 /* Set `inserted' to the number of inserted characters. */
4059 inserted = PT - temp; 4053 inserted = PT - temp;
4060 /* Set point before the inserted characters. */ 4054 /* Set point before the inserted characters. */