[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master d601fd4: Merge from origin/emacs-28
|
From: |
Stefan Kangas |
|
Subject: |
master d601fd4: Merge from origin/emacs-28 |
|
Date: |
Fri, 10 Dec 2021 00:49:12 -0500 (EST) |
branch: master
commit d601fd4692e0be3c9ee9b247c8a7bc5b2499f0eb
Merge: 59db96d 7a25ba0
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>
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...
---
ChangeLog.1 | 2 +-
doc/misc/rcirc.texi | 2 +-
doc/misc/tramp.texi | 2 +-
doc/misc/url.texi | 6 +++---
leim/MISC-DIC/README | 2 +-
leim/MISC-DIC/pinyin.map | 2 +-
leim/MISC-DIC/ziranma.cin | 2 +-
lib-src/emacsclient.c | 3 +--
lisp/ChangeLog.17 | 4 ++--
lisp/gnus/ChangeLog.2 | 2 +-
lisp/gnus/ChangeLog.3 | 2 +-
lisp/image-dired.el | 2 +-
lisp/mh-e/ChangeLog.1 | 2 +-
lisp/net/newst-backend.el | 2 +-
lisp/net/newst-reader.el | 2 +-
lisp/net/newst-ticker.el | 2 +-
lisp/net/newsticker.el | 2 +-
lisp/net/quickurl.el | 2 +-
lisp/net/tramp-archive.el | 2 +-
lisp/org/org.el | 4 ++--
lisp/progmodes/flymake.el | 2 +-
21 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/ChangeLog.1 b/ChangeLog.1
index 82e0ad5..756dce3 100644
--- a/ChangeLog.1
+++ b/ChangeLog.1
@@ -2326,7 +2326,7 @@
2013-07-03 Christoph Egger <christoph@debian.org> (tiny change)
* configure.ac (emacs_broken_SIGIO): Set on gnu-kfreebsd to avoid hang.
- http://bugs.debian.org/712974
+ https://bugs.debian.org/712974
2013-07-02 Paul Eggert <eggert@cs.ucla.edu>
diff --git a/doc/misc/rcirc.texi b/doc/misc/rcirc.texi
index 58ca045..f03f614 100644
--- a/doc/misc/rcirc.texi
+++ b/doc/misc/rcirc.texi
@@ -464,7 +464,7 @@ your status as ``being back'' if you do not. People can
use the
@cindex help about irc
Typical IRC servers implement many more commands. You can read more
about the fantastic world of IRC online at
-@uref{http://www.irchelp.org/, the Internet Relay Chat (IRC) help
+@uref{https://www.irchelp.org/, the Internet Relay Chat (IRC) help
archive}.
@node Configuration
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 2a8a038..86f4d1c 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -4231,7 +4231,7 @@ It is even possible to access file archives in file
archives, as
(progn
(url-handler-mode 1)
(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";))
@end group
@end lisp
diff --git a/doc/misc/url.texi b/doc/misc/url.texi
index 8f15e11..90e38e5 100644
--- a/doc/misc/url.texi
+++ b/doc/misc/url.texi
@@ -90,7 +90,7 @@ can be accessed (usually over a network) in a specific way.
@example
ftp://ftp.is.co.za/rfc/rfc1808.txt
-http://www.ietf.org/rfc/rfc2396.txt
+https://www.ietf.org/rfc/rfc2396.txt
ldap://[2001:db8::7]/c=GB?objectClass?one
mailto:John.Doe@@example.com
news:comp.infosystems.www.servers.unix
@@ -708,7 +708,7 @@ Well-known ports are used if the URL does not specify a
port.
@cindex rcirc
The @code{irc} scheme is defined in the Internet Draft at
-@url{http://www.w3.org/Addressing/draft-mirashi-url-irc-01.txt} (which
+@url{https://www.w3.org/Addressing/draft-mirashi-url-irc-01.txt} (which
was never approved as an RFC). Such URLs have the form
@example
@@ -1181,7 +1181,7 @@ opened by the URL library.
@c machines off the local network. This is characterized by being able
@c to reach someplace with a raw ip number, but not its hostname
@c (@url{http://129.79.254.191/} works, but
-@c @url{http://www.cs.indiana.edu/} doesn't). This used to happen on
+@c @url{https://www.cs.indiana.edu/} doesn't). This used to happen on
@c SunOS4 and Ultrix, but is now probably now rare. If Emacs can't be
@c rebuilt linked against the resolver library, it can use the external
@c @command{nslookup} program instead.
diff --git a/leim/MISC-DIC/README b/leim/MISC-DIC/README
index 74ae752..f205ecd 100644
--- a/leim/MISC-DIC/README
+++ b/leim/MISC-DIC/README
@@ -20,7 +20,7 @@ license notice.
They are copies of those distributed with a free package
called CCE at:
- http://archive.debian.org/debian/pool/main/c/cce/cce_0.36.orig.tar.gz
+ https://archive.debian.org/debian/pool/main/c/cce/cce_0.36.orig.tar.gz
As the original files don't contain copyright and license notices, a
proper notice is extracted from the file Copyright and added at the
diff --git a/leim/MISC-DIC/pinyin.map b/leim/MISC-DIC/pinyin.map
index 4809769..e206564 100644
--- a/leim/MISC-DIC/pinyin.map
+++ b/leim/MISC-DIC/pinyin.map
@@ -3,7 +3,7 @@
% This file is included in the free package called CCE. It is
% available in:
%
-% http://archive.debian.org/debian/pool/main/c/cce/cce_0.36.orig.tar.gz
+% https://archive.debian.org/debian/pool/main/c/cce/cce_0.36.orig.tar.gz
%
% As the file itself doesn't contain copyright and license notices,
% the following statements of the file cce/Copyright covers it.
diff --git a/leim/MISC-DIC/ziranma.cin b/leim/MISC-DIC/ziranma.cin
index b61aea2..b276e88 100644
--- a/leim/MISC-DIC/ziranma.cin
+++ b/leim/MISC-DIC/ziranma.cin
@@ -3,7 +3,7 @@
% This file is included in the free package called CCE. It is
% available in:
%
-% http://archive.debian.org/debian/pool/main/c/cce/cce_0.36.orig.tar.gz
+% https://archive.debian.org/debian/pool/main/c/cce/cce_0.36.orig.tar.gz
%
% As the file itself doesn't contain copyright and license notices,
% the following statements of the file cce/Copyright covers it.
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 6afea6f..ea9f72d 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1469,7 +1469,6 @@ set_local_socket (char const *server_name)
else
{
/* socket_name is a file name component. */
- sock_status = ENOENT;
char const *xdg_runtime_dir = egetenv ("XDG_RUNTIME_DIR");
if (xdg_runtime_dir)
{
@@ -1479,7 +1478,7 @@ set_local_socket (char const *server_name)
? connect_socket (AT_FDCWD, sockname, s, 0)
: ENAMETOOLONG);
}
- if (sock_status == ENOENT)
+ else
{
char const *tmpdir = egetenv ("TMPDIR");
if (tmpdir)
diff --git a/lisp/ChangeLog.17 b/lisp/ChangeLog.17
index 14a6c5d..4dd3df5 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 35402df..26ecaad 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 2aba3a5..836cca8 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 22e725c..6ca0cd8 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 e87bb34..2201ce2 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 77e1480..d51f8c0 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 40e3044..b228ea9 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 8cfafb5..068b862 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 c171421..52576c9 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 7f147fa..ed7d7e5 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 b0f447a..b44a4e8 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 1a13754..df79d57 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 4f9506c..72199b3 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.