From cbf499243e0787b33ca486ec6c9a396d4cd74f31 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Tue, 7 Apr 2015 18:08:51 +0200
Subject: [PATCH] Use screen ranges consistently

---
 src/text-editor.coffee | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/text-editor.coffee b/src/text-editor.coffee
index 8936e125a..7606cea7e 100644
--- a/src/text-editor.coffee
+++ b/src/text-editor.coffee
@@ -2056,7 +2056,9 @@ class TextEditor extends Model
 
   mergeSelectionsOnSameRows: (args...) ->
     @mergeSelections args..., (previousSelection, currentSelection) ->
-      previousSelection.intersectsScreenRowRange(currentSelection.getBufferRowRange()...)
+      screenRange = currentSelection.getScreenRange()
+
+      previousSelection.intersectsScreenRowRange(screenRange.start.row, screenRange.end.row)
 
   mergeSelections: (args...) ->
     mergePredicate = args.pop()