Split UndoHistory out of CellBuffer.

Fixed coalescing of nodes in the undo history.
Added LineCut, LineDelete, LineTranspose, UpperCase and LowerCase keyboard
commands and added keys for them.
Added UUID lexical class to CPP lexer.

1 files changed, 25 insertions, 20 deletions

diff --git a/src/KeyMap.cxx b/src/KeyMap.cxx
index f339cd275..9ab9694df 100644
--- a/src/KeyMap.cxx
+++ b/src/KeyMap.cxx
@@ -61,36 +61,36 @@ UINT KeyMap::Find(int key, int modifiers) {
 }
 
 KeyToCommand KeyMap::MapDefault[] = {
-    VK_DOWN,	SCI_NORM,	SCI_LINEDOWN,
-    VK_DOWN,	SCI_SHIFT,	SCI_LINEDOWNEXTEND,
-    VK_UP,		SCI_NORM,	SCI_LINEUP,
-    VK_UP,		SCI_SHIFT,	SCI_LINEUPEXTEND,
+    VK_DOWN,		SCI_NORM,	SCI_LINEDOWN,
+    VK_DOWN,		SCI_SHIFT,	SCI_LINEDOWNEXTEND,
+    VK_UP,			SCI_NORM,	SCI_LINEUP,
+    VK_UP,			SCI_SHIFT,	SCI_LINEUPEXTEND,
     VK_LEFT,		SCI_NORM,	SCI_CHARLEFT,
     VK_LEFT,		SCI_SHIFT,	SCI_CHARLEFTEXTEND,
     VK_LEFT,		SCI_CTRL,	SCI_WORDLEFT,
     VK_LEFT,		SCI_CSHIFT,	SCI_WORDLEFTEXTEND,
-    VK_RIGHT,	SCI_NORM,	SCI_CHARRIGHT,
-    VK_RIGHT,	SCI_SHIFT,	SCI_CHARRIGHTEXTEND,
-    VK_RIGHT,	SCI_CTRL,	SCI_WORDRIGHT,
-    VK_RIGHT,	SCI_CSHIFT,	SCI_WORDRIGHTEXTEND,
-    VK_HOME, 	SCI_NORM, 	SCI_VCHOME,
-    VK_HOME, 	SCI_SHIFT, 	SCI_VCHOMEEXTEND,
-    VK_HOME, 	SCI_CTRL, 	SCI_DOCUMENTSTART,
-    VK_HOME, 	SCI_CSHIFT, 	SCI_DOCUMENTSTARTEXTEND,
+    VK_RIGHT,		SCI_NORM,	SCI_CHARRIGHT,
+    VK_RIGHT,		SCI_SHIFT,	SCI_CHARRIGHTEXTEND,
+    VK_RIGHT,		SCI_CTRL,	SCI_WORDRIGHT,
+    VK_RIGHT,		SCI_CSHIFT,	SCI_WORDRIGHTEXTEND,
+    VK_HOME, 		SCI_NORM, 	SCI_VCHOME,
+    VK_HOME, 		SCI_SHIFT, 	SCI_VCHOMEEXTEND,
+    VK_HOME, 		SCI_CTRL, 	SCI_DOCUMENTSTART,
+    VK_HOME, 		SCI_CSHIFT, 	SCI_DOCUMENTSTARTEXTEND,
     VK_END,	 	SCI_NORM, 	SCI_LINEEND,
     VK_END,	 	SCI_SHIFT, 	SCI_LINEENDEXTEND,
     VK_END, 		SCI_CTRL, 	SCI_DOCUMENTEND,
     VK_END, 		SCI_CSHIFT, 	SCI_DOCUMENTENDEXTEND,
-    VK_PRIOR,	SCI_NORM, 	SCI_PAGEUP,
-    VK_PRIOR,	SCI_SHIFT, 	SCI_PAGEUPEXTEND,
-    VK_NEXT, 	SCI_NORM, 	SCI_PAGEDOWN,
-    VK_NEXT, 	SCI_SHIFT, 	SCI_PAGEDOWNEXTEND,
+    VK_PRIOR,		SCI_NORM, 	SCI_PAGEUP,
+    VK_PRIOR,		SCI_SHIFT, 	SCI_PAGEUPEXTEND,
+    VK_NEXT, 		SCI_NORM, 	SCI_PAGEDOWN,
+    VK_NEXT, 		SCI_SHIFT, 	SCI_PAGEDOWNEXTEND,
     VK_DELETE, 	SCI_NORM,	WM_CLEAR,
     VK_DELETE, 	SCI_SHIFT,	WM_CUT,
     VK_DELETE, 	SCI_CTRL,	SCI_DELWORDRIGHT,
-    VK_INSERT, 	SCI_NORM,	SCI_EDITTOGGLEOVERTYPE,
-    VK_INSERT, 	SCI_SHIFT,	WM_PASTE,
-    VK_INSERT, 	SCI_CTRL,	WM_COPY,
+    VK_INSERT, 		SCI_NORM,	SCI_EDITTOGGLEOVERTYPE,
+    VK_INSERT, 		SCI_SHIFT,	WM_PASTE,
+    VK_INSERT, 		SCI_CTRL,	WM_COPY,
     VK_ESCAPE,  	SCI_NORM,	SCI_CANCEL,
     VK_BACK,		SCI_NORM, 	SCI_DELETEBACK,
     VK_BACK,		SCI_CTRL, 	SCI_DELWORDLEFT,
@@ -103,9 +103,14 @@ KeyToCommand KeyMap::MapDefault[] = {
     VK_TAB,		SCI_NORM,	SCI_TAB,
     VK_TAB,		SCI_SHIFT,	SCI_BACKTAB,
     VK_RETURN, 	SCI_NORM,	SCI_NEWLINE,
-    'L', 			SCI_CTRL,	SCI_FORMFEED,
     VK_ADD, 		SCI_CTRL,	SCI_ZOOMIN,
     VK_SUBTRACT,	SCI_CTRL,	SCI_ZOOMOUT,
+    //'L', 			SCI_CTRL,		SCI_FORMFEED,
+    'L', 			SCI_CTRL,	SCI_LINECUT,
+    'L', 			SCI_CSHIFT,	SCI_LINEDELETE,
+    'T', 			SCI_CTRL,	SCI_LINETRANSPOSE,
+    'U', 			SCI_CTRL,	SCI_LOWERCASE,
+    'U', 			SCI_CSHIFT,	SCI_UPPERCASE,
     0,0,0,
 };