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 remote-tracking branch 'origin/master' into cj-tabs-be-weird

Browse Source 
Conflicts:
	package.json
This commit is contained in:
Corey Johnson
2014-05-08 14:36:50 -07:00
parent 7d76105530 255cdbb60a
commit a649d75ab8
6 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/editor.coffee
View File

@@ -576,7 +576,7 @@ class Editor extends Model
bufferRowForScreenRow: (row) -> @displayBuffer.bufferRowForScreenRow(row)
# Public: Get the syntactic scopes for the most the given position in buffer
# Public: Get the syntactic scopes for the given position in buffer
# coordinates.
#
# For example, if called with a position inside the parameter list of an