Merge lp:~masmullin/scintilla-cocoa/updates into lp:scintilla-cocoa

[masmullin]

Updates from http://scintilla.hg.sourceforge.net:8000/hgroot/scintilla/scintilla
+ a build fix when SCI_LEXER is defined on cocoa

Notes:
Updating will require TDM 4.5 when doing a windows build. This code breaks 4.4.1

[masmullin (masmullin)]

Proposing because CS3376 and CS3377 are important. Plus it fixes a cocoa specific build break.

[lp:~masmullin/scintilla-cocoa/updates]

50. By masmullin on 2010-08-19

update to changeset 3396

51. By masmullin on 2010-08-28

update to 3400 from http://scintilla.hg.sourceforge.net:8000/hgroot/scintilla/scintilla

52. By masmullin on 2010-09-06

Pull changes from http://scintilla.hg.sourceforge.net:8000/hgroot/scintilla/scintilla changeset 3406

53. By masmullin on 2010-09-12

pull from http://scintilla.hg.sourceforge.net:8000/hgroot/scintilla/scintilla changeset 3409

54. By masmullin on 2010-09-19

pulled from http://scintilla.hg.sourceforge.net:8000/hgroot/scintilla/scintilla @ cs:3413

55. By masmullin on 2010-09-19

oops, forgot this one, goes with previous submit.

56. By masmullin on 2010-10-08

pull all new changes from the official trunk of scintilla-cocoa (lp:scintilla-cocoa). This rebases us with lp:scintilla-cocoa

57. By masmullin on 2010-10-08

pull from http://scintilla.hg.sourceforge.net:8000/hgroot/scintilla/scintilla cs3425

[Mike Lischke (mike-lischke)]

I'm sorry for the long period since this patch could be reviewed.

Regarding this patch: please resubmit only the build fix. Updates from the main Scintilla repository will be done by me and merged to the LP (and other) repositories.

Thank you.

review: Needs Resubmitting

[masmullin (masmullin)]

No worries Mike. Since I'm going to be grabbing changes from main scintilla more often than your main LP I thought the least I could do to "give back" is start up a code review for the merges I've done, and hopefully save you a few hours of merging tedium.

I'll start up a code review for the build fix shortly.

[lp:~masmullin/scintilla-cocoa/updates]

58. By masmullin on 2010-12-20

pull from sourceforge scintilla @ changeset 3481

59. By masmullin on 2011-02-04

pull from http://scintilla.hg.sourceforge.net:8000/hgroot/scintilla/scintilla @ CS 3528

60. By masmullin on 2011-03-27

pull from head @ CS 3583

61. By masmullin on 2011-05-10

synced to CS 3648

62. By masmullin on 2011-06-01

sync to http://scintilla.hg.sourceforge.net:8000/hgroot/scintilla/scintilla @ CS 3676

63. By masmullin on 2011-07-28

pull from http://scintilla.hg.sourceforge.net:8000/hgroot/scintilla/scintilla @ CS 3810

64. By masmullin on 2011-07-28

http://scintilla.hg.sourceforge.net:8000/hgroot/scintilla/scintilla @ 3810... forgot the main.xib

65. By masmullin on 2011-08-02

update to cs 3814 from http://scintilla.hg.sourceforge.net:8000/hgroot/scintilla/scintilla

66. By Michael Mullin <email address hidden> on 2011-08-02

I needed this change to compile clang-2.9 on ubuntu 11.04

67. By masmullin on 2011-08-30

manual merge from lp:scintilla-cocoa

68. By masmullin on 2011-08-30

more manual merging from lp:scintilla-cocoa

69. By masmullin on 2011-08-30

automated merge

70. By masmullin on 2013-08-22

Grabbed from the scintilla trunk @ http://hg.code.sf.net/p/scintilla/code

71. By masmullin on 2014-01-24

Pull from hg clone http://hg.code.sf.net/p/scintilla/code scintilla-code on Jan 23 9:43pm (parent: 4968:7cb4eedf5a84 tip)

72. By masmullin on 2014-01-24

goes with previous commit

73. By masmullin on 2014-01-24

make it easier to merge next time

Unmerged revisions

73. By masmullin on 2014-01-24

make it easier to merge next time

72. By masmullin on 2014-01-24

goes with previous commit

71. By masmullin on 2014-01-24

Pull from hg clone http://hg.code.sf.net/p/scintilla/code scintilla-code on Jan 23 9:43pm (parent: 4968:7cb4eedf5a84 tip)

70. By masmullin on 2013-08-22

Grabbed from the scintilla trunk @ http://hg.code.sf.net/p/scintilla/code

69. By masmullin on 2011-08-30

automated merge

68. By masmullin on 2011-08-30

more manual merging from lp:scintilla-cocoa

67. By masmullin on 2011-08-30

manual merge from lp:scintilla-cocoa

66. By Michael Mullin <email address hidden> on 2011-08-02

I needed this change to compile clang-2.9 on ubuntu 11.04

65. By masmullin on 2011-08-02

update to cs 3814 from http://scintilla.hg.sourceforge.net:8000/hgroot/scintilla/scintilla

64. By masmullin on 2011-07-28

http://scintilla.hg.sourceforge.net:8000/hgroot/scintilla/scintilla @ 3810... forgot the main.xib

=== removed file '.bzrignore'
--- .bzrignore	2009-05-20 12:52:54 +0000
+++ .bzrignore	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-cocoa/ScintillaTest/ScintillaTest.xcodeproj/Mike.mode2v3
-cocoa/ScintillaTest/ScintillaTest.xcodeproj/Mike.pbxuser
-*.mode2v3
-*.pbxuser
-.DS_Store
-cocoa/ScintillaTest/build
-bin
-bin
-*.perspectivev3
-cocoa/ScintillaFramework/build
 
=== added file '.hgeol'
--- .hgeol	1970-01-01 00:00:00 +0000
+++ .hgeol	2014-01-24 04:00:28 +0000
@@ -0,0 +1,42 @@
+[patterns]
+**.cxx = native
+**.cpp = native
+**.c = native
+**.h = native
+**.m = native
+**.mm = native
+**.iface = native
+**.template = native
+**.mk = native
+**.py = native
+**.rc = native
+**.html = native
+**.bat = native
+**.mak = native
+**.def = native
+**.manifest = native
+**.properties = native
+**.styled = native
+**.asp = native
+**.php = native
+**.vb = native
+**.d = native
+**.lua = native
+**.rb = native
+**.pl = native
+**.txt = native
+**.pch = native
+**.hgeol = native
+**.dsp = native
+**.sln = native
+**.vcproj = native
+**.pro = native
+**.gen = native
+**makefile = native
+README = native
+**.bmp = BIN
+**.cur = BIN
+**.ico = BIN
+**.jpg = BIN
+**.png = BIN
+tgzsrc = LF
 
=== renamed file '.hgeol' => '.hgeol.moved'
=== added file '.hgignore'
--- .hgignore	1970-01-01 00:00:00 +0000
+++ .hgignore	2014-01-24 04:00:28 +0000
@@ -0,0 +1,59 @@
+syntax: glob
+*.o
+*.a
+*.lib
+*.obj
+*.pyc
+*.dll
+*.dylib
+*.framework
+*.pyd
+*.exp
+*.lib
+*.pdb
+*.res
+*.bak
+*.sbr
+*.suo
+*.idb
+*.bsc
+*.intermediate.manifest
+*.lastbuildstate
+*.cache
+*.ilk
+*.ncb
+*.tlog
+*.sdf
+gtk/*.plist
+win32/*.plist
+*.opt
+*.plg
+*.pbxbtree
+*.mode1v3
+*.pbxuser
+*.pbproj
+*.log
+*.xcbkptlist
+*.xcscheme
+*.xcworkspacedata
+*.xcuserstate
+*.xcsettings
+xcschememanagement.plist
+.DS_Store
+cocoa/build
+cocoa/ScintillaFramework/build
+cocoa/ScintillaTest/build
+macosx/SciTest/build
+*.cppcheck
+Makefile.Debug
+Makefile.Release
+*_resource.rc
+moc_*
+*.pro.user
+ScintillaEdit.cpp
+ScintillaEdit.h
+ScintillaConstants.py
+ScintillaEditBase.intermediate.manifest
+ScintillaEdit.intermediate.manifest
+qt/*/Makefile
+cov-int
 
=== renamed file '.hgignore' => '.hgignore.moved'
=== added file '.hgtags'
--- .hgtags	1970-01-01 00:00:00 +0000
+++ .hgtags	2014-01-24 04:00:28 +0000
@@ -0,0 +1,95 @@
+01f406ccdce315e9870c44036e18ebf0fa74df22 rel-1-64
+038d4e745187fddd764fda49b12b878ece14c0bd rel-1-63
+03dff61592cf2abbabd9e383f1c8417af3e9d87b rel-1-34
+11a62bd24819d0044dcf4b8621f79924cab781bd rel-1-56
+1804bf43c2443fb8db7468a36e8022891dfc32c5 rel-1-73
+1c4055eaf77fb0e2730adcba2b04a9c40318bdf1 rel-1-74
+2abff14b87854b56df577a96d6d87e06bbb44251 rel-1-27
+3a80173ef6320433ac4ab05ff97774f186d878ba rel-1-75
+4107ec8a3a14b68b832dd12ce568d6517da063f1 rel-2-03
+4479fb32e7238069d4ed81d7e586b6bcbc2a94ce rel-1-39
+4af05ea4430505d34c9832313c1e5aaac7a54237 rel-1-61
+4b0ff01c39b7b9c7aa65d1965bd49daaffe05ea8 rel-1-40
+4ec090359e447b59d24c3e970fc9faede13ec187 rel-1-45
+4f3e52891003743da45d4464020f59849240d278 rel-1-37
+4f77dabcfbab1de33dc2ef89029a4536a1c6c697 rel-1-25
+4ff6778c456258929c6f9074bdc03d90c28968bf rel-2-00
+58c51367e4127167fe7be54681b788618732d65b rel-1-51
+668816d0fd5d75dee228bca98b183969c4b1de53 rel-1-52
+67a79ce06212780dc0592bbcf3a3172244cf18c8 rel-1-76
+67aaa980e972a75e9aa11e1fbfe66b4b9c1d78fe rel-1-48
+6a3e91c35d19e241621c10b2a37c6233e33c1c0a rel-1-66
+6a3e91c35d19e241621c10b2a37c6233e33c1c0a rel-1-66-carbon
+6aa816d746280a68821eb90efad0fb5f2d3b751e rel-1-35
+6b44857e410f45ad5c9e9b48a481fb902c20a2dc rel-1-26
+6b9c7f104c6160507212e5412ba79ecffc6f9057 initial
+7681410bf25abb8fa8f51552fd61ec83bdf1a8b0 rel-1-65
+7c87fe602c2c1fd973eb89675813192723f7f368 rel-1-30
+85fbbc9b421bdc97a34bead08cdd34cf4c6271f3 rel-1-58
+86d8875ed69c96026e9ec4b77fff3f9d369bfcb6 rel-1-60
+87f60a6fb558871ef85a781e5d03321f77e1d11a rel-1-38
+89b230d9f013855747841b3b3bc8b229259e0c81 rel-1-79
+8af30946bc0ad1196ddf51b51545929cab3fa2e6 rel-1-69
+8c2d64c399e5d823e2b2ef547a260357be0428c0 rel-1-54
+8d11fc4c543f6228d73fa385ec9fca5723f8c832 rel-2-11
+94801bf860900c9dde428db66c5e01a63e521c05 rel-1-44
+988c66dff88ed44913d8d6303f7e136c19f5d6ea rel-2-02
+9d268dfb34560f2aeb817148ca746814fd85115d rel-1-46
+9e813ff6f15778dd6c6d2f6ab20f9aa8e91b2e47 rel-1-47
+9eda4d6efdd657f2ce8ad1034bdd20998f573a40 rel-1-49
+a313740fe8b8ee9df5cfc6f4bae7c665d160f4dd rel-1-78
+a5905b21afdbee56912e039eeb2e2f7fdcf155df rel-1-42
+ade751c9a7e7945e48428e32cdf41d6f7d189f08 rel-1-62
+ae7bd57a9dcedb67467a4b43a27bdf802479bc9e rel-1-33
+af2def618260df6bde2fdb3fd1f22ad532b18270 rel-1-77
+b618c255982d76d4d554c456888cd705b1a52d33 rel-1-68
+b6b5e68dd21fa2f5015e1b45f5b1880aa1c9ecef rel-1-55
+bd0f312842328a1118c43ebd54899916f1009b86 rel-1-57
+c019d05d7131f21ccf7abedb979ca29f2ff5fe32 rel-1-71
+c2c0575d28f000d925d4c0ec689df9b1e572af2d rel-1-43
+c6733869c489c4e39aeb84ffe5d28378e9fb121d rel-1-31
+cc4d999c38f16be78e8ba54749bd4e3711b66882 rel-1-41
+d125f70deea4580ead7cb72814bdb17ad9c16258 rel-1-36
+d2316766e67ea2a10effe85e6e27ea7b520df409 rel-1-70
+d940969f5c6f78c252ac110884aa89014c7d1349 rel-2-10
+ed67316cd7395abf840d8c9d10eb6a23f693d4fc rel-1-28
+ee4e67b4a9fe76e85230216340dc7eff3978fbf8 rel-1-59
+f04248111a542b559402f0e08253b613d7dec849 rel-1-32
+f394f7465aa354dfdea57599f8c7d0e424313144 rel-1-53
+f4d4bb4d5fd70e9affe63460161cf2779f9dfdb3 rel-1-24
+f6af29ca9c6e9ffd457d9f6b9477d03f2d944f64 rel-1-67
+f99c7dfc2bffb16cd478633526b4cba883e266ab rel-2-12
+fd3e6bb269b1c38e003202dc5856cf120667ed88 rel-1-72
+fdf95390299493c05c0e11c3c2ef98293c552908 rel-1-50
+fe112bae056a00c5e0b7218dd3903b16e3d43d24 rel-1-23
+ffde119d297ecdce968737c68f0e21410a0c36c4 rel-2-20
+bae0795bc8950108a5265dd3a1b231dbb1c0a92f rel-2-21
+91d53a344450102a73387dd591cecc4294574891 rel-2-22
+338e9c43eb8339b293aa5cb069aa84c60bbac6ba rel-2-23
+3a0d1edb7ae5478426346dab2219e10606238bd0 rel-2-24
+930e2f7d36165066fffd5cef6225c7774a2d7996 rel-2-25
+221dae018a0dd86d4adc91370dfc507ca078b452 rel-2-26
+02d0b25c22c3a4d672aca5fa37b3e5bffc30fa32 rel-2-27
+265b4ffceb4a356fd7917ce938051e8a206bac3e rel-2-28
+6f590a14726334be3256c55e8bab9119c71f3160 rel-2-29
+7a59b936e02452b66dff32264e5bc72c038ade19 rel-3-0-0
+ad485b918c5a81dbf591eab1916afa3d600b0639 rel-3-0-1
+16f620503ab2e3ae463e39c36f897385fd73b9d1 rel-3-0-2
+d147d5b894708a5c7d3e7b81513fe02f0075e62c rel-3-0-3
+2faf55888eeb76e40d5b286cd45f4f40c331b1c2 rel-3-0-4
+a9219577729080874f5f46e0a634d5d117cc2eed rel-3-1-0
+ae4d2f897a8fd92294f61d4d56e90e7700a912df rel-3-2-0
+41bdec833d4a9bb108bd3e4890371b22d1132f1a rel-3-2-1
+183c117293e78c4264dca7afac9f66cb5d585ddc rel-3-2-2
+7d54d6d61ace06828cb0850b53a8008672d67f33 rel-3-2-3
+1092d3d2495955cfe1a227e360e14d5358b5136f rel-3-2-4
+74f6ed8c5737db179f791d6fe6cab2dc119f65fb rel-3-2-5
+04c9afc26342f4c1b9492c4b27efb33585d6a56d rel-3-3-0
+5f9c0934513bf8d9dfe64127ad19cb95800415e9 scitex-3-3-0
+d2022a5e4948379ab0aa89b510b850209d6cbb01 rel-3-3-1
+d887fce163757c50ec95ed204d50b02675db830c rel-3-3-2
+1cd0ebd585926933259e776ac380ef17a20e2d5d rel-3-3-3
+e1c3afb1c5d42c664558839b1d68ed4dcc50e5d1 rel-3-3-4
+c343e43079c4458fae69f82ff3b6569b7bba0821 rel-3-3-5
+da3cbb774e02f626fd9ee5446608f0f63665042a rel-3-3-6
+5693714a8b0b30e481ba4f089f2ecc93fc80c80d rel-3-3-7
 
=== renamed file '.hgtags' => '.hgtags.moved'
=== modified file 'README'
--- README	2011-08-19 07:30:58 +0000
+++ README	2014-01-24 04:00:28 +0000
@@ -40,8 +40,8 @@
 
 *** Windows version ***
 
-A C++ compiler is required. Visual Studio .NET 2010 is the development system
-used for most development although TDM Mingw32 4.4.1 is also supported.
+A C++ compiler is required. Visual Studio 2010 is the development system
+used for most development although TDM Mingw32 4.7.1 is also supported.
 
 To build Scintilla, make in the scintilla/win32 directory
 		cd scintilla\win32
@@ -54,10 +54,7 @@
 GCC:		mingw32-make
 VS .NET: 	nmake -f scite.mak
 
-An executable SciTE will now be in scite\bin.
-
-The Visual C++ 6.0 project (.dsp) and make files are no longer supported but are left
-in the download for people that are prepared to update them.
+An executable SciTE will now be in scite/bin.
 
 *** GTK+/Windows version ***
 
 
=== added directory 'bin'
=== added file 'bin/.cvsignore'
--- bin/.cvsignore	1970-01-01 00:00:00 +0000
+++ bin/.cvsignore	2014-01-24 04:00:28 +0000
@@ -0,0 +1,2 @@
+.cvsignore
+*.dll
 
=== added file 'bin/__init__.py'
--- bin/__init__.py	1970-01-01 00:00:00 +0000
+++ bin/__init__.py	2014-01-24 04:00:28 +0000
@@ -0,0 +1,1 @@
+
 
=== added file 'bin/empty.txt'
--- bin/empty.txt	1970-01-01 00:00:00 +0000
+++ bin/empty.txt	2014-01-24 04:00:28 +0000
@@ -0,0 +1,1 @@
+This empty files ensures that the directory is created.
 \ No newline at end of file
 
=== modified file 'cocoa/Framework.mk'
--- cocoa/Framework.mk	2011-08-19 07:30:58 +0000
+++ cocoa/Framework.mk	2014-01-24 04:00:28 +0000
@@ -4,19 +4,16 @@
 INST_NAME=-install_name \
 	@executable_path/../Frameworks/Sci.framework/Versions/A/Sci
 
-LD=gcc $(ARCH) -dynamiclib -framework Cocoa $(INST_NAME)
+LD=$(COMPILER) $(ARCH) -dynamiclib -framework Cocoa $(INST_NAME) -framework QuartzCore
 
 LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx))))
 
 SCI_LEXERS=$(LEXOBJS) \
