Merge branch 'dev' into work/v1.11

# Conflicts:
#	CMakeLists.txt
#	res/lang/cs.bin
#	res/lang/de.bin
#	res/lang/en.bin
#	res/lang/eo.bin
#	res/lang/es.bin
#	res/lang/es_MX.bin
#	res/lang/fi.bin
#	res/lang/fr.bin
#	res/lang/gl.bin
#	res/lang/hu.bin
#	res/lang/ia.bin
#	res/lang/ie.bin
#	res/lang/isv.bin
#	res/lang/nl.bin
#	res/lang/pl.bin
#	res/lang/ru.bin
#	res/lang/sk.bin
#	res/lang/sr.bin
#	res/lang/tok.bin
#	res/lang/tr.bin
#	res/lang/uk.bin
#	res/lang/zh_Hans.bin
#	res/lang/zh_Hant.bin

5 files changed, 21 insertions, 4 deletions

diff --git a/po/en.po b/po/en.po
index aa557043..6db26259 100644
--- a/po/en.po
+++ b/po/en.po
@@ -1833,6 +1833,12 @@ msgstr "Upload with Titan"
 msgid "keys.upload.edit"
 msgstr "Edit Page with Titan"
 
+msgid "keys.feeds.showall"
+msgstr "Sidebar: Show all feed entries"
+
+msgid "keys.feeds.showunread"
+msgstr "Sidebar: Show unread feed entries"
+
 msgid "error.badstatus"
 msgstr "Unknown Status Code"
 
diff --git a/res/about/version.gmi b/res/about/version.gmi
index f397c7e1..aee62e82 100644
--- a/res/about/version.gmi
+++ b/res/about/version.gmi
@@ -6,6 +6,10 @@
 ```
 # Release notes
 
+## 1.10.6
+* Added bindings for switching Feeds list to Unread/All mode.
+* Fixed normalization of empty Gemini URL paths to `/` as per the November 2021 spec update.
+
 ## 1.10.5
 * Added a keybinding for "Paste Preceding Line" (in input prompt menu).
 * The "Miscellaneous Symbols and Arrows" Unicode block (U+2B00...U+2BFF) is accepted as custom link icons.
diff --git a/src/gmrequest.c b/src/gmrequest.c
index 82c232e1..603975f0 100644
--- a/src/gmrequest.c
+++ b/src/gmrequest.c
@@ -593,6 +593,15 @@ void setUrl_GmRequest(iGmRequest *d, const iString *url) {
        the web. */
     /* Encode everything except already-percent encoded characters. */
     iString *enc = urlEncodeExclude_String(&d->url, "%" URL_RESERVED_CHARS);
+    /* Normalize empty paths to /. */ {
+        iUrl parts;
+        init_Url(&parts, enc);
+        if (isEmpty_Range(&parts.path) && equalCase_Rangecc(parts.scheme, "gemini") &&
+            parts.path.start) {
+            /* Normalize to "/" as per specification (November 2021 update). */
+            insertData_Block(&enc->chars, parts.path.start - constBegin_String(enc), "/", 1);
+        }
+    }
     set_String(&d->url, enc);
     delete_String(enc);
     d->identity = identityForUrl_GmCerts(d->certs, &d->url);
diff --git a/src/gmutil.c b/src/gmutil.c
index 9188091d..e862b18a 100644
--- a/src/gmutil.c
+++ b/src/gmutil.c
@@ -341,10 +341,6 @@ void urlEncodePath_String(iString *d) {
         return;
     }
     if (isEmpty_Range(&url.path)) {
-        if (equalCase_Rangecc(url.scheme, "gemini") && url.path.start) {            
-            /* Normalize to "/" as per specification (November 2021 update). */
-            insertData_Block(&d->chars, url.path.start - constBegin_String(d), "/", 1);
-        }        
         return;
     }
     iString *encoded = new_String();
diff --git a/src/ui/keys.c b/src/ui/keys.c
index 33f39633..26a286bc 100644
--- a/src/ui/keys.c
+++ b/src/ui/keys.c
@@ -215,6 +215,8 @@ static const struct { int id; iMenuItem bind; int flags; } defaultBindings_[] =
     { 50, { "${keys.bookmark.add}",         'd', KMOD_PRIMARY,              "bookmark.add"                      }, 0 },
     { 51, { "${keys.bookmark.addfolder}",   'n', KMOD_SHIFT,                "bookmarks.addfolder"               }, 0 },
     { 55, { "${keys.subscribe}",            subscribeToPage_KeyModifier,    "feeds.subscribe"                   }, 0 },
+    { 56, { "${keys.feeds.showall}",        SDLK_u, KMOD_SHIFT,             "feeds.mode arg:0"                  }, 0 },
+    { 57, { "${keys.feeds.showunread}",     SDLK_u, 0,                      "feeds.mode arg:1"                  }, 0 },
     { 60, { "${keys.findtext}",             'f', KMOD_PRIMARY,              "focus.set id:find.input"           }, 0 },
     { 70, { "${keys.zoom.in}",              SDLK_EQUALS, KMOD_PRIMARY,      "zoom.delta arg:10"                 }, 0 },
     { 71, { "${keys.zoom.out}",             SDLK_MINUS, KMOD_PRIMARY,       "zoom.delta arg:-10"                }, 0 },