From ac3947b16438141df4b9f9d603503751a07c6111 Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Wed, 20 Dec 2017 20:51:17 -0800
Subject: [PATCH] Continue progress on keyboard shortcuts.

---
 .../MainWindow/Keyboard/GlobalKeyboardShortcuts.plist     | 8 +++++++-
 Evergreen/MainWindow/MainWindowController.swift           | 6 ++++++
 .../Resources/KeyboardShortcuts/KeyboardShortcuts.html    | 2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Evergreen/MainWindow/Keyboard/GlobalKeyboardShortcuts.plist b/Evergreen/MainWindow/Keyboard/GlobalKeyboardShortcuts.plist
index 8c17c4d1c..4611d1fc0 100644
--- a/Evergreen/MainWindow/Keyboard/GlobalKeyboardShortcuts.plist
+++ b/Evergreen/MainWindow/Keyboard/GlobalKeyboardShortcuts.plist
@@ -30,7 +30,7 @@
 	</dict>
 	<dict>
 		<key>key</key>
-		<string>[downarrow]</string>
+		<string>+</string>
 		<key>shiftModifier</key>
 		<true/>
 		<key>action</key>
@@ -54,6 +54,12 @@
 		<key>action</key>
 		<string>markUnreadAndGoToNextUnread:</string>
 	</dict>
+	<dict>
+		<key>key</key>
+		<string>l</string>
+		<key>action</key>
+		<string>markReadAndGoToNextUnread:</string>
+	</dict>
 	<dict>
 		<key>key</key>
 		<string>u</string>
diff --git a/Evergreen/MainWindow/MainWindowController.swift b/Evergreen/MainWindow/MainWindowController.swift
index 512392f86..c0397f3a7 100644
--- a/Evergreen/MainWindow/MainWindowController.swift
+++ b/Evergreen/MainWindow/MainWindowController.swift
@@ -192,6 +192,12 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
 		nextUnread(sender)
 	}
 
+	@IBAction func markReadAndGoToNextUnread(_ sender: Any?) {
+
+		markUnread(sender)
+		nextUnread(sender)
+	}
+
 	@IBAction func toggleSidebar(_ sender: Any?) {
 		
 		splitViewController!.toggleSidebar(sender)
diff --git a/Evergreen/Resources/KeyboardShortcuts/KeyboardShortcuts.html b/Evergreen/Resources/KeyboardShortcuts/KeyboardShortcuts.html
index 19f10971b..4f404e820 100644
--- a/Evergreen/Resources/KeyboardShortcuts/KeyboardShortcuts.html
+++ b/Evergreen/Resources/KeyboardShortcuts/KeyboardShortcuts.html
@@ -39,7 +39,7 @@
 <tr><td colspan="2">&nbsp;<br /></td></tr>
 <tr class="tableTitleRow"><td colspan="2">Everywhere…</td></tr>
 <tr class="backgroundColorRow"><td>Scroll or go to next unread</td><td>space bar</td></tr>
-<tr><td>Go to next unread</td><td>+ or shift-downArrow</td></tr>
+<tr><td>Go to next unread</td><td>+</td></tr>
 <tr class="backgroundColorRow"><td>Mark as read</td><td>r</td></tr>
 <tr><td>Mark all as read</td><td>k</td></tr>
 <tr class="backgroundColorRow"><td>Mark all as read, go to next unread</td><td>l (lowercase L)</td></tr>