Changeset 4066

Timestamp:

Jun 16, 2020, 12:26:05 PM (5 years ago)

Author:

Andreas Schnellbacher

Message:

• Edit: Stop interpreter on multiple errors. That should avoid multiple MessageNWait calls.
• Edit: Improved file loading for Edit /n.
• Cleanup of saved und used file ids.

Location:

trunk/src/netlabs/macros

Files:

• edit.e (modified) (8 diffs)
• infoline.e (modified) (2 diffs)
• select.e (modified) (2 diffs)

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

@@ -660 +660 @@
                              -- Both values are set by defmain, if only
                              -- the unknown file was loaded (via xcom edit).
-   universal lastselectedfid
-
    edit_rc = ''
-   -- Reset lastselectedfid to avoid suppression of next ProcessSelect
-   lastselectedfid = ''
 
    do once = 1 to 1
@@ -709 +705 @@
 
       NumErrors = 0
-      FirstFid  = ''
+      firstfid  = ''
 
       fParseCmd = 1
@@ -919 +915 @@
                NumErrors = NumErrors + 1
             else
-               if FirstFid = '' then
-                  -- If rc = 0, then set FirstFid:
-                  getfileid FirstFid
+               if firstfid = '' then
+                  -- If rc = 0, then set firstfid:
+                  getfileid firstfid
                endif
             endif
@@ -932 +928 @@
       if FileSpec = '' & Cmd = '' & pos( '/n', lowcase( Options)) then
          call LoadFile( FileSpec, Options)
+         edit_rc = rc
+         if not edit_rc then
+            getfileid firstfid
+         endif
       endif
 
       if NumErrors > 1 then
          MessageNWait( MULTIPLE_ERRORS__MSG)
-      endif
-
-      dprintf( 'EDIT', 'arg( 1) = ['arg( 1)'], FirstFid = ['FirstFid'], ['FirstFid.filename']')
+         stop
+      endif
+
+      dprintf( 'EDIT', 'arg( 1) = ['arg( 1)'], firstfid = ['firstfid'], ['firstfid.filename']')
       -- If 1 or more files are loaded by the current Edit cmd
       -- (or if loadfile has returned rc = 0)
-      if FirstFid <> '' then
+      if firstfid <> '' then
          -- Set fid for ProcessFilesLoaded
-         firstloadedfid = FirstFid
+         firstloadedfid = firstfid
 
          -- Initialize firstinringfid if not already set by a previous Edit command
@@ -1206 +1207 @@
       .autosave = 0
       .visible = 0
-      firstloadedfid = ''
+      firstnewfid = ''
 
       -- Execute the lines
@@ -1229 +1230 @@
 
          'Edit /np 'LineStr
-         if firstloadedfid = '' then
+         if firstnewfid = '' then
             getfileid fid
             if fid <> listfid then
-               firstloadedfid = fid
+               firstnewfid = fid
             endif
          endif
@@ -1240 +1241 @@
       -- This makes other commands in the FileList need only one PostMe
       -- to be applied on this file.
-      if firstloadedfid <> '' then
-         if validatefileid( firstloadedfid) then
-            activatefile firstloadedfid
+      if firstnewfid <> '' then
+         if validatefileid( firstnewfid) then
+            activatefile firstnewfid
          endif
       endif
@@ -1248 +1249 @@
       -- Note: File loading takes some time. Therefore many commands
       -- won't give reliable results at this time. PostMe helps.
-      'PostMe CloseHiddenFile' listfid firstloadedfid  -- PostMe required
+      'PostMe CloseHiddenFile' listfid firstnewfid  -- PostMe required
    enddo
 

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

@@ -519 +519 @@
    universal lastselectedfid
    universal infolinerefresh  -- Disable refresh of infolines if = 0
-;   universal modifydisabled   -- Disable processing of defmodify code, if
-                               -- checked
+
    do once = 1 to 1
-      --if modifydisabled = 1 then
-      --   leave
-      --endif
       getfileid fid
-      -- Don't process the following on file switching (cases 4) and 5))
+      -- Don't process the following on file switching
       if fid <> lastselectedfid then
          leave
-      endif
-      if lastselectedfid = '' then
-         leave
-      endif
-
-      -- Init universal var if this is the first selected file
-      if lastselectedfid = '' then
-         lastselectedfid = fid
       endif
 
@@ -556 +544 @@
          'SetStatusLine'  -- update color of statusline
       endif
-
-      -- Commented out, because: The following would disable resetting the modify
-      -- state for tmp files, like .NEPMD_INFO. .modify is reset, but both the
-      -- title bar and the status bar color show the modified state.
-      -- ModifyDisabled = 1    -- Disable defmodify immediately
-      --'postme EnableModify'  -- Reenable defmodify delayed
    enddo
-
 
 ; ---------------------------------------------------------------------------

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

@@ -66 +66 @@
    endif
 
-   -- Suppress too early select events
+   -- Suppress too early select event for the automaticallay loaded file
    if loadstate = '' then
       dprintf( 'SELECT', 'suppress ProcessSelect for '.filename', fid = 'fid', loadstate = 'loadstate' (initial file)')
@@ -75 +75 @@
 
    if fid = lastselectedfid then
-      -- nop, ProcessSelect2 was already executed for this file
+      -- nop, ProcessSelect was already executed for this file
       dprintf( 'SELECT', 'suppress ProcessSelect for '.filename', fid = 'fid', loadstate = 'loadstate' (already processed)')
    else