Merge branch 'dev' into web-workers

src/app/editor.coffee

@@ -182,6 +182,7 @@ class Editor extends View
         'editor:close-other-edit-sessions': @destroyInactiveEditSessions
         'editor:close-all-edit-sessions': @destroyAllEditSessions
         'editor:select-grammar': @selectGrammar
+        'editor:copy-path': @copyPathToPasteboard
 
     documentation = {}
     for name, method of editorBindings
@@ -310,9 +311,10 @@ class Editor extends View
 
   setInvisibles: (@invisibles={}) ->
     _.defaults @invisibles,
-      eol: '\u00ac',
-      space: '\u2022',
+      eol: '\u00ac'
+      space: '\u2022'
       tab: '\u00bb'
+      cr: '\u00a4'
     @resetDisplay()
 
   checkoutHead: -> @getBuffer().checkoutHead()
@@ -1079,8 +1081,11 @@ class Editor extends View
         position += token.value.length
 
     popScope() while scopeStack.length > 0
-    if not @mini and invisibles?.eol
-      line.push("<span class='invisible'>#{invisibles.eol}</span>")
+    if invisibles and not @mini
+      if invisibles.cr and screenLine.lineEnding is '\r\n'
+        line.push("<span class='invisible'>#{invisibles.cr}</span>")
+      if invisibles.eol
+        line.push("<span class='invisible'>#{invisibles.eol}</span>")
 
     line.push('</pre>')
     line.join('')
@@ -1159,3 +1164,7 @@ class Editor extends View
 
     @insertText(text, select: true)
     true
+
+  copyPathToPasteboard: ->
+    path = @getPath()
+    pasteboard.write(path) if path?