-	LexerBase.o LexerModule.o LexerSimple.o Accessor.o
+	$(addsuffix .o, $(basename $(notdir $(wildcard ../lexlib/*.cxx))))
 
-SCI_OBJ=AutoComplete.o CallTip.o CellBuffer.o CharClassify.o \
-	ContractionState.o Decoration.o Document.o Editor.o \
-	ExternalLexer.o Indicator.o KeyMap.o LineMarker.o PerLine.o \
-	PositionCache.o PropSetSimple.o RESearch.o RunStyles.o ScintillaBase.o Style.o \
-	StyleContext.o UniConversion.o ViewStyle.o XPM.o WordList.o \
-	Selection.o CharacterSet.o Catalogue.o $(SCI_LEXERS)
+SCI_FILES = $(notdir $(wildcard $(SCI_DIR)/*.cxx))
+SCI_OBJ = $(addsuffix .o,$(basename $(SCI_FILES)))
+SCI_OBJ += $(SCI_LEXERS)
 
 WAH_OBJ=DocumentAccessor.o KeyWords.o WindowAccessor.o
 
 
=== modified file 'cocoa/InfoBar.h'
--- cocoa/InfoBar.h	2012-10-26 08:56:06 +0000
+++ cocoa/InfoBar.h	2014-01-24 04:00:28 +0000
@@ -28,15 +28,15 @@
 @private
   NSImage* mBackground;
   IBDisplay mDisplayMask;
-  
+
   float mScaleFactor;
   NSPopUpButton* mZoomPopup;
-  
+
   int mCurrentCaretX;
   int mCurrentCaretY;
   NSTextField* mCaretPositionLabel;
   NSTextField* mStatusTextLabel;
-  
+
   id <InfoBarCommunicator> mCallback;
 }
 
 
=== modified file 'cocoa/InfoBar.mm'
--- cocoa/InfoBar.mm	2013-01-09 10:52:16 +0000
+++ cocoa/InfoBar.mm	2014-01-24 04:00:28 +0000
@@ -22,7 +22,7 @@
 {
 	// Get the parent's idea of where we should draw
 	NSRect newRect = [super drawingRectForBounds: theRect];
-  
+
 	// When the text field is being edited or selected, we have to turn off the magic because it
   // screws up the configuration of the field editor. We sneak around this by intercepting
   // selectWithFrame and editWithFrame and sneaking a reduced, centered rect in at the last minute.
@@ -30,26 +30,26 @@
 	{
 		// Get our ideal size for current text
 		NSSize textSize = [self cellSizeForBounds: theRect];
-    
+
 		// Center that in the proposed rect
-		float heightDelta = newRect.size.height - textSize.height;	
+		float heightDelta = newRect.size.height - textSize.height;
 		if (heightDelta > 0)
 		{
 			newRect.size.height -= heightDelta;
 			newRect.origin.y += ceil(heightDelta / 2);
 		}
 	}
-	
+
 	return newRect;
 }
 
 //--------------------------------------------------------------------------------------------------
 
-- (void) selectWithFrame: (NSRect) aRect inView: (NSView*) controlView editor: (NSText*) textObj 
+- (void) selectWithFrame: (NSRect) aRect inView: (NSView*) controlView editor: (NSText*) textObj
                 delegate:(id) anObject start: (NSInteger) selStart length: (NSInteger) selLength
 {
 	aRect = [self drawingRectForBounds: aRect];
-	mIsEditingOrSelecting = YES;	
+	mIsEditingOrSelecting = YES;
 	[super selectWithFrame: aRect
                   inView: controlView
                   editor: textObj
@@ -63,7 +63,7 @@
 
 - (void) editWithFrame: (NSRect) aRect inView: (NSView*) controlView editor: (NSText*) textObj
               delegate: (id) anObject event: (NSEvent*) theEvent
-{	
+{
 	aRect = [self drawingRectForBounds: aRect];
 	mIsEditingOrSelecting = YES;
 	[super editWithFrame: aRect
@@ -86,9 +86,15 @@
   if (self)
   {
     NSBundle* bundle = [NSBundle bundleForClass: [InfoBar class]];
+<<<<<<< TREE
     
     NSString* path = [bundle pathForResource: @"info_bar_bg" ofType: @"png" inDirectory: nil];
     mBackground = [[NSImage alloc] initWithContentsOfFile: path];
+=======
+
+    NSString* path = [bundle pathForResource: @"info_bar_bg" ofType: @"tiff" inDirectory: nil];
+    mBackground = [[NSImage alloc] initWithContentsOfFile: path];
+>>>>>>> MERGE-SOURCE
     if (![mBackground isValid])
       NSLog(@"Background image for info bar is invalid.");
 
@@ -103,7 +109,7 @@
 //--------------------------------------------------------------------------------------------------
 
 /**
- * Called by a connected compontent (usually the info bar) if something changed there.
+ * Called by a connected component (usually the info bar) if something changed there.
  *
  * @param type The type of the notification.
  * @param message Carries the new status message if the type is a status message change.
@@ -152,14 +158,14 @@
 {
   // 1) The zoom popup.
   unsigned numberOfDefaultItems = sizeof(DefaultScaleMenuLabels) / sizeof(NSString *);
-  
+
   // Create the popup button.
   mZoomPopup = [[NSPopUpButton allocWithZone:[self zone]] initWithFrame: NSMakeRect(0.0, 0.0, 1.0, 1.0) pullsDown: NO];
-  
+
   // No border or background please.
   [[mZoomPopup cell] setBordered: NO];
   [[mZoomPopup cell] setArrowPosition: NSPopUpArrowAtBottom];
-  
+
   // Fill it.
   for (unsigned count = 0; count < numberOfDefaultItems; count++)
   {
@@ -169,28 +175,28 @@
       [currentItem setRepresentedObject: [NSNumber numberWithFloat: DefaultScaleMenuFactors[count]]];
   }
   [mZoomPopup selectItemAtIndex: DefaultScaleMenuSelectedItemIndex];
-  
+
   // Hook it up.
   [mZoomPopup setTarget: self];
   [mZoomPopup setAction: @selector(zoomItemAction:)];
-  
+
   // Set a suitable font.
   [mZoomPopup setFont: [NSFont menuBarFontOfSize: BarFontSize]];
-  
+
   // Make sure the popup is big enough to fit the cells.
   [mZoomPopup sizeToFit];
-  
+
   // Don't let it become first responder
   [mZoomPopup setRefusesFirstResponder: YES];
-  
+
   // put it in the scrollview.
   [self addSubview: mZoomPopup];
   [mZoomPopup release];
-  
+
   // 2) The caret position label.
   Class oldCellClass = [NSTextField cellClass];
   [NSTextField setCellClass: [VerticallyCenteredTextFieldCell class]];
-  
+
   mCaretPositionLabel = [[NSTextField alloc] initWithFrame: NSMakeRect(0.0, 0.0, 50.0, 1.0)];
   [mCaretPositionLabel setBezeled: NO];
   [mCaretPositionLabel setBordered: NO];
@@ -205,7 +211,7 @@
 
   [self addSubview: mCaretPositionLabel];
   [mCaretPositionLabel release];
-  
+
   // 3) The status text.
   mStatusTextLabel = [[NSTextField alloc] initWithFrame: NSMakeRect(0.0, 0.0, 1.0, 1.0)];
   [mStatusTextLabel setBezeled: NO];
@@ -220,7 +226,7 @@
 
   [self addSubview: mStatusTextLabel];
   [mStatusTextLabel release];
-  
+
   // Restore original cell class so that everything else doesn't get broken
   [NSTextField setCellClass: oldCellClass];
 }
@@ -248,12 +254,12 @@
     [mBackground drawAtPoint: target fromRect: NSZeroRect operation: NSCompositeCopy fraction: 1];
     target.x += mBackground.size.width;
   }
-  
+
   // Draw separator lines between items.
   NSRect verticalLineRect;
   float component = 190.0 / 255.0;
   NSColor* lineColor = [NSColor colorWithDeviceRed: component green: component blue: component alpha: 1];
-  
+
   if (mDisplayMask & IBShowZoom)
   {
     verticalLineRect = [mZoomPopup frame];
@@ -265,7 +271,7 @@
       NSRectFill(verticalLineRect);
     }
   }
-  
+
   if (mDisplayMask & IBShowCaretPosition)
   {
     verticalLineRect = [mCaretPositionLabel frame];
@@ -347,7 +353,7 @@
     mDisplayMask = display;
     [self positionSubViews];
     [self needsDisplay];
-  }  
+  }
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -358,7 +364,7 @@
 - (void) zoomItemAction: (id) sender
 {
   NSNumber* selectedFactorObject = [[sender selectedCell] representedObject];
-  
+
   if (selectedFactorObject == nil)
   {
     NSLog(@"Scale popup action: setting arbitrary zoom factors is not yet supported.");
@@ -369,9 +375,9 @@
     [self setScaleFactor: [selectedFactorObject floatValue] adjustPopup: NO];
   }
 }
-    
+
 //--------------------------------------------------------------------------------------------------
-    
+
 - (void) setScaleFactor: (float) newScaleFactor adjustPopup: (BOOL) flag
 {
   if (mScaleFactor != newScaleFactor)
@@ -381,7 +387,7 @@
     {
       unsigned count = 0;
       unsigned numberOfDefaultItems = sizeof(DefaultScaleMenuFactors) / sizeof(float);
-      
+
       // We only work with some preset zoom values. If the given value does not correspond
       // to one then show no selection.
       while (count < numberOfDefaultItems && (fabs(newScaleFactor - DefaultScaleMenuFactors[count]) > 0.07))
@@ -391,7 +397,7 @@
       else
       {
         [mZoomPopup selectItemAtIndex: count];
-        
+
         // Set scale factor to found preset value if it comes close.
         mScaleFactor = DefaultScaleMenuFactors[count];
       }
@@ -400,7 +406,7 @@
     {
       // Internally set. Notify owner.
       [mCallback notify: IBNZoomChanged message: nil location: NSZeroPoint value: newScaleFactor];
-    }    
+    }
   }
 }
 
@@ -414,12 +420,12 @@
   // Make the position one-based.
   int newX = (int) position.x + 1;
   int newY = (int) position.y + 1;
-  
+
   if (mCurrentCaretX != newX || mCurrentCaretY != newY)
   {
     mCurrentCaretX = newX;
     mCurrentCaretY = newY;
-    
+
     [mCaretPositionLabel setStringValue: [NSString stringWithFormat: @"%d:%d", newX, newY]];
   }
 }
@@ -427,7 +433,7 @@
 //--------------------------------------------------------------------------------------------------
 
 /**
- * Makes the bar resize to the smallest width that can accomodate the currently enabled items.
+ * Makes the bar resize to the smallest width that can accommodate the currently enabled items.
  */
 - (void) sizeToFit
 {
@@ -435,13 +441,13 @@
   frame.size.width = 0;
   if (mDisplayMask & IBShowZoom)
     frame.size.width += [mZoomPopup frame].size.width;
-  
+
   if (mDisplayMask & IBShowCaretPosition)
     frame.size.width += [mCaretPositionLabel frame].size.width;
-  
+
   if (mDisplayMask & IBShowStatusText)
     frame.size.width += [mStatusTextLabel frame].size.width;
-  
+
   [self setFrame: frame];
 }
 
 
=== modified file 'cocoa/PlatCocoa.h'
--- cocoa/PlatCocoa.h	2012-10-26 08:56:06 +0000
+++ cocoa/PlatCocoa.h	2014-01-24 04:00:28 +0000
@@ -50,7 +50,7 @@
   QuartzTextLayout*	textLayout;
   int codePage;
   int verticalDeviceResolution;
-	
+
   /** If the surface is a bitmap context, contains a reference to the bitmap data. */
   uint8_t* bitmapData;
   /** If the surface is a bitmap context, stores the dimensions of the bitmap. */
@@ -96,6 +96,7 @@
   void DrawRGBAImage(PRectangle rc, int width, int height, const unsigned char *pixelsImage);
   void Ellipse(PRectangle rc, ColourDesired fore, ColourDesired back);
   void Copy(PRectangle rc, Scintilla::Point from, Surface &surfaceSource);
+<<<<<<< TREE
   void DrawTextNoClip(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore,
                      ColourDesired back);
   void DrawTextClipped(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore, 
@@ -110,6 +111,22 @@
   XYPOSITION ExternalLeading(Font &font_);
   XYPOSITION Height(Font &font_);
   XYPOSITION AverageCharWidth(Font &font_);
+=======
+  void DrawTextNoClip(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore,
+                     ColourDesired back);
+  void DrawTextClipped(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore,
+                      ColourDesired back);
+  void DrawTextTransparent(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore);
+  void MeasureWidths(Font &font_, const char *s, int len, XYPOSITION *positions);
+  XYPOSITION WidthText(Font &font_, const char *s, int len);
+  XYPOSITION WidthChar(Font &font_, char ch);
+  XYPOSITION Ascent(Font &font_);
+  XYPOSITION Descent(Font &font_);
+  XYPOSITION InternalLeading(Font &font_);
+  XYPOSITION ExternalLeading(Font &font_);
+  XYPOSITION Height(Font &font_);
+  XYPOSITION AverageCharWidth(Font &font_);
+>>>>>>> MERGE-SOURCE
 
   void SetClip(PRectangle rc);
   void FlushCachedState();
@@ -117,7 +134,7 @@
   void SetUnicodeMode(bool unicodeMode_);
   void SetDBCSMode(int codePage_);
 }; // SurfaceImpl class
-  
+
 } // Scintilla namespace
 
 #endif
 
=== modified file 'cocoa/PlatCocoa.mm'
--- cocoa/PlatCocoa.mm	2012-10-26 08:56:06 +0000
+++ cocoa/PlatCocoa.mm	2014-01-24 04:00:28 +0000
@@ -12,9 +12,10 @@
  * This file is dual licensed under LGPL v2.1 and the Scintilla license (http://www.scintilla.org/License.txt).
  */
 
-#import <ScintillaView.h>
-
-#include "PlatCocoa.h"
+#import "Platform.h"
+#import "ScintillaView.h"
+#import "ScintillaCocoa.h"
+#import "PlatCocoa.h"
 
 #include <cstring>
 #include <cstdio>
@@ -22,14 +23,14 @@
 #include <assert.h>
 #include <sys/time.h>
 #include <stdexcept>
+#include <vector>
 #include <map>
 
+#include "StringCopy.h"
 #include "XPM.h"
 
 #import <Foundation/NSGeometry.h>
 
-#import <Carbon/Carbon.h> // Temporary
-
 using namespace Scintilla;
 
 extern sptr_t scintilla_send_message(void* sci, unsigned int iMessage, uptr_t wParam, sptr_t lParam);
@@ -57,7 +58,7 @@
 //--------------------------------------------------------------------------------------------------
 
 /**
- * Converts a PRctangle as used by Scintilla to a Quartz-style rectangle.
+ * Converts a PRectangle as used by Scintilla to a Quartz-style rectangle.
  */
 inline CGRect PRectangleToCGRect(PRectangle& rc)
 {
@@ -178,7 +179,7 @@
   }
   bitmapData = NULL;
   gc = NULL;
-  
+
   bitmapWidth = 0;
   bitmapHeight = 0;
   x = 0;
@@ -198,11 +199,11 @@
 void SurfaceImpl::Init(WindowID)
 {
   // To be able to draw, the surface must get a CGContext handle.  We save the graphics port,
-  // then aquire/release the context on an as-need basis (see above).
+  // then acquire/release the context on an as-need basis (see above).
   // XXX Docs on QDBeginCGContext are light, a better way to do this would be good.
   // AFAIK we should not hold onto a context retrieved this way, thus the need for
-  // aquire/release of the context.
-  
+  // acquire/release of the context.
+
   Release();
 }
 
@@ -221,45 +222,42 @@
 void SurfaceImpl::InitPixMap(int width, int height, Surface* /* surface_ */, WindowID /* wid */)
 {
   Release();
-  
+
   // Create a new bitmap context, along with the RAM for the bitmap itself
   bitmapWidth = width;
   bitmapHeight = height;
-  
+
   const int bitmapBytesPerRow = (width * BYTES_PER_PIXEL);
   const int bitmapByteCount = (bitmapBytesPerRow * height);
-  
+
   // Create an RGB color space.
   CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
   if (colorSpace == NULL)
     return;
-  
+
   // Create the bitmap.
   bitmapData = new uint8_t[bitmapByteCount];
-  if (bitmapData != NULL)
+  // create the context
+  gc = CGBitmapContextCreate(bitmapData,
+                             width,
+                             height,
+                             BITS_PER_COMPONENT,
+                             bitmapBytesPerRow,
+                             colorSpace,
+                             kCGImageAlphaPremultipliedLast);
+
+  if (gc == NULL)
   {
-    // create the context
-    gc = CGBitmapContextCreate(bitmapData,
-                               width,
-                               height,
-                               BITS_PER_COMPONENT,
-                               bitmapBytesPerRow,
-                               colorSpace,
-                               kCGImageAlphaPremultipliedLast);
-    
-    if (gc == NULL)
-    {
-      // the context couldn't be created for some reason,
-      // and we have no use for the bitmap without the context
-      delete[] bitmapData;
-      bitmapData = NULL;
-    }
-    textLayout->setContext (gc);
+    // the context couldn't be created for some reason,
+    // and we have no use for the bitmap without the context
+    delete[] bitmapData;
+    bitmapData = NULL;
   }
-  
+  textLayout->setContext (gc);
+
   // the context retains the color space, so we can release it
   CGColorSpaceRelease(colorSpace);
-  
+
   if (gc != NULL && bitmapData != NULL)
   {
     // "Erase" to white.
@@ -276,9 +274,9 @@
   if (gc)
   {
     ColourDesired colour(fore.AsLong());
-    
+
     // Set the Stroke color to match
-    CGContextSetRGBStrokeColor(gc, colour.GetRed() / 255.0, colour.GetGreen() / 255.0, 
+    CGContextSetRGBStrokeColor(gc, colour.GetRed() / 255.0, colour.GetGreen() / 255.0,
                                colour.GetBlue() / 255.0, 1.0 );
   }
 }
@@ -290,9 +288,9 @@
   if (gc)
   {
     ColourDesired colour(back.AsLong());
-    
+
     // Set the Fill color to match
-    CGContextSetRGBFillColor(gc, colour.GetRed() / 255.0, colour.GetGreen() / 255.0, 
+    CGContextSetRGBFillColor(gc, colour.GetRed() / 255.0, colour.GetGreen() / 255.0,
                              colour.GetBlue() / 255.0, 1.0 );
   }
 }
@@ -304,17 +302,17 @@
   // For now, assume that GetImage can only be called on PixMap surfaces.
   if (bitmapData == NULL)
     return NULL;
-  
+
   CGContextFlush(gc);
-  
+
   // Create an RGB color space.
   CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
   if( colorSpace == NULL )
     return NULL;
-  
+
   const int bitmapBytesPerRow = ((int) bitmapWidth * BYTES_PER_PIXEL);
   const int bitmapByteCount = (bitmapBytesPerRow * (int) bitmapHeight);
-  
+
   // Make a copy of the bitmap data for the image creation and divorce it
   // From the SurfaceImpl lifetime
   CFDataRef dataRef = CFDataCreate(kCFAllocatorDefault, bitmapData, bitmapByteCount);
@@ -338,18 +336,18 @@
                           0,
                           kCGRenderingIntentDefault);
   }
-  
+
   // The image retains the color space, so we can release it.
   CGColorSpaceRelease(colorSpace);
   colorSpace = NULL;
-  
+
   // Done with the data provider.
   CGDataProviderRelease(dataProvider);
   dataProvider = NULL;
-  
+
   // Done with the data provider.
   CFRelease(dataRef);
-    
+
   return image;
 }
 
@@ -389,10 +387,10 @@
 void SurfaceImpl::LineTo(int x_, int y_)
 {
   CGContextBeginPath( gc );
-  
+
   // Because Quartz is based on floating point, lines are drawn with half their colour
   // on each side of the line. Integer coordinates specify the INTERSECTION of the pixel
-  // divison lines. If you specify exact pixel values, you get a line that
+  // division lines. If you specify exact pixel values, you get a line that
   // is twice as thick but half as intense. To get pixel aligned rendering,
   // we render the "middle" of the pixels by adding 0.5 to the coordinates.
   CGContextMoveToPoint( gc, x + 0.5, y + 0.5 );
@@ -408,31 +406,27 @@
                           ColourDesired back)
 {
   // Allocate memory for the array of points.
-  CGPoint *points = new CGPoint[npts];
-  
+  std::vector<CGPoint> points(npts);
+
   for (int i = 0;i < npts;i++)
   {
     // Quartz floating point issues: plot the MIDDLE of the pixels
     points[i].x = pts[i].x + 0.5;
     points[i].y = pts[i].y + 0.5;
   }
-  
+
   CGContextBeginPath(gc);
-  
+
   // Set colours
   FillColour(back);
   PenColour(fore);
-  
+
   // Draw the polygon
-  CGContextAddLines(gc, points, npts);
-  
+  CGContextAddLines(gc, points.data(), npts);
+
   // Explicitly close the path, so it is closed for stroking AND filling (implicit close = filling only)
   CGContextClosePath( gc );
   CGContextDrawPath( gc, kCGPathFillStroke );
-  
-  // Deallocate memory.
-  delete points;
-  points = NULL;
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -444,7 +438,7 @@
     CGContextBeginPath( gc );
     FillColour(back);
     PenColour(fore);
-    
+
     // Quartz integer -> float point conversion fun (see comment in SurfaceImpl::LineTo)
     // We subtract 1 from the Width() and Height() so that all our drawing is within the area defined
     // by the PRectangle. Otherwise, we draw one pixel too far to the right and bottom.
@@ -487,7 +481,7 @@
 void SurfaceImpl::FillRectangle(PRectangle rc, Surface &surfacePattern)
 {
   SurfaceImpl& patternSurface = static_cast<SurfaceImpl &>(surfacePattern);
-  
+
   // For now, assume that copy can only be called on PixMap surfaces. Shows up black.
   CGImageRef image = patternSurface.GetImage();
   if (image == NULL)
@@ -495,11 +489,19 @@
     FillRectangle(rc, ColourDesired(0));
     return;
   }
-  
-  const CGPatternCallbacks drawImageCallbacks = { 0,
-    reinterpret_cast<CGPatternDrawPatternCallback>(drawImageRefCallback),
-    reinterpret_cast<CGPatternReleaseInfoCallback>(releaseImageRefCallback) };
-  
+<<<<<<< TREE
+  
+  const CGPatternCallbacks drawImageCallbacks = { 0,
+    reinterpret_cast<CGPatternDrawPatternCallback>(drawImageRefCallback),
+    reinterpret_cast<CGPatternReleaseInfoCallback>(releaseImageRefCallback) };
+  
+=======
+
+  const CGPatternCallbacks drawImageCallbacks = { 0,
+    reinterpret_cast<CGPatternDrawPatternCallback>(drawImageRefCallback),
+    reinterpret_cast<CGPatternReleaseInfoCallback>(releaseImageRefCallback) };
+
+>>>>>>> MERGE-SOURCE
   CGPatternRef pattern = CGPatternCreate(image,
                                          CGRectMake(0, 0, patternSurface.bitmapWidth, patternSurface.bitmapHeight),
                                          CGAffineTransformIdentity,
@@ -514,10 +516,10 @@
     // Create a pattern color space
     CGColorSpaceRef colorSpace = CGColorSpaceCreatePattern( NULL );
     if( colorSpace != NULL ) {
-      
+
       CGContextSaveGState( gc );
       CGContextSetFillColorSpace( gc, colorSpace );
-      
+
       // Unlike the documentation, you MUST pass in a "components" parameter:
       // For coloured patterns it is the alpha value.
       const CGFloat alpha = 1.0;
@@ -540,12 +542,12 @@
   // which is a rectangle with rounded corners each having a radius of 4 pixels.
   // It would be almost as good just cutting off the corners with lines at
   // 45 degrees as is done on GTK+.
-  
+
   // Create a rectangle with semicircles at the corners
   const int MAX_RADIUS = 4;
   int radius = Platform::Minimum( MAX_RADIUS, rc.Height()/2 );
   radius = Platform::Minimum( radius, rc.Width()/2 );
-  
+
   // Points go clockwise, starting from just below the top left
   // Corners are kept together, so we can easily create arcs to connect them
   CGPoint corners[4][3] =
@@ -571,7 +573,7 @@
       { rc.left, rc.bottom - radius - 1 },
     },
   };
-  
+
   // Align the points in the middle of the pixels
   for( int i = 0; i < 4; ++ i )
   {
@@ -581,38 +583,133 @@
       corners[i][j].y += 0.5;
     }
   }
-  
+
   PenColour( fore );
   FillColour( back );
-  
+
   // Move to the last point to begin the path
   CGContextBeginPath( gc );
   CGContextMoveToPoint( gc, corners[3][2].x, corners[3][2].y );
-  
+
   for ( int i = 0; i < 4; ++ i )
   {
     CGContextAddLineToPoint( gc, corners[i][0].x, corners[i][0].y );
     CGContextAddArcToPoint( gc, corners[i][1].x, corners[i][1].y, corners[i][2].x, corners[i][2].y, radius );
   }
-  
+
   // Close the path to enclose it for stroking and for filling, then draw it
   CGContextClosePath( gc );
   CGContextDrawPath( gc, kCGPathFillStroke );
 }
 
+<<<<<<< TREE
 void Scintilla::SurfaceImpl::AlphaRectangle(PRectangle rc, int /*cornerSize*/, ColourDesired fill, int alphaFill,
                                             ColourDesired /*outline*/, int /*alphaOutline*/, int /*flags*/)
+=======
+// DrawChamferedRectangle is a helper function for AlphaRectangle that either fills or strokes a
+// rectangle with its corners chamfered at 45 degrees.
+static void DrawChamferedRectangle(CGContextRef gc, PRectangle rc, int cornerSize, CGPathDrawingMode mode) {
+  // Points go clockwise, starting from just below the top left
+  CGPoint corners[4][2] =
+  {
+    {
+      { rc.left, rc.top + cornerSize },
+      { rc.left + cornerSize, rc.top },
+    },
+    {
+      { rc.right - cornerSize - 1, rc.top },
+      { rc.right - 1, rc.top + cornerSize },
+    },
+    {
+      { rc.right - 1, rc.bottom - cornerSize - 1 },
+      { rc.right - cornerSize - 1, rc.bottom - 1 },
+    },
+    {
+      { rc.left + cornerSize, rc.bottom - 1 },
+      { rc.left, rc.bottom - cornerSize - 1 },
+    },
+  };
+
+  // Align the points in the middle of the pixels
+  for( int i = 0; i < 4; ++ i )
+  {
+    for( int j = 0; j < 2; ++ j )
+    {
+      corners[i][j].x += 0.5;
+      corners[i][j].y += 0.5;
+    }
+  }
+
+  // Move to the last point to begin the path
+  CGContextBeginPath( gc );
+  CGContextMoveToPoint( gc, corners[3][1].x, corners[3][1].y );
+
+  for ( int i = 0; i < 4; ++ i )
+  {
+    CGContextAddLineToPoint( gc, corners[i][0].x, corners[i][0].y );
+    CGContextAddLineToPoint( gc, corners[i][1].x, corners[i][1].y );
+  }
+
+  // Close the path to enclose it for stroking and for filling, then draw it
+  CGContextClosePath( gc );
+  CGContextDrawPath( gc, mode );
+}
+
+void Scintilla::SurfaceImpl::AlphaRectangle(PRectangle rc, int cornerSize, ColourDesired fill, int alphaFill,
+                                            ColourDesired outline, int alphaOutline, int /*flags*/)
+>>>>>>> MERGE-SOURCE
 {
   if ( gc ) {
+<<<<<<< TREE
     ColourDesired colour( fill.AsLong() );
  
     // Snap rectangle boundaries to nearest int
     rc.left = lround(rc.left);
     rc.right = lround(rc.right);
+=======
+    // Snap rectangle boundaries to nearest int
+    rc.left = lround(rc.left);
+    rc.right = lround(rc.right);
+>>>>>>> MERGE-SOURCE
     // Set the Fill color to match
-    CGContextSetRGBFillColor( gc, colour.GetRed() / 255.0, colour.GetGreen() / 255.0, colour.GetBlue() / 255.0, alphaFill / 255.0 );
-    CGRect rect = PRectangleToCGRect( rc );
-    CGContextFillRect( gc, rect );
+    CGContextSetRGBFillColor( gc, fill.GetRed() / 255.0, fill.GetGreen() / 255.0, fill.GetBlue() / 255.0, alphaFill / 255.0 );
+    CGContextSetRGBStrokeColor( gc, outline.GetRed() / 255.0, outline.GetGreen() / 255.0, outline.GetBlue() / 255.0, alphaOutline / 255.0 );
+    PRectangle rcFill = rc;
+    if (cornerSize == 0) {
+      // A simple rectangle, no rounded corners
+      if ((fill == outline) && (alphaFill == alphaOutline)) {
+        // Optimization for simple case
+        CGRect rect = PRectangleToCGRect( rcFill );
+        CGContextFillRect( gc, rect );
+      } else {
+        rcFill.left += 1.0;
+        rcFill.top += 1.0;
+        rcFill.right -= 1.0;
+        rcFill.bottom -= 1.0;
+        CGRect rect = PRectangleToCGRect( rcFill );
+        CGContextFillRect( gc, rect );
+        CGContextAddRect( gc, CGRectMake( rc.left + 0.5, rc.top + 0.5, rc.Width() - 1, rc.Height() - 1 ) );
+        CGContextStrokePath( gc );
+      }
+    } else {
+      // Approximate rounded corners with 45 degree chamfers.
+      // Drawing real circular arcs often leaves some over- or under-drawn pixels.
+      if ((fill == outline) && (alphaFill == alphaOutline)) {
+        // Specializing this case avoids a few stray light/dark pixels in corners.
+        rcFill.left -= 0.5;
+        rcFill.top -= 0.5;
+        rcFill.right += 0.5;
+        rcFill.bottom += 0.5;
+        DrawChamferedRectangle( gc, rcFill, cornerSize, kCGPathFill );
+      } else {
+        rcFill.left += 0.5;
+        rcFill.top += 0.5;
+        rcFill.right -= 0.5;
+        rcFill.bottom -= 0.5;
+        DrawChamferedRectangle( gc, rcFill, cornerSize-1, kCGPathFill );
+        DrawChamferedRectangle( gc, rc, cornerSize, kCGPathStroke );
+      }
+    }
   }
 }
 
@@ -629,25 +726,30 @@
 	if (colorSpace) {
 		const int bitmapBytesPerRow = ((int) width * 4);
 		const int bitmapByteCount = (bitmapBytesPerRow * (int) height);
-		
+
 		// Create a data provider.
 		CGDataProviderRef dataProvider = 0;
 		if (invert) {
+<<<<<<< TREE
 			unsigned char *pixelsUpsideDown = new unsigned char[bitmapByteCount];
 		
+=======
+			unsigned char *pixelsUpsideDown = new unsigned char[bitmapByteCount];
+
+>>>>>>> MERGE-SOURCE
 			for (int y=0; y<height; y++) {
 				int yInverse = height - y - 1;
 				memcpy(pixelsUpsideDown + y * bitmapBytesPerRow,
 				       pixelsImage + yInverse * bitmapBytesPerRow,
 				       bitmapBytesPerRow);
 			}
-			
+
 			dataProvider = CGDataProviderCreateWithData(
 								NULL, pixelsUpsideDown, bitmapByteCount, ProviderReleaseData);
 		} else {
 			dataProvider = CGDataProviderCreateWithData(
 								NULL, pixelsImage, bitmapByteCount, NULL);
-			
+
 		}
 		if (dataProvider) {
 			// Create the CGImage.
@@ -665,7 +767,11 @@
 
 			CGDataProviderRelease(dataProvider);
 		}
+<<<<<<< TREE
 		
+=======
+
+>>>>>>> MERGE-SOURCE
 		// The image retains the color space, so we can release it.
 		CGColorSpaceRelease(colorSpace);
 	}
@@ -681,6 +787,7 @@
 	}
 }
 
