Merge branch 'master' into cj-add-react-editor-shims

src/display-buffer.coffee

@@ -520,7 +520,7 @@ class DisplayBuffer extends Model
       charWidths = @getScopedCharWidths(token.scopes)
       for char in token.value
         return {top, left} if column is targetColumn
-        left += charWidths[char] ? defaultCharWidth
+        left += charWidths[char] ? defaultCharWidth unless char is '\0'
         column++
     {top, left}
 

src/editor-component.coffee

@@ -539,7 +539,7 @@ EditorComponent = React.createClass
 
   onDecorationChanged: ->
     @decorationChangedImmediate ?= setImmediate =>
-      @requestUpdate()
+      @requestUpdate() if @isMounted()
       @decorationChangedImmediate = null
 
   selectToMousePositionUntilMouseUp: (event) ->

src/lines-component.coffee

@@ -232,6 +232,8 @@ LinesComponent = React.createClass
       charWidths = editor.getScopedCharWidths(scopes)
 
       for char in value
+        continue if char is '\0'
+
         unless charWidths[char]?
           unless textNode?
             rangeForMeasurement ?= document.createRange()