Commit Graph

62 Commits (adf02ca9ebd42bb2614b6a68a0c887f5d8f39285)

Author SHA1 Message Date
Christian Grasser eba913d887 Scintilla Namespace
- corrected missing scintilla namespaces
- activated usage of scintilla namespace in nmakefile and vcxproj

Closes #3033
2017-03-15 09:29:28 +01:00
Markus Heidelberg 6dab6621ba
Make Scintilla build properly with GCC/MinGW
Fix GCC compile error: extra qualification 'WordList::' on member 'SetWordAt' [-fpermissive]

Fix GCC compile error: a storage class can only be specified for objects and functions

Fix GCC compile error with invalid usage of conditional operator
  Invoke the "afterthought" part of the for loop in the normal code at the
  end of the loop where proper conditions can be used.
  Error message:
  third operand to the conditional operator is of type 'void', but the second operand
  is neither a throw-expression nor of type 'void'

closes #1656
closes #1655
2016-07-04 18:09:47 +09:00
don4d a82ad53e9c Update given examples 2016-06-20 12:22:47 +02:00
Don HO 5a5582b972 Make Scintilla 64-bit built with boost's pcre 2016-06-15 20:52:24 +02:00
Julien Nabet 7b596fa488 Fix some out of index errors
Closes #1851
[PowerEditor/src/Parameters.cpp:2581]: (warning) Array index -1 is out of bounds. Otherwise there is useless condition at line 2568.
[PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp:3079]: (style) Unused variable: newline
[PowerEditor/src/WinControls/Grid/BabyGrid.cpp:166]: (style) Array index 'j' is used before limits check.
[PowerEditor/src/WinControls/Grid/BabyGrid.cpp:171]: (style) Array index 'j' is used before limits check.
[scintilla/lexers/LexUser.cxx:1128]: (error) Array 'maskMapper[15]' accessed at index 15, which is out of bounds.
2016-05-16 13:25:16 +02:00
Christian Grasser d6c72fa3f7 Merge branch 'master' of https://github.com/notepad-plus-plus/notepad-plus-plus into x64_build_adaptions 2015-06-18 07:23:03 +02:00
Don Ho c0cd924c1e [BUG_FIXED] Fix js block not recognized in HTML 2015-06-13 18:23:12 +02:00
Christian Grasser a8a6f2c881 - avoid some compiler warning
- build also without SCI_OWNREGEX
2015-06-11 17:41:07 +02:00
Christian Grasser fdd2dbc21f - add npp boostregex dir/sources and define SCI_OWNREGEX
- add boost via nuget package
2015-06-11 17:37:54 +02:00
Christian Grasser a6e0dd9a53 adapted scintilla vs project to notepad++ naming of build configurations from
Debug -> Unicode Debug and Release -> Unicode Release, to hav a consistent look in VS solution
Used same
ToolsVersion="12.0"
and
<PlatformToolset>v120_xp</PlatformToolset>
2015-06-11 11:31:59 +02:00
Christian Grasser 9d9be045ae avoid access violation with empty string s -> length == 0 2015-06-11 11:22:05 +02:00
Christian Grasser e0bc440df7 - avoid compiler warning about unused parameter 2015-06-11 10:10:43 +02:00
Christian Grasser 2a9b099a08 - avoid build issue for unicode:
2>..\lexers\LexUser.cxx(1406): error C2664: 'void GenerateVector(vvstring &,const char *,char *,int)' : cannot convert argument 3 from 'const wchar_t [3]' to 'char *'
2>          Types pointed to are unrelated; conversion requires reinterpret_cast, C-style cast or function-style cast
2015-06-11 10:10:19 +02:00
Don Ho 4ac665d0ce [UPGRADE] Upgrade Scintilla from v3.34 to v3.56. 2015-06-07 23:19:26 +02:00
Don Ho 9de1967bf3 [BUG_FIXED] Fix a crash issue for old processors due to SSE2 instruction.
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1324 f5eea248-9336-0410-98b8-ebc06183d4e3
2014-12-31 22:58:26 +00:00
Don Ho b50d2a9a29 [NEW] Add VS 2013 support.
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1278 f5eea248-9336-0410-98b8-ebc06183d4e3
2014-10-14 22:29:23 +00:00
Don Ho 545f4f943f [UPDATE] (AUTHOR Chris Covier) Make Scintilla project compilable under VS2013.
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1199 f5eea248-9336-0410-98b8-ebc06183d4e3
2014-03-09 19:44:04 +00:00
Don Ho 4c6ea9795e [UPDATE] Remove an incorrect character.
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1169 f5eea248-9336-0410-98b8-ebc06183d4e3
2014-01-05 23:15:13 +00:00
Don Ho 01f3148e0e [UPDATE] (Author: Neomi) Remove unnecessary modification in Scintilla.
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1106 f5eea248-9336-0410-98b8-ebc06183d4e3
2013-09-02 08:30:29 +00:00
Don Ho 9e0bf8b63a [UPDATE] Rename "block comment" to "Single line comment" and "stream comment" to "block comment".
[UPDATE] Remove invalid command "Online Documentation".

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1105 f5eea248-9336-0410-98b8-ebc06183d4e3
2013-09-01 13:11:06 +00:00
Don Ho cb7806e94c [UPDATE] Update Scintilla to 3.3.4
[BUG_FIXED] (Author: Dave Brotherstone) Fix scintilla crash bug while closing a document.

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1104 f5eea248-9336-0410-98b8-ebc06183d4e3
2013-08-28 00:44:27 +00:00
Don Ho 5e122d0089 [BUG_FIXED] (Author: Ivan Radić - aka Loreia) UDL 2.1 minor bug fixed.
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1018 f5eea248-9336-0410-98b8-ebc06183d4e3
2013-02-02 16:29:30 +00:00
Don Ho d60466eed3 [BUG_FIXED] (Author: Ivan Radić - aka Loreia) UDL 2.1.
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1012 f5eea248-9336-0410-98b8-ebc06183d4e3
2013-01-27 01:03:53 +00:00
Don Ho ffdebe56ed [BUG_FIXED] (Author: François-R Boyer & Dave Brotherstone) Regex search and replace haning problem fix.
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1009 f5eea248-9336-0410-98b8-ebc06183d4e3
2013-01-25 00:46:29 +00:00
Don Ho bcb502808e [BUG_FIXED] (Author: Dave Brotherstone) Fix find "\r\n" in RegExpr mode.
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@990 f5eea248-9336-0410-98b8-ebc06183d4e3
2012-12-02 19:29:23 +00:00
Don Ho b31da09c2b [BUG_FIXED] (Author: Ivan Radić, aka Loreia)
- Expanded max array style from 24 to 30 (to accomodate for GlobalStyles).
- UDL Styler dialog has removed close cutton because it is causing application crash in Npp v.6.2
- Fixed bug where "Folder in code" keywords were detected even outside of commnets.
- Fixed bug where 0xfece57 was picked as number, but 0xfe57ce was not.


