github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-12 23:55:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into as-file-recovery-service

Browse Source
This commit is contained in:
Antonio Scandurra
2016-05-24 10:07:30 +02:00
parent 7a12984af3 8710096cfe
commit 152c28a0e9
19 changed files with 90 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/text-editor.coffee
View File

@@ -2596,7 +2596,7 @@ class TextEditor extends Model
# Returns the new {Selection}.
addSelection: (marker, options={}) ->
cursor = @addCursor(marker)
selection = new Selection(_.extend({editor: this, marker, cursor, @clipboard}, options))
selection = new Selection(Object.assign({editor: this, marker, cursor, @clipboard}, options))
@selections.push(selection)
selectionBufferRange = selection.getBufferRange()
@mergeIntersectingSelections(preserveFolds: options.preserveFolds)