Hi, This patch series applies on top of the ignore-blank patch sent earlier. The basic idea is that by tracking not only where the cursor is, but also where it is in terms of diff chunks, we can enable several nice features and bits of user feedback. Patches 1 and 3 are just cleanups. The interesting stuff is in patch 2, which adds the cursor tracking and uses it to do sensitivity setting of Up/Down actions. It looks like a lot of code to do sensitivity setting, but the real benefits are that this enables the features in later patches. Review and feedback on patches 1-3 would be greatly appreciated. Patches 4-7 (sent separately to avoid list size limit) aren't yet ready - they're provided partially as a proof-of-concept, and partially so that people can give feedback on the features. We get a "x of y" style status bar display for difference indices in patch 4, and subtle highlighting of the currently focused chunk in patch 5. The actually cool stuff is in 6 & 7, which adds a first pass at keyboard-based merging. There are still some bugs here (notably in three-way merging), and a few bits are missing (e.g., switching panes is needed), but it should be at least somewhat usable. cheers, Kai
Attachment:
0001-Use-gtk.TextView.scroll_to_mark-rather-than-home-gro.patch
Description: Binary data
Attachment:
0002-Add-detailed-cursor-handling-and-use-for-Up-Down-se.patch
Description: Binary data
Attachment:
0003-Use-cursor-struct-in-current-line-highlighting.patch
Description: Binary data