procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* ediff.el (ediff-regions-internal, ediff-documentation):

Browse source 
* ediff-vers.el (rcs-ediff-view-revision): Put temp buffer into
	fundamental mode.
This commit is contained in:
Dave Love 2000-11-10 22:34:22 +00:00
parent a82fe213e7
commit e4d2c13046
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ediff.el
View file

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