diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index 28b4666db..70bffea63 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -2401,7 +2401,6 @@ void Notepad_plus::command(int id) case IDM_EDIT_COPY: _pEditView->execute(WM_COPY); - this->_mainEditView.canGoRight(); checkClipboard(); break; @@ -2409,7 +2408,6 @@ void Notepad_plus::command(int id) { int eolMode = int(_pEditView->execute(SCI_GETEOLMODE)); _pEditView->execute(SCI_PASTE); - //if (!(_pEditView->getCurrentBuffer()).isBin()) _pEditView->execute(SCI_CONVERTEOLS, eolMode); } break; diff --git a/PowerEditor/src/ScitillaComponent/ScintillaEditView.h b/PowerEditor/src/ScitillaComponent/ScintillaEditView.h index 43b08b8c4..01bd432ba 100644 --- a/PowerEditor/src/ScitillaComponent/ScintillaEditView.h +++ b/PowerEditor/src/ScitillaComponent/ScintillaEditView.h @@ -37,6 +37,14 @@ #define WM_MOUSEHWHEEL 0x020E #endif //WM_MOUSEHWHEEL +#ifndef WM_APPCOMMAND +#define WM_APPCOMMAND 0x0319 +#define APPCOMMAND_BROWSER_BACKWARD 1 +#define APPCOMMAND_BROWSER_FORWARD 2 +#define FAPPCOMMAND_MASK 0xF000 +#define GET_APPCOMMAND_LPARAM(lParam) ((short)(HIWORD(lParam) & ~FAPPCOMMAND_MASK)) +#endif //WM_APPCOMMAND + class NppParameters; #define NB_WORD_LIST 4 @@ -726,7 +734,7 @@ protected: setLexer(SCLEX_LISP, L_LISP, "lisp", LIST_0); }; - void setShemeLexer(){ + void setSchemeLexer(){ setLexer(SCLEX_LISP, L_SCHEME, "lisp", LIST_0); };