Merge branch 'dev' into work/v1.11

4 files changed, 14 insertions, 4 deletions

diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 3d2e31b2..6513fc33 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -2745,7 +2745,7 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d,
                                                                  : "media.untitled.audio");
                         iUrl parts;
                         init_Url(&parts, d->mod.url);
-                        if (!isEmpty_Range(&parts.path)) {
+                        if (!isEmpty_Range(&parts.path) && !equalCase_Rangecc(parts.scheme, "data")) {
                             linkTitle =
                                 baseName_Path(collect_String(newRange_String(parts.path))).start;
                         }
@@ -3254,9 +3254,10 @@ static void checkResponse_DocumentWidget_(iDocumentWidget *d) {
                     addChildPos_Widget(buttons, iClob(lineBreak), front_WidgetAddPos);
                 }
                 /* Menu for additional actions, past entries. */ {
+                    const iBinding *bind = findCommand_Keys("input.precedingline");
                     iMenuItem items[] = { { "${menu.input.precedingline}",
-                                            SDLK_v,
-                                            KMOD_PRIMARY | KMOD_SHIFT,
+                                            bind->key,
+                                            bind->mods,
                                             format_CStr("!valueinput.set ptr:%p text:%s",
                                                         buttons,
                                                         cstr_String(&d->linePrecedingLink)) } };
diff --git a/src/ui/keys.c b/src/ui/keys.c
index d4d9320e..33f39633 100644
--- a/src/ui/keys.c
+++ b/src/ui/keys.c
@@ -241,6 +241,7 @@ static const struct { int id; iMenuItem bind; int flags; } defaultBindings_[] =
     { 110,{ "${menu.save.downloads}",       SDLK_s, KMOD_PRIMARY,           "document.save"                     }, 0 },
     { 120,{ "${keys.upload}",               SDLK_u, KMOD_PRIMARY,           "document.upload"                   }, 0 },
     { 121,{ "${keys.upload.edit}",          SDLK_e, KMOD_PRIMARY,           "document.upload copy:1"            }, 0 },
+    { 130,{ "${keys.input.precedingline}",  SDLK_v, KMOD_PRIMARY | KMOD_SHIFT, "input.precedingline"            }, 0 },
     /* The following cannot currently be changed (built-in duplicates). */
 #if defined (iPlatformApple)
     { 1002, { NULL, SDLK_LEFTBRACKET,  KMOD_PRIMARY,             "navigate.back"        }, 0 },
diff --git a/src/ui/linkinfo.c b/src/ui/linkinfo.c
index 72d76678..46aa6663 100644
--- a/src/ui/linkinfo.c
+++ b/src/ui/linkinfo.c
@@ -100,8 +100,12 @@ void infoText_LinkInfo(const iGmDocument *doc, iGmLinkId linkId, iString *text_o
         appendRange_String(text_out, (iRangecc){ constBegin_String(url), comma });
     }
     else if (scheme != gemini_GmLinkScheme) {
+        const size_t maxDispLen = 300;
         appendCStr_String(text_out, scheme == file_GmLinkScheme ? "" : globe_Icon " ");
-        appendCStrN_String(text_out, cstr_String(url), iMin(500, size_String(url)));
+        appendCStrN_String(text_out, cstr_String(url), iMin(maxDispLen, size_String(url)));
+        if (size_String(url) > maxDispLen) {
+            appendCStr_String(text_out, "...");
+        }
     }
     else {
         appendCStr_String(text_out, "\x1b[1m");
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index da0ec22c..da377ac2 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -1392,6 +1392,10 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                 }
             }
         }
+        else if (equal_Command(cmd, "idents.changed") && d->mode == identities_SidebarMode) {
+            updateItems_SidebarWidget_(d);
+            return iTrue;
+        }
         else if (isPortraitPhone_App() && isVisible_Widget(w) && d->side == left_SidebarSide &&
                  equal_Command(cmd, "swipe.forward")) {
             postCommand_App("sidebar.toggle");