From: "Phillip Lord" <phillip.lord@russet.org.uk>
To: emacs-devel@gnu.org
Subject: Commit for emacs-25, fixing undo with revert-buffer
Date: Thu, 30 Jun 2016 00:15:31 +0100 [thread overview]
Message-ID: <06759cf52b3dd9c6a684b1ecaafa2e16.squirrel@cloud103.planethippo.com> (raw)
I would like to apply this patch for emacs-25 fixing Bug#23785.
From d425b7875b162cabf65661e42b62b5e54344ffe6 Mon Sep 17 00:00:00 2001
From: Phillip Lord <phillip.lord@russet.org.uk>
Date: Tue, 28 Jun 2016 08:02:51 +0100
Subject: [PATCH] Fix missing undo-boundary on revert-buffer.
* src/fileio.c (insert-file-contents): Call undo-auto--undoable-change
Addresses Bug#23785.
Do not merge to master as c98bc98 also addresses the same bug.
---
lisp/simple.el | 10 +++++++++-
src/fileio.c | 5 +++++
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/lisp/simple.el b/lisp/simple.el
index b66827d..43ad43c 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2940,9 +2940,17 @@ undo-auto-amalgamate
(cdr buffer-undo-list))))))
(setq undo-auto--last-boundary-cause 0)))))
+;; This function is called also from one place in fileio.c. We call
+;; this function, rather than undoable-change because it reduces the
+;; number of lisp functions we have to use fboundp for to avoid
+;; bootstrap issues.
+(defun undo-auto--undoable-change-no-timer ()
+ "Record `current-buffer' as changed."
+ (add-to-list 'undo-auto--undoably-changed-buffers (current-buffer)))
+
(defun undo-auto--undoable-change ()
"Called after every undoable buffer change."
- (add-to-list 'undo-auto--undoably-changed-buffers (current-buffer))
+ (undo-auto--undoable-change-no-timer)
(undo-auto--boundary-ensure-timer))
;; End auto-boundary section
diff --git a/src/fileio.c b/src/fileio.c
index b11f923..3005ca3 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3436,6 +3436,9 @@ by calling `format-decode', which see. */)
if (!NILP (BVAR (current_buffer, read_only)))
Fbarf_if_buffer_read_only (Qnil);
+ if (!NILP (Ffboundp (Qundo_auto__undoable_change_no_timer)))
+ call0 (Qundo_auto__undoable_change_no_timer);
+
val = Qnil;
p = Qnil;
orig_filename = Qnil;
@@ -5797,6 +5800,8 @@ syms_of_fileio (void)
which gives a list of operations it handles. */
DEFSYM (Qoperations, "operations");
+ DEFSYM (Qundo_auto__undoable_change_no_timer,
"undo-auto--undoable-change-no-timer");
+
DEFSYM (Qexpand_file_name, "expand-file-name");
DEFSYM (Qsubstitute_in_file_name, "substitute-in-file-name");
DEFSYM (Qdirectory_file_name, "directory-file-name");
--
2.9.0
next reply other threads:[~2016-06-29 23:15 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-29 23:15 Phillip Lord [this message]
2016-06-30 15:39 ` Commit for emacs-25, fixing undo with revert-buffer Eli Zaretskii
2016-07-04 15:32 ` Phillip Lord
2016-07-04 16:19 ` Eli Zaretskii
2016-07-05 9:45 ` Phillip Lord
2016-07-05 21:51 ` Stefan Monnier
2016-07-06 18:27 ` John Wiegley
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=06759cf52b3dd9c6a684b1ecaafa2e16.squirrel@cloud103.planethippo.com \
--to=phillip.lord@russet.org.uk \
--cc=emacs-devel@gnu.org \
/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.