Merge branch 'master' of https://github.com/notepad-plus-plus/notepad-plus-plus

PowerEditor/src/ScitillaComponent/AutoCompletion.cpp

@@ -382,12 +382,15 @@ void AutoCompletion::getCloseTag(char *closeTag, size_t closeTagSize, size_t car
 	if (size_t(foundTextLen) > closeTagSize - 2) // buffer size is not large enough. -2 for '/' & '\0'
 		return;
 
-	char tagHead[3];
-	_pEditView->getText(tagHead, targetStart, targetStart+2);
+	char tagHead[5];
+	_pEditView->getText(tagHead, targetStart, targetStart+4);
 
 	if (tagHead[1] == '/') // "</toto>" will be ignored
 		return;
 
+	if (strncmp(tagHead, "<!--", 4) == 0) // Comments will be ignored
+		return;
+
 	char tagTail[2];
 	_pEditView->getText(tagTail, caretPos-2, caretPos-1);
 

PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp

@@ -3258,7 +3258,7 @@ LRESULT APIENTRY Progress::wndProc(HWND hwnd, UINT umsg, WPARAM wparam, LPARAM l
 		case WM_CREATE:
 		{
 			Progress* pw =(Progress*)((LPCREATESTRUCT)lparam)->lpCreateParams;
-			::SetWindowLongPtr(hwnd, GWLP_USERDATA, PtrToUlong(pw));
+			::SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)pw);
 			return 0;
 		}
 

PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.cpp

@@ -254,8 +254,8 @@ TCHAR * FileDialog::doSaveDlg()
 
 	_ofn.Flags |= OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY | OFN_ENABLESIZING;
 
-	_ofn.Flags |= OFN_ENABLEHOOK;
-	_ofn.lpfnHook = OFNHookProc;
+	//_ofn.Flags |= OFN_ENABLEHOOK;
+	//_ofn.lpfnHook = OFNHookProc;
 
 	TCHAR *fn = NULL;
 	try {

PowerEditor/src/langs.model.xml

@@ -234,7 +234,7 @@
             <Keywords name="type3">std ieee work standard textio std_logic_1164 std_logic_arith std_logic_misc std_logic_signed std_logic_textio std_logic_unsigned numeric_bit numeric_std math_complex math_real vital_primitives vital_timing</Keywords>
             <Keywords name="type4">boolean bit character severity_level integer real time delay_length natural positive string bit_vector file_open_kind file_open_status line text side width std_ulogic std_ulogic_vector std_logic std_logic_vector X01 X01Z UX01 UX01Z unsigned signed</Keywords>
         </Language>
-        <Language name="xml" ext="xml xaml xsl xslt xsd xul kml svg mxml xsml wsdl xlf xliff xbl sxbl pimx config vsixmanifest manifest proj csproj vbproj fsproj vcproj vcxproj nproj pyproj javaproj wixproj filters settings testsettings vsmdi ruleset rules targets props vsprops propdesc resx rdlc rdl xrm-ms sitemap swidtag gml gtt gpx plist" commentLine="" commentStart="&lt;!--" commentEnd="--&gt;">
+        <Language name="xml" ext="xml xaml xsl xslt xsd xul kml svg mxml xsml wsdl xlf xliff xbl sxbl sitemap gml gpx plist" commentLine="" commentStart="&lt;!--" commentEnd="--&gt;">
         </Language>
         <Language name="yaml" ext="yml yaml" commentLine="#">
         </Language>