+<<<<<<< TREE
 void SurfaceImpl::Ellipse(PRectangle rc, ColourDesired fore, ColourDesired back) {
   // Drawing an ellipse with bezier curves. Code modified from:
   // http://www.codeguru.com/gdi/ellipse.shtml
@@ -722,30 +829,25 @@
   cCtlPt[12].y =
   cCtlPt[6].y  = centre.y + 0.5;
   
+=======
+void SurfaceImpl::Ellipse(PRectangle rc, ColourDesired fore, ColourDesired back) {
+  CGRect ellipseRect = CGRectMake(rc.left, rc.top, rc.Width(), rc.Height());
+>>>>>>> MERGE-SOURCE
   FillColour(back);
   PenColour(fore);
-  
-  CGContextBeginPath( gc );
-  CGContextMoveToPoint( gc, cCtlPt[0].x, cCtlPt[0].y );
-  
-  for ( int i = 1; i < 13; i += 3 )
-  {
-    CGContextAddCurveToPoint( gc, cCtlPt[i].x, cCtlPt[i].y, cCtlPt[i+1].x, cCtlPt[i+1].y, cCtlPt[i+2].x, cCtlPt[i+2].y );
-  }
-  
-  // Close the path to enclose it for stroking and for filling, then draw it
-  CGContextClosePath( gc );
-  CGContextDrawPath( gc, kCGPathFillStroke );
+  CGContextBeginPath(gc);
+  CGContextAddEllipseInRect(gc, ellipseRect);
+  CGContextDrawPath(gc, kCGPathFillStroke);
 }
 
 void SurfaceImpl::CopyImageRectangle(Surface &surfaceSource, PRectangle srcRect, PRectangle dstRect)
 {
   SurfaceImpl& source = static_cast<SurfaceImpl &>(surfaceSource);
   CGImageRef image = source.GetImage();
-  
+
   CGRect src = PRectangleToCGRect(srcRect);
   CGRect dst = PRectangleToCGRect(dstRect);
-  
+
   /* source from QuickDrawToQuartz2D.pdf on developer.apple.com */
   float w = (float) CGImageGetWidth(image);
   float h = (float) CGImageGetHeight(image);
@@ -769,10 +871,10 @@
   // Maybe we have to make the Surface two contexts:
   // a bitmap context which we do all the drawing on, and then a "real" context
   // which we copy the output to when we call "Synchronize". Ugh! Gross and slow!
-  
+
   // For now, assume that copy can only be called on PixMap surfaces
   SurfaceImpl& source = static_cast<SurfaceImpl &>(surfaceSource);
-  
+
   // Get the CGImageRef
   CGImageRef image = source.GetImage();
   // If we could not get an image reference, fill the rectangle black
@@ -781,19 +883,19 @@
     FillRectangle( rc, ColourDesired( 0 ) );
     return;
   }
-  
+
   // Now draw the image on the surface
-  
+
   // Some fancy clipping work is required here: draw only inside of rc
   CGContextSaveGState( gc );
   CGContextClipToRect( gc, PRectangleToCGRect( rc ) );
-  
+
   //Platform::DebugPrintf(stderr, "Copy: CGContextDrawImage: (%d, %d) - (%d X %d)\n", rc.left - from.x, rc.top - from.y, source.bitmapWidth, source.bitmapHeight );
   CGContextDrawImage( gc, CGRectMake( rc.left - from.x, rc.top - from.y, source.bitmapWidth, source.bitmapHeight ), image );
-  
+
   // Undo the clipping fun
   CGContextRestoreGState( gc );
-  
+
   // Done with the image
   CGImageRelease( image );
   image = NULL;
@@ -878,8 +980,13 @@
   }
 }
 
+<<<<<<< TREE
 void SurfaceImpl::DrawTextTransparent(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, 
                                       ColourDesired fore)
