Re: marge mistake 1.8.x from r26177

On 08.01.2015 19:29, kosuebi22_at_yahoo.co.jp wrote:
> Thank you very much, apply my patch.
>
> I think merge mistake at 1.8.x branch r26178 from r26177.
>
> Index: SciEdit.cpp
> ===================================================================
> --- SciEdit.cpp(revision 26183)
> +++ SciEdit.cpp(working copy)
> @@ -367,7 +367,7 @@
>
> void CSciEdit::SetFont(CString sFontName, int iFontSizeInPoints)
> {
> - CRegStdDWORD used2d(L"Software\\TortoiseSVN\\ScintillaDirect2D", TRUE);
> + CRegStdDWORD used2d(L"Software\\TortoiseSVN\\ScintillaDirect2D", FALSE);
> CStringA fontName;
> if (SysInfo::Instance().IsWin7OrLater() && DWORD(used2d))
> fontName = CUnicodeUtils::GetUTF8(sFontName);
>

Thanks, committed in r26190.

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest interface to (Sub)version control
   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3093942
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].