diff --git a/components/codetools/finddeclarationtool.pas b/components/codetools/finddeclarationtool.pas
index d4647d8d4e..f3f76cc3f7 100644
--- a/components/codetools/finddeclarationtool.pas
+++ b/components/codetools/finddeclarationtool.pas
@@ -882,9 +882,10 @@ begin
     writeln(DebugPrefix,'TFindDeclarationTool.FindDeclaration C CleanCursorPos=',CleanCursorPos);
     {$ENDIF}
     // find CodeTreeNode at cursor
-    if (Tree.Root<>nil) and (Tree.Root.StartPos<CleanCursorPos) then
-      CursorNode:=FindDeepestNodeAtPos(CleanCursorPos,true)
-    else begin
+    if (Tree.Root<>nil) and (Tree.Root.StartPos<=CleanCursorPos) then begin
+      CursorNode:=FindDeepestNodeAtPos(CleanCursorPos,true);
+      CleanPosInFront:=CursorNode.StartPos;
+    end else begin
       CleanPosInFront:=1;
       CursorNode:=nil;
     end;
diff --git a/lcl/include/application.inc b/lcl/include/application.inc
index 7e753294f2..ca8524062c 100644
--- a/lcl/include/application.inc
+++ b/lcl/include/application.inc
@@ -302,6 +302,9 @@ begin
   end;
 end;
 
+{------------------------------------------------------------------------------
+  procedure TApplication.StopHintTimer;
+ ------------------------------------------------------------------------------}
 procedure TApplication.StopHintTimer;
 begin
   if FHintTimer<>nil then
@@ -311,7 +314,6 @@ end;
 
 {------------------------------------------------------------------------------
   procedure TApplication.NotifyIdleHandler;
-
  ------------------------------------------------------------------------------}
 procedure TApplication.NotifyIdleHandler;
 var
@@ -834,6 +836,9 @@ end;
 { =============================================================================
 
   $Log$
+  Revision 1.42  2002/12/17 11:56:09  mattias
+  fixed find declaration of non comment pos
+
   Revision 1.41  2002/02/09 01:48:23  mattias
   renamed TinterfaceObject.Init to AppInit and TWinControls can now contain childs in gtk