summaryrefslogtreecommitdiff
path: root/lisp/net
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/net')
-rw-r--r--lisp/net/dbus.el3
-rw-r--r--lisp/net/eww.el8
-rw-r--r--lisp/net/gnutls.el7
-rw-r--r--lisp/net/net-utils.el2
-rw-r--r--lisp/net/newst-backend.el10
-rw-r--r--lisp/net/newsticker.el2
-rw-r--r--lisp/net/nsm.el2
-rw-r--r--lisp/net/puny.el8
-rw-r--r--lisp/net/secrets.el2
-rw-r--r--lisp/net/soap-client.el4
-rw-r--r--lisp/net/tramp-compat.el8
-rw-r--r--lisp/net/tramp-sh.el4
12 files changed, 34 insertions, 26 deletions
diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index 23ba191e3cf..48712a9c3d8 100644
--- a/lisp/net/dbus.el
+++ b/lisp/net/dbus.el
@@ -165,6 +165,9 @@ See URL `https://dbus.freedesktop.org/doc/dbus-specification.html#bus-messages-b
;; </signal>
;; </interface>
+(defconst dbus-annotation-deprecated (concat dbus-interface-dbus ".Deprecated")
+ "An annotation indicating a deprecated interface, method, signal, or property.")
+
;;; Default D-Bus errors.
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 1ed87c66250..fd9fe98439d 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -450,11 +450,11 @@ killed after rendering."
;;;###autoload
(defun eww-search-words ()
- "Search the web for the text between BEG and END.
+ "Search the web for the text in the region.
If region is active (and not whitespace), search the web for
-the text between BEG and END. Else, prompt the user for a search
-string. See the `eww-search-prefix' variable for the search
-engine used."
+the text between region beginning and end. Else, prompt the
+user for a search string. See the variable `eww-search-prefix'
+for the search engine used."
(interactive)
(if (use-region-p)
(let ((region-string (buffer-substring (region-beginning) (region-end))))
diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el
index e713c94117b..8ad721964dd 100644
--- a/lisp/net/gnutls.el
+++ b/lisp/net/gnutls.el
@@ -348,8 +348,11 @@ defaults to GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT."
(t nil))))
(min-prime-bits (or min-prime-bits gnutls-min-prime-bits)))
- (when verify-hostname-error
- (push :hostname verify-error))
+ ;; Only add :hostname if `verify-error' is not t, since t
+ ;; means "include :hostname" Bug#38602.
+ (and verify-hostname-error
+ (not (eq verify-error t))
+ (push :hostname verify-error))
`(:priority ,priority-string
:hostname ,hostname
diff --git a/lisp/net/net-utils.el b/lisp/net/net-utils.el
index ef3651b0335..8c7d33a67d4 100644
--- a/lisp/net/net-utils.el
+++ b/lisp/net/net-utils.el
@@ -771,7 +771,7 @@ This command uses `smbclient-program' to connect to HOST."
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Full list is available at:
-;; http://www.iana.org/assignments/port-numbers
+;; https://www.iana.org/assignments/port-numbers
(defvar network-connection-service-alist
(list
(cons 'echo 7)
diff --git a/lisp/net/newst-backend.el b/lisp/net/newst-backend.el
index b8f1bccd788..f45abf780f7 100644
--- a/lisp/net/newst-backend.el
+++ b/lisp/net/newst-backend.el
@@ -68,9 +68,6 @@ considered to be running if the newsticker timer list is not empty."
;; Hard-coding URLs like this is a recipe for propagating obsolete info.
(defconst newsticker--raw-url-list-defaults
'(
- ;; 2017/12: no response.
-;;; ("CNET News.com"
-;;; "http://export.cnet.com/export/feeds/news/rss/1,11176,,00.xml")
("Debian Security Advisories"
"http://www.debian.org/security/dsa.en.rdf")
("Debian Security Advisories - Long format"
@@ -81,11 +78,6 @@ considered to be running if the newsticker timer list is not empty."
3600)
("LWN (Linux Weekly News)"
"https://lwn.net/headlines/rss")
- ;; Not updated since 2010.
-;;; ("NY Times: Technology"
-;;; "http://www.nytimes.com/services/xml/rss/userland/Technology.xml")
-;;; ("NY Times"
-;;; "http://www.nytimes.com/services/xml/rss/userland/HomePage.xml")
("Quote of the day"
"http://feeds.feedburner.com/quotationspage/qotd"
"07:00"
@@ -898,7 +890,7 @@ Argument BUFFER is the buffer of the retrieval process."
;; Atom 1.0 feed.
;; (and (eq 'feed (xml-node-name topnode))
- ;; (string= "http://www.w3.org/2005/Atom"
+ ;; (string= "https://www.w3.org/2005/Atom"
;; (xml-get-attribute topnode 'xmlns)))
(setq image-url (newsticker--get-logo-url-atom-1.0 topnode))
(setq icon-url (newsticker--get-icon-url-atom-1.0 topnode))
diff --git a/lisp/net/newsticker.el b/lisp/net/newsticker.el
index 6329e7660f7..535122a31fb 100644
--- a/lisp/net/newsticker.el
+++ b/lisp/net/newsticker.el
@@ -54,7 +54,7 @@
;; as well as the following Atom formats:
;; * Atom 0.3
;; * Atom 1.0
-;; (see http://www.ietf.org/internet-drafts/draft-ietf-atompub-format-11.txt)
+;; (see https://www.ietf.org/internet-drafts/draft-ietf-atompub-format-11.txt)
;; That makes Newsticker.el an "Atom aggregator, "RSS reader", "RSS
;; aggregator", and "Feed Reader".
diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el
index cc22427e6d1..2b300401650 100644
--- a/lisp/net/nsm.el
+++ b/lisp/net/nsm.el
@@ -164,7 +164,7 @@ STATUS SETTINGS. HOST is the host domain, PORT is a TCP port
number, STATUS is the peer status returned by
`gnutls-peer-status', and SETTINGS is the persistent and session
settings for the host HOST. Please refer to the contents of
-`nsm-setting-file' for details. If a problem is found, the check
+`nsm-settings-file' for details. If a problem is found, the check
function is required to return an error message, and nil
otherwise.
diff --git a/lisp/net/puny.el b/lisp/net/puny.el
index cc406076c58..5c58fe02cbf 100644
--- a/lisp/net/puny.el
+++ b/lisp/net/puny.el
@@ -23,7 +23,7 @@
;;; Commentary:
;; Written by looking at
-;; http://stackoverflow.com/questions/183485/can-anyone-recommend-a-good-free-javascript-for-punycode-to-unicode-conversion
+;; https://stackoverflow.com/questions/183485/can-anyone-recommend-a-good-free-javascript-for-punycode-to-unicode-conversion
;;; Code:
@@ -196,12 +196,12 @@ For instance \"xn--bcher-kva\" => \"bücher\"."
(cl-incf i)))
(buffer-string)))
-;; http://www.unicode.org/reports/tr39/#Restriction_Level_Detection
-;; http://www.unicode.org/reports/tr31/#Table_Candidate_Characters_for_Inclusion_in_Identifiers
+;; https://www.unicode.org/reports/tr39/#Restriction_Level_Detection
+;; https://www.unicode.org/reports/tr31/#Table_Candidate_Characters_for_Inclusion_in_Identifiers
(defun puny-highly-restrictive-string-p (string)
"Say whether STRING is \"highly restrictive\" in the Unicode IDNA sense.
-See http://www.unicode.org/reports/tr39/#Restriction_Level_Detection
+See https://www.unicode.org/reports/tr39/#Restriction_Level_Detection
for details. The main idea is that if you're mixing
scripts (like latin and cyrillic), you may confuse the user by
using homographs."
diff --git a/lisp/net/secrets.el b/lisp/net/secrets.el
index 10d061fba20..dc1b468a118 100644
--- a/lisp/net/secrets.el
+++ b/lisp/net/secrets.el
@@ -23,7 +23,7 @@
;;; Commentary:
;; This package provides an implementation of the Secret Service API
-;; <http://www.freedesktop.org/wiki/Specifications/secret-storage-spec>.
+;; <https://www.freedesktop.org/wiki/Specifications/secret-storage-spec>.
;; This API is meant to make GNOME-Keyring- and KWallet-like daemons
;; available under a common D-BUS interface and thus increase
;; interoperability between GNOME, KDE and other applications having
diff --git a/lisp/net/soap-client.el b/lisp/net/soap-client.el
index f07d214e122..241ce9efcb3 100644
--- a/lisp/net/soap-client.el
+++ b/lisp/net/soap-client.el
@@ -2078,7 +2078,7 @@ This is a specialization of `soap-decode-type' for
soap-headers ; list of (message part use)
soap-body ; message parts present in the body
use ; 'literal or 'encoded, see
- ; http://www.w3.org/TR/wsdl#_soap:body
+ ; https://www.w3.org/TR/wsdl#_soap:body
)
(cl-defstruct (soap-binding (:include soap-element))
@@ -2111,6 +2111,8 @@ This is a specialization of `soap-decode-type' for
;; Add the XSD types to the wsdl document
(let ((ns (soap-make-xs-basic-types
+ ;; The following string is a name and not an URL, so
+ ;; the "http:" should not be changed.
"http://www.w3.org/2001/XMLSchema" "xsd")))
(soap-wsdl-add-namespace ns wsdl)
(soap-wsdl-add-alias "xsd" (soap-namespace-name ns) wsdl))
diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el
index 218594b551c..c554a8d0c2d 100644
--- a/lisp/net/tramp-compat.el
+++ b/lisp/net/tramp-compat.el
@@ -45,6 +45,14 @@
(declare-function tramp-handle-temporary-file-directory "tramp")
(defvar tramp-temp-name-prefix)
+(defconst tramp-compat-emacs-compiled-version (eval-when-compile emacs-version)
+ "The Emacs version used for compilation.")
+
+(unless (= emacs-major-version
+ (car (version-to-list tramp-compat-emacs-compiled-version)))
+ (warn "Tramp has been compiled with Emacs %s, this is Emacs %s"
+ tramp-compat-emacs-compiled-version emacs-version))
+
;; For not existing functions, obsolete functions, or functions with a
;; changed argument list, there are compiler warnings. We want to
;; avoid them in cases we know what we do.
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index a51edae1482..15eab0a4de5 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -756,7 +756,7 @@ for($i = 0; $i < $n; $i++)
$stat[1]);
}
printf(\")\\n\");' \"$1\" \"$2\" 2>/dev/null"
- "Perl script implementing `directory-files-attributes' as Lisp `read'able
+ "Perl script implementing `directory-files-and-attributes' as Lisp `read'able
output.
Escape sequence %s is replaced with name of Perl binary.
This string is passed to `format', so percent characters need to be doubled.")
@@ -4408,7 +4408,7 @@ process to set up. VEC specifies the connection."
;; IRIX64 bash expands "!" even when in single quotes. This
;; destroys our shell functions, we must disable it. See
- ;; <http://stackoverflow.com/questions/3291692/irix-bash-shell-expands-expression-in-single-quotes-yet-shouldnt>.
+ ;; <https://stackoverflow.com/questions/3291692/irix-bash-shell-expands-expression-in-single-quotes-yet-shouldnt>.
(when (string-match-p "^IRIX64" uname)
(tramp-send-command vec "set +H" t))