Fix stuff in new lexers found by regexlint.

1 files changed, 75 insertions, 75 deletions

diff --git a/pygments/lexers/foxpro.py b/pygments/lexers/foxpro.py
index 8973adba..51cd499b 100644
--- a/pygments/lexers/foxpro.py
+++ b/pygments/lexers/foxpro.py
@@ -127,15 +127,15 @@ class FoxProLexer(RegexLexer):
              r'_THROTTLE|_TOOLBOX|_TOOLTIPTIMEOUT|_TRANSPORT|_TRIGGERLEVEL|'
              r'_UNIX|_VFP|_WINDOWS|_WIZARD|_WRAP', Keyword.Pseudo),
 
-            (r'THIS|THISFORM|THISFORMSET', Name.Builtin),
+            (r'THISFORMSET|THISFORM|THIS', Name.Builtin),
 
             (r'Application|CheckBox|Collection|Column|ComboBox|'
-             r'CommandButton|CommandGroup|Container|Control|Cursor|'
-             r'CursorAdapter|Custom|DataEnvironment|DataObject|EditBox|'
-             r'Empty|Exception|Fields|File|Files|Form|FormSet|FoxCode|'
+             r'CommandButton|CommandGroup|Container|Control|CursorAdapter|'
+             r'Cursor|Custom|DataEnvironment|DataObject|EditBox|'
+             r'Empty|Exception|Fields|Files|File|FormSet|Form|FoxCode|'
              r'Grid|Header|Hyperlink|Image|Label|Line|ListBox|Objects|'
-             r'OptionButton|OptionGroup|Page|PageFrame|Project|ProjectHook|'
-             r'Projects|Relation|ReportListener|Separator|Server|Servers|'
+             r'OptionButton|OptionGroup|PageFrame|Page|ProjectHook|Projects|'
+             r'Project|Relation|ReportListener|Separator|Servers|Server|'
              r'Session|Shape|Spinner|Tables|TextBox|Timer|ToolBar|'
              r'XMLAdapter|XMLField|XMLTable', Name.Class),
 
