bug-gnu-emacs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bug#23785: Emacs 25: 'Undo' overdoes things.


From: Phillip Lord
Subject: bug#23785: Emacs 25: 'Undo' overdoes things.
Date: Mon, 20 Jun 2016 18:12:29 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.95 (gnu/linux)

Eli Zaretskii <address@hidden> writes:

>> From: address@hidden (Phillip Lord)
>> Cc: "Eli Zaretskii" <address@hidden>,  address@hidden,  address@hidden
>> Date: Mon, 20 Jun 2016 16:03:35 +0100
>> 
>> My suggestion: this patch goes to Emacs-25.
>
> What patch?

Eli, do pay attention! The one that I didn't attach obviously.

Phil

>From a77a8683cddf918869b63fc3242ae594b186cc94 Mon Sep 17 00:00:00 2001
From: Phillip Lord <address@hidden>
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 | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/fileio.c b/src/fileio.c
index b11f923..9fc1bd8 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4047,8 +4047,16 @@ 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.9.0


reply via email to

[Prev in Thread] Current Thread [Next in Thread]