Merge pull request #284 from dmitmel/master

[pull] master from dmitmel:master

nvim/plugin/editing.vim

@@ -233,6 +233,7 @@ set commentstring=//%s
   let g:delimitMate_expand_cr = 1
 
   let g:surround_{char2nr('*')} = "**\r**"
+  let g:surround_{char2nr('~')} = "~~\r~~"
 
   let g:pencil#wrapModeDefault = 'soft'
   let g:pencil#conceallevel = 0

scripts/playerctl-simple-menu

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# type: ignore
 
 # A simple graphical menu to control MPRIS-compatible players through Playerctl.
 # <https://wiki.archlinux.org/index.php/MPRIS>
@@ -7,7 +8,9 @@
 # TODO: Update the menu on player status changes.
 
 import math
+import posixpath
 import sys
+import urllib.parse
 
 import gi
 
@@ -59,6 +62,14 @@ def iter_metadata_entries_for_player(player):
     if album:
       yield album.get_string()
 
+  else:
+    url = metadata.lookup_value("xesam:url")
+    if url:
+      url_parsed = urllib.parse.urlparse(url.get_string())
+      if url_parsed.scheme == "file":
+        filename = posixpath.basename(urllib.parse.unquote(url_parsed.path))
+        yield filename
+
   if player.props.can_seek:
     position_secs = player.props.position / 1e6
     duration = metadata.lookup_value("mpris:length")