From 9cc30829faae560f603a19065591176650a0babe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Van=20Canneyt?= <michael@freepascal.org>
Date: Wed, 21 Feb 2024 14:59:40 +0100
Subject: [PATCH] * Restore messages state

---
 compiler/globstat.pas | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/compiler/globstat.pas b/compiler/globstat.pas
index 2060311443..710f695f3b 100644
--- a/compiler/globstat.pas
+++ b/compiler/globstat.pas
@@ -81,7 +81,7 @@ procedure restore_global_state(state:tglobalstate;full:boolean);
 implementation
 
 uses
-  pbase,comphook;
+  switches, verbose, pbase,comphook;
 
 var
   states : array of tglobalstate;
@@ -159,6 +159,14 @@ var
       oldidtoken:=idtoken;
       old_block_type:=block_type;
       oldtokenpos:=current_tokenpos;
+      {
+        consuming the semicolon after a uses clause can add to the
+        pending state if the first directives change warning state.
+        So we must flush before context switch. See for example:
+        ppcgen/cgppc.pas
+        line 144 has a WARN 6018 OFF...
+      }
+      flushpendingswitchesstate;
       old_switchesstatestack:=switchesstatestack;
       old_switchesstatestackpos:=switchesstatestackpos;
 
@@ -167,7 +175,6 @@ var
 
       { save akt... state }
       { handle the postponed case first }
-      //flushpendingswitchesstate;
       oldcurrent_filepos:=current_filepos;
       old_settings:=current_settings;
       old_verbosity:=status.verbosity;
@@ -205,6 +212,9 @@ var
       current_filepos:=oldcurrent_filepos;
       current_settings:=old_settings;
       status.verbosity:=old_verbosity;
+      { restore message settings which were recorded prior to unit switch }
+
+      RestoreLocalVerbosity(current_settings.pmessage);
 
       if full then
         begin