;;; ediff-util.el --- the core commands and utilities of ediff
;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
;; GNU Emacs is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
;; any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
(setq wind (ediff-get-visible-buffer-window cloned-buff))
(select-window wind)
(delete-other-windows)
+ (ediff-activate-mark)
(split-window-vertically)
(ediff-select-lowest-window)
(setq other-wind (selected-window))
(with-temp-buffer
(erase-buffer)
(insert
- (format "\n ******* Mark a region in buffer %s *******\n"
+ (format "\n ******* Mark a region in buffer %s (or confirm the existing one) *******\n"
(buffer-name cloned-buff)))
(insert
(ediff-with-current-buffer buff
(defun ediff-activate-mark ()
(ediff-cond-compile-for-xemacs-or-emacs
(zmacs-activate-region) ; xemacs
- (setq mark-active t) ; emacs
+ (progn
+ (make-local-variable 'transient-mark-mode)
+ (setq mark-active t
+ transient-mark-mode t) ; emacs
+ )
))
(cond ((fboundp 'nuke-selective-display)