Changeset [17ef8da6589d3cde8a2d7952a83cba19b236024c] by Jocelyn Legault

October 8th, 2010 @ 03:11 AM

Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-5.7

[NEW_FEATURE]

  • Add line wrap methods.
  • Make folding margin hidable.
  • One set of settings are applied in 2 scintilla controls.

Conflicts:

PowerEditor/src/Notepad_plus.cpp
PowerEditor/src/Notepad_plus.h
PowerEditor/src/NppCommands.cpp
PowerEditor/src/Parameters.h
PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp
PowerEditor/src/ScintillaComponent/ScintillaEditView.h
PowerEditor/src/ScitillaComponent/ScintillaRef.h
PowerEditor/src/WinControls/Preference/preference.rc
PowerEditor/src/WinControls/Preference/preferenceDlg.cpp
PowerEditor/src/WinControls/Preference/preferenceDlg.h
PowerEditor/src/WinControls/Preference/preference_rc.h

[#45]

Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/17ef8da6589d3cde8a2d795...

Committed by Jocelyn Legault

  • M PowerEditor/src/Notepad_plus.cpp
  • M PowerEditor/src/Notepad_plus.h
  • M PowerEditor/src/Notepad_plus_Window.cpp
  • M PowerEditor/src/NppBigSwitch.cpp
  • M PowerEditor/src/NppCommands.cpp
  • M PowerEditor/src/Parameters.cpp
  • M PowerEditor/src/Parameters.h
  • M PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp
  • M PowerEditor/src/ScintillaComponent/ScintillaEditView.h
  • M PowerEditor/src/ScintillaComponent/ScintillaRef.h
  • M PowerEditor/src/WinControls/Preference/preference.rc
  • M PowerEditor/src/WinControls/Preference/preferenceDlg.cpp
  • M PowerEditor/src/WinControls/Preference/preference_rc.h
  • M PowerEditor/src/menuCmdID.h
New-ticket Create new ticket

Create your profile

Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป

Notepad++ Community Release

Shared Ticket Bins