master 29684a7342: Rename new option to browse-url-default-scheme

[Stefan Kangas]

branch: master
commit 29684a734253f289e649535b2190e8d2ca956e8b
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Rename new option to browse-url-default-scheme
    
    * lisp/net/browse-url.el (browse-url-default-scheme): Rename from
    'browse-url-guess-default-scheme'.  Update caller.
    Suggested by Eli Zaretskii <eliz@gnu.org>.
---
 etc/NEWS               | 8 ++++----
 lisp/net/browse-url.el | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index 2ab1361a9e..660ea7d720 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1925,10 +1925,10 @@ related 'auth-sources' entry were wrong.
 ** Browse URL
 
 ---
-*** New user option 'browse-url-guess-default-scheme'.
-This user option affects the URL scheme that 'browse-url' and related
-functions will assume when it has to guess.  You could customize this
-to "https" to always prefer HTTPS URLs.
+*** New user option 'browse-url-default-scheme'.
+This user option decides which URL scheme that 'browse-url' and
+related functions will use by default.  For example, you could
+customize this to "https" to always prefer HTTPS URLs.
 
 ---
 *** Support for the Netscape web browser has been removed.
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 198c86f935..a55aec76bf 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -652,8 +652,8 @@ regarding its parameter treatment."
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; URL input
 
-(defcustom browse-url-guess-default-scheme "http"
-  "URL scheme to use when `browse-url' (and related commands) has to guess.
+(defcustom browse-url-default-scheme "http"
+  "URL scheme that `browse-url' (and related commands) will use by default.
 
 For example, when point is on an URL fragment like
 \"www.example.org\", `browse-url' will assume that this is an
@@ -669,7 +669,7 @@ websites are increasingly rare, but they do still exist."
   (or (thing-at-point 'url t)
       ;; assume that the user is pointing at something like gnu.org/gnu
       (let ((f (thing-at-point 'filename t)))
-        (and f (concat browse-url-guess-default-scheme "://" f)))))
+        (and f (concat browse-url-default-scheme "://" f)))))
 
 ;; Having this as a separate function called by the browser-specific
 ;; functions allows them to be stand-alone commands, making it easier