From f98ba7ba0e3f2cbb8886d6635528f87572600000 Mon Sep 17 00:00:00 2001
From: Julian Weigt <julian.weigt@gmail.com>
Date: Sun, 21 Aug 2016 15:33:55 +0200
Subject: [PATCH 1/3] Added test for empty dictionary

---
 tests/end2end/features/hints.feature | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/end2end/features/hints.feature b/tests/end2end/features/hints.feature
index 6f05b7d6b..486c64408 100644
--- a/tests/end2end/features/hints.feature
+++ b/tests/end2end/features/hints.feature
@@ -184,6 +184,13 @@ Feature: Using hints
         Then the error "Not enough words in the dictionary." should be shown
         And data/numbers/5.txt should be loaded
 
+    Scenario: Dictionary file does not exist
+        When I open data/hints/html/simple.html
+        And I set hints -> dictionary to no_words
+        And I set hints -> mode to word
+        And I run :hint
+        Then the error "Word hints requires reading the file at *" should be shown
+
     ### Number hint mode
 
     # https://github.com/The-Compiler/qutebrowser/issues/308

From be89e8f4996ce46695a8d8ba34ef5e82860531c5 Mon Sep 17 00:00:00 2001
From: Julian Weigt <julian.weigt@gmail.com>
Date: Sun, 21 Aug 2016 19:37:30 +0200
Subject: [PATCH 2/3] Add check that qutebrowser defaults to letter hints

---
 tests/end2end/features/hints.feature | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/end2end/features/hints.feature b/tests/end2end/features/hints.feature
index 486c64408..fe3ba056f 100644
--- a/tests/end2end/features/hints.feature
+++ b/tests/end2end/features/hints.feature
@@ -189,7 +189,9 @@ Feature: Using hints
         And I set hints -> dictionary to no_words
         And I set hints -> mode to word
         And I run :hint
+        And I press the key "a"
         Then the error "Word hints requires reading the file at *" should be shown
+        And data/hello.txt should be loaded
 
     ### Number hint mode
 

From 778d96c3c607884b2ee6b5a9b0072411253e110e Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 23 Aug 2016 23:09:04 +0200
Subject: [PATCH 3/3] Regenerate authors

---
 README.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.asciidoc b/README.asciidoc
index 6af28d775..f79270523 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -184,6 +184,7 @@ Contributors, sorted by the number of commits in descending order:
 * Zach-Button
 * Tomasz Kramkowski
 * Peter Rice
+* Julian Weigt
 * Ismail S
 * Halfwit
 * David Vogt
@@ -208,7 +209,6 @@ Contributors, sorted by the number of commits in descending order:
 * Panashe M. Fundira
 * Link
 * Larry Hynes
-* Julian Weigt
 * Johannes Altmanninger
 * Jeremy Kaplan
 * Ismail