* ediff-util.el (ediff-setup):

* ediff-diff.el (ediff-prepare-error-list): Disable undo for
ediff-error-buffer.

3 files changed, 10 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c381247b9b6..aeec1d29cb1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-03  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * ediff-util.el (ediff-setup):
+        * ediff-diff.el (ediff-prepare-error-list): Disable undo for
+        ediff-error-buffer.
+
 2007-12-03  Tassilo Horn  <tassilo@member.fsf.org>
 
         * doc-view.el (doc-view-initiate-display): Use `doc-view-mode-p'.
diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el
index a835fb8e750..1b51b440f05 100644
--- a/lisp/ediff-diff.el
+++ b/lisp/ediff-diff.el
@@ -343,6 +343,7 @@ one optional arguments, diff-number to refine.")
             (get-buffer-create (ediff-unique-buffer-name
                                 "*ediff-errors" "*"))))
   (ediff-with-current-buffer ediff-error-buffer
+    (setq buffer-undo-list t)
     (erase-buffer)
     (insert (ediff-with-current-buffer diff-buff (buffer-string)))
     (goto-char (point-min))
diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el
index 2c8d2468419..f3e5a250f9e 100644
--- a/lisp/ediff-util.el
+++ b/lisp/ediff-util.el
@@ -396,6 +396,9 @@ to invocation.")
       (setq ediff-error-buffer
             (get-buffer-create (ediff-unique-buffer-name "*ediff-errors" "*")))
 
+      (with-current-buffer ediff-error-buffer
+        (setq buffer-undo-list t))
+
       (ediff-with-current-buffer buffer-A (ediff-strip-mode-line-format))
       (ediff-with-current-buffer buffer-B (ediff-strip-mode-line-format))
       (if ediff-3way-job