Hi Eric and Samuel,
As I understand it, the problem is that the undo history gets scrambled
by the interleaving of user edits (in the indirect source-editing
buffer) and automatic changes introduced by org (un- and re-indenting
the source code).
I have the following patch, which seems to prevent the misbehavior
Samuel noticed. It has the drawback of not keeping the fine-grained
undo information: after org-src-edit-exit, all changes made during the
edit are seen as only one change, and undone as a unit.
I think the problem of interleaving the automatic and user-driven
changes in a sensible way is tricky. We don’t want the first invocation
of undo after org-src-edit-exit to remove the contents of the code
block, which is what a naive approach gives (since org-src-edit-exit
deletes then reinserts the code block contents).
I’ve been running with this patch for a while and not noticed any ill
effects. But I haven’t made a concerted attempt to test undo around
code blocks, which is why I’ve held off on pushing it. If it fixes
Samuel’s problem and looks good, perhaps it is ready to go.
>From 4a55d50e46eeebe9346cd10173b8c3a5a8baa7c6 Mon Sep 17 00:00:00 2001
From: Aaron Ecay <aarone...@gmail.com>
Date: Wed, 28 Aug 2013 11:50:53 -0400
Subject: [PATCH] Fix org-src-edit interaction with undo.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* org-src.el (org-edit-src-exit): Place an undo boundary before
writing changes back to parent buffer.
The previous code attempted to preserve the undo information in the
indirect buffer editing the source code, but this interacts poorly
with the undo system, and can lead to undo operations scrambling the
buffer. The new approach means that edits made in the indirect buffer
cannot be undone piece-by-piece (instead, all changes made in the
indirect buffer constitute one “change” from the point of view of
undo), but the misbehavior of undo is (hopefully) now avoided.
---
lisp/org-src.el | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lisp/org-src.el b/lisp/org-src.el
index 0f88174..96a413e 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -753,12 +753,12 @@ with \",*\", \",#+\", \",,*\" and \",,#+\"."
(kill-buffer buffer))
(goto-char beg)
(when allow-write-back-p
- (let ((buffer-undo-list t))
- (delete-region beg (max beg end))
- (unless (string-match "\\`[ \t]*\\'" code)
- (insert code))
- (goto-char beg)
- (if single (just-one-space))))
+ (undo-boundary)
+ (delete-region beg (max beg end))
+ (unless (string-match "\\`[ \t]*\\'" code)
+ (insert code))
+ (goto-char beg)
+ (if single (just-one-space)))
(if (memq t (mapcar (lambda (overlay)
(eq (overlay-get overlay 'invisible)
'org-hide-block))
--
1.8.4
--
Aaron Ecay
