mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-28 07:45:00 +00:00
Code Issues Releases Activity

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

Browse Source 
* ediff-diff.el (ediff-prepare-error-list): Disable undo for
ediff-error-buffer.
This commit is contained in:
Dan Nicolaescu 2007-12-03 09:29:00 +00:00
parent 1682490ce8
commit e392d1cc57
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/ChangeLog
View File

@ -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'.

1
lisp/ediff-diff.el
View File

@ -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))

3
lisp/ediff-util.el
View File

@ -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