]> git.eshelyaron.com Git - emacs.git/commitdiff
; Revert "Ensure undo-boundary after insert-file-contents."
authorPhillip Lord <phillip.lord@russet.org.uk>
Wed, 22 Jun 2016 08:42:49 +0000 (09:42 +0100)
committerPhillip Lord <phillip.lord@russet.org.uk>
Wed, 22 Jun 2016 08:42:49 +0000 (09:42 +0100)
This reverts commit 6cdd8f7153b553c6dc02be47e04a2e75117b6fe4.

The original commit did not address the problem it was claiming to.

src/fileio.c

index 746aac42a9c924366960c0b32e859e88227baa25..b11f9233ab4891232a4f785c41f0fc9d531c4814 100644 (file)
@@ -4047,14 +4047,8 @@ 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.  */