Mercurial > emacs
changeset 87009:2039ff581b31
* ediff-util.el (ediff-setup):
* ediff-diff.el (ediff-prepare-error-list): Disable undo for
ediff-error-buffer.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Mon, 03 Dec 2007 09:29:00 +0000 |
| parents | 888320f5e3f7 |
| children | c0bf3a28db21 |
| files | lisp/ChangeLog lisp/ediff-diff.el lisp/ediff-util.el |
| diffstat | 3 files changed, 10 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Dec 03 09:28:15 2007 +0000 +++ b/lisp/ChangeLog Mon Dec 03 09:29:00 2007 +0000 @@ -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'.
--- a/lisp/ediff-diff.el Mon Dec 03 09:28:15 2007 +0000 +++ b/lisp/ediff-diff.el Mon Dec 03 09:29:00 2007 +0000 @@ -343,6 +343,7 @@ (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))
--- a/lisp/ediff-util.el Mon Dec 03 09:28:15 2007 +0000 +++ b/lisp/ediff-util.el Mon Dec 03 09:29:00 2007 +0000 @@ -396,6 +396,9 @@ (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