Merge branch 'master' of https://github.com/LadyClaire/qutebrowser into LadyClaire-master

qutebrowser/browser/commands.py

@@ -249,12 +249,15 @@ class CommandDispatcher:
                                           "set!")
         else:
             try:
-                url = urlutils.fuzzy_url(url)
+                url = objreg.get('quickmark-manager').get(url)
-            except urlutils.InvalidUrlError as e:
+            except urlmarks.Error:
-                # We don't use cmdexc.CommandError here as this can be called
+                try:
-                # async from edit_url
+                    url = urlutils.fuzzy_url(url)
-                message.error(self._win_id, str(e))
+                except urlutils.InvalidUrlError as e:
-                return
+                    # We don't use cmdexc.CommandError here as this can be 
+                    # called async from edit_url
+                    message.error(self._win_id, str(e))
+                    return
         if tab or bg or window:
             self._open(url, tab, bg, window)
         else:

tests/end2end/features/open.feature

@@ -103,3 +103,8 @@ Feature: Opening pages
                 history:
                 - active: true
                   url: http://localhost:*/data/numbers/7.txt
+
+    Scenario: Opening a quickmark
+        When I run :quickmark-add http://localhost:(port)/data/numbers/8.txt quickmarktest
+        And I run :open quickmarktest
+        Then data/numbers/8.txt should be loaded