Fixed winchar tests

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6430 212acab6-be3b-0410-9dea-997c60f758d6

Contrib/InstallOptions/InstallOptions.nsh

@@ -130,8 +130,6 @@ Macros and conversion functions for InstallOptions
 !endif
   !insertmacro INSTALLOPTIONS_WRITE "${FILE}" "Settings" "RTL" "$(^RTL)"
 
-  !verbose pop
-
 !macroend
 
 !macro INSTALLOPTIONS_EXTRACT_AS FILE FILENAME

Contrib/System/SysFunc.nsh

@@ -3,15 +3,13 @@
 ; (c) brainsucker, 2002
 ; (r) BSForce
 
-; Check for double includes
+
+!verbose push 3
 !ifndef SysFunc.NSH.Included
 !define SysFunc.NSH.Included
 
 !include "System.nsh"
-
-!verbose 3      ; For WinMessages especially
-  !include "WinMessages.nsh"
-!verbose 4
+!include "WinMessages.nsh"
 
 ; ================= GetInstallerExeName implementation =================
 
@@ -393,6 +391,5 @@ exit:
    System::Store "P0 l"
 FunctionEnd
 
-!verbose 4
-
-!endif
+!endif
+!verbose pop

Contrib/System/System.nsh

@@ -3,12 +3,10 @@
 ; (c) brainsucker, 2002
 ; (r) BSForce
 
-; Check for double includes
+!verbose push 3
 !ifndef System.NSH.Included
 !define System.NSH.Included
 
-!verbose 3
-
 !include WinCore.nsh
 
 ; ------------- Functions --------------
@@ -411,6 +409,5 @@ CheckCB_${CHKN}:
 ExitCB_${CHKN}:
 !macroend
 
-!verbose 4
-
-!endif
+!endif
+!verbose pop