On Saturday, May 28, 2022 at 4:18:44 PM UTC+2 [email protected] wrote:
> lördag 28 maj 2022 kl. 10:24:21 UTC+2 skrev Stefan: > >> thanks for all your patches! >> I went with option 4, I agree that's the best solution. >> > > (y), LGTM. > > I realise you reworked the patch a bit and removed GetWindowText > altogether (I thought about it but figured there was probably a reason it > was used). For the matter of consistency, should the same be applied to > MergeWizardTree? Something along the lines of [1]? > now that you mention it: yes there was (and is) a reason for using GetWindowText: GetString can return an empty string sometimes (e.g. when using up/down to select from the history without hitting return). Not always, but sometimes. So I'm going to change this back to using GetWindowText again and then trim the string from newlines. > > TortoiseMerge seems to look at Software\TortoiseMerge\ContextLines (from > the settings dialog), which I havn't set, and thus gets a default value of > 0 from src/TortoiseMerge/MainFrm.cpp line 2950. I'm attaching a proposed > patch [2] to change this to three, which seems a better default. There were > a few additional places in the code looking at the above reg key, but with > a default value of 1 that I didn't change. I'm not sure if it makes sense > to have different default values for the same registry key. The attached > patch [3] should change the default setting in the Settings dialog to 3 as > well. > Thanks! I've applied your patches. If you would register at osdn.net I can give you commit access so you can commit your fixes yourself :) Stefan -- You received this message because you are subscribed to the Google Groups "TortoiseSVN-dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn-dev/4364ce60-f55b-4f2b-8aad-cbfea94df3c9n%40googlegroups.com.
