Index: src/Edit.h
===================================================================
--- src/Edit.h	(revision 26)
+++ src/Edit.h	(working copy)
@@ -21,7 +21,7 @@


 // extern "C" declarations of Scintilla functions
-BOOL Scintilla_RegisterClasses(HINSTANCE);
+BOOL Scintilla_RegisterClasses(void *hInstance);
 BOOL Scintilla_ReleaseResources();


Index: src/Helpers.c
===================================================================
--- src/Helpers.c	(revision 26)
+++ src/Helpers.c	(working copy)
@@ -1576,6 +1576,10 @@
   }
   else
     pmru->pszItems[0] = StrDup(pszFile);
+
+  // Needed to make W7 jump lists work when NP2 is not explicitly associated
+  if (IsW7()) SHAddToRecentDocs(SHARD_PATHW, pszFile);
+
   return(1);
 }

Index: src/Notepad2.c
===================================================================
--- src/Notepad2.c	(revision 26)
+++ src/Notepad2.c	(working copy)
@@ -5781,7 +5781,7 @@
   if (IniSectionGetInt(pIniSection,L"NoFileVariables",0))
     fNoFileVariables = 1;

-  IniSectionGetString(pIniSection,L"ShellAppUserModelID",L"(default)",
+  IniSectionGetString(pIniSection,L"ShellAppUserModelID",L"Notepad2",
     g_wchAppUserModelID,COUNTOF(g_wchAppUserModelID));

   if (IniSectionGetInt(pIniSection,L"ShellUseSystemMRU",0))
Index: src/Styles.c
===================================================================
--- src/Styles.c	(revision 26)
+++ src/Styles.c	(working copy)
@@ -1738,7 +1738,7 @@

 void Style_SetLexerFromFile(HWND hwnd,LPCWSTR lpszFile)
 {
-  LPWSTR lpszExt;
+  LPWSTR lpszExt = PathFindExtension(lpszFile);
   BOOL  bFound = FALSE;
   PEDITLEXER pLexNew = pLexArray[iDefaultLexer];
   PEDITLEXER pLexSniffed;
@@ -1777,7 +1777,6 @@
     }
   }

-  lpszExt = PathFindExtension(lpszFile);
   if (!bFound && bAutoSelect && /* bAutoSelect == FALSE skips lexer search */
       (lpszFile && lstrlen(lpszFile) > 0 && *lpszExt)) {