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

Merge branch 'master' into ns-switch-to-display-layers

Browse Source
This commit is contained in:
Antonio Scandurra
2016-04-11 13:15:00 +02:00
parent ab0d69ce90 852d8d71a4
commit 6b2bfd5656
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/text-editor.coffee
View File

@@ -1653,7 +1653,7 @@ class TextEditor extends Model
#
# * `markerLayer` A {DisplayMarkerLayer} or {MarkerLayer} to decorate.
# * `decorationParams` The same parameters that are passed to
# {decorateMarker}, except the `type` cannot be `overlay` or `gutter`.
# {TextEditor::decorateMarker}, except the `type` cannot be `overlay` or `gutter`.
#
# Returns a {LayerDecoration}.
decorateMarkerLayer: (markerLayer, decorationParams) ->