From e01ac96b66189342261267d338f48426a8aabb11 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki & Nathan Sobo <kevin+nathan@github.com>
Date: Tue, 2 Jul 2013 15:32:44 -0700
Subject: [PATCH] Guard against a null pending changed event

Previously TextBuffer would emit change events even when the change
was empty. SharedString does not emit empty change events and so a
pending event may no longer be present when a marker-updated event
fires.
---
 src/app/display-buffer.coffee | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/display-buffer.coffee b/src/app/display-buffer.coffee
index 11f7bbae4..a13b863b0 100644
--- a/src/app/display-buffer.coffee
+++ b/src/app/display-buffer.coffee
@@ -605,9 +605,9 @@ class DisplayBuffer
         @maxLineLength = length
 
   handleMarkersUpdated: =>
-    event = @pendingChangeEvent
-    @pendingChangeEvent = null
-    @triggerChanged(event, false)
+    if event = @pendingChangeEvent
+      @pendingChangeEvent = null
+      @triggerChanged(event, false)
 
   handleMarkerCreated: (marker) =>
     new Fold(this, marker) if marker.matchesAttributes(@foldMarkerAttributes())