Random cleanups

Author: dail8859

docs_gen/ExternalPluginSupport.md

@@ -7,9 +7,9 @@ Plugin developers are able to execute Lua code from their own plugins. Notepad++
 
 Information needed for LuaScript is defined in the custom struct defined [here](https://github.com/dail8859/LuaScript/blob/master/src/NppLuaScript.h).
 
- - `structVersion` - (reserved for future use) must always be `1`
- - `flags` - (reserved for future use) must always be `0`
- - `script` - UTF-8 encoded string. The meaning of this is dependent on the command executed.
+- `structVersion` - (reserved for future use) must always be `1`
+- `flags` - (reserved for future use) must always be `0`
+- `script` - UTF-8 encoded string. The meaning of this is dependent on the command executed.
 
 <br/>
 

docs_gen/ldoc.ltp

@@ -301,7 +301,7 @@
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>Generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.3</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc $(ldoc.version)</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 <footer>

examples/LuaAutoIndent.lua

@@ -3,7 +3,7 @@
 local decreaseIndentPattern = [[^\s*(elseif|else|end|\})\s*$]]
 local increaseIndentPattern = [[^\s*(else|elseif|for|(local\s+)?function|if|repeat|until|while)\b((?!end).)*$|\{\s*$]]
 
-do_increase = false
+local do_increase = false
 
 -- Get the start and end position of a specific line number
 local function getLinePositions(line_num)

scripts/IFaceTableGen.py

@@ -172,7 +172,7 @@ def GetScriptableInterface(f):
 	return (constants, funclist, proplist)
 
 
-def printIFaceTableCXXFile(faceAndIDs):
+def printIFaceTableCppFile(faceAndIDs):
 	out = []
 	f, ids = faceAndIDs
 	(constants, functions, properties) = GetScriptableInterface(f)
@@ -383,7 +383,7 @@ def RegenerateAll():
 	f = Face.Face()
 	f.ReadFromFile("Scintilla.iface")
 	#idsInOrder = idsFromDocumentation(srcRoot + "/scintilla/doc/ScintillaDoc.html")
-	Regenerate("../src/SciIFaceTable.cpp", "//", printIFaceTableCXXFile([f, []]))
+	Regenerate("../src/SciIFaceTable.cpp", "//", printIFaceTableCppFile([f, []]))
 	#Regenerate(srcRoot + "/scite/doc/PaneAPI.html", "<!--", printIFaceTableHTMLFile([f, menuIDs, idsInOrder]))
 
 if __name__=="__main__":

src/Dialogs/AboutDialog.cpp

@@ -23,12 +23,18 @@
 #include "Hyperlinks.h"
 #include "Version.h"
 
+#ifdef _WIN64
+#define BITNESS TEXT("(64 bit)")
+#else
+#define BITNESS TEXT("(32 bit)")
+#endif
+
 INT_PTR CALLBACK abtDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) {
 	switch(uMsg) {
 		case WM_INITDIALOG:
 			ConvertStaticToHyperlink(hwndDlg, IDC_GITHUB);
 			ConvertStaticToHyperlink(hwndDlg, IDC_README);
-			SetWindowText(GetDlgItem(hwndDlg, IDC_VERSION), TEXT("LuaScript v") VERSION_TEXT TEXT(" ") VERSION_STAGE);
+			SetWindowText(GetDlgItem(hwndDlg, IDC_VERSION), TEXT("LuaScript v") VERSION_TEXT TEXT(" ") VERSION_STAGE TEXT(" ") BITNESS);
 			return true;
 		case WM_COMMAND:
 			switch(LOWORD(wParam)) {

src/Dialogs/AboutDialog.h

@@ -23,4 +23,4 @@
 
 void ShowAboutDialog(HINSTANCE hInstance, const wchar_t *lpTemplateName, HWND hWndParent);
 
-#endif
+#endif

src/Dialogs/Hyperlinks.cpp

@@ -122,7 +122,7 @@ BOOL ConvertStaticToHyperlink(HWND hwndCtl)
 	HWND hwndParent = GetParent(hwndCtl);
 	if (NULL != hwndParent)
 	{
-		WNDPROC pfnOrigProc = (WNDPROC)GetWindowLongPtr(hwndParent, GWLP_WNDPROC);
+		WNDPROC pfnOrigProc = (WNDPROC) GetWindowLongPtr(hwndParent, GWLP_WNDPROC);
 		if (pfnOrigProc != _HyperlinkParentProc)
 		{
 			SetProp(hwndParent, PROP_ORIGINAL_PROC, (HANDLE) pfnOrigProc);

src/Dialogs/resource.rc

@@ -20,7 +20,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1
 {
 	PUSHBUTTON      "Close", IDOK, 86, 109, 50, 14
     GROUPBOX        "", IDC_VERSION, 10, 9, 201, 93, BS_CENTER
-    LTEXT           "Author : Justin Dailey <[email protected]>", IDC_STATIC, 30, 26, 180, 8
+    LTEXT           "Author: Justin Dailey <[email protected]>", IDC_STATIC, 30, 26, 180, 8
     LTEXT           "The LuaScript code is hosted on", IDC_STATIC, 30, 43, 180, 8
     LTEXT           "GitHub", IDC_GITHUB, 133, 43, 31, 8, SS_LEFT | SS_NOTIFY, WS_EX_LEFT
     LTEXT           "For detailed usage, see the ", IDC_STATIC, 30, 62, 180, 8