+=======
+void SurfaceImpl::DrawTextTransparent(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len,
+                                      ColourDesired fore)
+>>>>>>> MERGE-SOURCE
 {
 	CFStringEncoding encoding = EncodingFromCharacterSet(unicodeMode, FontCharacterSet(font_));
 	ColourDesired colour(fore.AsLong());
@@ -887,7 +994,7 @@
 
 	QuartzTextStyle* style = reinterpret_cast<QuartzTextStyle*>(font_.GetID());
 	style->setCTStyleColor(color);
-	
+
 	CGColorRelease(color);
 
 	textLayout->setText (reinterpret_cast<const UInt8*>(s), len, encoding, *reinterpret_cast<QuartzTextStyle*>(font_.GetID()));
@@ -912,10 +1019,10 @@
 {
 	CFStringEncoding encoding = EncodingFromCharacterSet(unicodeMode, FontCharacterSet(font_));
 	textLayout->setText (reinterpret_cast<const UInt8*>(s), len, encoding, *reinterpret_cast<QuartzTextStyle*>(font_.GetID()));
-	
+
 	CTLineRef mLine = textLayout->getCTLine();
 	assert(mLine != NULL);
-	
+
 	if (unicodeMode) {
 		// Map the widths given for UTF-16 characters back onto the UTF-8 input string
 		CFIndex fit = textLayout->getStringLength();
@@ -961,7 +1068,7 @@
   {
     CFStringEncoding encoding = EncodingFromCharacterSet(unicodeMode, FontCharacterSet(font_));
     textLayout->setText (reinterpret_cast<const UInt8*>(s), len, encoding, *reinterpret_cast<QuartzTextStyle*>(font_.GetID()));
-    
+
 	return textLayout->MeasureStringWidth();
   }
   return 1;
@@ -973,7 +1080,7 @@
   {
     CFStringEncoding encoding = EncodingFromCharacterSet(unicodeMode, FontCharacterSet(font_));
     textLayout->setText (reinterpret_cast<const UInt8*>(str), 1, encoding, *reinterpret_cast<QuartzTextStyle*>(font_.GetID()));
-    
+
     return textLayout->MeasureStringWidth();
   }
   else
@@ -987,7 +1094,7 @@
 XYPOSITION SurfaceImpl::Ascent(Font &font_) {
   if (!font_.GetID())
     return 1;
-  
+
 	float ascent = reinterpret_cast<QuartzTextStyle*>( font_.GetID() )->getAscent();
 	return ascent + 0.5;
 
@@ -996,7 +1103,7 @@
 XYPOSITION SurfaceImpl::Descent(Font &font_) {
   if (!font_.GetID())
     return 1;
-  
+
 	float descent = reinterpret_cast<QuartzTextStyle*>( font_.GetID() )->getDescent();
 	return descent + 0.5;
 
@@ -1009,7 +1116,7 @@
 XYPOSITION SurfaceImpl::ExternalLeading(Font &font_) {
   if (!font_.GetID())
     return 1;
-  
+
 	float leading = reinterpret_cast<QuartzTextStyle*>( font_.GetID() )->getLeading();
 	return leading + 0.5;
 
@@ -1021,14 +1128,19 @@
 	return ht;
 }
 
+<<<<<<< TREE
 XYPOSITION SurfaceImpl::AverageCharWidth(Font &font_) {
   
+=======
+XYPOSITION SurfaceImpl::AverageCharWidth(Font &font_) {
+
+>>>>>>> MERGE-SOURCE
   if (!font_.GetID())
     return 1;
-  
-  const int sizeStringLength = (sizeof( sizeString ) / sizeof( sizeString[0] ) - 1);
+
+  const int sizeStringLength = ELEMENTS( sizeString );
   int width = WidthText( font_, sizeString, sizeStringLength  );
-  
+
   return (int) ((width / (float) sizeStringLength) + 0.5);
 }
 
@@ -1109,8 +1221,13 @@
       // NSView
       NSView* view = reinterpret_cast<NSView*>(idWin);
       win = [view window];
+<<<<<<< TREE
       rect = [view convertRect: [view bounds] toView: nil];
       rect.origin = [win convertBaseToScreen: rect.origin];
+=======
+      rect = [view convertRect: [view bounds] toView: nil];
+      rect.origin = [win convertBaseToScreen:rect.origin];
+>>>>>>> MERGE-SOURCE
     }
     else
     {
@@ -1269,9 +1386,9 @@
   if (wid)
   {
     id idWin = reinterpret_cast<id>(wid);
-    if ([idWin isMemberOfClass: [InnerView class]])
+    if ([idWin isMemberOfClass: [SCIContentView class]])
     {
-      InnerView* container = reinterpret_cast<InnerView*>(idWin);
+      SCIContentView* container = reinterpret_cast<SCIContentView*>(idWin);
       [container setCursor: curs];
     }
   }
@@ -1488,7 +1605,6 @@
 class ListBoxImpl : public ListBox, IListBox
 {
 private:
-  ControlRef lb;
   ImageMap images;
   int lineHeight;
   bool unicodeMode;
@@ -1503,14 +1619,19 @@
   NSScrollView* scroller;
   NSTableColumn* colIcon;
   NSTableColumn* colText;
+<<<<<<< TREE
   AutoCompletionDataSource* ds;
 	
+=======
+  AutoCompletionDataSource* ds;
+
+>>>>>>> MERGE-SOURCE
   LinesData ld;
   CallBackAction doubleClickAction;
   void* doubleClickActionData;
 
 public:
-  ListBoxImpl() : lb(NULL), lineHeight(10), unicodeMode(false),
+  ListBoxImpl() : lineHeight(10), unicodeMode(false),
     desiredVisibleRows(5), maxItemWidth(0), aveCharWidth(8), maxIconWidth(0),
     doubleClickAction(NULL), doubleClickActionData(NULL)
   {
@@ -1698,36 +1819,31 @@
 {
   Clear();
   size_t count = strlen(list) + 1;
-  char* words = new char[count];
-  if (words)
+  std::vector<char> words(list, list+count);
+  char* startword = words.data();
+  char* numword = NULL;
+  int i = 0;
+  for (; words[i]; i++)
   {
-    memcpy(words, list, count);
-    char* startword = words;
-    char* numword = NULL;
-    int i = 0;
-    for (; words[i]; i++)
-    {
-      if (words[i] == separator)
-      {
-        words[i] = '\0';
-        if (numword)
-          *numword = '\0';
-        Append(startword, numword?atoi(numword + 1):-1);
-        startword = words + i + 1;
-        numword = NULL;
-      }
-      else if (words[i] == typesep)
-      {
-        numword = words + i;
-      }
-    }
-    if (startword)
-    {
+    if (words[i] == separator)
+    {
+      words[i] = '\0';
       if (numword)
         *numword = '\0';
       Append(startword, numword?atoi(numword + 1):-1);
-    }
-    delete []words;
+      startword = words.data() + i + 1;
+      numword = NULL;
+    }
+    else if (words[i] == typesep)
+    {
+      numword = words.data() + i;
+    }
+  }
+  if (startword)
+  {
+    if (numword)
+      *numword = '\0';
+    Append(startword, numword?atoi(numword + 1):-1);
   }
   [table reloadData];
 }
@@ -1770,8 +1886,7 @@
     value[0] = '\0';
     return;
   }
-  strncpy(value, textString, len);
-  value[len - 1] = '\0';
+  strlcpy(value, textString, len);
 }
 
 void ListBoxImpl::RegisterImage(int type, const char* xpm_data)
@@ -1792,12 +1907,21 @@
 }
 
 void ListBoxImpl::RegisterRGBAImage(int type, int width, int height, const unsigned char *pixelsImage) {
+<<<<<<< TREE
 	CGImageRef imageRef = ImageCreateFromRGBA(width, height, pixelsImage, false);
 	NSSize sz = {width, height};
 	NSImage *img = [[[NSImage alloc] initWithSize: sz] autorelease];
 	NSBitmapImageRep *bitmapRep = [[NSBitmapImageRep alloc] initWithCGImage: imageRef];
 	[img addRepresentation: bitmapRep];
 	[bitmapRep release];
+=======
+	CGImageRef imageRef = ImageCreateFromRGBA(width, height, pixelsImage, false);
+	NSSize sz = {static_cast<CGFloat>(width), static_cast<CGFloat>(height)};
+	NSImage *img = [[[NSImage alloc] initWithSize: sz] autorelease];
+	NSBitmapImageRep *bitmapRep = [[NSBitmapImageRep alloc] initWithCGImage: imageRef];
+	[img addRepresentation: bitmapRep];
+	[bitmapRep release];
+>>>>>>> MERGE-SOURCE
 	CGImageRelease(imageRef);
 	[img retain];
 	ImageMap::iterator it=images.find(type);
@@ -1884,7 +2008,7 @@
 @implementation ScintillaContextMenu : NSMenu
 
 // This NSMenu subclass serves also as target for menu commands and forwards them as
-// notfication messages to the front end.
+// notification messages to the front end.
 
 - (void) handleCommand: (NSMenuItem*) sender
 {
@@ -1939,8 +2063,13 @@
 
 ElapsedTime::ElapsedTime() {
   struct timeval curTime;
+<<<<<<< TREE
   gettimeofday( &curTime, NULL );
   
+=======
+  gettimeofday( &curTime, NULL );
+
+>>>>>>> MERGE-SOURCE
   bigBit = curTime.tv_sec;
   littleBit = curTime.tv_usec;
 }
@@ -1999,18 +2128,18 @@
 //--------------------------------------------------------------------------------------------------
 
 /**
- * Returns the time span in which two consequtive mouse clicks must occur to be considered as
+ * Returns the time span in which two consecutive mouse clicks must occur to be considered as
  * double click.
  *
  * @return
  */
 unsigned int Platform::DoubleClickTime()
 {
-  float threshold = [[NSUserDefaults standardUserDefaults] floatForKey: 
+  float threshold = [[NSUserDefaults standardUserDefaults] floatForKey:
                      @"com.apple.mouse.doubleClickThreshold"];
   if (threshold == 0)
     threshold = 0.5;
-  return static_cast<unsigned int>(threshold / kEventDurationMillisecond);
+  return static_cast<unsigned int>(threshold * 1000.0);
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -2023,9 +2152,9 @@
 //--------------------------------------------------------------------------------------------------
 
 /**
- * Helper method for the backend to reach through to the scintiall window.
+ * Helper method for the backend to reach through to the scintilla window.
  */
-long Platform::SendScintilla(WindowID w, unsigned int msg, unsigned long wParam, long lParam) 
+long Platform::SendScintilla(WindowID w, unsigned int msg, unsigned long wParam, long lParam)
 {
   return scintilla_send_message(w, msg, wParam, lParam);
 }
@@ -2033,7 +2162,7 @@
 //--------------------------------------------------------------------------------------------------
 
 /**
- * Helper method for the backend to reach through to the scintiall window.
+ * Helper method for the backend to reach through to the scintilla window.
  */
 long Platform::SendScintillaPointer(WindowID w, unsigned int msg, unsigned long wParam, void *lParam)
 {
@@ -2052,7 +2181,7 @@
     // Shift_jis
     return ((uch >= 0x81) && (uch <= 0x9F)) ||
         ((uch >= 0xE0) && (uch <= 0xFC));
-        // Lead bytes F0 to FC may be a Microsoft addition. 
+        // Lead bytes F0 to FC may be a Microsoft addition.
   case 936:
     // GBK
     return (uch >= 0x81) && (uch <= 0xFE);
@@ -2116,7 +2245,7 @@
 {
   const int BUF_SIZE = 2000;
   char buffer[BUF_SIZE];
-  
+
   va_list pArguments;
   va_start(pArguments, format);
   vsnprintf(buffer, BUF_SIZE, format, pArguments);
@@ -2148,10 +2277,9 @@
 void Platform::Assert(const char *c, const char *file, int line)
 {
   char buffer[2000];
-  sprintf(buffer, "Assertion [%s] failed at %s %d", c, file, line);
-  strcat(buffer, "\r\n");
+  snprintf(buffer, sizeof(buffer), "Assertion [%s] failed at %s %d\r\n", c, file, line);
   Platform::DebugDisplay(buffer);
-#ifdef DEBUG 
+#ifdef DEBUG
   // Jump into debugger in assert on Mac (CL269835)
   ::Debugger();
 #endif
@@ -2172,9 +2300,9 @@
 
 /**
  * Implements the platform specific part of library loading.
- * 
+ *
  * @param modulePath The path to the module to load.
- * @return A library instance or NULL if the module could not be found or another problem occured.
+ * @return A library instance or NULL if the module could not be found or another problem occurred.
  */
 DynamicLibrary* DynamicLibrary::Load(const char* /* modulePath */)
 {
 
=== modified file 'cocoa/QuartzTextLayout.h'
--- cocoa/QuartzTextLayout.h	2011-08-19 07:30:58 +0000
+++ cocoa/QuartzTextLayout.h	2014-01-24 04:00:28 +0000
@@ -20,7 +20,7 @@
 {
 public:
     /** Create a text layout for drawing on the specified context. */
-    QuartzTextLayout( CGContextRef context )
+    explicit QuartzTextLayout( CGContextRef context )
     {
 		mString = NULL;
 		mLine = NULL;
@@ -39,7 +39,7 @@
 		{
 			CFRelease(mLine);
 			mLine = NULL;
-		}	
+		}
     }
 
     inline void setText( const UInt8* buffer, size_t byteLength, CFStringEncoding encoding, const QuartzTextStyle& r )
@@ -47,19 +47,19 @@
 		CFStringRef str = CFStringCreateWithBytes( NULL, buffer, byteLength, encoding, false );
         if (!str)
             return;
-		
+
 	        stringLength = CFStringGetLength(str);
 
 		CFMutableDictionaryRef stringAttribs = r.getCTStyle();
-		
+
 		if (mString != NULL)
 			CFRelease(mString);
 		mString = ::CFAttributedStringCreate(NULL, str, stringAttribs);
-		
+
 		if (mLine != NULL)
 			CFRelease(mLine);
 		mLine = ::CTLineCreateWithAttributedString(mString);
-		
+
 		CFRelease( str );
     }
 
@@ -70,28 +70,28 @@
     {
 		if (mLine == NULL)
 			return;
-		
+
 		::CGContextSetTextMatrix(gc, CGAffineTransformMakeScale(1.0, -1.0));
-		
+
 		// Set the text drawing position.
 		::CGContextSetTextPosition(gc, x, y);
-		
+
 		// And finally, draw!
 		::CTLineDraw(mLine, gc);
     }
-	
+
 	float MeasureStringWidth()
-	{		
+	{
 		if (mLine == NULL)
 			return 0.0f;
-		
+
 		return ::CTLineGetTypographicBounds(mLine, NULL, NULL, NULL);
 	}
-	
+
     CTLineRef getCTLine() {
         return mLine;
     }
-	
+
     CFIndex getStringLength() {
 	    return stringLength;
     }
 
=== modified file 'cocoa/ScintillaCocoa.h'
--- cocoa/ScintillaCocoa.h	2012-10-26 08:56:06 +0000
+++ cocoa/ScintillaCocoa.h	2014-01-24 04:00:28 +0000
@@ -29,7 +29,6 @@
 #include "PropSetSimple.h"
 #endif
 
-#include "SVector.h"
 #include "SplitVector.h"
 #include "Partitioning.h"
 #include "RunStyles.h"
@@ -45,16 +44,19 @@
 #include "ViewStyle.h"
 #include "CharClassify.h"
 #include "Decoration.h"
+#include "CaseFolder.h"
 #include "Document.h"
 #include "Selection.h"
 #include "PositionCache.h"
 #include "Editor.h"
-//#include "ScintillaCallTip.h"
 
 #include "ScintillaBase.h"
+#include "CaseConvert.h"
 
 extern "C" NSString* ScintillaRecPboardType;
 
+@class SCIContentView;
+@class SCIMarginView;
 @class ScintillaView;
 
 @class FindHighlightLayer;
@@ -76,26 +78,6 @@
 namespace Scintilla {
 
 /**
- * On the Mac, there is no WM_COMMAND or WM_NOTIFY message that can be sent
- * back to the parent. Therefore, there must be a callback handler that acts
- * like a Windows WndProc, where Scintilla can send notifications to. Use
- * ScintillaCocoa::RegisterNotifyHandler() to register such a handler.
- * Message format is:
- * <br>
- * WM_COMMAND: HIWORD (wParam) = notification code, LOWORD (wParam) = 0 (no control ID), lParam = ScintillaCocoa*
- * <br>
- * WM_NOTIFY: wParam = 0 (no control ID), lParam = ptr to SCNotification structure, with hwndFrom set to ScintillaCocoa*
- */
-typedef void(*SciNotifyFunc) (intptr_t windowid, unsigned int iMessage, uintptr_t wParam, uintptr_t lParam);
-
-/**
- * Scintilla sends these two messages to the nofity handler. Please refer
- * to the Windows API doc for details about the message format.
- */
-#define	WM_COMMAND	1001
-#define WM_NOTIFY	1002
-
-/**
  * Main scintilla class, implemented for OS X (Cocoa).
  */
 class ScintillaCocoa : public ScintillaBase
@@ -103,48 +85,76 @@
 private:
   TimerTarget* timerTarget;
   NSEvent* lastMouseEvent;
-  
+
+  id<ScintillaNotificationProtocol> delegate;
+
   SciNotifyFunc	notifyProc;
   intptr_t notifyObj;
 
   bool capturedMouse;
 
+  bool enteredSetScrollingSize;
+
   // Private so ScintillaCocoa objects can not be copied
   ScintillaCocoa(const ScintillaCocoa &) : ScintillaBase() {}
   ScintillaCocoa &operator=(const ScintillaCocoa &) { return * this; }
 
   bool GetPasteboardData(NSPasteboard* board, SelectionText* selectedText);
   void SetPasteboardData(NSPasteboard* board, const SelectionText& selectedText);
-  
+
   int scrollSpeed;
   int scrollTicks;
+<<<<<<< TREE
   NSTimer* tickTimer;
   NSTimer* idleTimer;
 	
   FindHighlightLayer *layerFindIndicator;
 
+=======
+  NSTimer* tickTimer;
+  NSTimer* idleTimer;
+  CFRunLoopObserverRef observer;
+
+  FindHighlightLayer *layerFindIndicator;
+
+>>>>>>> MERGE-SOURCE
 protected:
+  Point GetVisibleOriginInMain();
   PRectangle GetClientRectangle();
   Point ConvertPoint(NSPoint point);
-  
+  virtual void RedrawRect(PRectangle rc);
+  virtual void Redraw();
+
   virtual void Initialise();
   virtual void Finalise();
   virtual CaseFolder *CaseFolderForEncoding();
   virtual std::string CaseMapString(const std::string &s, int caseMapping);
-  virtual void CancelModes();
+<<<<<<< TREE
+  virtual void CancelModes();
+=======
+  virtual void CancelModes();
+
+>>>>>>> MERGE-SOURCE
 public:
-  NSView* ContentView();
-
-  ScintillaCocoa(NSView* view);
+  ScintillaCocoa(SCIContentView* view, SCIMarginView* viewMargin);
   virtual ~ScintillaCocoa();
 
+  void SetDelegate(id<ScintillaNotificationProtocol> delegate_);
   void RegisterNotifyCallback(intptr_t windowid, SciNotifyFunc callback);
   sptr_t WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam);
 
   ScintillaView* TopContainer();
+  NSScrollView* ScrollContainer();
+  SCIContentView* ContentView();
 
-  bool SyncPaint(void* gc, PRectangle rc);
-  bool Draw(NSRect rect, CGContextRef gc);
+<<<<<<< TREE
+  bool SyncPaint(void* gc, PRectangle rc);
+  bool Draw(NSRect rect, CGContextRef gc);
+=======
+  bool SyncPaint(void* gc, PRectangle rc);
+  bool Draw(NSRect rect, CGContextRef gc);
+  void PaintMargin(NSRect aRect);
+>>>>>>> MERGE-SOURCE
 
   virtual sptr_t DefWndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam);
   void SetTicking(bool on);
@@ -155,9 +165,10 @@
   void SetVerticalScrollPos();
   void SetHorizontalScrollPos();
   bool ModifyScrollBars(int nMax, int nPage);
+  bool SetScrollingSize(void);
   void Resize();
-  void DoScroll(float position, NSScrollerPart part, bool horizontal);
-    
+  void UpdateForScroll();
+
   // Notifications for the owner.
   void NotifyChange();
   void NotifyFocus(bool focus);
@@ -179,13 +190,20 @@
   virtual void ClaimSelection();
 
   NSPoint GetCaretPosition();
-  
+
   static sptr_t DirectFunction(ScintillaCocoa *sciThis, unsigned int iMessage, uptr_t wParam, sptr_t lParam);
 
   void TimerFired(NSTimer* timer);
   void IdleTimerFired();
+  static void UpdateObserver(CFRunLoopObserverRef observer, CFRunLoopActivity activity, void *sci);
+  void ObserverAdd();
+  void ObserverRemove();
+  virtual void IdleWork();
+  virtual void QueueIdleWork(WorkNeeded::workItems items, int upTo);
   int InsertText(NSString* input);
-  
+  void SelectOnlyMainSelection();
+  virtual void SetDocPointer(Document *document);
+
   bool KeyboardInput(NSEvent* event);
   void MouseDown(NSEvent* event);
   void MouseMove(NSEvent* event);
@@ -202,14 +220,14 @@
   void DraggingExited(id <NSDraggingInfo> info);
   bool PerformDragOperation(id <NSDraggingInfo> info);
   void DragScroll();
-  
+
   // Promote some methods needed for NSResponder actions.
   virtual void SelectAll();
   void DeleteBackward();
   virtual void Cut();
   virtual void Undo();
   virtual void Redo();
-  
+
   virtual NSMenu* CreateContextMenu(NSEvent* event);
   void HandleCommand(NSInteger command);
 
 
=== modified file 'cocoa/ScintillaCocoa.mm'
--- cocoa/ScintillaCocoa.mm	2013-01-21 11:10:24 +0000
+++ cocoa/ScintillaCocoa.mm	2014-01-24 04:00:28 +0000
@@ -2,7 +2,7 @@
 /**
  * Scintilla source code edit control
  * ScintillaCocoa.mm - Cocoa subclass of ScintillaBase
- * 
+ *
  * Written by Mike Lischke <[e-mail]>
  *
  * Loosely based on ScintillaMacOSX.cxx.
@@ -15,6 +15,7 @@
  */
 
 #import <Cocoa/Cocoa.h>
+<<<<<<< TREE
 #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
 #import <QuartzCore/CAGradientLayer.h>
 #endif
@@ -25,13 +26,21 @@
 
 #include "ScintillaView.h"
 #include "PlatCocoa.h"
+=======
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
+#import <QuartzCore/CAGradientLayer.h>
+#endif
+#import <QuartzCore/CAAnimation.h>
+#import <QuartzCore/CATransaction.h>
+
+#import "Platform.h"
+#import "ScintillaView.h"
+#import "ScintillaCocoa.h"
+#import "PlatCocoa.h"
+>>>>>>> MERGE-SOURCE
 
 using namespace Scintilla;
 
-#ifndef WM_UNICHAR
-#define WM_UNICHAR 0x0109
-#endif
-
 NSString* ScintillaRecPboardType = @"com.scintilla.utf16-plain-text.rectangular";
 
 //--------------------------------------------------------------------------------------------------
@@ -139,6 +148,7 @@
 
 //--------------------------------------------------------------------------------------------------
 
+<<<<<<< TREE
 #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
 
 // Only implement FindHighlightLayer on OS X 10.6+
@@ -307,6 +317,176 @@
 
 //--------------------------------------------------------------------------------------------------
 
+=======
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
+
+// Only implement FindHighlightLayer on OS X 10.6+
+
+/**
+ * Class to display the animated gold roundrect used on OS X for matches.
+ */
+@interface FindHighlightLayer : CAGradientLayer
+{
+@private
+	NSString *sFind;
+	int positionFind;
+	BOOL retaining;
+	CGFloat widthText;
+	CGFloat heightLine;
+	NSString *sFont;
+	CGFloat fontSize;
+}
+
+@property (copy) NSString *sFind;
+@property (assign) int positionFind;
+@property (assign) BOOL retaining;
+@property (assign) CGFloat widthText;
+@property (assign) CGFloat heightLine;
+@property (copy) NSString *sFont;
+@property (assign) CGFloat fontSize;
+
+- (void) animateMatch: (CGPoint)ptText bounce:(BOOL)bounce;
+- (void) hideMatch;
+
+@end
+
+//--------------------------------------------------------------------------------------------------
+
+@implementation FindHighlightLayer
+
+@synthesize sFind, positionFind, retaining, widthText, heightLine, sFont, fontSize;
+
+-(id) init {
+	if (self = [super init]) {
+		[self setNeedsDisplayOnBoundsChange: YES];
+		// A gold to slightly redder gradient to match other applications
+		CGColorRef colGold = CGColorCreateGenericRGB(1.0, 1.0, 0, 1.0);
+		CGColorRef colGoldRed = CGColorCreateGenericRGB(1.0, 0.8, 0, 1.0);
+		self.colors = [NSArray arrayWithObjects:(id)colGoldRed, (id)colGold, nil];
+		CGColorRelease(colGoldRed);
+		CGColorRelease(colGold);
+
+		CGColorRef colGreyBorder = CGColorCreateGenericGray(0.756f, 0.5f);
+		self.borderColor = colGreyBorder;
+		CGColorRelease(colGreyBorder);
+
+		self.borderWidth = 1.0;
+		self.cornerRadius = 5.0f;
+		self.shadowRadius = 1.0f;
+		self.shadowOpacity = 0.9f;
+		self.shadowOffset = CGSizeMake(0.0f, -2.0f);
+		self.anchorPoint = CGPointMake(0.5, 0.5);
+	}
+	return self;
+
+}
+
+const CGFloat paddingHighlightX = 4;
+const CGFloat paddingHighlightY = 2;
+
+-(void) drawInContext:(CGContextRef)context {
+	if (!sFind || !sFont)
+		return;
+
+	CFStringRef str = CFStringRef(sFind);
+
+	CFMutableDictionaryRef styleDict = CFDictionaryCreateMutable(kCFAllocatorDefault, 2,
+								     &kCFTypeDictionaryKeyCallBacks,
+								     &kCFTypeDictionaryValueCallBacks);
+	CGColorRef color = CGColorCreateGenericRGB(0.0, 0.0, 0.0, 1.0);
+	CFDictionarySetValue(styleDict, kCTForegroundColorAttributeName, color);
+	CTFontRef fontRef = ::CTFontCreateWithName((CFStringRef)sFont, fontSize, NULL);
+	CFDictionaryAddValue(styleDict, kCTFontAttributeName, fontRef);
+
+	CFAttributedStringRef attrString = ::CFAttributedStringCreate(NULL, str, styleDict);
+	CTLineRef textLine = ::CTLineCreateWithAttributedString(attrString);
+	// Indent from corner of bounds
+	CGContextSetTextPosition(context, paddingHighlightX, 3 + paddingHighlightY);
+	CTLineDraw(textLine, context);
+
+	CFRelease(textLine);
+	CFRelease(attrString);
+	CFRelease(fontRef);
+	CGColorRelease(color);
+	CFRelease(styleDict);
+}
+
+- (void) animateMatch: (CGPoint)ptText bounce:(BOOL)bounce {
+	if (!self.sFind || ![self.sFind length]) {
+		[self hideMatch];
+		return;
+	}
+
+	CGFloat width = self.widthText + paddingHighlightX * 2;
+	CGFloat height = self.heightLine + paddingHighlightY * 2;
+
+	CGFloat flipper = self.geometryFlipped ? -1.0 : 1.0;
+
+	// Adjust for padding
+	ptText.x -= paddingHighlightX;
+	ptText.y += flipper * paddingHighlightY;
+
+	// Shift point to centre as expanding about centre
+	ptText.x += width / 2.0;
+	ptText.y -= flipper * height / 2.0;
+
+	[CATransaction begin];
+	[CATransaction setValue:[NSNumber numberWithFloat:0.0] forKey:kCATransactionAnimationDuration];
+	self.bounds = CGRectMake(0,0, width, height);
+	self.position = ptText;
+	if (bounce) {
+		// Do not reset visibility when just moving
+		self.hidden = NO;
+		self.opacity = 1.0;
+	}
+	[self setNeedsDisplay];
+	[CATransaction commit];
+
+	if (bounce) {
+		CABasicAnimation *animBounce = [CABasicAnimation animationWithKeyPath:@"transform.scale"];
+		animBounce.duration = 0.15;
+		animBounce.autoreverses = YES;
+		animBounce.removedOnCompletion = NO;
+		animBounce.fromValue = [NSNumber numberWithFloat: 1.0];
+		animBounce.toValue = [NSNumber numberWithFloat: 1.25];
+
+		if (self.retaining) {
+
+			[self addAnimation: animBounce forKey:@"animateFound"];
+
+		} else {
+
+			CABasicAnimation *animFade = [CABasicAnimation animationWithKeyPath:@"opacity"];
+			animFade.duration = 0.1;
+			animFade.beginTime = 0.4;
+			animFade.removedOnCompletion = NO;
+			animFade.fromValue = [NSNumber numberWithFloat: 1.0];
+			animFade.toValue = [NSNumber numberWithFloat: 0.0];
+
+			CAAnimationGroup *group = [CAAnimationGroup animation];
+			[group setDuration:0.5];
+			group.removedOnCompletion = NO;
+			group.fillMode = kCAFillModeForwards;
+			[group setAnimations:[NSArray arrayWithObjects:animBounce, animFade, nil]];
+
+			[self addAnimation:group forKey:@"animateFound"];
+		}
+	}
+}
+
+- (void) hideMatch {
+	self.sFind = @"";
+	self.positionFind = INVALID_POSITION;
+	self.hidden = YES;
+}
+
+@end
+
+#endif
+
+//--------------------------------------------------------------------------------------------------
+
+>>>>>>> MERGE-SOURCE
 @implementation TimerTarget
 
 - (id) init: (void*) target
@@ -318,9 +498,9 @@
 
     // Get the default notification queue for the thread which created the instance (usually the
     // main thread). We need that later for idle event processing.
-    NSNotificationCenter* center = [NSNotificationCenter defaultCenter]; 
+    NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
     notificationQueue = [[NSNotificationQueue alloc] initWithNotificationCenter: center];
-    [center addObserver: self selector: @selector(idleTriggered:) name: @"Idle" object: nil]; 
+    [center addObserver: self selector: @selector(idleTriggered:) name: @"Idle" object: nil];
   }
   return self;
 }
@@ -329,8 +509,13 @@
 
 - (void) dealloc
 {
+<<<<<<< TREE
   NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
   [center removeObserver: self];
+=======
+  NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
+  [center removeObserver:self];
+>>>>>>> MERGE-SOURCE
   [notificationQueue release];
   [super dealloc];
 }
@@ -358,11 +543,11 @@
   // Post a new idle notification, which gets executed when the run loop is idle.
   // Since we are coalescing on name and sender there will always be only one actual notification
   // even for multiple requests.
-  NSNotification *notification = [NSNotification notificationWithName: @"Idle" object: self]; 
+  NSNotification *notification = [NSNotification notificationWithName: @"Idle" object: self];
   [notificationQueue enqueueNotification: notification
                             postingStyle: NSPostWhenIdle
                             coalesceMask: (NSNotificationCoalescingOnName | NSNotificationCoalescingOnSender)
-                                forModes: nil]; 
+                                forModes: nil];
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -381,11 +566,30 @@
 
 //----------------- ScintillaCocoa -----------------------------------------------------------------
 
-ScintillaCocoa::ScintillaCocoa(NSView* view)
+ScintillaCocoa::ScintillaCocoa(SCIContentView* view, SCIMarginView* viewMargin)
 {
-  wMain = view; // Don't retain since we're owned by view, which would cause a cycle
-  timerTarget = [[TimerTarget alloc] init: this];
-  layerFindIndicator = NULL;
+<<<<<<< TREE
+  wMain = view; // Don't retain since we're owned by view, which would cause a cycle
+  timerTarget = [[TimerTarget alloc] init: this];
+  layerFindIndicator = NULL;
+=======
+  vs.marginInside = false;
+  wMain = view; // Don't retain since we're owned by view, which would cause a cycle
+  wMargin = viewMargin;
+  timerTarget = [[TimerTarget alloc] init: this];
+  lastMouseEvent = NULL;
+  delegate = NULL;
+  notifyObj = NULL;
+  notifyProc = NULL;
+  capturedMouse = false;
+  enteredSetScrollingSize = false;
+  scrollSpeed = 1;
+  scrollTicks = 2000;
+  tickTimer = NULL;
+  idleTimer = NULL;
+  observer = NULL;
+  layerFindIndicator = NULL;
+>>>>>>> MERGE-SOURCE
   Initialise();
 }
 
@@ -393,7 +597,7 @@
 
 ScintillaCocoa::~ScintillaCocoa()
 {
-  SetTicking(false);
+  Finalise();
   [timerTarget release];
 }
 
@@ -402,29 +606,20 @@
 /**
  * Core initialization of the control. Everything that needs to be set up happens here.
  */
-void ScintillaCocoa::Initialise() 
+void ScintillaCocoa::Initialise()
 {
-  static bool initedLexers = false;
-  if (!initedLexers)
-  {
-    initedLexers = true;
-    Scintilla_LinkLexers();
-  }
-  notifyObj = NULL;
-  notifyProc = NULL;
-  
-  capturedMouse = false;
-  
+  Scintilla_LinkLexers();
+
   // Tell Scintilla not to buffer: Quartz buffers drawing for us.
   WndProc(SCI_SETBUFFEREDDRAW, 0, 0);
-  
+
   // We are working with Unicode exclusively.
   WndProc(SCI_SETCODEPAGE, SC_CP_UTF8, 0);
 
   // Add Mac specific key bindings.
-  for (int i = 0; macMapDefault[i].key; i++) 
+  for (int i = 0; macMapDefault[i].key; i++)
     kmap.AssignCmdKey(macMapDefault[i].key, macMapDefault[i].modifiers, macMapDefault[i].msg);
-  
+
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -434,12 +629,70 @@
  */
 void ScintillaCocoa::Finalise()
 {
+  ObserverRemove();
   SetTicking(false);
   ScintillaBase::Finalise();
 }
 
 //--------------------------------------------------------------------------------------------------
 
+void ScintillaCocoa::UpdateObserver(CFRunLoopObserverRef observer, CFRunLoopActivity activity, void *info) {
+  ScintillaCocoa* sci = reinterpret_cast<ScintillaCocoa*>(info);
+  sci->IdleWork();
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Add an observer to the run loop to perform styling as high-priority idle task.
+ */
+
+void ScintillaCocoa::ObserverAdd() {
+  if (!observer) {
+    CFRunLoopObserverContext context;
+    context.version = 0;
+    context.info = this;
+    context.retain = NULL;
+    context.release = NULL;
+    context.copyDescription = NULL;
+
+    CFRunLoopRef mainRunLoop = CFRunLoopGetMain();
+    observer = CFRunLoopObserverCreate(NULL, kCFRunLoopEntry | kCFRunLoopBeforeWaiting,
+      true, 0, UpdateObserver, &context);
+    CFRunLoopAddObserver(mainRunLoop, observer, kCFRunLoopCommonModes);
+  }
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Remove the run loop observer.
+ */
+void ScintillaCocoa::ObserverRemove() {
+  if (observer) {
+    CFRunLoopRef mainRunLoop = CFRunLoopGetMain();
+    CFRunLoopRemoveObserver(mainRunLoop, observer, kCFRunLoopCommonModes);
+    CFRelease(observer);
+  }
+  observer = NULL;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void ScintillaCocoa::IdleWork() {
+  Editor::IdleWork();
+  ObserverRemove();
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void ScintillaCocoa::QueueIdleWork(WorkNeeded::workItems items, int upTo) {
+  Editor::QueueIdleWork(items, upTo);
+  ObserverAdd();
+}
+
+//--------------------------------------------------------------------------------------------------
+
 /**
  * Convert a core foundation string into an array of bytes in a particular encoding
  */
@@ -449,7 +702,7 @@
     CFIndex usedLen = 0;
     CFStringGetBytes(cfsRef, rangeAll, encoding, '?',
                      false, NULL, 0, &usedLen);
-    
+
     char *buffer = new char[usedLen+1];
     CFStringGetBytes(cfsRef, rangeAll, encoding, '?',
                      false, (UInt8 *)buffer,usedLen, NULL);
@@ -463,6 +716,7 @@
  * Case folders.
  */
 
+<<<<<<< TREE
 class CaseFolderUTF8 : public CaseFolderTable {
 public:
 	CaseFolderUTF8() {
@@ -494,10 +748,12 @@
 	}
 };
 
+=======
+>>>>>>> MERGE-SOURCE
 class CaseFolderDBCS : public CaseFolderTable {
 	CFStringEncoding encoding;
 public:
-	CaseFolderDBCS(CFStringEncoding encoding_) : encoding(encoding_) {
+	explicit CaseFolderDBCS(CFStringEncoding encoding_) : encoding(encoding_) {
 		StandardASCII();
 	}
 	virtual size_t Fold(char *folded, size_t sizeFolded, const char *mixed, size_t lenMixed) {
@@ -506,12 +762,12 @@
 			return 1;
 		} else {
             CFStringRef cfsVal = CFStringCreateWithBytes(kCFAllocatorDefault,
-                                                         reinterpret_cast<const UInt8 *>(mixed), 
+                                                         reinterpret_cast<const UInt8 *>(mixed),
                                                          lenMixed, encoding, false);
 
             NSString *sMapped = [(NSString *)cfsVal stringByFoldingWithOptions:NSCaseInsensitiveSearch
                                                                         locale:[NSLocale currentLocale]];
-            
+
             char *encoded = EncodedBytes((CFStringRef)sMapped, encoding);
 
 			size_t lenMapped = strlen(encoded);
@@ -533,7 +789,7 @@
 
 CaseFolder *ScintillaCocoa::CaseFolderForEncoding() {
 	if (pdoc->dbcsCodePage == SC_CP_UTF8) {
-		return new CaseFolderUTF8();
+		return new CaseFolderUnicode();
 	} else {
         CFStringEncoding encoding = EncodingFromCharacterSet(IsUnicodeMode(),
                                                              vs.styles[STYLE_DEFAULT].characterSet);
@@ -545,18 +801,20 @@
                 char sCharacter[2] = "A";
                 sCharacter[0] = i;
                 CFStringRef cfsVal = CFStringCreateWithBytes(kCFAllocatorDefault,
-                                                             reinterpret_cast<const UInt8 *>(sCharacter), 
+                                                             reinterpret_cast<const UInt8 *>(sCharacter),
                                                              1, encoding, false);
-                
+                if (!cfsVal)
+                        continue;
+
                 NSString *sMapped = [(NSString *)cfsVal stringByFoldingWithOptions:NSCaseInsensitiveSearch
                                                                             locale:[NSLocale currentLocale]];
-                
+
                 char *encoded = EncodedBytes((CFStringRef)sMapped, encoding);
-                
+
                 if (strlen(encoded) == 1) {
                     pcf->SetTranslation(sCharacter[0], encoded[0]);
                 }
-                
+
                 delete []encoded;
                 CFRelease(cfsVal);
             }
@@ -576,10 +834,21 @@
  */
 std::string ScintillaCocoa::CaseMapString(const std::string &s, int caseMapping)
 {
+  if ((s.size() == 0) || (caseMapping == cmSame))
+    return s;
+
+  if (IsUnicodeMode()) {
+    std::string retMapped(s.length() * maxExpansionCaseConversion, 0);
+    size_t lenMapped = CaseConvertString(&retMapped[0], retMapped.length(), s.c_str(), s.length(),
+      (caseMapping == cmUpper) ? CaseConversionUpper : CaseConversionLower);
+    retMapped.resize(lenMapped);
+    return retMapped;
+  }
+
   CFStringEncoding encoding = EncodingFromCharacterSet(IsUnicodeMode(),
                                                        vs.styles[STYLE_DEFAULT].characterSet);
   CFStringRef cfsVal = CFStringCreateWithBytes(kCFAllocatorDefault,
-                                               reinterpret_cast<const UInt8 *>(s.c_str()), 
+                                               reinterpret_cast<const UInt8 *>(s.c_str()),
                                                s.length(), encoding, false);
 
   NSString *sMapped;
@@ -621,7 +890,17 @@
 ScintillaView* ScintillaCocoa::TopContainer()
 {
   NSView* container = static_cast<NSView*>(wMain.GetID());
-  return static_cast<ScintillaView*>([container superview]);
+  return static_cast<ScintillaView*>([[[container superview] superview] superview]);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Helper function to get the scrolling view.
+ */
+NSScrollView* ScintillaCocoa::ScrollContainer() {
+  NSView* container = static_cast<NSView*>(wMain.GetID());
+  return static_cast<NSScrollView*>([[container superview] superview]);
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -629,9 +908,21 @@
 /**
  * Helper function to get the inner container which represents the actual "canvas" we work with.
  */
-NSView* ScintillaCocoa::ContentView()
-{
-  return static_cast<NSView*>(wMain.GetID());
+SCIContentView* ScintillaCocoa::ContentView()
+{
+  return static_cast<SCIContentView*>(wMain.GetID());
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Return the top left visible point relative to the origin point of the whole document.
+ */
+Scintilla::Point ScintillaCocoa::GetVisibleOriginInMain()
+{
+  NSScrollView *scrollView = ScrollContainer();
+  NSRect contentRect = [[scrollView contentView] bounds];
+  return Point(contentRect.origin.x, contentRect.origin.y);
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -639,42 +930,67 @@
 /**
  * Instead of returning the size of the inner view we have to return the visible part of it
  * in order to make scrolling working properly.
+ * The returned value is in document coordinates.
  */
 PRectangle ScintillaCocoa::GetClientRectangle()
 {
-  NSView* host = ContentView();
-  NSSize size = [host frame].size;
-  return PRectangle(0, 0, size.width, size.height);
+  NSScrollView *scrollView = ScrollContainer();
+  NSSize size = [[scrollView contentView] bounds].size;
+  Point origin = GetVisibleOriginInMain();
+  return PRectangle(origin.x, origin.y, origin.x+size.width, origin.y + size.height);
 }
 
 //--------------------------------------------------------------------------------------------------
 
 /**
  * Converts the given point from base coordinates to local coordinates and at the same time into
- * a native Point structure. Base coordinates are used for the top window used in the view hierarchy. 
+ * a native Point structure. Base coordinates are used for the top window used in the view hierarchy.
+ * Returned value is in view coordinates.
  */
 Scintilla::Point ScintillaCocoa::ConvertPoint(NSPoint point)
 {
   NSView* container = ContentView();
   NSPoint result = [container convertPoint: point fromView: nil];
-  
-  return Point(result.x, result.y);
+  Scintilla::Point ptOrigin = GetVisibleOriginInMain();
+  return Point(result.x - ptOrigin.x, result.y - ptOrigin.y);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Do not clip like superclass as Cocoa is not reporting all of prepared area.
+ */
+void ScintillaCocoa::RedrawRect(PRectangle rc)
+{
+  if (!rc.Empty())
+    wMain.InvalidateRectangle(rc);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Ensure all of prepared content is also redrawn.
+ */
+void ScintillaCocoa::Redraw()
+{
+  wMargin.InvalidateAll();
+  wMain.InvalidateAll();
 }
 
 //--------------------------------------------------------------------------------------------------
 
 /**
  * A function to directly execute code that would usually go the long way via window messages.
- * However this is a Windows metapher and not used here, hence we just call our fake
+ * However this is a Windows metaphor and not used here, hence we just call our fake
  * window proc. The given parameters directly reflect the message parameters used on Windows.
  *
  * @param sciThis The target which is to be called.
  * @param iMessage A code that indicates which message was sent.
- * @param wParam One of the two free parameters for the message. Traditionally a word sized parameter 
+ * @param wParam One of the two free parameters for the message. Traditionally a word sized parameter
  *               (hence the w prefix).
  * @param lParam The other of the two free parameters. A signed long.
  */
-sptr_t ScintillaCocoa::DirectFunction(ScintillaCocoa *sciThis, unsigned int iMessage, uptr_t wParam, 
+sptr_t ScintillaCocoa::DirectFunction(ScintillaCocoa *sciThis, unsigned int iMessage, uptr_t wParam,
                                       sptr_t lParam)
 {
   return sciThis->WndProc(iMessage, wParam, lParam);
@@ -695,12 +1011,12 @@
 
 //--------------------------------------------------------------------------------------------------
 
-/** 
+/**
  * That's our fake window procedure. On Windows each window has a dedicated procedure to handle
  * commands (also used to synchronize UI and background threads), which is not the case in Cocoa.
- * 
+ *
  * Messages handled here are almost solely for special commands of the backend. Everything which
- * would be sytem messages on Windows (e.g. for key down, mouse move etc.) are handled by
+ * would be system messages on Windows (e.g. for key down, mouse move etc.) are handled by
  * directly calling appropriate handlers.
  */
 sptr_t ScintillaCocoa::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam)
@@ -709,19 +1025,20 @@
   {
     case SCI_GETDIRECTFUNCTION:
       return reinterpret_cast<sptr_t>(DirectFunction);
-      
+
     case SCI_GETDIRECTPOINTER:
       return reinterpret_cast<sptr_t>(this);
-      
+
     case SCI_GRABFOCUS:
-	  [[ContentView() window] makeFirstResponder:ContentView()];
+      [[ContentView() window] makeFirstResponder:ContentView()];
       break;
 
     case SCI_SETBUFFEREDDRAW:
-      // Buffered drawing not supported on Cocoa 
+      // Buffered drawing not supported on Cocoa
       bufferedDraw = false;
       break;
 
+<<<<<<< TREE
     case SCI_FINDINDICATORSHOW:
       ShowFindIndicatorForRange(NSMakeRange(wParam, lParam-wParam), YES);
       return 0;
@@ -747,9 +1064,23 @@
       }
       return 0;
 
+=======
+    case SCI_FINDINDICATORSHOW:
+      ShowFindIndicatorForRange(NSMakeRange(wParam, lParam-wParam), YES);
+      return 0;
+
+    case SCI_FINDINDICATORFLASH:
+      ShowFindIndicatorForRange(NSMakeRange(wParam, lParam-wParam), NO);
+      return 0;
+
+    case SCI_FINDINDICATORHIDE:
+      HideFindIndicator();
+      return 0;
+
+>>>>>>> MERGE-SOURCE
     default:
       sptr_t r = ScintillaBase::WndProc(iMessage, wParam, lParam);
-      
+
       return r;
   }
   return 0l;
@@ -758,7 +1089,7 @@
 //--------------------------------------------------------------------------------------------------
 
 /**
- * In Windows lingo this is the handler which handles anything that wasn't handled in the normal 
+ * In Windows lingo this is the handler which handles anything that wasn't handled in the normal
  * window proc which would usually send the message back to generic window proc that Windows uses.
  */
 sptr_t ScintillaCocoa::DefWndProc(unsigned int, uptr_t, sptr_t)
@@ -849,7 +1180,7 @@
 {
   if (!Editor::CanPaste())
     return false;
-  
+
   return GetPasteboardData([NSPasteboard generalPasteboard], NULL);
 }
 
@@ -871,25 +1202,25 @@
   bool ok = GetPasteboardData([NSPasteboard generalPasteboard], &selectedText);
   if (forceRectangular)
     selectedText.rectangular = forceRectangular;
-  
-  if (!ok || !selectedText.s)
+
+  if (!ok || selectedText.Empty())
     // No data or no flavor we support.
     return;
-  
+
   pdoc->BeginUndoAction();
   ClearSelection(false);
-  int length = selectedText.len - 1; // One less to avoid inserting the terminating 0 character.
+  int length = selectedText.Length();
+  SelectionPosition selStart = sel.RangeMain().Start();
   if (selectedText.rectangular)
   {
-    SelectionPosition selStart = sel.RangeMain().Start();
-    PasteRectangular(selStart, selectedText.s, length);
-  }
-  else 
-    if (pdoc->InsertString(sel.RangeMain().caret.Position(), selectedText.s, length))
-      SetEmptySelection(sel.RangeMain().caret.Position() + length);
-  
+    PasteRectangular(selStart, selectedText.Data(), length);
+  }
+  else
+  {
+    InsertPaste(selStart, selectedText.Data(), length);
+  }
   pdoc->EndUndoAction();
-  
+
   Redraw();
   EnsureCaretVisible();
 }
@@ -923,7 +1254,7 @@
 	if (self) {
         sci = NULL;
 	}
-	
+
 	return self;
 }
 
@@ -971,7 +1302,7 @@
 void ScintillaCocoa::CreateCallTipWindow(PRectangle rc) {
     if (!ct.wCallTip.Created()) {
         NSRect ctRect = NSMakeRect(rc.top,rc.bottom, rc.Width(), rc.Height());
-        NSWindow *callTip = [[NSWindow alloc] initWithContentRect: ctRect 
+        NSWindow *callTip = [[NSWindow alloc] initWithContentRect: ctRect
                                                         styleMask: NSBorderlessWindowMask
                                                           backing: NSBackingStoreBuffered
                                                             defer: NO];
@@ -994,8 +1325,13 @@
   ScintillaContextMenu *menu= reinterpret_cast<ScintillaContextMenu*>(popup.GetID());
   [menu setOwner: this];
   [menu setAutoenablesItems: NO];
+<<<<<<< TREE
   
   if (cmd == 0) {
+=======
+
+  if (cmd == 0) {
+>>>>>>> MERGE-SOURCE
     item = [NSMenuItem separatorItem];
   } else {
     item = [[[NSMenuItem alloc] init] autorelease];
@@ -1005,7 +1341,7 @@
   [item setAction: @selector(handleCommand:)];
   [item setTag: cmd];
   [item setEnabled: enabled];
-  
+
   [menu addItem: item];
 }
 
@@ -1051,7 +1387,7 @@
   int line = pdoc->LineFromPosition(posDrag.Position());
   int currentVisibleLine = cs.DisplayFromDoc(line);
   int lastVisibleLine = Platform::Minimum(topLine + LinesOnScreen(), cs.LinesDisplayed()) - 2;
-    
+
   if (currentVisibleLine <= topLine && topLine > 0)
     ScrollTo(topLine - scrollSpeed);
   else
@@ -1063,9 +1399,9 @@
       scrollTicks = 2000;
       return;
     }
-  
+
   // TODO: also handle horizontal scrolling.
-  
+
   if (scrollSpeed == 1)
   {
     scrollTicks -= timer.tickSize;
@@ -1075,7 +1411,7 @@
       scrollTicks = 2000;
     }
   }
-  
+
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -1088,12 +1424,14 @@
   if (sel.Empty())
     return;
 
+  inDragDrop = ddDragging;
+
   // Put the data to be dragged on the drag pasteboard.
   SelectionText selectedText;
   NSPasteboard* pasteboard = [NSPasteboard pasteboardWithName: NSDragPboard];
   CopySelectionRange(&selectedText);
   SetPasteboardData(pasteboard, selectedText);
-  
+
   // calculate the bounds of the selection
   PRectangle client = GetTextRectangle();
   int selStart = sel.RangeMain().Start().Position();
@@ -1102,14 +1440,14 @@
   int endLine = pdoc->LineFromPosition(selEnd);
   Point pt;
   long startPos, endPos, ep;
-  Rect rcSel;
-  
+  PRectangle rcSel;
+
   if (startLine==endLine && WndProc(SCI_GETWRAPMODE, 0, 0) != SC_WRAP_NONE) {
     // Komodo bug http://bugs.activestate.com/show_bug.cgi?id=87571
     // Scintilla bug https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3040200&group_id=2439
     // If the width on a wrapped-line selection is negative,
     // find a better bounding rectangle.
-    
+
     Point ptStart, ptEnd;
     startPos = WndProc(SCI_GETLINESELSTARTPOSITION, startLine, 0);
     endPos =   WndProc(SCI_GETLINESELENDPOSITION,   startLine, 0);
@@ -1163,19 +1501,16 @@
   }
   // must convert to global coordinates for drag regions, but also save the
   // image rectangle for further calculations and copy operations
-  PRectangle localRectangle = PRectangle(rcSel.left, rcSel.top, rcSel.right, rcSel.bottom);
-    
+
   // Prepare drag image.
-  NSRect selectionRectangle = PRectangleToNSRect(localRectangle);
-  
+  NSRect selectionRectangle = PRectangleToNSRect(rcSel);
+
   NSView* content = ContentView();
-    
-#if 1
 
   // To get a bitmap of the text we're dragging, we just use Paint on a pixmap surface.
   SurfaceImpl *sw = new SurfaceImpl();
   SurfaceImpl *pixmap = NULL;
-  
+
   bool lastHideSelection = hideSelection;
   hideSelection = true;
   if (sw)
@@ -1183,26 +1518,27 @@
     pixmap = new SurfaceImpl();
     if (pixmap)
     {
-      PRectangle imageRect = NSRectToPRectangle(selectionRectangle);
+      PRectangle imageRect = rcSel;
       paintState = painting;
       sw->InitPixMap(client.Width(), client.Height(), NULL, NULL);
       paintingAllText = true;
-      // Have to create a new context and make current as text drawing goes 
+      // Have to create a new context and make current as text drawing goes
       // to the current context, not a passed context.
-      CGContextRef gcsw = sw->GetContext(); 
-      NSGraphicsContext *nsgc = [NSGraphicsContext graphicsContextWithGraphicsPort: gcsw 
+      CGContextRef gcsw = sw->GetContext();
+      NSGraphicsContext *nsgc = [NSGraphicsContext graphicsContextWithGraphicsPort: gcsw
                                                                            flipped: YES];
       [NSGraphicsContext setCurrentContext:nsgc];
+      CGContextTranslateCTM(gcsw, -client.left, -client.top);
       Paint(sw, client);
       paintState = notPainting;
-      
+
       pixmap->InitPixMap(imageRect.Width(), imageRect.Height(), NULL, NULL);
-      
-      CGContextRef gc = pixmap->GetContext(); 
+
+      CGContextRef gc = pixmap->GetContext();
       // To make Paint() work on a bitmap, we have to flip our coordinates and translate the origin
       CGContextTranslateCTM(gc, 0, imageRect.Height());
       CGContextScaleCTM(gc, 1.0, -1.0);
-      
+
       pixmap->CopyImageRectangle(*sw, imageRect, PRectangle(0, 0, imageRect.Width(), imageRect.Height()));
       // XXX TODO: overwrite any part of the image that is not part of the
       //           selection to make it transparent.  right now we just use
@@ -1212,7 +1548,7 @@
     delete sw;
   }
   hideSelection = lastHideSelection;
-  
+
   NSBitmapImageRep* bitmap = NULL;
   if (pixmap)
   {
@@ -1222,29 +1558,20 @@
     pixmap->Release();
     delete pixmap;
   }
-#else
-  
-  // Poor man's drag image: take a snapshot of the content view.
-  [content lockFocus];
-  NSBitmapImageRep* bitmap = [[[NSBitmapImageRep alloc] initWithFocusedViewRect: selectionRectangle] autorelease];
-  [bitmap setColorSpaceName: NSDeviceRGBColorSpace];
-  [content unlockFocus];
-  
-#endif
-  
+
   NSImage* image = [[[NSImage alloc] initWithSize: selectionRectangle.size] autorelease];
   [image addRepresentation: bitmap];
-  
+
   NSImage* dragImage = [[[NSImage alloc] initWithSize: selectionRectangle.size] autorelease];
   [dragImage setBackgroundColor: [NSColor clearColor]];
   [dragImage lockFocus];
-  [image dissolveToPoint: NSMakePoint(0.0, 0.0) fraction: 0.5];
+  [image drawAtPoint: NSZeroPoint fromRect: NSZeroRect operation: NSCompositeSourceOver fraction: 0.5];
   [dragImage unlockFocus];
-  
+
   NSPoint startPoint;
-  startPoint.x = selectionRectangle.origin.x;
-  startPoint.y = selectionRectangle.origin.y + selectionRectangle.size.height;
-  [content dragImage: dragImage 
+  startPoint.x = selectionRectangle.origin.x + client.left;
+  startPoint.y = selectionRectangle.origin.y + selectionRectangle.size.height + client.top;
+  [content dragImage: dragImage
                   at: startPoint
               offset: NSZeroSize
                event: lastMouseEvent // Set in MouseMove.
@@ -1260,7 +1587,6 @@
  */
 NSDragOperation ScintillaCocoa::DraggingEntered(id <NSDraggingInfo> info)
 {
-  inDragDrop = ddDragging;
   return DraggingUpdated(info);
 }
 
@@ -1273,22 +1599,22 @@
  */
 NSDragOperation ScintillaCocoa::DraggingUpdated(id <NSDraggingInfo> info)
 {
-  // Convert the drag location from window coordinates to view coordinates and 
+  // Convert the drag location from window coordinates to view coordinates and
   // from there to a text position to finally set the drag position.
   Point location = ConvertPoint([info draggingLocation]);
   SetDragPosition(SPositionFromLocation(location));
-  
+
   NSDragOperation sourceDragMask = [info draggingSourceOperationMask];
   if (sourceDragMask == NSDragOperationNone)
     return sourceDragMask;
-  
+
   NSPasteboard* pasteboard = [info draggingPasteboard];
-  
+
   // Return what type of operation we will perform. Prefer move over copy.
   if ([[pasteboard types] containsObject: NSStringPboardType] ||
       [[pasteboard types] containsObject: ScintillaRecPboardType])
     return (sourceDragMask & NSDragOperationMove) ? NSDragOperationMove : NSDragOperationCopy;
-  
+
   if ([[pasteboard types] containsObject: NSFilenamesPboardType])
     return (sourceDragMask & NSDragOperationGeneric);
   return NSDragOperationNone;
@@ -1314,7 +1640,7 @@
 bool ScintillaCocoa::PerformDragOperation(id <NSDraggingInfo> info)
 {
   NSPasteboard* pasteboard = [info draggingPasteboard];
-  
+
   if ([[pasteboard types] containsObject: NSFilenamesPboardType])
   {
     NSArray* files = [pasteboard propertyListForType: NSFilenamesPboardType];
@@ -1325,13 +1651,13 @@
   {
     SelectionText text;
     GetPasteboardData(pasteboard, &text);
-    
-    if (text.len > 0)
+
+    if (text.Length() > 0)
     {
       NSDragOperation operation = [info draggingSourceOperationMask];
       bool moving = (operation & NSDragOperationMove) != 0;
-      
-      DropAt(posDrag, text.s, moving, text.rectangular);
+
+      DropAt(posDrag, text.Data(), text.Length(), moving, text.rectangular);
     };
   }
 
@@ -1342,26 +1668,26 @@
 
 void ScintillaCocoa::SetPasteboardData(NSPasteboard* board, const SelectionText &selectedText)
 {
-  if (selectedText.len == 0)
+  if (selectedText.Length() == 0)
     return;
 
   CFStringEncoding encoding = EncodingFromCharacterSet(selectedText.codePage == SC_CP_UTF8,
                                                        selectedText.characterSet);
   CFStringRef cfsVal = CFStringCreateWithBytes(kCFAllocatorDefault,
-                                               reinterpret_cast<const UInt8 *>(selectedText.s), 
-                                               selectedText.len-1, encoding, false);
-
-  [board declareTypes:[NSArray arrayWithObjects:
-                       NSStringPboardType,
-                       selectedText.rectangular ? ScintillaRecPboardType : nil,
-                       nil] owner:nil];
-  
+                                               reinterpret_cast<const UInt8 *>(selectedText.Data()),
+                                               selectedText.Length(), encoding, false);
+
+  NSArray *pbTypes = selectedText.rectangular ?
+    [NSArray arrayWithObjects: NSStringPboardType, ScintillaRecPboardType, nil] :
+    [NSArray arrayWithObjects: NSStringPboardType, nil];
+  [board declareTypes:pbTypes owner:nil];
+
   if (selectedText.rectangular)
   {
     // This is specific to scintilla, allows us to drag rectangular selections around the document.
     [board setString: (NSString *)cfsVal forType: ScintillaRecPboardType];
   }
-  
+
   [board setString: (NSString *)cfsVal forType: NSStringPboardType];
 
   if (cfsVal)
@@ -1375,40 +1701,39 @@
  */
 bool ScintillaCocoa::GetPasteboardData(NSPasteboard* board, SelectionText* selectedText)
 {
-  NSArray* supportedTypes = [NSArray arrayWithObjects: ScintillaRecPboardType, 
-                             NSStringPboardType, 
+  NSArray* supportedTypes = [NSArray arrayWithObjects: ScintillaRecPboardType,
+                             NSStringPboardType,
                              nil];
   NSString *bestType = [board availableTypeFromArray: supportedTypes];
   NSString* data = [board stringForType: bestType];
-  
+
   if (data != nil)
   {
     if (selectedText != nil)
     {
       CFStringEncoding encoding = EncodingFromCharacterSet(IsUnicodeMode(),
                                                            vs.styles[STYLE_DEFAULT].characterSet);
-      CFRange rangeAll = {0, [data length]};
+      CFRange rangeAll = {0, static_cast<CFIndex>([data length])};
       CFIndex usedLen = 0;
       CFStringGetBytes((CFStringRef)data, rangeAll, encoding, '?',
                        false, NULL, 0, &usedLen);
 
-      UInt8 *buffer = new UInt8[usedLen];
-    
+      std::vector<UInt8> buffer(usedLen);
+
       CFStringGetBytes((CFStringRef)data, rangeAll, encoding, '?',
-                       false, buffer,usedLen, NULL);
+                       false, buffer.data(),usedLen, NULL);
 
       bool rectangular = bestType == ScintillaRecPboardType;
 
       int len = static_cast<int>(usedLen);
-      char *dest = Document::TransformLineEnds(&len, (char *)buffer, len, pdoc->eolMode);
+      std::string dest = Document::TransformLineEnds((char *)buffer.data(), len, pdoc->eolMode);
 
-      selectedText->Set(dest, len+1, pdoc->dbcsCodePage, 
+      selectedText->Copy(dest, pdoc->dbcsCodePage,
                          vs.styles[STYLE_DEFAULT].characterSet , rectangular, false);
-      delete []buffer;
     }
     return true;
   }
-  
+
   return false;
 }
 
@@ -1417,16 +1742,6 @@
 void ScintillaCocoa::SetMouseCapture(bool on)
 {
   capturedMouse = on;
-  /*
-  if (mouseDownCaptures)
-  {
-    if (capturedMouse)
-      WndProc(SCI_SETCURSOR, Window::cursorArrow, 0);
-    else
-      // Reset to normal. Actual image will be set on mouse move.
-      WndProc(SCI_SETCURSOR, (unsigned int) SC_CURSORNORMAL, 0);
-  }
-   */
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -1451,6 +1766,16 @@
   Surface *sw = Surface::Allocate(SC_TECHNOLOGY_DEFAULT);
   if (sw)
   {
+    CGContextSetAllowsAntialiasing((CGContextRef)gc,
+                                   vs.extraFontFlag != SC_EFF_QUALITY_NON_ANTIALIASED);
+    CGContextSetAllowsFontSmoothing((CGContextRef)gc,
+                                    vs.extraFontFlag == SC_EFF_QUALITY_LCD_OPTIMIZED);
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
+    if (CGContextSetAllowsFontSubpixelPositioning != NULL)
+      CGContextSetAllowsFontSubpixelPositioning((CGContextRef)gc,
+						vs.extraFontFlag == SC_EFF_QUALITY_DEFAULT ||
+						vs.extraFontFlag == SC_EFF_QUALITY_LCD_OPTIMIZED);
+#endif
     sw->Init(gc, wMain.GetID());
     Paint(sw, rc);
     succeeded = paintState != paintAbandoned;
@@ -1458,6 +1783,7 @@
     delete sw;
   }
   paintState = notPainting;
+<<<<<<< TREE
   return succeeded;
 }
 
@@ -1466,9 +1792,55 @@
 /**
  * Scrolls the pixels in the window some number of lines.
  * Invalidates the pixels scrolled into view.
+=======
+  if (!succeeded)
+  {
+    NSView *marginView = static_cast<NSView*>(wMargin.GetID());
+    [marginView setNeedsDisplay:YES];
+  }
+  return succeeded;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Paint the margin into the SCIMarginView space.
+ */
+void ScintillaCocoa::PaintMargin(NSRect aRect)
+{
+  CGContextRef gc = (CGContextRef) [[NSGraphicsContext currentContext] graphicsPort];
+
+  PRectangle rc = NSRectToPRectangle(aRect);
+  rcPaint = rc;
+  Surface *sw = Surface::Allocate(SC_TECHNOLOGY_DEFAULT);
+  if (sw)
+  {
+    CGContextSetAllowsAntialiasing(gc,
+                                   vs.extraFontFlag != SC_EFF_QUALITY_NON_ANTIALIASED);
+    CGContextSetAllowsFontSmoothing(gc,
+                                    vs.extraFontFlag == SC_EFF_QUALITY_LCD_OPTIMIZED);
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
+    if (CGContextSetAllowsFontSubpixelPositioning != NULL)
+      CGContextSetAllowsFontSubpixelPositioning(gc,
+						vs.extraFontFlag == SC_EFF_QUALITY_DEFAULT ||
+						vs.extraFontFlag == SC_EFF_QUALITY_LCD_OPTIMIZED);
+#endif
+    sw->Init(gc, wMargin.GetID());
+    PaintSelMargin(sw, rc);
+    sw->Release();
+    delete sw;
+  }
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * ScrollText is empty because scrolling is handled by the NSScrollView.
+>>>>>>> MERGE-SOURCE
  */
 void ScintillaCocoa::ScrollText(int linesToMove)
 {
+<<<<<<< TREE
 	// Move those pixels
 	NSView *content = ContentView();
 	if ([content layer]) {
@@ -1509,15 +1881,18 @@
 
 	// Could invalidate instead of synchronous draw but that may not be as smooth
 	//[content setNeedsDisplayInRect: redrawRectangle];
+=======
+>>>>>>> MERGE-SOURCE
 }
 
 //--------------------------------------------------------------------------------------------------
 
 /**
- * Modfies the vertical scroll position to make the current top line show up as such.
+ * Modifies the vertical scroll position to make the current top line show up as such.
  */
 void ScintillaCocoa::SetVerticalScrollPos()
 {
+<<<<<<< TREE
   ScintillaView* topContainer = TopContainer();
   
   // Convert absolute coordinate into the range [0..1]. Keep in mind that the visible area
@@ -1525,14 +1900,26 @@
   int maxScrollPos = MaxScrollPos();
   float relativePosition = (maxScrollPos > 0) ? ((float) topLine / maxScrollPos) : 0.0f;
   [topContainer setVerticalScrollPosition: relativePosition];
+=======
+  NSScrollView *scrollView = ScrollContainer();
+  if (scrollView) {
+    NSClipView *clipView = [scrollView contentView];
+    NSRect contentRect = [clipView bounds];
+    [clipView scrollToPoint: NSMakePoint(contentRect.origin.x, topLine * vs.lineHeight)];
+    [scrollView reflectScrolledClipView:clipView];
+  }
+>>>>>>> MERGE-SOURCE
 }
 
 //--------------------------------------------------------------------------------------------------
 
+/**
+ * Modifies the horizontal scroll position to match xOffset.
+ */
 void ScintillaCocoa::SetHorizontalScrollPos()
 {
-  ScintillaView* topContainer = TopContainer();
   PRectangle textRect = GetTextRectangle();
+<<<<<<< TREE
   
   // Convert absolute coordinate into the range [0..1]. Keep in mind that the visible area
   // does *not* belong to the scroll range.
@@ -1544,12 +1931,29 @@
   float relativePosition = (float) xOffset / maxXOffset;
   [topContainer setHorizontalScrollPosition: relativePosition];
   MoveFindIndicatorWithBounce(NO);
+=======
+
+  int maxXOffset = scrollWidth - textRect.Width();
+  if (maxXOffset < 0)
+    maxXOffset = 0;
+  if (xOffset > maxXOffset)
+    xOffset = maxXOffset;
+  NSScrollView *scrollView = ScrollContainer();
+  if (scrollView) {
+    NSClipView * clipView = [scrollView contentView];
+    NSRect contentRect = [clipView bounds];
+    [clipView scrollToPoint: NSMakePoint(xOffset, contentRect.origin.y)];
+    [scrollView reflectScrolledClipView:clipView];
+  }
+  MoveFindIndicatorWithBounce(NO);
+>>>>>>> MERGE-SOURCE
 }
 
 //--------------------------------------------------------------------------------------------------
 
 /**
  * Used to adjust both scrollers to reflect the current scroll range and position in the editor.
+ * Arguments no longer used as NSScrollView handles details of scroll bar sizes.
  *
  * @param nMax Number of lines in the editor.
  * @param nPage Number of lines per scroll page.
@@ -1557,12 +1961,11 @@
  */
 bool ScintillaCocoa::ModifyScrollBars(int nMax, int nPage)
 {
-#pragma unused(nPage)
-  // Input values are given in lines, not pixels, so we have to convert.
-  int lineHeight = static_cast<int>(WndProc(SCI_TEXTHEIGHT, 0, 0));
-  PRectangle bounds = GetTextRectangle();
-  ScintillaView* topContainer = TopContainer();
+#pragma unused(nMax, nPage)
+  return SetScrollingSize();
+}
 
+<<<<<<< TREE
   // Set page size to the same value as the scroll range to hide the scrollbar.
   int scrollRange = lineHeight * (nMax + 1); // +1 because the caller subtracted one.
   int pageSize;
@@ -1582,87 +1985,86 @@
   MoveFindIndicatorWithBounce(NO);	
   
   return verticalChange || horizontalChange;
+=======
+bool ScintillaCocoa::SetScrollingSize(void) {
+	bool changes = false;
+	SCIContentView *inner = ContentView();
+	if (!enteredSetScrollingSize) {
+		enteredSetScrollingSize = true;
+		NSScrollView *scrollView = ScrollContainer();
+		NSClipView *clipView = [ScrollContainer() contentView];
+		NSRect clipRect = [clipView bounds];
+		CGFloat docHeight = (cs.LinesDisplayed()+1) * vs.lineHeight;
+		if (!endAtLastLine)
+			docHeight += (int([scrollView bounds].size.height / vs.lineHeight)-3) * vs.lineHeight;
+		// Allow extra space so that last scroll position places whole line at top
+		int clipExtra = int(clipRect.size.height) % vs.lineHeight;
+		docHeight += clipExtra;
+		// Ensure all of clipRect covered by Scintilla drawing
+		if (docHeight < clipRect.size.height)
+			docHeight = clipRect.size.height;
+		CGFloat docWidth = scrollWidth;
+		bool showHorizontalScroll = horizontalScrollBarVisible &&
+			!Wrapping();
+		if (!showHorizontalScroll)
+			docWidth = clipRect.size.width;
+		NSRect contentRect = {0, 0, docWidth, docHeight};
+		NSRect contentRectNow = [inner frame];
+		changes = (contentRect.size.width != contentRectNow.size.width) ||
+			(contentRect.size.height != contentRectNow.size.height);
+		if (changes) {
+			[inner setFrame: contentRect];
+		}
+		[scrollView setHasVerticalScroller: verticalScrollBarVisible];
+		[scrollView setHasHorizontalScroller: showHorizontalScroll];
+		SetVerticalScrollPos();
+		enteredSetScrollingSize = false;
+	}
+	[inner.owner setMarginWidth: vs.fixedColumnWidth];
+	return changes;
+>>>>>>> MERGE-SOURCE
 }
 
 //--------------------------------------------------------------------------------------------------
 
 void ScintillaCocoa::Resize()
 {
+  SetScrollingSize();
   ChangeSize();
 }
 
 //--------------------------------------------------------------------------------------------------
 
 /**
- * Called by the frontend control when the user manipulates one of the scrollers.
+ * Update fields to match scroll position after receiving a notification that the user has scrolled.
+ */
+void ScintillaCocoa::UpdateForScroll() {
+  Point ptOrigin = GetVisibleOriginInMain();
+  xOffset = ptOrigin.x;
+  int newTop = Platform::Minimum(ptOrigin.y / vs.lineHeight, MaxScrollPos());
+  SetTopLine(newTop);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Register a delegate that will be called for notifications and commands.
+ * This provides similar functionality to RegisterNotifyCallback but in an
+ * Objective C way.
  *
- * @param position The relative position of the scroller in the range of [0..1].
- * @param part Specifies which part was clicked on by the user, so we can handle thumb tracking
- *             as well as page and line scrolling.
- * @param horizontal True if the horizontal scroller was hit, otherwise false.
+ * @param delegate_ A pointer to an object that implements ScintillaNotificationProtocol.
  */
-void ScintillaCocoa::DoScroll(float position, NSScrollerPart part, bool horizontal)
+
+void ScintillaCocoa::SetDelegate(id<ScintillaNotificationProtocol> delegate_)
 {
-  // If the given scroller part is not the knob (or knob slot) then the given position is not yet
-  // current and we have to update it.
-  if (horizontal)
-  {
-    // Horizontal offset is given in pixels.
-    PRectangle textRect = GetTextRectangle();
-    int offset = (int) (position * (scrollWidth - textRect.Width()));
-    int smallChange = (int) (textRect.Width() / 30);
-    if (smallChange < 5)
-      smallChange = 5;
-    switch (part)
-    {
-      case NSScrollerDecrementLine:
-        offset -= smallChange;
-        break;
-      case NSScrollerDecrementPage:
-        offset -= textRect.Width();
-        break;
-      case NSScrollerIncrementLine:
-        offset += smallChange;
-        break;
-      case NSScrollerIncrementPage:
-        offset += textRect.Width();
-        break;
-    };
-    HorizontalScrollTo(offset);
-  }
-  else
-  {
-    // VerticalScrolling is by line. If the user is scrolling using the knob we can directly
-    // set the new scroll position. Otherwise we have to compute it first.
-    if (part == NSScrollerKnob)
-      ScrollTo(position * MaxScrollPos(), false);
-    else
-    {
-    switch (part)
-    {
-      case NSScrollerDecrementLine:
-          ScrollTo(topLine - 1, true);
-        break;
-      case NSScrollerDecrementPage:
-          ScrollTo(topLine - LinesOnScreen(), true);
-        break;
-      case NSScrollerIncrementLine:
-          ScrollTo(topLine + 1, true);
-        break;
-      case NSScrollerIncrementPage:
-          ScrollTo(topLine + LinesOnScreen(), true);
-        break;
-    };
-      
-    }
-  }
+  delegate = delegate_;
 }
 
 //--------------------------------------------------------------------------------------------------
 
 /**
  * Used to register a callback function for a given window. This is used to emulate the way
- * Windows notfies other controls (mainly up in the view hierarchy) about certain events.
+ * Windows notifies other controls (mainly up in the view hierarchy) about certain events.
  *
  * @param windowid A handle to a window. That value is generic and can be anything. It is passed
  *                 through to the callback.
@@ -1691,6 +2093,8 @@
   if (notifyProc != NULL)
     notifyProc(notifyObj, WM_COMMAND, Platform::LongFromTwoShorts(GetCtrlID(), (focus ? SCEN_SETFOCUS : SCEN_KILLFOCUS)),
 	       (uintptr_t) this);
+
+  Editor::NotifyFocus(focus);
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -1702,13 +2106,13 @@
  * @param scn The notification to send.
  */
 void ScintillaCocoa::NotifyParent(SCNotification scn)
-{ 
+{
+  scn.nmhdr.hwndFrom = (void*) this;
+  scn.nmhdr.idFrom = GetCtrlID();
   if (notifyProc != NULL)
-  {
-    scn.nmhdr.hwndFrom = (void*) this;
-    scn.nmhdr.idFrom = GetCtrlID();
-    notifyProc(notifyObj, WM_NOTIFY, (uintptr_t) 0, (uintptr_t) &scn);
-  }
+    notifyProc(notifyObj, WM_NOTIFY, GetCtrlID(), (uintptr_t) &scn);
+  if (delegate)
+    [delegate notification:&scn];
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -1718,7 +2122,7 @@
   SCNotification scn;
   scn.nmhdr.code = SCN_URIDROPPED;
   scn.text = uri;
-  
+
   NotifyParent(scn);
 }
 
@@ -1775,7 +2179,7 @@
 }
 
 //--------------------------------------------------------------------------------------------------
-    
+
 /**
  * Helper function to translate OS X key codes to Scintilla key codes.
  */
@@ -1821,8 +2225,26 @@
 //--------------------------------------------------------------------------------------------------
 
 /**
+ * Translate NSEvent modifier flags into SCI_* modifier flags.
+ *
+ * @param modifiers An integer bit set of NSSEvent modifier flags.
+ * @return A set of SCI_* modifier flags.
+ */
+static int TranslateModifierFlags(NSUInteger modifiers)
+{
+  // Signal Control as SCI_META
+  return
+    (((modifiers & NSShiftKeyMask) != 0) ? SCI_SHIFT : 0) |
+    (((modifiers & NSCommandKeyMask) != 0) ? SCI_CTRL : 0) |
+    (((modifiers & NSAlternateKeyMask) != 0) ? SCI_ALT : 0) |
+    (((modifiers & NSControlKeyMask) != 0) ? SCI_META : 0);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
  * Main keyboard input handling method. It is called for any key down event, including function keys,
- * numeric keypad input and whatnot. 
+ * numeric keypad input and whatnot.
  *
  * @param event The event instance associated with the key down event.
  * @return True if the input was handled, false otherwise.
@@ -1830,37 +2252,24 @@
 bool ScintillaCocoa::KeyboardInput(NSEvent* event)
 {
   // For now filter out function keys.
-  NSUInteger modifiers = [event modifierFlags];
-  
   NSString* input = [event characters];
-  
-  bool control = (modifiers & NSControlKeyMask) != 0;
-  bool shift = (modifiers & NSShiftKeyMask) != 0;
-  bool command = (modifiers & NSCommandKeyMask) != 0;
-  bool alt = (modifiers & NSAlternateKeyMask) != 0;
-  
+
   bool handled = false;
-  
-  // Handle each entry individually. Usually we only have one entry anway.
+
+  // Handle each entry individually. Usually we only have one entry anyway.
   for (size_t i = 0; i < input.length; i++)
   {
     const UniChar originalKey = [input characterAtIndex: i];
     UniChar key = KeyTranslate(originalKey);
-    
+
     bool consumed = false; // Consumed as command?
-    
-    // Signal Control as SCMOD_META
-    int modifierKeys = 
-	  (shift ? SCI_SHIFT : 0) | 
-	  (command ? SCI_CTRL : 0) |
-	  (alt ? SCI_ALT : 0) |
-	  (control ? SCI_META : 0);
-    if (KeyDownWithModifiers(key, modifierKeys, &consumed))
+
+    if (KeyDownWithModifiers(key, TranslateModifierFlags([event modifierFlags]), &consumed))
       handled = true;
     if (consumed)
       handled = true;
   }
-  
+
   return handled;
 }
 
@@ -1873,24 +2282,53 @@
 {
   CFStringEncoding encoding = EncodingFromCharacterSet(IsUnicodeMode(),
                                                          vs.styles[STYLE_DEFAULT].characterSet);
-  CFRange rangeAll = {0, [input length]};
+  CFRange rangeAll = {0, static_cast<CFIndex>([input length])};
   CFIndex usedLen = 0;
   CFStringGetBytes((CFStringRef)input, rangeAll, encoding, '?',
                    false, NULL, 0, &usedLen);
-    
-  UInt8 *buffer = new UInt8[usedLen];
-    
+
+  std::vector<UInt8> buffer(usedLen);
+
   CFStringGetBytes((CFStringRef)input, rangeAll, encoding, '?',
-                     false, buffer,usedLen, NULL);
-    
-  AddCharUTF((char*) buffer, static_cast<unsigned int>(usedLen), false);
-  delete []buffer;
+                     false, buffer.data(),usedLen, NULL);
+
+  AddCharUTF((char*) buffer.data(), static_cast<unsigned int>(usedLen), false);
   return static_cast<int>(usedLen);
 }
 
 //--------------------------------------------------------------------------------------------------
 
 /**
+ * Used to ensure that only one selection is active for input composition as composition
+ * does not support multi-typing.
+ * Also drop virtual space as that is not supported by composition.
+ */
+void ScintillaCocoa::SelectOnlyMainSelection()
+{
+  SelectionRange mainSel = sel.RangeMain();
+  mainSel.ClearVirtualSpace();
+  sel.SetSelection(mainSel);
+  Redraw();
+}
+
+//--------------------------------------------------------------------------------------------------
+/**
+ * When switching documents discard any incomplete character composition state as otherwise tries to
+ * act on the new document.
+ */
+void ScintillaCocoa::SetDocPointer(Document *document)
+{
+  // Drop input composition.
+  NSTextInputContext *inctxt = [NSTextInputContext currentInputContext];
+  [inctxt discardMarkedText];
+  SCIContentView *inner = ContentView();
+  [inner unmarkText];
+  Editor::SetDocPointer(document);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
  * Called by the owning view when the mouse pointer enters the control.
  */
 void ScintillaCocoa::MouseEntered(NSEvent* event)
@@ -1898,7 +2336,7 @@
   if (!HaveMouseCapture())
   {
     WndProc(SCI_SETCURSOR, (long int)SC_CURSORNORMAL, 0);
-    
+
     // Mouse location is given in screen coordinates and might also be outside of our bounds.
     Point location = ConvertPoint([event locationInWindow]);
     ButtonMove(location);
@@ -1921,7 +2359,7 @@
   bool command = ([event modifierFlags] & NSCommandKeyMask) != 0;
   bool shift = ([event modifierFlags] & NSShiftKeyMask) != 0;
   bool alt = ([event modifierFlags] & NSAlternateKeyMask) != 0;
-    
+
   ButtonDown(Point(location.x, location.y), (int) (time * 1000), shift, command, alt);
 }
 
@@ -1930,8 +2368,8 @@
 void ScintillaCocoa::MouseMove(NSEvent* event)
 {
   lastMouseEvent = event;
-  
-  ButtonMove(ConvertPoint([event locationInWindow]));
+
+  ButtonMoveWithModifiers(ConvertPoint([event locationInWindow]), TranslateModifierFlags([event modifierFlags]));
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -1949,18 +2387,15 @@
 void ScintillaCocoa::MouseWheel(NSEvent* event)
 {
   bool command = ([event modifierFlags] & NSCommandKeyMask) != 0;
-  int dX = 0;
   int dY = 0;
 
-  dX = 10 * [event deltaX]; // Arbitrary scale factor.
-
-    // In order to make scrolling with larger offset smoother we scroll less lines the larger the 
+    // In order to make scrolling with larger offset smoother we scroll less lines the larger the
     // delta value is.
     if ([event deltaY] < 0)
     dY = -(int) sqrt(-10.0 * [event deltaY]);
     else
     dY = (int) sqrt(10.0 * [event deltaY]);
-  
+
   if (command)
   {
     // Zoom! We play with the font sizes in the styles.
@@ -1972,8 +2407,6 @@
   }
   else
   {
-    HorizontalScrollTo(xOffset - dX);
-    ScrollTo(topLine - dY, true);
   }
 }
 
@@ -2015,7 +2448,7 @@
 {
   // Call ScintillaBase to create the context menu.
   ContextMenu(Point(0, 0));
-  
+
   return reinterpret_cast<NSMenu*>(popup.GetID());
 }
 
@@ -2044,9 +2477,14 @@
   }
 }
 
+// If building with old SDK, need to define version number for 10.8
+#ifndef NSAppKitVersionNumber10_8
+#define NSAppKitVersionNumber10_8 1187
+#endif
 
 //--------------------------------------------------------------------------------------------------
 
+<<<<<<< TREE
 void ScintillaCocoa::ShowFindIndicatorForRange(NSRange charRange, BOOL retaining)
 {
 #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
@@ -2123,3 +2561,88 @@
 }
 
 
+=======
+void ScintillaCocoa::ShowFindIndicatorForRange(NSRange charRange, BOOL retaining)
+{
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
+  NSView *content = ContentView();
+  if (!layerFindIndicator)
+  {
+    layerFindIndicator = [[FindHighlightLayer alloc] init];
+    [content setWantsLayer: YES];
+    layerFindIndicator.geometryFlipped = content.layer.geometryFlipped;
+    if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_8)
+    {
+      // Content layer is unflipped on 10.9, but the indicator shows wrong unless flipped
+      layerFindIndicator.geometryFlipped = YES;
+    }
+    [[content layer] addSublayer:layerFindIndicator];
+  }
+  [layerFindIndicator removeAnimationForKey:@"animateFound"];
+
+  if (charRange.length)
+  {
+    CFStringEncoding encoding = EncodingFromCharacterSet(IsUnicodeMode(),
+							 vs.styles[STYLE_DEFAULT].characterSet);
+    std::vector<char> buffer(charRange.length);
+    pdoc->GetCharRange(&buffer[0], charRange.location, charRange.length);
+
+    CFStringRef cfsFind = CFStringCreateWithBytes(kCFAllocatorDefault,
+						  reinterpret_cast<const UInt8 *>(&buffer[0]),
+						  charRange.length, encoding, false);
+    layerFindIndicator.sFind = (NSString *)cfsFind;
+    if (cfsFind)
+        CFRelease(cfsFind);
+    layerFindIndicator.retaining = retaining;
+    layerFindIndicator.positionFind = charRange.location;
+    int style = WndProc(SCI_GETSTYLEAT, charRange.location, 0);
+    std::vector<char> bufferFontName(WndProc(SCI_STYLEGETFONT, style, 0) + 1);
+    WndProc(SCI_STYLEGETFONT, style, (sptr_t)&bufferFontName[0]);
+    layerFindIndicator.sFont = [NSString stringWithUTF8String: &bufferFontName[0]];
+
+    layerFindIndicator.fontSize = WndProc(SCI_STYLEGETSIZEFRACTIONAL, style, 0) /
+      (float)SC_FONT_SIZE_MULTIPLIER;
+    layerFindIndicator.widthText = WndProc(SCI_POINTXFROMPOSITION, 0, charRange.location + charRange.length) -
+      WndProc(SCI_POINTXFROMPOSITION, 0, charRange.location);
+    layerFindIndicator.heightLine = WndProc(SCI_TEXTHEIGHT, 0, 0);
+    MoveFindIndicatorWithBounce(YES);
+  }
+  else
+  {
+    [layerFindIndicator hideMatch];
+  }
+#endif
+}
+
+void ScintillaCocoa::MoveFindIndicatorWithBounce(BOOL bounce)
+{
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
+  if (layerFindIndicator)
+  {
+    CGPoint ptText = CGPointMake(
+      WndProc(SCI_POINTXFROMPOSITION, 0, layerFindIndicator.positionFind),
+      WndProc(SCI_POINTYFROMPOSITION, 0, layerFindIndicator.positionFind));
+    ptText.x = ptText.x - vs.fixedColumnWidth + xOffset;
+    ptText.y += topLine * vs.lineHeight;
+    if (!layerFindIndicator.geometryFlipped)
+    {
+      NSView *content = ContentView();
+      ptText.y = content.bounds.size.height - ptText.y;
+    }
+    [layerFindIndicator animateMatch:ptText bounce:bounce];
+  }
+#endif
+}
+
+void ScintillaCocoa::HideFindIndicator()
+{
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
+  if (layerFindIndicator)
+  {
+    [layerFindIndicator hideMatch];
+  }
+#endif
+}
+
+
+>>>>>>> MERGE-SOURCE
 
=== modified file 'cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.pbxproj'
--- cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.pbxproj	2012-10-26 08:56:06 +0000
+++ cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.pbxproj	2014-01-24 04:00:28 +0000
@@ -7,6 +7,14 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		1100F1EB178E393200105727 /* CaseConvert.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 1100F1E6178E393200105727 /* CaseConvert.cxx */; };
+		1100F1EC178E393200105727 /* CaseConvert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1100F1E7178E393200105727 /* CaseConvert.h */; };
+		1100F1ED178E393200105727 /* CaseFolder.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 1100F1E8178E393200105727 /* CaseFolder.cxx */; };
+		1100F1EE178E393200105727 /* CaseFolder.h in Headers */ = {isa = PBXBuildFile; fileRef = 1100F1E9178E393200105727 /* CaseFolder.h */; };
+		1100F1EF178E393200105727 /* UnicodeFromUTF8.h in Headers */ = {isa = PBXBuildFile; fileRef = 1100F1EA178E393200105727 /* UnicodeFromUTF8.h */; };
+		1102C31C169FB49300DC16AB /* LexLaTeX.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 1102C31B169FB49300DC16AB /* LexLaTeX.cxx */; };
+		11126B8214CD3A6200803C49 /* LexAVS.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 11126B8114CD3A6200803C49 /* LexAVS.cxx */; };
+		1114D6CB1602A951001DC345 /* LexPO.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 1114D6CA1602A951001DC345 /* LexPO.cxx */; };
 		114B6F0D11FA7526004FB6AB /* LexAbaqus.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 114B6EBE11FA7526004FB6AB /* LexAbaqus.cxx */; };
 		114B6F0E11FA7526004FB6AB /* LexAda.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 114B6EBF11FA7526004FB6AB /* LexAda.cxx */; };
 		114B6F0F11FA7526004FB6AB /* LexAPDL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 114B6EC011FA7526004FB6AB /* LexAPDL.cxx */; };
@@ -142,7 +150,6 @@
 		114B6FD111FA7623004FB6AB /* Selection.h in Headers */ = {isa = PBXBuildFile; fileRef = 114B6FB611FA7623004FB6AB /* Selection.h */; };
 		114B6FD211FA7623004FB6AB /* SplitVector.h in Headers */ = {isa = PBXBuildFile; fileRef = 114B6FB711FA7623004FB6AB /* SplitVector.h */; };
 		114B6FD311FA7623004FB6AB /* Style.h in Headers */ = {isa = PBXBuildFile; fileRef = 114B6FB811FA7623004FB6AB /* Style.h */; };
-		114B6FD411FA7623004FB6AB /* SVector.h in Headers */ = {isa = PBXBuildFile; fileRef = 114B6FB911FA7623004FB6AB /* SVector.h */; };
 		114B6FD511FA7623004FB6AB /* UniConversion.h in Headers */ = {isa = PBXBuildFile; fileRef = 114B6FBA11FA7623004FB6AB /* UniConversion.h */; };
 		114B6FD611FA7623004FB6AB /* ViewStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = 114B6FBB11FA7623004FB6AB /* ViewStyle.h */; };
 		114B6FD711FA7623004FB6AB /* XPM.h in Headers */ = {isa = PBXBuildFile; fileRef = 114B6FBC11FA7623004FB6AB /* XPM.h */; };
@@ -157,9 +164,21 @@
 		114B6FEB11FA7645004FB6AB /* PropSetSimple.h in Headers */ = {isa = PBXBuildFile; fileRef = 114B6FE011FA7645004FB6AB /* PropSetSimple.h */; };
 		114B6FEC11FA7645004FB6AB /* StyleContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 114B6FE111FA7645004FB6AB /* StyleContext.h */; };
 		114B6FED11FA7645004FB6AB /* WordList.h in Headers */ = {isa = PBXBuildFile; fileRef = 114B6FE211FA7645004FB6AB /* WordList.h */; };
+		1152A77315313E58000D4E1A /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1152A77215313E58000D4E1A /* QuartzCore.framework */; };
+		11594BE9155B91DF0099E1FA /* LexOScript.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 11594BE7155B91DF0099E1FA /* LexOScript.cxx */; };
+		11594BEA155B91DF0099E1FA /* LexVisualProlog.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 11594BE8155B91DF0099E1FA /* LexVisualProlog.cxx */; };
+		1160E0381803651C00BCEBCB /* LexRust.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 1160E0371803651C00BCEBCB /* LexRust.cxx */; };
+		117ACE9114A29A1E002876F9 /* LexTCMD.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 117ACE9014A29A1E002876F9 /* LexTCMD.cxx */; };
 		119FF1BF13C9D1820007CE42 /* QuartzTextStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = 119FF1BE13C9D1820007CE42 /* QuartzTextStyle.h */; };
+		11A0A8A1148602DF0018D143 /* LexCoffeeScript.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 11A0A8A0148602DF0018D143 /* LexCoffeeScript.cxx */; };
 		11BB124D12FF9C1300F6BCF7 /* LexModula.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 11BB124C12FF9C1300F6BCF7 /* LexModula.cxx */; };
+		11BEB6A214EF189600BDE92A /* LexECL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 11BEB6A114EF189600BDE92A /* LexECL.cxx */; };
 		11F35FDB12AEFAF100F0236D /* LexA68k.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 11F35FDA12AEFAF100F0236D /* LexA68k.cxx */; };
+		11FBA39D17817DA00048C071 /* CharacterCategory.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 11FBA39B17817DA00048C071 /* CharacterCategory.cxx */; };
+		11FBA39E17817DA00048C071 /* CharacterCategory.h in Headers */ = {isa = PBXBuildFile; fileRef = 11FBA39C17817DA00048C071 /* CharacterCategory.h */; };
+		11FDAEB7174E1A9800FA161B /* LexSTTXT.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 11FDAEB6174E1A9700FA161B /* LexSTTXT.cxx */; };
+		11FDD0E017C480D4001541B9 /* LexKVIrc.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 11FDD0DF17C480D4001541B9 /* LexKVIrc.cxx */; };
+		11FF3FE21810EB3900E13F13 /* LexDMAP.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 11FF3FE11810EB3900E13F13 /* LexDMAP.cxx */; };
 		2744E5A40FC168A100E85C33 /* InfoBar.h in Headers */ = {isa = PBXBuildFile; fileRef = 2744E59D0FC168A100E85C33 /* InfoBar.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		2744E5AA0FC168A100E85C33 /* ScintillaView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2744E5A30FC168A100E85C33 /* ScintillaView.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		2744E5AC0FC168B200E85C33 /* InfoBarCommunicator.h in Headers */ = {isa = PBXBuildFile; fileRef = 2744E5AB0FC168B200E85C33 /* InfoBarCommunicator.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -185,6 +204,12 @@
 		27FEF4540FC1B413005E115A /* info_bar_bg.png in Resources */ = {isa = PBXBuildFile; fileRef = 27FEF4510FC1B413005E115A /* info_bar_bg.png */; };
 		27FEF4550FC1B413005E115A /* mac_cursor_busy.png in Resources */ = {isa = PBXBuildFile; fileRef = 27FEF4520FC1B413005E115A /* mac_cursor_busy.png */; };
 		27FEF4560FC1B413005E115A /* mac_cursor_flipped.png in Resources */ = {isa = PBXBuildFile; fileRef = 27FEF4530FC1B413005E115A /* mac_cursor_flipped.png */; };
+		280056FB188DDD2C00F200AE /* SparseState.h in Headers */ = {isa = PBXBuildFile; fileRef = 280056F8188DDD2C00F200AE /* SparseState.h */; };
+		280056FC188DDD2C00F200AE /* StringCopy.h in Headers */ = {isa = PBXBuildFile; fileRef = 280056F9188DDD2C00F200AE /* StringCopy.h */; };
+		280056FD188DDD2C00F200AE /* SubStyles.h in Headers */ = {isa = PBXBuildFile; fileRef = 280056FA188DDD2C00F200AE /* SubStyles.h */; };
+		28D516D81830FFCA0047C93D /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 28D516D51830FFCA0047C93D /* [e-mail] */; };
+		28D516D91830FFCA0047C93D /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 28D516D61830FFCA0047C93D /* [e-mail] */; };
+		28D516DA1830FFCA0047C93D /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 28D516D71830FFCA0047C93D /* [e-mail] */; };
 		8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C1666FE841158C02AAC07 /* InfoPlist.strings */; };
 		8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */; };
 /* End PBXBuildFile section */
@@ -194,6 +219,14 @@
 		0867D6A5FE840307C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
 		089C1667FE841158C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
+		1100F1E6178E393200105727 /* CaseConvert.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CaseConvert.cxx; path = ../../src/CaseConvert.cxx; sourceTree = "<group>"; };
+		1100F1E7178E393200105727 /* CaseConvert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CaseConvert.h; path = ../../src/CaseConvert.h; sourceTree = "<group>"; };
+		1100F1E8178E393200105727 /* CaseFolder.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CaseFolder.cxx; path = ../../src/CaseFolder.cxx; sourceTree = "<group>"; };
+		1100F1E9178E393200105727 /* CaseFolder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CaseFolder.h; path = ../../src/CaseFolder.h; sourceTree = "<group>"; };
+		1100F1EA178E393200105727 /* UnicodeFromUTF8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UnicodeFromUTF8.h; path = ../../src/UnicodeFromUTF8.h; sourceTree = "<group>"; };
+		1102C31B169FB49300DC16AB /* LexLaTeX.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexLaTeX.cxx; path = ../../lexers/LexLaTeX.cxx; sourceTree = "<group>"; };
+		11126B8114CD3A6200803C49 /* LexAVS.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexAVS.cxx; path = ../../lexers/LexAVS.cxx; sourceTree = "<group>"; };
+		1114D6CA1602A951001DC345 /* LexPO.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexPO.cxx; path = ../../lexers/LexPO.cxx; sourceTree = "<group>"; };
 		114B6EBE11FA7526004FB6AB /* LexAbaqus.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexAbaqus.cxx; path = ../../lexers/LexAbaqus.cxx; sourceTree = SOURCE_ROOT; };
 		114B6EBF11FA7526004FB6AB /* LexAda.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexAda.cxx; path = ../../lexers/LexAda.cxx; sourceTree = SOURCE_ROOT; };
 		114B6EC011FA7526004FB6AB /* LexAPDL.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexAPDL.cxx; path = ../../lexers/LexAPDL.cxx; sourceTree = SOURCE_ROOT; };
@@ -329,7 +362,6 @@
 		114B6FB611FA7623004FB6AB /* Selection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Selection.h; path = ../../src/Selection.h; sourceTree = SOURCE_ROOT; };
 		114B6FB711FA7623004FB6AB /* SplitVector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SplitVector.h; path = ../../src/SplitVector.h; sourceTree = SOURCE_ROOT; };
 		114B6FB811FA7623004FB6AB /* Style.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Style.h; path = ../../src/Style.h; sourceTree = SOURCE_ROOT; };
-		114B6FB911FA7623004FB6AB /* SVector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SVector.h; path = ../../src/SVector.h; sourceTree = SOURCE_ROOT; };
 		114B6FBA11FA7623004FB6AB /* UniConversion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UniConversion.h; path = ../../src/UniConversion.h; sourceTree = SOURCE_ROOT; };
 		114B6FBB11FA7623004FB6AB /* ViewStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ViewStyle.h; path = ../../src/ViewStyle.h; sourceTree = SOURCE_ROOT; };
 		114B6FBC11FA7623004FB6AB /* XPM.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = XPM.h; path = ../../src/XPM.h; sourceTree = SOURCE_ROOT; };
@@ -344,9 +376,21 @@
 		114B6FE011FA7645004FB6AB /* PropSetSimple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PropSetSimple.h; path = ../../lexlib/PropSetSimple.h; sourceTree = SOURCE_ROOT; };
 		114B6FE111FA7645004FB6AB /* StyleContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StyleContext.h; path = ../../lexlib/StyleContext.h; sourceTree = SOURCE_ROOT; };
 		114B6FE211FA7645004FB6AB /* WordList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WordList.h; path = ../../lexlib/WordList.h; sourceTree = SOURCE_ROOT; };
+		1152A77215313E58000D4E1A /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = ../../../../../../../../System/Library/Frameworks/QuartzCore.framework; sourceTree = "<group>"; };
+		11594BE7155B91DF0099E1FA /* LexOScript.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexOScript.cxx; path = ../../lexers/LexOScript.cxx; sourceTree = "<group>"; };
+		11594BE8155B91DF0099E1FA /* LexVisualProlog.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexVisualProlog.cxx; path = ../../lexers/LexVisualProlog.cxx; sourceTree = "<group>"; };
+		1160E0371803651C00BCEBCB /* LexRust.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexRust.cxx; path = ../../lexers/LexRust.cxx; sourceTree = "<group>"; };
+		117ACE9014A29A1E002876F9 /* LexTCMD.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexTCMD.cxx; path = ../../lexers/LexTCMD.cxx; sourceTree = "<group>"; };
 		119FF1BE13C9D1820007CE42 /* QuartzTextStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QuartzTextStyle.h; path = ../QuartzTextStyle.h; sourceTree = "<group>"; };
+		11A0A8A0148602DF0018D143 /* LexCoffeeScript.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexCoffeeScript.cxx; path = ../../lexers/LexCoffeeScript.cxx; sourceTree = "<group>"; };
 		11BB124C12FF9C1300F6BCF7 /* LexModula.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexModula.cxx; path = ../../lexers/LexModula.cxx; sourceTree = SOURCE_ROOT; };
+		11BEB6A114EF189600BDE92A /* LexECL.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexECL.cxx; path = ../../lexers/LexECL.cxx; sourceTree = "<group>"; };
 		11F35FDA12AEFAF100F0236D /* LexA68k.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexA68k.cxx; path = ../../lexers/LexA68k.cxx; sourceTree = SOURCE_ROOT; };
+		11FBA39B17817DA00048C071 /* CharacterCategory.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CharacterCategory.cxx; path = ../../lexlib/CharacterCategory.cxx; sourceTree = "<group>"; };
+		11FBA39C17817DA00048C071 /* CharacterCategory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CharacterCategory.h; path = ../../lexlib/CharacterCategory.h; sourceTree = "<group>"; };
+		11FDAEB6174E1A9700FA161B /* LexSTTXT.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexSTTXT.cxx; path = ../../lexers/LexSTTXT.cxx; sourceTree = "<group>"; };
+		11FDD0DF17C480D4001541B9 /* LexKVIrc.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexKVIrc.cxx; path = ../../lexers/LexKVIrc.cxx; sourceTree = "<group>"; };
+		11FF3FE11810EB3900E13F13 /* LexDMAP.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexDMAP.cxx; path = ../../lexers/LexDMAP.cxx; sourceTree = "<group>"; };
 		2744E4850FC1678600E85C33 /* Platform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Platform.h; path = ../../include/Platform.h; sourceTree = SOURCE_ROOT; };
 		2744E4870FC1678600E85C33 /* SciLexer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SciLexer.h; path = ../../include/SciLexer.h; sourceTree = SOURCE_ROOT; };
 		2744E4880FC1678600E85C33 /* Scintilla.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Scintilla.h; path = ../../include/Scintilla.h; sourceTree = SOURCE_ROOT; };
@@ -372,6 +416,12 @@
 		27FEF4510FC1B413005E115A /* info_bar_bg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = info_bar_bg.png; sourceTree = "<group>"; };
 		27FEF4520FC1B413005E115A /* mac_cursor_busy.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = mac_cursor_busy.png; sourceTree = "<group>"; };
 		27FEF4530FC1B413005E115A /* mac_cursor_flipped.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = mac_cursor_flipped.png; sourceTree = "<group>"; };
+		280056F8188DDD2C00F200AE /* SparseState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SparseState.h; path = ../../lexlib/SparseState.h; sourceTree = "<group>"; };
+		280056F9188DDD2C00F200AE /* StringCopy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StringCopy.h; path = ../../lexlib/StringCopy.h; sourceTree = "<group>"; };
+		280056FA188DDD2C00F200AE /* SubStyles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SubStyles.h; path = ../../lexlib/SubStyles.h; sourceTree = "<group>"; };
+		28D516D51830FFCA0047C93D /* [e-mail] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[e-mail]"; sourceTree = "<group>"; };
+		28D516D61830FFCA0047C93D /* [e-mail] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[e-mail]"; sourceTree = "<group>"; };
+		28D516D71830FFCA0047C93D /* [e-mail] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[e-mail]"; sourceTree = "<group>"; };
 		32DBCF5E0370ADEE00C91783 /* Scintilla_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Scintilla_Prefix.pch; sourceTree = "<group>"; };
 		8DC2EF5A0486A6940098B216 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		8DC2EF5B0486A6940098B216 /* Scintilla.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Scintilla.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -385,6 +435,7 @@
 			files = (
 				27CEACF816358CC400DEDFD9 /* QuartzCore.framework in Frameworks */,
 				8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */,
+				1152A77315313E58000D4E1A /* QuartzCore.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -453,6 +504,7 @@
 		1058C7B2FEA5585E11CA2CBB /* Other Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				1152A77215313E58000D4E1A /* QuartzCore.framework */,
 				0867D6A5FE840307C02AAC07 /* AppKit.framework */,
 				D2F7E79907B2D74100F64583 /* CoreData.framework */,
 				0867D69BFE84028FC02AAC07 /* Foundation.framework */,
@@ -472,6 +524,7 @@
 		2744E47D0FC1674E00E85C33 /* Lexers */ = {
 			isa = PBXGroup;
 			children = (
+<<<<<<< TREE
 				27CEACFA16358CFD00DEDFD9 /* LexAVS.cxx */,
 				27CEACFB16358CFD00DEDFD9 /* LexCoffeeScript.cxx */,
 				27CEACFC16358CFD00DEDFD9 /* LexECL.cxx */,
@@ -480,6 +533,9 @@
 				27CEACFF16358CFD00DEDFD9 /* LexTCMD.cxx */,
 				27CEAD0016358CFD00DEDFD9 /* LexVisualProlog.cxx */,
 				11BB124C12FF9C1300F6BCF7 /* LexModula.cxx */,
+=======
+				11126B8114CD3A6200803C49 /* LexAVS.cxx */,
+>>>>>>> MERGE-SOURCE
 				11F35FDA12AEFAF100F0236D /* LexA68k.cxx */,
 				114B6EBE11FA7526004FB6AB /* LexAbaqus.cxx */,
 				114B6EBF11FA7526004FB6AB /* LexAda.cxx */,
@@ -497,12 +553,15 @@
 				114B6ECB11FA7526004FB6AB /* LexCLW.cxx */,
 				114B6ECC11FA7526004FB6AB /* LexCmake.cxx */,
 				114B6ECD11FA7526004FB6AB /* LexCOBOL.cxx */,
+				11A0A8A0148602DF0018D143 /* LexCoffeeScript.cxx */,
 				114B6ECE11FA7526004FB6AB /* LexConf.cxx */,
 				114B6ECF11FA7526004FB6AB /* LexCPP.cxx */,
 				114B6ED011FA7526004FB6AB /* LexCrontab.cxx */,
 				114B6ED111FA7526004FB6AB /* LexCsound.cxx */,
 				114B6ED211FA7526004FB6AB /* LexCSS.cxx */,
 				114B6ED311FA7526004FB6AB /* LexD.cxx */,
+				11FF3FE11810EB3900E13F13 /* LexDMAP.cxx */,
+				11BEB6A114EF189600BDE92A /* LexECL.cxx */,
 				114B6ED411FA7526004FB6AB /* LexEiffel.cxx */,
 				114B6ED511FA7526004FB6AB /* LexErlang.cxx */,
 				114B6ED611FA7526004FB6AB /* LexEScript.cxx */,
@@ -515,6 +574,8 @@
 				114B6EDD11FA7526004FB6AB /* LexHTML.cxx */,
 				114B6EDE11FA7526004FB6AB /* LexInno.cxx */,
 				114B6EDF11FA7526004FB6AB /* LexKix.cxx */,
+				11FDD0DF17C480D4001541B9 /* LexKVIrc.cxx */,
+				1102C31B169FB49300DC16AB /* LexLaTeX.cxx */,
 				114B6EE011FA7526004FB6AB /* LexLisp.cxx */,
 				114B6EE111FA7526004FB6AB /* LexLout.cxx */,
 				114B6EE211FA7526004FB6AB /* LexLua.cxx */,
@@ -523,17 +584,20 @@
 				114B6EE511FA7526004FB6AB /* LexMatlab.cxx */,
 				114B6EE611FA7526004FB6AB /* LexMetapost.cxx */,
 				114B6EE711FA7526004FB6AB /* LexMMIXAL.cxx */,
+				11BB124C12FF9C1300F6BCF7 /* LexModula.cxx */,
 				114B6EE811FA7526004FB6AB /* LexMPT.cxx */,
 				114B6EE911FA7526004FB6AB /* LexMSSQL.cxx */,
 				114B6EEA11FA7526004FB6AB /* LexMySQL.cxx */,
 				114B6EEB11FA7526004FB6AB /* LexNimrod.cxx */,
 				114B6EEC11FA7526004FB6AB /* LexNsis.cxx */,
 				114B6EED11FA7526004FB6AB /* LexOpal.cxx */,
+				11594BE7155B91DF0099E1FA /* LexOScript.cxx */,
 				114B6EEE11FA7526004FB6AB /* LexOthers.cxx */,
 				114B6EEF11FA7526004FB6AB /* LexPascal.cxx */,
 				114B6EF011FA7526004FB6AB /* LexPB.cxx */,
 				114B6EF111FA7526004FB6AB /* LexPerl.cxx */,
 				114B6EF211FA7526004FB6AB /* LexPLM.cxx */,
+				1114D6CA1602A951001DC345 /* LexPO.cxx */,
 				114B6EF311FA7526004FB6AB /* LexPOV.cxx */,
 				114B6EF411FA7526004FB6AB /* LexPowerPro.cxx */,
 				114B6EF511FA7526004FB6AB /* LexPowerShell.cxx */,
@@ -543,6 +607,7 @@
 				114B6EF911FA7526004FB6AB /* LexR.cxx */,
 				114B6EFA11FA7526004FB6AB /* LexRebol.cxx */,
 				114B6EFB11FA7526004FB6AB /* LexRuby.cxx */,
+				1160E0371803651C00BCEBCB /* LexRust.cxx */,
 				114B6EFC11FA7526004FB6AB /* LexScriptol.cxx */,
 				114B6EFD11FA7526004FB6AB /* LexSmalltalk.cxx */,
 				114B6EFE11FA7526004FB6AB /* LexSML.cxx */,
@@ -550,15 +615,18 @@
 				114B6F0011FA7526004FB6AB /* LexSpecman.cxx */,
 				114B6F0111FA7526004FB6AB /* LexSpice.cxx */,
 				114B6F0211FA7526004FB6AB /* LexSQL.cxx */,
+				11FDAEB6174E1A9700FA161B /* LexSTTXT.cxx */,
 				114B6F0311FA7526004FB6AB /* LexTACL.cxx */,
 				114B6F0411FA7526004FB6AB /* LexTADS3.cxx */,
 				114B6F0511FA7526004FB6AB /* LexTAL.cxx */,
 				114B6F0611FA7526004FB6AB /* LexTCL.cxx */,
+				117ACE9014A29A1E002876F9 /* LexTCMD.cxx */,
 				114B6F0711FA7526004FB6AB /* LexTeX.cxx */,
 				114B6F0811FA7526004FB6AB /* LexTxt2tags.cxx */,
 				114B6F0911FA7526004FB6AB /* LexVB.cxx */,
 				114B6F0A11FA7526004FB6AB /* LexVerilog.cxx */,
 				114B6F0B11FA7526004FB6AB /* LexVHDL.cxx */,
+				11594BE8155B91DF0099E1FA /* LexVisualProlog.cxx */,
 				114B6F0C11FA7526004FB6AB /* LexYAML.cxx */,
 			);
 			name = Lexers;
@@ -568,20 +636,14 @@
 			isa = PBXGroup;
 			children = (
 				114B6FD811FA7645004FB6AB /* Accessor.h */,
-				114B6FD911FA7645004FB6AB /* CharacterSet.h */,
-				114B6FDA11FA7645004FB6AB /* LexAccessor.h */,
-				114B6FDB11FA7645004FB6AB /* LexerBase.h */,
-				114B6FDC11FA7645004FB6AB /* LexerModule.h */,
-				114B6FDD11FA7645004FB6AB /* LexerNoExceptions.h */,
-				114B6FDE11FA7645004FB6AB /* LexerSimple.h */,
-				114B6FDF11FA7645004FB6AB /* OptionSet.h */,
-				114B6FE011FA7645004FB6AB /* PropSetSimple.h */,
-				114B6FE111FA7645004FB6AB /* StyleContext.h */,
-				114B6FE211FA7645004FB6AB /* WordList.h */,
 				114B6FA211FA7623004FB6AB /* AutoComplete.h */,
 				114B6FA311FA7623004FB6AB /* CallTip.h */,
+				1100F1E7178E393200105727 /* CaseConvert.h */,
+				1100F1E9178E393200105727 /* CaseFolder.h */,
 				114B6FA411FA7623004FB6AB /* Catalogue.h */,
 				114B6FA511FA7623004FB6AB /* CellBuffer.h */,
+				11FBA39C17817DA00048C071 /* CharacterCategory.h */,
+				114B6FD911FA7645004FB6AB /* CharacterSet.h */,
 				114B6FA611FA7623004FB6AB /* CharClassify.h */,
 				114B6FA711FA7623004FB6AB /* ContractionState.h */,
 				114B6FA811FA7623004FB6AB /* Decoration.h */,
@@ -589,23 +651,35 @@
 				114B6FAA11FA7623004FB6AB /* Editor.h */,
 				114B6FAB11FA7623004FB6AB /* ExternalLexer.h */,
 				114B6FAC11FA7623004FB6AB /* FontQuality.h */,
+				114B6FA011FA75DB004FB6AB /* ILexer.h */,
 				114B6FAD11FA7623004FB6AB /* Indicator.h */,
 				114B6FAE11FA7623004FB6AB /* KeyMap.h */,
+				114B6FDA11FA7645004FB6AB /* LexAccessor.h */,
+				114B6FDB11FA7645004FB6AB /* LexerBase.h */,
+				114B6FDC11FA7645004FB6AB /* LexerModule.h */,
+				114B6FDD11FA7645004FB6AB /* LexerNoExceptions.h */,
+				114B6FDE11FA7645004FB6AB /* LexerSimple.h */,
 				114B6FAF11FA7623004FB6AB /* LineMarker.h */,
+				114B6FDF11FA7645004FB6AB /* OptionSet.h */,
 				114B6FB011FA7623004FB6AB /* Partitioning.h */,
 				114B6FB111FA7623004FB6AB /* PerLine.h */,
 				114B6FB211FA7623004FB6AB /* PositionCache.h */,
+				114B6FE011FA7645004FB6AB /* PropSetSimple.h */,
 				114B6FB311FA7623004FB6AB /* RESearch.h */,
 				114B6FB411FA7623004FB6AB /* RunStyles.h */,
 				114B6FB511FA7623004FB6AB /* ScintillaBase.h */,
 				114B6FB611FA7623004FB6AB /* Selection.h */,
+				280056F8188DDD2C00F200AE /* SparseState.h */,
 				114B6FB711FA7623004FB6AB /* SplitVector.h */,
+				280056F9188DDD2C00F200AE /* StringCopy.h */,
 				114B6FB811FA7623004FB6AB /* Style.h */,
-				114B6FB911FA7623004FB6AB /* SVector.h */,
+				114B6FE111FA7645004FB6AB /* StyleContext.h */,
+				280056FA188DDD2C00F200AE /* SubStyles.h */,
+				1100F1EA178E393200105727 /* UnicodeFromUTF8.h */,
 				114B6FBA11FA7623004FB6AB /* UniConversion.h */,
 				114B6FBB11FA7623004FB6AB /* ViewStyle.h */,
+				114B6FE211FA7645004FB6AB /* WordList.h */,
 				114B6FBC11FA7623004FB6AB /* XPM.h */,
-				114B6FA011FA75DB004FB6AB /* ILexer.h */,
 			);
 			name = "Header Files";
 			sourceTree = "<group>";
@@ -614,18 +688,14 @@
 			isa = PBXGroup;
 			children = (
 				114B6F8E11FA75BE004FB6AB /* Accessor.cxx */,
-				114B6F8F11FA75BE004FB6AB /* CharacterSet.cxx */,
-				114B6F9011FA75BE004FB6AB /* LexerBase.cxx */,
-				114B6F9111FA75BE004FB6AB /* LexerModule.cxx */,
-				114B6F9211FA75BE004FB6AB /* LexerNoExceptions.cxx */,
-				114B6F9311FA75BE004FB6AB /* LexerSimple.cxx */,
-				114B6F9411FA75BE004FB6AB /* PropSetSimple.cxx */,
-				114B6F9511FA75BE004FB6AB /* StyleContext.cxx */,
-				114B6F9611FA75BE004FB6AB /* WordList.cxx */,
 				114B6F6011FA7597004FB6AB /* AutoComplete.cxx */,
 				114B6F6111FA7597004FB6AB /* CallTip.cxx */,
+				1100F1E6178E393200105727 /* CaseConvert.cxx */,
+				1100F1E8178E393200105727 /* CaseFolder.cxx */,
 				114B6F6211FA7597004FB6AB /* Catalogue.cxx */,
 				114B6F6311FA7597004FB6AB /* CellBuffer.cxx */,
+				11FBA39B17817DA00048C071 /* CharacterCategory.cxx */,
+				114B6F8F11FA75BE004FB6AB /* CharacterSet.cxx */,
 				114B6F6411FA7597004FB6AB /* CharClassify.cxx */,
 				114B6F6511FA7597004FB6AB /* ContractionState.cxx */,
 				114B6F6611FA7597004FB6AB /* Decoration.cxx */,
@@ -634,16 +704,23 @@
 				114B6F6911FA7598004FB6AB /* ExternalLexer.cxx */,
 				114B6F6A11FA7598004FB6AB /* Indicator.cxx */,
 				114B6F6B11FA7598004FB6AB /* KeyMap.cxx */,
+				114B6F9011FA75BE004FB6AB /* LexerBase.cxx */,
+				114B6F9111FA75BE004FB6AB /* LexerModule.cxx */,
+				114B6F9211FA75BE004FB6AB /* LexerNoExceptions.cxx */,
+				114B6F9311FA75BE004FB6AB /* LexerSimple.cxx */,
 				114B6F6C11FA7598004FB6AB /* LineMarker.cxx */,
 				114B6F6D11FA7598004FB6AB /* PerLine.cxx */,
 				114B6F6E11FA7598004FB6AB /* PositionCache.cxx */,
+				114B6F9411FA75BE004FB6AB /* PropSetSimple.cxx */,
 				114B6F6F11FA7598004FB6AB /* RESearch.cxx */,
 				114B6F7011FA7598004FB6AB /* RunStyles.cxx */,
 				114B6F7111FA7598004FB6AB /* ScintillaBase.cxx */,
 				114B6F7211FA7598004FB6AB /* Selection.cxx */,
 				114B6F7311FA7598004FB6AB /* Style.cxx */,
+				114B6F9511FA75BE004FB6AB /* StyleContext.cxx */,
 				114B6F7411FA7598004FB6AB /* UniConversion.cxx */,
 				114B6F7511FA7598004FB6AB /* ViewStyle.cxx */,
+				114B6F9611FA75BE004FB6AB /* WordList.cxx */,
 				114B6F7611FA7598004FB6AB /* XPM.cxx */,
 			);
 			name = "Source Files";
@@ -681,6 +758,9 @@
 		27FEF4500FC1B413005E115A /* res */ = {
 			isa = PBXGroup;
 			children = (
+				28D516D51830FFCA0047C93D /* [e-mail] */,
+				28D516D61830FFCA0047C93D /* [e-mail] */,
+				28D516D71830FFCA0047C93D /* [e-mail] */,
 				27FEF4510FC1B413005E115A /* info_bar_bg.png */,
 				27FEF4520FC1B413005E115A /* mac_cursor_busy.png */,
 				27FEF4530FC1B413005E115A /* mac_cursor_flipped.png */,
@@ -712,6 +792,7 @@
 				2791F3E00FC1A390009DBCF9 /* ScintillaCocoa.h in Headers */,
 				2744E5AA0FC168A100E85C33 /* ScintillaView.h in Headers */,
 				2791F3C70FC19F71009DBCF9 /* Platform.h in Headers */,
+				280056FB188DDD2C00F200AE /* SparseState.h in Headers */,
 				2791F3C80FC19F71009DBCF9 /* SciLexer.h in Headers */,
 				2791F3C90FC19F71009DBCF9 /* Scintilla.h in Headers */,
 				114B6FA111FA75DB004FB6AB /* ILexer.h in Headers */,
@@ -734,11 +815,12 @@
 				114B6FCD11FA7623004FB6AB /* PositionCache.h in Headers */,
 				114B6FCE11FA7623004FB6AB /* RESearch.h in Headers */,
 				114B6FCF11FA7623004FB6AB /* RunStyles.h in Headers */,
+				280056FD188DDD2C00F200AE /* SubStyles.h in Headers */,
 				114B6FD011FA7623004FB6AB /* ScintillaBase.h in Headers */,
 				114B6FD111FA7623004FB6AB /* Selection.h in Headers */,
 				114B6FD211FA7623004FB6AB /* SplitVector.h in Headers */,
 				114B6FD311FA7623004FB6AB /* Style.h in Headers */,
-				114B6FD411FA7623004FB6AB /* SVector.h in Headers */,
+				280056FC188DDD2C00F200AE /* StringCopy.h in Headers */,
 				114B6FD511FA7623004FB6AB /* UniConversion.h in Headers */,
 				114B6FD611FA7623004FB6AB /* ViewStyle.h in Headers */,
 				114B6FD711FA7623004FB6AB /* XPM.h in Headers */,
@@ -754,6 +836,10 @@
 				114B6FEC11FA7645004FB6AB /* StyleContext.h in Headers */,
 				114B6FED11FA7645004FB6AB /* WordList.h in Headers */,
 				119FF1BF13C9D1820007CE42 /* QuartzTextStyle.h in Headers */,
+				11FBA39E17817DA00048C071 /* CharacterCategory.h in Headers */,
+				1100F1EC178E393200105727 /* CaseConvert.h in Headers */,
+				1100F1EE178E393200105727 /* CaseFolder.h in Headers */,
+				1100F1EF178E393200105727 /* UnicodeFromUTF8.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -785,7 +871,11 @@
 		0867D690FE84028FC02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+<<<<<<< TREE
 				LastUpgradeCheck = 0440;
+=======
+				LastUpgradeCheck = 0500;
+>>>>>>> MERGE-SOURCE
 			};
 			buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "ScintillaFramework" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -814,8 +904,11 @@
 			files = (
 				8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */,
 				27FEF4540FC1B413005E115A /* info_bar_bg.png in Resources */,
+				28D516D81830FFCA0047C93D /* [e-mail] in Resources */,
+				28D516D91830FFCA0047C93D /* [e-mail] in Resources */,
 				27FEF4550FC1B413005E115A /* mac_cursor_busy.png in Resources */,
 				27FEF4560FC1B413005E115A /* mac_cursor_flipped.png in Resources */,
+				28D516DA1830FFCA0047C93D /* [e-mail] in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -943,6 +1036,7 @@
 				114B6F9F11FA75BE004FB6AB /* WordList.cxx in Sources */,
 				11F35FDB12AEFAF100F0236D /* LexA68k.cxx in Sources */,
 				11BB124D12FF9C1300F6BCF7 /* LexModula.cxx in Sources */,
+<<<<<<< TREE
 				27CEAD0116358CFD00DEDFD9 /* LexAVS.cxx in Sources */,
 				27CEAD0216358CFD00DEDFD9 /* LexCoffeeScript.cxx in Sources */,
 				27CEAD0316358CFD00DEDFD9 /* LexECL.cxx in Sources */,
@@ -950,6 +1044,23 @@
 				27CEAD0516358CFD00DEDFD9 /* LexPO.cxx in Sources */,
 				27CEAD0616358CFD00DEDFD9 /* LexTCMD.cxx in Sources */,
 				27CEAD0716358CFD00DEDFD9 /* LexVisualProlog.cxx in Sources */,
+=======
+				11A0A8A1148602DF0018D143 /* LexCoffeeScript.cxx in Sources */,
+				117ACE9114A29A1E002876F9 /* LexTCMD.cxx in Sources */,
+				11126B8214CD3A6200803C49 /* LexAVS.cxx in Sources */,
+				11BEB6A214EF189600BDE92A /* LexECL.cxx in Sources */,
+				11594BE9155B91DF0099E1FA /* LexOScript.cxx in Sources */,
+				11594BEA155B91DF0099E1FA /* LexVisualProlog.cxx in Sources */,
+				1114D6CB1602A951001DC345 /* LexPO.cxx in Sources */,
+				1102C31C169FB49300DC16AB /* LexLaTeX.cxx in Sources */,
+				11FDAEB7174E1A9800FA161B /* LexSTTXT.cxx in Sources */,
+				11FBA39D17817DA00048C071 /* CharacterCategory.cxx in Sources */,
+				1100F1EB178E393200105727 /* CaseConvert.cxx in Sources */,
+				1100F1ED178E393200105727 /* CaseFolder.cxx in Sources */,
+				11FDD0E017C480D4001541B9 /* LexKVIrc.cxx in Sources */,
+				1160E0381803651C00BCEBCB /* LexRust.cxx in Sources */,
+				11FF3FE21810EB3900E13F13 /* LexDMAP.cxx in Sources */,
+>>>>>>> MERGE-SOURCE
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -971,8 +1082,12 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+<<<<<<< TREE
 				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				COMBINE_HIDPI_IMAGES = YES;
+=======
+				COMBINE_HIDPI_IMAGES = YES;
+>>>>>>> MERGE-SOURCE
 				COPY_PHASE_STRIP = NO;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -987,7 +1102,10 @@
 					SCI_NAMESPACE,
 					SCI_LEXER,
 				);
+<<<<<<< TREE
 				GCC_VERSION = "";
+=======
+>>>>>>> MERGE-SOURCE
 				GCC_WARN_UNINITIALIZED_AUTOS = NO;
 				GCC_WARN_UNKNOWN_PRAGMAS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
@@ -996,7 +1114,11 @@
 				INSTALL_PATH = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				PRODUCT_NAME = Scintilla;
+<<<<<<< TREE
 				SDKROOT = "";
+=======
+				SKIP_INSTALL = YES;
+>>>>>>> MERGE-SOURCE
 				WRAPPER_EXTENSION = framework;
 			};
 			name = Debug;
@@ -1005,8 +1127,12 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+<<<<<<< TREE
 				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				COMBINE_HIDPI_IMAGES = YES;
+=======
+				COMBINE_HIDPI_IMAGES = YES;
+>>>>>>> MERGE-SOURCE
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -1018,8 +1144,12 @@
 					SCI_NAMESPACE,
 					SCI_LEXER,
 				);
+<<<<<<< TREE
 				GCC_VERSION = "";
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+=======
+				GCC_WARN_UNINITIALIZED_AUTOS = NO;
+>>>>>>> MERGE-SOURCE
 				GCC_WARN_UNKNOWN_PRAGMAS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_LABEL = YES;
@@ -1027,7 +1157,11 @@
 				INSTALL_PATH = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				PRODUCT_NAME = Scintilla;
+<<<<<<< TREE
 				SDKROOT = "";
+=======
+				SKIP_INSTALL = YES;
+>>>>>>> MERGE-SOURCE
 				WRAPPER_EXTENSION = framework;
 			};
 			name = Release;
@@ -1035,7 +1169,8 @@
 		1DEB91B208733DA50010E9CD /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -1045,15 +1180,22 @@
 					../../src,
 					../../lexlib,
 				);
+<<<<<<< TREE
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				SKIP_INSTALL = YES;
+=======
+				MACOSX_DEPLOYMENT_TARGET = 10.5;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = macosx;
+>>>>>>> MERGE-SOURCE
 			};
 			name = Debug;
 		};
 		1DEB91B308733DA50010E9CD /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
@@ -1062,8 +1204,13 @@
 					../../src,
 					../../lexlib,
 				);
+<<<<<<< TREE
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				SKIP_INSTALL = YES;
+=======
+				MACOSX_DEPLOYMENT_TARGET = 10.5;
+				SDKROOT = macosx;
+>>>>>>> MERGE-SOURCE
 			};
 			name = Release;
 		};
 
