diff --git a/src/Notepad3.c b/src/Notepad3.c index 3328dc2e6..85c70d359 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -1996,9 +1996,9 @@ LRESULT MsgCreate(HWND hwnd, WPARAM wParam,LPARAM lParam) MRU_Load(Globals.pMRUreplace); if (Globals.hwndEdit == NULL || s_hwndEditFrame == NULL || - Globals.hwndStatus == NULL || Globals.hwndToolbar == NULL || s_hwndReBar == NULL) + Globals.hwndStatus == NULL || Globals.hwndToolbar == NULL || s_hwndReBar == NULL) { return -1LL; - + } Style_SetDefaultLexer(Globals.hwndEdit); ObserveNotifyChangeEvent(); @@ -2771,12 +2771,12 @@ LRESULT MsgCopyData(HWND hwnd, WPARAM wParam, LPARAM lParam) if (OpenFileDlg(Globals.hwndMain, tchFile, COUNTOF(tchFile), ¶ms->wchData)) bOpened = FileLoad(false, false, false, Settings.SkipUnicodeDetection, Settings.SkipANSICodePageDetection, false, tchFile); } - - else + else { bOpened = FileLoad(false, false, false, Settings.SkipUnicodeDetection, Settings.SkipANSICodePageDetection, false, ¶ms->wchData); - + } if (bOpened) { - if (params->flagChangeNotify == FWM_MSGBOX) { + if (params->flagChangeNotify == FWM_MSGBOX) + { FileWatching.FileWatchingMode = FWM_NONE; FileWatching.ResetFileWatching = true; InstallFileWatching(Globals.CurrentFile); diff --git a/src/Notepad3.rc b/src/Notepad3.rc index 2eda823de..ceba27ed0 100644 --- a/src/Notepad3.rc +++ b/src/Notepad3.rc @@ -156,9 +156,9 @@ BEGIN "O", IDM_EDIT_SENTENCECASE, VIRTKEY, CONTROL, ALT, NOINVERT "O", CMD_RECODEOEM, VIRTKEY, SHIFT, CONTROL, NOINVERT "P", IDM_FILE_PRINT, VIRTKEY, CONTROL, NOINVERT - "P", IDM_EDIT_COMPRESS_BLANKS, VIRTKEY, ALT, NOINVERT + "P", IDM_EDIT_COMPRESS_BLANKS, VIRTKEY, CONTROL, ALT, NOINVERT "P", CMD_DEFAULTWINPOS, VIRTKEY, SHIFT, CONTROL, NOINVERT - //~"P", MMMMMMMMMMMMMMMMMM, VIRTKEY, ALT, NOINVERT /// Menu(Appearance) + //~"P", IDM_EDIT_COMPRESS_BLANKS VIRTKEY, ALT, NOINVERT /// Menu(Appearance) "Q", IDM_EDIT_LINECOMMENT, VIRTKEY, CONTROL, NOINVERT "Q", IDM_EDIT_ENCLOSESELECTION, VIRTKEY, ALT, NOINVERT /// NO Menu "Q", IDM_EDIT_STREAMCOMMENT, VIRTKEY, SHIFT, CONTROL, NOINVERT