From 9e3c2d093b9b9ca3178d44a510625f367fa64083 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Tue, 26 May 2015 17:09:59 -0700
Subject: [PATCH] Avoid double transaction when typing

---
 src/text-editor-component.coffee |  3 +--
 src/text-editor.coffee           | 24 ++++++++++++++++--------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/text-editor-component.coffee b/src/text-editor-component.coffee
index eb01e0f23..431966910 100644
--- a/src/text-editor-component.coffee
+++ b/src/text-editor-component.coffee
@@ -309,8 +309,7 @@ class TextEditorComponent
     selectedLength = inputNode.selectionEnd - inputNode.selectionStart
     @editor.selectLeft() if selectedLength is 1
 
-    insertedRange = @editor.transact atom.config.get('editor.undoGroupingInterval'), =>
-      @editor.insertText(event.data)
+    insertedRange = @editor.insertText(event.data, groupUndo: true)
     inputNode.value = event.data if insertedRange
 
   onVerticalScroll: (scrollTop) =>
diff --git a/src/text-editor.coffee b/src/text-editor.coffee
index 4489d82af..6d979fdf7 100644
--- a/src/text-editor.coffee
+++ b/src/text-editor.coffee
@@ -761,15 +761,23 @@ class TextEditor extends Model
     @emit('will-insert-text', willInsertEvent) if includeDeprecatedAPIs
     @emitter.emit 'will-insert-text', willInsertEvent
 
+    groupingInterval = if options.groupUndo
+      atom.config.get('editor.undoGroupingInterval')
+    else
+      0
+
     if willInsert
       options.autoIndentNewline ?= @shouldAutoIndent()
       options.autoDecreaseIndent ?= @shouldAutoIndent()
-      @mutateSelectedText (selection) =>
-        range = selection.insertText(text, options)
-        didInsertEvent = {text, range}
-        @emit('did-insert-text', didInsertEvent) if includeDeprecatedAPIs
-        @emitter.emit 'did-insert-text', didInsertEvent
-        range
+      @mutateSelectedText(
+        (selection) =>
+          range = selection.insertText(text, options)
+          didInsertEvent = {text, range}
+          @emit('did-insert-text', didInsertEvent) if includeDeprecatedAPIs
+          @emitter.emit 'did-insert-text', didInsertEvent
+          range
+        , groupingInterval
+      )
     else
       false
 
@@ -795,9 +803,9 @@ class TextEditor extends Model
   # * `fn` A {Function} that will be called once for each {Selection}. The first
   #      argument will be a {Selection} and the second argument will be the
   #      {Number} index of that selection.
-  mutateSelectedText: (fn) ->
+  mutateSelectedText: (fn, groupingInterval=0) ->
     @mergeIntersectingSelections =>
-      @transact =>
+      @transact groupingInterval, =>
         fn(selection, index) for selection, index in @getSelectionsOrderedByBufferPosition()
 
   # Move lines intersection the most recent selection up by one row in screen