=== modified file 'cocoa/ScintillaTest/AppController.mm'
--- cocoa/ScintillaTest/AppController.mm	2012-10-26 08:56:06 +0000
+++ cocoa/ScintillaTest/AppController.mm	2014-01-24 04:00:28 +0000
@@ -261,6 +261,7 @@
                       matchCase: NO
                       wholeWord: NO
                        scrollTo: YES
+<<<<<<< TREE
                            wrap: YES
                       backwards: NO];
 
@@ -268,10 +269,23 @@
   long matchEnd = [mEditor getGeneralProperty: SCI_GETSELECTIONEND parameter: 0];
   [mEditor setGeneralProperty: SCI_FINDINDICATORFLASH parameter: matchStart value:matchEnd];
 
+=======
+                           wrap: YES];
+
+  long matchStart = [mEditor getGeneralProperty: SCI_GETSELECTIONSTART parameter: 0];
+  long matchEnd = [mEditor getGeneralProperty: SCI_GETSELECTIONEND parameter: 0];
+  [mEditor setGeneralProperty: SCI_FINDINDICATORFLASH parameter: matchStart value:matchEnd];
+
+>>>>>>> MERGE-SOURCE
   if ([[searchField stringValue] isEqualToString: @"XX"])
     [self showAutocompletion];
 }
 
