From bf44cf89db1c190c25138414c5fc2df19bc3250c Mon Sep 17 00:00:00 2001
From: Ben Ogle <ogle.ben@gmail.com>
Date: Wed, 17 Sep 2014 18:00:31 -0700
Subject: [PATCH] DisplayBufferMarker::matchesAttributes -> ::matchesProperties

---
 src/display-buffer-marker.coffee | 7 +++++--
 src/display-buffer.coffee        | 2 +-
 src/editor.coffee                | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/display-buffer-marker.coffee b/src/display-buffer-marker.coffee
index 0e001dc65..a34bc273a 100644
--- a/src/display-buffer-marker.coffee
+++ b/src/display-buffer-marker.coffee
@@ -155,9 +155,12 @@ class DisplayBufferMarker
     deprecate 'Use Marker::getProperties instead'
     @setProperties(properties)
 
-  matchesAttributes: (attributes) ->
+  matchesProperties: (attributes) ->
     attributes = @displayBuffer.translateToBufferMarkerParams(attributes)
-    @bufferMarker.matchesAttributes(attributes)
+    @bufferMarker.matchesParams(attributes)
+  matchesAttributes: (attributes) ->
+    deprecate 'Use Marker::matchesProperties instead'
+    @matchesProperties(attributes)
 
   ###
   Section: Comparing to other markers
diff --git a/src/display-buffer.coffee b/src/display-buffer.coffee
index c86324b35..d966c9d8c 100644
--- a/src/display-buffer.coffee
+++ b/src/display-buffer.coffee
@@ -1139,7 +1139,7 @@ class DisplayBuffer extends Model
       @emitDidChange(event, false)
 
   handleBufferMarkerCreated: (marker) =>
-    @createFoldForMarker(marker) if marker.matchesAttributes(@getFoldMarkerAttributes())
+    @createFoldForMarker(marker) if marker.matchesProperties(@getFoldMarkerAttributes())
     if displayBufferMarker = @getMarker(marker.id)
       # The marker might have been removed in some other handler called before
       # this one. Only emit when the marker still exists.
diff --git a/src/editor.coffee b/src/editor.coffee
index b7b918ae0..6e10e266b 100644
--- a/src/editor.coffee
+++ b/src/editor.coffee
@@ -2622,7 +2622,7 @@ class Editor extends Model
     @emitter.emit 'did-change-grammar'
 
   handleMarkerCreated: (marker) =>
-    if marker.matchesAttributes(@getSelectionMarkerAttributes())
+    if marker.matchesProperties(@getSelectionMarkerAttributes())
       @addSelection(marker)
 
   ###