Mercurial > emacs
changeset 33390:d574be791ed3
* ediff.el (ediff-regions-internal, ediff-documentation):
* ediff-vers.el (rcs-ediff-view-revision): Put temp buffer into
fundamental mode.
author | Dave Love <fx@gnu.org> |
---|---|
date | Fri, 10 Nov 2000 22:34:22 +0000 |
parents | ebf2995faea1 |
children | f8c8c2d3538e |
files | lisp/ediff.el |
diffstat | 1 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ediff.el Fri Nov 10 22:19:12 2000 +0000 +++ b/lisp/ediff.el Fri Nov 10 22:34:22 2000 +0000 @@ -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 @@ (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 @@ (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