@@ -144,7 +144,7 @@ class FoxProLexer(RegexLexer):
 
             (r'\.(ActiveColumn|ActiveControl|ActiveForm|ActivePage|'
              r'ActiveProject|ActiveRow|AddLineFeeds|ADOCodePage|Alias|'
-             r'Align|Alignment|AllowAddNew|AllowAutoColumnFit|'
+             r'Alignment|Align|AllowAddNew|AllowAutoColumnFit|'
              r'AllowCellSelection|AllowDelete|AllowHeaderSizing|'
              r'AllowInsert|AllowModalMessages|AllowOutput|AllowRowSizing|'
              r'AllowSimultaneousFetch|AllowTabs|AllowUpdate|'
@@ -154,11 +154,11 @@ class FoxProLexer(RegexLexer):
              r'AutoIncrement|AutoOpenTables|AutoRelease|AutoSize|'
              r'AutoVerbMenu|AutoYield|BackColor|ForeColor|BackStyle|'
              r'BaseClass|BatchUpdateCount|BindControls|BorderColor|'
-             r'BorderStyle|BorderWidth|Bound|BoundColumn|BoundTo|'
-             r'BreakOnError|BufferMode|BufferModeOverride|'
+             r'BorderStyle|BorderWidth|BoundColumn|BoundTo|Bound|'
+             r'BreakOnError|BufferModeOverride|BufferMode|'
              r'BuildDateTime|ButtonCount|Buttons|Cancel|Caption|'
              r'Centered|Century|ChildAlias|ChildOrder|ChildTable|'
-             r'Class|ClassLibrary|ClipControls|Closable|CLSID|CodePage|'
+             r'ClassLibrary|Class|ClipControls|Closable|CLSID|CodePage|'
              r'ColorScheme|ColorSource|ColumnCount|ColumnLines|'
              r'ColumnOrder|Columns|ColumnWidths|CommandClauses|'
              r'Comment|CompareMemo|ConflictCheckCmd|ConflictCheckType|'
@@ -166,11 +166,11 @@ class FoxProLexer(RegexLexer):
              r'ControlSource|ConversionFunc|Count|CurrentControl|'
              r'CurrentDataSession|CurrentPass|CurrentX|CurrentY|'
              r'CursorSchema|CursorSource|CursorStatus|Curvature|'
-             r'Database|DataSession|DataSessionID|DataSource|'
-             r'DataSourceType|DataType|DateFormat|DateMark|Debug|'
-             r'DeclareXMLPrefix|DEClass|DEClassLibrary|Default|'
-             r'DefaultFilePath|DefOLELCID|DeleteCmd|DeleteCmdDataSource|'
-             r'DeleteCmdDataSourceType|DeleteMark|Description|Desktop|'
+             r'Database|DataSessionID|DataSession|DataSourceType|'
+             r'DataSource|DataType|DateFormat|DateMark|Debug|'
+             r'DeclareXMLPrefix|DEClassLibrary|DEClass|DefaultFilePath|'
+             r'Default|DefOLELCID|DeleteCmdDataSourceType|DeleteCmdDataSource|'
+             r'DeleteCmd|DeleteMark|Description|Desktop|'
              r'Details|DisabledBackColor|DisabledForeColor|'
              r'DisabledItemBackColor|DisabledItemForeColor|'
              r'DisabledPicture|DisableEncode|DisplayCount|'
@@ -183,112 +183,112 @@ class FoxProLexer(RegexLexer):
              r'DynamicFontShadow|DynamicFontSize|DynamicInputMask|'
              r'DynamicLineHeight|EditorOptions|Enabled|'
              r'EnableHyperlinks|Encrypted|ErrorNo|Exclude|Exclusive|'
-             r'FetchAsNeeded|FetchMemo|FetchMemoCmdList|'
-             r'FetchMemoDataSource|FetchMemoDataSourceType|FetchSize|'
-             r'FileClass|FileClassLibrary|FillColor|FillStyle|Filter|'
+             r'FetchAsNeeded|FetchMemoCmdList|FetchMemoDataSourceType|'
+             r'FetchMemoDataSource|FetchMemo|FetchSize|'
+             r'FileClassLibrary|FileClass|FillColor|FillStyle|Filter|'
              r'FirstElement|FirstNestedTable|Flags|FontBold|FontItalic|'
              r'FontStrikethru|FontUnderline|FontCharSet|FontCondense|'
              r'FontExtend|FontName|FontOutline|FontShadow|FontSize|'
              r'ForceCloseTag|Format|FormCount|FormattedOutput|Forms|'
              r'FractionDigits|FRXDataSession|FullName|GDIPlusGraphics|'
              r'GridLineColor|GridLines|GridLineWidth|HalfHeightCaption|'
-             r'HeaderClass|HeaderClassLibrary|HeaderHeight|Height|'
-             r'HelpContextID|HideSelection|Highlight|HighlightBackColor|'
-             r'HighlightForeColor|HighlightStyle|HighlightRow|'
-             r'HighlightRowLineWidth|HomeDir|Hours|HostName|'
-             r'HScrollSmallChange|hWnd|Icon|Increment|IncrementalSearch|'
-             r'InitialSelectedAlias|InputMask|InsertCmd|'
-             r'InsertCmdDataSource|InsertCmdDataSourceType|'
-             r'InsertCmdRefreshCmd|InsertCmdRefreshFieldList|'
-             r'InsertCmdRefreshKeyFieldList|Instancing|IntegralHeight|'
+             r'HeaderClassLibrary|HeaderClass|HeaderHeight|Height|'
+             r'HelpContextID|HideSelection|HighlightBackColor|'
+             r'HighlightForeColor|HighlightStyle|HighlightRowLineWidth|'
+             r'HighlightRow|Highlight|HomeDir|Hours|HostName|'
+             r'HScrollSmallChange|hWnd|Icon|IncrementalSearch|Increment|'
+             r'InitialSelectedAlias|InputMask|InsertCmdDataSourceType|'
+             r'InsertCmdDataSource|InsertCmdRefreshCmd|'
+             r'InsertCmdRefreshFieldList|InsertCmdRefreshKeyFieldList|'
+             r'InsertCmd|Instancing|IntegralHeight|'
              r'Interval|IMEMode|IsAttribute|IsBase64|IsBinary|IsNull|'
              r'IsDiffGram|IsLoaded|ItemBackColor,|ItemData|ItemIDData|'
              r'ItemTips|IXMLDOMElement|KeyboardHighValue|KeyboardLowValue|'
              r'Keyfield|KeyFieldList|KeyPreview|KeySort|LanguageOptions|'
-             r'Left|LeftColumn|LineContents|LineNo|LineSlant|LinkMaster|'
-             r'List|ListCount|ListenerType|ListIndex|ListItem|ListItemID|'
-             r'LockColumns|LockColumnsLeft|LockScreen|MacDesktop|'
+             r'LeftColumn|Left|LineContents|LineNo|LineSlant|LinkMaster|'
+             r'ListCount|ListenerType|ListIndex|ListItemID|ListItem|'
+             r'List|LockColumnsLeft|LockColumns|LockScreen|MacDesktop|'
              r'MainFile|MapN19_4ToCurrency|MapBinary|MapVarchar|Margin|'
              r'MaxButton|MaxHeight|MaxLeft|MaxLength|MaxRecords|MaxTop|'
-             r'MaxWidth|MDIForm|MemberClass|MemberClassLibrary|'
+             r'MaxWidth|MDIForm|MemberClassLibrary|MemberClass|'
              r'MemoWindow|Message|MinButton|MinHeight|MinWidth|'
              r'MouseIcon|MousePointer|Movable|MoverBars|MultiSelect|'
              r'Name|NestedInto|NewIndex|NewItemID|NextSiblingTable|'
-             r'NoCpTrans|NoData|NoDataOnLoad|NullDisplay|'
+             r'NoCpTrans|NoDataOnLoad|NoData|NullDisplay|'
              r'NumberOfElements|Object|OLEClass|OLEDragMode|'
              r'OLEDragPicture|OLEDropEffects|OLEDropHasData|'
              r'OLEDropMode|OLEDropTextInsertion|OLELCID|'
              r'OLERequestPendingTimeout|OLEServerBusyRaiseError|'
              r'OLEServerBusyTimeout|OLETypeAllowed|OneToMany|'
-             r'OpenViews|OpenWindow|Optimize|Order|OrderDirection|'
+             r'OpenViews|OpenWindow|Optimize|OrderDirection|Order|'
              r'OutputPageCount|OutputType|PageCount|PageHeight|'
              r'PageNo|PageOrder|Pages|PageTotal|PageWidth|'
-             r'Panel|PanelLink|Parent|ParentAlias|ParentClass|'
-             r'ParentTable|Partition|PasswordChar|Picture|'
-             r'PictureMargin|PicturePosition|PictureSpacing|'
-             r'PictureSelectionDisplay|PictureVal|Prepared|'
+             r'PanelLink|Panel|ParentAlias|ParentClass|ParentTable|'
+             r'Parent|Partition|PasswordChar|PictureMargin|'
+             r'PicturePosition|PictureSpacing|PictureSelectionDisplay|'
+             r'PictureVal|Picture|Prepared|'
              r'PolyPoints|PreserveWhiteSpace|PreviewContainer|'
-             r'PrintJobName|Procedure|PROCESSID|ProgID|ProjectHook|'
-             r'ProjectHookClass|ProjectHookLibrary|QuietMode|'
+             r'PrintJobName|Procedure|PROCESSID|ProgID|ProjectHookClass|'
+             r'ProjectHookLibrary|ProjectHook|QuietMode|'
              r'ReadCycle|ReadLock|ReadMouse|ReadObject|ReadOnly|'
-             r'ReadSave|ReadTimeout|RecordMark|RecordSource|'
-             r'RecordSourceType|RefreshAlias|RefreshCmd|'
-             r'RefreshCmdDataSource|RefreshCmdDataSourceType|'
+             r'ReadSave|ReadTimeout|RecordMark|RecordSourceType|'
+             r'RecordSource|RefreshAlias|'
+             r'RefreshCmdDataSourceType|RefreshCmdDataSource|RefreshCmd|'
              r'RefreshIgnoreFieldList|RefreshTimeStamp|RelationalExpr|'
              r'RelativeColumn|RelativeRow|ReleaseType|Resizable|'
              r'RespectCursorCP|RespectNesting|RightToLeft|RotateFlip|'
-             r'Rotation|RowColChange|RowHeight|RowSource|'
-             r'RowSourceType|ScaleMode|SCCProvider|SCCStatus|ScrollBars|'
-             r'Seconds|SelectCmd|Selected|SelectedID|'
-             r'SelectedItemBackColor|SelectedItemForeColor|'
+             r'Rotation|RowColChange|RowHeight|RowSourceType|'
+             r'RowSource|ScaleMode|SCCProvider|SCCStatus|ScrollBars|'
+             r'Seconds|SelectCmd|SelectedID|'
+             r'SelectedItemBackColor|SelectedItemForeColor|Selected|'
              r'SelectionNamespaces|SelectOnEntry|SelLength|SelStart|'
-             r'SelText|SendGDIPlusImage|SendUpdates|ServerClass|'
-             r'ServerClassLibrary|ServerHelpFile|ServerName|'
+             r'SelText|SendGDIPlusImage|SendUpdates|ServerClassLibrary|'
+             r'ServerClass|ServerHelpFile|ServerName|'
              r'ServerProject|ShowTips|ShowInTaskbar|ShowWindow|'
              r'Sizable|SizeBox|SOM|Sorted|Sparse|SpecialEffect|'
              r'SpinnerHighValue|SpinnerLowValue|SplitBar|StackLevel|'
-             r'StartMode|StatusBar|StatusBarText|Stretch|StrictDateEntry|'
+             r'StartMode|StatusBarText|StatusBar|Stretch|StrictDateEntry|'
              r'Style|TabIndex|Tables|TabOrientation|Tabs|TabStop|'
              r'TabStretch|TabStyle|Tag|TerminateRead|Text|Themes|'
-             r'ThreadID|TimestampFieldList|TitleBar|ToolTipText|Top|'
-             r'TopIndex|TopItemID|TwoPassProcess|Type|TypeLibCLSID|'
-             r'TypeLibDesc|TypeLibName|Unicode|UpdatableFieldList|'
-             r'UpdateCmd|UpdateCmdDataSource|UpdateCmdDataSourceType|'
+             r'ThreadID|TimestampFieldList|TitleBar|ToolTipText|'
+             r'TopIndex|TopItemID|Top|TwoPassProcess|TypeLibCLSID|'
+             r'TypeLibDesc|TypeLibName|Type|Unicode|UpdatableFieldList|'
+             r'UpdateCmdDataSourceType|UpdateCmdDataSource|'
              r'UpdateCmdRefreshCmd|UpdateCmdRefreshFieldList|'
-             r'UpdateCmdRefreshKeyFieldList|UpdateGram|'
-             r'UpdateGramSchemaLocation|UpdateNameList|UpdateType|'
+             r'UpdateCmdRefreshKeyFieldList|UpdateCmd|'
+             r'UpdateGramSchemaLocation|UpdateGram|UpdateNameList|UpdateType|'
              r'UseCodePage|UseCursorSchema|UseDeDataSource|UseMemoSize|'
-             r'UserValue|UseTransactions|UTF8Encoded|Value|Version|'
-             r'VersionComments|VersionCompany|VersionCopyright|'
-             r'VersionDescription|VersionNumber|VersionProduct|'
-             r'VersionTrademarks|VFPXMLProgID|ViewPortHeight|ViewPortLeft|'
+             r'UserValue|UseTransactions|UTF8Encoded|Value|VersionComments|'
+             r'VersionCompany|VersionCopyright|VersionDescription|'
+             r'VersionNumber|VersionProduct|VersionTrademarks|Version|'
+             r'VFPXMLProgID|ViewPortHeight|ViewPortLeft|'
              r'ViewPortTop|ViewPortWidth|VScrollSmallChange|View|Visible|'
-             r'VisualEffect|WhatsThisButton|WhatsThisHelp|WhatsThisHelpID|'
+             r'VisualEffect|WhatsThisButton|WhatsThisHelpID|WhatsThisHelp|'
              r'WhereType|Width|WindowList|WindowState|WindowType|WordWrap|'
              r'WrapCharInCDATA|WrapInCDATA|WrapMemoInCDATA|XMLAdapter|'
-             r'XMLConstraints|XMLName|XMLNameIsXPath|XMLNamespace|'
+             r'XMLConstraints|XMLNameIsXPath|XMLNamespace|XMLName|'
              r'XMLPrefix|XMLSchemaLocation|XMLTable|XMLType|'
              r'XSDfractionDigits|XSDmaxLength|XSDtotalDigits|'
              r'XSDtype|ZoomBox)', Name.Attribute),
 
