Patch: No diff block in TMerge, ++

Hi,

Here's a patch with various fixes in TMerge. The original
idea was to get rid of the diff block and only keep the
selection block. This is done, but then one thing led to
another, and I ended up fixing a number of other things
as well.

Summary of changes:
* Removed the diff block. Now there's only the selection block, which
  can be moved between diffs using F7/s-F7.
* Correctly preserving origin of a text selection operation. Click+drag
  from lower left to upper right did not do so previously.
* Ensured that selection greyout does not appear in line diff bar.
* Unified a number of code fragments dealing with x adjustments due
  to tabs. Corrected a number of cases where the proper adjustments
  were not done.
* Selection block is now always absent in all views or on the same
  lines in all views, except after Find text. Context menu did not
  observe this.
* Introduced a goal x position for the caret, so that it returns to the
  original position after going by a shorter line.
* Unified code for search for next/prev diff/conflict into a single
  function
* Reduced code for Backspace/Delete by reusing RemoveSelection
* Changed the position where the empty block is inserted in left view
  on two-file "use both, this first/last" to get matching lines to line
  up.
* "Use whole this/other file" did not store all line statuses for undo
* Right-clicking to get a context menu and then copying text or not
  selecting an option would generate en empty undo stack entry.
* Keeping caret in view on single/double view switch.

Oddvar

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org