Merge from origin/emacs-28

7a25ba0fde ; * lisp/image-dired.el: Fix typo.
dda6337066 emacsclient takes more care about XDG_RUNTIME_DIR
26fb4168b8 ; Prefer HTTPS in more URLs
6b89578524 ; * lisp/progmodes/flymake.el: Update the minimum Emacs ve...

13 files changed, 15 insertions, 15 deletions

diff --git a/lisp/ChangeLog.17 b/lisp/ChangeLog.17
index 14a6c5d06e4..4dd3df5953b 100644
--- a/lisp/ChangeLog.17
+++ b/lisp/ChangeLog.17
@@ -10766,7 +10766,7 @@
         * emacs-lisp/find-gc.el (find-gc-source-directory): Give it a value.
         (find-gc-source-files): Update some names.
         (trace-call-tree): Simplify and update.
-        Avoid predictable temp-file names.  (http://bugs.debian.org/747100)
+        Avoid predictable temp-file names.  (https://bugs.debian.org/747100)
         This is CVE-2014-3422.
 
 2014-05-08  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -17742,7 +17742,7 @@
 2013-10-13  Glenn Morris  <rgm@gnu.org>
 
         * progmodes/sh-script.el (sh-mark-line, sh-learn-buffer-indent):
-        Occur buffers are read-only.  http://bugs.debian.org/720775
+        Occur buffers are read-only.  https://bugs.debian.org/720775
 
         * emacs-lisp/authors.el (authors-fixed-entries):
         Comment out old alpha stuff.
diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2
index 35402dffd07..26ecaada5e5 100644
--- a/lisp/gnus/ChangeLog.2
+++ b/lisp/gnus/ChangeLog.2
@@ -1759,7 +1759,7 @@
 
         * pgg-gpg.el, pgg-pgp.el, pgg-pgp5.el, pgg.el: Reapply changes
         from 2003-04-03 to fix security problem.
-        See http://www.debian.org/security/2003/dsa-339.
+        See https://www.debian.org/security/2003/dsa-339.
 
 2003-07-23  Teodor Zlatanov  <tzz@lifelogs.com>
 
diff --git a/lisp/gnus/ChangeLog.3 b/lisp/gnus/ChangeLog.3
index 2aba3a5706f..836cca87ffb 100644
--- a/lisp/gnus/ChangeLog.3
+++ b/lisp/gnus/ChangeLog.3
@@ -655,7 +655,7 @@
 2014-05-08  Glenn Morris  <rgm@gnu.org>
 
         * gnus-fun.el (gnus-grab-cam-face):
-        Do not use predictable temp-file name.  (http://bugs.debian.org/747100)
+        Do not use predictable temp-file name.  (https://bugs.debian.org/747100)
         This is CVE-2014-3421.
 
 2014-05-04  Glenn Morris  <rgm@gnu.org>
diff --git a/lisp/image-dired.el b/lisp/image-dired.el
index 22e725c2168..6ca0cd8831d 100644
--- a/lisp/image-dired.el
+++ b/lisp/image-dired.el
@@ -41,7 +41,7 @@
 ;;
 ;;  I briefly tried out thumbs.el, and although it seemed more
 ;; powerful than this package, it did not work the way I wanted to.  It
-;; was too slow to created thumbnails of all files in a directory (I
+;; was too slow to create thumbnails of all files in a directory (I
 ;; currently keep all my 2000+ images in the same directory) and
 ;; browsing the thumbnail buffer was slow too.  image-dired.el will not
 ;; create thumbnails until they are needed and the browsing is done
diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1
index e87bb343cf1..2201ce22a26 100644
--- a/lisp/mh-e/ChangeLog.1
+++ b/lisp/mh-e/ChangeLog.1
@@ -10218,7 +10218,7 @@
         it can fail if the user's MH environment is not setup correctly).
         I now set the value of mh-folder-unseen-seq-name at runtime when I
         first need it.  This should fix Debian bugs
-        http://bugs.debian.org/140232 and http://bugs.debian.org/140817
+        https://bugs.debian.org/140232 and https://bugs.debian.org/140817
 
 2002-03-25  Peter S Galbraith  <psg@debian.org>
 
diff --git a/lisp/net/newst-backend.el b/lisp/net/newst-backend.el
index 77e148047ae..d51f8c0189f 100644
--- a/lisp/net/newst-backend.el
+++ b/lisp/net/newst-backend.el
@@ -4,7 +4,7 @@
 
 ;; Author:      Ulf Jasper <ulf.jasper@web.de>
 ;; Filename:    newst-backend.el
-;; URL:         http://www.nongnu.org/newsticker
+;; URL:         https://www.nongnu.org/newsticker
 ;; Keywords:    News, RSS, Atom
 ;; Package:     newsticker
 
diff --git a/lisp/net/newst-reader.el b/lisp/net/newst-reader.el
index 40e304402ad..b228ea9a60f 100644
--- a/lisp/net/newst-reader.el
+++ b/lisp/net/newst-reader.el
@@ -4,7 +4,7 @@
 
 ;; Author:      Ulf Jasper <ulf.jasper@web.de>
 ;; Filename:    newst-reader.el
-;; URL:         http://www.nongnu.org/newsticker
+;; URL:         https://www.nongnu.org/newsticker
 ;; Package:     newsticker
 
 ;; ======================================================================
diff --git a/lisp/net/newst-ticker.el b/lisp/net/newst-ticker.el
index 8cfafb5bfe4..068b862b694 100644
--- a/lisp/net/newst-ticker.el
+++ b/lisp/net/newst-ticker.el
@@ -4,7 +4,7 @@
 
 ;; Author:      Ulf Jasper <ulf.jasper@web.de>
 ;; Filename:    newst-ticker.el
-;; URL:         http://www.nongnu.org/newsticker
+;; URL:         https://www.nongnu.org/newsticker
 ;; Keywords:    News, RSS, Atom
 ;; Package:     newsticker
 
diff --git a/lisp/net/newsticker.el b/lisp/net/newsticker.el
index c1714218be9..52576c936a3 100644
--- a/lisp/net/newsticker.el
+++ b/lisp/net/newsticker.el
@@ -4,7 +4,7 @@
 
 ;; Author:      Ulf Jasper <ulf.jasper@web.de>
 ;; Filename:    newsticker.el
-;; URL:         http://www.nongnu.org/newsticker
+;; URL:         https://www.nongnu.org/newsticker
 ;; Created:     17. June 2003
 ;; Keywords:    News, RSS, Atom
 
diff --git a/lisp/net/quickurl.el b/lisp/net/quickurl.el
index 7f147fa0ded..ed7d7e53a96 100644
--- a/lisp/net/quickurl.el
+++ b/lisp/net/quickurl.el
@@ -55,7 +55,7 @@
 ;;
 ;; (("GNU"    . "https://www.gnu.org/")
 ;;  ("FSF"      "https://www.fsf.org/" "The Free Software Foundation")
-;;  ("emacs"  . "http://www.emacs.org/")
+;;  ("emacs"  . "https://www.emacs.org/")
 ;;  ("davep"    "http://www.davep.org/" "Dave's homepage"))
 ;;
 ;; In case you're wondering about the mixture of cons cells and lists,
diff --git a/lisp/net/tramp-archive.el b/lisp/net/tramp-archive.el
index b0f447a3aee..b44a4e86aad 100644
--- a/lisp/net/tramp-archive.el
+++ b/lisp/net/tramp-archive.el
@@ -104,7 +104,7 @@
 ;; It is even possible to access file archives in file archives, as
 
 ;;   (find-file
-;;    "http://ftp.debian.org/debian/pool/main/c/coreutils/coreutils_8.28-1_amd64.deb/control.tar.gz/control")
+;;    "https://ftp.debian.org/debian/pool/main/c/coreutils/coreutils_8.28-1_amd64.deb/control.tar.gz/control")
 
 ;;; Code:
 
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 1a137546192..df79d57f2c6 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -693,7 +693,7 @@ defined in org-duration.el.")
 If a description starts with <C>, the file is not part of Emacs and Org mode,
 so loading it will require that you have properly installed org-contrib
 package from NonGNU Emacs Lisp Package Archive
-http://elpa.nongnu.org/nongnu/org-contrib.html
+https://elpa.nongnu.org/nongnu/org-contrib.html
 
 You can also use this system to load external packages (i.e. neither Org
 core modules, nor org-contrib modules).  Just add symbols
@@ -773,7 +773,7 @@ For export specific modules, see also `org-export-backends'."
 If a description starts with <C>, the file is not part of Emacs and Org mode,
 so loading it will require that you have properly installed org-contrib
 package from NonGNU Emacs Lisp Package Archive
-http://elpa.nongnu.org/nongnu/org-contrib.html
+https://elpa.nongnu.org/nongnu/org-contrib.html
 
 Unlike to `org-modules', libraries in this list will not be
 loaded along with Org, but only once the export framework is
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 4f9506c98b9..72199b33a43 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -6,7 +6,7 @@
 ;; Maintainer: João Távora <joaotavora@gmail.com>
 ;; Version: 1.2.1
 ;; Keywords: c languages tools
-;; Package-Requires: ((emacs "26.1") (eldoc "1.1.0") (project "0.7.1"))
+;; Package-Requires: ((emacs "28.1") (eldoc "1.1.0") (project "0.7.1"))
 
 ;; This is a GNU ELPA :core package.  Avoid functionality that is not
 ;; compatible with the version of Emacs recorded above.