+-(IBAction) setFontQuality: (id) sender
+{
+    [ScintillaView directCall:mEditor message:SCI_SETFONTQUALITY wParam:[sender tag] lParam:0];
+}
+
 @end
 
 //--------------------------------------------------------------------------------------------------
 
=== modified file 'cocoa/ScintillaTest/English.lproj/MainMenu.xib'
--- cocoa/ScintillaTest/English.lproj/MainMenu.xib	2010-05-09 16:49:06 +0000
+++ cocoa/ScintillaTest/English.lproj/MainMenu.xib	2014-01-24 04:00:28 +0000
@@ -856,6 +856,56 @@
 													</object>
 												</object>
 											</object>
+											<object class="NSMenuItem" id="693549040">
+												<reference key="NSMenu" ref="786677654"/>
+												<string key="NSTitle">Font Quality</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+												<string key="NSAction">submenuAction:</string>
+												<object class="NSMenu" key="NSSubmenu" id="129955363">
+													<string key="NSTitle">Font Quality</string>
+													<object class="NSMutableArray" key="NSMenuItems">
+														<bool key="EncodedWithXMLCoder">YES</bool>
+														<object class="NSMenuItem" id="746486634">
+															<reference key="NSMenu" ref="129955363"/>
+															<string key="NSTitle">Default</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="35465992"/>
+															<reference key="NSMixedImage" ref="502551668"/>
+														</object>
+														<object class="NSMenuItem" id="693037100">
+															<reference key="NSMenu" ref="129955363"/>
+															<string key="NSTitle">Non-antialiased</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="35465992"/>
+															<reference key="NSMixedImage" ref="502551668"/>
+															<int key="NSTag">1</int>
+														</object>
+														<object class="NSMenuItem" id="863119271">
+															<reference key="NSMenu" ref="129955363"/>
+															<string key="NSTitle">Antialiased</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="35465992"/>
+															<reference key="NSMixedImage" ref="502551668"/>
+															<int key="NSTag">2</int>
+														</object>
+														<object class="NSMenuItem" id="1060624593">
+															<reference key="NSMenu" ref="129955363"/>
+															<string key="NSTitle">LCD Optimized</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="35465992"/>
+															<reference key="NSMixedImage" ref="502551668"/>
+															<int key="NSTag">3</int>
+														</object>
+													</object>
+												</object>
+											</object>
 											<object class="NSMenuItem" id="739652853">
 												<reference key="NSMenu" ref="786677654"/>
 												<bool key="NSIsDisabled">YES</bool>
