From b9b981ab39810dbc44d0f8230bd7d26fc42453ea Mon Sep 17 00:00:00 2001
From: Ansgar Becker <ansgarbecker@users.noreply.github.com>
Date: Fri, 22 Apr 2011 08:01:53 +0000
Subject: [PATCH] Do not break column names with spaces with WordWrap(). Fixes
 issue #2390.

---
 source/main.pas | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/source/main.pas b/source/main.pas
index a7c88243..c570da18 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -7162,21 +7162,25 @@ end;
 
 procedure TMainForm.editFilterSearchChange(Sender: TObject);
 var
-  Clause: String;
+  Clause, Line: String;
   i: Integer;
   ed: TEdit;
 begin
   ed := TEdit(Sender);
   Clause := '';
   if ed.Text <> '' then begin
+    Line := '';
     for i:=0 to SelectedTableColumns.Count-1 do begin
       if i > 0 then
-        Clause := Clause + ' OR ';
-      Clause := Clause + ActiveConnection.QuoteIdent(SelectedTableColumns[i].Name) + ' LIKE ' + esc('%'+ed.Text+'%');
+        Line := Line + ' OR ';
+      Line := Line + ActiveConnection.QuoteIdent(SelectedTableColumns[i].Name) + ' LIKE ' + esc('%'+ed.Text+'%');
+      // Add linebreak near right window edge
+      if Length(Line) > SynMemoFilter.CharsInWindow-30 then begin
+        Clause := Clause + Line + CRLF;
+        Line := '';
+      end;
     end;
   end;
-  // Add linebreaks at near right window edge
-  Clause := WrapText(Clause, SynMemoFilter.CharsInWindow-5);
   SynMemoFilter.UndoList.AddGroupBreak;
   SynMemoFilter.SelectAll;
   SynMemoFilter.SelText := Clause;