5 files changed, 30 insertions, 21 deletions

diff --git a/src/gmdocument.c b/src/gmdocument.c
index 1f8ecb75..8d2e3f1f 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -177,8 +177,9 @@ static iRangecc addLink_GmDocument_(iGmDocument *d, iRangecc line, iGmLinkId *li
             else if (startsWithCase_Rangecc(parts.scheme, "http")) {
                 link->flags |= http_GmLinkFlag;
             }
-            else if (equalCase_Rangecc(parts.scheme, "gopher")) {
-                link->flags |= gopher_GmLinkFlag;
+            else if (equalCase_Rangecc(parts.scheme, "gopher") ||
+                     equalCase_Rangecc(parts.scheme, "finger")) {
+                link->flags |= gopher_finger_GmLinkFlag;
                 if (startsWith_Rangecc(parts.path, "/7")) {
                     link->flags |= query_GmLinkFlag;
                 }
@@ -187,7 +188,6 @@ static iRangecc addLink_GmDocument_(iGmDocument *d, iRangecc line, iGmLinkId *li
                 link->flags |= file_GmLinkFlag;
             }
             else if (equalCase_Rangecc(parts.scheme, "data")) {
-                link->flags |= data_GmLinkFlag;
             }
             else if (equalCase_Rangecc(parts.scheme, "about")) {
                 link->flags |= about_GmLinkFlag;
@@ -245,7 +245,8 @@ static iBool isForcedMonospace_GmDocument_(const iGmDocument *d) {
     if (equalCase_Rangecc(scheme, "gemini")) {
         return prefs_App()->monospaceGemini;
     }
-    if (equalCase_Rangecc(scheme, "gopher")) {
+    if (equalCase_Rangecc(scheme, "gopher") ||
+        equalCase_Rangecc(scheme, "finger")) {
         return prefs_App()->monospaceGopher;
     }
     return iFalse;
@@ -1373,24 +1374,24 @@ enum iColorId linkColor_GmDocument(const iGmDocument *d, iGmLinkId linkId, enum
             if (link->flags & visited_GmLinkFlag) {
                 return link->flags & www_GmLinkFlag
                            ? tmHypertextLinkIconVisited_ColorId
-                           : link->flags & gopher_GmLinkFlag ? tmGopherLinkIconVisited_ColorId
+                           : link->flags & gopher_finger_GmLinkFlag ? tmGopherLinkIconVisited_ColorId
                                                              : tmLinkIconVisited_ColorId;
             }
             return link->flags & www_GmLinkFlag
                        ? tmHypertextLinkIcon_ColorId
-                       : link->flags & gopher_GmLinkFlag ? tmGopherLinkIcon_ColorId
+                       : link->flags & gopher_finger_GmLinkFlag ? tmGopherLinkIcon_ColorId
                                                          : tmLinkIcon_ColorId;
         }
         if (part == text_GmLinkPart) {
             return link->flags & www_GmLinkFlag
                        ? tmHypertextLinkText_ColorId
-                       : link->flags & gopher_GmLinkFlag ? tmGopherLinkText_ColorId
+                       : link->flags & gopher_finger_GmLinkFlag ? tmGopherLinkText_ColorId
                                                          : tmLinkText_ColorId;
         }
         if (part == textHover_GmLinkPart) {
             return link->flags & www_GmLinkFlag
                        ? tmHypertextLinkTextHover_ColorId
-                       : link->flags & gopher_GmLinkFlag ? tmGopherLinkTextHover_ColorId
+                       : link->flags & gopher_finger_GmLinkFlag ? tmGopherLinkTextHover_ColorId
                                                          : tmLinkTextHover_ColorId;
         }
         if (part == domain_GmLinkPart) {
@@ -1399,13 +1400,13 @@ enum iColorId linkColor_GmDocument(const iGmDocument *d, iGmLinkId linkId, enum
             }
             return link->flags & www_GmLinkFlag
                        ? tmHypertextLinkDomain_ColorId
-                       : link->flags & gopher_GmLinkFlag ? tmGopherLinkDomain_ColorId
+                       : link->flags & gopher_finger_GmLinkFlag ? tmGopherLinkDomain_ColorId
                                                          : tmLinkDomain_ColorId;
         }
         if (part == visited_GmLinkPart) {
             return link->flags & www_GmLinkFlag
                        ? tmHypertextLinkLastVisitDate_ColorId
-                       : link->flags & gopher_GmLinkFlag ? tmGopherLinkLastVisitDate_ColorId
+                       : link->flags & gopher_finger_GmLinkFlag ? tmGopherLinkLastVisitDate_ColorId
                                                          : tmLinkLastVisitDate_ColorId;
         }
     }
@@ -1416,6 +1417,7 @@ iBool isMediaLink_GmDocument(const iGmDocument *d, iGmLinkId linkId) {
     const iString *dstUrl = absoluteUrl_String(&d->url, linkUrl_GmDocument(d, linkId));
     const iRangecc scheme = urlScheme_String(dstUrl);
     if (equalCase_Rangecc(scheme, "gemini") || equalCase_Rangecc(scheme, "gopher") ||
+        equalCase_Rangecc(scheme, "finger") ||
         equalCase_Rangecc(scheme, "file") || willUseProxy_App(scheme)) {
         return (linkFlags_GmDocument(d, linkId) &
                 (imageFileExtension_GmLinkFlag | audioFileExtension_GmLinkFlag)) != 0;
diff --git a/src/gmdocument.h b/src/gmdocument.h
index b1121d85..7d962511 100644
--- a/src/gmdocument.h
+++ b/src/gmdocument.h
@@ -53,7 +53,7 @@ typedef uint16_t iGmLinkId;
 
 enum iGmLinkFlags {
     gemini_GmLinkFlag             = iBit(1),
-    gopher_GmLinkFlag             = iBit(2),
+    gopher_finger_GmLinkFlag      = iBit(2),
     http_GmLinkFlag               = iBit(3),
     file_GmLinkFlag               = iBit(4),
     data_GmLinkFlag               = iBit(5),
diff --git a/src/gmrequest.c b/src/gmrequest.c
index 5b005fbb..a1cf1a8e 100644
--- a/src/gmrequest.c
+++ b/src/gmrequest.c
@@ -434,9 +434,6 @@ static void gopherError_GmRequest_(iGmRequest *d, iSocket *socket, int error, co
 }
 
 static void beginGopherConnection_GmRequest_(iGmRequest *d, const iString *host, uint16_t port) {
-    if (port == 0) {
-        port = 70; /* default port */
-    }
     clear_Block(&d->gopher.source);
     iGmResponse *resp = d->resp;
     d->gopher.meta   = &resp->meta;
@@ -642,7 +639,11 @@ void submit_GmRequest(iGmRequest *d) {
         }
     }
     else if (equalCase_Rangecc(url.scheme, "gopher")) {
-        beginGopherConnection_GmRequest_(d, host, port);
+        beginGopherConnection_GmRequest_(d, host, port ? port : 70);
+        return;
+    }
+    else if (equalCase_Rangecc(url.scheme, "finger")) {
+        beginGopherConnection_GmRequest_(d, host, port ? port : 79);
         return;
     }
     else if (!equalCase_Rangecc(url.scheme, "gemini")) {
diff --git a/src/gopher.c b/src/gopher.c
index dfdcf672..229ff9f4 100644
--- a/src/gopher.c
+++ b/src/gopher.c
@@ -149,16 +149,21 @@ void deinit_Gopher(iGopher *d) {
 void open_Gopher(iGopher *d, const iString *url) {
     iUrl parts;
     init_Url(&parts, url);
-    /* Determine Gopher item type. */
-    d->type = '1';
     if (!isEmpty_Range(&parts.path)) {
         if (*parts.path.start == '/') {
             parts.path.start++;
         }
-        if (parts.path.start < parts.path.end) {
-            d->type = *parts.path.start;
-            parts.path.start++;
-        }
+    }
+    /* Determine Gopher item type (finger is type 0). */
+    if (equalCase_Rangecc(parts.scheme, "finger")) {
+        d->type = '0';
+    }
+    else if (parts.path.start < parts.path.end) {
+                d->type = *parts.path.start;
+                parts.path.start++;
+    }
+    else {
+      d->type = '1';
     }
     if (d->type == '7' && isEmpty_Range(&parts.query)) {
         /* Ask for the query parameters first. */
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index bc9dbc8d..da66c65d 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -2292,6 +2292,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                     const iRangecc scheme   = urlScheme_String(linkUrl);
                     const iBool    isGemini = equalCase_Rangecc(scheme, "gemini");
                     if (willUseProxy_App(scheme) || isGemini ||
+                        equalCase_Rangecc(scheme, "finger") ||
                         equalCase_Rangecc(scheme, "gopher")) {
                         /* Regular links that we can open. */
                         pushBackN_Array(