github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-28 03:01:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ns-improve-workspace-api-docs

Browse Source
This commit is contained in:
Nathan Sobo
2014-03-04 11:04:24 -07:00
parent 4b7e5ca9fc a1505736d7
commit 20a396f190
5 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/editor.coffee
View File

@@ -1733,3 +1733,7 @@ class Editor extends Model
getSelectionMarkerAttributes: ->
type: 'selection', editorId: @id, invalidate: 'never'
# Deprecated: Call {::joinLines} instead.
joinLine: ->
@joinLines()