-            (r'\.(ActivateCell|Add|Add|AddColumn|AddItem|AddListItem|'
-             r'AddObject|AddProperty|AddTableSchema|AddToSCC|'
+            (r'\.(ActivateCell|AddColumn|AddItem|AddListItem|AddObject|'
+             r'AddProperty|AddTableSchema|AddToSCC|Add|'
              r'ApplyDiffgram|Attach|AutoFit|AutoOpen|Box|Build|'
              r'CancelReport|ChangesToCursor|CheckIn|CheckOut|Circle|'
-             r'CleanUp|Clear|ClearData|ClearStatus|CloneObject|Close|'
-             r'CloseTables|Cls|CursorAttach|CursorDetach|CursorFill|'
+             r'CleanUp|ClearData|ClearStatus|Clear|CloneObject|CloseTables|'
+             r'Close|Cls|CursorAttach|CursorDetach|CursorFill|'
              r'CursorRefresh|DataToClip|DelayedMemoFetch|DeleteColumn|'
              r'Dock|DoMessage|DoScroll|DoStatus|DoVerb|Drag|Draw|Eval|'
              r'GetData|GetDockState|GetFormat|GetKey|GetLatestVersion|'
              r'GetPageHeight|GetPageWidth|Help|Hide|IncludePageInOutput|'
-             r'IndexToItemID|Item|ItemIDToIndex|LoadXML|Line|Modify|'
-             r'Move|MoveItem|Nest|OLEDrag|OnPreviewClose|OutputPage|'
+             r'IndexToItemID|ItemIDToIndex|Item|LoadXML|Line|Modify|'
+             r'MoveItem|Move|Nest|OLEDrag|OnPreviewClose|OutputPage|'
              r'Point|Print|PSet|Quit|ReadExpression|ReadMethod|'
-             r'RecordRefresh|Refresh|Release|ReleaseXML|Remove|'
-             r'RemoveFromSCC|RemoveItem|RemoveListItem|RemoveObject|'
-             r'Render|Requery|RequestData|Reset|ResetToDefault|Run|'
-             r'SaveAs|SaveAsClass|SetAll|SetData|SetFocus|SetFormat|'
-             r'SetMain|SetVar|SetViewPort|Show|ShowWhatsThis|'
+             r'RecordRefresh|Refresh|ReleaseXML|Release|RemoveFromSCC|'
+             r'RemoveItem|RemoveListItem|RemoveObject|Remove|'
+             r'Render|Requery|RequestData|ResetToDefault|Reset|Run|'
+             r'SaveAsClass|SaveAs|SetAll|SetData|SetFocus|SetFormat|'
+             r'SetMain|SetVar|SetViewPort|ShowWhatsThis|Show|'
              r'SupportsListenerType|TextHeight|TextWidth|ToCursor|'
              r'ToXML|UndoCheckOut|Unnest|UpdateStatus|WhatsThisMode|'
              r'WriteExpression|WriteMethod|ZOrder)', Name.Function),
@@ -327,9 +327,9 @@ class FoxProLexer(RegexLexer):
              r'dbc_BeforeRenameView|dbc_BeforeValidateData|'
              r'dbc_CloseData|dbc_Deactivate|dbc_ModifyData|dbc_OpenData|'
              r'dbc_PackData|DblClick|Deactivate|Deleted|Destroy|DoCmd|'
-             r'DownClick|DragDrop|DragOver|DropDown|Error|ErrorMessage|'
+             r'DownClick|DragDrop|DragOver|DropDown|ErrorMessage|Error|'
              r'EvaluateContents|GotFocus|Init|InteractiveChange|KeyPress|'
-             r'Load|LoadReport|LostFocus|Message|MiddleClick|MouseDown|'
+             r'LoadReport|Load|LostFocus|Message|MiddleClick|MouseDown|'
              r'MouseEnter|MouseLeave|MouseMove|MouseUp|MouseWheel|Moved|'
              r'OLECompleteDrag|OLEDragOver|OLEGiveFeedback|OLESetData|'
              r'OLEStartDrag|OnMoveItem|Paint|ProgrammaticChange|'
@@ -337,7 +337,7 @@ class FoxProLexer(RegexLexer):
              r'QueryRunFile|QueryUnload|RangeHigh|RangeLow|ReadActivate|'
              r'ReadDeactivate|ReadShow|ReadValid|ReadWhen|Resize|'
              r'RightClick|SCCInit|SCCDestroy|Scrolled|Timer|UIEnable|'
-             r'UnDock|Unload|UnloadReport|UpClick|Valid|When)', Name.Function),
+             r'UnDock|UnloadReport|Unload|UpClick|Valid|When)', Name.Function),
 
             (r'\s+', Text),
             # everything else is not colored