Bug fix: elpher-ipv4-only wasn't being respected.

[elpher.git] / elpher.el

diff --git a/elpher.el b/elpher.el
index e6243e5..b4e508a 100644 (file)
--- a/elpher.el
+++ b/elpher.el
@@ -20,7 +20,7 @@
 
 ;; Author: Tim Vaughan <plugd@thelambdalab.xyz>
 ;; Created: 11 April 2019
-;; Version: 3.1.0
+;; Version: 3.2.0
 ;; Keywords: comm gopher
 ;; Homepage: https://thelambdalab.xyz/elpher
 ;; Package-Requires: ((emacs "27.1"))
@@ -85,7 +85,7 @@
 ;;; Global constants
 ;;
 
-(defconst elpher-version "3.1.0"
+(defconst elpher-version "3.2.0"
   "Current version of elpher.")
 
 (defconst elpher-margin-width 6
@@ -773,7 +773,7 @@ the host operating system and the local network capabilities.)"
                                      (elpher-process-cleanup)
                                      (cond
                                         ; Try again with IPv4
-                                      ((not (or force-ipv4 socks))
+                                      ((not (or elpher-ipv4-always force-ipv4 socks))
                                        (message "Connection timed out.  Retrying with IPv4.")
                                        (elpher-get-host-response address default-port
                                                                  query-string
@@ -794,7 +794,9 @@ the host operating system and the local network capabilities.)"
                (proc (if socks (socks-open-network-stream "elpher-process" nil host service)
                        (make-network-process :name "elpher-process"
                                              :host host
-                                             :family (and force-ipv4 'ipv4)
+                                             :family (and (or force-ipv4
+                                                              elpher-ipv4-always)
+                                                          'ipv4)
                                              :service service
                                              :buffer nil
                                              :nowait t