Fix crash when building find string location bar if Wrap Long Lines is enabled.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25603 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
No need to expand tab to spaces when finding inline diff positions.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25610 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Add ad-hoc tab mode combobox in ribbon status bar.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25628 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Add default Use spaces and Smart tab char in Settings page.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25629 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Drop Use spaces and Smart tab char from ribbon toolbar.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25630 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Add EditorConfigWrapper class in TortoiseMerge.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25633 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Show whether EditorConfig is applied in ribbon status bar.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25634 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Use EditorConfig tabwidth and indentstyle settings.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25635 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Add default Enable EditorConfig in settings page.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25636 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
If reflected name is specified, use it for editorconfig.
This make it possible to apply editorconfig for temp file.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25638 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
If only one path is specified like it would happen if someone used the "open with" feature in explorer, pre-fill that path in the "open" dialog.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25657 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Fix calls to OnCaretMove().

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25710 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Ensure drawing of whitespace indicators is always right of the margin.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25712 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Improve auto-detection of tab-mode.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25713 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Add try-catch block around the use of CStdioFile.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25723 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Remove unused files.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25829 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Remove the no longer present file since r25829 from the project file.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25831 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Initialize member variables in constructors.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25833 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Add null-pointer checks.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25836 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Remove variable reassignments.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@25878 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac