Merge branch 'LadyClaire-master'

CHANGELOG.asciidoc

@@ -24,6 +24,7 @@ Changed
   already exists.
 - `:bookmark-load` now has a `--delete` flag which deletes the bookmark after
   loading it.
+- `:open` now also accepts quickmark names instead of URLs
 
 Fixed
 -----

README.asciidoc

@@ -207,6 +207,7 @@ Contributors, sorted by the number of commits in descending order:
 * Ismail
 * Edgar Hipp
 * Daryl Finlay
+* Claire Cavanaugh
 * adam
 * Samir Benmendil
 * Regina Hug

qutebrowser/browser/commands.py

@@ -248,11 +248,14 @@ class CommandDispatcher:
                 raise cmdexc.CommandError("No URL given, but -t/-b/-w is not "
                                           "set!")
         else:
+            try:
+                url = objreg.get('quickmark-manager').get(url)
+            except urlmarks.Error:
                 try:
                     url = urlutils.fuzzy_url(url)
                 except urlutils.InvalidUrlError as e:
-                # We don't use cmdexc.CommandError here as this can be called
-                # async from edit_url
+                    # 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:

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