Merge remote-tracking branch 'origin/dev' into markers

This commit is contained in:
Kevin Sawicki & Nathan Sobo
2013-02-05 16:12:35 -07:00

View File

@@ -49,7 +49,7 @@ class BracketMatcher extends AtomPackage
view = $$ -> @div class: 'bracket-matcher'
view.data('bufferPosition', bufferPosition)
view.css('top', pixelPosition.top).css('left', pixelPosition.left)
view.width(editor.charWidth).height(editor.charHeight)
view.width(editor.charWidth).height(editor.lineHeight)
findCurrentPair: (editor, buffer, matches) ->
position = editor.getCursorBufferPosition()