[Emacs-diffs] Changes to emacs/lisp/ediff-util.el,v

[Michael Kifer]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Michael Kifer <kifer>   07/01/23 20:56:57

Index: ediff-util.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ediff-util.el,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- ediff-util.el       21 Jan 2007 03:53:11 -0000      1.70
+++ ediff-util.el       23 Jan 2007 20:56:57 -0000      1.71
@@ -3346,13 +3346,14 @@
     (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
@@ -4059,7 +4060,11 @@
 (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)