Changeset 2870

Timestamp:

Jan 14, 2018, 8:14:18 PM (7 years ago)

Author:

Andreas Schnellbacher

Message:

• ProsessSearchPos: Changed temp. removement of T and B search parameters. Now the cursor pos. can be changed manually without letting the search action start from the top (T) or bottom (B) again, if specified.
• Fixed error message "Invalid number argument" for defc Change.
• Cosmetic changes.

File:

• trunk/src/netlabs/macros/locate.e (modified) (12 diffs)

trunk/src/netlabs/macros/locate.e ¶

@@ -251 +251 @@
    -- This is executed before a search and can therefore check position.
    fFindNext = 0
-   do i = 1 to 1
+   do once = 1 to 1
 
       -- Remove FR+- from previous and next search options
@@ -273 +273 @@
       if fid <> LastFid then
          leave
-      endif
-      if PrevSearchString <> search_string then
+      elseif PrevSearchString <> search_string then
          leave
-      endif
-      if PrevOpts <> NextOpts then
-         leave
-      endif
-
-      -- If the cursor was moved manually after the last search, don't move it
-      -- before the next search.
-      if LastLine <> .line | LastCol <> .col then
+      elseif PrevOpts <> NextOpts then
          leave
       endif
@@ -311 +303 @@
       enddo
    endif
+
+   fCursorPosChanged = 0
+   do once = 1 to 1
+      -- If the cursor was moved manually after the last search, don't move it
+      -- before the next search.
+      if LastLine = .line & LastCol = .col then
+         leave
+      endif
+      fCursorPosChanged = 1
+   enddo
 
    -- FindNext or backward: Move cursor first to not find the just found string again
@@ -322 +324 @@
          --dprintf( '   ProcessSearchPos: Search mode: l -> c ==> leave')
          leave
-      endif
-
-      if fFindNext | not fForeward then
+      elseif fCursorPosChanged then
+         leave
+      elseif fFindNext | not fForeward then
          -- FindNext requires to move the cursor first, before the next search.
          -- Reverse search requires to move the cursor first, before the next search
@@ -407 +409 @@
             if .line = marklastline then
                if .col > marklastcol then
-               fSearch = 0
+                  fSearch = 0
+               endif
             endif
-         endif
          endif
       else
@@ -432 +434 @@
 ; search within a mark and
 ; o  recognizes if a search within a mark is restarted (and should rather be
-;    stpped)
+;    stopped)
 ; o  checks if found string is completely within the mark ((required for
 ;    char mark only))
@@ -571 +573 @@
 ; 'T' and 'B' in default_search_options for this locate command.
 ;
-; Moved from STDCMDS.E
 ; Note:  this DEFC also gets executed by the slash ('/') command and by the
 ; search dialog. The search dialog adds option 'D'.
@@ -725 +726 @@
 
 ; ---------------------------------------------------------------------------
-; Moved from STDCMDS.E
 defc RepeatChange, C, Change
    universal default_search_options
@@ -812 +812 @@
    fRestorePos = 1
 
-   OldLineLength = 0
-   NewLineLength = 0
+   OldLineLen = 0
+   NewLineLen = 0
    if fSearch then
       if pos( 'G', search_options) > 0 | pos( 'X', search_options) > 0 then
@@ -928 +928 @@
 
 ; ---------------------------------------------------------------------------
-; Moved from STDPROCS.E
 ; Highlight a "hit" after a Locate command or Repeat_find operation.
 ; Never used its previous arg(1) = search_len in 6.03b.
@@ -1095 +1094 @@
 
 ; ---------------------------------------------------------------------------
-; Moved from STDCTRL.E
 ; Can also be called with C or F as arg to repeat last change or find.
 /*
@@ -1528 +1526 @@
 
 ; ---------------------------------------------------------------------------
-; Moved from MOUSE.E
 ; Find identifier under cursor -- if arg(1) > 0: -- under pointer.
 defc FindToken