summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorDave Love <fx@gnu.org>2000-11-10 22:34:22 +0000
committerDave Love <fx@gnu.org>2000-11-10 22:34:22 +0000
commite4d2c130460a242c50264e3cc6e6beee9be42f44 (patch)
treefb191d7436e828c25b0ff0b891fb0c235d30bd65 /lisp
parenta82fe213e7358f7155bc84c5c37c67b08a359141 (diff)
* ediff.el (ediff-regions-internal, ediff-documentation):
* ediff-vers.el (rcs-ediff-view-revision): Put temp buffer into fundamental mode.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ediff.el6
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ediff.el b/lisp/ediff.el
index 140a80c6846..7146f564dad 100644
--- a/lisp/ediff.el
+++ b/lisp/ediff.el
@@ -4,7 +4,7 @@
;; Author: Michael Kifer <kifer@cs.sunysb.edu>
;; Created: February 2, 1994
-;; Keywords: comparing, merging, patching, version control.
+;; Keywords: comparing, merging, patching, tools, unix
(defconst ediff-version "2.75" "The current version of Ediff")
(defconst ediff-date "October 29, 2000" "Date of last update")
@@ -946,6 +946,8 @@ lines. For small regions, use `ediff-regions-wordwise'."
(and (< beg-B end-A) (<= end-A end-B)))) ; b-B e-A e-B
(progn
(with-output-to-temp-buffer ediff-msg-buffer
+ (ediff-with-current-buffer standard-output
+ (fundamental-mode))
(princ "
You have requested to compare overlapping regions of the same buffer.
@@ -1359,6 +1361,8 @@ With optional NODE, goes to that node."
(raise-frame (selected-frame)))
(error (beep 1)
(with-output-to-temp-buffer ediff-msg-buffer
+ (ediff-with-current-buffer standard-output
+ (fundamental-mode))
(princ ediff-BAD-INFO))
(if (window-live-p ctl-window)
(progn