@@ -1833,6 +1883,38 @@
 					</object>
 					<int key="connectionID">468</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">setFontQuality:</string>
+						<reference key="source" ref="229445039"/>
+						<reference key="destination" ref="746486634"/>
+					</object>
+					<int key="connectionID">475</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">setFontQuality:</string>
+						<reference key="source" ref="229445039"/>
+						<reference key="destination" ref="693037100"/>
+					</object>
+					<int key="connectionID">476</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">setFontQuality:</string>
+						<reference key="source" ref="229445039"/>
+						<reference key="destination" ref="863119271"/>
+					</object>
+					<int key="connectionID">477</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">setFontQuality:</string>
+						<reference key="source" ref="229445039"/>
+						<reference key="destination" ref="1060624593"/>
+					</object>
+					<int key="connectionID">478</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -2537,6 +2619,7 @@
 							<reference ref="214559597"/>
 							<reference ref="596732606"/>
 							<reference ref="393423671"/>
+							<reference ref="693549040"/>
 						</object>
 						<reference key="parent" ref="792887677"/>
 					</object>
@@ -2771,6 +2854,47 @@
 						<reference key="object" ref="515024530"/>
 						<reference key="parent" ref="552917647"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">469</int>
+						<reference key="object" ref="693549040"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="129955363"/>
+						</object>
+						<reference key="parent" ref="786677654"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">470</int>
+						<reference key="object" ref="129955363"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="746486634"/>
+							<reference ref="693037100"/>
+							<reference ref="863119271"/>
+							<reference ref="1060624593"/>
+						</object>
+						<reference key="parent" ref="693549040"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">471</int>
+						<reference key="object" ref="746486634"/>
+						<reference key="parent" ref="129955363"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">472</int>
+						<reference key="object" ref="693037100"/>
+						<reference key="parent" ref="129955363"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">473</int>
+						<reference key="object" ref="863119271"/>
+						<reference key="parent" ref="129955363"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">474</int>
+						<reference key="object" ref="1060624593"/>
+						<reference key="parent" ref="129955363"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
 
