Project: FAR manager
Revision: 1946
Author: skirda
Date: 10 Aug 2008 14:43:17
Changes:mix
Files:modified: /trunk/unicode_far/keyboard.cpp (
try)
modified: /trunk/unicode_far/hotplug.cpp (
try)
modified: /trunk/unicode_far/vbuild.m4 (
try)
modified: /trunk/unicode_far/changelog (
try)
modified: /trunk/unicode_far/editor.cpp (
try)
modified: /trunk/unicode_far/farlang.templ (
try)
| ...... | @@ -1406,11 +1406,16 @@ |
| 1406 | 1406 | // |
| ...... | @@ -170,9 +170,10 @@ |
| 170 | 170 | if(HotPlugList.GetItemCount() > 0)
|
| 171 | 171 | {
|
| 172 | 172 | BlockExtKey blockExtKey;
|
| 173 | int bResult;
|
| 173 | 174 |
|
| 174 | 175 | I=(int)(INT_PTR)HotPlugList.GetUserData(NULL,0);
|
| 175 | | if(RemoveHotplugDevice(pInfo[I].hDevInst,pInfo[I].dwDriveMask,EJECT_NOTIFY_AFTERREMOVE) == 1)
|
| 176 | if((bResult=RemoveHotplugDevice(pInfo[I].hDevInst,pInfo[I].dwDriveMask,EJECT_NOTIFY_AFTERREMOVE)) == 1)
|
| 176 | 177 | {
|
| 177 | 178 | HotPlugList.Hide();
|
| 178 | 179 | if(pInfo)
|
| ...... | @@ -180,6 +181,13 @@ |
| 180 | 181 | pInfo=NULL;
|
| 181 | 182 | RefreshHotplugMenu(pInfo,HotPlugList);
|
| 182 | 183 | }
|
| 184 | else if (bResult != -1)
|
| 185 | {
|
| 186 | SetLastError(ERROR_DRIVE_LOCKED); // ... |
| ...... | @@ -1 +1 @@ |
| 0 | | m4_define(BUILD,545)m4_dnl |
| 0 | m4_define(BUILD,546)m4_dnl |
| ...... | @@ -1,3 +1,17 @@ |
| 1 | svs 10.08.2008 23:29:07 +0300 - build 546
|
| 2 |
|
| 3 | 1. Mantis#0000577: |
| ...... | @@ -6055,7 +6055,7 @@ |
| 6055 | 6055 | int CopySize=Length-TBlockX;
|
| 6056 | 6056 | if (CopySize>TBlockSizeX)
|
| 6057 | 6057 | CopySize=TBlockSizeX;
|
| 6058 | | AddUndoData(CurPtr->GetStringAddrW(),CurPtr->GetEOL(),BlockStartLine+Line,0,UNDO_EDIT);
|
| 6058 | AddUndoData(CurPtr->GetStringAddrW(),CurPtr->GetEOL(),BlockStartLine+Line,CurLine->GetCurPos(),UNDO_EDIT);
|
| 6059 | 6059 | BlockUndo=TRUE;
|
| 6060 | 6060 | ::Xlat(CurPtr->Str,TBlockX,TBlockX+CopySize,CurPtr->TableSet,Opt.XLat.Flags);
|
| 6061 | 6061 | }
|
| ...... | @@ -6078,7 +6078,7 @@ |
| 6078 | 6078 | break;
|
| 6079 | 6079 | if(EndSel == -1)
|
| 6080 | 6080 | EndSel=StrLength(CurPtr->Str);
|
| 6081 | | AddUndoData(CurPtr->GetStringAddrW(),CurPtr->GetEOL(),BlockStartLine+Line,0,UNDO_EDIT);
|
| 6081 | AddUndoData(CurPtr->GetStringAddrW(),CurPtr->GetEOL(),BlockStartLine+Line,CurLine->GetCurPos(),UNDO_EDIT);
|
| 6082 | 6082 | ::Xlat(CurPtr->Str,StartSel,EndSel,CurPtr->TableSet,Opt.XLat.Flags);
|
| 6083 | 6083 | BlockUndo=TRUE;
|
| 6084 | 6084 | Line++;
|
To list