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

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c381247b9b6541c675964d3a672f06838ce972ac..aeec1d29cb144483d00c5fb5c84b6644101fe757 100644 (file)
--- 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 a835fb8e75096c63f4e4a68e043b3f0304c7dbff..1b51b440f05d4457b327569bcd2d797f5350cd65 100644 (file)
--- 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 2c8d2468419334b9ac6a61d2cbe8e495a36434f5..f3e5a250f9e6fb6bba79619600658086e50292d0 100644 (file)
--- 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