=== modified file 'cocoa/ScintillaTest/ScintillaTest.xcodeproj/project.pbxproj'
--- cocoa/ScintillaTest/ScintillaTest.xcodeproj/project.pbxproj	2012-10-26 08:56:06 +0000
+++ cocoa/ScintillaTest/ScintillaTest.xcodeproj/project.pbxproj	2014-01-24 04:00:28 +0000
@@ -191,7 +191,11 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+<<<<<<< TREE
 				LastUpgradeCheck = 0440;
+=======
+				LastUpgradeCheck = 0450;
+>>>>>>> MERGE-SOURCE
 			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "ScintillaTest" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -304,6 +308,7 @@
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = "";
 				PRODUCT_NAME = ScintillaTest;
+				SDKROOT = macosx;
 				USER_HEADER_SEARCH_PATHS = "";
 			};
 			name = Debug;
@@ -330,6 +335,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "";
 				PRODUCT_NAME = ScintillaTest;
+				SDKROOT = macosx;
 				USER_HEADER_SEARCH_PATHS = "";
 			};
 			name = Release;
@@ -340,12 +346,17 @@
 				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "";
+<<<<<<< TREE
 				SDKROOT = "";
+=======
+				SDKROOT = macosx;
+>>>>>>> MERGE-SOURCE
 			};
 			name = Debug;
 		};
@@ -354,12 +365,17 @@
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				GCC_C_LANGUAGE_STANDARD = c99;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "";
+<<<<<<< TREE
 				SDKROOT = "";
+=======
+				SDKROOT = macosx;
+>>>>>>> MERGE-SOURCE
 			};
 			name = Release;
 		};
 
=== modified file 'cocoa/ScintillaView.h'
--- cocoa/ScintillaView.h	2013-01-21 11:10:24 +0000
+++ cocoa/ScintillaView.h	2014-01-24 04:00:28 +0000
@@ -11,15 +11,38 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "Platform.h"
 #import "Scintilla.h"
 #import "SciLexer.h"
 
 #import "InfoBarCommunicator.h"
-#import "ScintillaCocoa.h"
+
+/**
+ * Scintilla sends these two messages to the notify handler. Please refer
+ * to the Windows API doc for details about the message format.
+ */
+#define WM_COMMAND 1001
+#define WM_NOTIFY 1002
+
+namespace Scintilla {
+/**
+ * On the Mac, there is no WM_COMMAND or WM_NOTIFY message that can be sent
+ * back to the parent. Therefore, there must be a callback handler that acts
+ * like a Windows WndProc, where Scintilla can send notifications to. Use
+ * ScintillaView registerNotifyCallback() to register such a handler.
+ * Message format is:
+ * <br>
+ * WM_COMMAND: HIWORD (wParam) = notification code, LOWORD (wParam) = control ID, lParam = ScintillaCocoa*
+ * <br>
+ * WM_NOTIFY: wParam = control ID, lParam = ptr to SCNotification structure, with hwndFrom set to ScintillaCocoa*
+ */
+typedef void(*SciNotifyFunc) (intptr_t windowid, unsigned int iMessage, uintptr_t wParam, uintptr_t lParam);
+
+class ScintillaCocoa;
+}
 
 @class ScintillaView;
 
+<<<<<<< TREE
 extern NSString *SCIUpdateUINotification;
 
 @protocol ScintillaNotificationProtocol
@@ -28,9 +51,37 @@
 
 /**
  * InnerView is the Cocoa interface to the Scintilla backend. It handles text input and
+=======
+extern NSString *const SCIUpdateUINotification;
+
+@protocol ScintillaNotificationProtocol
+- (void)notification: (Scintilla::SCNotification*)notification;
+@end
+
+/**
+ * SCIMarginView draws line numbers and other margins next to the text view.
+ */
+@interface SCIMarginView : NSRulerView
+{
+@private
+  int marginWidth;
+  ScintillaView *owner;
+  NSMutableArray *currentCursors;
+}
+
+@property (assign) int marginWidth;
+@property (assign) ScintillaView *owner;
+
+- (id)initWithScrollView:(NSScrollView *)aScrollView;
+
+@end
+
+/**
+ * SCIContentView is the Cocoa interface to the Scintilla backend. It handles text input and
+>>>>>>> MERGE-SOURCE
  * provides a canvas for painting the output.
  */
-@interface InnerView : NSView <NSTextInput>
+@interface SCIContentView : NSView <NSTextInputClient, NSUserInterfaceValidations>
 {
 @private
   ScintillaView* mOwner;
@@ -42,28 +93,31 @@
   BOOL undoCollectionWasActive;
 }
 
+<<<<<<< TREE
 @property (nonatomic, assign) ScintillaView* owner;
 
 - (void) dealloc;
+=======
+@property (nonatomic, assign) ScintillaView* owner;
+
+>>>>>>> MERGE-SOURCE
 - (void) removeMarkedText;
-- (void) setCursor: (Scintilla::Window::Cursor) cursor;
+- (void) setCursor: (int) cursor;
 
 - (BOOL) canUndo;
 - (BOOL) canRedo;
 
 @end
 
-@interface ScintillaView : NSView <InfoBarCommunicator>
+@interface ScintillaView : NSView <InfoBarCommunicator, ScintillaNotificationProtocol>
 {
 @private
   // The back end is kind of a controller and model in one.
   // It uses the content view for display.
   Scintilla::ScintillaCocoa* mBackend;
-  
-  // The object (eg NSDocument) that controls the ScintillaView.
-  NSObject* mOwner;
-  
+
   // This is the actual content to which the backend renders itself.
+<<<<<<< TREE
   InnerView* mContent;
   
   NSScroller* mHorizontalScroller;
@@ -71,20 +125,44 @@
   
   CGFloat zoomDelta;
   
+=======
+  SCIContentView* mContent;
+
+  NSScrollView *scrollView;
+  SCIMarginView *marginView;
+
+  CGFloat zoomDelta;
+
+>>>>>>> MERGE-SOURCE
   // Area to display additional controls (e.g. zoom info, caret position, status info).
   NSView <InfoBarCommunicator>* mInfoBar;
   BOOL mInfoBarAtTop;
+<<<<<<< TREE
   int mInitialInfoBarWidth;
 
   id<ScintillaNotificationProtocol> mDelegate;
+=======
+
+  id<ScintillaNotificationProtocol> mDelegate;
+>>>>>>> MERGE-SOURCE
 }
 
+<<<<<<< TREE
 @property (nonatomic, assign) Scintilla::ScintillaCocoa* backend;
 @property (nonatomic, assign) NSObject* owner;
 @property (nonatomic, assign) id<ScintillaNotificationProtocol> delegate;
 
 - (void) dealloc;
 - (void) positionSubViews;
+=======
+@property (nonatomic, readonly) Scintilla::ScintillaCocoa* backend;
+@property (nonatomic, assign) id<ScintillaNotificationProtocol> delegate;
+@property (nonatomic, readonly) NSScrollView *scrollView;
+
++ (Class) contentViewClass;
+
+- (void) positionSubViews;
+>>>>>>> MERGE-SOURCE
 
 - (void) sendNotification: (NSString*) notificationName;
 - (void) notify: (NotificationType) type message: (NSString*) message location: (NSPoint) location
@@ -92,15 +170,13 @@
 - (void) setCallback: (id <InfoBarCommunicator>) callback;
 
 - (void) suspendDrawing: (BOOL) suspend;
+- (void) notification: (Scintilla::SCNotification*) notification;
 
 // Scroller handling
-- (BOOL) setVerticalScrollRange: (int) range page: (int) page;
-- (void) setVerticalScrollPosition: (float) position;
-- (BOOL) setHorizontalScrollRange: (int) range page: (int) page;
-- (void) setHorizontalScrollPosition: (float) position;
-
+- (void) setMarginWidth: (int) width;
 - (void) scrollerAction: (id) sender;
-- (InnerView*) content;
+- (SCIContentView*) content;
+- (void) updateMarginCursors;
 
 // NSTextView compatibility layer.
 - (NSString*) string;
@@ -120,6 +196,9 @@
 // Native call through to the backend.
 + (sptr_t) directCall: (ScintillaView*) sender message: (unsigned int) message wParam: (uptr_t) wParam
                lParam: (sptr_t) lParam;
+- (sptr_t) message: (unsigned int) message wParam: (uptr_t) wParam lParam: (sptr_t) lParam;
+- (sptr_t) message: (unsigned int) message wParam: (uptr_t) wParam;
+- (sptr_t) message: (unsigned int) message;
 
 // Back end properties getters and setters.
 - (void) setGeneralProperty: (int) property parameter: (long) parameter value: (long) value;
@@ -139,8 +218,14 @@
 - (void) setLexerProperty: (NSString*) name value: (NSString*) value;
 - (NSString*) getLexerProperty: (NSString*) name;
 
-- (void) registerNotifyCallback: (intptr_t) windowid value: (Scintilla::SciNotifyFunc) callback;
-
+<<<<<<< TREE
+- (void) registerNotifyCallback: (intptr_t) windowid value: (Scintilla::SciNotifyFunc) callback;
+
+=======
+// The delegate property should be used instead of registerNotifyCallback which will be deprecated.
+- (void) registerNotifyCallback: (intptr_t) windowid value: (Scintilla::SciNotifyFunc) callback;
+
+>>>>>>> MERGE-SOURCE
 - (void) setInfoBar: (NSView <InfoBarCommunicator>*) aView top: (BOOL) top;
 - (void) setStatusText: (NSString*) text;
 
 
=== modified file 'cocoa/ScintillaView.mm'
--- cocoa/ScintillaView.mm	2013-01-21 11:10:24 +0000
+++ cocoa/ScintillaView.mm	2014-01-24 04:00:28 +0000
@@ -9,7 +9,9 @@
  * This file is dual licensed under LGPL v2.1 and the Scintilla license (http://www.scintilla.org/License.txt).
  */
 
+#import "Platform.h"
 #import "ScintillaView.h"
+#import "ScintillaCocoa.h"
 
 using namespace Scintilla;
 
@@ -20,29 +22,162 @@
 // The scintilla indicator used for keyboard input.
 #define INPUT_INDICATOR INDIC_MAX - 1
 
+<<<<<<< TREE
 NSString *SCIUpdateUINotification = @"SCIUpdateUI";
 
 @implementation InnerView
+=======
+NSString *const SCIUpdateUINotification = @"SCIUpdateUI";
+
+/**
+ * Provide an NSCursor object that matches the Window::Cursor enumeration.
+ */
+static NSCursor *cursorFromEnum(Window::Cursor cursor)
+{
+  switch (cursor)
+  {
+    case Window::cursorText:
+      return [NSCursor IBeamCursor];
+    case Window::cursorArrow:
+      return [NSCursor arrowCursor];
+    case Window::cursorWait:
+      return waitCursor;
+    case Window::cursorHoriz:
+      return [NSCursor resizeLeftRightCursor];
+    case Window::cursorVert:
+      return [NSCursor resizeUpDownCursor];
+    case Window::cursorReverseArrow:
+      return reverseArrowCursor;
+    case Window::cursorUp:
+    default:
+      return [NSCursor arrowCursor];
+  }
+}
+
+
+@implementation SCIMarginView
+
+@synthesize marginWidth, owner;
+
+- (id)initWithScrollView:(NSScrollView *)aScrollView
+{
+  self = [super initWithScrollView:aScrollView orientation:NSVerticalRuler];
+  if (self != nil)
+  {
+    owner = nil;
+    marginWidth = 20;
+    currentCursors = [[NSMutableArray arrayWithCapacity:0] retain];
+    for (size_t i=0; i<5; i++)
+    {
+      [currentCursors addObject: [reverseArrowCursor retain]];
+    }
+    [self setClientView:[aScrollView documentView]];
+  }
+  return self;
+}
+
+- (void) dealloc
+{
+  [currentCursors release];
+  [super dealloc];
+}
+
+- (void) setFrame: (NSRect) frame
+{
+  [super setFrame: frame];
+
+  [[self window] invalidateCursorRectsForView: self];
+}
+
+- (CGFloat)requiredThickness
+{
+  return marginWidth;
+}
+
+- (void)drawHashMarksAndLabelsInRect:(NSRect)aRect
+{
+  if (owner) {
+    NSRect contentRect = [[[self scrollView] contentView] bounds];
+    NSRect marginRect = [self bounds];
+    // Ensure paint to bottom of view to avoid glitches
+    if (marginRect.size.height > contentRect.size.height) {
+      // Legacy scroll bar mode leaves a poorly painted corner
+      aRect = marginRect;
+    }
+    owner.backend->PaintMargin(aRect);
+  }
+}
+
+- (void) mouseDown: (NSEvent *) theEvent
+{
+  NSClipView *textView = [[self scrollView] contentView];
+  [[textView window] makeFirstResponder:textView];
+  owner.backend->MouseDown(theEvent);
+}
+
+- (void) mouseDragged: (NSEvent *) theEvent
+{
+  owner.backend->MouseMove(theEvent);
+}
+
+- (void) mouseMoved: (NSEvent *) theEvent
+{
+  owner.backend->MouseMove(theEvent);
+}
+
+- (void) mouseUp: (NSEvent *) theEvent
+{
+  owner.backend->MouseUp(theEvent);
+}
+
+/**
+ * This method is called to give us the opportunity to define our mouse sensitive rectangle.
+ */
+- (void) resetCursorRects
+{
+  [super resetCursorRects];
+
+  int x = 0;
+  NSRect marginRect = [self bounds];
+  size_t co = [currentCursors count];
+  for (size_t i=0; i<co; i++)
+  {
+    int cursType = owner.backend->WndProc(SCI_GETMARGINCURSORN, i, 0);
+    int width =owner.backend->WndProc(SCI_GETMARGINWIDTHN, i, 0);
+    NSCursor *cc = cursorFromEnum(static_cast<Window::Cursor>(cursType));
+    [currentCursors replaceObjectAtIndex:i withObject: cc];
+    marginRect.origin.x = x;
+    marginRect.size.width = width;
+    [self addCursorRect: marginRect cursor: cc];
+    [cc setOnMouseEntered: YES];
+    x += width;
+  }
+}
+
+@end
+
+@implementation SCIContentView
+>>>>>>> MERGE-SOURCE
 
 @synthesize owner = mOwner;
 
 //--------------------------------------------------------------------------------------------------
 
-- (NSView*) initWithFrame: (NSRect) frame 
+- (NSView*) initWithFrame: (NSRect) frame
 {
   self = [super initWithFrame: frame];
-  
+
   if (self != nil)
   {
     // Some initialization for our view.
     mCurrentCursor = [[NSCursor arrowCursor] retain];
     mCurrentTrackingRect = 0;
     mMarkedTextRange = NSMakeRange(NSNotFound, 0);
-    
+
     [self registerForDraggedTypes: [NSArray arrayWithObjects:
                                    NSStringPboardType, ScintillaRecPboardType, NSFilenamesPboardType, nil]];
   }
-  
+
   return self;
 }
 
@@ -70,39 +205,16 @@
 /**
  * Called by the backend if a new cursor must be set for the view.
  */
-- (void) setCursor: (Window::Cursor) cursor
+- (void) setCursor: (int) cursor
 {
+  Window::Cursor eCursor = (Window::Cursor)cursor;
   [mCurrentCursor autorelease];
-  switch (cursor)
-  {
-    case Window::cursorText:
-      mCurrentCursor = [NSCursor IBeamCursor];
-      break;
-    case Window::cursorArrow:
-      mCurrentCursor = [NSCursor arrowCursor];
-      break;
-    case Window::cursorWait:
-      mCurrentCursor = waitCursor;
-      break;
-    case Window::cursorHoriz:
-      mCurrentCursor = [NSCursor resizeLeftRightCursor];
-      break;
-    case Window::cursorVert:
-      mCurrentCursor = [NSCursor resizeUpDownCursor];
-      break;
-    case Window::cursorReverseArrow:
-      mCurrentCursor = reverseArrowCursor;
-      break;
-    case Window::cursorUp:
-    default:
-      mCurrentCursor = [NSCursor arrowCursor];
-      break;
-  }
-  
+  mCurrentCursor = cursorFromEnum(eCursor);
   [mCurrentCursor retain];
-  
+
   // Trigger recreation of the cursor rectangle(s).
   [[self window] invalidateCursorRectsForView: self];
+  [mOwner updateMarginCursors];
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -113,7 +225,7 @@
 - (void) resetCursorRects
 {
   [super resetCursorRects];
-  
+
   // We only have one cursor rect: our bounds.
   [self addCursorRect: [self bounds] cursor: mCurrentCursor];
   [mCurrentCursor setOnMouseEntered: YES];
@@ -127,17 +239,26 @@
 - (void) drawRect: (NSRect) rect
 {
   CGContextRef context = (CGContextRef) [[NSGraphicsContext currentContext] graphicsPort];