Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Implement changes requested by HotKeyIt

- Bundled script now does not have a trailing newline
- If the compiler is uncompiled, it uses A_AhkPath for /iLib resolving
  • Loading branch information...
commit 4f66ec806f76e2915b6733db8dafb0044db9bbd1 1 parent 3345dd4
fincs authored December 23, 2011

Showing 1 changed file with 3 additions and 1 deletion. Show diff stats Hide diff stats

  1. 4  ScriptParser.ahk
4  ScriptParser.ahk
@@ -116,10 +116,12 @@ PreprocessScript(ByRef ScriptText, AhkScript, ExtraFiles, FileList="", FirstScri
116 116
 		Util_Status("Auto-including any functions called from a library...")
117 117
 		ilibfile = %A_Temp%\_ilib.ahk
118 118
 		FileDelete, %ilibfile%
119  
-		RunWait, "%A_ScriptDir%\..\AutoHotkey.exe" /iLib "%ilibfile%" "%AhkScript%", %FirstScriptDir%, UseErrorLevel
  119
+		static AhkPath := A_IsCompiled ? A_ScriptDir "\..\AutoHotkey.exe" : A_AhkPath
  120
+		RunWait, "%AhkPath%" /iLib "%ilibfile%" "%AhkScript%", %FirstScriptDir%, UseErrorLevel
120 121
 		IfExist, %ilibfile%
121 122
 			PreprocessScript(ScriptText, ilibfile, ExtraFiles, FileList, FirstScriptDir, Options)
122 123
 		FileDelete, %ilibfile%
  124
+		StringTrimRight, ScriptText, ScriptText, 1 ; remove trailing newline
123 125
 	}
124 126
 	
125 127
 	if OldWorkingDir

0 notes on commit 4f66ec8

Please sign in to comment.
Something went wrong with that request. Please try again.