* Grep improoved

This commit is contained in:
pierre 2000-03-02 22:33:36 +00:00
parent 002f25445d
commit 1c21c0f968
2 changed files with 18 additions and 3 deletions

View File

@ -204,6 +204,9 @@ begin
Insert(IL2); Insert(IL2);
R2.Move(0,-1); R2.Move(0,-1);
Insert(New(PLabel, Init(R2, '~G~rep arguments', IL2))); Insert(New(PLabel, Init(R2, '~G~rep arguments', IL2)));
R1.Assign(R2.B.X, R2.A.Y+1, R2.B.X+3, R2.B.Y+1);
Control := New(PHistory, Init(R1, IL2, GrepArgsId));
Insert(Control);
end; end;
InsertButtons(PGrepDialog); InsertButtons(PGrepDialog);
@ -219,6 +222,12 @@ begin
{ Linux ? } { Linux ? }
AddToolCommand(GrepExe+' -n '+GrepArgs); AddToolCommand(GrepExe+' -n '+GrepArgs);
ToFocus:=ToolMessages^.count-1; ToFocus:=ToolMessages^.count-1;
UpdateToolMessages;
if Assigned(MessagesWindow) then
MessagesWindow^.FocusItem(ToFocus);
showmsg:=true;
Messages;
if not ExecuteRedir(GrepExe,'-n '+GrepArgs,'',GrepOutName,GrepErrName) then if not ExecuteRedir(GrepExe,'-n '+GrepArgs,'',GrepOutName,GrepErrName) then
Begin Begin
{ 2 as exit code just means that { 2 as exit code just means that
@ -231,7 +240,6 @@ begin
end; end;
End; End;
{$I-} {$I-}
showmsg:=true;
Assign(GrepOut,GrepOutName); Assign(GrepOut,GrepOutName);
Reset(GrepOut); Reset(GrepOut);
error_in_reading:=false; error_in_reading:=false;
@ -283,7 +291,10 @@ end;
{ {
$Log$ $Log$
Revision 1.17 2000-02-10 00:48:02 pierre Revision 1.18 2000-03-02 22:33:36 pierre
* Grep improoved
Revision 1.17 2000/02/10 00:48:02 pierre
* avoid crash for empty string * avoid crash for empty string
Revision 1.16 2000/02/02 22:49:44 pierre Revision 1.16 2000/02/02 22:49:44 pierre

View File

@ -488,6 +488,7 @@ const
TextReplaceID = 106; TextReplaceID = 106;
GotoID = 107; GotoID = 107;
TextGrepId = 108; TextGrepId = 108;
GrepArgsId = 109;
{ used for ShiftDel and ShiftIns to avoid { used for ShiftDel and ShiftIns to avoid
GetShiftState to be considered for extending GetShiftState to be considered for extending
@ -5613,7 +5614,10 @@ end;
END. END.
{ {
$Log$ $Log$
Revision 1.81 2000-02-09 12:56:54 pierre Revision 1.82 2000-03-02 22:33:36 pierre
* Grep improoved
Revision 1.81 2000/02/09 12:56:54 pierre
* fix for DelChar past end of line * fix for DelChar past end of line
Revision 1.80 2000/02/07 12:11:15 pierre Revision 1.80 2000/02/07 12:11:15 pierre