From 62c08fe0cd0c4e06902a47f6dda0c7849b7d23fc Mon Sep 17 00:00:00 2001
From: nyamatongwe <unknown>
Date: Thu, 10 Jan 2013 10:04:13 +1100
Subject: Turn off undo collection for IME composition. From Mike Lischke.

---
 cocoa/ScintillaView.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'cocoa/ScintillaView.h')

diff --git a/cocoa/ScintillaView.h b/cocoa/ScintillaView.h
index 8a028e2c4..d5f500df3 100644
--- a/cocoa/ScintillaView.h
+++ b/cocoa/ScintillaView.h
@@ -4,7 +4,7 @@
  *
  * Created by Mike Lischke.
  *
- * Copyright 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2011, 2013, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2009, 2011 Sun Microsystems, Inc. All rights reserved.
  * This file is dual licensed under LGPL v2.1 and the Scintilla license (http://www.scintilla.org/License.txt).
  */
@@ -39,6 +39,7 @@ extern NSString *SCIUpdateUINotification;
 
   // Set when we are in composition mode and partial input is displayed.
   NSRange mMarkedTextRange;
+  BOOL undoCollectionWasActive;
 }
 
 @property (nonatomic, assign) ScintillaView* owner;
-- 
cgit v1.2.3