Commit 279c800c authored by Michael Kifer's avatar Michael Kifer
Browse files

2007-01-23 Michael Kifer <kifer@cs.stonybrook.edu>

	* ediff-util.el (ediff-clone-buffer-for-region-comparison): change text
	of message. Activate mark.
	(ediff-activate-mark): set transient-mark-mode to t.

	* ediff.el (ediff-regions-wordwise,ediff-regions-linewise): changed
	docstrings.

	* viper-keym.el (viper-insert-basic-map): deleted binding for S-TAB.
parent 9671c13a
2007-01-23 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-keym.el (viper-insert-basic-map): deleted binding for S-TAB.
* ediff-util.el (ediff-clone-buffer-for-region-comparison): change text
of message. Activate mark.
(ediff-activate-mark): set transient-mark-mode to t.
* ediff.el (ediff-regions-wordwise,ediff-regions-linewise): changed
docstrings.
2007-01-23 Martin Rudalics <rudalics@gmx.at>
 
* help-fns.el (describe-variable): Don't suppress display of
......@@ -3346,13 +3346,14 @@ Without an argument, it saves customized diff argument, if available
(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 @@ Mail anyway? (y or n) ")
(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)
......
......@@ -922,10 +922,7 @@ If WIND-B is nil, use window next to WIND-A."
;;;###autoload
(defun ediff-regions-wordwise (buffer-A buffer-B &optional startup-hooks)
"Run Ediff on a pair of regions in specified buffers.
Regions \(i.e., point and mark\) are assumed to be set in advance except
for the second region in the case both regions are from the same buffer.
In such a case the user is asked to interactively establish the second
region.
Regions \(i.e., point and mark\) can be set in advance or marked interactively.
This function is effective only for relatively small regions, up to 200
lines. For large regions, use `ediff-regions-linewise'."
(interactive
......@@ -966,10 +963,7 @@ lines. For large regions, use `ediff-regions-linewise'."
;;;###autoload
(defun ediff-regions-linewise (buffer-A buffer-B &optional startup-hooks)
"Run Ediff on a pair of regions in specified buffers.
Regions \(i.e., point and mark\) are assumed to be set in advance except
for the second region in the case both regions are from the same buffer.
In such a case the user is asked to interactively establish the second
region.
Regions \(i.e., point and mark\) can be set in advance or marked interactively.
Each region is enlarged to contain full lines.
This function is effective for large regions, over 100-200
lines. For small regions, use `ediff-regions-wordwise'."
......
......@@ -308,8 +308,6 @@ If running in a terminal, [(escape)] is not understood, so must use \"\\e\"."
(define-key viper-insert-basic-map "\C-d" 'viper-backward-indent)
(define-key viper-insert-basic-map "\C-w" 'viper-delete-backward-word)
(define-key viper-insert-basic-map "\C-t" 'viper-forward-indent)
(define-key viper-insert-basic-map
(if viper-xemacs-p [(shift tab)] [S-tab]) 'viper-insert-tab)
(define-key viper-insert-basic-map viper-quoted-insert-key 'quoted-insert)
(define-key viper-insert-basic-map "\C-?" 'viper-del-backward-char-in-insert)
(define-key viper-insert-basic-map [backspace] 'viper-del-backward-char-in-insert)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment