mirror of
				https://github.com/arkenfox/user.js.git
				synced 2025-11-03 23:35:26 +01:00 
			
		
		
		
	Add files via upload (#474)
This commit is contained in:
		@@ -192,7 +192,6 @@ REM ############ Merge function ############
 | 
			
		||||
:merge
 | 
			
		||||
SETLOCAL DisableDelayedExpansion
 | 
			
		||||
FOR /F tokens^=2^,^*^ delims^=^'^" %%G IN ('FINDSTR /R /C:"^user_pref[ 	]*\([ 	]*[\"'].*[\"'][ 	]*,.*\)[ 	]*;" "%~1"') DO (SET "[%%G]=%%H")
 | 
			
		||||
 | 
			
		||||
FOR /F tokens^=2^,^*^ delims^=^' %%G IN ('FINDSTR /R /C:"^//// --- comment-out --- '[^'][^']*'.*" "%~1"') DO (SET "__unset__%%G=1")
 | 
			
		||||
(
 | 
			
		||||
	FOR /F "tokens=1,* delims=:" %%I IN ('FINDSTR /N "^" "%~1"') DO (
 | 
			
		||||
@@ -206,7 +205,6 @@ FOR /F tokens^=2^,^*^ delims^=^' %%G IN ('FINDSTR /R /C:"^//// --- comment-out -
 | 
			
		||||
			) ELSE (
 | 
			
		||||
				ENDLOCAL
 | 
			
		||||
				FOR /F tokens^=2^ delims^=^'^" %%K IN ("%%J") DO (
 | 
			
		||||
				
 | 
			
		||||
					IF NOT "_user.js.parrot"=="%%K" (
 | 
			
		||||
						IF DEFINED __unset__%%K (
 | 
			
		||||
							ECHO://%%J
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user