git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@972 f5eea248-9336-0410-98b8-ebc06183d4e3
2012-10-20 16:20:57 +00:00
Don Ho cc1c928b8c [BUG_FIXED] (Author: Ivan Radić, aka Loreia) Fix a minor issue of UDL2.
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@967 f5eea248-9336-0410-98b8-ebc06183d4e3
2012-10-07 21:49:52 +00:00
Don Ho a58e54bc68 [NEW_FEATURE] (Author: Loreia L.) New implementation of User Defined Language - UDL2.
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@960 f5eea248-9336-0410-98b8-ebc06183d4e3
2012-09-28 21:04:16 +00:00
Don Ho cac7e4ff24 [BUG_FIXED] (Author: John Burak) Fix xml syntax highlighting broken because of php preprocessor instruction inside.
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@920 f5eea248-9336-0410-98b8-ebc06183d4e3
2012-06-29 19:21:49 +00:00
Don Ho 71e2f0c9e3 [BUG_FIXED] (Author: Dave Brotherstone) Fix UTF-8 EOF detection for PCRE.
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@900 f5eea248-9336-0410-98b8-ebc06183d4e3
2012-04-23 23:43:48 +00:00
Don Ho 1282853ede [BUG_FiXED] (Author: Dave Brotherstone)Add a forgotten file.
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@899 f5eea248-9336-0410-98b8-ebc06183d4e3
2012-04-23 22:38:42 +00:00
Don Ho 1bb0c2f137 [BUG_FiXED] (Author: Dave Brotherstone)Add a forgotten file.
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@898 f5eea248-9336-0410-98b8-ebc06183d4e3
2012-04-23 21:58:47 +00:00
Don Ho 25cdfe770c [BUG_FiXED] (Author: Dave Brotherstone)Fix Scintilla compilation with boost v1.49 PCRE problem.
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@894 f5eea248-9336-0410-98b8-ebc06183d4e3
2012-04-15 01:50:56 +00:00
Don Ho dd2f32bb69 [FIXED_BUG] doc map: Fix moving problem.
doc map: Fix folding/unfolding problem.

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@866 f5eea248-9336-0410-98b8-ebc06183d4e3
2012-02-20 01:23:07 +00:00
Don Ho 91a40f059b [ADD] (Author: Dave Brotherstone) PCRE support (Add forgotten file).
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@865 f5eea248-9336-0410-98b8-ebc06183d4e3
2012-02-18 00:53:45 +00:00
Don Ho 3264a77ead [ENHANCEMENT] (Author: Dave Brotherstone) Enhance Scintilla compiling script for PCRE support.
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@864 f5eea248-9336-0410-98b8-ebc06183d4e3
2012-02-15 01:06:47 +00:00
Don Ho 7e0ed0ebf3 [NEW_FEATURE] (Author: Dave Brotherstone) Add PCRE (Perl Compatible Regular Expressions) support.
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@863 f5eea248-9336-0410-98b8-ebc06183d4e3
2012-02-13 01:45:05 +00:00
Don Ho 10dc4e06d7 [UPDATE] Update Scintilla to 2.27.
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@791 f5eea248-9336-0410-98b8-ebc06183d4e3
2011-07-17 22:30:49 +00:00
Don Ho d521e78ded [UPDATE] Adapt Scintilla VC6 makefile for the additional lexers that Notepad++ needs.
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@754 f5eea248-9336-0410-98b8-ebc06183d4e3
2011-04-28 21:22:35 +00:00
Don Ho 0152ded3ff [UPDATE] Scintilla update from 2.21 to 2.25
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@742 f5eea248-9336-0410-98b8-ebc06183d4e3
2011-03-22 00:16:49 +00:00
Don Ho a7f127dca0 [BUG_FIXED] (Author: Neil Hodgson) Fix for bug #3103936. Backwards search with code page 936 does not match at line start.
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@698 f5eea248-9336-0410-98b8-ebc06183d4e3
2010-11-09 19:27:26 +00:00
Don Ho 87bfb72d5e [UPDATE] Add Notepad++ lexer in VS6 project file.
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@687 f5eea248-9336-0410-98b8-ebc06183d4e3
2010-10-23 21:13:29 +00:00
Don Ho 9d9d64fb2c [BUG_FIXED] (Author: Neil Hodgson) Fix for bug #3065912 Fail to Search up when code.page = 936.
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@686 f5eea248-9336-0410-98b8-ebc06183d4e3
2010-10-23 18:33:49 +00:00
Don Ho 16c671a825 [BUG_FIXED] Fix VB syntax highlighting regression in asp script.
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@666 f5eea248-9336-0410-98b8-ebc06183d4e3
2010-09-16 23:09:05 +00:00
Don Ho 059f9977ef [UPDATE] Update Scintilla to v2.21.
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@662 f5eea248-9336-0410-98b8-ebc06183d4e3
2010-09-05 22:56:27 +00:00
Don Ho f602782337 [BUG_FIXED] Fix Lexer SearchResult syntax highlighting bug.
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@656 f5eea248-9336-0410-98b8-ebc06183d4e3
2010-08-27 01:01:10 +00:00
Don Ho c1ff1bfafb [UPDATE] Adapt LexObjC LexSearchResult and LexUser to a new configuration.
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@654 f5eea248-9336-0410-98b8-ebc06183d4e3
2010-08-22 02:20:44 +00:00
Don Ho d4d42f8a1a [UPDATE] Update Scintilla from 2.12 to 2.20
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@653 f5eea248-9336-0410-98b8-ebc06183d4e3
2010-08-21 23:59:56 +00:00
Don Ho 52e19bbb88 [UPDATE] Complete Scintilla source files.
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@641 f5eea248-9336-0410-98b8-ebc06183d4e3
2010-07-14 09:47:17 +00:00
Don Ho a2dd828443 [UPDATE] Update Scintilla from 2.0.1 to 2.1.2
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@640 f5eea248-9336-0410-98b8-ebc06183d4e3
2010-07-12 22:19:51 +00:00