emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master 767b3a7 2/2: Merge branch 'master' of git.sv.gnu.or


From: Vincent Belache
Subject: [Emacs-diffs] master 767b3a7 2/2: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Date: Fri, 15 Sep 2017 17:53:21 -0400 (EDT)

branch: master
commit 767b3a7429d94d1565256565fda2060c95ca4f73
Merge: d1458d0 9785d35
Author: Vincent Belaïche <address@hidden>
Commit: Vincent Belaïche <address@hidden>

    Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
---
 .dir-locals.el                                     |   2 +-
 .gitattributes                                     |   2 +-
 .gitignore                                         |   2 +-
 .gitlab-ci.yml                                     |   2 +-
 BUGS                                               |   4 +-
 CONTRIBUTE                                         |  26 +-
 GNUmakefile                                        |   2 +-
 INSTALL                                            |   8 +-
 INSTALL.REPO                                       |   2 +-
 Makefile.in                                        |   5 +-
 README                                             |   4 +-
 admin/README                                       |   2 +-
 admin/admin.el                                     |   2 +-
 admin/alloc-colors.c                               |   2 +-
 admin/authors.el                                   |   2 +-
 admin/build-configs                                |   3 +-
 admin/bzrmerge.el                                  |   2 +-
 admin/charsets/Makefile.in                         |   2 +-
 admin/charsets/big5.awk                            |   4 +-
 admin/charsets/compact.awk                         |   2 +-
 admin/charsets/cp51932.awk                         |   2 +-
 admin/charsets/cp932.awk                           |   3 +-
 admin/charsets/eucjp-ms.awk                        |   2 +-
 admin/charsets/gb180302.awk                        |   2 +-
 admin/charsets/gb180304.awk                        |   2 +-
 admin/charsets/mapconv                             |   2 +-
 admin/charsets/mapfiles/README                     |   2 +-
 admin/charsets/mule-charsets.el                    |   3 +-
 admin/cus-test.el                                  |   2 +-
 admin/diff-tar-files                               |   2 +-
 admin/find-gc.el                                   |   2 +-
 admin/gitmerge.el                                  |   2 +-
 admin/grammars/Makefile.in                         |   2 +-
 admin/grammars/c.by                                |   2 +-
 admin/grammars/grammar.wy                          |   2 +-
 admin/grammars/java-tags.wy                        |   2 +-
 admin/grammars/js.wy                               |   2 +-
 admin/grammars/make.by                             |   4 +-
 admin/grammars/python.wy                           |   2 +-
 admin/grammars/scheme.by                           |   3 +-
 admin/grammars/srecode-template.wy                 |   2 +-
 admin/last-chance.el                               |   2 +-
 admin/make-emacs                                   |   2 +-
 admin/make-tarball.txt                             |  20 +-
 admin/merge-gnulib                                 |   2 +-
 admin/merge-pkg-config                             |   2 +-
 admin/notes/bugtracker                             |  36 +--
 admin/notes/copyright                              |   4 +-
 admin/notes/elpa                                   |   2 +-
 admin/notes/font-backend                           |   2 +-
 admin/notes/hydra                                  |   2 +-
 admin/notes/multi-tty                              |   2 +-
 admin/notes/unicode                                |   2 +-
 admin/notes/www                                    |   2 +-
 admin/nt/README-UNDUMP.W32                         |   2 +-
 admin/quick-install-emacs                          |   2 +-
 admin/release-process                              |   4 +-
 admin/unidata/Makefile.in                          |   3 +-
 admin/unidata/blocks.awk                           |   4 +-
 admin/unidata/unidata-gen.el                       |   2 +-
 admin/unidata/uvs.el                               |   2 +-
 admin/update-copyright                             |   2 +-
 admin/update_autogen                               |   2 +-
 autogen.sh                                         |   4 +-
 build-aux/git-hooks/commit-msg                     |   2 +-
 build-aux/git-hooks/pre-commit                     |   2 +-
 build-aux/gitlog-to-changelog                      |   4 +-
 build-aux/gitlog-to-emacslog                       |   2 +-
 build-aux/make-info-dir                            |   2 +-
 build-aux/move-if-change                           |   6 +-
 build-aux/msys-to-w32                              |   2 +-
 build-aux/update-copyright                         |   4 +-
 build-aux/update-subdirs                           |   2 +-
 configure.ac                                       |  29 +-
 doc/emacs/Makefile.in                              |   2 +-
 doc/emacs/emacs.texi                               |  14 +-
 doc/emacs/files.texi                               |   5 +-
 doc/emacs/glossary.texi                            |   4 +-
 doc/emacs/gnu.texi                                 |   8 +-
 doc/emacs/help.texi                                |   2 +-
 doc/emacs/trouble.texi                             |  30 +-
 doc/lispintro/Makefile.in                          |   2 +-
 doc/lispintro/README                               |   2 +-
 doc/lispintro/cons-1.eps                           |   2 +-
 doc/lispintro/cons-2.eps                           |   2 +-
 doc/lispintro/cons-2a.eps                          |   2 +-
 doc/lispintro/cons-3.eps                           |   2 +-
 doc/lispintro/cons-4.eps                           |   2 +-
 doc/lispintro/cons-5.eps                           |   2 +-
 doc/lispintro/drawers.eps                          |  20 +-
 doc/lispintro/emacs-lisp-intro.texi                |  16 +-
 doc/lispintro/lambda-1.eps                         |   2 +-
 doc/lispintro/lambda-2.eps                         |   2 +-
 doc/lispintro/lambda-3.eps                         |   2 +-
 doc/lispref/Makefile.in                            |   2 +-
 doc/lispref/README                                 |   4 +-
 doc/lispref/display.texi                           |   2 +-
 doc/lispref/doclicense.texi                        |   4 +-
 doc/lispref/edebug.texi                            |   4 +-
 doc/lispref/elisp.texi                             |   2 +-
 doc/lispref/files.texi                             |  18 +-
 doc/lispref/minibuf.texi                           |   2 +-
 doc/lispref/nonascii.texi                          |   2 +-
 doc/lispref/package.texi                           |   2 +-
 doc/lispref/processes.texi                         |   2 +-
 doc/lispref/searching.texi                         |   4 +-
 doc/lispref/symbols.texi                           |   3 +-
 doc/lispref/text.texi                              |   2 +-
 doc/lispref/tips.texi                              |   6 +-
 doc/lispref/two-volume-cross-refs.txt              |   2 +-
 doc/lispref/two-volume.make                        |   2 +-
 doc/man/emacs.1.in                                 |   6 +-
 doc/misc/Makefile.in                               |   2 +-
 doc/misc/autotype.texi                             |   2 +-
 doc/misc/calc.texi                                 |   2 +-
 doc/misc/cc-mode.texi                              |   4 +-
 doc/misc/cl.texi                                   |   6 +-
 doc/misc/efaq-w32.texi                             |  22 +-
 doc/misc/efaq.texi                                 |  49 ++--
 doc/misc/emacs-gnutls.texi                         |   2 +-
 doc/misc/erc.texi                                  |   2 +-
 doc/misc/gnus-faq.texi                             |   6 +-
 doc/misc/gnus-news.el                              |   4 +-
 doc/misc/gnus-news.texi                            |   2 +-
 doc/misc/gnus.texi                                 |  12 +-
 doc/misc/message.texi                              |   2 +-
 doc/misc/mh-e.texi                                 |  38 +--
 doc/misc/org.texi                                  |   4 +-
 doc/misc/reftex.texi                               |   4 +-
 doc/misc/smtpmail.texi                             |   4 +-
 doc/misc/url.texi                                  |   4 +-
 doc/misc/woman.texi                                |   2 +-
 etc/CALC-NEWS                                      |   2 +-
 etc/CENSORSHIP                                     |   2 +-
 etc/COPYING                                        |   8 +-
 etc/DEBUG                                          |   4 +-
 etc/DISTRIB                                        |   8 +-
 etc/ERC-NEWS                                       |   6 +-
 etc/ETAGS.EBNF                                     |   2 +-
 etc/ETAGS.README                                   |   2 +-
 etc/FTP                                            |   4 +-
 etc/GNUS-NEWS                                      |   4 +-
 etc/HELLO                                          |   2 +-
 etc/HISTORY                                        |   4 +-
 etc/LINUX-GNU                                      |   2 +-
 etc/MACHINES                                       |   4 +-
 etc/MH-E-NEWS                                      |   6 +-
 etc/NEWS                                           |  36 ++-
 etc/NEWS.1-17                                      |   2 +-
 etc/NEWS.18                                        |   2 +-
 etc/NEWS.19                                        |   4 +-
 etc/NEWS.20                                        |   2 +-
 etc/NEWS.21                                        |   2 +-
 etc/NEWS.22                                        |   2 +-
 etc/NEWS.23                                        |   2 +-
 etc/NEWS.24                                        |   4 +-
 etc/NEWS.25                                        |  43 ++-
 etc/NEXTSTEP                                       |   2 +-
 etc/NXML-NEWS                                      |   2 +-
 etc/ORG-NEWS                                       |  14 +-
 etc/PROBLEMS                                       |  43 +--
 etc/TERMS                                          |   2 +-
 etc/THE-GNU-PROJECT                                |   2 +-
 etc/TODO                                           |  14 +-
 etc/WHY-FREE                                       |   2 +-
 etc/charsets/README                                |   2 +-
 etc/compilation.txt                                |   2 +-
 etc/edt-user.el                                    |   2 +-
 etc/emacs-buffer.gdb                               |   2 +-
 etc/emacs.appdata.xml                              |   4 +-
 etc/enriched.txt                                   |   2 +-
 etc/forms/forms-d2.el                              |   2 +-
 etc/gnus-tut.txt                                   |   2 +-
 etc/grep.txt                                       |   2 +-
 etc/images/checked.xpm                             |   2 +-
 etc/images/gnus/gnus.svg                           |   6 +-
 etc/images/icons/hicolor/scalable/apps/emacs.svg   |   2 +-
 etc/images/icons/hicolor/scalable/apps/emacs23.svg |   2 +-
 .../scalable/mimetypes/emacs-document23.svg        |   2 +-
 etc/images/mh-logo.xpm                             |   2 +-
 etc/images/splash.svg                              |   4 +-
 etc/images/unchecked.xpm                           |   2 +-
 etc/org/README                                     |   2 +-
 etc/ps-prin0.ps                                    |   2 +-
 etc/ps-prin1.ps                                    |   2 +-
 etc/refcards/Makefile                              |   2 +-
 etc/refcards/README                                |   6 +-
 etc/refcards/calccard.tex                          |   5 +-
 etc/refcards/cs-dired-ref.tex                      |   4 +-
 etc/refcards/cs-refcard.tex                        |   4 +-
 etc/refcards/cs-survival.tex                       |   4 +-
 etc/refcards/de-refcard.tex                        |   5 +-
 etc/refcards/dired-ref.tex                         |   7 +-
 etc/refcards/fr-dired-ref.tex                      |   4 +-
 etc/refcards/fr-refcard.tex                        |   4 +-
 etc/refcards/fr-survival.tex                       |   4 +-
 etc/refcards/gnus-logo.eps                         |   2 +-
 etc/refcards/gnus-refcard.tex                      |   2 +-
 etc/refcards/orgcard.tex                           |   4 +-
 etc/refcards/pdflayout.sty                         |   2 +-
 etc/refcards/pl-refcard.tex                        |   5 +-
 etc/refcards/pt-br-refcard.tex                     |   4 +-
 etc/refcards/refcard.tex                           |   5 +-
 etc/refcards/ru-refcard.tex                        |   4 +-
 etc/refcards/sk-dired-ref.tex                      |   4 +-
 etc/refcards/sk-refcard.tex                        |   4 +-
 etc/refcards/sk-survival.tex                       |   4 +-
 etc/refcards/survival.tex                          |   5 +-
 etc/refcards/vipcard.tex                           |   5 +-
 etc/refcards/viperCard.tex                         |   5 +-
 etc/schema/locate.rnc                              |   6 +-
 etc/schema/relaxng.rnc                             |   8 +-
 etc/schema/schemas.xml                             |   2 +-
 etc/ses-example.ses                                |   2 +-
 etc/srecode/c.srt                                  |   4 +-
 etc/srecode/cpp.srt                                |   6 +-
 etc/srecode/default.srt                            |   4 +-
 etc/srecode/doc-cpp.srt                            |   2 +-
 etc/srecode/doc-default.srt                        |   2 +-
 etc/srecode/doc-java.srt                           |   2 +-
 etc/srecode/ede-autoconf.srt                       |   2 +-
 etc/srecode/ede-make.srt                           |   2 +-
 etc/srecode/el.srt                                 |   4 +-
 etc/srecode/getset-cpp.srt                         |   3 +-
 etc/srecode/java.srt                               |   6 +-
 etc/srecode/make.srt                               |   2 +-
 etc/srecode/template.srt                           |   2 +-
 etc/srecode/test.srt                               |   4 +-
 etc/srecode/texi.srt                               |   2 +-
 etc/srecode/wisent.srt                             |   2 +-
 etc/themes/adwaita-theme.el                        |   2 +-
 etc/themes/deeper-blue-theme.el                    |   2 +-
 etc/themes/dichromacy-theme.el                     |   2 +-
 etc/themes/leuven-theme.el                         |   4 +-
 etc/themes/light-blue-theme.el                     |   2 +-
 etc/themes/manoj-dark-theme.el                     |   2 +-
 etc/themes/misterioso-theme.el                     |   2 +-
 etc/themes/tango-dark-theme.el                     |   2 +-
 etc/themes/tango-theme.el                          |   2 +-
 etc/themes/tsdh-dark-theme.el                      |   2 +-
 etc/themes/tsdh-light-theme.el                     |   2 +-
 etc/themes/wheatgrass-theme.el                     |   2 +-
 etc/themes/whiteboard-theme.el                     |   2 +-
 etc/themes/wombat-theme.el                         |   2 +-
 etc/tutorials/TUTORIAL                             |   2 +-
 etc/tutorials/TUTORIAL.bg                          |   2 +-
 etc/tutorials/TUTORIAL.cn                          |   4 +-
 etc/tutorials/TUTORIAL.he                          |   2 +-
 etc/tutorials/TUTORIAL.nl                          |   2 +-
 etc/tutorials/TUTORIAL.sl                          |   2 +-
 etc/tutorials/TUTORIAL.sv                          |   2 +-
 etc/tutorials/TUTORIAL.zh                          |   4 +-
 leim/Makefile.in                                   |   2 +-
 leim/README                                        |   2 +-
 leim/leim-ext.el                                   |   2 +-
 lib-src/Makefile.in                                |   2 +-
 lib-src/ebrowse.c                                  |   2 +-
 lib-src/emacsclient.c                              |   2 +-
 lib-src/etags.c                                    |   2 +-
 lib-src/hexl.c                                     |   2 +-
 lib-src/make-docfile.c                             |   2 +-
 lib-src/movemail.c                                 |   2 +-
 lib-src/pop.c                                      |   2 +-
 lib-src/pop.h                                      |   2 +-
 lib-src/profile.c                                  |   2 +-
 lib-src/rcs2log                                    |   2 +-
 lib-src/update-game-score.c                        |   2 +-
 lib/Makefile.in                                    |   2 +-
 lib/acl-errno-valid.c                              |   2 +-
 lib/acl-internal.c                                 |   2 +-
 lib/acl-internal.h                                 |   2 +-
 lib/acl.h                                          |   2 +-
 lib/acl_entries.c                                  |   2 +-
 lib/alloca.in.h                                    |   2 +-
 lib/allocator.h                                    |   2 +-
 lib/arg-nonnull.h                                  |   2 +-
 lib/at-func.c                                      |   2 +-
 lib/binary-io.c                                    |   2 +-
 lib/binary-io.h                                    |   2 +-
 lib/byteswap.in.h                                  |   2 +-
 lib/c++defs.h                                      |   6 +-
 lib/c-ctype.h                                      |   2 +-
 lib/c-strcase.h                                    |   2 +-
 lib/c-strcasecmp.c                                 |   2 +-
 lib/c-strncasecmp.c                                |   2 +-
 lib/careadlinkat.c                                 |   2 +-
 lib/careadlinkat.h                                 |   2 +-
 lib/cloexec.c                                      |   2 +-
 lib/cloexec.h                                      |   2 +-
 lib/close-stream.c                                 |   2 +-
 lib/count-leading-zeros.h                          |   2 +-
 lib/count-one-bits.h                               |   2 +-
 lib/count-trailing-zeros.h                         |   2 +-
 lib/diffseq.h                                      |   2 +-
 lib/dirent.in.h                                    |   2 +-
 lib/dirfd.c                                        |   2 +-
 lib/dosname.h                                      |   2 +-
 lib/dtotimespec.c                                  |   2 +-
 lib/dup2.c                                         |   2 +-
 lib/errno.in.h                                     |   2 +-
 lib/euidaccess.c                                   |   2 +-
 lib/execinfo.in.h                                  |   2 +-
 lib/explicit_bzero.c                               |   2 +-
 lib/faccessat.c                                    |   2 +-
 lib/fcntl.c                                        |   2 +-
 lib/fcntl.in.h                                     |   2 +-
 lib/fdatasync.c                                    |   2 +-
 lib/fdopendir.c                                    |   2 +-
 lib/filemode.c                                     |   2 +-
 lib/filemode.h                                     |   2 +-
 lib/filevercmp.c                                   |   2 +-
 lib/filevercmp.h                                   |   2 +-
 lib/flexmember.h                                   |   2 +-
 lib/fpending.c                                     |   2 +-
 lib/fpending.h                                     |   2 +-
 lib/fstatat.c                                      |   2 +-
 lib/fsync.c                                        |   2 +-
 lib/ftoastr.c                                      |   2 +-
 lib/ftoastr.h                                      |   2 +-
 lib/get-permissions.c                              |   2 +-
 lib/getdtablesize.c                                |   2 +-
 lib/getgroups.c                                    |   2 +-
 lib/getloadavg.c                                   |   2 +-
 lib/getopt-cdefs.in.h                              |   2 +-
 lib/getopt-core.h                                  |   2 +-
 lib/getopt-ext.h                                   |   2 +-
 lib/getopt-pfx-core.h                              |   2 +-
 lib/getopt-pfx-ext.h                               |   2 +-
 lib/getopt.c                                       |   2 +-
 lib/getopt.in.h                                    |   2 +-
 lib/getopt1.c                                      |   2 +-
 lib/getopt_.h                                      | 285 -------------------
 lib/getopt_int.h                                   |   2 +-
 lib/gettext.h                                      |   2 +-
 lib/gettime.c                                      |   2 +-
 lib/gettimeofday.c                                 |   2 +-
 lib/gnulib.mk.in                                   |   2 +-
 lib/group-member.c                                 |   2 +-
 lib/ignore-value.h                                 |   2 +-
 lib/intprops.h                                     |   2 +-
 lib/inttypes.in.h                                  |   2 +-
 lib/limits.in.h                                    |   2 +-
 lib/localtime-buffer.c                             |   2 +-
 lib/localtime-buffer.h                             |   2 +-
 lib/lstat.c                                        |   2 +-
 lib/md5.c                                          |   2 +-
 lib/md5.h                                          |   2 +-
 lib/memrchr.c                                      |   2 +-
 lib/minmax.h                                       |   2 +-
 lib/mkostemp.c                                     |   2 +-
 lib/mktime-internal.h                              |   2 +-
 lib/mktime.c                                       |   2 +-
 lib/nstrftime.c                                    |   2 +-
 lib/open.c                                         |   2 +-
 lib/openat-priv.h                                  |   2 +-
 lib/openat-proc.c                                  |   2 +-
 lib/openat.h                                       |   2 +-
 lib/pipe2.c                                        |   2 +-
 lib/pselect.c                                      |   2 +-
 lib/pthread_sigmask.c                              |   2 +-
 lib/putenv.c                                       |   2 +-
 lib/qcopy-acl.c                                    |   2 +-
 lib/readlink.c                                     |   2 +-
 lib/readlinkat.c                                   |   2 +-
 lib/root-uid.h                                     |   2 +-
 lib/save-cwd.c                                     |   2 +-
 lib/save-cwd.h                                     |   2 +-
 lib/set-permissions.c                              |   2 +-
 lib/sha1.c                                         |   2 +-
 lib/sha1.h                                         |   2 +-
 lib/sha256.c                                       |   2 +-
 lib/sha256.h                                       |   2 +-
 lib/sha512.c                                       |   2 +-
 lib/sha512.h                                       |   2 +-
 lib/sig2str.c                                      |   2 +-
 lib/sig2str.h                                      |   2 +-
 lib/signal.in.h                                    |   2 +-
 lib/stat-time.h                                    |   2 +-
 lib/stdalign.in.h                                  |   4 +-
 lib/stddef.in.h                                    |   2 +-
 lib/stdint.in.h                                    |   2 +-
 lib/stdio-impl.h                                   |   2 +-
 lib/stdio.in.h                                     |   2 +-
 lib/stdlib.in.h                                    |   2 +-
 lib/stpcpy.c                                       |   2 +-
 lib/strftime.h                                     |   2 +-
 lib/string.in.h                                    |   2 +-
 lib/strtoimax.c                                    |   2 +-
 lib/strtol.c                                       |   2 +-
 lib/strtoll.c                                      |   2 +-
 lib/symlink.c                                      |   2 +-
 lib/sys_select.in.h                                |   2 +-
 lib/sys_stat.in.h                                  |   2 +-
 lib/sys_time.in.h                                  |   2 +-
 lib/sys_types.in.h                                 |   2 +-
 lib/tempname.c                                     |   2 +-
 lib/tempname.h                                     |   2 +-
 lib/time-internal.h                                |   2 +-
 lib/time.in.h                                      |   2 +-
 lib/time_r.c                                       |   2 +-
 lib/time_rz.c                                      |   2 +-
 lib/timegm.c                                       |   2 +-
 lib/timespec-add.c                                 |   2 +-
 lib/timespec-sub.c                                 |   2 +-
 lib/timespec.h                                     |   2 +-
 lib/u64.h                                          |   2 +-
 lib/unistd.in.h                                    |   2 +-
 lib/unlocked-io.h                                  |   2 +-
 lib/utimens.c                                      |   2 +-
 lib/utimens.h                                      |   2 +-
 lib/verify.h                                       |   2 +-
 lib/vla.h                                          |   2 +-
 lib/warn-on-use.h                                  |   2 +-
 lib/xalloc-oversized.h                             |   2 +-
 lisp/Makefile.in                                   |   4 +-
 lisp/abbrev.el                                     |   2 +-
 lisp/align.el                                      |   2 +-
 lisp/allout-widgets.el                             |   2 +-
 lisp/allout.el                                     |   2 +-
 lisp/ansi-color.el                                 |   2 +-
 lisp/apropos.el                                    |   2 +-
 lisp/arc-mode.el                                   |   2 +-
 lisp/array.el                                      |   2 +-
 lisp/auth-source-pass.el                           |   2 +-
 lisp/auth-source.el                                |   2 +-
 lisp/autoarg.el                                    |   2 +-
 lisp/autoinsert.el                                 |   8 +-
 lisp/autorevert.el                                 |   2 +-
 lisp/avoid.el                                      |   2 +-
 lisp/battery.el                                    |   2 +-
 lisp/bindings.el                                   |   2 +-
 lisp/bookmark.el                                   |   2 +-
 lisp/bs.el                                         |   2 +-
 lisp/buff-menu.el                                  |   2 +-
 lisp/button.el                                     |   2 +-
 lisp/calc/calc-aent.el                             |   2 +-
 lisp/calc/calc-alg.el                              |   4 +-
 lisp/calc/calc-arith.el                            |  20 +-
 lisp/calc/calc-bin.el                              |  10 +-
 lisp/calc/calc-comb.el                             |   2 +-
 lisp/calc/calc-cplx.el                             |   2 +-
 lisp/calc/calc-embed.el                            |   2 +-
 lisp/calc/calc-ext.el                              |   2 +-
 lisp/calc/calc-fin.el                              |   2 +-
 lisp/calc/calc-forms.el                            |   2 +-
 lisp/calc/calc-frac.el                             |   8 +-
 lisp/calc/calc-funcs.el                            |  50 ++--
 lisp/calc/calc-graph.el                            |   2 +-
 lisp/calc/calc-help.el                             |   2 +-
 lisp/calc/calc-incom.el                            |   2 +-
 lisp/calc/calc-keypd.el                            |   2 +-
 lisp/calc/calc-lang.el                             |   2 +-
 lisp/calc/calc-macs.el                             |   2 +-
 lisp/calc/calc-map.el                              |  10 +-
 lisp/calc/calc-math.el                             |  40 +--
 lisp/calc/calc-menu.el                             |   2 +-
 lisp/calc/calc-misc.el                             |   2 +-
 lisp/calc/calc-mode.el                             |   2 +-
 lisp/calc/calc-mtx.el                              |   2 +-
 lisp/calc/calc-nlfit.el                            |   2 +-
 lisp/calc/calc-poly.el                             |   2 +-
 lisp/calc/calc-prog.el                             |   2 +-
 lisp/calc/calc-rewr.el                             |  54 ++--
 lisp/calc/calc-rules.el                            |   2 +-
 lisp/calc/calc-sel.el                              |   8 +-
 lisp/calc/calc-stat.el                             |   2 +-
 lisp/calc/calc-store.el                            |   2 +-
 lisp/calc/calc-stuff.el                            |   2 +-
 lisp/calc/calc-trail.el                            |   2 +-
 lisp/calc/calc-undo.el                             |   4 +-
 lisp/calc/calc-units.el                            |   2 +-
 lisp/calc/calc-vec.el                              |   2 +-
 lisp/calc/calc-yank.el                             |   2 +-
 lisp/calc/calc.el                                  |   2 +-
 lisp/calc/calcalg2.el                              |   2 +-
 lisp/calc/calcalg3.el                              |  74 ++---
 lisp/calc/calccomp.el                              |   2 +-
 lisp/calc/calcsel2.el                              |   2 +-
 lisp/calculator.el                                 |   2 +-
 lisp/calendar/appt.el                              |   2 +-
 lisp/calendar/cal-bahai.el                         |   2 +-
 lisp/calendar/cal-china.el                         |   2 +-
 lisp/calendar/cal-coptic.el                        |   2 +-
 lisp/calendar/cal-dst.el                           |   6 +-
 lisp/calendar/cal-french.el                        |   2 +-
 lisp/calendar/cal-hebrew.el                        |   2 +-
 lisp/calendar/cal-html.el                          |   2 +-
 lisp/calendar/cal-islam.el                         |   2 +-
 lisp/calendar/cal-iso.el                           |   2 +-
 lisp/calendar/cal-julian.el                        |   2 +-
 lisp/calendar/cal-mayan.el                         |   2 +-
 lisp/calendar/cal-menu.el                          |   2 +-
 lisp/calendar/cal-move.el                          |   2 +-
 lisp/calendar/cal-persia.el                        |   2 +-
 lisp/calendar/cal-tex.el                           |   2 +-
 lisp/calendar/cal-x.el                             |   2 +-
 lisp/calendar/calendar.el                          |   2 +-
 lisp/calendar/diary-lib.el                         |   2 +-
 lisp/calendar/holidays.el                          |   2 +-
 lisp/calendar/icalendar.el                         |   2 +-
 lisp/calendar/lunar.el                             |   2 +-
 lisp/calendar/parse-time.el                        |   2 +-
 lisp/calendar/solar.el                             |   2 +-
 lisp/calendar/time-date.el                         |   2 +-
 lisp/calendar/timeclock.el                         |   2 +-
 lisp/calendar/todo-mode.el                         |   2 +-
 lisp/case-table.el                                 |   2 +-
 lisp/cdl.el                                        |   2 +-
 lisp/cedet/cedet-cscope.el                         |   2 +-
 lisp/cedet/cedet-files.el                          |   2 +-
 lisp/cedet/cedet-global.el                         |   2 +-
 lisp/cedet/cedet-idutils.el                        |   2 +-
 lisp/cedet/cedet.el                                |   2 +-
 lisp/cedet/data-debug.el                           |   2 +-
 lisp/cedet/ede.el                                  |   2 +-
 lisp/cedet/ede/auto.el                             |   2 +-
 lisp/cedet/ede/autoconf-edit.el                    |   2 +-
 lisp/cedet/ede/base.el                             |   2 +-
 lisp/cedet/ede/config.el                           |   2 +-
 lisp/cedet/ede/cpp-root.el                         |   2 +-
 lisp/cedet/ede/custom.el                           |   2 +-
 lisp/cedet/ede/detect.el                           |   2 +-
 lisp/cedet/ede/dired.el                            |   2 +-
 lisp/cedet/ede/emacs.el                            |   2 +-
 lisp/cedet/ede/files.el                            |   2 +-
 lisp/cedet/ede/generic.el                          |   2 +-
 lisp/cedet/ede/linux.el                            |   2 +-
 lisp/cedet/ede/locate.el                           |   2 +-
 lisp/cedet/ede/make.el                             |   2 +-
 lisp/cedet/ede/makefile-edit.el                    |   2 +-
 lisp/cedet/ede/pconf.el                            |   2 +-
 lisp/cedet/ede/pmake.el                            |   2 +-
 lisp/cedet/ede/proj-archive.el                     |   2 +-
 lisp/cedet/ede/proj-aux.el                         |   2 +-
 lisp/cedet/ede/proj-comp.el                        |   2 +-
 lisp/cedet/ede/proj-elisp.el                       |   2 +-
 lisp/cedet/ede/proj-info.el                        |   2 +-
 lisp/cedet/ede/proj-misc.el                        |   2 +-
 lisp/cedet/ede/proj-obj.el                         |   2 +-
 lisp/cedet/ede/proj-prog.el                        |   2 +-
 lisp/cedet/ede/proj-scheme.el                      |   2 +-
 lisp/cedet/ede/proj-shared.el                      |   2 +-
 lisp/cedet/ede/proj.el                             |   2 +-
 lisp/cedet/ede/project-am.el                       |   2 +-
 lisp/cedet/ede/shell.el                            |   2 +-
 lisp/cedet/ede/simple.el                           |   2 +-
 lisp/cedet/ede/source.el                           |   2 +-
 lisp/cedet/ede/speedbar.el                         |   2 +-
 lisp/cedet/ede/srecode.el                          |   2 +-
 lisp/cedet/ede/system.el                           |   2 +-
 lisp/cedet/ede/util.el                             |   2 +-
 lisp/cedet/inversion.el                            |   2 +-
 lisp/cedet/mode-local.el                           |   2 +-
 lisp/cedet/pulse.el                                |   2 +-
 lisp/cedet/semantic.el                             |   2 +-
 lisp/cedet/semantic/analyze.el                     |   2 +-
 lisp/cedet/semantic/analyze/complete.el            |   2 +-
 lisp/cedet/semantic/analyze/debug.el               |   2 +-
 lisp/cedet/semantic/analyze/fcn.el                 |   2 +-
 lisp/cedet/semantic/analyze/refs.el                |   2 +-
 lisp/cedet/semantic/bovine.el                      |   2 +-
 lisp/cedet/semantic/bovine/c.el                    |   2 +-
 lisp/cedet/semantic/bovine/debug.el                |   2 +-
 lisp/cedet/semantic/bovine/el.el                   |   2 +-
 lisp/cedet/semantic/bovine/gcc.el                  |   2 +-
 lisp/cedet/semantic/bovine/grammar.el              |   4 +-
 lisp/cedet/semantic/bovine/make.el                 |   2 +-
 lisp/cedet/semantic/bovine/scm.el                  |   2 +-
 lisp/cedet/semantic/chart.el                       |   2 +-
 lisp/cedet/semantic/complete.el                    |   2 +-
 lisp/cedet/semantic/ctxt.el                        |   2 +-
 lisp/cedet/semantic/db-debug.el                    |   2 +-
 lisp/cedet/semantic/db-ebrowse.el                  |   2 +-
 lisp/cedet/semantic/db-el.el                       |   2 +-
 lisp/cedet/semantic/db-file.el                     |   2 +-
 lisp/cedet/semantic/db-find.el                     |   2 +-
 lisp/cedet/semantic/db-global.el                   |   2 +-
 lisp/cedet/semantic/db-javascript.el               |   2 +-
 lisp/cedet/semantic/db-mode.el                     |   2 +-
 lisp/cedet/semantic/db-ref.el                      |   2 +-
 lisp/cedet/semantic/db-typecache.el                |   2 +-
 lisp/cedet/semantic/db.el                          |   2 +-
 lisp/cedet/semantic/debug.el                       |   2 +-
 lisp/cedet/semantic/decorate.el                    |   2 +-
 lisp/cedet/semantic/decorate/include.el            |   2 +-
 lisp/cedet/semantic/decorate/mode.el               |   2 +-
 lisp/cedet/semantic/dep.el                         |   2 +-
 lisp/cedet/semantic/doc.el                         |   2 +-
 lisp/cedet/semantic/ede-grammar.el                 |   2 +-
 lisp/cedet/semantic/edit.el                        |   2 +-
 lisp/cedet/semantic/find.el                        |   2 +-
 lisp/cedet/semantic/format.el                      |   2 +-
 lisp/cedet/semantic/fw.el                          |   2 +-
 lisp/cedet/semantic/grammar-wy.el                  |   2 +-
 lisp/cedet/semantic/grammar.el                     |   4 +-
 lisp/cedet/semantic/html.el                        |   2 +-
 lisp/cedet/semantic/ia-sb.el                       |   2 +-
 lisp/cedet/semantic/ia.el                          |   4 +-
 lisp/cedet/semantic/idle.el                        |   2 +-
 lisp/cedet/semantic/imenu.el                       |   2 +-
 lisp/cedet/semantic/java.el                        |   2 +-
 lisp/cedet/semantic/lex-spp.el                     |   2 +-
 lisp/cedet/semantic/lex.el                         |   2 +-
 lisp/cedet/semantic/mru-bookmark.el                |   2 +-
 lisp/cedet/semantic/sb.el                          |   2 +-
 lisp/cedet/semantic/scope.el                       |   2 +-
 lisp/cedet/semantic/senator.el                     |   2 +-
 lisp/cedet/semantic/sort.el                        |   2 +-
 lisp/cedet/semantic/symref.el                      |   2 +-
 lisp/cedet/semantic/symref/cscope.el               |   2 +-
 lisp/cedet/semantic/symref/filter.el               |   2 +-
 lisp/cedet/semantic/symref/global.el               |   2 +-
 lisp/cedet/semantic/symref/grep.el                 |   2 +-
 lisp/cedet/semantic/symref/idutils.el              |   2 +-
 lisp/cedet/semantic/symref/list.el                 |   2 +-
 lisp/cedet/semantic/tag-file.el                    |   2 +-
 lisp/cedet/semantic/tag-ls.el                      |   2 +-
 lisp/cedet/semantic/tag-write.el                   |   2 +-
 lisp/cedet/semantic/tag.el                         |   2 +-
 lisp/cedet/semantic/texi.el                        |   2 +-
 lisp/cedet/semantic/util-modes.el                  |   2 +-
 lisp/cedet/semantic/util.el                        |   2 +-
 lisp/cedet/semantic/wisent.el                      |   2 +-
 lisp/cedet/semantic/wisent/comp.el                 |   2 +-
 lisp/cedet/semantic/wisent/grammar.el              |   4 +-
 lisp/cedet/semantic/wisent/java-tags.el            |   4 +-
 lisp/cedet/semantic/wisent/javascript.el           |   2 +-
 lisp/cedet/semantic/wisent/python.el               |   2 +-
 lisp/cedet/semantic/wisent/wisent.el               |   2 +-
 lisp/cedet/srecode.el                              |   2 +-
 lisp/cedet/srecode/args.el                         |   2 +-
 lisp/cedet/srecode/compile.el                      |   2 +-
 lisp/cedet/srecode/cpp.el                          |   2 +-
 lisp/cedet/srecode/ctxt.el                         |   2 +-
 lisp/cedet/srecode/dictionary.el                   |   2 +-
 lisp/cedet/srecode/document.el                     |   2 +-
 lisp/cedet/srecode/el.el                           |   2 +-
 lisp/cedet/srecode/expandproto.el                  |   2 +-
 lisp/cedet/srecode/extract.el                      |   2 +-
 lisp/cedet/srecode/fields.el                       |   2 +-
 lisp/cedet/srecode/filters.el                      |   3 +-
 lisp/cedet/srecode/find.el                         |   2 +-
 lisp/cedet/srecode/getset.el                       |   2 +-
 lisp/cedet/srecode/insert.el                       |   2 +-
 lisp/cedet/srecode/java.el                         |   2 +-
 lisp/cedet/srecode/map.el                          |   2 +-
 lisp/cedet/srecode/mode.el                         |   2 +-
 lisp/cedet/srecode/semantic.el                     |   2 +-
 lisp/cedet/srecode/srt-mode.el                     |   2 +-
 lisp/cedet/srecode/srt.el                          |   2 +-
 lisp/cedet/srecode/table.el                        |   3 +-
 lisp/cedet/srecode/template.el                     |   2 +-
 lisp/cedet/srecode/texi.el                         |   2 +-
 lisp/char-fold.el                                  |   2 +-
 lisp/chistory.el                                   |   2 +-
 lisp/cmuscheme.el                                  |   2 +-
 lisp/color.el                                      |  44 ++-
 lisp/comint.el                                     |   2 +-
 lisp/completion.el                                 |   2 +-
 lisp/composite.el                                  |   2 +-
 lisp/cus-dep.el                                    |   2 +-
 lisp/cus-edit.el                                   |   2 +-
 lisp/cus-face.el                                   |   2 +-
 lisp/cus-start.el                                  |   2 +-
 lisp/cus-theme.el                                  |   2 +-
 lisp/custom.el                                     |   2 +-
 lisp/dabbrev.el                                    |   2 +-
 lisp/delim-col.el                                  |   2 +-
 lisp/delsel.el                                     |   2 +-
 lisp/descr-text.el                                 |   2 +-
 lisp/desktop.el                                    |   2 +-
 lisp/dframe.el                                     |   2 +-
 lisp/dired-aux.el                                  |   2 +-
 lisp/dired-x.el                                    |   2 +-
 lisp/dired.el                                      |   2 +-
 lisp/dirtrack.el                                   |   2 +-
 lisp/disp-table.el                                 |   2 +-
 lisp/display-line-numbers.el                       |   2 +-
 lisp/dnd.el                                        |   2 +-
 lisp/doc-view.el                                   |   2 +-
 lisp/dom.el                                        |   4 +-
 lisp/double.el                                     |   2 +-
 lisp/dynamic-setting.el                            |   3 +-
 lisp/ebuff-menu.el                                 |   2 +-
 lisp/echistory.el                                  |   2 +-
 lisp/ecomplete.el                                  |   2 +-
 lisp/edmacro.el                                    |   2 +-
 lisp/ehelp.el                                      |   2 +-
 lisp/elec-pair.el                                  |   2 +-
 lisp/electric.el                                   |   2 +-
 lisp/elide-head.el                                 |   2 +-
 lisp/emacs-lisp/advice.el                          |   2 +-
 lisp/emacs-lisp/autoload.el                        |   6 +-
 lisp/emacs-lisp/avl-tree.el                        |   2 +-
 lisp/emacs-lisp/backquote.el                       |   2 +-
 lisp/emacs-lisp/benchmark.el                       |   2 +-
 lisp/emacs-lisp/bindat.el                          |   2 +-
 lisp/emacs-lisp/byte-opt.el                        |   2 +-
 lisp/emacs-lisp/byte-run.el                        |   2 +-
 lisp/emacs-lisp/bytecomp.el                        |   2 +-
 lisp/emacs-lisp/cconv.el                           |   2 +-
 lisp/emacs-lisp/chart.el                           |   2 +-
 lisp/emacs-lisp/check-declare.el                   |   2 +-
 lisp/emacs-lisp/checkdoc.el                        |   2 +-
 lisp/emacs-lisp/cl-extra.el                        |   2 +-
 lisp/emacs-lisp/cl-generic.el                      |   2 +-
 lisp/emacs-lisp/cl-indent.el                       |   2 +-
 lisp/emacs-lisp/cl-lib.el                          |   2 +-
 lisp/emacs-lisp/cl-macs.el                         |  13 +-
 lisp/emacs-lisp/cl-preloaded.el                    |   2 +-
 lisp/emacs-lisp/cl-print.el                        |   2 +-
 lisp/emacs-lisp/cl-seq.el                          |   2 +-
 lisp/emacs-lisp/cl.el                              |   2 +-
 lisp/emacs-lisp/copyright.el                       |   2 +-
 lisp/emacs-lisp/crm.el                             |   2 +-
 lisp/emacs-lisp/cursor-sensor.el                   |   2 +-
 lisp/emacs-lisp/debug.el                           |   2 +-
 lisp/emacs-lisp/derived.el                         |   2 +-
 lisp/emacs-lisp/disass.el                          |   2 +-
 lisp/emacs-lisp/easy-mmode.el                      |   2 +-
 lisp/emacs-lisp/easymenu.el                        |   2 +-
 lisp/emacs-lisp/edebug.el                          |   2 +-
 lisp/emacs-lisp/eieio-base.el                      |   2 +-
 lisp/emacs-lisp/eieio-compat.el                    |   2 +-
 lisp/emacs-lisp/eieio-core.el                      |   2 +-
 lisp/emacs-lisp/eieio-custom.el                    |   2 +-
 lisp/emacs-lisp/eieio-datadebug.el                 |   2 +-
 lisp/emacs-lisp/eieio-opt.el                       |   2 +-
 lisp/emacs-lisp/eieio-speedbar.el                  |   2 +-
 lisp/emacs-lisp/eieio.el                           |   2 +-
 lisp/emacs-lisp/eldoc.el                           |   4 +-
 lisp/emacs-lisp/elint.el                           |   2 +-
 lisp/emacs-lisp/elp.el                             |   2 +-
 lisp/emacs-lisp/ert-x.el                           |   2 +-
 lisp/emacs-lisp/ert.el                             |   4 +-
 lisp/emacs-lisp/ewoc.el                            |   2 +-
 lisp/emacs-lisp/find-func.el                       |   2 +-
 lisp/emacs-lisp/float-sup.el                       |   2 +-
 lisp/emacs-lisp/generator.el                       |   2 +-
 lisp/emacs-lisp/generic.el                         |   2 +-
 lisp/emacs-lisp/gv.el                              |   2 +-
 lisp/emacs-lisp/helper.el                          |   2 +-
 lisp/emacs-lisp/inline.el                          |   2 +-
 lisp/emacs-lisp/let-alist.el                       |   2 +-
 lisp/emacs-lisp/lisp-mnt.el                        |   2 +-
 lisp/emacs-lisp/lisp-mode.el                       |   2 +-
 lisp/emacs-lisp/lisp.el                            |   2 +-
 lisp/emacs-lisp/macroexp.el                        |   2 +-
 lisp/emacs-lisp/map-ynp.el                         |   2 +-
 lisp/emacs-lisp/map.el                             |   2 +-
 lisp/emacs-lisp/nadvice.el                         |   2 +-
 lisp/emacs-lisp/package-x.el                       |   2 +-
 lisp/emacs-lisp/package.el                         |  28 +-
 lisp/emacs-lisp/pcase.el                           |   2 +-
 lisp/emacs-lisp/pp.el                              |   2 +-
 lisp/emacs-lisp/radix-tree.el                      |   2 +-
 lisp/emacs-lisp/re-builder.el                      |   2 +-
 lisp/emacs-lisp/regexp-opt.el                      |   2 +-
 lisp/emacs-lisp/regi.el                            |   2 +-
 lisp/emacs-lisp/ring.el                            |   2 +-
 lisp/emacs-lisp/rx.el                              |   2 +-
 lisp/emacs-lisp/seq.el                             |   2 +-
 lisp/emacs-lisp/shadow.el                          |   2 +-
 lisp/emacs-lisp/smie.el                            |   2 +-
 lisp/emacs-lisp/subr-x.el                          | 107 ++++---
 lisp/emacs-lisp/syntax.el                          |   2 +-
 lisp/emacs-lisp/tabulated-list.el                  |   2 +-
 lisp/emacs-lisp/tcover-ses.el                      |   2 +-
 lisp/emacs-lisp/tcover-unsafep.el                  |   2 +-
 lisp/emacs-lisp/testcover.el                       |   2 +-
 lisp/emacs-lisp/thunk.el                           |   2 +-
 lisp/emacs-lisp/timer-list.el                      |   4 +-
 lisp/emacs-lisp/timer.el                           |   2 +-
 lisp/emacs-lisp/tq.el                              |   2 +-
 lisp/emacs-lisp/trace.el                           |   2 +-
 lisp/emacs-lisp/unsafep.el                         |   2 +-
 lisp/emacs-lisp/warnings.el                        |   2 +-
 lisp/emacs-lock.el                                 |   2 +-
 lisp/emulation/cua-base.el                         |   2 +-
 lisp/emulation/cua-gmrk.el                         |   2 +-
 lisp/emulation/cua-rect.el                         |   2 +-
 lisp/emulation/edt-lk201.el                        |   2 +-
 lisp/emulation/edt-mapper.el                       |   2 +-
 lisp/emulation/edt-pc.el                           |   2 +-
 lisp/emulation/edt-vt100.el                        |   2 +-
 lisp/emulation/edt.el                              |   2 +-
 lisp/emulation/keypad.el                           |   2 +-
 lisp/emulation/viper-cmd.el                        |   2 +-
 lisp/emulation/viper-ex.el                         |   2 +-
 lisp/emulation/viper-init.el                       |   2 +-
 lisp/emulation/viper-keym.el                       |   2 +-
 lisp/emulation/viper-macs.el                       |   2 +-
 lisp/emulation/viper-mous.el                       |   2 +-
 lisp/emulation/viper-util.el                       |   2 +-
 lisp/emulation/viper.el                            |   2 +-
 lisp/env.el                                        |   2 +-
 lisp/epa-dired.el                                  |   2 +-
 lisp/epa-file.el                                   |   2 +-
 lisp/epa-hook.el                                   |   2 +-
 lisp/epa-mail.el                                   |   2 +-
 lisp/epa.el                                        |   2 +-
 lisp/epg-config.el                                 |   2 +-
 lisp/epg.el                                        |   2 +-
 lisp/erc/erc-autoaway.el                           |   2 +-
 lisp/erc/erc-backend.el                            |   2 +-
 lisp/erc/erc-button.el                             |   2 +-
 lisp/erc/erc-capab.el                              |   2 +-
 lisp/erc/erc-compat.el                             |   2 +-
 lisp/erc/erc-dcc.el                                |   2 +-
 lisp/erc/erc-desktop-notifications.el              |   2 +-
 lisp/erc/erc-ezbounce.el                           |   2 +-
 lisp/erc/erc-fill.el                               |   2 +-
 lisp/erc/erc-goodies.el                            |   2 +-
 lisp/erc/erc-ibuffer.el                            |   3 +-
 lisp/erc/erc-identd.el                             |   3 +-
 lisp/erc/erc-imenu.el                              |   3 +-
 lisp/erc/erc-join.el                               |   3 +-
 lisp/erc/erc-lang.el                               |   4 +-
 lisp/erc/erc-list.el                               |   3 +-
 lisp/erc/erc-log.el                                |   2 +-
 lisp/erc/erc-match.el                              |   2 +-
 lisp/erc/erc-menu.el                               |   3 +-
 lisp/erc/erc-netsplit.el                           |   5 +-
 lisp/erc/erc-networks.el                           |   2 +-
 lisp/erc/erc-notify.el                             |   2 +-
 lisp/erc/erc-page.el                               |   3 +-
 lisp/erc/erc-pcomplete.el                          |   5 +-
 lisp/erc/erc-replace.el                            |   3 +-
 lisp/erc/erc-ring.el                               |   2 +-
 lisp/erc/erc-services.el                           |   2 +-
 lisp/erc/erc-sound.el                              |   3 +-
 lisp/erc/erc-speedbar.el                           |   2 +-
 lisp/erc/erc-spelling.el                           |   2 +-
 lisp/erc/erc-stamp.el                              |   3 +-
 lisp/erc/erc-track.el                              |   2 +-
 lisp/erc/erc-truncate.el                           |   3 +-
 lisp/erc/erc-xdcc.el                               |   3 +-
 lisp/erc/erc.el                                    |   6 +-
 lisp/eshell/em-alias.el                            |   2 +-
 lisp/eshell/em-banner.el                           |   2 +-
 lisp/eshell/em-basic.el                            |   2 +-
 lisp/eshell/em-cmpl.el                             |   2 +-
 lisp/eshell/em-dirs.el                             |   2 +-
 lisp/eshell/em-glob.el                             |   2 +-
 lisp/eshell/em-hist.el                             |   2 +-
 lisp/eshell/em-ls.el                               |   2 +-
 lisp/eshell/em-pred.el                             |   2 +-
 lisp/eshell/em-prompt.el                           |   2 +-
 lisp/eshell/em-rebind.el                           |   2 +-
 lisp/eshell/em-script.el                           |   2 +-
 lisp/eshell/em-smart.el                            |   2 +-
 lisp/eshell/em-term.el                             |   2 +-
 lisp/eshell/em-tramp.el                            |   2 +-
 lisp/eshell/em-unix.el                             |   2 +-
 lisp/eshell/em-xtra.el                             |   2 +-
 lisp/eshell/esh-arg.el                             |   2 +-
 lisp/eshell/esh-cmd.el                             |   2 +-
 lisp/eshell/esh-ext.el                             |   2 +-
 lisp/eshell/esh-io.el                              |   2 +-
 lisp/eshell/esh-mode.el                            |   2 +-
 lisp/eshell/esh-module.el                          |   2 +-
 lisp/eshell/esh-opt.el                             |   2 +-
 lisp/eshell/esh-proc.el                            |   2 +-
 lisp/eshell/esh-util.el                            |   2 +-
 lisp/eshell/esh-var.el                             |   2 +-
 lisp/eshell/eshell.el                              |   2 +-
 lisp/expand.el                                     |   2 +-
 lisp/ezimage.el                                    |   2 +-
 lisp/face-remap.el                                 |   2 +-
 lisp/facemenu.el                                   |   2 +-
 lisp/faces.el                                      |   2 +-
 lisp/ffap.el                                       |   3 +-
 lisp/filecache.el                                  |   2 +-
 lisp/filenotify.el                                 |  14 +-
 lisp/files-x.el                                    |   2 +-
 lisp/files.el                                      | 138 ++++-----
 lisp/filesets.el                                   |   2 +-
 lisp/find-cmd.el                                   |   2 +-
 lisp/find-dired.el                                 |   2 +-
 lisp/find-file.el                                  |   2 +-
 lisp/find-lisp.el                                  |   2 +-
 lisp/finder.el                                     |   4 +-
 lisp/flow-ctrl.el                                  |   2 +-
 lisp/foldout.el                                    |   2 +-
 lisp/follow.el                                     |   2 +-
 lisp/font-core.el                                  |   2 +-
 lisp/font-lock.el                                  |   2 +-
 lisp/format-spec.el                                |   2 +-
 lisp/format.el                                     |   2 +-
 lisp/forms.el                                      |   2 +-
 lisp/frame.el                                      |   2 +-
 lisp/frameset.el                                   |   2 +-
 lisp/fringe.el                                     |   2 +-
 lisp/generic-x.el                                  |   2 +-
 lisp/gnus/canlock.el                               |   2 +-
 lisp/gnus/deuglify.el                              |   2 +-
 lisp/gnus/gmm-utils.el                             |   2 +-
 lisp/gnus/gnus-agent.el                            |   2 +-
 lisp/gnus/gnus-art.el                              |   9 +-
 lisp/gnus/gnus-async.el                            |   2 +-
 lisp/gnus/gnus-bcklg.el                            |   2 +-
 lisp/gnus/gnus-bookmark.el                         |   2 +-
 lisp/gnus/gnus-cache.el                            |   2 +-
 lisp/gnus/gnus-cite.el                             |   2 +-
 lisp/gnus/gnus-cloud.el                            |   2 +-
 lisp/gnus/gnus-cus.el                              |   2 +-
 lisp/gnus/gnus-delay.el                            |   2 +-
 lisp/gnus/gnus-demon.el                            |   2 +-
 lisp/gnus/gnus-diary.el                            |   2 +-
 lisp/gnus/gnus-dired.el                            |   2 +-
 lisp/gnus/gnus-draft.el                            |   2 +-
 lisp/gnus/gnus-dup.el                              |   2 +-
 lisp/gnus/gnus-eform.el                            |   2 +-
 lisp/gnus/gnus-fun.el                              |   2 +-
 lisp/gnus/gnus-gravatar.el                         |   2 +-
 lisp/gnus/gnus-group.el                            |   4 +-
 lisp/gnus/gnus-html.el                             |   2 +-
 lisp/gnus/gnus-icalendar.el                        |   2 +-
 lisp/gnus/gnus-int.el                              |   2 +-
 lisp/gnus/gnus-kill.el                             |   2 +-
 lisp/gnus/gnus-logic.el                            |   2 +-
 lisp/gnus/gnus-mh.el                               |   2 +-
 lisp/gnus/gnus-ml.el                               |   2 +-
 lisp/gnus/gnus-mlspl.el                            |   2 +-
 lisp/gnus/gnus-msg.el                              |   2 +-
 lisp/gnus/gnus-notifications.el                    |   2 +-
 lisp/gnus/gnus-picon.el                            |   2 +-
 lisp/gnus/gnus-range.el                            |   2 +-
 lisp/gnus/gnus-registry.el                         |   2 +-
 lisp/gnus/gnus-rfc1843.el                          |   2 +-
 lisp/gnus/gnus-salt.el                             |   2 +-
 lisp/gnus/gnus-score.el                            |   4 +-
 lisp/gnus/gnus-sieve.el                            |   2 +-
 lisp/gnus/gnus-spec.el                             |   2 +-
 lisp/gnus/gnus-srvr.el                             |   2 +-
 lisp/gnus/gnus-start.el                            |   2 +-
 lisp/gnus/gnus-sum.el                              |   4 +-
 lisp/gnus/gnus-topic.el                            |   2 +-
 lisp/gnus/gnus-undo.el                             |   2 +-
 lisp/gnus/gnus-util.el                             |   2 +-
 lisp/gnus/gnus-uu.el                               |   2 +-
 lisp/gnus/gnus-vm.el                               |   2 +-
 lisp/gnus/gnus-win.el                              |   2 +-
 lisp/gnus/gnus.el                                  |   2 +-
 lisp/gnus/gssapi.el                                |   2 +-
 lisp/gnus/legacy-gnus-agent.el                     |   2 +-
 lisp/gnus/mail-source.el                           |   2 +-
 lisp/gnus/message.el                               |   9 +-
 lisp/gnus/mm-archive.el                            |   2 +-
 lisp/gnus/mm-bodies.el                             |   2 +-
 lisp/gnus/mm-decode.el                             |   2 +-
 lisp/gnus/mm-encode.el                             |   2 +-
 lisp/gnus/mm-extern.el                             |   2 +-
 lisp/gnus/mm-partial.el                            |   2 +-
 lisp/gnus/mm-url.el                                |   2 +-
 lisp/gnus/mm-util.el                               |   2 +-
 lisp/gnus/mm-uu.el                                 |   2 +-
 lisp/gnus/mm-view.el                               |   2 +-
 lisp/gnus/mml-sec.el                               |   2 +-
 lisp/gnus/mml-smime.el                             |   2 +-
 lisp/gnus/mml.el                                   |   2 +-
 lisp/gnus/mml1991.el                               |   2 +-
 lisp/gnus/mml2015.el                               |   2 +-
 lisp/gnus/nnagent.el                               |   2 +-
 lisp/gnus/nnbabyl.el                               |   2 +-
 lisp/gnus/nndiary.el                               |   2 +-
 lisp/gnus/nndir.el                                 |   2 +-
 lisp/gnus/nndoc.el                                 |   2 +-
 lisp/gnus/nndraft.el                               |   2 +-
 lisp/gnus/nneething.el                             |   2 +-
 lisp/gnus/nnfolder.el                              |   2 +-
 lisp/gnus/nngateway.el                             |   2 +-
 lisp/gnus/nnheader.el                              |   2 +-
 lisp/gnus/nnimap.el                                |   4 +-
 lisp/gnus/nnir.el                                  |   2 +-
 lisp/gnus/nnmail.el                                |   2 +-
 lisp/gnus/nnmaildir.el                             |   2 +-
 lisp/gnus/nnmairix.el                              |   2 +-
 lisp/gnus/nnmbox.el                                |   2 +-
 lisp/gnus/nnmh.el                                  |   2 +-
 lisp/gnus/nnml.el                                  |   2 +-
 lisp/gnus/nnnil.el                                 |   2 +-
 lisp/gnus/nnoo.el                                  |   2 +-
 lisp/gnus/nnregistry.el                            |   2 +-
 lisp/gnus/nnrss.el                                 |   2 +-
 lisp/gnus/nnspool.el                               |   2 +-
 lisp/gnus/nntp.el                                  |   2 +-
 lisp/gnus/nnvirtual.el                             |   2 +-
 lisp/gnus/nnweb.el                                 |   2 +-
 lisp/gnus/score-mode.el                            |   2 +-
 lisp/gnus/smiley.el                                |   2 +-
 lisp/gnus/smime.el                                 |   2 +-
 lisp/gnus/spam-report.el                           |   2 +-
 lisp/gnus/spam-stat.el                             |   2 +-
 lisp/gnus/spam-wash.el                             |   2 +-
 lisp/gnus/spam.el                                  |   2 +-
 lisp/help-at-pt.el                                 |   2 +-
 lisp/help-fns.el                                   |   2 +-
 lisp/help-macro.el                                 |   2 +-
 lisp/help-mode.el                                  |   2 +-
 lisp/help.el                                       |   6 +-
 lisp/hex-util.el                                   |   2 +-
 lisp/hexl.el                                       |   2 +-
 lisp/hfy-cmap.el                                   |   2 +-
 lisp/hi-lock.el                                    |   2 +-
 lisp/hilit-chg.el                                  |   2 +-
 lisp/hippie-exp.el                                 |   2 +-
 lisp/hl-line.el                                    |   2 +-
 lisp/htmlfontify.el                                |   2 +-
 lisp/ibuf-ext.el                                   |   4 +-
 lisp/ibuf-macs.el                                  |   2 +-
 lisp/ibuffer.el                                    |   2 +-
 lisp/icomplete.el                                  |   2 +-
 lisp/ido.el                                        |   6 +-
 lisp/ielm.el                                       |   2 +-
 lisp/iimage.el                                     |   2 +-
 lisp/image-dired.el                                |   2 +-
 lisp/image-file.el                                 |   2 +-
 lisp/image-mode.el                                 |   2 +-
 lisp/image.el                                      |   2 +-
 lisp/image/compface.el                             |   2 +-
 lisp/image/gravatar.el                             |   2 +-
 lisp/imenu.el                                      |   2 +-
 lisp/indent.el                                     |   2 +-
 lisp/info-look.el                                  |   8 +-
 lisp/info-xref.el                                  |   2 +-
 lisp/info.el                                       |   4 +-
 lisp/informat.el                                   |   2 +-
 lisp/international/ccl.el                          |   2 +-
 lisp/international/characters.el                   |   2 +-
 lisp/international/fontset.el                      |   2 +-
 lisp/international/isearch-x.el                    |   2 +-
 lisp/international/iso-ascii.el                    |   2 +-
 lisp/international/iso-cvt.el                      |   2 +-
 lisp/international/iso-transl.el                   |   2 +-
 lisp/international/ja-dic-cnv.el                   |   2 +-
 lisp/international/ja-dic-utl.el                   |   2 +-
 lisp/international/kinsoku.el                      |   2 +-
 lisp/international/kkc.el                          |   2 +-
 lisp/international/latexenc.el                     |   2 +-
 lisp/international/latin1-disp.el                  |   2 +-
 lisp/international/mule-cmds.el                    |   2 +-
 lisp/international/mule-conf.el                    |   2 +-
 lisp/international/mule-diag.el                    |   2 +-
 lisp/international/mule-util.el                    |   2 +-
 lisp/international/mule.el                         |   2 +-
 lisp/international/ogonek.el                       |   2 +-
 lisp/international/quail.el                        |   2 +-
 lisp/international/rfc1843.el                      |   6 +-
 lisp/international/robin.el                        |   2 +-
 lisp/international/titdic-cnv.el                   |  10 +-
 lisp/international/ucs-normalize.el                |   2 +-
 lisp/international/utf-7.el                        |   4 +-
 lisp/international/utf7.el                         |   2 +-
 lisp/isearch.el                                    |   2 +-
 lisp/isearchb.el                                   |   2 +-
 lisp/jit-lock.el                                   |   4 +-
 lisp/jka-cmpr-hook.el                              |   2 +-
 lisp/jka-compr.el                                  |   2 +-
 lisp/json.el                                       |  37 +--
 lisp/kermit.el                                     |   2 +-
 lisp/kmacro.el                                     |   2 +-
 lisp/language/burmese.el                           |   3 +-
 lisp/language/cham.el                              |   2 +-
 lisp/language/china-util.el                        |   2 +-
 lisp/language/chinese.el                           |   2 +-
 lisp/language/cyril-util.el                        |   2 +-
 lisp/language/cyrillic.el                          |   2 +-
 lisp/language/czech.el                             |   2 +-
 lisp/language/english.el                           |   2 +-
 lisp/language/ethio-util.el                        |   2 +-
 lisp/language/ethiopic.el                          |   2 +-
 lisp/language/european.el                          |   2 +-
 lisp/language/georgian.el                          |   2 +-
 lisp/language/greek.el                             |   2 +-
 lisp/language/hanja-util.el                        |   2 +-
 lisp/language/hebrew.el                            |   2 +-
 lisp/language/ind-util.el                          |   2 +-
 lisp/language/indian.el                            |   8 +-
 lisp/language/japan-util.el                        |   2 +-
 lisp/language/japanese.el                          |  10 +-
 lisp/language/khmer.el                             |   2 +-
 lisp/language/korea-util.el                        |   2 +-
 lisp/language/korean.el                            |   2 +-
 lisp/language/lao-util.el                          |   2 +-
 lisp/language/lao.el                               |   2 +-
 lisp/language/misc-lang.el                         |   2 +-
 lisp/language/romanian.el                          |   2 +-
 lisp/language/sinhala.el                           |   4 +-
 lisp/language/slovak.el                            |   2 +-
 lisp/language/tai-viet.el                          |   2 +-
 lisp/language/thai-util.el                         |   2 +-
 lisp/language/thai-word.el                         |   2 +-
 lisp/language/thai.el                              |   2 +-
 lisp/language/tibet-util.el                        |   2 +-
 lisp/language/tibetan.el                           |   2 +-
 lisp/language/tv-util.el                           |   5 +-
 lisp/language/utf-8-lang.el                        |   2 +-
 lisp/language/viet-util.el                         |   2 +-
 lisp/language/vietnamese.el                        |   2 +-
 lisp/leim/quail/arabic.el                          |   2 +-
 lisp/leim/quail/croatian.el                        |   2 +-
 lisp/leim/quail/cyril-jis.el                       |   2 +-
 lisp/leim/quail/cyrillic.el                        |   2 +-
 lisp/leim/quail/czech.el                           |   2 +-
 lisp/leim/quail/ethiopic.el                        |   2 +-
 lisp/leim/quail/georgian.el                        |   2 +-
 lisp/leim/quail/greek.el                           |   2 +-
 lisp/leim/quail/hangul.el                          |   2 +-
 lisp/leim/quail/hanja-jis.el                       |   2 +-
 lisp/leim/quail/hanja.el                           |   2 +-
 lisp/leim/quail/hanja3.el                          |   2 +-
 lisp/leim/quail/hebrew.el                          |   2 +-
 lisp/leim/quail/indian.el                          |   2 +-
 lisp/leim/quail/ipa-praat.el                       |   2 +-
 lisp/leim/quail/ipa.el                             |   2 +-
 lisp/leim/quail/japanese.el                        |   2 +-
 lisp/leim/quail/lao.el                             |   2 +-
 lisp/leim/quail/latin-alt.el                       |   2 +-
 lisp/leim/quail/latin-ltx.el                       |   2 +-
 lisp/leim/quail/latin-post.el                      |   2 +-
 lisp/leim/quail/latin-pre.el                       |   2 +-
 lisp/leim/quail/lrt.el                             |   2 +-
 lisp/leim/quail/persian.el                         |   4 +-
 lisp/leim/quail/programmer-dvorak.el               |   2 +-
 lisp/leim/quail/py-punct.el                        |   2 +-
 lisp/leim/quail/pypunct-b5.el                      |   2 +-
 lisp/leim/quail/rfc1345.el                         |   2 +-
 lisp/leim/quail/sgml-input.el                      |   2 +-
 lisp/leim/quail/sisheng.el                         |   2 +-
 lisp/leim/quail/slovak.el                          |   2 +-
 lisp/leim/quail/symbol-ksc.el                      |   2 +-
 lisp/leim/quail/tamil-dvorak.el                    |   2 +-
 lisp/leim/quail/thai.el                            |   2 +-
 lisp/leim/quail/tibetan.el                         |   2 +-
 lisp/leim/quail/uni-input.el                       |   2 +-
 lisp/leim/quail/viqr.el                            |   2 +-
 lisp/leim/quail/vntelex.el                         |   2 +-
 lisp/leim/quail/vnvni.el                           |   2 +-
 lisp/leim/quail/welsh.el                           |   2 +-
 lisp/linum.el                                      |   2 +-
 lisp/loadhist.el                                   |   2 +-
 lisp/loadup.el                                     |   4 +-
 lisp/locate.el                                     |   2 +-
 lisp/lpr.el                                        |   2 +-
 lisp/ls-lisp.el                                    |   2 +-
 lisp/macros.el                                     |   2 +-
 lisp/mail/binhex.el                                |   2 +-
 lisp/mail/blessmail.el                             |   2 +-
 lisp/mail/emacsbug.el                              |   4 +-
 lisp/mail/flow-fill.el                             |   2 +-
 lisp/mail/footnote.el                              |   2 +-
 lisp/mail/hashcash.el                              |   2 +-
 lisp/mail/ietf-drums.el                            |   2 +-
 lisp/mail/mail-extr.el                             |   2 +-
 lisp/mail/mail-hist.el                             |   2 +-
 lisp/mail/mail-parse.el                            |   2 +-
 lisp/mail/mail-prsvr.el                            |   2 +-
 lisp/mail/mail-utils.el                            |   2 +-
 lisp/mail/mailabbrev.el                            |   2 +-
 lisp/mail/mailalias.el                             |   2 +-
 lisp/mail/mailclient.el                            |   2 +-
 lisp/mail/mailheader.el                            |   2 +-
 lisp/mail/metamail.el                              |   2 +-
 lisp/mail/mspools.el                               |   2 +-
 lisp/mail/qp.el                                    |   2 +-
 lisp/mail/reporter.el                              |   2 +-
 lisp/mail/rfc2045.el                               |   2 +-
 lisp/mail/rfc2047.el                               |   2 +-
 lisp/mail/rfc2231.el                               |   2 +-
 lisp/mail/rfc2368.el                               |   2 +-
 lisp/mail/rfc822.el                                |   2 +-
 lisp/mail/rmail-spam-filter.el                     |   2 +-
 lisp/mail/rmail.el                                 |   2 +-
 lisp/mail/rmailedit.el                             |   2 +-
 lisp/mail/rmailkwd.el                              |   2 +-
 lisp/mail/rmailmm.el                               |   2 +-
 lisp/mail/rmailmsc.el                              |   2 +-
 lisp/mail/rmailout.el                              |   2 +-
 lisp/mail/rmailsort.el                             |   2 +-
 lisp/mail/rmailsum.el                              |   2 +-
 lisp/mail/sendmail.el                              |   2 +-
 lisp/mail/smtpmail.el                              |   2 +-
 lisp/mail/supercite.el                             |   2 +-
 lisp/mail/uce.el                                   |   2 +-
 lisp/mail/undigest.el                              |   2 +-
 lisp/mail/unrmail.el                               |   2 +-
 lisp/mail/uudecode.el                              |   2 +-
 lisp/mail/yenc.el                                  |   2 +-
 lisp/makesum.el                                    |   2 +-
 lisp/man.el                                        |   2 +-
 lisp/master.el                                     |   2 +-
 lisp/mb-depth.el                                   |   2 +-
 lisp/md4.el                                        |   2 +-
 lisp/menu-bar.el                                   |   2 +-
 lisp/mh-e/mh-acros.el                              |   2 +-
 lisp/mh-e/mh-alias.el                              |   2 +-
 lisp/mh-e/mh-buffers.el                            |   2 +-
 lisp/mh-e/mh-comp.el                               |   2 +-
 lisp/mh-e/mh-compat.el                             |   2 +-
 lisp/mh-e/mh-e.el                                  |   6 +-
 lisp/mh-e/mh-folder.el                             |   2 +-
 lisp/mh-e/mh-funcs.el                              |   2 +-
 lisp/mh-e/mh-gnus.el                               |   2 +-
 lisp/mh-e/mh-identity.el                           |   2 +-
 lisp/mh-e/mh-inc.el                                |   2 +-
 lisp/mh-e/mh-junk.el                               |   2 +-
 lisp/mh-e/mh-letter.el                             |   2 +-
 lisp/mh-e/mh-limit.el                              |   2 +-
 lisp/mh-e/mh-mime.el                               |   2 +-
 lisp/mh-e/mh-print.el                              |   2 +-
 lisp/mh-e/mh-scan.el                               |   2 +-
 lisp/mh-e/mh-search.el                             |   2 +-
 lisp/mh-e/mh-seq.el                                |   2 +-
 lisp/mh-e/mh-show.el                               |   2 +-
 lisp/mh-e/mh-speed.el                              |   2 +-
 lisp/mh-e/mh-thread.el                             |   2 +-
 lisp/mh-e/mh-tool-bar.el                           |   2 +-
 lisp/mh-e/mh-utils.el                              |   2 +-
 lisp/mh-e/mh-xface.el                              |   2 +-
 lisp/midnight.el                                   |   2 +-
 lisp/minibuf-eldef.el                              |   2 +-
 lisp/minibuffer.el                                 |   2 +-
 lisp/misc.el                                       |   2 +-
 lisp/misearch.el                                   |   2 +-
 lisp/mouse-copy.el                                 |   2 +-
 lisp/mouse-drag.el                                 |   2 +-
 lisp/mouse.el                                      |   2 +-
 lisp/mpc.el                                        |  14 +-
 lisp/msb.el                                        |   2 +-
 lisp/mwheel.el                                     |   2 +-
 lisp/net/ange-ftp.el                               |   2 +-
 lisp/net/browse-url.el                             |   4 +-
 lisp/net/dbus.el                                   |   2 +-
 lisp/net/dig.el                                    |   2 +-
 lisp/net/dns.el                                    |   2 +-
 lisp/net/eudc-bob.el                               |   2 +-
 lisp/net/eudc-export.el                            |   2 +-
 lisp/net/eudc-hotlist.el                           |   2 +-
 lisp/net/eudc-vars.el                              |   2 +-
 lisp/net/eudc.el                                   |   2 +-
 lisp/net/eudcb-bbdb.el                             |   2 +-
 lisp/net/eudcb-ldap.el                             |   2 +-
 lisp/net/eudcb-mab.el                              |   2 +-
 lisp/net/eww.el                                    |  22 +-
 lisp/net/gnutls.el                                 |   2 +-
 lisp/net/goto-addr.el                              |   2 +-
 lisp/net/hmac-def.el                               |   2 +-
 lisp/net/hmac-md5.el                               |   2 +-
 lisp/net/imap.el                                   |   2 +-
 lisp/net/ldap.el                                   |   2 +-
 lisp/net/mailcap.el                                |   2 +-
 lisp/net/mairix.el                                 |   2 +-
 lisp/net/net-utils.el                              |   2 +-
 lisp/net/netrc.el                                  |   2 +-
 lisp/net/network-stream.el                         |   2 +-
 lisp/net/newst-backend.el                          |   2 +-
 lisp/net/newst-plainview.el                        |   2 +-
 lisp/net/newst-reader.el                           |   2 +-
 lisp/net/newst-ticker.el                           |   2 +-
 lisp/net/newst-treeview.el                         |   2 +-
 lisp/net/newsticker.el                             |   2 +-
 lisp/net/nsm.el                                    |   2 +-
 lisp/net/ntlm.el                                   |   2 +-
 lisp/net/pinentry.el                               |   2 +-
 lisp/net/pop3.el                                   |   2 +-
 lisp/net/puny.el                                   |   2 +-
 lisp/net/quickurl.el                               |  10 +-
 lisp/net/rcirc.el                                  |   2 +-
 lisp/net/rfc2104.el                                |   2 +-
 lisp/net/rlogin.el                                 |   2 +-
 lisp/net/sasl-cram.el                              |   2 +-
 lisp/net/sasl-digest.el                            |   2 +-
 lisp/net/sasl-ntlm.el                              |   2 +-
 lisp/net/sasl-scram-rfc.el                         |   2 +-
 lisp/net/sasl.el                                   |   2 +-
 lisp/net/secrets.el                                |   2 +-
 lisp/net/shr-color.el                              |   2 +-
 lisp/net/shr.el                                    |   8 +-
 lisp/net/sieve-manage.el                           |   2 +-
 lisp/net/sieve-mode.el                             |   2 +-
 lisp/net/sieve.el                                  |   2 +-
 lisp/net/snmp-mode.el                              |   2 +-
 lisp/net/soap-client.el                            |   2 +-
 lisp/net/soap-inspect.el                           |   2 +-
 lisp/net/socks.el                                  |   2 +-
 lisp/net/starttls.el                               |   4 +-
 lisp/net/telnet.el                                 |   2 +-
 lisp/net/tls.el                                    |   4 +-
 lisp/net/tramp-adb.el                              |   5 +-
 lisp/net/tramp-cache.el                            |   2 +-
 lisp/net/tramp-cmds.el                             |   2 +-
 lisp/net/tramp-compat.el                           |   2 +-
 lisp/net/tramp-ftp.el                              |   2 +-
 lisp/net/tramp-gvfs.el                             |   2 +-
 lisp/net/tramp-sh.el                               |  24 +-
 lisp/net/tramp-smb.el                              |  14 +-
 lisp/net/tramp-uu.el                               |   2 +-
 lisp/net/tramp.el                                  |   6 +-
 lisp/net/trampver.el                               |   5 +-
 lisp/net/webjump.el                                |   8 +-
 lisp/net/zeroconf.el                               |   2 +-
 lisp/newcomment.el                                 |   2 +-
 lisp/notifications.el                              |   2 +-
 lisp/novice.el                                     |   2 +-
 lisp/nxml/nxml-enc.el                              |   4 +-
 lisp/nxml/nxml-maint.el                            |   2 +-
 lisp/nxml/nxml-mode.el                             |   2 +-
 lisp/nxml/nxml-ns.el                               |   2 +-
 lisp/nxml/nxml-outln.el                            |   2 +-
 lisp/nxml/nxml-parse.el                            |   2 +-
 lisp/nxml/nxml-rap.el                              |   2 +-
 lisp/nxml/nxml-util.el                             |   2 +-
 lisp/nxml/rng-cmpct.el                             |   2 +-
 lisp/nxml/rng-dt.el                                |   2 +-
 lisp/nxml/rng-loc.el                               |   2 +-
 lisp/nxml/rng-maint.el                             |   2 +-
 lisp/nxml/rng-match.el                             |   2 +-
 lisp/nxml/rng-nxml.el                              |   2 +-
 lisp/nxml/rng-parse.el                             |   2 +-
 lisp/nxml/rng-pttrn.el                             |   2 +-
 lisp/nxml/rng-uri.el                               |   2 +-
 lisp/nxml/rng-util.el                              |   2 +-
 lisp/nxml/rng-valid.el                             |   2 +-
 lisp/nxml/rng-xsd.el                               |   2 +-
 lisp/nxml/xmltok.el                                |   2 +-
 lisp/nxml/xsd-regexp.el                            |   2 +-
 lisp/obarray.el                                    |   2 +-
 lisp/obsolete/abbrevlist.el                        |   2 +-
 lisp/obsolete/assoc.el                             |   2 +-
 lisp/obsolete/bruce.el                             |   4 +-
 lisp/obsolete/cc-compat.el                         |   8 +-
 lisp/obsolete/cl-compat.el                         |   2 +-
 lisp/obsolete/complete.el                          |   2 +-
 lisp/obsolete/crisp.el                             |   2 +-
 lisp/obsolete/cust-print.el                        |   2 +-
 lisp/obsolete/erc-hecomplete.el                    |   3 +-
 lisp/obsolete/eudcb-ph.el                          |   2 +-
 lisp/obsolete/fast-lock.el                         |   2 +-
 lisp/obsolete/gs.el                                |   2 +-
 lisp/obsolete/gulp.el                              |   2 +-
 lisp/obsolete/html2text.el                         |   2 +-
 lisp/obsolete/iswitchb.el                          |   2 +-
 lisp/obsolete/landmark.el                          |   2 +-
 lisp/obsolete/lazy-lock.el                         |   2 +-
 lisp/obsolete/ledit.el                             |   2 +-
 lisp/obsolete/levents.el                           |   2 +-
 lisp/obsolete/lmenu.el                             |   2 +-
 lisp/obsolete/longlines.el                         |   2 +-
 lisp/obsolete/lucid.el                             |   2 +-
 lisp/obsolete/messcompat.el                        |   2 +-
 lisp/obsolete/mouse-sel.el                         |   2 +-
 lisp/obsolete/old-emacs-lock.el                    |   2 +-
 lisp/obsolete/old-whitespace.el                    |   2 +-
 lisp/obsolete/options.el                           |   2 +-
 lisp/obsolete/otodo-mode.el                        |   2 +-
 lisp/obsolete/pc-mode.el                           |   2 +-
 lisp/obsolete/pc-select.el                         |   2 +-
 lisp/obsolete/pgg-def.el                           |   2 +-
 lisp/obsolete/pgg-gpg.el                           |   2 +-
 lisp/obsolete/pgg-parse.el                         |   2 +-
 lisp/obsolete/pgg-pgp.el                           |   2 +-
 lisp/obsolete/pgg-pgp5.el                          |   2 +-
 lisp/obsolete/pgg.el                               |   2 +-
 lisp/obsolete/rcompile.el                          |   2 +-
 lisp/obsolete/s-region.el                          |   2 +-
 lisp/obsolete/sregex.el                            |   2 +-
 lisp/obsolete/sup-mouse.el                         |   2 +-
 lisp/obsolete/terminal.el                          |   2 +-
 lisp/obsolete/tpu-edt.el                           |   2 +-
 lisp/obsolete/tpu-extras.el                        |   2 +-
 lisp/obsolete/tpu-mapper.el                        |   2 +-
 lisp/obsolete/vc-arch.el                           |   2 +-
 lisp/obsolete/vip.el                               |   2 +-
 lisp/obsolete/ws-mode.el                           |   2 +-
 lisp/obsolete/xesam.el                             |   2 +-
 lisp/obsolete/yow.el                               |   2 +-
 lisp/org/ob-C.el                                   |   2 +-
 lisp/org/ob-J.el                                   |   2 +-
 lisp/org/ob-R.el                                   |   2 +-
 lisp/org/ob-abc.el                                 |   2 +-
 lisp/org/ob-asymptote.el                           |   2 +-
 lisp/org/ob-awk.el                                 |   2 +-
 lisp/org/ob-calc.el                                |   2 +-
 lisp/org/ob-clojure.el                             |   2 +-
 lisp/org/ob-comint.el                              |   2 +-
 lisp/org/ob-coq.el                                 |   2 +-
 lisp/org/ob-core.el                                |   2 +-
 lisp/org/ob-css.el                                 |   2 +-
 lisp/org/ob-ditaa.el                               |   2 +-
 lisp/org/ob-dot.el                                 |   2 +-
 lisp/org/ob-ebnf.el                                |   2 +-
 lisp/org/ob-emacs-lisp.el                          |   2 +-
 lisp/org/ob-eval.el                                |   2 +-
 lisp/org/ob-exp.el                                 |   2 +-
 lisp/org/ob-forth.el                               |   2 +-
 lisp/org/ob-fortran.el                             |   2 +-
 lisp/org/ob-gnuplot.el                             |   2 +-
 lisp/org/ob-groovy.el                              |   2 +-
 lisp/org/ob-haskell.el                             |   2 +-
 lisp/org/ob-io.el                                  |   2 +-
 lisp/org/ob-java.el                                |   2 +-
 lisp/org/ob-js.el                                  |   2 +-
 lisp/org/ob-keys.el                                |   2 +-
 lisp/org/ob-latex.el                               |   2 +-
 lisp/org/ob-ledger.el                              |   2 +-
 lisp/org/ob-lilypond.el                            |   2 +-
 lisp/org/ob-lisp.el                                |   2 +-
 lisp/org/ob-lob.el                                 |   2 +-
 lisp/org/ob-lua.el                                 |   2 +-
 lisp/org/ob-makefile.el                            |   2 +-
 lisp/org/ob-matlab.el                              |   2 +-
 lisp/org/ob-maxima.el                              |   2 +-
 lisp/org/ob-mscgen.el                              |   2 +-
 lisp/org/ob-ocaml.el                               |   2 +-
 lisp/org/ob-octave.el                              |   2 +-
 lisp/org/ob-org.el                                 |   2 +-
 lisp/org/ob-perl.el                                |   2 +-
 lisp/org/ob-picolisp.el                            |   2 +-
 lisp/org/ob-plantuml.el                            |   2 +-
 lisp/org/ob-processing.el                          |   2 +-
 lisp/org/ob-python.el                              |   2 +-
 lisp/org/ob-ref.el                                 |   2 +-
 lisp/org/ob-ruby.el                                |   2 +-
 lisp/org/ob-sass.el                                |   2 +-
 lisp/org/ob-scala.el                               |   2 +-
 lisp/org/ob-scheme.el                              |   4 +-
 lisp/org/ob-screen.el                              |   2 +-
 lisp/org/ob-sed.el                                 |   2 +-
 lisp/org/ob-shell.el                               |   2 +-
 lisp/org/ob-shen.el                                |   2 +-
 lisp/org/ob-sql.el                                 |   2 +-
 lisp/org/ob-sqlite.el                              |   2 +-
 lisp/org/ob-stan.el                                |   2 +-
 lisp/org/ob-table.el                               |   2 +-
 lisp/org/ob-tangle.el                              |   2 +-
 lisp/org/ob.el                                     |   2 +-
 lisp/org/org-agenda.el                             |   2 +-
 lisp/org/org-archive.el                            |   2 +-
 lisp/org/org-attach.el                             |   2 +-
 lisp/org/org-bbdb.el                               |   2 +-
 lisp/org/org-bibtex.el                             |   2 +-
 lisp/org/org-capture.el                            |   2 +-
 lisp/org/org-clock.el                              |   2 +-
 lisp/org/org-colview.el                            |   2 +-
 lisp/org/org-compat.el                             |   2 +-
 lisp/org/org-crypt.el                              |   2 +-
 lisp/org/org-ctags.el                              |   2 +-
 lisp/org/org-datetree.el                           |   2 +-
 lisp/org/org-docview.el                            |   2 +-
 lisp/org/org-element.el                            |   2 +-
 lisp/org/org-entities.el                           |   2 +-
 lisp/org/org-eshell.el                             |   2 +-
 lisp/org/org-eww.el                                |   2 +-
 lisp/org/org-faces.el                              |   2 +-
 lisp/org/org-feed.el                               |   2 +-
 lisp/org/org-footnote.el                           |   2 +-
 lisp/org/org-gnus.el                               |   2 +-
 lisp/org/org-habit.el                              |   2 +-
 lisp/org/org-id.el                                 |   2 +-
 lisp/org/org-indent.el                             |   2 +-
 lisp/org/org-info.el                               |  10 +-
 lisp/org/org-inlinetask.el                         |   2 +-
 lisp/org/org-irc.el                                |   2 +-
 lisp/org/org-lint.el                               |   2 +-
 lisp/org/org-list.el                               |   2 +-
 lisp/org/org-macro.el                              |   2 +-
 lisp/org/org-macs.el                               |   2 +-
 lisp/org/org-mhe.el                                |   2 +-
 lisp/org/org-mobile.el                             |   2 +-
 lisp/org/org-mouse.el                              |   2 +-
 lisp/org/org-pcomplete.el                          |   2 +-
 lisp/org/org-plot.el                               |   2 +-
 lisp/org/org-protocol.el                           |   2 +-
 lisp/org/org-rmail.el                              |   2 +-
 lisp/org/org-src.el                                |   2 +-
 lisp/org/org-table.el                              |   2 +-
 lisp/org/org-timer.el                              |   2 +-
 lisp/org/org-w3m.el                                |   2 +-
 lisp/org/org.el                                    |   2 +-
 lisp/org/ox-ascii.el                               |   2 +-
 lisp/org/ox-beamer.el                              |   2 +-
 lisp/org/ox-html.el                                |   4 +-
 lisp/org/ox-icalendar.el                           |   2 +-
 lisp/org/ox-latex.el                               |   2 +-
 lisp/org/ox-man.el                                 |   2 +-
 lisp/org/ox-md.el                                  |   2 +-
 lisp/org/ox-odt.el                                 |   2 +-
 lisp/org/ox-org.el                                 |   2 +-
 lisp/org/ox-publish.el                             |   2 +-
 lisp/org/ox-texinfo.el                             |   2 +-
 lisp/org/ox.el                                     |   2 +-
 lisp/outline.el                                    |   2 +-
 lisp/paren.el                                      |   4 +-
 lisp/password-cache.el                             |   2 +-
 lisp/pcmpl-cvs.el                                  |   2 +-
 lisp/pcmpl-gnu.el                                  |   2 +-
 lisp/pcmpl-linux.el                                |   2 +-
 lisp/pcmpl-rpm.el                                  |   2 +-
 lisp/pcmpl-unix.el                                 |   2 +-
 lisp/pcmpl-x.el                                    |   2 +-
 lisp/pcomplete.el                                  |   2 +-
 lisp/pixel-scroll.el                               |   2 +-
 lisp/play/5x5.el                                   |   2 +-
 lisp/play/animate.el                               |   2 +-
 lisp/play/blackbox.el                              |   2 +-
 lisp/play/bubbles.el                               |   2 +-
 lisp/play/cookie1.el                               |   2 +-
 lisp/play/decipher.el                              |   2 +-
 lisp/play/dissociate.el                            |   2 +-
 lisp/play/doctor.el                                |   2 +-
 lisp/play/dunnet.el                                |   2 +-
 lisp/play/fortune.el                               |   2 +-
 lisp/play/gamegrid.el                              |   2 +-
 lisp/play/gametree.el                              |   2 +-
 lisp/play/gomoku.el                                |   2 +-
 lisp/play/handwrite.el                             |   2 +-
 lisp/play/life.el                                  |   2 +-
 lisp/play/morse.el                                 |   2 +-
 lisp/play/mpuz.el                                  |   2 +-
 lisp/play/pong.el                                  |   2 +-
 lisp/play/snake.el                                 |   2 +-
 lisp/play/solitaire.el                             |   2 +-
 lisp/play/spook.el                                 |   2 +-
 lisp/play/tetris.el                                |   2 +-
 lisp/play/zone.el                                  |   2 +-
 lisp/plstore.el                                    |   2 +-
 lisp/printing.el                                   |  10 +-
 lisp/proced.el                                     |   2 +-
 lisp/profiler.el                                   |   2 +-
 lisp/progmodes/ada-mode.el                         |   2 +-
 lisp/progmodes/ada-prj.el                          |   2 +-
 lisp/progmodes/ada-stmt.el                         |   2 +-
 lisp/progmodes/ada-xref.el                         |   2 +-
 lisp/progmodes/antlr-mode.el                       |   2 +-
 lisp/progmodes/asm-mode.el                         |   2 +-
 lisp/progmodes/autoconf.el                         |   2 +-
 lisp/progmodes/bat-mode.el                         |   2 +-
 lisp/progmodes/bug-reference.el                    |   4 +-
 lisp/progmodes/cc-align.el                         |   4 +-
 lisp/progmodes/cc-awk.el                           |   2 +-
 lisp/progmodes/cc-bytecomp.el                      |   2 +-
 lisp/progmodes/cc-cmds.el                          |   2 +-
 lisp/progmodes/cc-defs.el                          |   2 +-
 lisp/progmodes/cc-engine.el                        |   4 +-
 lisp/progmodes/cc-fonts.el                         |   2 +-
 lisp/progmodes/cc-guess.el                         |   2 +-
 lisp/progmodes/cc-langs.el                         |   2 +-
 lisp/progmodes/cc-menus.el                         |   2 +-
 lisp/progmodes/cc-mode.el                          |   2 +-
 lisp/progmodes/cc-styles.el                        |   2 +-
 lisp/progmodes/cc-vars.el                          |   2 +-
 lisp/progmodes/cfengine.el                         |   2 +-
 lisp/progmodes/cmacexp.el                          |   2 +-
 lisp/progmodes/compile.el                          |   2 +-
 lisp/progmodes/cperl-mode.el                       |  21 +-
 lisp/progmodes/cpp.el                              |   2 +-
 lisp/progmodes/cwarn.el                            |   2 +-
 lisp/progmodes/dcl-mode.el                         |   2 +-
 lisp/progmodes/ebnf-abn.el                         |   2 +-
 lisp/progmodes/ebnf-bnf.el                         |   2 +-
 lisp/progmodes/ebnf-dtd.el                         |   2 +-
 lisp/progmodes/ebnf-ebx.el                         |   2 +-
 lisp/progmodes/ebnf-iso.el                         |   2 +-
 lisp/progmodes/ebnf-otz.el                         |   2 +-
 lisp/progmodes/ebnf-yac.el                         |   2 +-
 lisp/progmodes/ebnf2ps.el                          |   2 +-
 lisp/progmodes/ebrowse.el                          |   2 +-
 lisp/progmodes/elisp-mode.el                       |   2 +-
 lisp/progmodes/etags.el                            |   2 +-
 lisp/progmodes/executable.el                       |   2 +-
 lisp/progmodes/f90.el                              |   2 +-
 lisp/progmodes/flymake-proc.el                     |   2 +-
 lisp/progmodes/flymake-ui.el                       |   2 +-
 lisp/progmodes/flymake.el                          |   2 +-
 lisp/progmodes/fortran.el                          |   2 +-
 lisp/progmodes/gdb-mi.el                           |   2 +-
 lisp/progmodes/glasses.el                          |   2 +-
 lisp/progmodes/grep.el                             |   2 +-
 lisp/progmodes/gud.el                              |   2 +-
 lisp/progmodes/hideif.el                           |   2 +-
 lisp/progmodes/hideshow.el                         |   2 +-
 lisp/progmodes/icon.el                             |   2 +-
 lisp/progmodes/idlw-complete-structtag.el          |  10 +-
 lisp/progmodes/idlw-help.el                        |   2 +-
 lisp/progmodes/idlw-shell.el                       |   2 +-
 lisp/progmodes/idlw-toolbar.el                     |   2 +-
 lisp/progmodes/idlwave.el                          |   2 +-
 lisp/progmodes/inf-lisp.el                         |   2 +-
 lisp/progmodes/js.el                               |   2 +-
 lisp/progmodes/ld-script.el                        |   2 +-
 lisp/progmodes/m4-mode.el                          |   2 +-
 lisp/progmodes/make-mode.el                        |   2 +-
 lisp/progmodes/mantemp.el                          |   2 +-
 lisp/progmodes/meta-mode.el                        |   2 +-
 lisp/progmodes/mixal-mode.el                       |   4 +-
 lisp/progmodes/octave.el                           |  10 +-
 lisp/progmodes/opascal.el                          |   2 +-
 lisp/progmodes/pascal.el                           |   2 +-
 lisp/progmodes/perl-mode.el                        |   2 +-
 lisp/progmodes/prog-mode.el                        |  12 +-
 lisp/progmodes/project.el                          |   2 +-
 lisp/progmodes/prolog.el                           |   2 +-
 lisp/progmodes/ps-mode.el                          |   2 +-
 lisp/progmodes/python.el                           |   6 +-
 lisp/progmodes/ruby-mode.el                        |   2 +-
 lisp/progmodes/scheme.el                           |   2 +-
 lisp/progmodes/sh-script.el                        |   2 +-
 lisp/progmodes/simula.el                           |   2 +-
 lisp/progmodes/sql.el                              |   4 +-
 lisp/progmodes/subword.el                          |   2 +-
 lisp/progmodes/tcl.el                              |   2 +-
 lisp/progmodes/vera-mode.el                        |   2 +-
 lisp/progmodes/verilog-mode.el                     |   2 +-
 lisp/progmodes/vhdl-mode.el                        |   4 +-
 lisp/progmodes/which-func.el                       |   2 +-
 lisp/progmodes/xref.el                             |   2 +-
 lisp/progmodes/xscheme.el                          |   2 +-
 lisp/ps-bdf.el                                     |   2 +-
 lisp/ps-def.el                                     |   2 +-
 lisp/ps-mule.el                                    |   2 +-
 lisp/ps-print.el                                   |   2 +-
 lisp/ps-samp.el                                    |   2 +-
 lisp/recentf.el                                    |   2 +-
 lisp/rect.el                                       |   2 +-
 lisp/register.el                                   |   2 +-
 lisp/registry.el                                   |   2 +-
 lisp/repeat.el                                     |   2 +-
 lisp/replace.el                                    |   2 +-
 lisp/reposition.el                                 |   2 +-
 lisp/reveal.el                                     |   2 +-
 lisp/rfn-eshadow.el                                |   2 +-
 lisp/rot13.el                                      |   2 +-
 lisp/rtree.el                                      |   2 +-
 lisp/ruler-mode.el                                 |   2 +-
 lisp/savehist.el                                   |   2 +-
 lisp/saveplace.el                                  |   2 +-
 lisp/sb-image.el                                   |   2 +-
 lisp/scroll-all.el                                 |   2 +-
 lisp/scroll-bar.el                                 |   2 +-
 lisp/scroll-lock.el                                |   2 +-
 lisp/select.el                                     |   2 +-
 lisp/server.el                                     |   2 +-
 lisp/ses.el                                        |   2 +-
 lisp/shadowfile.el                                 |   2 +-
 lisp/shell.el                                      |   2 +-
 lisp/simple.el                                     |   2 +-
 lisp/skeleton.el                                   |   2 +-
 lisp/sort.el                                       |   2 +-
 lisp/soundex.el                                    |   2 +-
 lisp/speedbar.el                                   |   2 +-
 lisp/startup.el                                    |  34 +--
 lisp/strokes.el                                    |   2 +-
 lisp/subr.el                                       |  13 +-
 lisp/svg.el                                        |  10 +-
 lisp/t-mouse.el                                    |   2 +-
 lisp/tabify.el                                     |   2 +-
 lisp/talk.el                                       |   2 +-
 lisp/tar-mode.el                                   |   2 +-
 lisp/tempo.el                                      |   2 +-
 lisp/term.el                                       |   2 +-
 lisp/term/AT386.el                                 |   2 +-
 lisp/term/README                                   |   2 +-
 lisp/term/common-win.el                            |   2 +-
 lisp/term/internal.el                              |   2 +-
 lisp/term/iris-ansi.el                             |   2 +-
 lisp/term/news.el                                  |   2 +-
 lisp/term/ns-win.el                                |   2 +-
 lisp/term/pc-win.el                                |   2 +-
 lisp/term/rxvt.el                                  |   2 +-
 lisp/term/sun.el                                   |   2 +-
 lisp/term/tty-colors.el                            |   2 +-
 lisp/term/tvi970.el                                |   4 +-
 lisp/term/vt100.el                                 |   2 +-
 lisp/term/w32-win.el                               |   5 +-
 lisp/term/w32console.el                            |   2 +-
 lisp/term/wyse50.el                                |   2 +-
 lisp/term/x-win.el                                 |   2 +-
 lisp/term/xterm.el                                 |   4 +-
 lisp/textmodes/artist.el                           |   2 +-
 lisp/textmodes/bib-mode.el                         |   2 +-
 lisp/textmodes/bibtex-style.el                     |   2 +-
 lisp/textmodes/bibtex.el                           |   2 +-
 lisp/textmodes/conf-mode.el                        |   2 +-
 lisp/textmodes/css-mode.el                         |   6 +-
 lisp/textmodes/dns-mode.el                         |   2 +-
 lisp/textmodes/enriched.el                         |   2 +-
 lisp/textmodes/fill.el                             |   2 +-
 lisp/textmodes/flyspell.el                         |   4 +-
 lisp/textmodes/ispell.el                           |   2 +-
 lisp/textmodes/less-css-mode.el                    |   2 +-
 lisp/textmodes/makeinfo.el                         |   2 +-
 lisp/textmodes/mhtml-mode.el                       |   2 +-
 lisp/textmodes/nroff-mode.el                       |   2 +-
 lisp/textmodes/page-ext.el                         |   2 +-
 lisp/textmodes/page.el                             |   2 +-
 lisp/textmodes/paragraphs.el                       |   2 +-
 lisp/textmodes/picture.el                          |   2 +-
 lisp/textmodes/po.el                               |   2 +-
 lisp/textmodes/refbib.el                           |   2 +-
 lisp/textmodes/refer.el                            |   2 +-
 lisp/textmodes/refill.el                           |   2 +-
 lisp/textmodes/reftex-auc.el                       |   2 +-
 lisp/textmodes/reftex-cite.el                      |   2 +-
 lisp/textmodes/reftex-dcr.el                       |   2 +-
 lisp/textmodes/reftex-global.el                    |   2 +-
 lisp/textmodes/reftex-index.el                     |   2 +-
 lisp/textmodes/reftex-parse.el                     |   2 +-
 lisp/textmodes/reftex-ref.el                       |   2 +-
 lisp/textmodes/reftex-sel.el                       |   2 +-
 lisp/textmodes/reftex-toc.el                       |   2 +-
 lisp/textmodes/reftex-vars.el                      |   4 +-
 lisp/textmodes/reftex.el                           |   8 +-
 lisp/textmodes/remember.el                         |   2 +-
 lisp/textmodes/rst.el                              |   2 +-
 lisp/textmodes/sgml-mode.el                        |  10 +-
 lisp/textmodes/table.el                            |   2 +-
 lisp/textmodes/tex-mode.el                         |   2 +-
 lisp/textmodes/texinfmt.el                         |   2 +-
 lisp/textmodes/texinfo.el                          |   2 +-
 lisp/textmodes/texnfo-upd.el                       |   2 +-
 lisp/textmodes/text-mode.el                        |   2 +-
 lisp/textmodes/tildify.el                          |   2 +-
 lisp/textmodes/two-column.el                       |   2 +-
 lisp/textmodes/underline.el                        |   2 +-
 lisp/thingatpt.el                                  |   2 +-
 lisp/thumbs.el                                     |   2 +-
 lisp/time-stamp.el                                 |   2 +-
 lisp/time.el                                       |   2 +-
 lisp/timezone.el                                   |   2 +-
 lisp/tmm.el                                        |   2 +-
 lisp/tool-bar.el                                   |   2 +-
 lisp/tooltip.el                                    |   2 +-
 lisp/tree-widget.el                                |   2 +-
 lisp/tutorial.el                                   |   2 +-
 lisp/type-break.el                                 |   2 +-
 lisp/uniquify.el                                   |   2 +-
 lisp/url/url-about.el                              |   2 +-
 lisp/url/url-auth.el                               |   2 +-
 lisp/url/url-cache.el                              |   2 +-
 lisp/url/url-cid.el                                |   2 +-
 lisp/url/url-cookie.el                             |   2 +-
 lisp/url/url-dav.el                                |   2 +-
 lisp/url/url-dired.el                              |   2 +-
 lisp/url/url-domsuf.el                             |   2 +-
 lisp/url/url-expand.el                             |   4 +-
 lisp/url/url-file.el                               |   2 +-
 lisp/url/url-ftp.el                                |   2 +-
 lisp/url/url-future.el                             |   2 +-
 lisp/url/url-gw.el                                 |   8 +-
 lisp/url/url-handlers.el                           |   6 +-
 lisp/url/url-history.el                            |   2 +-
 lisp/url/url-http.el                               |   2 +-
 lisp/url/url-imap.el                               |   2 +-
 lisp/url/url-irc.el                                |   2 +-
 lisp/url/url-ldap.el                               |   2 +-
 lisp/url/url-mailto.el                             |   4 +-
 lisp/url/url-methods.el                            |   2 +-
 lisp/url/url-misc.el                               |   2 +-
 lisp/url/url-news.el                               |   2 +-
 lisp/url/url-nfs.el                                |   2 +-
 lisp/url/url-ns.el                                 |   2 +-
 lisp/url/url-parse.el                              |   5 +-
 lisp/url/url-privacy.el                            |   2 +-
 lisp/url/url-proxy.el                              |   2 +-
 lisp/url/url-queue.el                              |   2 +-
 lisp/url/url-tramp.el                              |   2 +-
 lisp/url/url-util.el                               |   2 +-
 lisp/url/url-vars.el                               |   2 +-
 lisp/url/url.el                                    |   6 +-
 lisp/userlock.el                                   |   2 +-
 lisp/vc/add-log.el                                 |   2 +-
 lisp/vc/compare-w.el                               |   2 +-
 lisp/vc/cvs-status.el                              |   2 +-
 lisp/vc/diff-mode.el                               |   2 +-
 lisp/vc/diff.el                                    |   2 +-
 lisp/vc/ediff-diff.el                              |   2 +-
 lisp/vc/ediff-help.el                              |   2 +-
 lisp/vc/ediff-hook.el                              |   2 +-
 lisp/vc/ediff-init.el                              |   2 +-
 lisp/vc/ediff-merg.el                              |   2 +-
 lisp/vc/ediff-mult.el                              |   2 +-
 lisp/vc/ediff-ptch.el                              |   2 +-
 lisp/vc/ediff-util.el                              |   2 +-
 lisp/vc/ediff-vers.el                              |   2 +-
 lisp/vc/ediff-wind.el                              |   2 +-
 lisp/vc/ediff.el                                   |   2 +-
 lisp/vc/log-edit.el                                |   2 +-
 lisp/vc/log-view.el                                |   2 +-
 lisp/vc/pcvs-defs.el                               |   2 +-
 lisp/vc/pcvs-info.el                               |   2 +-
 lisp/vc/pcvs-parse.el                              |   2 +-
 lisp/vc/pcvs-util.el                               |   2 +-
 lisp/vc/pcvs.el                                    |   2 +-
 lisp/vc/smerge-mode.el                             |   4 +-
 lisp/vc/vc-annotate.el                             |   2 +-
 lisp/vc/vc-bzr.el                                  |   2 +-
 lisp/vc/vc-cvs.el                                  |   2 +-
 lisp/vc/vc-dav.el                                  |   2 +-
 lisp/vc/vc-dir.el                                  |   2 +-
 lisp/vc/vc-dispatcher.el                           |   2 +-
 lisp/vc/vc-filewise.el                             |   2 +-
 lisp/vc/vc-git.el                                  |  13 +-
 lisp/vc/vc-hg.el                                   |   2 +-
 lisp/vc/vc-hooks.el                                |   2 +-
 lisp/vc/vc-mtn.el                                  |   2 +-
 lisp/vc/vc-rcs.el                                  |   2 +-
 lisp/vc/vc-sccs.el                                 |   2 +-
 lisp/vc/vc-src.el                                  |   2 +-
 lisp/vc/vc-svn.el                                  |   2 +-
 lisp/vc/vc.el                                      |   2 +-
 lisp/vcursor.el                                    |   2 +-
 lisp/version.el                                    |   2 +-
 lisp/view.el                                       |   2 +-
 lisp/vt-control.el                                 |   2 +-
 lisp/vt100-led.el                                  |   2 +-
 lisp/w32-fns.el                                    |   2 +-
 lisp/w32-vars.el                                   |   2 +-
 lisp/wdired.el                                     |   2 +-
 lisp/whitespace.el                                 |   2 +-
 lisp/wid-browse.el                                 |   2 +-
 lisp/wid-edit.el                                   |   2 +-
 lisp/widget.el                                     |   2 +-
 lisp/windmove.el                                   |   2 +-
 lisp/window.el                                     |   2 +-
 lisp/winner.el                                     |   2 +-
 lisp/woman.el                                      |   2 +-
 lisp/x-dnd.el                                      |   2 +-
 lisp/xdg.el                                        |   2 +-
 lisp/xml.el                                        |   2 +-
 lisp/xt-mouse.el                                   |   2 +-
 lisp/xwidget.el                                    |   2 +-
 lwlib/Makefile.in                                  |   2 +-
 lwlib/deps.mk                                      |   2 +-
 lwlib/lwlib-Xaw.c                                  |   2 +-
 lwlib/lwlib-Xlw.c                                  |   2 +-
 lwlib/lwlib-Xm.c                                   |   2 +-
 lwlib/lwlib-Xm.h                                   |   2 +-
 lwlib/lwlib-int.h                                  |   2 +-
 lwlib/lwlib-utils.c                                |   2 +-
 lwlib/lwlib-widget.h                               |   2 +-
 lwlib/lwlib.c                                      |   2 +-
 lwlib/lwlib.h                                      |   2 +-
 lwlib/xlwmenu.c                                    |   2 +-
 lwlib/xlwmenu.h                                    |   2 +-
 lwlib/xlwmenuP.h                                   |   2 +-
 m4/getgroups.m4                                    |   2 +-
 m4/gnulib-comp.m4                                  |   2 +-
 m4/std-gnu11.m4                                    |   2 +-
 m4/stdalign.m4                                     |   2 +-
 m4/sys_types_h.m4                                  |   2 +-
 make-dist                                          |   2 +-
 modules/modhelp.py                                 |   2 +-
 .../Emacs.base/Contents/Resources/Credits.html     |   2 +-
 nextstep/INSTALL                                   |   2 +-
 nextstep/Makefile.in                               |   2 +-
 nextstep/README                                    |   2 +-
 nextstep/templates/Info.plist.in                   |   2 +-
 nt/INSTALL                                         |   9 +
 nt/INSTALL.W64                                     |   1 +
 nt/README                                          |   4 +-
 nt/README.W32                                      |   2 +-
 oldXMenu/Activate.c                                |   2 +-
 oldXMenu/Create.c                                  |   2 +-
 oldXMenu/FindSel.c                                 |   2 +-
 oldXMenu/Internal.c                                |   2 +-
 oldXMenu/Makefile.in                               |   2 +-
 oldXMenu/deps.mk                                   |   2 +-
 oldXMenu/insque.c                                  |   2 +-
 src/.gdbinit                                       |   2 +-
 src/Makefile.in                                    |   8 +-
 src/README                                         |   2 +-
 src/alloc.c                                        |   2 +-
 src/atimer.c                                       |   2 +-
 src/atimer.h                                       |   2 +-
 src/bidi.c                                         |   2 +-
 src/blockinput.h                                   |   2 +-
 src/buffer.c                                       |   2 +-
 src/buffer.h                                       |   2 +-
 src/bytecode.c                                     |   2 +-
 src/callint.c                                      |   2 +-
 src/callproc.c                                     |   2 +-
 src/casefiddle.c                                   |   2 +-
 src/casetab.c                                      |   2 +-
 src/category.c                                     |   2 +-
 src/category.h                                     |   2 +-
 src/ccl.c                                          |   4 +-
 src/ccl.h                                          |   2 +-
 src/character.c                                    |   2 +-
 src/character.h                                    |   2 +-
 src/charset.c                                      |   2 +-
 src/charset.h                                      |   2 +-
 src/chartab.c                                      |   2 +-
 src/cm.c                                           |   2 +-
 src/cm.h                                           |   2 +-
 src/cmds.c                                         |   2 +-
 src/coding.c                                       |   2 +-
 src/coding.h                                       |   2 +-
 src/commands.h                                     |   2 +-
 src/composite.c                                    |   2 +-
 src/composite.h                                    |   2 +-
 src/conf_post.h                                    |  24 +-
 src/data.c                                         |   2 +-
 src/dbusbind.c                                     |   2 +-
 src/decompress.c                                   |   2 +-
 src/deps.mk                                        |   2 +-
 src/dired.c                                        |   2 +-
 src/dispextern.h                                   |   2 +-
 src/dispnew.c                                      |   3 +-
 src/disptab.h                                      |   2 +-
 src/doc.c                                          |   4 +-
 src/doprnt.c                                       |   2 +-
 src/dynlib.c                                       |   2 +-
 src/dynlib.h                                       |   2 +-
 src/editfns.c                                      |   2 +-
 src/emacs-icon.h                                   |   2 +-
 src/emacs-module.c                                 |   2 +-
 src/emacs-module.h.in                              |   2 +-
 src/emacs.c                                        |   6 +-
 src/emacsgtkfixed.c                                |   2 +-
 src/emacsgtkfixed.h                                |   2 +-
 src/epaths.in                                      |   3 +-
 src/eval.c                                         |   2 +-
 src/fileio.c                                       |   6 +-
 src/filelock.c                                     |   2 +-
 src/firstfile.c                                    |   2 +-
 src/floatfns.c                                     |   2 +-
 src/fns.c                                          |   4 +-
 src/font.c                                         |   2 +-
 src/font.h                                         |   2 +-
 src/fontset.c                                      |   2 +-
 src/fontset.h                                      |   2 +-
 src/frame.c                                        |   4 +-
 src/frame.h                                        |   2 +-
 src/fringe.c                                       |   2 +-
 src/ftcrfont.c                                     |   2 +-
 src/ftfont.c                                       |   2 +-
 src/ftfont.h                                       |   2 +-
 src/ftxfont.c                                      |   2 +-
 src/getpagesize.h                                  |   2 +-
 src/gfilenotify.c                                  |   2 +-
 src/gmalloc.c                                      |  18 +-
 src/gnutls.c                                       |   6 +-
 src/gnutls.h                                       |   2 +-
 src/gtkutil.c                                      |   2 +-
 src/gtkutil.h                                      |   2 +-
 src/image.c                                        |   4 +-
 src/indent.c                                       |   2 +-
 src/indent.h                                       |   2 +-
 src/inotify.c                                      |   2 +-
 src/insdel.c                                       |   2 +-
 src/intervals.c                                    |   2 +-
 src/intervals.h                                    |   2 +-
 src/keyboard.c                                     |   2 +-
 src/keyboard.h                                     |   2 +-
 src/keymap.c                                       |   2 +-
 src/keymap.h                                       |   2 +-
 src/kqueue.c                                       |   2 +-
 src/lastfile.c                                     |   2 +-
 src/lcms.c                                         | 268 ++++++++++++++++++
 src/lisp.h                                         |  19 +-
 src/lread.c                                        |   2 +-
 src/macfont.h                                      |   2 +-
 src/macfont.m                                      |   2 +-
 src/macros.c                                       |   2 +-
 src/macros.h                                       |   2 +-
 src/marker.c                                       |   2 +-
 src/menu.c                                         |   2 +-
 src/menu.h                                         |   2 +-
 src/minibuf.c                                      |   2 +-
 src/nsfns.m                                        |   2 +-
 src/nsfont.m                                       |   4 +-
 src/nsgui.h                                        |   2 +-
 src/nsimage.m                                      |   2 +-
 src/nsmenu.m                                       |   2 +-
 src/nsselect.m                                     |   2 +-
 src/nsterm.h                                       |   2 +-
 src/nsterm.m                                       |   4 +-
 src/print.c                                        |   2 +-
 src/process.c                                      |   8 +-
 src/process.h                                      |   2 +-
 src/profiler.c                                     |   2 +-
 src/puresize.h                                     |   2 +-
 src/ralloc.c                                       |   2 +-
 src/regex.c                                        |   2 +-
 src/regex.h                                        |   2 +-
 src/region-cache.c                                 |   2 +-
 src/region-cache.h                                 |   2 +-
 src/scroll.c                                       |   2 +-
 src/search.c                                       |   2 +-
 src/sheap.c                                        |   2 +-
 src/sheap.h                                        |   2 +-
 src/sound.c                                        |   2 +-
 src/syntax.c                                       |   2 +-
 src/syntax.h                                       |   2 +-
 src/sysdep.c                                       |   4 +-
 src/sysselect.h                                    |   2 +-
 src/syssignal.h                                    |   2 +-
 src/sysstdio.h                                     |   2 +-
 src/systhread.c                                    |   2 +-
 src/systhread.h                                    |   2 +-
 src/systime.h                                      |   2 +-
 src/systty.h                                       |   2 +-
 src/syswait.h                                      |   2 +-
 src/term.c                                         |   2 +-
 src/termcap.c                                      |   2 +-
 src/termchar.h                                     |   2 +-
 src/termhooks.h                                    |   2 +-
 src/terminal.c                                     |   2 +-
 src/terminfo.c                                     |   2 +-
 src/termopts.h                                     |   2 +-
 src/textprop.c                                     |   2 +-
 src/thread.c                                       |   2 +-
 src/thread.h                                       |   2 +-
 src/tparam.c                                       |   2 +-
 src/tparam.h                                       |   2 +-
 src/undo.c                                         |   2 +-
 src/unexaix.c                                      |   2 +-
 src/unexcoff.c                                     |   2 +-
 src/unexcw.c                                       |   2 +-
 src/unexelf.c                                      |   2 +-
 src/unexmacosx.c                                   |   2 +-
 src/unexw32.c                                      |  22 +-
 src/vm-limit.c                                     |   2 +-
 src/w32fns.c                                       |   1 +
 src/w32heap.c                                      |   2 +-
 src/w32term.c                                      |   9 +-
 src/widget.c                                       |   2 +-
 src/widget.h                                       |   2 +-
 src/widgetprv.h                                    |   2 +-
 src/window.c                                       |   2 +-
 src/window.h                                       |   2 +-
 src/xdisp.c                                        |   2 +-
 src/xfaces.c                                       |  24 +-
 src/xfns.c                                         |   2 +-
 src/xfont.c                                        |   4 +-
 src/xftfont.c                                      |   2 +-
 src/xgselect.c                                     |   2 +-
 src/xgselect.h                                     |   2 +-
 src/xmenu.c                                        |   2 +-
 src/xml.c                                          |   2 +-
 src/xrdb.c                                         |   2 +-
 src/xselect.c                                      |   2 +-
 src/xsettings.c                                    |   2 +-
 src/xsettings.h                                    |   2 +-
 src/xsmfns.c                                       |   2 +-
 src/xterm.c                                        |   6 +-
 src/xterm.h                                        |   2 +-
 src/xwidget.c                                      |   2 +-
 src/xwidget.h                                      |   2 +-
 test/Makefile.in                                   |   2 +-
 test/README                                        |   2 +-
 test/data/emacs-module/mod-test.c                  |   2 +-
 test/lib-src/emacsclient-tests.el                  |   2 +-
 test/lisp/abbrev-tests.el                          |   2 +-
 test/lisp/arc-mode-tests.el                        |   2 +-
 test/lisp/auth-source-pass-tests.el                |   2 +-
 test/lisp/auth-source-tests.el                     |   2 +-
 test/lisp/autorevert-tests.el                      |   2 +-
 test/lisp/buff-menu-tests.el                       |   4 +-
 test/lisp/calc/calc-tests.el                       |   6 +-
 test/lisp/calendar/icalendar-tests.el              |   2 +-
 test/lisp/calendar/parse-time-tests.el             |   2 +-
 test/lisp/calendar/todo-mode-tests.el              |   2 +-
 test/lisp/char-fold-tests.el                       |   2 +-
 test/lisp/color-tests.el                           | 251 +++++++++++++++++
 test/lisp/comint-tests.el                          |   2 +-
 test/lisp/dabbrev-tests.el                         |   2 +-
 test/lisp/descr-text-tests.el                      |   2 +-
 test/lisp/dired-aux-tests.el                       |   4 +-
 test/lisp/dired-tests.el                           |  18 +-
 test/lisp/dired-x-tests.el                         |   4 +-
 test/lisp/dom-tests.el                             |   2 +-
 test/lisp/electric-tests.el                        |   2 +-
 test/lisp/emacs-lisp/benchmark-tests.el            |   2 +-
 test/lisp/emacs-lisp/bytecomp-tests.el             |   2 +-
 test/lisp/emacs-lisp/checkdoc-tests.el             |   2 +-
 test/lisp/emacs-lisp/cl-extra-tests.el             |   2 +-
 test/lisp/emacs-lisp/cl-generic-tests.el           |   2 +-
 test/lisp/emacs-lisp/cl-lib-tests.el               |   2 +-
 test/lisp/emacs-lisp/cl-macs-tests.el              |   2 +-
 test/lisp/emacs-lisp/cl-print-tests.el             |   2 +-
 test/lisp/emacs-lisp/cl-seq-tests.el               |   6 +-
 .../eieio-tests/eieio-test-methodinvoke.el         |   2 +-
 .../emacs-lisp/eieio-tests/eieio-test-persist.el   |  14 +-
 test/lisp/emacs-lisp/eieio-tests/eieio-tests.el    |   2 +-
 test/lisp/emacs-lisp/ert-tests.el                  |   2 +-
 test/lisp/emacs-lisp/ert-x-tests.el                |   2 +-
 test/lisp/emacs-lisp/generator-tests.el            |   2 +-
 test/lisp/emacs-lisp/gv-tests.el                   |   2 +-
 test/lisp/emacs-lisp/let-alist-tests.el            |   2 +-
 test/lisp/emacs-lisp/lisp-mode-tests.el            |   2 +-
 test/lisp/emacs-lisp/lisp-tests.el                 |   2 +-
 test/lisp/emacs-lisp/map-tests.el                  |   2 +-
 test/lisp/emacs-lisp/nadvice-tests.el              |   2 +-
 test/lisp/emacs-lisp/package-tests.el              |   2 +-
 test/lisp/emacs-lisp/pcase-tests.el                |   2 +-
 test/lisp/emacs-lisp/pp-tests.el                   |   2 +-
 test/lisp/emacs-lisp/regexp-opt-tests.el           |   2 +-
 test/lisp/emacs-lisp/ring-tests.el                 |   2 +-
 test/lisp/emacs-lisp/rx-tests.el                   |   2 +-
 test/lisp/emacs-lisp/seq-tests.el                  |   2 +-
 test/lisp/emacs-lisp/subr-x-tests.el               | 310 +++++++++++----------
 test/lisp/emacs-lisp/tabulated-list-test.el        |   2 +-
 .../emacs-lisp/testcover-resources/testcases.el    |   2 +-
 test/lisp/emacs-lisp/testcover-tests.el            |   2 +-
 test/lisp/emacs-lisp/thunk-tests.el                |   2 +-
 test/lisp/emacs-lisp/timer-tests.el                |   2 +-
 test/lisp/emulation/viper-tests.el                 |   2 +-
 test/lisp/epg-tests.el                             |   2 +-
 test/lisp/erc/erc-track-tests.el                   |   2 +-
 test/lisp/eshell/em-ls-tests.el                    |  10 +-
 test/lisp/eshell/eshell-tests.el                   |   2 +-
 test/lisp/faces-tests.el                           |   2 +-
 test/lisp/ffap-tests.el                            |   8 +-
 test/lisp/filenotify-tests.el                      |   2 +-
 test/lisp/files-tests.el                           |  33 ++-
 test/lisp/files-x-tests.el                         |   2 +-
 test/lisp/gnus/gnus-tests.el                       |   2 +-
 test/lisp/gnus/message-tests.el                    |   2 +-
 test/lisp/help-fns-tests.el                        |   6 +-
 test/lisp/hi-lock-tests.el                         |   4 +-
 test/lisp/htmlfontify-tests.el                     |   2 +-
 test/lisp/ibuffer-tests.el                         |  10 +-
 test/lisp/ido-tests.el                             |   2 +-
 test/lisp/imenu-tests.el                           |   2 +-
 test/lisp/info-xref-tests.el                       |   2 +-
 test/lisp/international/mule-tests.el              |   2 +-
 test/lisp/international/mule-util-tests.el         |   2 +-
 test/lisp/international/ucs-normalize-tests.el     |   2 +-
 test/lisp/isearch-tests.el                         |   2 +-
 test/lisp/jit-lock-tests.el                        |   2 +-
 test/lisp/json-tests.el                            |   2 +-
 test/lisp/kmacro-tests.el                          |   2 +-
 test/lisp/ls-lisp-tests.el                         |  10 +-
 test/lisp/mail/rmail-tests.el                      |   2 +-
 test/lisp/man-tests.el                             |   2 +-
 test/lisp/md4-tests.el                             |   2 +-
 test/lisp/minibuffer-tests.el                      |   2 +-
 test/lisp/mouse-tests.el                           |   2 +-
 test/lisp/net/dbus-tests.el                        |   2 +-
 test/lisp/net/gnutls-tests.el                      |   2 +-
 test/lisp/net/mailcap-tests.el                     |   2 +-
 test/lisp/net/network-stream-tests.el              |   2 +-
 test/lisp/net/newsticker-tests.el                  |   2 +-
 test/lisp/net/puny-tests.el                        |   2 +-
 test/lisp/net/sasl-scram-rfc-tests.el              |   2 +-
 test/lisp/net/shr-tests.el                         |   2 +-
 test/lisp/net/tramp-tests.el                       | 137 +++++----
 test/lisp/obarray-tests.el                         |   2 +-
 test/lisp/progmodes/bat-mode-tests.el              |   2 +-
 test/lisp/progmodes/cc-mode-tests.el               |   2 +-
 test/lisp/progmodes/compile-tests.el               |   2 +-
 test/lisp/progmodes/elisp-mode-tests.el            |   2 +-
 test/lisp/progmodes/etags-tests.el                 |   2 +-
 test/lisp/progmodes/f90-tests.el                   |  32 +--
 test/lisp/progmodes/flymake-tests.el               |   4 +-
 test/lisp/progmodes/js-tests.el                    |   2 +-
 test/lisp/progmodes/python-tests.el                |   2 +-
 test/lisp/progmodes/ruby-mode-tests.el             |   2 +-
 test/lisp/progmodes/sql-tests.el                   |   2 +-
 test/lisp/progmodes/subword-tests.el               |   8 +-
 test/lisp/progmodes/xref-tests.el                  |   2 +-
 test/lisp/ps-print-tests.el                        |   2 +-
 test/lisp/register-tests.el                        |   4 +-
 test/lisp/replace-tests.el                         |   2 +-
 test/lisp/rot13-tests.el                           |   2 +-
 test/lisp/ses-tests.el                             |   2 +-
 test/lisp/shell-tests.el                           |   2 +-
 test/lisp/simple-tests.el                          |   2 +-
 test/lisp/sort-tests.el                            |   2 +-
 test/lisp/soundex-tests.el                         |   2 +-
 test/lisp/subr-tests.el                            |   4 +-
 test/lisp/tar-mode-tests.el                        |   2 +-
 test/lisp/textmodes/css-mode-tests.el              |   2 +-
 test/lisp/textmodes/dns-mode-tests.el              |   2 +-
 test/lisp/textmodes/mhtml-mode-tests.el            |   2 +-
 test/lisp/textmodes/reftex-tests.el                |   2 +-
 test/lisp/textmodes/sgml-mode-tests.el             |   2 +-
 test/lisp/textmodes/tildify-tests.el               |   2 +-
 test/lisp/thingatpt-tests.el                       |  32 +--
 test/lisp/url/url-auth-tests.el                    |   2 +-
 test/lisp/url/url-expand-tests.el                  |   2 +-
 test/lisp/url/url-future-tests.el                  |   2 +-
 test/lisp/url/url-parse-tests.el                   |   2 +-
 test/lisp/url/url-util-tests.el                    |   2 +-
 test/lisp/vc/add-log-tests.el                      |   2 +-
 test/lisp/vc/diff-mode-tests.el                    |   6 +-
 test/lisp/vc/ediff-diff-tests.el                   |   2 +-
 test/lisp/vc/ediff-ptch-tests.el                   |   6 +-
 test/lisp/vc/vc-bzr-tests.el                       |   6 +-
 test/lisp/vc/vc-hg-tests.el                        |   2 +-
 test/lisp/vc/vc-tests.el                           |   2 +-
 test/lisp/whitespace-tests.el                      |   2 +-
 test/lisp/xdg-tests.el                             |   2 +-
 test/lisp/xml-tests.el                             |   2 +-
 test/lisp/xt-mouse-tests.el                        |   2 +-
 test/manual/biditest.el                            |   2 +-
 test/manual/cedet/cedet-utests.el                  |   2 +-
 test/manual/cedet/ede-tests.el                     |   2 +-
 test/manual/cedet/semantic-ia-utest.el             |   2 +-
 test/manual/cedet/semantic-tests.el                |   2 +-
 test/manual/cedet/semantic-utest-c.el              |   2 +-
 test/manual/cedet/semantic-utest.el                |   2 +-
 test/manual/cedet/srecode-tests.el                 |   2 +-
 test/manual/cedet/tests/test.c                     |   9 +-
 test/manual/cedet/tests/test.el                    |   2 +-
 test/manual/cedet/tests/test.make                  |   4 +-
 test/manual/cedet/tests/testdoublens.cpp           |   3 +-
 test/manual/cedet/tests/testdoublens.hpp           |   5 +-
 test/manual/cedet/tests/testjavacomp.java          |   2 +-
 test/manual/cedet/tests/testpolymorph.cpp          |   2 +-
 test/manual/cedet/tests/testspp.c                  |   3 +-
 test/manual/cedet/tests/testsppreplace.c           |   3 +-
 test/manual/cedet/tests/testsppreplaced.c          |   2 +-
 test/manual/cedet/tests/testsubclass.cpp           |   3 +-
 test/manual/cedet/tests/testsubclass.hh            |   7 +-
 test/manual/cedet/tests/testtypedefs.cpp           |   3 +-
 test/manual/cedet/tests/testvarnames.c             |   2 +-
 test/manual/etags/c-src/emacs/src/gmalloc.c        |  20 +-
 test/manual/etags/c-src/emacs/src/keyboard.c       |   2 +-
 test/manual/etags/c-src/emacs/src/lisp.h           |   2 +-
 test/manual/etags/c-src/emacs/src/regex.h          |   2 +-
 test/manual/etags/c-src/etags.c                    |   2 +-
 .../etags/el-src/emacs/lisp/progmodes/etags.el     |   2 +-
 test/manual/etags/html-src/software.html           |   4 +-
 test/manual/etags/html-src/softwarelibero.html     |  10 +-
 test/manual/image-size-tests.el                    |   2 +-
 test/manual/indent/octave.m                        |   2 +-
 test/manual/indent/pascal.pas                      |   2 +-
 test/manual/redisplay-testsuite.el                 |   3 +-
 test/manual/rmailmm.el                             |   2 +-
 test/manual/scroll-tests.el                        |   2 +-
 test/src/alloc-tests.el                            |   2 +-
 test/src/buffer-tests.el                           |   2 +-
 test/src/callproc-tests.el                         |   2 +-
 test/src/casefiddle-tests.el                       |   2 +-
 test/src/charset-tests.el                          |   2 +-
 test/src/chartab-tests.el                          |   2 +-
 test/src/cmds-tests.el                             |   2 +-
 test/src/coding-tests.el                           |   2 +-
 test/src/data-tests.el                             |   2 +-
 test/src/decompress-tests.el                       |   2 +-
 test/src/doc-tests.el                              |   2 +-
 test/src/editfns-tests.el                          |   2 +-
 test/src/emacs-module-tests.el                     |   2 +-
 test/src/eval-tests.el                             |   2 +-
 test/src/fileio-tests.el                           |   2 +-
 test/src/floatfns-tests.el                         |   2 +-
 test/src/fns-tests.el                              |   2 +-
 test/src/font-tests.el                             |   2 +-
 test/src/inotify-tests.el                          |   2 +-
 test/src/keymap-tests.el                           |   2 +-
 test/src/lread-tests.el                            |   4 +-
 test/src/marker-tests.el                           |   2 +-
 test/src/minibuf-tests.el                          |   2 +-
 test/src/print-tests.el                            |   2 +-
 test/src/process-tests.el                          |   2 +-
 test/src/regex-tests.el                            |   2 +-
 test/src/syntax-tests.el                           |   2 +-
 test/src/textprop-tests.el                         |   2 +-
 test/src/thread-tests.el                           |   2 +-
 test/src/undo-tests.el                             |   6 +-
 test/src/xml-tests.el                              |   2 +-
 2264 files changed, 4188 insertions(+), 3742 deletions(-)

diff --git a/.dir-locals.el b/.dir-locals.el
index 8a4a348..a3705f4 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -8,7 +8,7 @@
                    (log-edit-setup-add-author . t)))
  (change-log-mode . ((add-log-time-zone-rule . t)
                     (fill-column . 74)
-                    (bug-reference-url-format . "http://debbugs.gnu.org/%s";)
+                    (bug-reference-url-format . "https://debbugs.gnu.org/%s";)
                     (mode . bug-reference)))
  (diff-mode . ((mode . whitespace)))
  (emacs-lisp-mode . ((indent-tabs-mode . nil))))
diff --git a/.gitattributes b/.gitattributes
index d523e13..df75c9a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 # A few files use CRLF endings, even on non-Microsoft platforms.
 # Do not warn about trailing whitespace with these files.
diff --git a/.gitignore b/.gitignore
index 9229297..7426082 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 # Currently we assume only Git 1.7.1 (April 2010) or later, so this
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 91ed6f9..08dd74e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@
 #  GNU General Public License for more details.
 #
 #  You should have received a copy of the GNU General Public License
-#  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+#  along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 # GNU Emacs support for the GitLab protocol for CI
 
diff --git a/BUGS b/BUGS
index 30bf10e..ee47321 100644
--- a/BUGS
+++ b/BUGS
@@ -7,7 +7,7 @@ Bugs section of the Emacs manual for advice on
 You can read the Bugs section of the manual from inside Emacs.
 Start Emacs, and press
   C-h r       (to view the Emacs manual)
-  m Bugs RET  (to go to the section on Bugs) 
+  m Bugs RET  (to go to the section on Bugs)
 Or you can use the standalone Info program:
   info emacs
   m Bugs RET
@@ -15,7 +15,7 @@ Or you can use the standalone Info program:
 Emacs distribution.)
 
 Printed copies of the Emacs manual can be purchased from the Free
-Software Foundation's online store at <http://shop.fsf.org/>.
+Software Foundation's online store at <https://shop.fsf.org/>.
 
 If necessary, you can read the manual without an info program:
 
diff --git a/CONTRIBUTE b/CONTRIBUTE
index 9b5fb09..90c6a86 100644
--- a/CONTRIBUTE
+++ b/CONTRIBUTE
@@ -1,7 +1,7 @@
 * How developers contribute to GNU Emacs
 
 Here is how software developers can contribute to Emacs.  (Non-developers: see
-http://www.gnu.org/software/emacs/manual/html_node/emacs/Contributing.html
+https://www.gnu.org/software/emacs/manual/html_node/emacs/Contributing.html
 or run the shell command 'info "(emacs)Contributing"'.)
 
 ** The Emacs repository
@@ -38,12 +38,12 @@ there.
 
 Bug reports and fixes, feature requests and patches/implementations
 should be sent to address@hidden, the bug/feature list.  This
-is coupled to the http://debbugs.gnu.org tracker.  It is best to use
+is coupled to the https://debbugs.gnu.org tracker.  It is best to use
 the command 'M-x report-emacs-bug RET' to report issues to the tracker
 (described below).  Be prepared to receive comments and requests for
 changes in your patches, following your submission.
 
-The Savannah info page http://savannah.gnu.org/mail/?group=emacs
+The Savannah info page https://savannah.gnu.org/mail/?group=emacs
 describes how to subscribe to the mailing lists, or see the list
 archives.
 
@@ -55,7 +55,7 @@ such patch without additional remarks, you can use a command 
like
 
 ** Issue tracker (a.k.a. "bug tracker")
 
-The Emacs issue tracker at http://debbugs.gnu.org lets you view bug
+The Emacs issue tracker at https://debbugs.gnu.org lets you view bug
 reports and search the database for bugs matching several criteria.
 Messages posted to the address@hidden mailing list, mentioned
 above, are recorded by the tracker with the corresponding bugs/issues.
@@ -89,11 +89,11 @@ If your change requires updating the manuals to document new
 functions/commands/variables/faces, then use the proper Texinfo
 command to index them; for instance, use @vindex for variables and
 @findex for functions/commands.  For the full list of predefine indices, see
-http://www.gnu.org/software/texinfo/manual/texinfo/html_node/Predefined-Indices.html
+https://www.gnu.org/software/texinfo/manual/texinfo/html_node/Predefined-Indices.html
 or run the shell command 'info "(texinfo)Predefined Indices"'.
 
 For more specific tips on Emacs's doc style, see
-http://www.gnu.org/software/emacs/manual/html_node/elisp/Documentation-Tips.html
+https://www.gnu.org/software/emacs/manual/html_node/elisp/Documentation-Tips.html
 Use 'checkdoc' to check for documentation errors before submitting a patch.
 
 ** Testing your changes
@@ -104,7 +104,7 @@ functionality you commit (of course, some changes cannot be 
easily
 tested).
 
 Emacs uses ERT, Emacs Lisp Regression Testing, for testing.  See
-http://www.gnu.org/software/emacs/manual/html_node/ert/
+https://www.gnu.org/software/emacs/manual/html_node/ert/
 or run 'info "(ert)"' for for more information on writing and running
 tests.
 
@@ -184,7 +184,7 @@ them right the first time, so here are guidelines for 
formatting them:
   between the summary line and the file entries.
 
 - Emacs generally follows the GNU coding standards for ChangeLogs: see
-  http://www.gnu.org/prep/standards/html_node/Change-Logs.html
+  https://www.gnu.org/prep/standards/html_node/Change-Logs.html
   or run 'info "(standards)Change Logs"'.  One exception is that
   commits still sometimes quote `like-this' (as the standards used to
   recommend) rather than 'like-this' or ‘like this’ (as they do now),
@@ -194,7 +194,7 @@ them right the first time, so here are guidelines for 
formatting them:
   to ChangeLog entries: they must be in English, and be complete
   sentences starting with a capital and ending with a period (except
   the summary line should not end in a period).  See
-  http://www.gnu.org/prep/standards/html_node/Comments.html
+  https://www.gnu.org/prep/standards/html_node/Comments.html
   or run 'info "(standards)Comments"'.
 
   They are preserved indefinitely, and have a reasonable chance of
@@ -234,7 +234,7 @@ them right the first time, so here are guidelines for 
formatting them:
 ** Generating ChangeLog entries
 
 - You can use Emacs functions to write ChangeLog entries; see
-  
http://www.gnu.org/software/emacs/manual/html_node/emacs/Change-Log-Commands.html
+  
https://www.gnu.org/software/emacs/manual/html_node/emacs/Change-Log-Commands.html
   or run 'info "(emacs)Change Log Commands"'.
 
 - If you use Emacs VC, one way to format ChangeLog entries is to create
@@ -305,8 +305,8 @@ The best way to understand Emacs internals is to read the 
code.  Some
 source files, such as xdisp.c, have extensive comments describing the
 design and implementation.  The following resources may also help:
 
-http://www.gnu.org/software/emacs/manual/html_node/elisp/Tips.html
-http://www.gnu.org/software/emacs/manual/html_node/elisp/GNU-Emacs-Internals.html
+https://www.gnu.org/software/emacs/manual/html_node/elisp/Tips.html
+https://www.gnu.org/software/emacs/manual/html_node/elisp/GNU-Emacs-Internals.html
 
 or run 'info "(elisp)Tips"' or 'info "(elisp)GNU Emacs Internals"'.
 
@@ -365,7 +365,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 Local variables:
 mode: outline
diff --git a/GNUmakefile b/GNUmakefile
index 304a7b3..3627d22 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 #
 # written by Paul Eggert
 
diff --git a/INSTALL b/INSTALL
index b018055..e76e843 100644
--- a/INSTALL
+++ b/INSTALL
@@ -24,7 +24,7 @@ find some things, or what options to use.
 'src/config.h' file containing system-dependent definitions.
 Running the 'make' utility then builds the package for your system.
 
-Building Emacs requires GNU make, <http://www.gnu.org/software/make/>.
+Building Emacs requires GNU make, <https://www.gnu.org/software/make/>.
 On most systems that Emacs supports, this is the default 'make' program.
 
 Here's the procedure to build Emacs using 'configure' on systems which
@@ -162,7 +162,7 @@ can be found (in the unlikely event that your distribution 
does not
 provide them).  By default, libraries marked with an X are required if
 X11 is being used.
 
-    libXaw3d          http://directory.fsf.org/project/xaw3d/
+    libXaw3d          https://directory.fsf.org/project/xaw3d/
   X libxpm for XPM:   http://www.x.org/releases/current/src/lib/
   X libpng for PNG:   http://www.libpng.org/
     libz (for PNG):   http://www.zlib.net/
@@ -187,7 +187,7 @@ them.
 On the GNU system, Emacs supports both X fonts and local fonts
 (i.e. fonts managed by the fontconfig library).  If you need more
 fonts than your distribution normally provides, you must install them
-yourself.  See <URL:http://www.gnu.org/software/freefont/> for a large
+yourself.  See <https://www.gnu.org/software/freefont/> for a large
 number of free Unicode fonts.
 
 * GNU/Linux development packages
@@ -678,4 +678,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/INSTALL.REPO b/INSTALL.REPO
index e7bb3bb..ac991f7 100644
--- a/INSTALL.REPO
+++ b/INSTALL.REPO
@@ -91,4 +91,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/Makefile.in b/Makefile.in
index 8a08465..14244ea 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ### Commentary:
 
@@ -991,8 +991,7 @@ ${srcdir}/info/dir: ${info_dir_deps}
        $(AM_V_at)${MKDIR_P} ${srcdir}/info
        $(AM_V_GEN)(cd ${srcdir}/doc && \
         AWK='${AWK}' ../build-aux/make-info-dir ${info_dir_inputs} \
-       ) >address@hidden
-       mv address@hidden $@
+       ) >address@hidden && mv address@hidden $@
 
 INSTALL_DVI = install-emacs-dvi install-lispref-dvi \
        install-lispintro-dvi install-misc-dvi
diff --git a/README b/README
index 527e406..c3cf78f 100644
--- a/README
+++ b/README
@@ -28,7 +28,7 @@ See the "Bugs" section of the Emacs manual for more 
information on how
 to report bugs.  (The file 'BUGS' in this directory explains how you
 can find and read that section using the Info files that come with
 Emacs.)  For a list of mailing lists related to Emacs, see
-<http://savannah.gnu.org/mail/?group=emacs>.  For the complete
+<https://savannah.gnu.org/mail/?group=emacs>.  For the complete
 list of GNU mailing lists, see <http://lists.gnu.org/>.
 
 The 'etc' subdirectory contains several other files, named in capital
@@ -116,4 +116,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/admin/README b/admin/README
index cb6ba85..7906844 100644
--- a/admin/README
+++ b/admin/README
@@ -78,7 +78,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 Local variables:
 mode: outline
diff --git a/admin/admin.el b/admin/admin.el
index e81e7f1..44d091d 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/admin/alloc-colors.c b/admin/alloc-colors.c
index fa6a639..a4701dd 100644
--- a/admin/alloc-colors.c
+++ b/admin/alloc-colors.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 #include <X11/Xlib.h>
diff --git a/admin/authors.el b/admin/authors.el
index 86d42be..c69ca94 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/admin/build-configs b/admin/build-configs
index aa62dad..ac3147f 100755
--- a/admin/build-configs
+++ b/admin/build-configs
@@ -16,7 +16,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 require 5;
@@ -97,4 +97,3 @@ foreach $config (@configs)
 # Local Variables:
 # mode: cperl
 # End:
-
diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el
index 46a5e42..d867c05 100644
--- a/admin/bzrmerge.el
+++ b/admin/bzrmerge.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/admin/charsets/Makefile.in b/admin/charsets/Makefile.in
index b154bc1..0c252ae 100644
--- a/admin/charsets/Makefile.in
+++ b/admin/charsets/Makefile.in
@@ -19,7 +19,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ### Commentary:
 
diff --git a/admin/charsets/big5.awk b/admin/charsets/big5.awk
index 7482d11..2393f91 100644
--- a/admin/charsets/big5.awk
+++ b/admin/charsets/big5.awk
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 BEGIN {
   tohex["A"] = 10;
@@ -68,5 +68,3 @@ function decode_big5(big5) {
   code = decode_big5(big5);
   printf "0x%04X %s\n", code, $2;
 }
-
-
diff --git a/admin/charsets/compact.awk b/admin/charsets/compact.awk
index 21e03ee..b912a0f 100644
--- a/admin/charsets/compact.awk
+++ b/admin/charsets/compact.awk
@@ -16,7 +16,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 # Commentary:
 # Make a charset map compact by changing this kind of line sequence:
diff --git a/admin/charsets/cp51932.awk b/admin/charsets/cp51932.awk
index df1f8cd..6aac988 100644
--- a/admin/charsets/cp51932.awk
+++ b/admin/charsets/cp51932.awk
@@ -16,7 +16,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 # Commentary:
 
diff --git a/admin/charsets/cp932.awk b/admin/charsets/cp932.awk
index acba033..7fd3e91 100644
--- a/admin/charsets/cp932.awk
+++ b/admin/charsets/cp932.awk
@@ -16,7 +16,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 # Commentary:
 
@@ -113,4 +113,3 @@ END {
        printf "0x%02X%02X 0x%04X # 4\n", i, j, code++;
     }
 }
-
diff --git a/admin/charsets/eucjp-ms.awk b/admin/charsets/eucjp-ms.awk
index 24152b4..94e27d0 100644
--- a/admin/charsets/eucjp-ms.awk
+++ b/admin/charsets/eucjp-ms.awk
@@ -16,7 +16,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 # Commentary:
 
diff --git a/admin/charsets/gb180302.awk b/admin/charsets/gb180302.awk
index 4947f96..1a6995a 100644
--- a/admin/charsets/gb180302.awk
+++ b/admin/charsets/gb180302.awk
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 BEGIN {
   tohex["A"] = 10;
diff --git a/admin/charsets/gb180304.awk b/admin/charsets/gb180304.awk
index 81d7e73..9c6522b 100644
--- a/admin/charsets/gb180304.awk
+++ b/admin/charsets/gb180304.awk
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 BEGIN {
   tohex["A"] = 10;
diff --git a/admin/charsets/mapconv b/admin/charsets/mapconv
index 5f62ff9..8ee3d14 100755
--- a/admin/charsets/mapconv
+++ b/admin/charsets/mapconv
@@ -19,7 +19,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 # Commentary:
 
diff --git a/admin/charsets/mapfiles/README b/admin/charsets/mapfiles/README
index f9dc2ba..f4fea85 100644
--- a/admin/charsets/mapfiles/README
+++ b/admin/charsets/mapfiles/README
@@ -80,4 +80,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/admin/charsets/mule-charsets.el b/admin/charsets/mule-charsets.el
index 4ccf4bf..8355af4 100644
--- a/admin/charsets/mule-charsets.el
+++ b/admin/charsets/mule-charsets.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 ;; For the record: the old, pre-v23 code was this:
@@ -67,4 +67,3 @@
     (sort-lines nil (point-min) (point-max))
     (let ((coding-system-for-write 'unix))
       (write-file (car elt)))))
-
diff --git a/admin/cus-test.el b/admin/cus-test.el
index 3808a44..a8582ac 100644
--- a/admin/cus-test.el
+++ b/admin/cus-test.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/admin/diff-tar-files b/admin/diff-tar-files
index 23df9ff..f45d72f 100755
--- a/admin/diff-tar-files
+++ b/admin/diff-tar-files
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 if [ $# != 2 ]; then
diff --git a/admin/find-gc.el b/admin/find-gc.el
index 53ac922..91acbb5 100644
--- a/admin/find-gc.el
+++ b/admin/find-gc.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index a0efce5..0dfd190 100644
--- a/admin/gitmerge.el
+++ b/admin/gitmerge.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/admin/grammars/Makefile.in b/admin/grammars/Makefile.in
index fd1d895..740168f 100644
--- a/admin/grammars/Makefile.in
+++ b/admin/grammars/Makefile.in
@@ -15,7 +15,7 @@
 ## GNU General Public License for more details.
 
 ## You should have received a copy of the GNU General Public License
-## along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+## along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ### Commentary:
 
diff --git a/admin/grammars/c.by b/admin/grammars/c.by
index c312fd6..da9f967 100644
--- a/admin/grammars/c.by
+++ b/admin/grammars/c.by
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;; TODO:  From Nate Schley
 ;; >  * Can't parse signature element: "const char* const rmc_ClrTxt"
diff --git a/admin/grammars/grammar.wy b/admin/grammars/grammar.wy
index ffbe7cc..d64dcdc 100644
--- a/admin/grammars/grammar.wy
+++ b/admin/grammars/grammar.wy
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 %package semantic-grammar-wy
 %provide semantic/grammar-wy
diff --git a/admin/grammars/java-tags.wy b/admin/grammars/java-tags.wy
index bbad38d..f1a4c14 100644
--- a/admin/grammars/java-tags.wy
+++ b/admin/grammars/java-tags.wy
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 %package wisent-java-tags-wy
 %provide semantic/wisent/javat-wy
diff --git a/admin/grammars/js.wy b/admin/grammars/js.wy
index 72b662e..ded8023 100644
--- a/admin/grammars/js.wy
+++ b/admin/grammars/js.wy
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/admin/grammars/make.by b/admin/grammars/make.by
index 0bfde31..d3a03ea 100644
--- a/admin/grammars/make.by
+++ b/admin/grammars/make.by
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 %package semantic-make-by
 %provide semantic/bovine/make-by
@@ -134,7 +134,7 @@ elements: element some-whitespace elements
          ( ,@$1 )
        | ;;EMPTY
        ;
-  
+
 element: sub-element element
         ( (concat (car ,$1) (car ,$2)) )
        | ;;EMPTY
diff --git a/admin/grammars/python.wy b/admin/grammars/python.wy
index 23aa65c..c8426e2 100644
--- a/admin/grammars/python.wy
+++ b/admin/grammars/python.wy
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/admin/grammars/scheme.by b/admin/grammars/scheme.by
index c4d6a39..86fe81d 100644
--- a/admin/grammars/scheme.by
+++ b/admin/grammars/scheme.by
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 %package semantic-scm-by
 %provide semantic/bovine/scm-by
@@ -98,4 +98,3 @@ expression : symbol
           ;
 
 ;;; scheme.by ends here
-
diff --git a/admin/grammars/srecode-template.wy 
b/admin/grammars/srecode-template.wy
index 811a324..aefa4c8 100644
--- a/admin/grammars/srecode-template.wy
+++ b/admin/grammars/srecode-template.wy
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/admin/last-chance.el b/admin/last-chance.el
index cab2d47..76b8bcf 100644
--- a/admin/last-chance.el
+++ b/admin/last-chance.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/admin/make-emacs b/admin/make-emacs
index 4c73506..0938336 100755
--- a/admin/make-emacs
+++ b/admin/make-emacs
@@ -17,7 +17,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 require 5;
diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index e5c7717..5822f66 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -18,7 +18,7 @@ Steps to take before starting on the first pretest in any 
release sequence:
     when preparing the first pretest for a major Emacs release.)
     Commit cus-edit.el if changed.
 
-3.  Remove any old pretests from ftp://alpha.gnu.org/gnu/emacs/pretest.
+3.  Remove any old pretests from https://alpha.gnu.org/gnu/emacs/pretest.
     You can use 'gnupload --delete' (see below for more gnupload details).
 
 General steps (for each step, check for possible errors):
@@ -101,8 +101,8 @@ General steps (for each step, check for possible errors):
     Check the contents of the new tar with admin/diff-tar-files
     against the previous release (if this is the first pretest) or the
     previous pretest.  If you did not make the previous pretest
-    yourself, find it at <ftp://alpha.gnu.org/gnu/emacs/pretest>.
-    Releases are of course at <ftp://ftp.gnu.org/pub/gnu/emacs/>.
+    yourself, find it at <https://alpha.gnu.org/gnu/emacs/pretest>.
+    Releases are of course at <https://ftp.gnu.org/pub/gnu/emacs/>.
 
     If this is the first pretest of a major release, just comparing
     with the previous release may overlook many new files.  You can try
@@ -130,9 +130,9 @@ General steps (for each step, check for possible errors):
     Now you should upload the files to the GNU ftp server.  In order to
     do that, you must be registered as an Emacs maintainer and have your
     GPG key acknowledged by the ftp people.  For instructions, see
-    
http://www.gnu.org/prep/maintain/html_node/Automated-Upload-Registration.html
+    
https://www.gnu.org/prep/maintain/html_node/Automated-Upload-Registration.html
     The simplest method to upload is to use the gnulib
-    <http://www.gnu.org/s/gnulib/> script "build-aux/gnupload":
+    <https://www.gnu.org/s/gnulib/> script "build-aux/gnupload":
 
     For a pretest:
      gnupload [--user address@hidden --to alpha.gnu.org:emacs/pretest \
@@ -161,11 +161,11 @@ General steps (for each step, check for possible errors):
     FILE.sig, FILE.directive.asc.
     For a release, place the files in the /incoming/ftp directory.
     For a pretest, place the files in /incoming/alpha instead, so that
-    they appear on ftp://alpha.gnu.org/.
+    they appear on https://alpha.gnu.org/.
 
 10. After five minutes, verify that the files are visible at
-    ftp://alpha.gnu.org/gnu/emacs/pretest/ for a pretest, or
-    ftp://ftp.gnu.org/gnu/emacs/ for a release.
+    https://alpha.gnu.org/gnu/emacs/pretest/ for a pretest, or
+    https://ftp.gnu.org/gnu/emacs/ for a release.
 
     Download them and check the signatures.  Check they build.
 
@@ -185,7 +185,7 @@ UPDATING THE EMACS WEB PAGES AFTER A RELEASE
 
 As soon as possible after a release, the Emacs web pages should be updated.
 Anyone with write access to the Emacs code repository can do this.
-For instructions, see <http://savannah.gnu.org/cvs/?group=emacs>.
+For instructions, see <https://savannah.gnu.org/cvs/?group=emacs>.
 Changes go live more or less as soon as they are committed.
 
 The pages to update are:
@@ -215,5 +215,5 @@ Add compressed copies of the main info pages from the 
tarfile to manual/info/.
 Update the refcards/pdf/ and ps/ directories, and also
 refcards/emacs-refcards.tar.gz (use make -C etc/refcards pdf ps dist).
 
-Browsing <http://web.cvs.savannah.gnu.org/viewvc/?root=emacs> is one
+Browsing <https://web.cvs.savannah.gnu.org/viewvc/?root=emacs> is one
 way to check for any files that still need updating.
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index e7b304a..60104e8 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -19,7 +19,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 # written by Paul Eggert
 
diff --git a/admin/merge-pkg-config b/admin/merge-pkg-config
index 363d22d..dbacb4bc 100755
--- a/admin/merge-pkg-config
+++ b/admin/merge-pkg-config
@@ -19,7 +19,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 # written by Paul Eggert
 
diff --git a/admin/notes/bugtracker b/admin/notes/bugtracker
index 3d6df03..6d0fe50 100644
--- a/admin/notes/bugtracker
+++ b/admin/notes/bugtracker
@@ -1,6 +1,6 @@
 NOTES ON THE EMACS BUG TRACKER   -*- outline -*-
 
-The Emacs Bug Tracker can be found at http://debbugs.gnu.org/
+The Emacs Bug Tracker can be found at https://debbugs.gnu.org/
 
 * Quick-start guide
 
@@ -33,14 +33,14 @@ tags 123 moreinfo|unreproducible|wontfix|patch
 
 * More detailed information
 
-For a list of all bugs, see http://debbugs.gnu.org/db/pa/lemacs.html
+For a list of all bugs, see https://debbugs.gnu.org/db/pa/lemacs.html
 This is a static page, updated once a day.  There is also a dynamic
 list, generated on request. This accepts various options, eg to see
 the most recent bugs:
 
-http://debbugs.gnu.org/cgi/pkgreport.cgi?newest=100
+https://debbugs.gnu.org/cgi/pkgreport.cgi?newest=100
 
-Or follow the links on the front page http://debbugs.gnu.org .
+Or follow the links on the front page https://debbugs.gnu.org .
 
 ** How do I report a bug in Emacs now?
 The same way as you always did.  Send mail to address@hidden,
@@ -73,7 +73,7 @@ cc everyone on replies.)
 (Many people think the submitter SHOULD be automatically subscribed
 to subsequent discussion, but this does not seem to be implemented.
 See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=37078
-See also http://debbugs.gnu.org/5439 )
+See also https://debbugs.gnu.org/5439 )
 
 Do NOT send a separate copy to the bug list address, since this may
 generate a new report.  The only time to send mail to the bug list
@@ -246,7 +246,7 @@ reopen 123
 *** Bugs can be tagged in various ways (eg wontfix, patch, etc).
 The available tags are:
 patch wontfix moreinfo unreproducible fixed notabug
-See http://debbugs.gnu.org/Developer#tags
+See https://debbugs.gnu.org/Developer#tags
 The list of tags can be prefixed with +, - or =, meaning to add (the
 default), remove, or reset the tags. E.g.:
 
@@ -254,7 +254,7 @@ tags 123 + wontfix
 
 ** URL shortcuts
 
-http://debbugs.gnu.org/...
+https://debbugs.gnu.org/...
 
 123             # given bug number
 123;mbox=yes    # mbox version of given bug
@@ -314,11 +314,11 @@ search box.  The only piece you really need to add is the 
"users"
 portion, the rest has the same syntax as normal.
 
 **** To browse bugs by usertag:
-http://debbugs.gnu.org/cgi/pkgindex.cgi?indexon=users
+https://debbugs.gnu.org/cgi/pkgindex.cgi?indexon=users
 
 **** To find all bugs usertagged by a given email address:
 
-http://debbugs.gnu.org/cgi/pkgreport.cgi?users=emacs
+https://debbugs.gnu.org/cgi/pkgreport.cgi?users=emacs
 
 (Supposedly, the "users" field can be a comma-separated list of more
 than one email address, but it does not seem to work for me.)
@@ -328,7 +328,7 @@ than one email address, but it does not seem to work for 
me.)
 This works just like a normal tags search, but with the addition of a
 "users" field.  Eg:
 
-http://debbugs.gnu.org/cgi/pkgreport.cgi?users=emacs;tag=calendar
+https://debbugs.gnu.org/cgi/pkgreport.cgi?users=emacs;tag=calendar
 
 *** To merge bugs:
 Eg when bad replies create a bunch of new bugs for the same report.
@@ -377,7 +377,7 @@ You must unmerge, clone, then re-merge.
 *** To set severity:
 severity 123 critical|grave|serious|important|normal|minor|wishlist
 
-See http://debbugs.gnu.org/Developer#severities for the meanings.
+See https://debbugs.gnu.org/Developer#severities for the meanings.
 
 *** To set the owner of a bug:
 owner 123 A Hacker <address@hidden>
@@ -435,10 +435,10 @@ The bug will be re-archived after the next 28 day period 
of no activity.
 
 It's a function of the number of displayed bugs.  You can speed things
 up by only looking at the newest 100 bugs:
-http://debbugs.gnu.org/cgi-bin/pkgreport.cgi?newest=100;package=emacs
+https://debbugs.gnu.org/cgi-bin/pkgreport.cgi?newest=100;package=emacs
 
 Or use the static index:
-http://debbugs.gnu.org/db/ix/full.html
+https://debbugs.gnu.org/db/ix/full.html
 
 ** What are those "mbox folder" links on the bug report pages?
 
@@ -484,7 +484,7 @@ the bug web-pages.
 
 *** Debian stuff
 
-http://lists.gnu.org/archive/html/emacs-devel/2009-11/msg00440.html
+https://lists.gnu.org/archive/html/emacs-devel/2009-11/msg00440.html
 
 ** Gnus-specific voodoo
 
@@ -493,7 +493,7 @@ 
http://lists.gnu.org/archive/html/emacs-devel/2009-11/msg00440.html
 *** If the above is not available:
 (add-hook 'gnus-article-mode-hook
           (lambda ()
-             (setq bug-reference-url-format "http://debbugs.gnu.org/%s";)
+             (setq bug-reference-url-format "https://debbugs.gnu.org/%s";)
               (bug-reference-mode 1)))
 
 and you can click on the bug number in the subject header.
@@ -507,8 +507,8 @@ reference, you don't need to read these as a user of the 
system.
 Getting mail from the Emacs bug list into the tracker requires the
 assistance of sysadmin at gnu.org.  The test tracker set-up was, I
 think, [gnu.org #359140]:
-http://lists.gnu.org/archive/html/savannah-hackers/2008-03/msg00074.html
-http://lists.gnu.org/archive/html/savannah-hackers/2008-04/msg00034.html
+https://lists.gnu.org/archive/html/savannah-hackers/2008-03/msg00074.html
+https://lists.gnu.org/archive/html/savannah-hackers/2008-04/msg00034.html
 
 ** The debbugs.gnu.org setup was handled in [gnu.org #510605].
 There are two pieces (replace AT with @ in the following):
@@ -548,7 +548,7 @@ It does basic spam processing on the moderator requests and
 automatically rejects the obviously bogus ones.  Someone still has to
 accept the good ones though.  The advantage of this would not be having
 to run and tune our own spam filter.  See
-http://savannah.nongnu.org/projects/listhelper
+https://savannah.nongnu.org/projects/listhelper
 
 An "X-Debbugs-Envelope-To" header is used to keep track of where the
 mail was actually bound for:
diff --git a/admin/notes/copyright b/admin/notes/copyright
index 9b61422..8345646 100644
--- a/admin/notes/copyright
+++ b/admin/notes/copyright
@@ -511,7 +511,7 @@ etc/TUTORIAL* (translations)
   rms: "We can leave the TUTORIAL translations alone until their
   maintainers update them."
   Can adapt short license text from end of GPL translations at:
-  http://www.gnu.org/licenses/translations.html
+  https://www.gnu.org/licenses/translations.html
   Only a few sentences around the license notice need changing from
   previous version.
 Done: TUTORIAL.eo
@@ -594,4 +594,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/admin/notes/elpa b/admin/notes/elpa
index 4c0f198..ea6c132 100644
--- a/admin/notes/elpa
+++ b/admin/notes/elpa
@@ -10,7 +10,7 @@ repository named "elpa", hosted on Savannah.  To check it out:
 
 Changes to this branch propagate to elpa.gnu.org via a "deployment" script run
 daily.  This script (which is kept in elpa/admin/update-archive.sh) generates
-the content visible at http://elpa.gnu.org/packages.
+the content visible at https://elpa.gnu.org/packages.
 
 A new package is released as soon as the "version number" of that package is
 changed.  So you can use 'elpa' to work on a package without fear of releasing
diff --git a/admin/notes/font-backend b/admin/notes/font-backend
index 2418966..65c37a4 100644
--- a/admin/notes/font-backend
+++ b/admin/notes/font-backend
@@ -66,4 +66,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/admin/notes/hydra b/admin/notes/hydra
index 4c1944a..a0c46df 100644
--- a/admin/notes/hydra
+++ b/admin/notes/hydra
@@ -68,4 +68,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/admin/notes/multi-tty b/admin/notes/multi-tty
index d0096ad..0969daf 100644
--- a/admin/notes/multi-tty
+++ b/admin/notes/multi-tty
@@ -1296,4 +1296,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/admin/notes/unicode b/admin/notes/unicode
index 8284e1b..bc72791 100644
--- a/admin/notes/unicode
+++ b/admin/notes/unicode
@@ -306,4 +306,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/admin/notes/www b/admin/notes/www
index 8e911a4..8e5bfb6 100644
--- a/admin/notes/www
+++ b/admin/notes/www
@@ -79,4 +79,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/admin/nt/README-UNDUMP.W32 b/admin/nt/README-UNDUMP.W32
index f421416..aa91633 100644
--- a/admin/nt/README-UNDUMP.W32
+++ b/admin/nt/README-UNDUMP.W32
@@ -7,7 +7,7 @@ This README file describes how to dump a bare precompiled 
version of
 GNU Emacs for Windows.  This barebin distribution supplements the
 standard distribution of Emacs, which you can download from:
 
-       ftp://ftp.gnu.org/gnu/emacs/
+       https://ftp.gnu.org/gnu/emacs/
 
 If you do not have the "bin" or "src" distribution, then you will need
 to download one of those before you can use this barebin version.
diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs
index 76b3c64..8f84ede 100755
--- a/admin/quick-install-emacs
+++ b/admin/quick-install-emacs
@@ -18,7 +18,7 @@
 ## GNU General Public License for more details.
 
 ## You should have received a copy of the GNU General Public License
-## along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+## along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 ### Commentary:
diff --git a/admin/release-process b/admin/release-process
index 6aa0040..3bb72b9 100644
--- a/admin/release-process
+++ b/admin/release-process
@@ -115,12 +115,12 @@ Redirect /software/emacs/manual/html_mono/automake.html 
/software/automake/manua
 Redirect /software/emacs/manual/html_node/automake/ 
/software/automake/manual/html_node/
 
 Another tool you can use to check links is gnu.org's linc.py:
-http://www.gnu.org/server/source/
+https://www.gnu.org/server/source/
 
 You run this with something like:
 
 cd /path/to/cvs/emacs-www
-linc.py -o /path/to/output-dir --url http://www.gnu.org/software/emacs/ .
+linc.py -o /path/to/output-dir --url https://www.gnu.org/software/emacs/ .
 
 Be warned that it is really, really slow (as in, can take ~ a full day
 to check the manual/ directory).  It is probably best to run it on a
diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in
index 5cc43bc..c389cb3 100644
--- a/admin/unidata/Makefile.in
+++ b/admin/unidata/Makefile.in
@@ -19,7 +19,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 SHELL = @SHELL@
 
@@ -119,4 +119,3 @@ maintainer-clean: distclean
 extraclean:
        rm -f ${top_srcdir}/src/macuvs.h ${unidir}/charscript.el*
        rm -f ${unifiles} ${unidir}/charprop.el
-
diff --git a/admin/unidata/blocks.awk b/admin/unidata/blocks.awk
index 7845d02..8eafedb 100755
--- a/admin/unidata/blocks.awk
+++ b/admin/unidata/blocks.awk
@@ -17,7 +17,7 @@
 ## GNU General Public License for more details.
 
 ## You should have received a copy of the GNU General Public License
-## along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+## along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ### Commentary:
 
@@ -32,7 +32,7 @@
 ## The Unicode blocks actually extend past some of these ranges with
 ## undefined codepoints.
 
-## For additional details, see <http://debbugs.gnu.org/20789#11>.
+## For additional details, see <https://debbugs.gnu.org/20789#11>.
 
 ## Things to do after installing a new version of Blocks.txt:
 ## Check the output against the old output.
diff --git a/admin/unidata/unidata-gen.el b/admin/unidata/unidata-gen.el
index 478099c..e6e8aaa 100644
--- a/admin/unidata/unidata-gen.el
+++ b/admin/unidata/unidata-gen.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/admin/unidata/uvs.el b/admin/unidata/uvs.el
index 0b7edc7..f254f4a 100644
--- a/admin/unidata/uvs.el
+++ b/admin/unidata/uvs.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/admin/update-copyright b/admin/update-copyright
index 4da327b..a068816 100755
--- a/admin/update-copyright
+++ b/admin/update-copyright
@@ -22,7 +22,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 # written by Paul Eggert
 
diff --git a/admin/update_autogen b/admin/update_autogen
index ba4ed00..cfbb7c7 100755
--- a/admin/update_autogen
+++ b/admin/update_autogen
@@ -18,7 +18,7 @@
 ## GNU General Public License for more details.
 
 ## You should have received a copy of the GNU General Public License
-## along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+## along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ### Commentary:
 
diff --git a/autogen.sh b/autogen.sh
index b3c5f48..00bdfb9 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -19,7 +19,7 @@
 ## GNU General Public License for more details.
 
 ## You should have received a copy of the GNU General Public License
-## along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+## along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ### Commentary:
 
@@ -210,7 +210,7 @@ If you do not have permission to do this, or if the version 
provided
 by your system is too old, it is normally straightforward to build
 these packages from source.  You can find the sources at:
 
-ftp://ftp.gnu.org/gnu/PACKAGE/
+https://ftp.gnu.org/gnu/PACKAGE/
 
 Download the package (make sure you get at least the minimum version
 listed above), extract it using tar, then run configure, make,
diff --git a/build-aux/git-hooks/commit-msg b/build-aux/git-hooks/commit-msg
index 475956e..3945086 100755
--- a/build-aux/git-hooks/commit-msg
+++ b/build-aux/git-hooks/commit-msg
@@ -16,7 +16,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 # Written by Paul Eggert.
 
diff --git a/build-aux/git-hooks/pre-commit b/build-aux/git-hooks/pre-commit
index 0fa5837..68a0c33 100755
--- a/build-aux/git-hooks/pre-commit
+++ b/build-aux/git-hooks/pre-commit
@@ -16,7 +16,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 LC_ALL=C
 export LC_ALL
diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog
index cf16425..ec5ab9e 100755
--- a/build-aux/gitlog-to-changelog
+++ b/build-aux/gitlog-to-changelog
@@ -3,7 +3,7 @@ eval '(exit $?0)' && eval 'exec perl -wS "$0" "$@"'
     if 0;
 # Convert git log output to ChangeLog format.
 
-my $VERSION = '2016-03-22 21:49'; # UTC
+my $VERSION = '2017-09-13 06:45'; # UTC
 # The definition above must lie within the first 8 lines in order
 # for the Emacs time-stamp write hook (at end) to update it.
 # If you change this file with Emacs, please let the write hook
@@ -22,7 +22,7 @@ my $VERSION = '2016-03-22 21:49'; # UTC
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # Written by Jim Meyering
 
diff --git a/build-aux/gitlog-to-emacslog b/build-aux/gitlog-to-emacslog
index bced7e4..6a58f2d 100755
--- a/build-aux/gitlog-to-emacslog
+++ b/build-aux/gitlog-to-emacslog
@@ -17,7 +17,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 LC_ALL=C
 export LC_ALL
diff --git a/build-aux/make-info-dir b/build-aux/make-info-dir
index e8c6694..8a1d580 100755
--- a/build-aux/make-info-dir
+++ b/build-aux/make-info-dir
@@ -20,7 +20,7 @@
 ## GNU General Public License for more details.
 
 ## You should have received a copy of the GNU General Public License
-## along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+## along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ### Commentary:
 
diff --git a/build-aux/move-if-change b/build-aux/move-if-change
index 4dd8699..4a65145 100755
--- a/build-aux/move-if-change
+++ b/build-aux/move-if-change
@@ -2,7 +2,7 @@
 # Like mv $1 $2, but if the files are the same, just delete $1.
 # Status is zero if successful, nonzero otherwise.
 
-VERSION='2016-01-11 22:04'; # UTC
+VERSION='2017-09-13 06:45'; # UTC
 # The definition above must lie within the first 8 lines in order
 # for the Emacs time-stamp write hook (at end) to update it.
 # If you change this file with Emacs, please let the write hook
@@ -21,7 +21,7 @@ VERSION='2016-01-11 22:04'; # UTC
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 usage="usage: $0 SOURCE DEST"
 
@@ -39,7 +39,7 @@ Report bugs to <address@hidden>."
 version=`expr "$VERSION" : '\([^ ]*\)'`
 version="move-if-change (gnulib) $version
 Copyright (C) 2011 Free Software Foundation, Inc.
-License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>
 This is free software: you are free to change and redistribute it.
 There is NO WARRANTY, to the extent permitted by law."
 
diff --git a/build-aux/msys-to-w32 b/build-aux/msys-to-w32
index 3f57478..38daf56 100755
--- a/build-aux/msys-to-w32
+++ b/build-aux/msys-to-w32
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # Take only the basename from the full pathname
 me=${0//*\//}
diff --git a/build-aux/update-copyright b/build-aux/update-copyright
index 2d20d21..63455c3 100755
--- a/build-aux/update-copyright
+++ b/build-aux/update-copyright
@@ -3,7 +3,7 @@ eval '(exit $?0)' && eval 'exec perl -wS -0777 -pi "$0" "$@"'
     if 0;
 # Update an FSF copyright year list to include the current year.
 
-my $VERSION = '2016-01-12.23:13'; # UTC
+my $VERSION = '2017-09-13.06:45'; # UTC
 
 # Copyright (C) 2009-2017 Free Software Foundation, Inc.
 #
@@ -18,7 +18,7 @@ my $VERSION = '2016-01-12.23:13'; # UTC
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # Written by Jim Meyering and Joel E. Denny
 
diff --git a/build-aux/update-subdirs b/build-aux/update-subdirs
index 90f1b3c..6419758 100755
--- a/build-aux/update-subdirs
+++ b/build-aux/update-subdirs
@@ -17,7 +17,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 cd "$1" || exit 1
diff --git a/configure.ac b/configure.ac
index d294412..c884716 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ dnl  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
See the
 dnl  GNU General Public License for more details.
 dnl
 dnl  You should have received a copy of the GNU General Public License
-dnl  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+dnl  along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 AC_PREREQ(2.65)
 dnl Note this is parsed by (at least) make-dist and lisp/cedet/ede/emacs.el.
@@ -343,6 +343,7 @@ OPTION_DEFAULT_ON([tiff],[don't compile with TIFF image 
support])
 OPTION_DEFAULT_ON([gif],[don't compile with GIF image support])
 OPTION_DEFAULT_ON([png],[don't compile with PNG image support])
 OPTION_DEFAULT_ON([rsvg],[don't compile with SVG image support])
+OPTION_DEFAULT_ON([lcms2],[don't compile with Little CMS support])
 OPTION_DEFAULT_ON([libsystemd],[don't compile with libsystemd support])
 OPTION_DEFAULT_OFF([cairo],[compile with Cairo drawing (experimental)])
 OPTION_DEFAULT_ON([xml2],[don't compile with XML parsing support])
@@ -3451,6 +3452,25 @@ if test "${with_jpeg}" != "no"; then
 fi
 AC_SUBST(LIBJPEG)
 
+HAVE_LCMS2=no
+LIBLCMS2=
+if test "${with_lcms2}" != "no"; then
+  OLIBS=$LIBS
+  AC_SEARCH_LIBS([cmsCreateTransform], [lcms2], [HAVE_LCMS2=yes])
+  LIBS=$OLIBS
+  case $ac_cv_search_cmsCreateTransform in
+    -*) LIBLCMS2=$ac_cv_search_cmsCreateTransform ;;
+  esac
+fi
+if test "${HAVE_LCMS2}" = "yes"; then
+  AC_DEFINE([HAVE_LCMS2], 1, [Define to 1 if you have the lcms2 library 
(-llcms2).])
+  ### mingw32 doesn't use -llcms2, since it loads the library dynamically.
+  if test "${opsys}" = "mingw32"; then
+     LIBLCMS2=
+  fi
+fi
+AC_SUBST(LIBLCMS2)
+
 HAVE_ZLIB=no
 LIBZ=
 if test "${with_zlib}" != "no"; then
@@ -4011,7 +4031,7 @@ AC_CACHE_CHECK([for library containing tputs], 
[emacs_cv_tputs_lib],
   emacs_cv_tputs_lib='none required'
 else
   # Maybe curses should be tried earlier?
-  # See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9736#35
+  # See https://debbugs.gnu.org/9736#35
   for tputs_library in '' tinfo ncurses terminfo termcap curses; do
     OLIBS=$LIBS
     if test -z "$tputs_library"; then
@@ -5294,7 +5314,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 /* No code in Emacs #includes config.h twice, but some bits of code
@@ -5348,7 +5368,7 @@ emacs_config_features=
 for opt in XAW3D XPM JPEG TIFF GIF PNG RSVG CAIRO IMAGEMAGICK SOUND GPM DBUS \
   GCONF GSETTINGS NOTIFY ACL LIBSELINUX GNUTLS LIBXML2 FREETYPE M17N_FLT \
   LIBOTF XFT ZLIB TOOLKIT_SCROLL_BARS X_TOOLKIT OLDXMENU X11 NS MODULES \
-  XWIDGETS LIBSYSTEMD CANNOT_DUMP; do
+  XWIDGETS LIBSYSTEMD CANNOT_DUMP LCMS2; do
 
     case $opt in
       CANNOT_DUMP) eval val=\${$opt} ;;
@@ -5381,6 +5401,7 @@ AS_ECHO(["  Does Emacs use -lXaw3d?                       
          ${HAVE_XAW3D
   Does Emacs use a png library?                           ${HAVE_PNG} $LIBPNG
   Does Emacs use -lrsvg-2?                                ${HAVE_RSVG}
   Does Emacs use cairo?                                   ${HAVE_CAIRO}
+  Does Emacs use -llcms2?                                 ${HAVE_LCMS2}
   Does Emacs use imagemagick (version 6)?                 ${HAVE_IMAGEMAGICK}
   Does Emacs support sound?                               ${HAVE_SOUND}
   Does Emacs use -lgpm?                                   ${HAVE_GPM}
diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in
index ffcc4ba..5d2503f 100644
--- a/doc/emacs/Makefile.in
+++ b/doc/emacs/Makefile.in
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 SHELL = @SHELL@
 
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 1f60354..1b9a8b3 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -118,11 +118,11 @@ some of the ways to customize it; it corresponds to GNU 
Emacs version
 @ifset WWW_GNU_ORG
 @html
 The homepage for GNU Emacs is at
-<a href="/software/emacs/">http://www.gnu.org/software/emacs/</a>.<br>
+<a href="/software/emacs/">https://www.gnu.org/software/emacs/</a>.<br>
 To view this manual in other formats, click
 <a href="/software/emacs/manual/emacs.html">here</a>.<br>
 You can also purchase a printed copy from the
-<a href="http://shop.fsf.org/product/emacs-manual/";>FSF store</a>.
+<a href="https://shop.fsf.org/product/emacs-manual/";>FSF store</a>.
 @end html
 @end ifset
 
@@ -1314,7 +1314,7 @@ Emacs editors, all sharing common principles of 
organization.  For
 information on the underlying philosophy of Emacs and the lessons
 learned from its development, see @cite{Emacs, the Extensible,
 Customizable Self-Documenting Display Editor}, available from
address@hidden://publications.ai.mit.edu/ai-publications/pdf/AIM-519A.pdf}.
address@hidden://hdl.handle.net/1721.1/5736}.
 
 This version of the manual is mainly intended for use with GNU Emacs
 installed on GNU and Unix systems.  GNU Emacs can also be used on
@@ -1348,7 +1348,7 @@ One way to get a copy of GNU Emacs is from someone else 
who has it.
 You need not ask for our permission to do so, or tell any one else;
 just copy it.  If you have access to the Internet, you can get the
 latest distribution version of GNU Emacs by anonymous FTP; see
address@hidden://www.gnu.org/software/emacs} on our website for more
address@hidden://www.gnu.org/software/emacs} on our website for more
 information.
 
 You may also receive GNU Emacs when you buy a computer.  Computer
@@ -1365,19 +1365,19 @@ Software Foundation are tax deductible in the 
address@hidden  If you use GNU Emacs
 at your workplace, please suggest that the company make a donation.
 To donate, see @url{https://my.fsf.org/donate/}.
 For other ways in which you can help, see
address@hidden://www.gnu.org/help/help.html}.
address@hidden://www.gnu.org/help/help.html}.
 
 @c The command view-order-manuals uses this anchor.
 @anchor{Printed Books}
 We also sell hardcopy versions of this manual and @cite{An
 Introduction to Programming in Emacs Lisp}, by Robert J. Chassell.
-You can visit our online store at @url{http://shop.fsf.org/}.
+You can visit our online store at @url{https://shop.fsf.org/}.
 The income from sales goes to support the foundation's purpose: the
 development of new free software, and improvements to our existing
 programs including GNU Emacs.
 
 If you need to contact the Free Software Foundation, see
address@hidden://www.fsf.org/about/contact/}, or write to
address@hidden://www.fsf.org/about/contact/}, or write to
 
 @display
 Free Software Foundation
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index ca4f223..18f1c28 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -1817,10 +1817,9 @@ syntax:
 
 @noindent
 To carry out this request, Emacs uses a remote-login program such as
address@hidden, @command{ssh}, @command{rlogin}, or @command{telnet}.
address@hidden
 You must always specify in the file name which method to use---for
-example, @file{/ftp:@var{user}@@@var{host}:@var{filename}} uses FTP,
-whereas @file{/ssh:@var{user}@@@var{host}:@var{filename}} uses
+example, @file{/ssh:@var{user}@@@var{host}:@var{filename}} uses
 @command{ssh}.  When you specify the pseudo method @var{-} in the file
 name, Emacs chooses the method as follows:
 
diff --git a/doc/emacs/glossary.texi b/doc/emacs/glossary.texi
index 82e7394..124c1fd 100644
--- a/doc/emacs/glossary.texi
+++ b/doc/emacs/glossary.texi
@@ -594,7 +594,7 @@ GNU General Public License.  @xref{Copying}.
 @item Free Software Foundation
 The Free Software Foundation (FSF) is a charitable foundation
 dedicated to promoting the development of free software (q.v.).
-For more information, see @uref{http://fsf.org/, the FSF website}.
+For more information, see @uref{https://fsf.org/, the FSF website}.
 
 @item Fringe
 On a graphical display (q.v.), there's a narrow portion of the frame
@@ -650,7 +650,7 @@ GNU is a recursive acronym for GNU's Not Unix, and it 
refers to a
 Unix-compatible operating system which is free software (q.v.).
 @xref{Manifesto}.  GNU is normally used with Linux as the kernel since
 Linux works better than the GNU kernel.  For more information, see
address@hidden://www.gnu.org/, the GNU website}.
address@hidden://www.gnu.org/, the GNU website}.
 
 @item Graphic Character
 Graphic characters are those assigned pictorial images rather than
diff --git a/doc/emacs/gnu.texi b/doc/emacs/gnu.texi
index 78f5354..b88fd74 100644
--- a/doc/emacs/gnu.texi
+++ b/doc/emacs/gnu.texi
@@ -30,8 +30,8 @@ that different wording could help avoid.  Footnotes added in 
1993 help
 clarify these points.
 
 For up-to-date information about available GNU software, please see
-our web site, @uref{http://www.gnu.org}.  For software tasks and other
-ways to contribute, see @uref{http://www.gnu.org/help}.
+our web site, @uref{https://www.gnu.org}.  For software tasks and other
+ways to contribute, see @uref{https://www.gnu.org/help}.
 @end quotation
 
 @unnumberedsec What's address@hidden  Gnu's Not Unix!
@@ -379,7 +379,7 @@ urge people to reject the term ``intellectual property'' 
entirely,
 lest it lead others to suppose that those laws form one coherent
 issue.  The way to be clear is to discuss patents, copyrights, and
 trademarks separately.  See
address@hidden://www.gnu.org/philosophy/not-ipr.xhtml} for more
address@hidden://www.gnu.org/philosophy/not-ipr.xhtml} for more
 explanation of how this term spreads confusion and bias.} carefully
 (such as lawyers) say that there is no intrinsic right to intellectual
 property.  The kinds of supposed intellectual property rights that the
@@ -495,7 +495,7 @@ distinguish between ``free software'' and ``freeware''.  
The term
 ``freeware'' means software you are free to redistribute, but usually
 you are not free to study and change the source code, so most of it is
 not free software.  See
address@hidden://www.gnu.org/philosophy/words-to-avoid.html} for more
address@hidden://www.gnu.org/philosophy/words-to-avoid.html} for more
 explanation.}, asking for donations from satisfied users, or selling
 hand-holding services.  I have met people who are already working this
 way successfully.
diff --git a/doc/emacs/help.texi b/doc/emacs/help.texi
index 460ced0..9ef33dd 100644
--- a/doc/emacs/help.texi
+++ b/doc/emacs/help.texi
@@ -642,7 +642,7 @@ Display information about where to get external packages
 @item C-h C-f
 Display the Emacs frequently-answered-questions list (@code{view-emacs-FAQ}).
 @item C-h g
-Visit a @uref{http://www.gnu.org} page with information about the GNU
+Visit a @uref{https://www.gnu.org} page with information about the GNU
 Project (@code{describe-gnu-project}).
 @item C-h C-m
 Display information about ordering printed copies of Emacs manuals
diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi
index ee3fc49..a029aaa 100644
--- a/doc/emacs/trouble.texi
+++ b/doc/emacs/trouble.texi
@@ -491,7 +491,7 @@ are suggestions for workarounds and solutions.
 
 @cindex bug tracker
 @item
-The GNU Bug Tracker at @url{http://debbugs.gnu.org}.  Emacs bugs are
+The GNU Bug Tracker at @url{https://debbugs.gnu.org}.  Emacs bugs are
 filed in the tracker under the @samp{emacs} package.  The tracker
 records information about the status of each bug, the initial bug
 report, and the follow-up messages by the bug reporter and Emacs
@@ -690,7 +690,7 @@ and send it to that address.  Or you can simply send an 
email to that
 address describing the problem.
 
 Your report will be sent to the @samp{bug-gnu-emacs} mailing list, and
-stored in the GNU Bug Tracker at @url{http://debbugs.gnu.org}.  Please
+stored in the GNU Bug Tracker at @url{https://debbugs.gnu.org}.  Please
 include a valid reply email address, in case we need to ask you for
 more information about your report.  Submissions are moderated, so
 there may be a delay before your report appears.
@@ -1084,7 +1084,7 @@ improvement they bring about.
 For a fix for an existing bug, it is
 best to reply to the relevant discussion on the @samp{bug-gnu-emacs}
 list, or the bug entry in the GNU Bug Tracker at
address@hidden://debbugs.gnu.org}.  Explain why your change fixes the bug.
address@hidden://debbugs.gnu.org}.  Explain why your change fixes the bug.
 
 @item
 For a new feature, include a description of the feature and your
@@ -1176,7 +1176,7 @@ documentation, i.e., Texinfo files.
 @xref{Change Log},
 @ifset WWW_GNU_ORG
 see
address@hidden://www.gnu.org/prep/standards/html_node/Change-Log-Concepts.html},
address@hidden://www.gnu.org/prep/standards/html_node/Change-Log-Concepts.html},
 @end ifset
 @xref{Change Log Concepts, Change Log Concepts,
 Change Log Concepts, standards, GNU Coding Standards}.
@@ -1223,11 +1223,11 @@ repository (@pxref{Sending Patches}).
 
 @item
 check if existing bug reports are fixed in newer versions of Emacs
address@hidden://debbugs.gnu.org/cgi/pkgreport.cgi?which=pkg&data=emacs}.
address@hidden://debbugs.gnu.org/cgi/pkgreport.cgi?which=pkg&data=emacs}.
 
 @item
 fix existing bug reports
address@hidden://debbugs.gnu.org/cgi/pkgreport.cgi?which=pkg&data=emacs}.
address@hidden://debbugs.gnu.org/cgi/pkgreport.cgi?which=pkg&data=emacs}.
 
 @item
 @c etc/TODO not in WWW_GNU_ORG
@@ -1274,7 +1274,7 @@ require a copyright assignment to the FSF; 
@xref{Copyright Assignment}.
 The development version of Emacs can be downloaded from the
 repository where it is actively maintained by a group of developers.
 See the Emacs project page
address@hidden://savannah.gnu.org/projects/emacs/} for access details.
address@hidden://savannah.gnu.org/projects/emacs/} for access details.
 
 It is important to write your patch based on the current working
 version.  If you start from an older version, your patch may be
@@ -1296,7 +1296,7 @@ desired change), refer to:
 @ifset WWW_GNU_ORG
 @ifhtml
 the Emacs Manual
address@hidden://www.gnu.org/software/emacs/manual/emacs.html}.
address@hidden://www.gnu.org/software/emacs/manual/emacs.html}.
 @end ifhtml
 @ifnothtml
 @xref{Top, Emacs Manual,,emacs}.
@@ -1310,7 +1310,7 @@ the Emacs Manual
 @ifset WWW_GNU_ORG
 @ifhtml
 the Emacs Lisp Reference Manual
address@hidden://www.gnu.org/software/emacs/manual/elisp.html}.
address@hidden://www.gnu.org/software/emacs/manual/elisp.html}.
 @end ifhtml
 @ifnothtml
 @xref{Top, Emacs Lisp Reference Manual,,elisp}.
@@ -1321,7 +1321,7 @@ the Emacs Lisp Reference Manual
 @end ifclear
 
 @item
address@hidden://www.gnu.org/software/emacs}
address@hidden://www.gnu.org/software/emacs}
 
 @item
 @url{http://www.emacswiki.org/}
@@ -1337,7 +1337,7 @@ the Emacs Lisp Reference Manual
 @cindex coding standards
 
 Contributed code should follow the GNU Coding Standards
address@hidden://www.gnu.org/prep/standards/}. This may also be available
address@hidden://www.gnu.org/prep/standards/}. This may also be available
 in info on your system.
 
 If it doesn't, we'll need to find someone to fix the code before we
@@ -1350,7 +1350,7 @@ Emacs has additional style and coding conventions:
 @ifset WWW_GNU_ORG
 @ifhtml
 the ``Tips and Conventions'' Appendix in the Emacs Lisp Reference
address@hidden://www.gnu.org/software/emacs/manual/html_node/elisp/Tips.html}.
address@hidden://www.gnu.org/software/emacs/manual/html_node/elisp/Tips.html}.
 @end ifhtml
 @ifnothtml
 @xref{Tips, ``Tips and Conventions'' Appendix in the Emacs Lisp Reference, Tips
@@ -1385,11 +1385,11 @@ Use @code{?\s} instead of @code{? } in Lisp code for a 
space character.
 The FSF (Free Software Foundation) is the copyright holder for GNU Emacs.
 The FSF is a nonprofit with a worldwide mission to promote computer
 user freedom and to defend the rights of all free software users.
-For general information, see the website @url{http://www.fsf.org/}.
+For general information, see the website @url{https://www.fsf.org/}.
 
 Generally speaking, for non-trivial contributions to GNU Emacs we
 require that the copyright be assigned to the address@hidden  For the reasons
-behind this, see @url{http://www.gnu.org/licenses/why-assign.html}.
+behind this, see @url{https://www.gnu.org/licenses/why-assign.html}.
 
 Copyright assignment is a simple process.  Residents of some countries
 can do it entirely electronically.  We can help you get started, and
@@ -1434,7 +1434,7 @@ mailing list and newsgroup interconnect, so it does not 
matter which
 one you use.)
 
 @item
-Look in the @uref{http://www.fsf.org/resources/service/, service
+Look in the @uref{https://www.fsf.org/resources/service/, service
 directory} for someone who might help you for a fee.
 @end itemize
 
diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in
index d8e203f..065a718 100644
--- a/doc/lispintro/Makefile.in
+++ b/doc/lispintro/Makefile.in
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 SHELL = @SHELL@
 
diff --git a/doc/lispintro/README b/doc/lispintro/README
index f8134fc..18a3970 100644
--- a/doc/lispintro/README
+++ b/doc/lispintro/README
@@ -42,4 +42,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/doc/lispintro/cons-1.eps b/doc/lispintro/cons-1.eps
index 1d4e78c..fe3e6d2 100644
--- a/doc/lispintro/cons-1.eps
+++ b/doc/lispintro/cons-1.eps
@@ -19,7 +19,7 @@
 % GNU General Public License for more details.
 %
 % You should have received a copy of the GNU General Public License
-% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+% along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 /tgifdict 132 dict def
 tgifdict begin
diff --git a/doc/lispintro/cons-2.eps b/doc/lispintro/cons-2.eps
index af59a0f..a9838b4 100644
--- a/doc/lispintro/cons-2.eps
+++ b/doc/lispintro/cons-2.eps
@@ -19,7 +19,7 @@
 % GNU General Public License for more details.
 %
 % You should have received a copy of the GNU General Public License
-% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+% along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 /tgifdict 132 dict def
 tgifdict begin
diff --git a/doc/lispintro/cons-2a.eps b/doc/lispintro/cons-2a.eps
index 2edcc21..f5a048f 100644
--- a/doc/lispintro/cons-2a.eps
+++ b/doc/lispintro/cons-2a.eps
@@ -19,7 +19,7 @@
 % GNU General Public License for more details.
 %
 % You should have received a copy of the GNU General Public License
-% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+% along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 /tgifdict 132 dict def
 tgifdict begin
diff --git a/doc/lispintro/cons-3.eps b/doc/lispintro/cons-3.eps
index f7e37f1..5557367 100644
--- a/doc/lispintro/cons-3.eps
+++ b/doc/lispintro/cons-3.eps
@@ -19,7 +19,7 @@
 % GNU General Public License for more details.
 %
 % You should have received a copy of the GNU General Public License
-% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+% along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 /tgifdict 132 dict def
 tgifdict begin
diff --git a/doc/lispintro/cons-4.eps b/doc/lispintro/cons-4.eps
index f9549b9..86c3cfc 100644
--- a/doc/lispintro/cons-4.eps
+++ b/doc/lispintro/cons-4.eps
@@ -19,7 +19,7 @@
 % GNU General Public License for more details.
 %
 % You should have received a copy of the GNU General Public License
-% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+% along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 /tgifdict 132 dict def
 tgifdict begin
diff --git a/doc/lispintro/cons-5.eps b/doc/lispintro/cons-5.eps
index 83f14df..e66cff4 100644
--- a/doc/lispintro/cons-5.eps
+++ b/doc/lispintro/cons-5.eps
@@ -19,7 +19,7 @@
 % GNU General Public License for more details.
 %
 % You should have received a copy of the GNU General Public License
-% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+% along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 /tgifdict 132 dict def
 tgifdict begin
diff --git a/doc/lispintro/drawers.eps b/doc/lispintro/drawers.eps
index b9efdce..97a581b 100644
--- a/doc/lispintro/drawers.eps
+++ b/doc/lispintro/drawers.eps
@@ -24,7 +24,7 @@
 % GNU General Public License for more details.
 %
 % You should have received a copy of the GNU General Public License
-% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+% along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 /tgifdict 53 dict def
 tgifdict begin
@@ -223,7 +223,7 @@ NP
         GS
         0
             /Courier FF [17 0 0 -17 0 0] MS
-            (symbol name) TGSW 
+            (symbol name) TGSW
         AD
         GR
       2 DI NE 0 RM
@@ -243,7 +243,7 @@ NP
         GS
         0
             /Courier FF [17 0 0 -17 0 0] MS
-            (Chest of Drawers) TGSW 
+            (Chest of Drawers) TGSW
         AD
         GR
       2 DI NE 0 RM
@@ -342,7 +342,7 @@ NP
         GS
         0
             /NewCenturySchlbk-Roman FF [17 0 0 -17 0 0] MS
-            (directions to) TGSW 
+            (directions to) TGSW
         AD
         GR
       2 DI NE 0 RM
@@ -388,7 +388,7 @@ NP
         GS
         0
             /Courier FF [17 0 0 -17 0 0] MS
-            (symbol definition) TGSW 
+            (symbol definition) TGSW
         AD
         GR
       2 DI NE 0 RM
@@ -408,7 +408,7 @@ NP
         GS
         0
             /NewCenturySchlbk-Roman FF [17 0 0 -17 0 0] MS
-            (directions to) TGSW 
+            (directions to) TGSW
         AD
         GR
       2 DI NE 0 RM
@@ -428,7 +428,7 @@ NP
         GS
         0
             /Courier FF [17 0 0 -17 0 0] MS
-            (variable name) TGSW 
+            (variable name) TGSW
         AD
         GR
       2 DI NE 0 RM
@@ -448,7 +448,7 @@ NP
         GS
         0
             /NewCenturySchlbk-Roman FF [17 0 0 -17 0 0] MS
-            (directions to) TGSW 
+            (directions to) TGSW
         AD
         GR
       2 DI NE 0 RM
@@ -468,7 +468,7 @@ NP
         GS
         0
             /Courier FF [17 0 0 -17 0 0] MS
-            (property list) TGSW 
+            (property list) TGSW
         AD
         GR
       2 DI NE 0 RM
@@ -488,7 +488,7 @@ NP
         GS
         0
             /NewCenturySchlbk-Roman FF [17 0 0 -17 0 0] MS
-            (directions to) TGSW 
+            (directions to) TGSW
         AD
         GR
       2 DI NE 0 RM
diff --git a/doc/lispintro/emacs-lisp-intro.texi 
b/doc/lispintro/emacs-lisp-intro.texi
index 36d7677..d949387 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -120,7 +120,7 @@ Foundation, Inc.
 @iftex
 Published by the:@*
 
-GNU Press,               @hfill 
@uref{http://www.fsf.org/licensing/gnu-press/address@hidden
+GNU Press,               @hfill 
@uref{https://www.fsf.org/licensing/gnu-press/address@hidden
 a division of the               @hfill email: @email{sales@@address@hidden
 Free Software Foundation, Inc.  @hfill Tel: +1 (617) address@hidden
 51 Franklin Street, Fifth Floor @hfill Fax: +1 (617) address@hidden
@@ -128,10 +128,10 @@ Boston, MA 02110-1301 USA
 @end iftex
 
 @ifnottex
-Printed copies available from @uref{http://shop.fsf.org/}. Published by:
+Printed copies available from @uref{https://shop.fsf.org/}. Published by:
 
 @example
-GNU Press,                        http://www.fsf.org/licensing/gnu-press/
+GNU Press,                        https://www.fsf.org/licensing/gnu-press/
 a division of the                 email: sales@@fsf.org
 Free Software Foundation, Inc.    Tel: +1 (617) 542-5942
 51 Franklin Street, Fifth Floor   Fax: +1 (617) 542-2652
@@ -208,7 +208,7 @@ supports it in developing GNU and promoting software 
freedom.''
 @ifset WWW_GNU_ORG
 @html
 <p>The homepage for GNU Emacs is at
-<a href="/software/emacs/">http://www.gnu.org/software/emacs/</a>.<br>
+<a href="/software/emacs/">https://www.gnu.org/software/emacs/</a>.<br>
 To view this manual in other formats, click
 <a href="/software/emacs/manual/eintr.html">here</a>.
 @end html
@@ -12059,7 +12059,7 @@ For more information, see
 @ref{Indicating, , Indicating, texinfo, Texinfo Manual}, which goes to
 a Texinfo manual in the current directory.  Or, if you are on the
 Internet, see
address@hidden://www.gnu.org/software/texinfo/manual/texinfo/}
address@hidden://www.gnu.org/software/texinfo/manual/texinfo/}
 @end ifhtml
 @iftex
 ``Indicating Definitions, Commands, etc.''@: in @cite{Texinfo, The GNU
@@ -21658,8 +21658,8 @@ can ill afford to lose manuals this way.
 Free documentation, like free software, is a matter of freedom, not
 price.  The problem with these manuals was not that O'Reilly Associates
 charged a price for printed copies---that in itself is fine.  The Free
-Software Foundation @uref{http://shop.fsf.org, sells printed copies} of
-free @uref{http://www.gnu.org/doc/doc.html, GNU manuals}, too.
+Software Foundation @uref{https://shop.fsf.org, sells printed copies} of
+free @uref{https://www.gnu.org/doc/doc.html, GNU manuals}, too.
 But GNU manuals are available in source code form, while these manuals
 are available only on paper.  GNU manuals come with permission to copy
 and modify; the Perl manuals do not.  These restrictions are the
@@ -21738,7 +21738,7 @@ copylefted manuals to non-copylefted ones.
 @noindent
 Note: The Free Software Foundation maintains a page on its Web site
 that lists free books available from other publishers:@*
address@hidden://www.gnu.org/doc/other-free-books.html}
address@hidden://www.gnu.org/doc/other-free-books.html}
 
 @node GNU Free Documentation License
 @appendix GNU Free Documentation License
diff --git a/doc/lispintro/lambda-1.eps b/doc/lispintro/lambda-1.eps
index 47370b2..e349b20 100644
--- a/doc/lispintro/lambda-1.eps
+++ b/doc/lispintro/lambda-1.eps
@@ -19,7 +19,7 @@
 % GNU General Public License for more details.
 %
 % You should have received a copy of the GNU General Public License
-% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+% along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 /tgifdict 132 dict def
 tgifdict begin
diff --git a/doc/lispintro/lambda-2.eps b/doc/lispintro/lambda-2.eps
index 804dbfb..7be38da 100644
--- a/doc/lispintro/lambda-2.eps
+++ b/doc/lispintro/lambda-2.eps
@@ -19,7 +19,7 @@
 % GNU General Public License for more details.
 %
 % You should have received a copy of the GNU General Public License
-% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+% along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 /tgifdict 132 dict def
 tgifdict begin
diff --git a/doc/lispintro/lambda-3.eps b/doc/lispintro/lambda-3.eps
index 95610f6..a3b419a 100644
--- a/doc/lispintro/lambda-3.eps
+++ b/doc/lispintro/lambda-3.eps
@@ -19,7 +19,7 @@
 % GNU General Public License for more details.
 %
 % You should have received a copy of the GNU General Public License
-% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+% along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 /tgifdict 132 dict def
 tgifdict begin
diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index 89eb810..9fa5901 100644
--- a/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 SHELL = @SHELL@
 
diff --git a/doc/lispref/README b/doc/lispref/README
index fbc3169..b3f450a 100644
--- a/doc/lispref/README
+++ b/doc/lispref/README
@@ -18,7 +18,7 @@ or for HTML.
 
 * You can buy nicely printed copies from the Free Software Foundation.
 Buying a manual from the Free Software Foundation helps support our GNU
-development work.  See <http://shop.fsf.org/>.
+development work.  See <https://shop.fsf.org/>.
 (At time of writing, this manual is out of print.)
 
 * The master file for formatting this manual for Tex is called 'elisp.texi'.
@@ -45,4 +45,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 38f4f92..1dbc0bb 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -5338,7 +5338,7 @@ hint to ImageMagick to help it detect the image type.
 Specifies a rotation angle in degrees.
 
 @item :index @var{frame}
address@hidden Doesn't work: http://debbugs.gnu.org/7978
address@hidden Doesn't work: https://debbugs.gnu.org/7978
 @xref{Multi-Frame Images}.
 @end table
 
diff --git a/doc/lispref/doclicense.texi b/doc/lispref/doclicense.texi
index 9c3bbe5..542edaa 100644
--- a/doc/lispref/doclicense.texi
+++ b/doc/lispref/doclicense.texi
@@ -6,7 +6,7 @@
 
 @display
 Copyright @copyright{} 2000, 2001, 2002, 2007, 2008 Free Software Foundation, 
Inc.
address@hidden://fsf.org/}
address@hidden://fsf.org/}
 
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
@@ -414,7 +414,7 @@ The Free Software Foundation may publish new, revised 
versions
 of the GNU Free Documentation License from time to time.  Such new
 versions will be similar in spirit to the present version, but may
 differ in detail to address new problems or concerns.  See
address@hidden://www.gnu.org/copyleft/}.
address@hidden://www.gnu.org/copyleft/}.
 
 Each version of the License is given a distinguishing version number.
 If the Document specifies that a particular numbered version of this
diff --git a/doc/lispref/edebug.texi b/doc/lispref/edebug.texi
index da72c9b..cebf0a3 100644
--- a/doc/lispref/edebug.texi
+++ b/doc/lispref/edebug.texi
@@ -244,7 +244,7 @@ least for a certain distance.
 @item S
 Stop: don't execute any more of the program, but wait for more
 Edebug commands (@code{edebug-stop}).
address@hidden FIXME Does not work. http://debbugs.gnu.org/9764
address@hidden FIXME Does not work. https://debbugs.gnu.org/9764
 
 @item @key{SPC}
 Step: stop at the next stop point encountered (@code{edebug-step-mode}).
@@ -1139,7 +1139,7 @@ definition, but specifications are much more general than 
macro
 arguments.  @xref{Defining Macros}, for more explanation of
 the @code{declare} form.
 
address@hidden See, e.g., http://debbugs.gnu.org/10577
address@hidden See, e.g., https://debbugs.gnu.org/10577
 @c FIXME  Maybe there should be an Edebug option to get it to
 @c automatically load the entire source file containing the function
 @c being instrumented.  That would avoid this.
diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi
index b1399cd..4cbcdf8 100644
--- a/doc/lispref/elisp.texi
+++ b/doc/lispref/elisp.texi
@@ -159,7 +159,7 @@ Cover art by Etienne Suvasa.
 @ifset WWW_GNU_ORG
 @html
 <p>The homepage for GNU Emacs is at
-<a href="/software/emacs/">http://www.gnu.org/software/emacs/</a>.<br>
+<a href="/software/emacs/">https://www.gnu.org/software/emacs/</a>.<br>
 For information on using Emacs, refer to the
 <a href="/software/emacs/manual/emacs.html">Emacs Manual</a>.<br>
 To view this manual in other formats, click
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index 901382f..6be998f 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -457,15 +457,23 @@ Even though this is not a normal hook, you can use 
@code{add-hook} and
 @defvar write-contents-functions
 This works just like @code{write-file-functions}, but it is intended
 for hooks that pertain to the buffer's contents, not to the particular
-visited file or its location.  Such hooks are usually set up by major
-modes, as buffer-local bindings for this variable.  This variable
-automatically becomes buffer-local whenever it is set; switching to a
-new major mode always resets this variable, but calling
address@hidden does not.
+visited file or its location, and can be used to create arbitrary save
+processes for buffers that aren't visiting files at all.  Such hooks
+are usually set up by major modes, as buffer-local bindings for this
+variable.  This variable automatically becomes buffer-local whenever
+it is set; switching to a new major mode always resets this variable,
+but calling @code{set-visited-file-name} does not.
 
 If any of the functions in this hook returns address@hidden, the file
 is considered already written and the rest are not called and neither
 are the functions in @code{write-file-functions}.
+
+When using this hook to save buffers that are not visiting files (for
+instance, special-mode buffers), keep in mind that, if the function
+fails to save correctly and returns a @code{nil} value,
address@hidden will go on to prompt the user for a file to save
+the buffer in.  If this is undesirable, consider having the function
+fail by raising an error.
 @end defvar
 
 @defopt before-save-hook
diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi
index 89dee84..afd44b7 100644
--- a/doc/lispref/minibuf.texi
+++ b/doc/lispref/minibuf.texi
@@ -57,7 +57,7 @@ including @code{beginning-of-line}, @code{forward-word},
 @code{forward-sentence}, and @code{forward-paragraph}, stop at the
 boundary between the prompt and the actual text.
 
address@hidden See http://debbugs.gnu.org/11276
address@hidden See https://debbugs.gnu.org/11276
   The minibuffer's window is normally a single line; it grows
 automatically if the contents require more space.  Whilst it is
 active, you can explicitly resize it temporarily with the window
diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi
index 039201f..41d2d84 100644
--- a/doc/lispref/nonascii.texi
+++ b/doc/lispref/nonascii.texi
@@ -212,7 +212,7 @@ emacs, GNU Emacs Manual}.  Unlike 
@code{find-file-literally}, finding
 a file as @samp{raw-text} doesn't disable format conversion,
 uncompression, or auto mode selection.
 
address@hidden See http://debbugs.gnu.org/11226 for lack of unibyte tooltip.
address@hidden See https://debbugs.gnu.org/11226 for lack of unibyte tooltip.
 @vindex enable-multibyte-characters
 The buffer-local variable @code{enable-multibyte-characters} is
 address@hidden in multibyte buffers, and @code{nil} in unibyte ones.
diff --git a/doc/lispref/package.texi b/doc/lispref/package.texi
index af05d1e..153ee48 100644
--- a/doc/lispref/package.texi
+++ b/doc/lispref/package.texi
@@ -275,7 +275,7 @@ variable @code{load-file-name} (@pxref{Loading}).  Here is 
an example:
   Via the Package Menu, users may download packages from @dfn{package
 archives}.  Such archives are specified by the variable
 @code{package-archives}, whose default value contains a single entry:
-the archive hosted by the GNU project at @url{http://elpa.gnu.org}.  This
+the archive hosted by the GNU project at @url{https://elpa.gnu.org}.  This
 section describes how to set up and maintain a package archive.
 
 @cindex base location, package archive
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi
index 45e04a5..a1e8730 100644
--- a/doc/lispref/processes.texi
+++ b/doc/lispref/processes.texi
@@ -2331,7 +2331,7 @@ server is stopped; a address@hidden value means yes.
 Emacs can create encrypted network connections, using either built-in
 or external support.  The built-in support uses the GnuTLS
 Transport Layer Security Library; see
address@hidden://www.gnu.org/software/gnutls/, the GnuTLS project page}.
address@hidden://www.gnu.org/software/gnutls/, the GnuTLS project page}.
 If your Emacs was compiled with GnuTLS support, the function
 @code{gnutls-available-p} is defined and returns address@hidden  For
 more details, @pxref{Top,, Overview, emacs-gnutls, The Emacs-GnuTLS manual}.
diff --git a/doc/lispref/searching.texi b/doc/lispref/searching.texi
index 67d4c22..23879aa 100644
--- a/doc/lispref/searching.texi
+++ b/doc/lispref/searching.texi
@@ -950,7 +950,7 @@ for Font Lock address@hidden that @code{regexp-opt} does not
 guarantee that its result is absolutely the most efficient form
 possible.  A hand-tuned regular expression can sometimes be slightly
 more efficient, but is almost never worth the effort.}.
address@hidden E.g., see http://debbugs.gnu.org/2816
address@hidden E.g., see https://debbugs.gnu.org/2816
 
 The optional argument @var{paren} can be any of the following:
 
@@ -1220,7 +1220,7 @@ previous character cannot be part of a match for 
@var{regexp}.  When
 the match is extended, its starting position is allowed to occur
 before @var{limit}.
 
address@hidden http://debbugs.gnu.org/5689
address@hidden https://debbugs.gnu.org/5689
 As a general recommendation, try to avoid using @code{looking-back}
 wherever possible, since it is slow.  For this reason, there are no
 plans to add a @code{looking-back-p} function.
diff --git a/doc/lispref/symbols.texi b/doc/lispref/symbols.texi
index 2d9ec6f..cda5f1c 100644
--- a/doc/lispref/symbols.texi
+++ b/doc/lispref/symbols.texi
@@ -276,8 +276,7 @@ distinct uninterned symbol whose name is also @samp{foo}.
 @defun gensym &optional prefix
 This function returns a symbol using @code{make-symbol}, whose name is
 made by appending @code{gensym-counter} to @var{prefix}.  The prefix
-defaults to @code{"G"}.  If @var{prefix} is a number, it replaces the
-value of the counter.
+defaults to @code{"g"}.
 @end defun
 
 @defun intern name &optional obarray
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index b825b1d..a7d1079 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -4803,7 +4803,7 @@ would be:
 
 @lisp
 (dom-attr img 'href)
-=> "http://fsf.org/logo.png";
+=> "https://fsf.org/logo.png";
 @end lisp
 
 @item dom-children @var{node}
diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi
index 35abd8e..bed3bed 100644
--- a/doc/lispref/tips.texi
+++ b/doc/lispref/tips.texi
@@ -741,7 +741,7 @@ preceded by @samp{URL}.  For example,
 
 @smallexample
 The home page for the GNU project has more information (see URL
-`http://www.gnu.org/').
+`https://www.gnu.org/').
 @end smallexample
 
 @item
@@ -944,7 +944,7 @@ explains these conventions, starting with an example:
 
 ;; This file is free address@hidden
 @dots{}
-;; along with this file.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this file.  If not, see <https://www.gnu.org/licenses/>.
 @end group
 @end smallexample
 
@@ -966,7 +966,7 @@ might need to list them instead.  Do not say that the 
copyright holder
 is the Free Software Foundation (or that the file is part of GNU
 Emacs) unless your file has been accepted into the Emacs distribution.
 For more information on the form of copyright and license notices, see
address@hidden://www.gnu.org/licenses/gpl-howto.html, the guide on the GNU
address@hidden://www.gnu.org/licenses/gpl-howto.html, the guide on the GNU
 website}.
 
   After the copyright notice come several @dfn{header comment} lines,
diff --git a/doc/lispref/two-volume-cross-refs.txt 
b/doc/lispref/two-volume-cross-refs.txt
index 78133e9..6b12966 100644
--- a/doc/lispref/two-volume-cross-refs.txt
+++ b/doc/lispref/two-volume-cross-refs.txt
@@ -316,4 +316,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this file.  If not, see <http://www.gnu.org/licenses/>.
+along with this file.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/doc/lispref/two-volume.make b/doc/lispref/two-volume.make
index a797750..15f9649 100644
--- a/doc/lispref/two-volume.make
+++ b/doc/lispref/two-volume.make
@@ -232,4 +232,4 @@ elisp2-init: elisp.texi
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this file.  If not, see <http://www.gnu.org/licenses/>.
+# along with this file.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/doc/man/emacs.1.in b/doc/man/emacs.1.in
index 5d0948f..0e905b7 100644
--- a/doc/man/emacs.1.in
+++ b/doc/man/emacs.1.in
@@ -546,7 +546,7 @@ is the number of color planes.
 .SH MANUALS
 You can order printed copies of the GNU Emacs Manual from the Free
 Software Foundation, which develops GNU software.
-See the online store at <http://shop.fsf.org/>.
+See the online store at <https://shop.fsf.org/>.
 .br
 Your local administrator might also have copies available.
 As with all software and publications from FSF, everyone is permitted
@@ -597,10 +597,10 @@ Do not expect a personal answer to a bug report.
 The purpose of reporting bugs is to get them fixed for everyone
 in the next release, if possible.
 For personal assistance, consult the service directory at
-<http://www.fsf.org/resources/service/> for a list of people who offer it.
+<https://www.fsf.org/resources/service/> for a list of people who offer it.
 
 Please do not send anything but bug reports to this mailing list.
-For other Emacs lists, see <http://savannah.gnu.org/mail/?group=emacs>.
+For other Emacs lists, see <https://savannah.gnu.org/mail/?group=emacs>.
 .
 .
 .SH UNRESTRICTIONS
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 8ff8232..a60fb0b 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 SHELL = @SHELL@
 
diff --git a/doc/misc/autotype.texi b/doc/misc/autotype.texi
index 507a048..1f1f13a 100644
--- a/doc/misc/autotype.texi
+++ b/doc/misc/autotype.texi
@@ -581,7 +581,7 @@ specify that @kbd{M-x quickurl} should insert @var{URL} if 
the word
 @var{key} is at point, for example:
 
 @example
-(("FSF"      "http://www.fsf.org/"; "The Free Software Foundation")
+(("FSF"      "https://www.fsf.org/"; "The Free Software Foundation")
  ("emacs"  . "http://www.emacs.org/";)
  ("hagbard"  "http://www.hagbard.demon.co.uk"; "Hagbard's World"))
 @end example
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index 7bd0601..e4e7330 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -35751,7 +35751,7 @@ to work on these, please send a message (using @kbd{M-x 
report-calc-bug})
 so any efforts can be coordinated.
 
 The latest version of Calc is available from Savannah, in the Emacs
-repository.  See @uref{http://savannah.gnu.org/projects/emacs}.
+repository.  See @uref{https://savannah.gnu.org/projects/emacs}.
 
 @c [summary]
 @node Summary, Key Index, Reporting Bugs, Top
diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index f9ba5cc..c90f6d0 100644
--- a/doc/misc/cc-mode.texi
+++ b/doc/misc/cc-mode.texi
@@ -198,7 +198,7 @@ modify this GNU manual.''
 @insertcopying
 
 This manual was generated from cc-mode.texi, which is distributed with Emacs,
-or can be downloaded from @url{http://savannah.gnu.org/projects/emacs/}.
+or can be downloaded from @url{https://savannah.gnu.org/projects/emacs/}.
 @end titlepage
 
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -7396,7 +7396,7 @@ Emacs Lisp code that triggers the bug and include it in 
your report.
 
 @cindex bug report mailing list
 Reporting a bug using @code{c-submit-bug-report} files it in
-the GNU Bug Tracker at @url{http://debbugs.gnu.org}, then sends it on
+the GNU Bug Tracker at @url{https://debbugs.gnu.org}, then sends it on
 to @email{bug-cc-mode@@gnu.org}.  You can also send reports, other
 questions, and suggestions (kudos?@: @t{;-)} to that address.  It's a
 mailing list which you can join or browse an archive of; see the web site at
diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi
index 33b4858..b7ae7fe 100644
--- a/doc/misc/cl.texi
+++ b/doc/misc/cl.texi
@@ -1207,7 +1207,7 @@ must have a well-defined value outside the @code{cl-letf} 
body.
 There is essentially only one exception to this, which is @var{place}
 a plain variable with a specified @var{value} (such as @code{(a 17)}
 in the above example).
address@hidden See http://debbugs.gnu.org/12758
address@hidden See https://debbugs.gnu.org/12758
 @c Some or all of this was true for cl.el, but not for cl-lib.el.
 @ignore
 The only exceptions are plain variables and calls to
@@ -1389,7 +1389,7 @@ treated like a @code{cl-letf} or @code{cl-letf*}.  This 
differs from true
 Common Lisp, where the rules of lexical scoping cause a @code{let}
 binding to shadow a @code{symbol-macrolet} binding.  In this package,
 such shadowing does not occur, even when @code{lexical-binding} is
address@hidden See http://debbugs.gnu.org/12119
address@hidden See https://debbugs.gnu.org/12119
 @code{t}.  (This behavior predates the addition of lexical binding to
 Emacs Lisp, and may change in future to respect @code{lexical-binding}.)
 At present in this package, only @code{lexical-let} and
@@ -3326,7 +3326,7 @@ the first sequence.  This function is more general than 
the Emacs
 primitive @code{mapc}.  (Note that this function is called
 @code{cl-mapc} even in @file{cl.el}, rather than @code{mapc*} as you
 might expect.)
address@hidden http://debbugs.gnu.org/6575
address@hidden https://debbugs.gnu.org/6575
 @end defun
 
 @defun cl-mapl function list &rest more-lists
diff --git a/doc/misc/efaq-w32.texi b/doc/misc/efaq-w32.texi
index bb548c9..4ebcbea 100644
--- a/doc/misc/efaq-w32.texi
+++ b/doc/misc/efaq-w32.texi
@@ -164,7 +164,7 @@ instructions (requires DJGPP).
 @cindex Emacs source code
 @cindex source for Emacs
 You can download Emacs releases from
address@hidden://ftpmirror.gnu.org/emacs/, ftp.gnu.org mirrors}.  They
address@hidden://ftpmirror.gnu.org/emacs/, ftp.gnu.org mirrors}.  They
 are distributed as compressed tar files, digitally signed by the
 maintainer who made the release.
 
@@ -181,7 +181,7 @@ to give it a try.  @xref{Compiling}.
 @cindex latest development version of Emacs
 @cindex Emacs Development
 The development version of Emacs is available from
address@hidden://savannah.gnu.org/projects/emacs, Savannah}, the GNU
address@hidden://savannah.gnu.org/projects/emacs, Savannah}, the GNU
 development site.
 
 @node Compiling
@@ -581,7 +581,7 @@ update your registry (you may need to reboot).
 Shane Holder gives some background on how "Scancode Map" is used
 by the system:
 @ignore
-http://ftp.gnu.org/old-gnu/emacs/windows/docs/ntemacs/contrib/caps-ctrl-registry.txt
+https://ftp.gnu.org/old-gnu/emacs/windows/docs/ntemacs/contrib/caps-ctrl-registry.txt
 From: Shane Holder <holder@@mordor.rsn.hp.com>
 To: ntemacs-users@@cs.washington.edu
 Date: 04 Dec 1996 14:36:21 -0600
@@ -913,7 +913,7 @@ Fonts in Emacs 22 and earlier are named using the X Logical 
Font
 Description (XLFD) format.  Emacs on Windows ignores many of the
 fields, and populates them with * when listing fonts.  Former
 maintainer Andrew Innes wrote
address@hidden://www.gnu.org/software/emacs/windows/ntemacs/discuss/x-font-details,
address@hidden://www.gnu.org/software/emacs/windows/ntemacs/discuss/x-font-details,
 this explanation} of what each field in the font string means and how
 Emacs treated them back in 19.34.  Since then, multilingual support and
 a redisplay overhaul to support variable width fonts have changed things
@@ -1060,7 +1060,7 @@ support packages of various components of Windows itself, 
GNU/Linux
 distributions these days come with a number of Free truetype fonts
 that cover a wide range of languages.  The GNU Unifont project
 contains glyphs for most of the Unicode codespace, and can be
-downloaded from @uref{http://ftpmirror.gnu.org/unifont, ftp.gnu.org
+downloaded from @uref{https://ftpmirror.gnu.org/unifont, ftp.gnu.org
 mirrors}.
 
 @node Third-party multibyte
@@ -1136,7 +1136,7 @@ There are a number of methods by which you can control 
automatic CR/LF
 translation in Emacs, a situation that reflects the fact that the
 default support was not very robust in the past.  For a discussion of
 this issue, take a look at
address@hidden://www.gnu.org/software/emacs/windows/ntemacs/todo/translate,
address@hidden://www.gnu.org/software/emacs/windows/ntemacs/todo/translate,
 this collection of email messages} on the topic.
 
 @menu
@@ -1339,7 +1339,7 @@ When an EOF is sent to a subprocess running in an 
interactive shell
 with @code{process-send-eof}, the shell terminates unexpectedly as
 if its input was closed.  This affects the use of @kbd{C-c C-d} in
 shell buffers.  See
address@hidden://www.gnu.org/software/emacs/windows/ntemacs/todo/shell-ctrl-d,
address@hidden://www.gnu.org/software/emacs/windows/ntemacs/todo/shell-ctrl-d,
 this discussion} for more details.
 
 @node Using shell
@@ -1752,7 +1752,7 @@ AUCTeX is an Emacs package for writing LaTeX files, which 
also
 includes preview-latex, an Emacs mode for previewing the formatted
 contents of LaTeX documents.  Pre-compiled versions for Windows are
 available from
address@hidden://www.gnu.org/software/auctex/download-for-windows.html, the
address@hidden://www.gnu.org/software/auctex/download-for-windows.html, the
 AUCTeX site}.
 
 @node Spell check
@@ -2096,7 +2096,7 @@ code in lib/perl5db.pl
 @end example
 
 Doug Campbell also has some
address@hidden://www.gnu.org/software/emacs/windows/ntemacs/discuss/perldb,
address@hidden://www.gnu.org/software/emacs/windows/ntemacs/discuss/perldb,
 suggestions} for improving the interaction of perldb and Emacs.
 
 @c ------------------------------------------------------------
@@ -2272,8 +2272,8 @@ In Emacs, you can browse the manual using Info by typing 
@kbd{C-h r},
 and you can view the FAQ by typing @kbd{C-h C-f}. Other resources include:
 
 @itemize
address@hidden @uref{http://www.gnu.org/software/emacs/, The Emacs homepage}
address@hidden @uref{http://www.gnu.org/software/emacs/manual/, Other Emacs 
manuals}
address@hidden @uref{https://www.gnu.org/software/emacs/, The Emacs homepage}
address@hidden @uref{https://www.gnu.org/software/emacs/manual/, Other Emacs 
manuals}
 @item @uref{http://www.emacswiki.org/, Emacs Wiki}
 @end itemize
 
diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index 8d107e0..a8ece77 100644
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -393,7 +393,7 @@ recipients the same freedom that you enjoyed.
 
 @cindex GNU mailing lists
 The Emacs mailing lists are described at
address@hidden://savannah.gnu.org/mail/?group=emacs, the Emacs Savannah
address@hidden://savannah.gnu.org/mail/?group=emacs, the Emacs Savannah
 page}. Some of them are gatewayed to newsgroups.
 
 The newsgroup @uref{news:comp.emacs} is for discussion of Emacs programs
@@ -421,8 +421,7 @@ posting bug reports to this newsgroup directly 
(@pxref{Reporting bugs}).
 The FSF has maintained archives of all of the GNU mailing lists for many
 years, although there may be some unintentional gaps in coverage.  The
 archive can be browsed over the web at
address@hidden://lists.gnu.org/archive/html/, the GNU mail archive}.  Raw
-files can be downloaded from @uref{ftp://lists.gnu.org/}.
address@hidden://lists.gnu.org/archive/html/, the GNU mail archive}.
 
 Web-based Usenet search services, such as
 @uref{http://groups.google.com/groups/dir?q=gnu&;, Google}, also
@@ -506,12 +505,12 @@ unsubscribe.
 @cindex Free Software Foundation, contacting
 
 For up-to-date information, see
address@hidden://www.fsf.org/about/contact.html, the FSF contact web-page}.
address@hidden://www.fsf.org/about/contact.html, the FSF contact web-page}.
 You can send general correspondence to @email{info@@fsf.org}.
 
 @cindex Ordering GNU software
 For details on how to order items directly from the FSF, see the
address@hidden://shop.fsf.org/, FSF on-line store}.
address@hidden://shop.fsf.org/, FSF on-line store}.
 
 @c ------------------------------------------------------------
 @node Getting help
@@ -645,7 +644,7 @@ information.  To get a list of these commands, type 
@samp{?} after
 @cindex Emacs manual, obtaining a printed or HTML copy of
 
 You can order a printed copy of the Emacs manual from the address@hidden  For
-details see the @uref{http://shop.fsf.org/, FSF on-line store}.
+details see the @uref{https://shop.fsf.org/, FSF on-line store}.
 
 The full Texinfo source for the manual also comes in the @file{doc/emacs}
 directory of the Emacs distribution, if you're daring enough to try to
@@ -655,7 +654,7 @@ file}).
 If you absolutely have to print your own copy, and you don't have @TeX{},
 you can get a PostScript or PDF (or HTML) version from
 
address@hidden://www.gnu.org/software/emacs/manual/}
address@hidden://www.gnu.org/software/emacs/manual/}
 
 @xref{Learning how to do something}, for how to view the manual from Emacs.
 
@@ -675,12 +674,12 @@ in Info format (@pxref{Top, Emacs Lisp,, elisp, The
 Emacs Lisp Reference Manual}).
 
 You can also order a hardcopy of the manual from the FSF, for details
-see the @uref{http://shop.fsf.org/, FSF on-line store}.  (This manual is
+see the @uref{https://shop.fsf.org/, FSF on-line store}.  (This manual is
 not always in print.)
 
 An HTML version of the Emacs Lisp Reference Manual is available at
 
address@hidden://www.gnu.org/software/emacs/elisp-manual/elisp.html}
address@hidden://www.gnu.org/software/emacs/elisp-manual/elisp.html}
 
 @node Installing Texinfo documentation
 @section How do I install a piece of Texinfo documentation?
@@ -699,7 +698,7 @@ First, you must turn the Texinfo source files into Info 
files.  You may
 do this using the stand-alone @file{makeinfo} program, available as part
 of the Texinfo package at
 
address@hidden://www.gnu.org/software/texinfo/}
address@hidden://www.gnu.org/software/texinfo/}
 
 For information about the Texinfo format, read the Texinfo manual which
 comes with the Texinfo package.  This manual also comes installed in
@@ -893,7 +892,7 @@ Emacs news, a history of recent user-visible changes
 More GNU information, including back issues of the @cite{GNU's
 Bulletin}, are at
 
address@hidden://www.gnu.org/bulletins/bulletins.html} and
address@hidden://www.gnu.org/bulletins/bulletins.html} and
 
 @uref{http://www.cs.pdx.edu/~trent/gnu/gnu.html}
 
@@ -905,7 +904,7 @@ Bulletin}, are at
 @xref{Installing Emacs}, for some basic installation hints, and see
 @ref{Problems building Emacs}, if you have problems with the installation.
 
address@hidden://www.fsf.org/resources/service/, The GNU Service directory}
address@hidden://www.fsf.org/resources/service/, The GNU Service directory}
 lists companies and individuals willing to sell you help in installing
 or using Emacs and other GNU software.
 
@@ -983,7 +982,7 @@ version; three components indicate a development
 version (e.g., @samp{26.0.50} is what will eventually become @samp{26.1}).
 
 Emacs is under active development, hosted at
address@hidden://savannah.gnu.org/projects/emacs/, Savannah}.
address@hidden://savannah.gnu.org/projects/emacs/, Savannah}.
 Follow the instructions given there to clone the project repository.
 
 Because Emacs undergoes many changes before a release, the version
@@ -2490,7 +2489,7 @@ following in your @file{.emacs}:
 If you're tired of seeing backup files whenever you do an @samp{ls} at
 the Unix shell, try GNU @code{ls} with the @samp{-B} option.  GNU
 @code{ls} is part of the GNU Fileutils package, available from
address@hidden and its mirrors (@pxref{Current GNU distributions}).
address@hidden://ftp.gnu.org} and its mirrors (@pxref{Current GNU 
distributions}).
 
 To disable or change the way backups are made,
 @pxref{Backup Names,,, emacs, The GNU Emacs Manual}.
@@ -3293,11 +3292,11 @@ the source distribution.  In brief:
 
 @item
 First download the Emacs sources.  @xref{Current GNU distributions}, for
-a list of ftp sites that make them available.  On @file{ftp.gnu.org},
+a list of sites that make them available.  On @url{https://ftp.gnu.org},
 the main GNU distribution site, sources are available as
 
 @c Don't include VER in the file name, because pretests are not there.
address@hidden://ftp.gnu.org/pub/gnu/emacs/emacs-VERSION.tar.gz}
address@hidden://ftp.gnu.org/pub/gnu/emacs/emacs-VERSION.tar.gz}
 
 (Replace @samp{VERSION} with the relevant version number, e.g., @samp{23.1}.)
 
@@ -3305,7 +3304,7 @@ the main GNU distribution site, sources are available as
 Next uncompress and extract the source files.  This requires
 the @code{gzip} and @code{tar} programs, which are standard utilities.
 If your system does not have them, these can also be downloaded from
address@hidden
address@hidden://ftp.gnu.org}.
 
 GNU @code{tar} can uncompress and extract in a single-step:
 
@@ -3383,7 +3382,7 @@ problem (@pxref{Reporting bugs}).
 @cindex Downloading Emacs
 
 Information on downloading Emacs is available at
address@hidden://www.gnu.org/software/emacs/, the Emacs home-page}.
address@hidden://www.gnu.org/software/emacs/, the Emacs home-page}.
 
 @xref{Installing Emacs}, for information on how to obtain and build the latest
 version of Emacs, and see @ref{Current GNU distributions}, for a list of
@@ -3426,7 +3425,7 @@ see @ref{Packages that do not come with Emacs}.
 
 The easiest way to add more features to your Emacs is to use the
 command @kbd{M-x list-packages}.  This contacts the
address@hidden:///elpa.gnu.org, GNU ELPA} (``Emacs Lisp Package Archive'')
address@hidden:///elpa.gnu.org, GNU ELPA} (``Emacs Lisp Package Archive'')
 server and fetches the list of additional packages that it offers.
 These are GNU packages that are available for use with Emacs, but are
 distributed separately from Emacs itself, for reasons of space, etc.
@@ -3498,11 +3497,11 @@ Various spell-checkers are compatible with Emacs, 
including:
 
 The most up-to-date official GNU software is normally kept at
 
address@hidden://ftp.gnu.org/pub/gnu}
address@hidden://ftp.gnu.org/pub/gnu}
 
 A list of sites mirroring @samp{ftp.gnu.org} can be found at
 
address@hidden://www.gnu.org/order/ftp.html}
address@hidden://www.gnu.org/prep/ftp}
 
 @node Difference between Emacs and XEmacs
 @section What is the difference between Emacs and XEmacs (formerly Lucid 
Emacs)?
@@ -3548,7 +3547,7 @@ binary typically has a size of about 130 kbytes, so this 
can be useful
 if you are in an extremely space-restricted environment.  More
 information is available from
 
address@hidden://www.gnu.org/software/zile/}
address@hidden://www.gnu.org/software/zile/}
 
 
 @node Emacs for MS-DOS
@@ -3566,10 +3565,10 @@ onwards, including Windows XP and Vista.
 The file @file{etc/PROBLEMS} contains some additional information
 regarding Emacs under MS-DOS.
 
-A pre-built binary distribution of the old Emacs 20 is available, as
+A pre-built binary distribution of the old Emacs 24 is available, as
 described at
 
address@hidden://ftp.delorie.com/pub/djgpp/current/v2gnu/emacs.README}
address@hidden://www.delorie.com/pub/djgpp/current/v2gnu/emacs.README}
 
 For a list of other MS-DOS implementations of Emacs (and Emacs
 look-alikes), consult the list of ``Emacs implementations and literature,''
@@ -4203,7 +4202,7 @@ Arabic, Farsi, and Hebrew, since version 24.1.
 
 First, download and install the BDF font files and any auxiliary
 packages they need.  The GNU Intlfonts distribution can be found on
address@hidden://directory.fsf.org/localization/intlfonts.html, the GNU
address@hidden://directory.fsf.org/localization/intlfonts.html, the GNU
 Software Directory Web site}.
 
 Next, if you are on X Window system, issue the following two commands
diff --git a/doc/misc/emacs-gnutls.texi b/doc/misc/emacs-gnutls.texi
index 8716563..0ad48b0 100644
--- a/doc/misc/emacs-gnutls.texi
+++ b/doc/misc/emacs-gnutls.texi
@@ -113,7 +113,7 @@ The @code{gnutls-algorithm-priority} variable sets the 
GnuTLS priority
 string.  This is global, not per host name (although
 @code{gnutls-negotiate} supports a priority string per connection so
 it could be done if needed).  The priority string syntax is in the
address@hidden://www.gnu.org/software/gnutls/documentation.html, GnuTLS
address@hidden://www.gnu.org/software/gnutls/documentation.html, GnuTLS
 documentation}.
 @end defvar
 
diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index e38ead0..b391a88 100644
--- a/doc/misc/erc.texi
+++ b/doc/misc/erc.texi
@@ -875,7 +875,7 @@ decided to include ERC in Emacs.
 ERC 5.1 was released.  It was subsequently included in Emacs 22.
 
 ERC became an official GNU project, and development moved to
address@hidden://sv.gnu.org/projects/erc}.  We switched to using GNU Arch as
address@hidden://sv.gnu.org/projects/erc}.  We switched to using GNU Arch as
 our revision control system.  Our mailing list address changed as well.
 
 @item 2007
diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi
index 45797ce..b75ca0a 100644
--- a/doc/misc/gnus-faq.texi
+++ b/doc/misc/gnus-faq.texi
@@ -167,8 +167,8 @@ package system might not be up to date (e.g., Gnus 5.9 
bundled with Emacs
 21 is outdated).
 You can get the latest released version of Gnus from
 @uref{http://www.gnus.org/dist/gnus.tar.gz}
-or via anonymous FTP from
address@hidden://ftp.gnus.org/pub/gnus/gnus.tar.gz}.
+or from
address@hidden://ftp.gnus.org/pub/gnus/gnus.tar.gz}.
 
 @node FAQ 1-4
 @subsubheading Question 1.4
@@ -1522,7 +1522,7 @@ Gimp), open the image you want to include, cut out the
 relevant part, reduce color depth to 1 bit, resize to
 48*48 and save as bitmap. Now you should get the compface
 package from
address@hidden://ftp.cs.indiana.edu:/pub/faces/, this site}.
address@hidden://ftp.cs.indiana.edu/pub/faces/, this site}.
 and create the actual X-face by saying
 
 @example
diff --git a/doc/misc/gnus-news.el b/doc/misc/gnus-news.el
index c7d41c8..b6e8862 100644
--- a/doc/misc/gnus-news.el
+++ b/doc/misc/gnus-news.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -51,7 +51,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 \nLocal variables:\nmode: outline
 paragraph-separate: \"[        ]*$\"\nend:\n")
diff --git a/doc/misc/gnus-news.texi b/doc/misc/gnus-news.texi
index be7e7ac..94c2a79 100644
--- a/doc/misc/gnus-news.texi
+++ b/doc/misc/gnus-news.texi
@@ -143,7 +143,7 @@ with a WWW browser with @kbd{K H}.  @xref{MIME Commands}.
 @item International host names (@acronym{IDNA}) can now be decoded
 inside article bodies using @kbd{W i}
 (@code{gnus-summary-idna-message}).  This requires that GNU Libidn
-(@url{http://www.gnu.org/software/libidn/}) has been installed.
+(@url{https://www.gnu.org/software/libidn/}) has been installed.
 @c FIXME: Also mention @code{message-use-idna}?
 
 @item The address@hidden group names handling has been much
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 3e9b48e..88e121a 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -7759,7 +7759,9 @@ processing of the article is done before it is saved).  
For a different
 approach (uudecoding, unsharing) you should use @code{gnus-uu}
 (@pxref{Decoding Articles}).
 
-For the commands listed here, the target is a file.  If you want to
+For the commands listed here, the target is a file.
+A directory name (ending in @samp{/}) causes the target
+to be a file under that directory.  If you want to
 save to a group, see the @kbd{B c} (@code{gnus-summary-copy-article})
 command (@pxref{Mail Group Commands}).
 
@@ -8968,7 +8970,7 @@ Decode IDNA encoded domain names in the current articles. 
 IDNA
 encoded domain names looks like @samp{xn--bar}.  If a string remain
 unencoded after running invoking this, it is likely an invalid IDNA
 string (@samp{xn--bar} is invalid).  You must have GNU Libidn
-(@url{http://www.gnu.org/software/libidn/}) installed for this command
+(@url{https://www.gnu.org/software/libidn/}) installed for this command
 to work.
 
 @item W t
@@ -9184,7 +9186,7 @@ Verify a signed control message
 hierarchy maintainer.  You need to add the @acronym{PGP} public key of
 the maintainer to your keyring to verify the
 address@hidden@acronym{PGP} keys for many hierarchies are
-available at @uref{ftp://ftp.isc.org/pub/pgpcontrol/README.html}}
+available at @uref{https://ftp.isc.org/pub/pgpcontrol/README.html}}
 
 @item W s
 @kindex W s (Summary)
@@ -12318,7 +12320,7 @@ This variable controls whether Gnus performs IDNA 
decoding of
 internationalized domain names inside @samp{From}, @samp{To} and
 @samp{Cc} headers.  @xref{IDNA, ,IDNA,message, The Message Manual},
 for how to compose such messages.  This requires
address@hidden://www.gnu.org/software/libidn/, GNU Libidn}, and this
address@hidden://www.gnu.org/software/libidn/, GNU Libidn}, and this
 variable is only enabled if you have installed it.
 
 @vindex gnus-inhibit-images
@@ -13858,7 +13860,7 @@ The same as the above, but don't do automatic 
@acronym{STARTTLS} upgrades.
 @findex nntp-open-tls-stream
 @item nntp-open-tls-stream
 Opens a connection to a server over a @dfn{secure} channel.  To use
-this you must have @uref{http://www.gnu.org/software/gnutls/, GnuTLS}
+this you must have @uref{https://www.gnu.org/software/gnutls/, GnuTLS}
 installed.  You then define a server as follows:
 
 @lisp
diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index bbdef4a..829986e 100644
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -925,7 +925,7 @@ invoke @kbd{M-x message-idna-to-ascii-rhs RET} in the 
message buffer
 to have the address@hidden domain names encoded while you edit
 the message.
 
-Note that you must have @uref{http://www.gnu.org/software/libidn/, GNU
+Note that you must have @uref{https://www.gnu.org/software/libidn/, GNU
 Libidn} installed in order to use this functionality.
 
 @node Security
diff --git a/doc/misc/mh-e.texi b/doc/misc/mh-e.texi
index 3aa04ca..0fb6e6c 100644
--- a/doc/misc/mh-e.texi
+++ b/doc/misc/mh-e.texi
@@ -237,7 +237,7 @@ read a built-in tutorial by starting GNU Emacs and typing 
@kbd{C-h t}
 @ref{Top, , GNU Emacs Manual, emacs, GNU Emacs Manual},
 @end ifinfo
 @ifhtml
address@hidden://www.gnu.org/software/emacs/manual/html_node/emacs/,
address@hidden://www.gnu.org/software/emacs/manual/html_node/emacs/,
 @cite{GNU Emacs Manual}},
 @end ifhtml
 from the Free Software Foundation.
@@ -386,7 +386,7 @@ GNU Emacs Manual}.
 @end ifnothtml
 @ifhtml
 See section
address@hidden://www.gnu.org/software/emacs/manual/html_node/emacs/Easy-Customization.html,
address@hidden://www.gnu.org/software/emacs/manual/html_node/emacs/Easy-Customization.html,
 Easy Customization} in @cite{The GNU Emacs Manual}.
 @end ifhtml
 @xref{Options}.
@@ -406,7 +406,7 @@ GNU Emacs Manual}.
 @end ifnothtml
 @ifhtml
 See section
address@hidden://www.gnu.org/software/emacs/manual/html_node/emacs/Face-Customization.html,
address@hidden://www.gnu.org/software/emacs/manual/html_node/emacs/Face-Customization.html,
 Face Customization} in @cite{The GNU Emacs Manual}.
 @end ifhtml
 
@@ -424,7 +424,7 @@ Emacs Manual}
 @end ifnothtml
 @ifhtml
 See section
address@hidden://www.gnu.org/software/emacs/manual/html_node/emacs/Hooks.html,
address@hidden://www.gnu.org/software/emacs/manual/html_node/emacs/Hooks.html,
 Hooks} in @cite{The GNU Emacs Manual}
 @end ifhtml
 for a description about @dfn{normal hooks} and @dfn{abnormal hooks}.
@@ -475,7 +475,7 @@ point.
 @end ifnothtml
 @ifhtml
 See the section
address@hidden://www.gnu.org/software/emacs/manual/html_node/emacs/Completion.html,
address@hidden://www.gnu.org/software/emacs/manual/html_node/emacs/Completion.html,
 Completion} in @cite{The GNU Emacs Manual}.
 @end ifhtml
 Note that @key{SPC} cannot be used for completing filenames and
@@ -1123,17 +1123,17 @@ exist,
 @footnote{The @cite{GNU Emacs Lisp Reference Manual} should be available
 via the Info system by typing @kbd{C-h i m Emacs Lisp
 @key{RET}}. It is also available online at @*
address@hidden://www.gnu.org/software/emacs/manual/elisp.html}.}
address@hidden://www.gnu.org/software/emacs/manual/elisp.html}.}
 @end iftex
 @ifinfo
 @address@hidden, The GNU Emacs Lisp Reference Manual, , elisp, GNU
 Emacs Lisp Reference Manual}, which should be available via the
 Info system. It is also available online at
address@hidden://www.gnu.org/software/emacs/manual/elisp.html}.}
address@hidden://www.gnu.org/software/emacs/manual/elisp.html}.}
 @end ifinfo
 @ifhtml
 @footnote{The
address@hidden://www.gnu.org/software/emacs/manual/elisp.html,
address@hidden://www.gnu.org/software/emacs/manual/elisp.html,
 The GNU Emacs Lisp Reference Manual} should be available via
 the Info system by typing @kbd{C-h i m Emacs Lisp @key{RET}}.}
 @end ifhtml
@@ -1298,7 +1298,7 @@ When you choose a folder in MH-E via a command such as 
@kbd{o}
 @end ifnothtml
 @ifhtml
 (see the section
address@hidden://www.gnu.org/software/emacs/manual/html_node/emacs/Completion.html,
address@hidden://www.gnu.org/software/emacs/manual/html_node/emacs/Completion.html,
 Completion} in @cite{The GNU Emacs Manual}).
 @end ifhtml
 In addition, MH-E has several ways of choosing a suitable default so
@@ -2112,7 +2112,7 @@ display of this field requires the
 @command{uncompface} program}. Recent versions of XEmacs have internal
 support for @samp{X-Face:} images. If your version of XEmacs does not,
 then you'll need both @command{uncompface} and the
address@hidden://ftp.jpl.org/pub/elisp/, @samp{x-face} package}.}. MH-E
address@hidden://www.jpl.org/ftp/pub/elisp/, @samp{x-face} package}.}. MH-E
 renders the foreground and background of the image using the
 associated attributes of the face @code{mh-show-xface}.
 
@@ -2126,7 +2126,7 @@ associated attributes of the face @code{mh-show-xface}.
 Finally, MH-E will display images referenced by the
 @samp{X-Image-URL:} header field if neither the @samp{Face:} nor the
 @samp{X-Face:} fields are address@hidden display of the images
-requires the @uref{http://www.gnu.org/software/wget/wget.html,
+requires the @uref{https://www.gnu.org/software/wget/wget.html,
 @command{wget} program} to fetch the image and the @command{convert}
 program from the @uref{http://www.imagemagick.org/script/index.php,
 ImageMagick suite}.}. Of the three header fields this is the most
@@ -2856,7 +2856,7 @@ See @cite{The PGG Manual}.
 @end ifinfo
 @ifhtml
 See
address@hidden://www.gnu.org/software/emacs/manual/pgg.html,
address@hidden://www.gnu.org/software/emacs/manual/pgg.html,
 @cite{The PGG Manual}}.
 @end ifhtml
 
@@ -5623,7 +5623,7 @@ See @cite{The PGG Manual}.
 @end ifinfo
 @ifhtml
 See
address@hidden://www.gnu.org/software/emacs/manual/pgg.html,
address@hidden://www.gnu.org/software/emacs/manual/pgg.html,
 @cite{The PGG Manual}}.
 @end ifhtml
 
@@ -6032,7 +6032,7 @@ GNU Emacs Manual}).
 @end ifnothtml
 @ifhtml
 (see the section
address@hidden://www.gnu.org/software/emacs/manual/html_node/emacs/Regexps.html,
address@hidden://www.gnu.org/software/emacs/manual/html_node/emacs/Regexps.html,
 Syntax of Regular Expressions} in
 @cite{The GNU Emacs Manual}).
 @end ifhtml
@@ -6182,7 +6182,7 @@ GNU Emacs Manual}).
 @end ifnothtml
 @ifhtml
 (see the section
address@hidden://www.gnu.org/software/emacs/manual/html_node/emacs/Regexps.html,
address@hidden://www.gnu.org/software/emacs/manual/html_node/emacs/Regexps.html,
 Syntax of Regular Expressions} in
 @cite{The GNU Emacs Manual}).
 @end ifhtml
@@ -6290,7 +6290,7 @@ You can also use the speedbar
 @end ifnothtml
 @ifhtml
 (see the section
address@hidden://www.gnu.org/software/emacs/manual/html_node/emacs/Speedbar.html,
address@hidden://www.gnu.org/software/emacs/manual/html_node/emacs/Speedbar.html,
 Speedbar Frames} in @cite{The GNU Emacs Manual})
 @end ifhtml
 to view your folders. To bring up the speedbar, run @kbd{M-x speedbar
@@ -6422,7 +6422,7 @@ For a description of the menu bar, please
 @end ifnothtml
 @ifhtml
 see the section
address@hidden://www.gnu.org/software/emacs/manual/html_node/emacs/Menu-Bar.html,
address@hidden://www.gnu.org/software/emacs/manual/html_node/emacs/Menu-Bar.html,
 The Menu Bar} in @cite{The GNU Emacs Manual}.
 @end ifhtml
 
@@ -6444,7 +6444,7 @@ tool bar, please
 @end ifnothtml
 @ifhtml
 see the section
address@hidden://www.gnu.org/software/emacs/manual/html_node/emacs/Tool-Bars.html,
address@hidden://www.gnu.org/software/emacs/manual/html_node/emacs/Tool-Bars.html,
 Tool Bars} in @cite{The GNU Emacs Manual}.
 @end ifhtml
 
@@ -8226,7 +8226,7 @@ GNU Emacs Manual}.
 @end ifnothtml
 @ifhtml
 section
address@hidden://www.gnu.org/software/emacs/manual/html_node/emacs/Regexps.html,
address@hidden://www.gnu.org/software/emacs/manual/html_node/emacs/Regexps.html,
 Syntax of Regular Expressions} in @cite{The GNU Emacs Manual}.
 @end ifhtml
 
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index 44fcb94..ca57501 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -3601,7 +3601,7 @@ A link should be enclosed in double brackets and may 
contain a descriptive
 text to be displayed instead of the URL (@pxref{Link format}), for example:
 
 @example
-[[http://www.gnu.org/software/emacs/][GNU Emacs]]
+[[https://www.gnu.org/software/emacs/][GNU Emacs]]
 @end example
 
 @noindent
@@ -3713,7 +3713,7 @@ current session are part of the history for this prompt, 
so you can access
 them with @key{up} and @key{down} (or @kbd{M-p/n}).
 
 @b{Completion address@hidden Completion with @key{TAB} will help you to insert
-valid link prefixes like @samp{http:} or @samp{ftp:}, including the prefixes
+valid link prefixes like @samp{https:}, including the prefixes
 defined through link abbreviations (@pxref{Link abbreviations}).  If you
 press @key{RET} after inserting only the @var{prefix}, Org will offer
 specific completion support for some link address@hidden works if
diff --git a/doc/misc/reftex.texi b/doc/misc/reftex.texi
index dfe0ecc..e7eef9e 100644
--- a/doc/misc/reftex.texi
+++ b/doc/misc/reftex.texi
@@ -31,8 +31,8 @@ address@hidden
 @include emacsver.texi
 
 @set VERSION @value{EMACSVER}
address@hidden AUCTEXSITE @uref{http://www.gnu.org/software/auctex/,@AUCTeX{} 
web site}
address@hidden MAINTAINERSITE 
@uref{http://www.gnu.org/software/auctex/reftex.html,@RefTeX{} web page}
address@hidden AUCTEXSITE @uref{https://www.gnu.org/software/auctex/,@AUCTeX{} 
web site}
address@hidden MAINTAINERSITE 
@uref{https://www.gnu.org/software/auctex/reftex.html,@RefTeX{} web page}
 @set MAINTAINERCONTACT @uref{mailto:auctex-devel@@gnu.org,contact the 
maintainers}
 @set MAINTAINER the @AUCTeX{} project
 @set SUPPORTADDRESS @AUCTeX{} user mailing list (@email{auctex@@gnu.org})
diff --git a/doc/misc/smtpmail.texi b/doc/misc/smtpmail.texi
index 8249458..e45ec06 100644
--- a/doc/misc/smtpmail.texi
+++ b/doc/misc/smtpmail.texi
@@ -290,7 +290,7 @@ and @code{plain} for no encryption.
 Use of any form of TLS/SSL requires support in Emacs.  You can either
 use the built-in support (in Emacs 24.1 and later), or the
 @file{starttls.el} Lisp library.  The built-in support uses the GnuTLS
address@hidden@url{http://www.gnu.org/software/gnutls/}} library.
address@hidden@url{https://www.gnu.org/software/gnutls/}} library.
 If your Emacs has GnuTLS support built-in, the function
 @code{gnutls-available-p} is defined and returns address@hidden
 Otherwise, you must use the @file{starttls.el} library (see that file for
@@ -300,7 +300,7 @@ requires one of the following external tools to be 
installed:
 @enumerate
 @item
 The GnuTLS command line tool @samp{gnutls-cli}, which you can get from
address@hidden://www.gnu.org/software/gnutls/}.  This is the recommended
address@hidden://www.gnu.org/software/gnutls/}.  This is the recommended
 tool, mainly because it can verify server certificates.
 
 @item
diff --git a/doc/misc/url.texi b/doc/misc/url.texi
index a3c625e..e98fab4 100644
--- a/doc/misc/url.texi
+++ b/doc/misc/url.texi
@@ -112,11 +112,11 @@ technically obsolete despite its widespread vernacular 
usage.)
 meaning.  For example, the URI
 
 @example
-http://www.gnu.org/software/emacs/
+https://www.gnu.org/software/emacs/
 @end example
 
 @noindent
-specifies the scheme component @samp{http}, the hostname component
+specifies the scheme component @samp{https}, the hostname component
 @samp{www.gnu.org}, and the path component @samp{/software/emacs/}.
 
 @cindex parsed URIs
diff --git a/doc/misc/woman.texi b/doc/misc/woman.texi
index 7b926e1..fa12f9c 100644
--- a/doc/misc/woman.texi
+++ b/doc/misc/woman.texi
@@ -1290,7 +1290,7 @@ inelegantly, then please
 @enumerate
 @item
 try the latest version of @file{woman.el} from the Emacs repository
-on @uref{http://savannah.gnu.org/projects/emacs/}.  If it still fails, please
+on @uref{https://savannah.gnu.org/projects/emacs/}.  If it still fails, please
 
 @item
 use @kbd{M-x report-emacs-bug} to send a bug report.
diff --git a/etc/CALC-NEWS b/etc/CALC-NEWS
index 844b976..9518939 100644
--- a/etc/CALC-NEWS
+++ b/etc/CALC-NEWS
@@ -1167,7 +1167,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 Local variables:
diff --git a/etc/CENSORSHIP b/etc/CENSORSHIP
index a276331..cd779e4 100644
--- a/etc/CENSORSHIP
+++ b/etc/CENSORSHIP
@@ -5,4 +5,4 @@ Note added March 2014:
 This file is obsolete and will be removed in future.
 Please update any references to use
 
-<http://www.gnu.org/philosophy/censoring-emacs.html>
+<https://www.gnu.org/philosophy/censoring-emacs.html>
diff --git a/etc/COPYING b/etc/COPYING
index 94a9ed0..e600086 100644
--- a/etc/COPYING
+++ b/etc/COPYING
@@ -1,7 +1,7 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice 
is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an 
"about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/etc/DEBUG b/etc/DEBUG
index d7d6a0d..f5efbe0 100644
--- a/etc/DEBUG
+++ b/etc/DEBUG
@@ -677,7 +677,7 @@ procedure:
 ** If Emacs causes errors or memory leaks in your X server
 
 You can trace the traffic between Emacs and your X server with a tool
-like xmon, available at ftp://ftp.x.org/contrib/devel_tools/.
+like xmon.
 
 Xmon can be used to see exactly what Emacs sends when X protocol errors
 happen.  If Emacs causes the X server memory usage to increase you can
@@ -951,7 +951,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 Local variables:
diff --git a/etc/DISTRIB b/etc/DISTRIB
index 7e3a351..d7d01db 100644
--- a/etc/DISTRIB
+++ b/etc/DISTRIB
@@ -26,9 +26,9 @@ are designed to make sure that everyone who has a copy of GNU 
Emacs
 change it.
 
 For information on how to get GNU software, see
-http://www.gnu.org/software/software.html.  Printed copies of GNU
+https://www.gnu.org/software/software.html.  Printed copies of GNU
 manuals, including the Emacs manual, are available from the FSF's
-online store at http://shop.fsf.org.
+online store at https://shop.fsf.org.
 
 Emacs has been run on GNU/Linux, FreeBSD, NetBSD, OpenBSD, and on many
 Unix systems, on a variety of types of CPU, as well as on MS-DOS,
@@ -41,7 +41,7 @@ License for full details, in the file 'COPYING' in this 
directory (see
 above)), and neither I nor the Free Software Foundation promises any
 kind of support or assistance to users.  The foundation keeps a list
 of people who are willing to offer support and assistance for hire.
-See http://www.gnu.org/help/gethelp.html.
+See https://www.gnu.org/help/gethelp.html.
 
 However, we plan to continue to improve GNU Emacs and keep it
 reliable, so please send us any complaints and suggestions you have.
@@ -93,4 +93,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS
index b140e44..cee3281 100644
--- a/etc/ERC-NEWS
+++ b/etc/ERC-NEWS
@@ -313,8 +313,8 @@ This makes it easier to find modules by name.
 appear in the version of ERC that is bundled with Emacs 22.  These
 extras files may be found at:
 
- o http://ftp.gnu.org/gnu/erc/erc-5.2-extras.tar.gz, or
- o http://ftp.gnu.org/gnu/erc/erc-5.2-extras.zip.
+ o https://ftp.gnu.org/gnu/erc/erc-5.2-extras.tar.gz, or
+ o https://ftp.gnu.org/gnu/erc/erc-5.2-extras.zip.
 
 ** Renamed files
 
@@ -1343,4 +1343,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/etc/ETAGS.EBNF b/etc/ETAGS.EBNF
index fc20b9f..5928cea 100644
--- a/etc/ETAGS.EBNF
+++ b/etc/ETAGS.EBNF
@@ -109,4 +109,4 @@ COPYING PERMISSIONS:
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/etc/ETAGS.README b/etc/ETAGS.README
index f14a102..62965a4 100644
--- a/etc/ETAGS.README
+++ b/etc/ETAGS.README
@@ -44,4 +44,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+along with this program.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/etc/FTP b/etc/FTP
index 2fcfa22..ebd2695 100644
--- a/etc/FTP
+++ b/etc/FTP
@@ -1,8 +1,8 @@
 For information about how to download GNU Emacs, please see:
-<http://www.gnu.org/software/emacs/>
+<https://www.gnu.org/software/emacs/>
 
 For general GNU software downloading, please see
-<http://www.gnu.org/order/ftp.html>
+<https://www.gnu.org/order/ftp.html>
 
 Note added January 2014:
 This file is obsolete and will be removed in future.
diff --git a/etc/GNUS-NEWS b/etc/GNUS-NEWS
index 546686b..0196e61 100644
--- a/etc/GNUS-NEWS
+++ b/etc/GNUS-NEWS
@@ -102,7 +102,7 @@ are not reused when you select another article.  *Note 
Sticky Articles::.
 
 ** International host names (IDNA) can now be decoded inside article bodies
 using 'W i' ('gnus-summary-idna-message').  This requires that GNU Libidn
-(<http://www.gnu.org/software/libidn/>) has been installed.
+(<https://www.gnu.org/software/libidn/>) has been installed.
 
 ** The non-ASCII group names handling has been much improved.  The back ends
 that fully support non-ASCII group names are now 'nntp', 'nnml', and
@@ -307,7 +307,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 Local variables:
diff --git a/etc/HELLO b/etc/HELLO
index f5339f2..ceaff7e 100644
--- a/etc/HELLO
+++ b/etc/HELLO
@@ -90,7 +90,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Local Variables:
 ;;; tab-width: 32
diff --git a/etc/HISTORY b/etc/HISTORY
index 301ba33..095e6cb 100644
--- a/etc/HISTORY
+++ b/etc/HISTORY
@@ -3,7 +3,7 @@
 For more details about release contents, see the NEWS* files.
 
 Most of the development history of GNU Emacs is available in its
-source code repository <http://savannah.gnu.org/git/?group=emacs>.
+source code repository <https://savannah.gnu.org/git/?group=emacs>.
 However, in the early days GNU Emacs was developed without using
 version control systems and was published via half-inch 9-track
 1600-bpi magnetic tape reels.  Although information about this early
@@ -228,4 +228,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/etc/LINUX-GNU b/etc/LINUX-GNU
index 9e1c1a5..0f45e15 100644
--- a/etc/LINUX-GNU
+++ b/etc/LINUX-GNU
@@ -5,4 +5,4 @@ Note added March 2014:
 This file is obsolete and will be removed in future.
 Please update any references to use
 
-<http://www.gnu.org/gnu/linux-and-gnu.html>
+<https://www.gnu.org/gnu/linux-and-gnu.html>
diff --git a/etc/MACHINES b/etc/MACHINES
index 95073e0..49befca 100644
--- a/etc/MACHINES
+++ b/etc/MACHINES
@@ -40,7 +40,7 @@ the list at the end of this file.
   these systems relate to the GNU project, because that will help
   spread the GNU idea that software should be free--and thus encourage
   people to write more free software.  For more information, see
-  <http://www.gnu.org/gnu/linux-and-gnu.html>.
+  <https://www.gnu.org/gnu/linux-and-gnu.html>.
 
 *** 64-bit GNU/Linux
 
@@ -127,4 +127,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/etc/MH-E-NEWS b/etc/MH-E-NEWS
index 6e1f4db..6b1b66e 100644
--- a/etc/MH-E-NEWS
+++ b/etc/MH-E-NEWS
@@ -380,7 +380,7 @@ gatewayed at gmane.org (closes SF #979308).
 If you want to see the release notes for the alpha and beta releases
 leading up this release, please see:
 
-  
http://cvs.savannah.gnu.org/viewvc/emacs/emacs/etc/MH-E-NEWS?revision=1.25&view=markup
+  
https://cvs.savannah.gnu.org/viewvc/emacs/emacs/etc/MH-E-NEWS?revision=1.25&view=markup
 
 
 
@@ -2363,7 +2363,7 @@ new customization variables `mh-show-use-xface-flag' and 
`mh-x-face-file'
 (closes SF #480770).
 
 MH-E depends on the external x-face package found in
-ftp://ftp.jpl.org/pub/elisp/ to do this. The `uncompface' binary is
+http://www.jpl.org/pub/elisp/ to do this. The `uncompface' binary is
 also required to be in the execute PATH. It can be obtained from:
 http://freshmeat.net/redir/compface/1439/url_tgz/compface-1.4.tar.gz.
 
@@ -3394,7 +3394,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 Local variables:
diff --git a/etc/NEWS b/etc/NEWS
index af29b29..016868d 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -69,6 +69,15 @@ Deterministic builds omit the build date from the output of 
the
 following variables nil: 'emacs-build-system', 'emacs-build-time',
 'erc-emacs-build-time'.
 
+---
+** Emacs can now be built with support for Little CMS.
+
+If the lcms2 library is installed, Emacs will enable features built on
+top of that library.  The new configure option '--without-lcms2' can
+be used to build without lcms2 support even if it is installed.  Emacs
+linked to Little CMS exposes color management functions in Lisp: the
+color metrics 'lcms-cie-de2000' and 'lcms-cam02-ucs'.
+
 ** The configure option '--with-gameuser' now defaults to 'no',
 as this appears to be the most common configuration in practice.
 When it is 'no', the shared game directory and the auxiliary program
@@ -108,6 +117,14 @@ The effect is similar to that of "toolBar" resource on the 
tool bar.
 
 * Changes in Emacs 26.1
 
++++
+** Functions in 'write-contents-functions' can fully short-circuit the
+'save-buffer' process.  Previously, saving a buffer that was not
+visiting a file would always prompt for a file name.  Now it only does
+so if 'write-contents-functions' is nil (or all its functions return
+nil).  A non-nil buffer-local value for this variable is sufficient
+for 'save-some-buffers' to consider the buffer for saving.
+
 ---
 ** New variable 'executable-prefix-env' for inserting magic signatures.
 This variable affects the format of the interpreter magic number
@@ -1137,6 +1154,14 @@ be disabled by setting 
'byte-compile-cond-use-jump-table' to nil.
 ** The alist 'ucs-names' is now a hash table.
 
 ---
+** 'if-let' and 'when-let' are subsumed by 'if-let*' and 'when-let*'.
+The incumbent 'if-let' and 'when-let' are now marked obsolete.
+'if-let*' and 'when-let*' do not accept the single tuple special case.
+New macro 'and-let*' is an implementation of the Scheme SRFI-2 syntax
+of the same name.  'if-let*' and 'when-let*' now accept the same
+binding syntax as 'and-let*'.
+
+---
 ** 'C-up', 'C-down', 'C-left' and 'C-right' are now defined in term
 mode to send the same escape sequences that xterm does.  This makes
 things like forward-word in readline work.
@@ -1529,10 +1554,6 @@ It avoids unnecessary consing (and garbage collection).
 ** 'gensym' is now part of Elisp.
 
 ---
-** 'if-let*', 'when-let*', and 'and-let*' are new in subr-x.el.
-The incumbent 'if-let' and 'when-let' are now aliases.
-
----
 ** Low-level list functions like 'length' and 'member' now do a better
 job of signaling list cycles instead of looping indefinitely.
 
@@ -1576,6 +1597,11 @@ function keeps on returning the line number taking 
potential narrowing
 into account.  If this parameter is non-nil, the function ignores
 narrowing and returns the absolute line number.
 
+---
+** The function 'color-distance' now takes a second optional argument
+'metric'.  When non-nil, it should be a function of two arguments that
+accepts two colors and returns a number.
+
 ** Changes in Frame and Window Handling
 
 +++
@@ -1835,7 +1861,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 Local variables:
diff --git a/etc/NEWS.1-17 b/etc/NEWS.1-17
index 0a7ca05..b956442 100644
--- a/etc/NEWS.1-17
+++ b/etc/NEWS.1-17
@@ -2524,7 +2524,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 Local variables:
diff --git a/etc/NEWS.18 b/etc/NEWS.18
index 93e07df..b26e132 100644
--- a/etc/NEWS.18
+++ b/etc/NEWS.18
@@ -1614,7 +1614,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 Local variables:
diff --git a/etc/NEWS.19 b/etc/NEWS.19
index 70f8673..955dcfb 100644
--- a/etc/NEWS.19
+++ b/etc/NEWS.19
@@ -614,7 +614,7 @@ be different.
 It is generally recommended to use `system-configuration' rather
 than `system-type'.
 
-See <http://www.gnu.org/gnu/linux-and-gnu.html> for more about this.
+See <https://www.gnu.org/gnu/linux-and-gnu.html> for more about this.
 
 ** The functions shell-command and dired-call-process
 now run file name handlers for default-directory, if it has them.
@@ -6533,7 +6533,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 Local variables:
diff --git a/etc/NEWS.20 b/etc/NEWS.20
index 3e829d1..572ae5b 100644
--- a/etc/NEWS.20
+++ b/etc/NEWS.20
@@ -4506,7 +4506,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 Local variables:
diff --git a/etc/NEWS.21 b/etc/NEWS.21
index 9574a5d..eebacf8 100644
--- a/etc/NEWS.21
+++ b/etc/NEWS.21
@@ -4893,7 +4893,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 Local variables:
diff --git a/etc/NEWS.22 b/etc/NEWS.22
index 689eff9..6426a9d 100644
--- a/etc/NEWS.22
+++ b/etc/NEWS.22
@@ -5598,7 +5598,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 Local variables:
diff --git a/etc/NEWS.23 b/etc/NEWS.23
index 78802d2..84b8409 100644
--- a/etc/NEWS.23
+++ b/etc/NEWS.23
@@ -2558,7 +2558,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 Local variables:
diff --git a/etc/NEWS.24 b/etc/NEWS.24
index fc52fff..4c26f47 100644
--- a/etc/NEWS.24
+++ b/etc/NEWS.24
@@ -2542,7 +2542,7 @@ automatically select it.
 
 ** An Emacs Lisp package manager is now included.
 This is a convenient way to download and install additional packages,
-from a package repository at http://elpa.gnu.org.
+from a package repository at https://elpa.gnu.org.
 
 *** M-x list-packages shows a list of packages, which can be
 selected for installation.
@@ -3853,7 +3853,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 Local variables:
diff --git a/etc/NEWS.25 b/etc/NEWS.25
index db448fd..5201a30 100644
--- a/etc/NEWS.25
+++ b/etc/NEWS.25
@@ -18,33 +18,28 @@ with a prefix argument or by typing C-u C-h C-n.
 
 * Changes in Emacs 25.3
 
-This is mainly a release to fix security-relevant bugs.
+This is an emergency release to fix a security vulnerability in Emacs.
 
-** Enriched text mode no longer supports the 'FUNCTION' and 'display'
-translations, and Gnus no longer processes enriched text when
-inlining.  This fixes bugs introduced in Emacs 19.29.  To work around
-these bugs in Emacs versions 19.29 through 25.2, append the following
-to your ~/.emacs file:
+** Security vulnerability related to Enriched Text mode is removed.
 
-  (provide 'enriched)
-  (defun enriched-mode (&optional arg))
-  (defun enriched-decode (from to))
+*** Enriched Text mode has its support for decoding 'x-display' disabled.
+This feature allows saving 'display' properties as part of text.
+Emacs 'display' properties support evaluation of arbitrary Lisp forms
+as part of instantiating the property, so decoding 'x-display' is
+vulnerable to executing arbitrary malicious Lisp code included in the
+text (e.g., sent as part of an email message).
 
-Thanks to Charles A. Roelli for reporting this bug; see:
-https://bugs.gnu.org/28350
+This vulnerability was introduced in Emacs 21.1.  To work around that
+in Emacs versions before 25.3, append the following to your ~/.emacs
+init file:
 
-** TLS/SSL connections no longer fall back on the openssl s_client
-command to set up SSL connections in some hopefully-unlikely cases.
-This fixes a bug introduced in Emacs 22.1.  To work around this bug in
-Emacs versions 22.1 through 25.2, append the following to your
-~/.emacs file:
+  (eval-after-load "enriched"
+    '(defun enriched-decode-display-prop (start end &optional param)
+       (list start end)))
 
-  (setq tls-program '("gnutls-cli --x509cafile %t -p %p %h"))
-
-You may need to omit the "--x509cafile %t" on older installations.
-
-Thanks to Kurt Roeckx for reporting this bug to Debian; see:
-https://bugs.debian.org/766397
+*** Gnus no longer supports "richtext" and "enriched" inline MIME objects.
+This support was disabled to avoid evaluation of arbitrary Lisp code
+contained in email messages and news articles.
 
 
 * Changes in Emacs 25.2
@@ -1102,7 +1097,7 @@ be added to the archive.
 Emacs is compiled with file notification support.
 
 *** 'auto-revert-use-notify' is set to nil in 'global-auto-revert-mode'.
-See <http://debbugs.gnu.org/22814>.
+See <https://debbugs.gnu.org/22814>.
 
 ** File Notifications
 
@@ -1818,7 +1813,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 Local variables:
diff --git a/etc/NEXTSTEP b/etc/NEXTSTEP
index d3e4828..f657e04 100644
--- a/etc/NEXTSTEP
+++ b/etc/NEXTSTEP
@@ -310,4 +310,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/etc/NXML-NEWS b/etc/NXML-NEWS
index edf7c13..751ed37 100644
--- a/etc/NXML-NEWS
+++ b/etc/NXML-NEWS
@@ -220,4 +220,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index ff1000e..bb1a400 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -640,7 +640,7 @@ where local file =emacs.html= is referenced.
 For most folks this file does not exist.
 Thus the new behavior is to generate this HTML link instead:
 
-: <a 
href="http://www.gnu.org/software/emacs/manual/html_mono/emacs.html#List-Buffers";>emacs#List
 Buffers</a>
+: <a 
href="https://www.gnu.org/software/emacs/manual/html_mono/emacs.html#List-Buffers";>emacs#List
 Buffers</a>
 
 All emacs related info links are similarly translated plus few other
 =gnu.org= manuals.
@@ -1675,7 +1675,7 @@ manual for details and check 
[[http://orgmode.org/worg/org-8.0.html][this Worg p
 
 *** ~ox-texinfo.el~ by Jonathan Leech-Pepin
 
-    =ox-texinfo.el= allows you to export Org files to 
[[http://www.gnu.org/software/texinfo/][Texinfo]] files.
+    =ox-texinfo.el= allows you to export Org files to 
[[https://www.gnu.org/software/texinfo/][Texinfo]] files.
 
 ** New packages in contrib
 
@@ -1728,7 +1728,7 @@ manual for details and check 
[[http://orgmode.org/worg/org-8.0.html][this Worg p
 
 *** ~ox-groff.el~ by Luis Anaya and Nicolas Goaziou
 
-    The [[http://www.gnu.org/software/groff/][groff]] (GNU troff) software is 
a typesetting package which reads
+    The [[https://www.gnu.org/software/groff/][groff]] (GNU troff) software is 
a typesetting package which reads
     plain text mixed with formatting commands and produces formatted
     output.
 
@@ -2408,7 +2408,7 @@ You can now add the Org ELPA repository like this:
 #+END_SRC
 
 It contains both the =org-*.tar= package (the core Org distribution, also
-available through http://elpa.gnu.org) and the =org-plus*.tar= package (the
+available through https://elpa.gnu.org) and the =org-plus*.tar= package (the
 extended Org distribution, with non-GNU packages from the =contrib/=
 directory.)
 
@@ -2436,7 +2436,7 @@ See http://orgmode.org/elpa/
 
 *** =org-eshell.el= by Konrad Hinsen is now in Org
 
-    =org-eshell.el= allows you to create links from 
[[http://www.gnu.org/software/emacs/manual/html_node/eshell/index.html][Eshell]].
+    =org-eshell.el= allows you to create links from 
[[https://www.gnu.org/software/emacs/manual/html_node/eshell/index.html][Eshell]].
 
 *** Support for execution of Scala code blocks (see ob-scala.el)
 *** Support for execution of IO code blocks (see ob-io.el)
@@ -3036,7 +3036,7 @@ that Calc formulas can operate on them.
     =org-export-html-scripts= is now a variable, so that you can adapt
     the code and the license to your needs.
 
-    See http://www.gnu.org/philosophy/javascript-trap.html for
+    See https://www.gnu.org/philosophy/javascript-trap.html for
     explanations on why these changes were necessary.
 
 * Version 7.8.11
@@ -3821,4 +3821,4 @@ that Calc formulas can operate on them.
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+  along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 713e44f..f8f1a36 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -120,8 +120,8 @@ load-path.
 
 This version of GCC is buggy: see
 
-  http://debbugs.gnu.org/6031
-  http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43904
+  https://debbugs.gnu.org/6031
+  https://gcc.gnu.org/bugzilla/show_bug.cgi?id=43904
 
 You can work around this error in gcc-4.5 by omitting sibling call
 optimization.  To do this, configure Emacs with
@@ -166,7 +166,7 @@ untar it :-).
 ** Emacs can crash when displaying PNG images with transparency.
 
 This is due to a bug introduced in ImageMagick 6.8.2-3.  The bug should
-be fixed in ImageMagick 6.8.3-10.  See <URL:http://debbugs.gnu.org/13867>.
+be fixed in ImageMagick 6.8.3-10.  See <URL:https://debbugs.gnu.org/13867>.
 
 ** Crashes when displaying GIF images in Emacs built with version
 libungif-4.1.0 are resolved by using version libungif-4.1.0b1.
@@ -634,7 +634,7 @@ can cause this error.  Remove that file, execute 
'ispell-kill-ispell'
 in Emacs, and then try spell-checking again.
 
 *** TLS problems, e.g., Gnus hangs when fetching via imaps
-http://debbugs.gnu.org/24247
+https://debbugs.gnu.org/24247
 
 gnutls-cli 3.5.3 (2016-08-09) does not generate a "- Handshake was
 completed" message that tls.el relies upon, causing affected Emacs
@@ -671,9 +671,10 @@ problem by installing additional fonts.
 
 The intlfonts distribution includes a full spectrum of fonts that can
 display all the characters Emacs supports.  The etl-unicode collection
-of fonts (available from <URL:ftp://ftp.x.org/contrib/fonts/>) includes
-fonts that can display many Unicode characters; they can also be used
-by ps-print and ps-mule to print Unicode characters.
+of fonts (available from
+<https://ftp.nluug.nl/windowing/X/contrib/fonts/>) includes fonts that
+can display many Unicode characters; they can also be used by ps-print
+and ps-mule to print Unicode characters.
 
 ** Under X, some characters appear improperly aligned in their lines.
 
@@ -1063,9 +1064,9 @@ reported to refuse such attempts and snap back to the 
width needed to
 show the full menu bar (wmii) or at least cause the screen to flicker
 during such resizing attempts (i3, IceWM).
 
-See also http://debbugs.gnu.org/cgi/bugreport.cgi?bug=15700,
-http://debbugs.gnu.org/cgi/bugreport.cgi?bug=22000,
-http://debbugs.gnu.org/cgi/bugreport.cgi?bug=22898 and
+See also https://debbugs.gnu.org/cgi/bugreport.cgi?bug=15700,
+https://debbugs.gnu.org/cgi/bugreport.cgi?bug=22000,
+https://debbugs.gnu.org/cgi/bugreport.cgi?bug=22898 and
 http://lists.gnu.org/archive/html/emacs-devel/2016-07/msg00154.html.
 
 *** Metacity: Resizing Emacs or ALT-Tab causes X to be unresponsive.
@@ -1743,7 +1744,7 @@ global-font-lock-mode RET" or by customizing the variable
 'global-font-lock-mode'.
 
 ** Unexpected characters inserted into the buffer when you start Emacs.
-See e.g. <URL:http://debbugs.gnu.org/11129>
+See e.g. <URL:https://debbugs.gnu.org/11129>
 
 This can happen when you start Emacs in -nw mode in an Xterm.
 For example, in the *scratch* buffer, you might see something like:
@@ -1782,7 +1783,7 @@ exec 2> >(exec cat >&2 2>/dev/null)
 exec ssh "$@"
 
 *** GNU/Linux: Truncated svn annotate output with SSH.
-http://debbugs.gnu.org/7791
+https://debbugs.gnu.org/7791
 
 The symptoms are: you are accessing a svn repository over SSH.
 You use vc-annotate on a large (several thousand line) file, and the
@@ -2757,7 +2758,7 @@ Compiling the lisp files fails at random places, 
complaining:
 "No rule to make target '/path/to/some/lisp.elc'".
 The causes of this problem are not understood.  Using GNU make 3.81 compiled
 from source, rather than the Ubuntu version, worked.
-See <URL:http://debbugs.gnu.org/327>, <URL:http://debbugs.gnu.org/821>.
+See <URL:https://debbugs.gnu.org/327>, <URL:https://debbugs.gnu.org/821>.
 
 ** Dumping
 
@@ -2927,20 +2928,6 @@ release was reported to work without problems.  It 
worked OK on
 another system with Solaris 8 using apparently the same 5.0 compiler
 and the default CFLAGS.
 
-**** Solaris 2.x: Emacs dumps core when built with Motif.
-
-The Solaris Motif libraries are buggy, at least up through Solaris 2.5.1.
-Install the current Motif runtime library patch appropriate for your host.
-(Make sure the patch is current; some older patch versions still have the bug.)
-You should install the other patches recommended by Sun for your host, too.
-You can obtain Sun patches from ftp://sunsolve.sun.com/pub/patches/;
-look for files with names ending in '.PatchReport' to see which patches
-are currently recommended for your host.
-
-On Solaris 2.6, Emacs is said to work with Motif when Solaris patch
-105284-12 is installed, but fail when 105284-15 is installed.
-105284-18 might fix it again.
-
 **** Solaris 2.6 and 7: the Compose key does not work.
 
 This is a bug in Motif in Solaris.  Supposedly it has been fixed for
@@ -3201,7 +3188,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 Local variables:
diff --git a/etc/TERMS b/etc/TERMS
index 5237972..0b558a6 100644
--- a/etc/TERMS
+++ b/etc/TERMS
@@ -245,4 +245,4 @@ COPYING PERMISSIONS:
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/etc/THE-GNU-PROJECT b/etc/THE-GNU-PROJECT
index ece9aa6..d2aa155 100644
--- a/etc/THE-GNU-PROJECT
+++ b/etc/THE-GNU-PROJECT
@@ -5,4 +5,4 @@ Note added March 2014:
 This file is obsolete and will be removed in future.
 Please update any references to use
 
-<http://www.gnu.org/gnu/thegnuproject.html>
+<https://www.gnu.org/gnu/thegnuproject.html>
diff --git a/etc/TODO b/etc/TODO
index af2f41b..278c0b5 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -21,7 +21,7 @@ answers), at the address@hidden mailing list.
 For more information about getting involved, see the CONTRIBUTE file.
 
 As well as the issues listed here, there are bug reports at
-<http://debbugs.gnu.org>.  Bugs tagged "easy" ought to be suitable for
+<https://debbugs.gnu.org>.  Bugs tagged "easy" ought to be suitable for
 beginners to work on, but unfortunately we are not very good at using
 this tag.  Bugs tagged "help" are ones where assistance is required,
 but may be difficult to fix.  Bugs with severity "important" or higher
@@ -345,7 +345,7 @@ scroll bars are extensible.
 ** Program Enriched mode to read and save in RTF.  [Is there actually a
   decent single definition of RTF?  Maybe see info at
   http://latex2rtf.sourceforge.net/.]  This task seems to be addressed
-  by http://savannah.nongnu.org/projects/emacs-rtf/, which is still in
+  by https://savannah.nongnu.org/projects/emacs-rtf/, which is still in
   very early stages.
 
   Another place to look is the Wikipedia article at
@@ -824,7 +824,7 @@ of unique features.
 **** Existing packages
 
 Note that there is a generic UI test named frame-test.el, see
-http://debbugs.gnu.org/21415#284 .
+https://debbugs.gnu.org/21415#284 .
 The NS interface passes this, with the exception of two toolbar-related errors.
 
 **** Anders frame test
@@ -872,9 +872,9 @@ of the two patches, Emacs responds that s-9 was pressed.
 More investigation is needed to fix this problem.
 
 Links:
-- http://debbugs.gnu.org/19977
-- http://debbugs.gnu.org/21330
-- http://debbugs.gnu.org/21551
+- https://debbugs.gnu.org/19977
+- https://debbugs.gnu.org/21330
+- https://debbugs.gnu.org/21551
 
 **** Toggling the toolbar in fullheight or maximized modes
 
@@ -1550,7 +1550,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;; Local Variables:
 ;; coding: utf-8
diff --git a/etc/WHY-FREE b/etc/WHY-FREE
index a70232d..cd2c2fc 100644
--- a/etc/WHY-FREE
+++ b/etc/WHY-FREE
@@ -5,4 +5,4 @@ Note added March 2014:
 This file is obsolete and will be removed in future.
 Please update any references to use
 
-<http://www.gnu.org/philosophy/why-free.html>
+<https://www.gnu.org/philosophy/why-free.html>
diff --git a/etc/charsets/README b/etc/charsets/README
index 315c364..101e056 100644
--- a/etc/charsets/README
+++ b/etc/charsets/README
@@ -18,7 +18,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 (1) Format of mapping files
 
diff --git a/etc/compilation.txt b/etc/compilation.txt
index 85e3632..970c04e 100644
--- a/etc/compilation.txt
+++ b/etc/compilation.txt
@@ -640,4 +640,4 @@ COPYING PERMISSIONS:
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/etc/edt-user.el b/etc/edt-user.el
index 80f3b7e..6d729a7 100644
--- a/etc/edt-user.el
+++ b/etc/edt-user.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/etc/emacs-buffer.gdb b/etc/emacs-buffer.gdb
index 48e9a5d..7d9d648 100644
--- a/etc/emacs-buffer.gdb
+++ b/etc/emacs-buffer.gdb
@@ -18,7 +18,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 # Commentary:
 
diff --git a/etc/emacs.appdata.xml b/etc/emacs.appdata.xml
index 0ba305c..c3b1afb 100644
--- a/etc/emacs.appdata.xml
+++ b/etc/emacs.appdata.xml
@@ -25,9 +25,9 @@
   </ul>
  </description>
  <screenshots>
-  <screenshot type="default" width="632" 
height="354">http://www.gnu.org/software/emacs/images/appdata.png</screenshot>
+  <screenshot type="default" width="632" 
height="354">https://www.gnu.org/software/emacs/images/appdata.png</screenshot>
  </screenshots>
- <url type="homepage">http://www.gnu.org/software/emacs</url>
+ <url type="homepage">https://www.gnu.org/software/emacs</url>
  <updatecontact>emacs-devel_at_gnu.org</updatecontact>
  <project_group>GNU</project_group>
 </application>
diff --git a/etc/enriched.txt b/etc/enriched.txt
index e1f2d6c..0a29116 100644
--- a/etc/enriched.txt
+++ b/etc/enriched.txt
@@ -254,4 +254,4 @@ COPYING PERMISSIONS:
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <<http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <<https://www.gnu.org/licenses/>.
diff --git a/etc/forms/forms-d2.el b/etc/forms/forms-d2.el
index edd1a2d..96a49da 100644
--- a/etc/forms/forms-d2.el
+++ b/etc/forms/forms-d2.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/etc/gnus-tut.txt b/etc/gnus-tut.txt
index 74b110f..3d2d742 100644
--- a/etc/gnus-tut.txt
+++ b/etc/gnus-tut.txt
@@ -42,7 +42,7 @@ heart's delight at 
<URL:http://www.ifi.uio.no/~larsi/larsi.html>.
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 From lars Thu Feb 23 23:20:38 1995
 From: address@hidden (ding)
diff --git a/etc/grep.txt b/etc/grep.txt
index 582bc5f..f01a96b 100644
--- a/etc/grep.txt
+++ b/etc/grep.txt
@@ -112,7 +112,7 @@ COPYING PERMISSIONS:
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 
 ;;; Local Variables:
diff --git a/etc/images/checked.xpm b/etc/images/checked.xpm
index 033da68..c41cb90 100644
--- a/etc/images/checked.xpm
+++ b/etc/images/checked.xpm
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
  */
 static char * checked_xpm[] = {
 "12 12 5 1",
diff --git a/etc/images/gnus/gnus.svg b/etc/images/gnus/gnus.svg
index 0d9d863..ba2186d 100644
--- a/etc/images/gnus/gnus.svg
+++ b/etc/images/gnus/gnus.svg
@@ -18,7 +18,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+   along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 -->
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
@@ -49,7 +49,7 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
         <cc:license
-           rdf:resource="http://www.gnu.org/copyleft/gpl.html"; />
+           rdf:resource="https://www.gnu.org/copyleft/gpl.html"; />
         <dc:title>gnus</dc:title>
         <dc:date>2008/06/28</dc:date>
         <dc:creator>
@@ -64,7 +64,7 @@
         </dc:rights>
         <dc:description>gnus splash image</dc:description>
         <cc:license
-           rdf:resource="http://www.gnu.org/copyleft/gpl.html"; />
+           rdf:resource="https://www.gnu.org/copyleft/gpl.html"; />
       </cc:Work>
     </rdf:RDF>
   </metadata>
diff --git a/etc/images/icons/hicolor/scalable/apps/emacs.svg 
b/etc/images/icons/hicolor/scalable/apps/emacs.svg
index 632d53e..d329199 100644
--- a/etc/images/icons/hicolor/scalable/apps/emacs.svg
+++ b/etc/images/icons/hicolor/scalable/apps/emacs.svg
@@ -32,7 +32,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+   along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 --><!-- Created with Inkscape (http://www.inkscape.org/) --><defs
      id="defs4770"><linearGradient
diff --git a/etc/images/icons/hicolor/scalable/apps/emacs23.svg 
b/etc/images/icons/hicolor/scalable/apps/emacs23.svg
index 3e2168f..d314538 100644
--- a/etc/images/icons/hicolor/scalable/apps/emacs23.svg
+++ b/etc/images/icons/hicolor/scalable/apps/emacs23.svg
@@ -25,7 +25,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+   along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 -->
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
diff --git a/etc/images/icons/hicolor/scalable/mimetypes/emacs-document23.svg 
b/etc/images/icons/hicolor/scalable/mimetypes/emacs-document23.svg
index e4f4dc6..4451a97 100644
--- a/etc/images/icons/hicolor/scalable/mimetypes/emacs-document23.svg
+++ b/etc/images/icons/hicolor/scalable/mimetypes/emacs-document23.svg
@@ -16,7 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+   along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 -->
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
diff --git a/etc/images/mh-logo.xpm b/etc/images/mh-logo.xpm
index b2017c6..fe74741 100644
--- a/etc/images/mh-logo.xpm
+++ b/etc/images/mh-logo.xpm
@@ -18,7 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
  */
 static char *mh-e[] = {
 /* width height num_colors chars_per_pixel */
diff --git a/etc/images/splash.svg b/etc/images/splash.svg
index 4957d82..ea919bd 100644
--- a/etc/images/splash.svg
+++ b/etc/images/splash.svg
@@ -19,7 +19,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+   along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 -->
 
@@ -89,7 +89,7 @@
           </cc:Agent>
         </dc:contributor>
         <cc:license
-           rdf:resource="http://www.gnu.org/copyleft/gpl.html"; />
+           rdf:resource="https://www.gnu.org/copyleft/gpl.html"; />
       </cc:Work>
     </rdf:RDF>
   </metadata>
diff --git a/etc/images/unchecked.xpm b/etc/images/unchecked.xpm
index f7ca860..04f7556 100644
--- a/etc/images/unchecked.xpm
+++ b/etc/images/unchecked.xpm
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
  */
 static char * unchecked_xpm[] = {
 "12 12 5 1",
diff --git a/etc/org/README b/etc/org/README
index 68905ad..9d11c07 100644
--- a/etc/org/README
+++ b/etc/org/README
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 Author: Jambunathan K <kjambunathan at gmail dot com>
diff --git a/etc/ps-prin0.ps b/etc/ps-prin0.ps
index 66e46ea..b2d148f 100644
--- a/etc/ps-prin0.ps
+++ b/etc/ps-prin0.ps
@@ -16,7 +16,7 @@
 % GNU General Public License for more details.
 
 % You should have received a copy of the GNU General Public License
-% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+% along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 % As a special exception, the copyright holders of this module give
 % you permission to include the module in a Postscript file generated
diff --git a/etc/ps-prin1.ps b/etc/ps-prin1.ps
index c45aa6a..b46f312 100644
--- a/etc/ps-prin1.ps
+++ b/etc/ps-prin1.ps
@@ -16,7 +16,7 @@
 % GNU General Public License for more details.
 
 % You should have received a copy of the GNU General Public License
-% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+% along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 % As a special exception, the copyright holders of this module give
 % you permission to include the module in a Postscript file generated
diff --git a/etc/refcards/Makefile b/etc/refcards/Makefile
index e998ab7..3a8ca60 100644
--- a/etc/refcards/Makefile
+++ b/etc/refcards/Makefile
@@ -15,7 +15,7 @@
 ## GNU General Public License for more details.
 
 ## You should have received a copy of the GNU General Public License
-## along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+## along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ### Commentary:
 
diff --git a/etc/refcards/README b/etc/refcards/README
index 178cb92..492833d 100644
--- a/etc/refcards/README
+++ b/etc/refcards/README
@@ -20,8 +20,8 @@ To only generate the cards for a specific language, use e.g.
 to install extra TeX packages for some languages.
 
 PDF and PS copies of these cards are also available at
-<http://www.gnu.org/software/emacs/refcards>.  The FSF online
-store <http://shop.fsf.org/> sometimes has printed copies for sale.
+<https://www.gnu.org/software/emacs/refcards>.  The FSF online
+store <https://shop.fsf.org/> sometimes has printed copies for sale.
 
 
 
@@ -50,4 +50,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/etc/refcards/calccard.tex b/etc/refcards/calccard.tex
index 4507272..93aa007 100644
--- a/etc/refcards/calccard.tex
+++ b/etc/refcards/calccard.tex
@@ -39,7 +39,7 @@
 % GNU General Public License for more details.
 
 % You should have received a copy of the GNU General Public License
-% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+% along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %
@@ -82,7 +82,7 @@
 Released under the terms of the GNU General Public License version 3 or later.
 
 For more Emacs documentation, and the \TeX{} source for this card,
-see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
+see the Emacs distribution, or {\tt https://www.gnu.org/software/emacs}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
@@ -670,4 +670,3 @@ Variable names are single digits or whole words.
 % Local variables:
 % compile-command: "pdftex calccard"
 % End:
-
diff --git a/etc/refcards/cs-dired-ref.tex b/etc/refcards/cs-dired-ref.tex
index 8a05bab..6c4c3d6 100644
--- a/etc/refcards/cs-dired-ref.tex
+++ b/etc/refcards/cs-dired-ref.tex
@@ -22,7 +22,7 @@
 % GNU General Public License for more details.
 
 % You should have received a copy of the GNU General Public License
-% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+% along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 % See dired-ref.tex.
@@ -64,7 +64,7 @@
 Released under the terms of the GNU General Public License version 3 or later.
 
 For more Emacs documentation, and the \TeX{} source for this card,
-see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
+see the Emacs distribution, or {\tt https://www.gnu.org/software/emacs}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/cs-refcard.tex b/etc/refcards/cs-refcard.tex
index 6912893..1443458 100644
--- a/etc/refcards/cs-refcard.tex
+++ b/etc/refcards/cs-refcard.tex
@@ -25,7 +25,7 @@
 % GNU General Public License for more details.
 
 % You should have received a copy of the GNU General Public License
-% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+% along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 % This file is intended to be processed by plain TeX (TeX82).
@@ -81,7 +81,7 @@
 Released under the terms of the GNU General Public License version 3 or later.
 
 For more Emacs documentation, and the \TeX{} source for this card,
-see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
+see the Emacs distribution, or {\tt https://www.gnu.org/software/emacs}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/cs-survival.tex b/etc/refcards/cs-survival.tex
index bb14091..0770100 100644
--- a/etc/refcards/cs-survival.tex
+++ b/etc/refcards/cs-survival.tex
@@ -22,7 +22,7 @@
 % GNU General Public License for more details.
 
 % You should have received a copy of the GNU General Public License
-% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+% along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 % See survival.tex.
@@ -72,7 +72,7 @@
 
     For more Emacs documentation, and the \TeX{} source for this card,
     see the Emacs distribution, or
-    {\tt http://www.gnu.org/software/emacs}\par}}
+    {\tt https://www.gnu.org/software/emacs}\par}}
 
 \hsize 3.2in
 \vsize 7.95in
diff --git a/etc/refcards/de-refcard.tex b/etc/refcards/de-refcard.tex
index b5ca862..82e4f98 100644
--- a/etc/refcards/de-refcard.tex
+++ b/etc/refcards/de-refcard.tex
@@ -23,7 +23,7 @@
 % GNU General Public License for more details.
 
 % You should have received a copy of the GNU General Public License
-% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+% along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 % This file is intended to be processed by plain TeX (TeX82).
@@ -83,7 +83,7 @@ Released under the terms of the GNU General Public License
 version 3 or later.
 
 For more Emacs documentation, and the \TeX{} source for this card,
-see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
+see the Emacs distribution, or {\tt https://www.gnu.org/software/emacs}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
@@ -679,4 +679,3 @@ wird. F\"ur n\"ahere Details geben Sie \kbd{C-h f 
interactive} ein.
 % Local variables:
 % compile-command: "pdftex de-refcard"
 % End:
-
diff --git a/etc/refcards/dired-ref.tex b/etc/refcards/dired-ref.tex
index 86c53d0..26b2a28 100644
--- a/etc/refcards/dired-ref.tex
+++ b/etc/refcards/dired-ref.tex
@@ -21,7 +21,7 @@
 % GNU General Public License for more details.
 
 % You should have received a copy of the GNU General Public License
-% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+% along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 % This file is intended to be processed by plain TeX (TeX82).
@@ -37,7 +37,7 @@
 \newcount\columnsperpage
 
 % This file can be printed with 1, 2, or 3 columns per page.
-% Specify how many you want here.  
+% Specify how many you want here.
 % The reference card looks OK with 2 columns per page, portrait mode.
 % I haven't tried it with 3 columns per page.
 \columnsperpage=2
@@ -65,7 +65,7 @@
 Released under the terms of the GNU General Public License version 3 or later.
 
 For more Emacs documentation, and the \TeX{} source for this card,
-see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
+see the Emacs distribution, or {\tt https://www.gnu.org/software/emacs}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
@@ -405,4 +405,3 @@ see the Emacs distribution, or {\tt 
http://www.gnu.org/software/emacs}
 \copyrightnotice
 
 \bye
-
diff --git a/etc/refcards/fr-dired-ref.tex b/etc/refcards/fr-dired-ref.tex
index 68e492f..183b086 100644
--- a/etc/refcards/fr-dired-ref.tex
+++ b/etc/refcards/fr-dired-ref.tex
@@ -22,7 +22,7 @@
 % GNU General Public License for more details.
 
 % You should have received a copy of the GNU General Public License
-% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+% along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 % See dired-ref.tex.
@@ -59,7 +59,7 @@ Released under the terms of the GNU General Public License
 version 3 or later.
 
 For more Emacs documentation, and the \TeX{} source for this card,
-see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
+see the Emacs distribution, or {\tt https://www.gnu.org/software/emacs}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/fr-refcard.tex b/etc/refcards/fr-refcard.tex
index 294e3ad..dbeb2ba 100644
--- a/etc/refcards/fr-refcard.tex
+++ b/etc/refcards/fr-refcard.tex
@@ -24,7 +24,7 @@
 % GNU General Public License for more details.
 
 % You should have received a copy of the GNU General Public License
-% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+% along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 % This file is intended to be processed by plain TeX (TeX82).
@@ -79,7 +79,7 @@
 Released under the terms of the GNU General Public License version 3 or later.
 
 For more Emacs documentation, and the \TeX{} source for this card,
-see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
+see the Emacs distribution, or {\tt https://www.gnu.org/software/emacs}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/fr-survival.tex b/etc/refcards/fr-survival.tex
index f0885e5..047190c 100644
--- a/etc/refcards/fr-survival.tex
+++ b/etc/refcards/fr-survival.tex
@@ -23,7 +23,7 @@
 % GNU General Public License for more details.
 
 % You should have received a copy of the GNU General Public License
-% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+% along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 % See survival.tex.
@@ -67,7 +67,7 @@
 
     For more Emacs documentation, and the \TeX{} source for this card,
     see the Emacs distribution,
-    or {\tt http://www.gnu.org/software/emacs}\par}}
+    or {\tt https://www.gnu.org/software/emacs}\par}}
 
 \hsize 3.2in
 \vsize 7.95in
diff --git a/etc/refcards/gnus-logo.eps b/etc/refcards/gnus-logo.eps
index aff7a31..34301e6 100644
--- a/etc/refcards/gnus-logo.eps
+++ b/etc/refcards/gnus-logo.eps
@@ -16,7 +16,7 @@
 % GNU General Public License for more details.
 %
 % You should have received a copy of the GNU General Public License
-% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+% along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 %
 %%Title: gnuslogo1.ps
 %%BoundingBox: 0 0 493 505
diff --git a/etc/refcards/gnus-refcard.tex b/etc/refcards/gnus-refcard.tex
index 6768208..bc52733 100644
--- a/etc/refcards/gnus-refcard.tex
+++ b/etc/refcards/gnus-refcard.tex
@@ -126,7 +126,7 @@
   Released under the terms of the GNU General Public License version 3 or 
later.
 
   For more Emacs documentation, and the \TeX{} source for this card,
-  see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
+  see the Emacs distribution, or {\tt https://www.gnu.org/software/emacs}
 
   Please send corrections, additions and suggestions to the
   current maintainer's email address. \Guide{} last edited on \date.
diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index ecfd62f..71d1ef5 100644
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -37,7 +37,7 @@
 % GNU General Public License for more details.
 
 % You should have received a copy of the GNU General Public License
-% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+% along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %
@@ -81,7 +81,7 @@
 \centerline{version 3 or later.}
 
 \centerline{For more Emacs documentation, and the \TeX{} source for this card, 
see}
-\centerline{the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}}
+\centerline{the Emacs distribution, or {\tt 
https://www.gnu.org/software/emacs}}
 
 \endgroup}
 
diff --git a/etc/refcards/pdflayout.sty b/etc/refcards/pdflayout.sty
index affb475..90bf6bd 100644
--- a/etc/refcards/pdflayout.sty
+++ b/etc/refcards/pdflayout.sty
@@ -13,7 +13,7 @@
 % GNU General Public License for more details.
 
 % You should have received a copy of the GNU General Public License
-% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+% along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 % This file defines `\pdflayout':
 %  - \pdflayout=(0) is A4 portrait,
diff --git a/etc/refcards/pl-refcard.tex b/etc/refcards/pl-refcard.tex
index 0bddea4..ac0eca1 100644
--- a/etc/refcards/pl-refcard.tex
+++ b/etc/refcards/pl-refcard.tex
@@ -23,7 +23,7 @@
 % GNU General Public License for more details.
 
 % You should have received a copy of the GNU General Public License
-% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+% along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 % This file is intended to be processed by plain TeX (TeX82).
@@ -91,7 +91,7 @@
 Released under the terms of the GNU General Public License version 3 or later.
 
 For more Emacs documentation, and the \TeX{} source for this card,
-see the Emacs distribution, or {\tt http:////www.gnu.org//software//emacs}
+see the Emacs distribution, or {\tt https:////www.gnu.org//software//emacs}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
@@ -992,4 +992,3 @@ przez wywo/lanie \kbd{C-h f interactive}.
 % Local variables:
 % compile-command: "pdftex pl-refcard"
 % End:
-
diff --git a/etc/refcards/pt-br-refcard.tex b/etc/refcards/pt-br-refcard.tex
index 1ba50fa..dc9f0ae 100644
--- a/etc/refcards/pt-br-refcard.tex
+++ b/etc/refcards/pt-br-refcard.tex
@@ -23,7 +23,7 @@
 % GNU General Public License for more details.
 
 % You should have received a copy of the GNU General Public License
-% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+% along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 % This file is intended to be processed by plain TeX (TeX82).
@@ -84,7 +84,7 @@
 Released under the terms of the GNU General Public License version 3 or later.
 
 For more Emacs documentation, and the \TeX{} source for this card,
-see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
+see the Emacs distribution, or {\tt https://www.gnu.org/software/emacs}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/refcard.tex b/etc/refcards/refcard.tex
index 0a57fcf..3780897 100644
--- a/etc/refcards/refcard.tex
+++ b/etc/refcards/refcard.tex
@@ -22,7 +22,7 @@
 % GNU General Public License for more details.
 
 % You should have received a copy of the GNU General Public License
-% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+% along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 % This file is intended to be processed by plain TeX (TeX82).
@@ -82,7 +82,7 @@
 Released under the terms of the GNU General Public License version 3 or later.
 
 For more Emacs documentation, and the \TeX{} source for this card,
-see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
+see the Emacs distribution, or {\tt https://www.gnu.org/software/emacs}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
@@ -696,4 +696,3 @@ Type \kbd{C-h f interactive RET} for more details.
 % Local variables:
 % compile-command: "pdftex refcard"
 % End:
-
diff --git a/etc/refcards/ru-refcard.tex b/etc/refcards/ru-refcard.tex
index fad75dd..866dd79 100644
--- a/etc/refcards/ru-refcard.tex
+++ b/etc/refcards/ru-refcard.tex
@@ -20,7 +20,7 @@
 % GNU General Public License for more details.
 
 % You should have received a copy of the GNU General Public License
-% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+% along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 \documentclass[10pt]{article}
 \usepackage{multicol,tabularx}
@@ -58,7 +58,7 @@
   version 3 or later.}
 
 \centerline{For more Emacs documentation, and the \TeX{} source for this card,}
-\centerline{see the Emacs distribution, or {\tt 
http://www.gnu.org/software/emacs}}
+\centerline{see the Emacs distribution, or {\tt 
https://www.gnu.org/software/emacs}}
 \endgroup}
 
 \hyphenation{mini-buf-fer}
diff --git a/etc/refcards/sk-dired-ref.tex b/etc/refcards/sk-dired-ref.tex
index 9af5499..9818add 100644
--- a/etc/refcards/sk-dired-ref.tex
+++ b/etc/refcards/sk-dired-ref.tex
@@ -23,7 +23,7 @@
 % GNU General Public License for more details.
 
 % You should have received a copy of the GNU General Public License
-% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+% along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 % See dired-ref.tex.
@@ -65,7 +65,7 @@
 Released under the terms of the GNU General Public License version 3 or later.
 
 For more Emacs documentation, and the \TeX{} source for this card,
-see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
+see the Emacs distribution, or {\tt https://www.gnu.org/software/emacs}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/sk-refcard.tex b/etc/refcards/sk-refcard.tex
index dae3d8b..eb5f91a 100644
--- a/etc/refcards/sk-refcard.tex
+++ b/etc/refcards/sk-refcard.tex
@@ -26,7 +26,7 @@
 % GNU General Public License for more details.
 
 % You should have received a copy of the GNU General Public License
-% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+% along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 % This file is intended to be processed by plain TeX (TeX82).
@@ -82,7 +82,7 @@
 Released under the terms of the GNU General Public License version 3 or later.
 
 For more Emacs documentation, and the \TeX{} source for this card,
-see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
+see the Emacs distribution, or {\tt https://www.gnu.org/software/emacs}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/sk-survival.tex b/etc/refcards/sk-survival.tex
index 52e1eef..f071977 100644
--- a/etc/refcards/sk-survival.tex
+++ b/etc/refcards/sk-survival.tex
@@ -23,7 +23,7 @@
 % GNU General Public License for more details.
 
 % You should have received a copy of the GNU General Public License
-% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+% along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 % See survival.tex.
@@ -74,7 +74,7 @@
 
     For more Emacs documentation, and the \TeX{} source for this card,
     see the Emacs distribution,
-    or {\tt http://www.gnu.org/software/emacs}\par}}
+    or {\tt https://www.gnu.org/software/emacs}\par}}
 
 \hsize 3.2in
 \vsize 7.95in
diff --git a/etc/refcards/survival.tex b/etc/refcards/survival.tex
index 81ee44e..7b5325b 100644
--- a/etc/refcards/survival.tex
+++ b/etc/refcards/survival.tex
@@ -22,7 +22,7 @@
 % GNU General Public License for more details.
 
 % You should have received a copy of the GNU General Public License
-% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+% along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 %**start of header
 
@@ -61,7 +61,7 @@
 
     For more Emacs documentation, and the \TeX{} source for this card,
     see the Emacs distribution,
-    or {\tt http://www.gnu.org/software/emacs}\par}}
+    or {\tt https://www.gnu.org/software/emacs}\par}}
 
 \hsize 3.2in
 \vsize 7.95in
@@ -416,4 +416,3 @@ contains names of the current modes, in parentheses.
 % Local variables:
 % compile-command: "pdftex survival"
 % End:
-
diff --git a/etc/refcards/vipcard.tex b/etc/refcards/vipcard.tex
index 5913dd4..61ccdd5 100644
--- a/etc/refcards/vipcard.tex
+++ b/etc/refcards/vipcard.tex
@@ -21,7 +21,7 @@
 % GNU General Public License for more details.
 
 % You should have received a copy of the GNU General Public License
-% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+% along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 % This file is intended to be processed by plain TeX (TeX82).
@@ -74,7 +74,7 @@
 Released under the terms of the GNU General Public License version 3 or later.
 
 For more Emacs documentation, and the \TeX{} source for this card,
-see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
+see the Emacs distribution, or {\tt https://www.gnu.org/software/emacs}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
@@ -679,4 +679,3 @@ moves 11 lines below current line to the end of buffer.
 % Local variables:
 % compile-command: "pdftex vipcard"
 % End:
-
diff --git a/etc/refcards/viperCard.tex b/etc/refcards/viperCard.tex
index 6561a48..cebe485 100644
--- a/etc/refcards/viperCard.tex
+++ b/etc/refcards/viperCard.tex
@@ -23,7 +23,7 @@
 % GNU General Public License for more details.
 
 % You should have received a copy of the GNU General Public License
-% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+% along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 % This file is intended to be processed by plain TeX (TeX82).
@@ -78,7 +78,7 @@
 Released under the terms of the GNU General Public License version 3 or later.
 
 For more Emacs documentation, and the \TeX{} source for this card,
-see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
+see the Emacs distribution, or {\tt https://www.gnu.org/software/emacs}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
@@ -740,4 +740,3 @@ Ex commands can be made to have history. See the manual for 
details.
 % Local variables:
 % compile-command: "pdftex viperCard"
 % End:
-
diff --git a/etc/schema/locate.rnc b/etc/schema/locate.rnc
index 9af0198..3f4e7bb 100644
--- a/etc/schema/locate.rnc
+++ b/etc/schema/locate.rnc
@@ -13,7 +13,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 default namespace this = "http://thaiopensource.com/ns/locating-rules/1.0";
 namespace local = ""
@@ -36,7 +36,7 @@ rule =
   | typeId
   # | typeIdBase
   | extensionRule
- 
+
 ## Group of rules. Useful with xml:base.
 group = element group { common, rule* }
 
@@ -212,6 +212,6 @@ extensionRule =
 
 anyElement = element * { attribute * { text }*, (text|anyElement)* }
 
-common = 
+common =
   # attribute xml:base { xsd:anyURI }?,
   attribute * - (xml:base|this:*|local:*) { text }*
diff --git a/etc/schema/relaxng.rnc b/etc/schema/relaxng.rnc
index fae2bf1..7961457 100644
--- a/etc/schema/relaxng.rnc
+++ b/etc/schema/relaxng.rnc
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 default namespace rng = "http://relaxng.org/ns/structure/1.0";
 namespace local = ""
@@ -39,7 +39,7 @@ param = element param { commonAttributes, nameNCName, 
xsd:string }
 
 exceptPattern = element except { common & pattern+ }
 
-grammarContent = 
+grammarContent =
   definition
   | element div { common & grammarContent* }
   | element include { href, (common & includeContent*) }
@@ -54,7 +54,7 @@ definition =
 
 combine = attribute combine { "choice" | "interleave" }
 
-nameClass = 
+nameClass =
   element name { commonAttributes, xsd:QName }
   | element anyName { common & exceptNameClass? }
   | element nsName { common & exceptNameClass? }
@@ -69,7 +69,7 @@ type = attribute type { xsd:NCName }
 
 common = commonAttributes, foreignElement*
 
-commonAttributes = 
+commonAttributes =
   attribute ns { xsd:string }?,
   attribute datatypeLibrary { xsd:anyURI }?,
   foreignAttribute*
diff --git a/etc/schema/schemas.xml b/etc/schema/schemas.xml
index 97b2961..ef4a0b3 100644
--- a/etc/schema/schemas.xml
+++ b/etc/schema/schemas.xml
@@ -13,7 +13,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>. -->
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>. -->
 
 <locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0";>
   <transformURI fromPattern="*.xml" toPattern="*.rnc"/>
diff --git a/etc/ses-example.ses b/etc/ses-example.ses
index 5c0a281..51a1684 100644
--- a/etc/ses-example.ses
+++ b/etc/ses-example.ses
@@ -220,4 +220,4 @@ Sales summary - Acme fundraising
 ;;;   GNU General Public License for more details.
 ;;;
 ;;;   You should have received a copy of the GNU General Public License
-;;;   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;;;   along with this program.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/etc/srecode/c.srt b/etc/srecode/c.srt
index 720da3d..fe029a3 100644
--- a/etc/srecode/c.srt
+++ b/etc/srecode/c.srt
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 set mode "c-mode"
 
@@ -131,7 +131,7 @@ Override this with your own preference to avoid using 
doxygen"
 ----
 
 ;;; DOXYGEN FEATURES
-;; 
+;;
 ;;
 context declaration
 
diff --git a/etc/srecode/cpp.srt b/etc/srecode/cpp.srt
index 444c14d..6468ead 100644
--- a/etc/srecode/cpp.srt
+++ b/etc/srecode/cpp.srt
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 set mode "c++-mode"
 
@@ -56,7 +56,7 @@ Override this to affect applications, or the outer class 
structure for
 the user-facing template."
 ----
 class {{?NAME}} {{#PARENTS}}{{#FIRST}}: {{/FIRST}}public {{NAME}}{{/PARENTS}}
-{     
+{
    {{^}}
 };
 ----
@@ -111,7 +111,7 @@ Override this with your own preference to avoid using 
doxygen."
 ----
 
 ;;; DOXYGEN FEATURES
-;; 
+;;
 ;;
 context classdecl
 
diff --git a/etc/srecode/default.srt b/etc/srecode/default.srt
index f7a8f09..d8c7cd1 100644
--- a/etc/srecode/default.srt
+++ b/etc/srecode/default.srt
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 set mode "default"
 
@@ -34,7 +34,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
GNU
 General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program.  If not, see http://www.gnu.org/licenses/.";
+along with this program.  If not, see https://www.gnu.org/licenses/.";
 
 set DOLLAR "$"
 
diff --git a/etc/srecode/doc-cpp.srt b/etc/srecode/doc-cpp.srt
index 486bb63..e23b37b 100644
--- a/etc/srecode/doc-cpp.srt
+++ b/etc/srecode/doc-cpp.srt
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 set mode "c-mode"
 
diff --git a/etc/srecode/doc-default.srt b/etc/srecode/doc-default.srt
index 30a8311..3290d6a 100644
--- a/etc/srecode/doc-default.srt
+++ b/etc/srecode/doc-default.srt
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 set mode "default"
 
diff --git a/etc/srecode/doc-java.srt b/etc/srecode/doc-java.srt
index a3a294d..ab0edb8 100644
--- a/etc/srecode/doc-java.srt
+++ b/etc/srecode/doc-java.srt
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 set mode "java-mode"
 
diff --git a/etc/srecode/ede-autoconf.srt b/etc/srecode/ede-autoconf.srt
index c25416e..c75997d 100644
--- a/etc/srecode/ede-autoconf.srt
+++ b/etc/srecode/ede-autoconf.srt
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 set mode "autoconf-mode"
 set escape_start "{{"
diff --git a/etc/srecode/ede-make.srt b/etc/srecode/ede-make.srt
index 4485342..0c7d566 100644
--- a/etc/srecode/ede-make.srt
+++ b/etc/srecode/ede-make.srt
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 set mode "makefile-mode"
 set escape_start "{{"
diff --git a/etc/srecode/el.srt b/etc/srecode/el.srt
index cc3f1e8..66db566 100644
--- a/etc/srecode/el.srt
+++ b/etc/srecode/el.srt
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 set escape_start "$"
 set escape_end "$"
@@ -307,5 +307,3 @@ bind "s"
 
 
 ;; end
-
-
diff --git a/etc/srecode/getset-cpp.srt b/etc/srecode/getset-cpp.srt
index 9f4341d..50f5d22 100644
--- a/etc/srecode/getset-cpp.srt
+++ b/etc/srecode/getset-cpp.srt
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 set mode "c++-mode"
 set application "getset"
@@ -47,4 +47,3 @@ f{{NAME}}(){{#NOTLAST}},{{/NOTLAST}}
 ----
 
 ;; end
-
diff --git a/etc/srecode/java.srt b/etc/srecode/java.srt
index db154db..cfc55f8 100644
--- a/etc/srecode/java.srt
+++ b/etc/srecode/java.srt
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 set mode "java-mode"
 set escape_start "{{"
@@ -162,8 +162,8 @@ template javadoc-class :indent :blank :time :user :tag
  * Created: {{DATE}}
  *
  * @author {{AUTHOR}}
- * @version 
- * @since 
+ * @version
+ * @since
  */
 ----
 
diff --git a/etc/srecode/make.srt b/etc/srecode/make.srt
index af2e950..ef5f1be 100644
--- a/etc/srecode/make.srt
+++ b/etc/srecode/make.srt
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 set mode "makefile-mode"
 set escape_start "{{"
diff --git a/etc/srecode/template.srt b/etc/srecode/template.srt
index deb901f..8403a69 100644
--- a/etc/srecode/template.srt
+++ b/etc/srecode/template.srt
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 set escape_start "$"
 set escape_end "$"
diff --git a/etc/srecode/test.srt b/etc/srecode/test.srt
index 4e567ad..9843e53 100644
--- a/etc/srecode/test.srt
+++ b/etc/srecode/test.srt
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 set mode "srecode-template-mode"
 set escape_start "$"
@@ -83,7 +83,7 @@ template gapsomething :blank
 template inlinetext
 "Insert text that has no newlines"
 ----
- *In the middle* 
+ *In the middle*
 ----
 
 template includable :blank
diff --git a/etc/srecode/texi.srt b/etc/srecode/texi.srt
index 52acb77..def3b48 100644
--- a/etc/srecode/texi.srt
+++ b/etc/srecode/texi.srt
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 set mode "texinfo-mode"
 
diff --git a/etc/srecode/wisent.srt b/etc/srecode/wisent.srt
index ac59d77..7e8726c 100644
--- a/etc/srecode/wisent.srt
+++ b/etc/srecode/wisent.srt
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 set mode "wisent-grammar-mode"
 set comment_start  ";;"
diff --git a/etc/themes/adwaita-theme.el b/etc/themes/adwaita-theme.el
index 5c9df3d..7171c4a 100644
--- a/etc/themes/adwaita-theme.el
+++ b/etc/themes/adwaita-theme.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/etc/themes/deeper-blue-theme.el b/etc/themes/deeper-blue-theme.el
index d1111de..568411f 100644
--- a/etc/themes/deeper-blue-theme.el
+++ b/etc/themes/deeper-blue-theme.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/etc/themes/dichromacy-theme.el b/etc/themes/dichromacy-theme.el
index c32d18c..ed4b4f3 100644
--- a/etc/themes/dichromacy-theme.el
+++ b/etc/themes/dichromacy-theme.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/etc/themes/leuven-theme.el b/etc/themes/leuven-theme.el
index 6ec0316..a181b73 100644
--- a/etc/themes/leuven-theme.el
+++ b/etc/themes/leuven-theme.el
@@ -4,7 +4,7 @@
 
 ;; Author: Fabrice Niessen <(concat "fniessen" at-sign "pirilampo.org")>
 ;; URL: https://github.com/fniessen/emacs-leuven-theme
-;; Version: 20170715.0521
+;; Version: 20170912.2328
 ;; Keywords: color theme
 
 ;; This file is part of GNU Emacs.
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/etc/themes/light-blue-theme.el b/etc/themes/light-blue-theme.el
index 319b5f3..48d65d2 100644
--- a/etc/themes/light-blue-theme.el
+++ b/etc/themes/light-blue-theme.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/etc/themes/manoj-dark-theme.el b/etc/themes/manoj-dark-theme.el
index 9b461cc..dc1f9e6 100644
--- a/etc/themes/manoj-dark-theme.el
+++ b/etc/themes/manoj-dark-theme.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/etc/themes/misterioso-theme.el b/etc/themes/misterioso-theme.el
index 53772fb..74de3ef 100644
--- a/etc/themes/misterioso-theme.el
+++ b/etc/themes/misterioso-theme.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/etc/themes/tango-dark-theme.el b/etc/themes/tango-dark-theme.el
index 91bda44..58a2a59 100644
--- a/etc/themes/tango-dark-theme.el
+++ b/etc/themes/tango-dark-theme.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary
 
diff --git a/etc/themes/tango-theme.el b/etc/themes/tango-theme.el
index 9f7c0c2..820c463 100644
--- a/etc/themes/tango-theme.el
+++ b/etc/themes/tango-theme.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary
 
diff --git a/etc/themes/tsdh-dark-theme.el b/etc/themes/tsdh-dark-theme.el
index 3890fe0..881d190 100644
--- a/etc/themes/tsdh-dark-theme.el
+++ b/etc/themes/tsdh-dark-theme.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/etc/themes/tsdh-light-theme.el b/etc/themes/tsdh-light-theme.el
index f816412..0d2c006 100644
--- a/etc/themes/tsdh-light-theme.el
+++ b/etc/themes/tsdh-light-theme.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/etc/themes/wheatgrass-theme.el b/etc/themes/wheatgrass-theme.el
index 9ec532d..bdfedad 100644
--- a/etc/themes/wheatgrass-theme.el
+++ b/etc/themes/wheatgrass-theme.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/etc/themes/whiteboard-theme.el b/etc/themes/whiteboard-theme.el
index 0192289..eedf9ab 100644
--- a/etc/themes/whiteboard-theme.el
+++ b/etc/themes/whiteboard-theme.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/etc/themes/wombat-theme.el b/etc/themes/wombat-theme.el
index 80bac92..da0c289 100644
--- a/etc/themes/wombat-theme.el
+++ b/etc/themes/wombat-theme.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/etc/tutorials/TUTORIAL b/etc/tutorials/TUTORIAL
index a41e7b0..e099fe8 100644
--- a/etc/tutorials/TUTORIAL
+++ b/etc/tutorials/TUTORIAL
@@ -1132,7 +1132,7 @@ and comes with permission to distribute copies on certain 
conditions:
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+  along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 Please read the file COPYING and then do give copies of GNU Emacs to
 your friends.  Help stamp out software obstructionism ("ownership") by
diff --git a/etc/tutorials/TUTORIAL.bg b/etc/tutorials/TUTORIAL.bg
index ed6f29c..f341539 100644
--- a/etc/tutorials/TUTORIAL.bg
+++ b/etc/tutorials/TUTORIAL.bg
@@ -1178,7 +1178,7 @@ comes with permission to distribute copies on certain 
conditions:
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+  along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 Моля, прочетете файла COPYING и тогава давайте копия на ГНУ Емакс на
 свои приятели.  Помогнете да спрем затвореността на програмите
diff --git a/etc/tutorials/TUTORIAL.cn b/etc/tutorials/TUTORIAL.cn
index fe8f500..a9fc6f0 100644
--- a/etc/tutorials/TUTORIAL.cn
+++ b/etc/tutorials/TUTORIAL.cn
@@ -1013,7 +1013,7 @@ and comes with permission to distribute copies on certain 
conditions:
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+  along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 Please read the file COPYING and then do give copies of GNU Emacs to
 your friends.  Help stamp out software obstructionism ("ownership") by
@@ -1039,7 +1039,7 @@ using, writing, and sharing free software!
    售性或特定目的适用性所为的默示性担保。详情请参照GNU通用公共授权。
 
    您应已收到附随于 GNU Emacs 的GNU通用公共授权的副本;如果没有,请参照
-   <http://www.gnu.org/licenses/>.
+   <https://www.gnu.org/licenses/>.
 
 敬请阅读文件“COPYING”,然后向你的朋友们分发 GNU Emacs 拷贝。让我们以使
 用、编写和分享自由软件的实际行动来共同祛除软件障碍主义(所谓的“所有
diff --git a/etc/tutorials/TUTORIAL.he b/etc/tutorials/TUTORIAL.he
index beac4b7..f3e6bee 100644
--- a/etc/tutorials/TUTORIAL.he
+++ b/etc/tutorials/TUTORIAL.he
@@ -1016,7 +1016,7 @@ Software Foundation, אם בגרסא 3 של הרשיון, ואם (כאופציה
 אנא עיינו ב־GNU General Public License.
 
 ‏GNU Emacs אמור להיות מלווה בעותק של GNU General Public License; אם לא
-קיבלתם אותו, תוכלו למצוא אותו ב־‪<http://www.gnu.org/licenses/>‬.
+קיבלתם אותו, תוכלו למצוא אותו sב־‪<https://www.gnu.org/licenses/>‬.
 
 הנכם מוזמנים לקרוא את הקובץ COPYING ואז אכן לחלק עותקים של GNU Emacs
 לחבריכם. עזרו לנו לחסל את "הבעלות" על תוכנה שאינה אלא חבלה בתוכנה,
diff --git a/etc/tutorials/TUTORIAL.nl b/etc/tutorials/TUTORIAL.nl
index d0453bd..6f70e2c 100644
--- a/etc/tutorials/TUTORIAL.nl
+++ b/etc/tutorials/TUTORIAL.nl
@@ -1254,7 +1254,7 @@ and comes with permission to distribute copies on certain 
conditions:
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+  along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 Please read the file COPYING and then do give copies of GNU Emacs to
 your friends.  Help stamp out software obstructionism ("ownership") by
diff --git a/etc/tutorials/TUTORIAL.sl b/etc/tutorials/TUTORIAL.sl
index 4e59341..a9b8991 100644
--- a/etc/tutorials/TUTORIAL.sl
+++ b/etc/tutorials/TUTORIAL.sl
@@ -1134,7 +1134,7 @@ Copyright © 1985, 1996, 1998, 2001-2017 Free Software 
Foundation, Inc.
   General Public License«.
 
   Kopijo »GNU General Public License« bi morali prejeti skupaj s paketom
-  GNU Emacs. Če je niste, je na voljo na <http://www.gnu.org/licenses/>.
+  GNU Emacs. Če je niste, je na voljo na <https://www.gnu.org/licenses/>.
 
 Prosimo, preberite datoteko COPYING in potem ponudite kopijo programa
 GNU Emacs svojim prijateljem. Pomagajte zatreti obstrukcionizem
diff --git a/etc/tutorials/TUTORIAL.sv b/etc/tutorials/TUTORIAL.sv
index 45bd350..a0b041f 100644
--- a/etc/tutorials/TUTORIAL.sv
+++ b/etc/tutorials/TUTORIAL.sv
@@ -1155,7 +1155,7 @@ This file is part of GNU Emacs.
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+  along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 Please read the file COPYING and then do give copies of GNU Emacs to
 your friends.  Help stamp out software obstructionism ("ownership") by
diff --git a/etc/tutorials/TUTORIAL.zh b/etc/tutorials/TUTORIAL.zh
index c677cbd..07c3e1f 100644
--- a/etc/tutorials/TUTORIAL.zh
+++ b/etc/tutorials/TUTORIAL.zh
@@ -960,7 +960,7 @@ Emacs,請使用 C-z 。
 本快速指南的翻譯人員列表如下,如果您在閱讀本文之前,「完全」對 Emacs
 沒有概念,請告訴我們您的意見以作為本文後續的改進依據。翻譯也提供了一份
 《GNU Emacs 中文處理說明》在
-http://www.gnu.org/software/chinese/guide/emacs-chinese.zh.html 〈部份
+https://www.gnu.org/software/chinese/guide/emacs-chinese.zh.html 〈部份
 內容已經整理到本快速指南〉,也請您自行參閱。
 
 編輯器是電腦使用者最常接觸到的應用程式,因此不應該讓初學者感到過於困難,
@@ -972,7 +972,7 @@ 
http://www.gnu.org/software/chinese/guide/emacs-chinese.zh.html 〈部份
 issue here>」。
 
 如果您是 Emacs 老手,GNU Chinese Translators Team (GNU/CTT)
-<http://www.gnu.org/software/chinese/> 歡迎您的加入,我們現在正需要願
+<https://www.gnu.org/software/chinese/> 歡迎您的加入,我們現在正需要願
 意投入翻譯 Emacs 使用手冊的人員。
 
 本快速指南並沒有採用習慣上編輯器所使用的翻譯術語,一方面因為它的實際意
diff --git a/leim/Makefile.in b/leim/Makefile.in
index a21c2d9..f18010a 100644
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -19,7 +19,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 SHELL = @SHELL@
 
diff --git a/leim/README b/leim/README
index 7bcdbd3..26c511e 100644
--- a/leim/README
+++ b/leim/README
@@ -51,4 +51,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/leim/leim-ext.el b/leim/leim-ext.el
index c0779c3..0e6430b 100644
--- a/leim/leim-ext.el
+++ b/leim/leim-ext.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index fa8de0b..5947fbd 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -16,7 +16,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 SHELL = @SHELL@
 
diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index e77b7c9..d444a54 100644
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 #include <config.h>
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 5e181cc..b3ebb84 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 #include <config.h>
diff --git a/lib-src/etags.c b/lib-src/etags.c
index b4ce43d..4000f47 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -44,7 +44,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 /* NB To comply with the above BSD license, copyright information is
diff --git a/lib-src/hexl.c b/lib-src/hexl.c
index d949af0..df49a59 100644
--- a/lib-src/hexl.c
+++ b/lib-src/hexl.c
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 #include <config.h>
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index c48f202..69c7f37 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 /* The arguments given to this program are all the C and Lisp source files
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index e5ca0b1..ce8dfd2 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -17,7 +17,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 /* Important notice: defining MAIL_USE_FLOCK or MAIL_USE_LOCKF *will
diff --git a/lib-src/pop.c b/lib-src/pop.c
index 1a85bd2..ba5ac6e 100644
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -18,7 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 #include <config.h>
diff --git a/lib-src/pop.h b/lib-src/pop.h
index 474cf1a..8194985 100644
--- a/lib-src/pop.h
+++ b/lib-src/pop.h
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 #include <stdio.h>
diff --git a/lib-src/profile.c b/lib-src/profile.c
index f4ab45c..6308041 100644
--- a/lib-src/profile.c
+++ b/lib-src/profile.c
@@ -17,7 +17,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 /**
diff --git a/lib-src/rcs2log b/lib-src/rcs2log
index 1a1771b..5e57092 100755
--- a/lib-src/rcs2log
+++ b/lib-src/rcs2log
@@ -17,7 +17,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 
 Copyright='Copyright (C) 2017 Free Software Foundation, Inc.
diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c
index 942aeeb..5816edf 100644
--- a/lib-src/update-game-score.c
+++ b/lib-src/update-game-score.c
@@ -17,7 +17,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 /* This program allows a game to securely and atomically update a
diff --git a/lib/Makefile.in b/lib/Makefile.in
index ee41ea3..1f5b154 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 srcdir = @srcdir@
 VPATH = @srcdir@
diff --git a/lib/acl-errno-valid.c b/lib/acl-errno-valid.c
index a633985..1e96974 100644
--- a/lib/acl-errno-valid.c
+++ b/lib/acl-errno-valid.c
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
    Written by Paul Eggert.  */
 
diff --git a/lib/acl-internal.c b/lib/acl-internal.c
index 2a2dee9..63e6b6b 100644
--- a/lib/acl-internal.c
+++ b/lib/acl-internal.c
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
    Written by Paul Eggert, Andreas Grünbacher, and Bruno Haible.  */
 
diff --git a/lib/acl-internal.h b/lib/acl-internal.h
index e7bda0e..ebd2421 100644
--- a/lib/acl-internal.h
+++ b/lib/acl-internal.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
    Written by Paul Eggert, Andreas Grünbacher, and Bruno Haible.  */
 
diff --git a/lib/acl.h b/lib/acl.h
index b13370c..d3b0480 100644
--- a/lib/acl.h
+++ b/lib/acl.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
    Written by Paul Eggert.  */
 
diff --git a/lib/acl_entries.c b/lib/acl_entries.c
index 1df6a84..c7efaef 100644
--- a/lib/acl_entries.c
+++ b/lib/acl_entries.c
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
    Written by Paul Eggert and Andreas Gruenbacher.  */
 
diff --git a/lib/alloca.in.h b/lib/alloca.in.h
index c3dc38a..1881e74 100644
--- a/lib/alloca.in.h
+++ b/lib/alloca.in.h
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public
    License along with this program; if not, see
-   <http://www.gnu.org/licenses/>.
+   <https://www.gnu.org/licenses/>.
   */
 
 /* Avoid using the symbol _ALLOCA_H here, as Bison assumes _ALLOCA_H
diff --git a/lib/allocator.h b/lib/allocator.h
index 650f8e0..2ecbf1a 100644
--- a/lib/allocator.h
+++ b/lib/allocator.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/arg-nonnull.h b/lib/arg-nonnull.h
index 1e62cc8..61ee071 100644
--- a/lib/arg-nonnull.h
+++ b/lib/arg-nonnull.h
@@ -12,7 +12,7 @@
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools
    that the values passed as arguments n, ..., m must be non-NULL pointers.
diff --git a/lib/at-func.c b/lib/at-func.c
index 9eaa993..2a3e375 100644
--- a/lib/at-func.c
+++ b/lib/at-func.c
@@ -12,7 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* written by Jim Meyering */
 
diff --git a/lib/binary-io.c b/lib/binary-io.c
index a7558b2..2cee469 100644
--- a/lib/binary-io.c
+++ b/lib/binary-io.c
@@ -12,7 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/lib/binary-io.h b/lib/binary-io.h
index 9f1dde1..75adb33 100644
--- a/lib/binary-io.h
+++ b/lib/binary-io.h
@@ -12,7 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef _BINARY_H
 #define _BINARY_H
diff --git a/lib/byteswap.in.h b/lib/byteswap.in.h
index 5fc0663..32385a2 100644
--- a/lib/byteswap.in.h
+++ b/lib/byteswap.in.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef _GL_BYTESWAP_H
 #define _GL_BYTESWAP_H
diff --git a/lib/c++defs.h b/lib/c++defs.h
index f03f359..09dcd3e 100644
--- a/lib/c++defs.h
+++ b/lib/c++defs.h
@@ -12,7 +12,7 @@
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef _GL_CXXDEFS_H
 #define _GL_CXXDEFS_H
@@ -266,7 +266,7 @@
    _GL_CXXALIASWARN_1 (func, GNULIB_NAMESPACE)
 # define _GL_CXXALIASWARN_1(func,namespace) \
    _GL_CXXALIASWARN_2 (func, namespace)
-/* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>,
+/* To work around GCC bug <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>,
    we enable the warning only when not optimizing.  */
 # if !__OPTIMIZE__
 #  define _GL_CXXALIASWARN_2(func,namespace) \
@@ -294,7 +294,7 @@
                         GNULIB_NAMESPACE)
 # define _GL_CXXALIASWARN1_1(func,rettype,parameters_and_attributes,namespace) 
\
    _GL_CXXALIASWARN1_2 (func, rettype, parameters_and_attributes, namespace)
-/* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>,
+/* To work around GCC bug <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>,
    we enable the warning only when not optimizing.  */
 # if !__OPTIMIZE__
 #  define 
_GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
diff --git a/lib/c-ctype.h b/lib/c-ctype.h
index bcdba6b..9ad3c18 100644
--- a/lib/c-ctype.h
+++ b/lib/c-ctype.h
@@ -18,7 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+along with this program; if not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef C_CTYPE_H
 #define C_CTYPE_H
diff --git a/lib/c-strcase.h b/lib/c-strcase.h
index c82dab1..220d21d 100644
--- a/lib/c-strcase.h
+++ b/lib/c-strcase.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef C_STRCASE_H
 #define C_STRCASE_H
diff --git a/lib/c-strcasecmp.c b/lib/c-strcasecmp.c
index 5bce873..b2880a2 100644
--- a/lib/c-strcasecmp.c
+++ b/lib/c-strcasecmp.c
@@ -12,7 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/lib/c-strncasecmp.c b/lib/c-strncasecmp.c
index ada62d7..982e179 100644
--- a/lib/c-strncasecmp.c
+++ b/lib/c-strncasecmp.c
@@ -12,7 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/lib/careadlinkat.c b/lib/careadlinkat.c
index 455e00e..e2af54f 100644
--- a/lib/careadlinkat.c
+++ b/lib/careadlinkat.c
@@ -14,7 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Paul Eggert, Bruno Haible, and Jim Meyering.  */
 
diff --git a/lib/careadlinkat.h b/lib/careadlinkat.h
index 528a828..d436c69 100644
--- a/lib/careadlinkat.h
+++ b/lib/careadlinkat.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Paul Eggert, Bruno Haible, and Jim Meyering.  */
 
diff --git a/lib/cloexec.c b/lib/cloexec.c
index e34aef8..2b67a01 100644
--- a/lib/cloexec.c
+++ b/lib/cloexec.c
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
    The code is taken from glibc/manual/llio.texi  */
 
diff --git a/lib/cloexec.h b/lib/cloexec.h
index cdaf422..d937a40 100644
--- a/lib/cloexec.h
+++ b/lib/cloexec.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 */
 
diff --git a/lib/close-stream.c b/lib/close-stream.c
index 96c1265..1970762 100644
--- a/lib/close-stream.c
+++ b/lib/close-stream.c
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/lib/count-leading-zeros.h b/lib/count-leading-zeros.h
index e197137..1b60e28 100644
--- a/lib/count-leading-zeros.h
+++ b/lib/count-leading-zeros.h
@@ -12,7 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Eric Blake.  */
 
diff --git a/lib/count-one-bits.h b/lib/count-one-bits.h
index fb5fb92..1576b08 100644
--- a/lib/count-one-bits.h
+++ b/lib/count-one-bits.h
@@ -12,7 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Ben Pfaff.  */
 
diff --git a/lib/count-trailing-zeros.h b/lib/count-trailing-zeros.h
index 4a0a109..be71314 100644
--- a/lib/count-trailing-zeros.h
+++ b/lib/count-trailing-zeros.h
@@ -12,7 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/diffseq.h b/lib/diffseq.h
index a3cf140..b6f9f6f 100644
--- a/lib/diffseq.h
+++ b/lib/diffseq.h
@@ -14,7 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 /* The basic idea is to consider two vectors as similar if, when
diff --git a/lib/dirent.in.h b/lib/dirent.in.h
index f591787..5b23573 100644
--- a/lib/dirent.in.h
+++ b/lib/dirent.in.h
@@ -12,7 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef address@hidden@_DIRENT_H
 
diff --git a/lib/dirfd.c b/lib/dirfd.c
index 6b1a7b2..7e38fab 100644
--- a/lib/dirfd.c
+++ b/lib/dirfd.c
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Jim Meyering. */
 
diff --git a/lib/dosname.h b/lib/dosname.h
index dd5c177..255d57e 100644
--- a/lib/dosname.h
+++ b/lib/dosname.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
    From Paul Eggert and Jim Meyering.  */
 
diff --git a/lib/dtotimespec.c b/lib/dtotimespec.c
index 3ca5a9c..8f2e815 100644
--- a/lib/dtotimespec.c
+++ b/lib/dtotimespec.c
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* written by Paul Eggert */
 
diff --git a/lib/dup2.c b/lib/dup2.c
index 002dc8c..b89f837 100644
--- a/lib/dup2.c
+++ b/lib/dup2.c
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* written by Paul Eggert */
 
diff --git a/lib/errno.in.h b/lib/errno.in.h
index 13194f9..aaf5fec 100644
--- a/lib/errno.in.h
+++ b/lib/errno.in.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef address@hidden@_ERRNO_H
 
diff --git a/lib/euidaccess.c b/lib/euidaccess.c
index da2bda9..298c445 100644
--- a/lib/euidaccess.c
+++ b/lib/euidaccess.c
@@ -16,7 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by David MacKenzie and Torbjorn Granlund.
    Adapted for GNU C library by Roland McGrath.  */
diff --git a/lib/execinfo.in.h b/lib/execinfo.in.h
index 065a78d..f226926 100644
--- a/lib/execinfo.in.h
+++ b/lib/execinfo.in.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/explicit_bzero.c b/lib/explicit_bzero.c
index 262c68f..0909346 100644
--- a/lib/explicit_bzero.c
+++ b/lib/explicit_bzero.c
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public
    License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
+   <https://www.gnu.org/licenses/>.  */
 
 /* An assembler implementation of explicit_bzero can be created as an
    assembler alias of an optimized bzero implementation.
diff --git a/lib/faccessat.c b/lib/faccessat.c
index f9458e8..6cf9c99 100644
--- a/lib/faccessat.c
+++ b/lib/faccessat.c
@@ -12,7 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* written by Eric Blake */
 
diff --git a/lib/fcntl.c b/lib/fcntl.c
index d4dd144..91efd12 100644
--- a/lib/fcntl.c
+++ b/lib/fcntl.c
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Eric Blake <address@hidden>.  */
 
diff --git a/lib/fcntl.in.h b/lib/fcntl.in.h
index 076d1ac..00b270c 100644
--- a/lib/fcntl.in.h
+++ b/lib/fcntl.in.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* written by Paul Eggert */
 
diff --git a/lib/fdatasync.c b/lib/fdatasync.c
index 6875fa4..25fd740 100644
--- a/lib/fdatasync.c
+++ b/lib/fdatasync.c
@@ -13,7 +13,7 @@
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <unistd.h>
diff --git a/lib/fdopendir.c b/lib/fdopendir.c
index 03be92a..7f72258 100644
--- a/lib/fdopendir.c
+++ b/lib/fdopendir.c
@@ -12,7 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* written by Jim Meyering */
 
diff --git a/lib/filemode.c b/lib/filemode.c
index d62f70b..c6cf1f3 100644
--- a/lib/filemode.c
+++ b/lib/filemode.c
@@ -14,7 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/lib/filemode.h b/lib/filemode.h
index 5fbb791..809bf7e 100644
--- a/lib/filemode.h
+++ b/lib/filemode.h
@@ -14,7 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef FILEMODE_H_
 
diff --git a/lib/filevercmp.c b/lib/filevercmp.c
index 0396867..56c9821 100644
--- a/lib/filevercmp.c
+++ b/lib/filevercmp.c
@@ -14,7 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 #include <config.h>
 #include "filevercmp.h"
diff --git a/lib/filevercmp.h b/lib/filevercmp.h
index d698991..25cc6f6 100644
--- a/lib/filevercmp.h
+++ b/lib/filevercmp.h
@@ -14,7 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 #ifndef FILEVERCMP_H
 #define FILEVERCMP_H
diff --git a/lib/flexmember.h b/lib/flexmember.h
index 7405c41..7e4f95d 100644
--- a/lib/flexmember.h
+++ b/lib/flexmember.h
@@ -16,7 +16,7 @@
 
    You should have received a copy of the GNU General Public
    License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.
+   <https://www.gnu.org/licenses/>.
 
    Written by Paul Eggert.  */
 
diff --git a/lib/fpending.c b/lib/fpending.c
index 02602a1..5811a4a 100644
--- a/lib/fpending.c
+++ b/lib/fpending.c
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Jim Meyering. */
 
diff --git a/lib/fpending.h b/lib/fpending.h
index a901dee..73c7d79 100644
--- a/lib/fpending.h
+++ b/lib/fpending.h
@@ -14,7 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
    Written by Jim Meyering.  */
 
diff --git a/lib/fstatat.c b/lib/fstatat.c
index 70799be..d09add0 100644
--- a/lib/fstatat.c
+++ b/lib/fstatat.c
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Paul Eggert and Jim Meyering.  */
 
diff --git a/lib/fsync.c b/lib/fsync.c
index 5a4945e..a52e664 100644
--- a/lib/fsync.c
+++ b/lib/fsync.c
@@ -20,7 +20,7 @@
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <unistd.h>
diff --git a/lib/ftoastr.c b/lib/ftoastr.c
index f243416..029e797 100644
--- a/lib/ftoastr.c
+++ b/lib/ftoastr.c
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/ftoastr.h b/lib/ftoastr.h
index 74a855a..3ee05a3 100644
--- a/lib/ftoastr.h
+++ b/lib/ftoastr.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/get-permissions.c b/lib/get-permissions.c
index dc77748..c54d71c 100644
--- a/lib/get-permissions.c
+++ b/lib/get-permissions.c
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
    Written by Paul Eggert, Andreas Grünbacher, and Bruno Haible.  */
 
diff --git a/lib/getdtablesize.c b/lib/getdtablesize.c
index a092863..d0a5eca 100644
--- a/lib/getdtablesize.c
+++ b/lib/getdtablesize.c
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/lib/getgroups.c b/lib/getgroups.c
index dce0f2d..52473a5 100644
--- a/lib/getgroups.c
+++ b/lib/getgroups.c
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* written by Jim Meyering */
 
diff --git a/lib/getloadavg.c b/lib/getloadavg.c
index 0fe23bb..5f2dfab 100644
--- a/lib/getloadavg.c
+++ b/lib/getloadavg.c
@@ -17,7 +17,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Compile-time symbols that this file uses:
 
diff --git a/lib/getopt-cdefs.in.h b/lib/getopt-cdefs.in.h
index c71a4f1..21d847b 100644
--- a/lib/getopt-cdefs.in.h
+++ b/lib/getopt-cdefs.in.h
@@ -16,7 +16,7 @@
 
    You should have received a copy of the GNU General Public
    License along with gnulib; if not, see
-   <http://www.gnu.org/licenses/>.  */
+   <https://www.gnu.org/licenses/>.  */
 
 #ifndef _GETOPT_CDEFS_H
 #define _GETOPT_CDEFS_H 1
diff --git a/lib/getopt-core.h b/lib/getopt-core.h
index d315891..ec0734c 100644
--- a/lib/getopt-core.h
+++ b/lib/getopt-core.h
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public
    License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
+   <https://www.gnu.org/licenses/>.  */
 
 #ifndef _GETOPT_CORE_H
 #define _GETOPT_CORE_H 1
diff --git a/lib/getopt-ext.h b/lib/getopt-ext.h
index e4da22f..4cdbfb0 100644
--- a/lib/getopt-ext.h
+++ b/lib/getopt-ext.h
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public
    License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
+   <https://www.gnu.org/licenses/>.  */
 
 #ifndef _GETOPT_EXT_H
 #define _GETOPT_EXT_H 1
diff --git a/lib/getopt-pfx-core.h b/lib/getopt-pfx-core.h
index db5f15c..2ede4bb 100644
--- a/lib/getopt-pfx-core.h
+++ b/lib/getopt-pfx-core.h
@@ -16,7 +16,7 @@
 
    You should have received a copy of the GNU General Public
    License along with gnulib; if not, see
-   <http://www.gnu.org/licenses/>.  */
+   <https://www.gnu.org/licenses/>.  */
 
 #ifndef _GETOPT_PFX_CORE_H
 #define _GETOPT_PFX_CORE_H 1
diff --git a/lib/getopt-pfx-ext.h b/lib/getopt-pfx-ext.h
index 91f4df1..16d9634 100644
--- a/lib/getopt-pfx-ext.h
+++ b/lib/getopt-pfx-ext.h
@@ -16,7 +16,7 @@
 
    You should have received a copy of the GNU General Public
    License along with gnulib; if not, see
-   <http://www.gnu.org/licenses/>.  */
+   <https://www.gnu.org/licenses/>.  */
 
 #ifndef _GETOPT_PFX_EXT_H
 #define _GETOPT_PFX_EXT_H 1
diff --git a/lib/getopt.c b/lib/getopt.c
index 9a2867d..b0cc35b 100644
--- a/lib/getopt.c
+++ b/lib/getopt.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public
    License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
+   <https://www.gnu.org/licenses/>.  */
 
 #ifndef _LIBC
 # include <config.h>
diff --git a/lib/getopt.in.h b/lib/getopt.in.h
index 4ce1eb4..908f841 100644
--- a/lib/getopt.in.h
+++ b/lib/getopt.in.h
@@ -16,7 +16,7 @@
    General Public License for more details.
 
    You should have received a copy of the GNU General Public
-   License along with gnulib; if not, see <http://www.gnu.org/licenses/>.  */
+   License along with gnulib; if not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef address@hidden@_GETOPT_H
 
diff --git a/lib/getopt1.c b/lib/getopt1.c
index 2bc5926..d689f4c 100644
--- a/lib/getopt1.c
+++ b/lib/getopt1.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public
    License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
+   <https://www.gnu.org/licenses/>.  */
 
 #ifndef _LIBC
 # include <config.h>
diff --git a/lib/getopt_.h b/lib/getopt_.h
deleted file mode 100644
index 7c77a1c..0000000
--- a/lib/getopt_.h
+++ /dev/null
@@ -1,285 +0,0 @@
-/* Declarations for getopt.
-   Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2017 Free
-   Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#ifndef _GL_GETOPT_H
-
-#if __GNUC__ >= 3
-#pragma GCC system_header
-#endif
-
-
-/* The include_next requires a split double-inclusion guard.  We must
-   also inform the replacement unistd.h to not recursively use
-   <getopt.h>; our definitions will be present soon enough.  */
-#if HAVE_GETOPT_H
-# define _GL_SYSTEM_GETOPT
-# ifndef __GNUC__
-# include <next_getopt.h>
-# else
-# include_next <getopt.h>
-# endif
-# undef _GL_SYSTEM_GETOPT
-#endif
-
-#ifndef _GL_GETOPT_H
-
-#ifndef __need_getopt
-# define _GL_GETOPT_H 1
-#endif
-
-/* Standalone applications should #define __GETOPT_PREFIX to an
-   identifier that prefixes the external functions and variables
-   defined in this header.  When this happens, include the
-   headers that might declare getopt so that they will not cause
-   confusion if included after this file (if the system had <getopt.h>,
-   we have already included it).  Then systematically rename
-   identifiers so that they do not collide with the system functions
-   and variables.  Renaming avoids problems with some compilers and
-   linkers.  */
-#if defined __GETOPT_PREFIX && !defined __need_getopt
-# if !HAVE_GETOPT_H
-#  define __need_system_stdlib_h
-#  include <stdlib.h>
-#  undef __need_system_stdlib_h
-#  include <stdio.h>
-#  include <unistd.h>
-# endif
-# undef __need_getopt
-# undef getopt
-# undef getopt_long
-# undef getopt_long_only
-# undef optarg
-# undef opterr
-# undef optind
-# undef optopt
-# undef option
-# define __GETOPT_CONCAT(x, y) x ## y
-# define __GETOPT_XCONCAT(x, y) __GETOPT_CONCAT (x, y)
-# define __GETOPT_ID(y) __GETOPT_XCONCAT (__GETOPT_PREFIX, y)
-# define getopt __GETOPT_ID (getopt)
-# define getopt_long __GETOPT_ID (getopt_long)
-# define getopt_long_only __GETOPT_ID (getopt_long_only)
-# define optarg __GETOPT_ID (optarg)
-# define opterr __GETOPT_ID (opterr)
-# define optind __GETOPT_ID (optind)
-# define optopt __GETOPT_ID (optopt)
-# define option __GETOPT_ID (option)
-# define _getopt_internal __GETOPT_ID (getopt_internal)
-#endif
-
-/* Standalone applications get correct prototypes for getopt_long and
-   getopt_long_only; they declare "char **argv".  libc uses prototypes
-   with "char *const *argv" that are incorrect because getopt_long and
-   getopt_long_only can permute argv; this is required for backward
-   compatibility (e.g., for LSB 2.0.1).
-
-   This used to be '#if defined __GETOPT_PREFIX && !defined __need_getopt',
-   but it caused redefinition warnings if both unistd.h and getopt.h were
-   included, since unistd.h includes getopt.h having previously defined
-   __need_getopt.
-
-   The only place where __getopt_argv_const is used is in definitions
-   of getopt_long and getopt_long_only below, but these are visible
-   only if __need_getopt is not defined, so it is quite safe to rewrite
-   the conditional as follows:
-*/
-#if !defined __need_getopt
-# if defined __GETOPT_PREFIX
-#  define __getopt_argv_const /* empty */
-# else
-#  define __getopt_argv_const const
-# endif
-#endif
-
-/* If __GNU_LIBRARY__ is not already defined, either we are being used
-   standalone, or this is the first header included in the source file.
-   If we are being used with glibc, we need to include <features.h>, but
-   that does not exist if we are standalone.  So: if __GNU_LIBRARY__ is
-   not defined, include <ctype.h>, which will pull in <features.h> for us
-   if it's from glibc.  (Why ctype.h?  It's guaranteed to exist and it
-   doesn't flood the namespace with stuff the way some other headers do.)  */
-#if !defined __GNU_LIBRARY__
-# include <ctype.h>
-#endif
-
-#ifndef __THROW
-# ifndef __GNUC_PREREQ
-#  define __GNUC_PREREQ(maj, min) (0)
-# endif
-# if defined __cplusplus && __GNUC_PREREQ (2,8)
-#  define __THROW       throw ()
-# else
-#  define __THROW
-# endif
-#endif
-
-/* The definition of _GL_ARG_NONNULL is copied here.  */
-/* A C macro for declaring that specific arguments must not be NULL.
-   Copyright (C) 2009-2017 Free Software Foundation, Inc.
-
-   This program is free software: you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published
-   by the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools
-   that the values passed as arguments n, ..., m must be non-NULL pointers.
-   n = 1 stands for the first argument, n = 2 for the second argument etc.  */
-#ifndef _GL_ARG_NONNULL
-# if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || __GNUC__ > 3
-#  define _GL_ARG_NONNULL(params) __attribute__ ((__nonnull__ params))
-# else
-#  define _GL_ARG_NONNULL(params)
-# endif
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* For communication from 'getopt' to the caller.
-   When 'getopt' finds an option that takes an argument,
-   the argument value is returned here.
-   Also, when 'ordering' is RETURN_IN_ORDER,
-   each non-option ARGV-element is returned here.  */
-
-extern char *optarg;
-
-/* Index in ARGV of the next element to be scanned.
-   This is used for communication to and from the caller
-   and for communication between successive calls to 'getopt'.
-
-   On entry to 'getopt', zero means this is the first call; initialize.
-
-   When 'getopt' returns -1, this is the index of the first of the
-   non-option elements that the caller should itself scan.
-
-   Otherwise, 'optind' communicates from one call to the next
-   how much of ARGV has been scanned so far.  */
-
-extern int optind;
-
-/* Callers store zero here to inhibit the error message 'getopt' prints
-   for unrecognized options.  */
-
-extern int opterr;
-
-/* Set to an option character which was unrecognized.  */
-
-extern int optopt;
-
-#ifndef __need_getopt
-/* Describe the long-named options requested by the application.
-   The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
-   of 'struct option' terminated by an element containing a name which is
-   zero.
-
-   The field 'has_arg' is:
-   no_argument          (or 0) if the option does not take an argument,
-   required_argument    (or 1) if the option requires an argument,
-   optional_argument    (or 2) if the option takes an optional argument.
-
-   If the field 'flag' is not NULL, it points to a variable that is set
-   to the value given in the field 'val' when the option is found, but
-   left unchanged if the option is not found.
-
-   To have a long-named option do something other than set an 'int' to
-   a compiled-in constant, such as set a value from 'optarg', set the
-   option's 'flag' field to zero and its 'val' field to a nonzero
-   value (the equivalent single-letter option character, if there is
-   one).  For long options that have a zero 'flag' field, 'getopt'
-   returns the contents of the 'val' field.  */
-
-# if !GNULIB_defined_struct_option
-struct option
-{
-  const char *name;
-  /* has_arg can't be an enum because some compilers complain about
-     type mismatches in all the code that assumes it is an int.  */
-  int has_arg;
-  int *flag;
-  int val;
-};
-#  define GNULIB_defined_struct_option 1
-# endif
-
-/* Names for the values of the 'has_arg' field of 'struct option'.  */
-
-# define no_argument            0
-# define required_argument      1
-# define optional_argument      2
-#endif  /* need getopt */
-
-
-/* Get definitions and prototypes for functions to process the
-   arguments in ARGV (ARGC of them, minus the program name) for
-   options given in OPTS.
-
-   Return the option character from OPTS just read.  Return -1 when
-   there are no more options.  For unrecognized options, or options
-   missing arguments, 'optopt' is set to the option letter, and '?' is
-   returned.
-
-   The OPTS string is a list of characters which are recognized option
-   letters, optionally followed by colons, specifying that that letter
-   takes an argument, to be placed in 'optarg'.
-
-   If a letter in OPTS is followed by two colons, its argument is
-   optional.  This behavior is specific to the GNU 'getopt'.
-
-   The argument '--' causes premature termination of argument
-   scanning, explicitly telling 'getopt' that there are no more
-   options.
-
-   If OPTS begins with '-', then non-option arguments are treated as
-   arguments to the option '\1'.  This behavior is specific to the GNU
-   'getopt'.  If OPTS begins with '+', or POSIXLY_CORRECT is set in
-   the environment, then do not permute arguments.  */
-
-extern int getopt (int ___argc, char *const *___argv, const char *__shortopts)
-       __THROW _GL_ARG_NONNULL ((2, 3));
-
-#ifndef __need_getopt
-extern int getopt_long (int ___argc, char *__getopt_argv_const *___argv,
-                        const char *__shortopts,
-                        const struct option *__longopts, int *__longind)
-       __THROW _GL_ARG_NONNULL ((2, 3));
-extern int getopt_long_only (int ___argc, char *__getopt_argv_const *___argv,
-                             const char *__shortopts,
-                             const struct option *__longopts, int *__longind)
-       __THROW _GL_ARG_NONNULL ((2, 3));
-
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-/* Make sure we later can get all the definitions and declarations.  */
-#undef __need_getopt
-
-#endif /* _GL_GETOPT_H */
-#endif /* _GL_GETOPT_H */
diff --git a/lib/getopt_int.h b/lib/getopt_int.h
index a556219..e33856c 100644
--- a/lib/getopt_int.h
+++ b/lib/getopt_int.h
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public
    License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
+   <https://www.gnu.org/licenses/>.  */
 
 #ifndef _GETOPT_INT_H
 #define _GETOPT_INT_H  1
diff --git a/lib/gettext.h b/lib/gettext.h
index 742ce37..f6150be 100644
--- a/lib/gettext.h
+++ b/lib/gettext.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License along
-   with this program; if not, see <http://www.gnu.org/licenses/>.  */
+   with this program; if not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef _LIBGETTEXT_H
 #define _LIBGETTEXT_H 1
diff --git a/lib/gettime.c b/lib/gettime.c
index 4ae313e..e5af26c 100644
--- a/lib/gettime.c
+++ b/lib/gettime.c
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/gettimeofday.c b/lib/gettimeofday.c
index 8ae7622..a11b183 100644
--- a/lib/gettimeofday.c
+++ b/lib/gettimeofday.c
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, see <https://www.gnu.org/licenses/>.  */
 
 /* written by Jim Meyering */
 
diff --git a/lib/gnulib.mk.in b/lib/gnulib.mk.in
index fdf8743..9500871 100644
--- a/lib/gnulib.mk.in
+++ b/lib/gnulib.mk.in
@@ -13,7 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this file.  If not, see <http://www.gnu.org/licenses/>.
+# along with this file.  If not, see <https://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License,
 # this file may be distributed as part of a program that
diff --git a/lib/group-member.c b/lib/group-member.c
index 20f8ee8..7c4ce49 100644
--- a/lib/group-member.c
+++ b/lib/group-member.c
@@ -14,7 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/lib/ignore-value.h b/lib/ignore-value.h
index 2439d95..8ef3fe7 100644
--- a/lib/ignore-value.h
+++ b/lib/ignore-value.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Jim Meyering, Eric Blake and Pádraig Brady.  */
 
diff --git a/lib/intprops.h b/lib/intprops.h
index 28f4361..400ba5b 100644
--- a/lib/intprops.h
+++ b/lib/intprops.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/inttypes.in.h b/lib/inttypes.in.h
index 69b12a8..e7357e9 100644
--- a/lib/inttypes.in.h
+++ b/lib/inttypes.in.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /*
  * ISO C 99 <inttypes.h> for platforms that lack it.
diff --git a/lib/limits.in.h b/lib/limits.in.h
index 08d3c32..78dcf31 100644
--- a/lib/limits.in.h
+++ b/lib/limits.in.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef address@hidden@_LIMITS_H
 
diff --git a/lib/localtime-buffer.c b/lib/localtime-buffer.c
index f84ad3e..c96c577 100644
--- a/lib/localtime-buffer.c
+++ b/lib/localtime-buffer.c
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, see <https://www.gnu.org/licenses/>.  */
 
 /* written by Jim Meyering */
 
diff --git a/lib/localtime-buffer.h b/lib/localtime-buffer.h
index 483a579..0a0389d 100644
--- a/lib/localtime-buffer.h
+++ b/lib/localtime-buffer.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, see <https://www.gnu.org/licenses/>.  */
 
 /* written by Jim Meyering */
 
diff --git a/lib/lstat.c b/lib/lstat.c
index f4dc43e..c721a4e 100644
--- a/lib/lstat.c
+++ b/lib/lstat.c
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* written by Jim Meyering */
 
diff --git a/lib/md5.c b/lib/md5.c
index dcbba45..e16da59 100644
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -15,7 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Ulrich Drepper <address@hidden>, 1995.  */
 
diff --git a/lib/md5.h b/lib/md5.h
index e38a619..8b94bfc 100644
--- a/lib/md5.h
+++ b/lib/md5.h
@@ -15,7 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef _MD5_H
 #define _MD5_H 1
diff --git a/lib/memrchr.c b/lib/memrchr.c
index fefe16c..29e5698 100644
--- a/lib/memrchr.c
+++ b/lib/memrchr.c
@@ -20,7 +20,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #if defined _LIBC
 # include <memcopy.h>
diff --git a/lib/minmax.h b/lib/minmax.h
index 6b602a9..bbf1416 100644
--- a/lib/minmax.h
+++ b/lib/minmax.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef _MINMAX_H
 #define _MINMAX_H
diff --git a/lib/mkostemp.c b/lib/mkostemp.c
index 56c22a4..f1ce93b 100644
--- a/lib/mkostemp.c
+++ b/lib/mkostemp.c
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #if !_LIBC
 # include <config.h>
diff --git a/lib/mktime-internal.h b/lib/mktime-internal.h
index 6c8b2e7..00e58ab 100644
--- a/lib/mktime-internal.h
+++ b/lib/mktime-internal.h
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public
    License along with this program; if not, see
-   <http://www.gnu.org/licenses/>.  */
+   <https://www.gnu.org/licenses/>.  */
 
 #include <time.h>
 
diff --git a/lib/mktime.c b/lib/mktime.c
index 058ab65..dd7f0a3 100644
--- a/lib/mktime.c
+++ b/lib/mktime.c
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public
    License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
+   <https://www.gnu.org/licenses/>.  */
 
 /* Define this to 1 to have a standalone program to test this implementation of
    mktime.  */
diff --git a/lib/nstrftime.c b/lib/nstrftime.c
index 99bee4e..8795cd7 100644
--- a/lib/nstrftime.c
+++ b/lib/nstrftime.c
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public
    License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
+   <https://www.gnu.org/licenses/>.  */
 
 #ifdef _LIBC
 # define USE_IN_EXTENDED_LOCALE_MODEL 1
diff --git a/lib/open.c b/lib/open.c
index c62f02b..b5452b5 100644
--- a/lib/open.c
+++ b/lib/open.c
@@ -12,7 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Bruno Haible <address@hidden>, 2007.  */
 
diff --git a/lib/openat-priv.h b/lib/openat-priv.h
index 2598719..b5a411b 100644
--- a/lib/openat-priv.h
+++ b/lib/openat-priv.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* written by Jim Meyering */
 
diff --git a/lib/openat-proc.c b/lib/openat-proc.c
index 101449b..6d2b598 100644
--- a/lib/openat-proc.c
+++ b/lib/openat-proc.c
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/openat.h b/lib/openat.h
index a036081..1c4f64a 100644
--- a/lib/openat.h
+++ b/lib/openat.h
@@ -12,7 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* written by Jim Meyering */
 
diff --git a/lib/pipe2.c b/lib/pipe2.c
index 830f006..741cee9 100644
--- a/lib/pipe2.c
+++ b/lib/pipe2.c
@@ -12,7 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License along
-   with this program; if not, see <http://www.gnu.org/licenses/>.  */
+   with this program; if not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/lib/pselect.c b/lib/pselect.c
index 0c44ca9..2ea7c45 100644
--- a/lib/pselect.c
+++ b/lib/pselect.c
@@ -15,7 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License along
-   with this program; if not, see <http://www.gnu.org/licenses/>.  */
+   with this program; if not, see <https://www.gnu.org/licenses/>.  */
 
 /* written by Paul Eggert */
 
diff --git a/lib/pthread_sigmask.c b/lib/pthread_sigmask.c
index cb21330..9ccf89b 100644
--- a/lib/pthread_sigmask.c
+++ b/lib/pthread_sigmask.c
@@ -12,7 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/lib/putenv.c b/lib/putenv.c
index b55e262..7831864 100644
--- a/lib/putenv.c
+++ b/lib/putenv.c
@@ -15,7 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/lib/qcopy-acl.c b/lib/qcopy-acl.c
index fdf0a05..003cb42 100644
--- a/lib/qcopy-acl.c
+++ b/lib/qcopy-acl.c
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
    Written by Paul Eggert, Andreas Grünbacher, and Bruno Haible.  */
 
diff --git a/lib/readlink.c b/lib/readlink.c
index bf0cedc..cd9604b 100644
--- a/lib/readlink.c
+++ b/lib/readlink.c
@@ -12,7 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/lib/readlinkat.c b/lib/readlinkat.c
index 29a71dd..c9880e1 100644
--- a/lib/readlinkat.c
+++ b/lib/readlinkat.c
@@ -12,7 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* written by Eric Blake */
 
diff --git a/lib/root-uid.h b/lib/root-uid.h
index 3a0037a..4aa9dfe 100644
--- a/lib/root-uid.h
+++ b/lib/root-uid.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
    Written by Paul Eggert.  */
 
diff --git a/lib/save-cwd.c b/lib/save-cwd.c
index c1de48e..fbd944b 100644
--- a/lib/save-cwd.c
+++ b/lib/save-cwd.c
@@ -14,7 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Gnulib needs to save and restore the current working directory to
    fully emulate functions like fstatat.  But Emacs doesn't care what
diff --git a/lib/save-cwd.h b/lib/save-cwd.h
index d066a0e..577bc35 100644
--- a/lib/save-cwd.h
+++ b/lib/save-cwd.h
@@ -14,7 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Jim Meyering.  */
 
diff --git a/lib/set-permissions.c b/lib/set-permissions.c
index 75bb2dc..b30841f 100644
--- a/lib/set-permissions.c
+++ b/lib/set-permissions.c
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
    Written by Paul Eggert, Andreas Grünbacher, and Bruno Haible.  */
 
diff --git a/lib/sha1.c b/lib/sha1.c
index a578141..ca3eabc 100644
--- a/lib/sha1.c
+++ b/lib/sha1.c
@@ -14,7 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Scott G. Miller
    Credits:
diff --git a/lib/sha1.h b/lib/sha1.h
index fcef9ce..dd48889 100644
--- a/lib/sha1.h
+++ b/lib/sha1.h
@@ -14,7 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef SHA1_H
 # define SHA1_H 1
diff --git a/lib/sha256.c b/lib/sha256.c
index c0fb8be..449a9b7 100644
--- a/lib/sha256.c
+++ b/lib/sha256.c
@@ -14,7 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by David Madore, considerably copypasting from
    Scott G. Miller's sha1.c
diff --git a/lib/sha256.h b/lib/sha256.h
index 348b76e..b998aa4 100644
--- a/lib/sha256.h
+++ b/lib/sha256.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef SHA256_H
 # define SHA256_H 1
diff --git a/lib/sha512.c b/lib/sha512.c
index dbde671..e666231 100644
--- a/lib/sha512.c
+++ b/lib/sha512.c
@@ -14,7 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by David Madore, considerably copypasting from
    Scott G. Miller's sha1.c
diff --git a/lib/sha512.h b/lib/sha512.h
index 4460e6c..70a3f9a 100644
--- a/lib/sha512.h
+++ b/lib/sha512.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef SHA512_H
 # define SHA512_H 1
diff --git a/lib/sig2str.c b/lib/sig2str.c
index c50c612..a3ed970 100644
--- a/lib/sig2str.c
+++ b/lib/sig2str.c
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/sig2str.h b/lib/sig2str.h
index 9bec78e..4e43ea4 100644
--- a/lib/sig2str.h
+++ b/lib/sig2str.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/signal.in.h b/lib/signal.in.h
index 1ffba37..1d8ebfa 100644
--- a/lib/signal.in.h
+++ b/lib/signal.in.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
diff --git a/lib/stat-time.h b/lib/stat-time.h
index 9e45e85..47a3bf8 100644
--- a/lib/stat-time.h
+++ b/lib/stat-time.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/stdalign.in.h b/lib/stdalign.in.h
index ea24823..68e889e 100644
--- a/lib/stdalign.in.h
+++ b/lib/stdalign.in.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Paul Eggert and Bruno Haible.  */
 
@@ -53,7 +53,7 @@
 #undef _Alignof
 
 /* GCC releases before GCC 4.9 had a bug in _Alignof.  See GCC bug 52023
-   <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>.  */
+   <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>.  */
 #if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \
      || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9)))
 # ifdef __cplusplus
diff --git a/lib/stddef.in.h b/lib/stddef.in.h
index 16e72bd..758ccf6 100644
--- a/lib/stddef.in.h
+++ b/lib/stddef.in.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Eric Blake.  */
 
diff --git a/lib/stdint.in.h b/lib/stdint.in.h
index 5fbec34..df8b37d 100644
--- a/lib/stdint.in.h
+++ b/lib/stdint.in.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, see <https://www.gnu.org/licenses/>.  */
 
 /*
  * ISO C 99 <stdint.h> for platforms that lack it.
diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h
index d5b5943..0d606c1 100644
--- a/lib/stdio-impl.h
+++ b/lib/stdio-impl.h
@@ -12,7 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Many stdio implementations have the same logic and therefore can share
    the same implementation of stdio extension API, except that some fields
diff --git a/lib/stdio.in.h b/lib/stdio.in.h
index b714c54..5cf3131 100644
--- a/lib/stdio.in.h
+++ b/lib/stdio.in.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, see <https://www.gnu.org/licenses/>.  */
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h
index ef41c99..d5fa02b 100644
--- a/lib/stdlib.in.h
+++ b/lib/stdlib.in.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
diff --git a/lib/stpcpy.c b/lib/stpcpy.c
index 154d95f..079599d 100644
--- a/lib/stpcpy.c
+++ b/lib/stpcpy.c
@@ -16,7 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/lib/strftime.h b/lib/strftime.h
index 27a8d62..9d91e51 100644
--- a/lib/strftime.h
+++ b/lib/strftime.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <time.h>
 
diff --git a/lib/string.in.h b/lib/string.in.h
index aaff563..0e0e0c5 100644
--- a/lib/string.in.h
+++ b/lib/string.in.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, see <https://www.gnu.org/licenses/>.  */
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
diff --git a/lib/strtoimax.c b/lib/strtoimax.c
index 3f31fe9..f7d46f0 100644
--- a/lib/strtoimax.c
+++ b/lib/strtoimax.c
@@ -14,7 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Paul Eggert. */
 
diff --git a/lib/strtol.c b/lib/strtol.c
index 751d1e0..1ef8870 100644
--- a/lib/strtol.c
+++ b/lib/strtol.c
@@ -17,7 +17,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifdef _LIBC
 # define USE_NUMBER_GROUPING
diff --git a/lib/strtoll.c b/lib/strtoll.c
index d770e81..f6952f3 100644
--- a/lib/strtoll.c
+++ b/lib/strtoll.c
@@ -14,7 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #define QUAD    1
 
diff --git a/lib/symlink.c b/lib/symlink.c
index 60d4c14..427f1f5 100644
--- a/lib/symlink.c
+++ b/lib/symlink.c
@@ -12,7 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/lib/sys_select.in.h b/lib/sys_select.in.h
index 616e77d..3bda212 100644
--- a/lib/sys_select.in.h
+++ b/lib/sys_select.in.h
@@ -12,7 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, see <https://www.gnu.org/licenses/>.  */
 
 # if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
diff --git a/lib/sys_stat.in.h b/lib/sys_stat.in.h
index 1831740..f0919e9 100644
--- a/lib/sys_stat.in.h
+++ b/lib/sys_stat.in.h
@@ -12,7 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Eric Blake, Paul Eggert, and Jim Meyering.  */
 
diff --git a/lib/sys_time.in.h b/lib/sys_time.in.h
index 57739bc..8a3c87d 100644
--- a/lib/sys_time.in.h
+++ b/lib/sys_time.in.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/sys_types.in.h b/lib/sys_types.in.h
index 3cea448..b0d6132 100644
--- a/lib/sys_types.in.h
+++ b/lib/sys_types.in.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, see <https://www.gnu.org/licenses/>.  */
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
diff --git a/lib/tempname.c b/lib/tempname.c
index c274b8d..2e3f95f 100644
--- a/lib/tempname.c
+++ b/lib/tempname.c
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Extracted from glibc sysdeps/posix/tempname.c.  See also tmpdir.c.  */
 
diff --git a/lib/tempname.h b/lib/tempname.h
index 1ca9748..245c816 100644
--- a/lib/tempname.h
+++ b/lib/tempname.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* header written by Eric Blake */
 
diff --git a/lib/time-internal.h b/lib/time-internal.h
index bf22834..8caf11d 100644
--- a/lib/time-internal.h
+++ b/lib/time-internal.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License along
-   with this program; if not, see <http://www.gnu.org/licenses/>.  */
+   with this program; if not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/time.in.h b/lib/time.in.h
index f0c7ef8..d210fbf 100644
--- a/lib/time.in.h
+++ b/lib/time.in.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, see <https://www.gnu.org/licenses/>.  */
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
diff --git a/lib/time_r.c b/lib/time_r.c
index 708a98b..8cf8329 100644
--- a/lib/time_r.c
+++ b/lib/time_r.c
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License along
-   with this program; if not, see <http://www.gnu.org/licenses/>.  */
+   with this program; if not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/time_rz.c b/lib/time_rz.c
index 17bc11c..ad02edb 100644
--- a/lib/time_rz.c
+++ b/lib/time_rz.c
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License along
-   with this program; if not, see <http://www.gnu.org/licenses/>.  */
+   with this program; if not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/timegm.c b/lib/timegm.c
index 957a3b8..1cabf64 100644
--- a/lib/timegm.c
+++ b/lib/timegm.c
@@ -14,7 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef _LIBC
 # include <config.h>
diff --git a/lib/timespec-add.c b/lib/timespec-add.c
index e6c87c6..faa4582 100644
--- a/lib/timespec-add.c
+++ b/lib/timespec-add.c
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/timespec-sub.c b/lib/timespec-sub.c
index 5d9276d..3872f1b 100644
--- a/lib/timespec-sub.c
+++ b/lib/timespec-sub.c
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/timespec.h b/lib/timespec.h
index f5d823a..3831301 100644
--- a/lib/timespec.h
+++ b/lib/timespec.h
@@ -14,7 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #if ! defined TIMESPEC_H
 # define TIMESPEC_H
diff --git a/lib/u64.h b/lib/u64.h
index a860193..f56cc38 100644
--- a/lib/u64.h
+++ b/lib/u64.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/unistd.in.h b/lib/unistd.in.h
index f366caf..8a383b3 100644
--- a/lib/unistd.in.h
+++ b/lib/unistd.in.h
@@ -12,7 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef address@hidden@_UNISTD_H
 
diff --git a/lib/unlocked-io.h b/lib/unlocked-io.h
index aaf60a0..be5d2b5 100644
--- a/lib/unlocked-io.h
+++ b/lib/unlocked-io.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Jim Meyering.  */
 
diff --git a/lib/utimens.c b/lib/utimens.c
index ff4eab0..a5716ac 100644
--- a/lib/utimens.c
+++ b/lib/utimens.c
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/utimens.h b/lib/utimens.h
index 4d9c18e..f1dd988 100644
--- a/lib/utimens.h
+++ b/lib/utimens.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Paul Eggert.  */
 
diff --git a/lib/verify.h b/lib/verify.h
index dcba9c8..e0b4861 100644
--- a/lib/verify.h
+++ b/lib/verify.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Paul Eggert, Bruno Haible, and Jim Meyering.  */
 
diff --git a/lib/vla.h b/lib/vla.h
index 5bbf56b..59de9a6 100644
--- a/lib/vla.h
+++ b/lib/vla.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
    Written by Paul Eggert.  */
 
diff --git a/lib/warn-on-use.h b/lib/warn-on-use.h
index 3c0eb57..cae8c3e 100644
--- a/lib/warn-on-use.h
+++ b/lib/warn-on-use.h
@@ -12,7 +12,7 @@
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* _GL_WARN_ON_USE (function, "literal string") issues a declaration
    for FUNCTION which will then trigger a compiler warning containing
diff --git a/lib/xalloc-oversized.h b/lib/xalloc-oversized.h
index 2e09bab..ae4fbc7 100644
--- a/lib/xalloc-oversized.h
+++ b/lib/xalloc-oversized.h
@@ -13,7 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef XALLOC_OVERSIZED_H_
 #define XALLOC_OVERSIZED_H_
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 6532005..913f937 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 SHELL = @SHELL@
 
@@ -481,7 +481,7 @@ check-defun-dups:
 ## ones that don't change very often at that) seems pretty pointless
 ## to me.
 
-# http://debbugs.gnu.org/1004
+# https://debbugs.gnu.org/1004
 # CC Mode uses a compile time macro system which causes a compile time
 # dependency in cc-*.elc files on the macros in other cc-*.el and the
 # version string in cc-defs.el.
diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index 01ad3d4..dbda5b5 100644
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/align.el b/lisp/align.el
index 081f587..084cd21 100644
--- a/lisp/align.el
+++ b/lisp/align.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/allout-widgets.el b/lisp/allout-widgets.el
index c07bbd0..4338181 100644
--- a/lisp/allout-widgets.el
+++ b/lisp/allout-widgets.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/allout.el b/lisp/allout.el
index 529de85..d0be847 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/ansi-color.el b/lisp/ansi-color.el
index 72d70c2..34e1dae 100644
--- a/lisp/ansi-color.el
+++ b/lisp/ansi-color.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/apropos.el b/lisp/apropos.el
index 86d9b51..807fd85 100644
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el
index 938c143..b06c07f 100644
--- a/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/array.el b/lisp/array.el
index 1481ff2..d955461 100644
--- a/lisp/array.el
+++ b/lisp/array.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/auth-source-pass.el b/lisp/auth-source-pass.el
index 529e302..8f69ce3 100644
--- a/lisp/auth-source-pass.el
+++ b/lisp/auth-source-pass.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index d4b44a5..1cb7f5d 100644
--- a/lisp/auth-source.el
+++ b/lisp/auth-source.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/autoarg.el b/lisp/autoarg.el
index 7991693..7677b9e 100644
--- a/lisp/autoarg.el
+++ b/lisp/autoarg.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/autoinsert.el b/lisp/autoinsert.el
index fef4216..2820c8a 100644
--- a/lisp/autoinsert.el
+++ b/lisp/autoinsert.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -200,7 +200,7 @@ If this contains a %s, that will be replaced by the 
matching rule."
 \;; GNU General Public License for more details.
 
 \;; You should have received a copy of the GNU General Public License
-\;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+\;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 \;;; Commentary:
 
@@ -237,7 +237,7 @@ A copy of the license is included in the section entitled 
``GNU
 Free Documentation License''.
 
 A copy of the license is also available from the Free Software
-Foundation Web site at @url{http://www.gnu.org/licenses/fdl.html}.
+Foundation Web site at @url{https://www.gnu.org/licenses/fdl.html}.
 
 @end quotation
 
@@ -284,7 +284,7 @@ The document was typeset with
 * GNU Free Documentation License::  License for copying this manual.
 @end menu
 
address@hidden Get fdl.texi from http://www.gnu.org/licenses/fdl.html
address@hidden Get fdl.texi from https://www.gnu.org/licenses/fdl.html
 @include fdl.texi
 
 @node Index
diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index a15386a..4b70f73 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/avoid.el b/lisp/avoid.el
index a4935c4..1a47198 100644
--- a/lisp/avoid.el
+++ b/lisp/avoid.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/battery.el b/lisp/battery.el
index b1834f0..570cee1 100644
--- a/lisp/battery.el
+++ b/lisp/battery.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/bindings.el b/lisp/bindings.el
index be44b45..3a679f7 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 5b8ded7..1c8ff3d 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/bs.el b/lisp/bs.el
index c626698..07d23e4 100644
--- a/lisp/bs.el
+++ b/lisp/bs.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el
index 83d6bb6..cb10754 100644
--- a/lisp/buff-menu.el
+++ b/lisp/buff-menu.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/button.el b/lisp/button.el
index 99c03d9..7e9a712 100644
--- a/lisp/button.el
+++ b/lisp/button.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/calc/calc-aent.el b/lisp/calc/calc-aent.el
index 4e074d6..f70a6d0 100644
--- a/lisp/calc/calc-aent.el
+++ b/lisp/calc/calc-aent.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calc/calc-alg.el b/lisp/calc/calc-alg.el
index 9db901a..e64308b 100644
--- a/lisp/calc/calc-alg.el
+++ b/lisp/calc/calc-alg.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -544,7 +544,7 @@
          (if (and (eq (car-safe nn) 'frac) (eq (nth 1 nn) 1) (not n))
              (unless (and (eq (car-safe math-simplify-expr) 'calcFunc-eq)
                            (eq (car-safe (nth 1 math-simplify-expr)) 'var)
-                           (not (math-expr-contains (nth 2 math-simplify-expr) 
+                           (not (math-expr-contains (nth 2 math-simplify-expr)
                                                     (nth 1 
math-simplify-expr))))
                (setcar (cdr math-simplify-expr)
                         (math-mul (nth 2 nn) (nth 1 math-simplify-expr)))
diff --git a/lisp/calc/calc-arith.el b/lisp/calc/calc-arith.el
index ec08ea4..008d548 100644
--- a/lisp/calc/calc-arith.el
+++ b/lisp/calc/calc-arith.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -448,7 +448,7 @@
               ((Math-negp a) 1)
               ((Math-zerop a) 2)
               ((eq (car a) 'intv)
-               (cond 
+               (cond
                  ((math-known-posp (nth 2 a)) 4)
                  ((math-known-negp (nth 3 a)) 1)
                  ((Math-zerop (nth 2 a)) 6)
@@ -1436,12 +1436,12 @@
       (and (math-identity-matrix-p a t)
            (or (and (eq (car-safe b) 'calcFunc-idn)
                     (= (length b) 2)
-                    (list 'calcFunc-idn (math-mul 
+                    (list 'calcFunc-idn (math-mul
                                          (nth 1 (nth 1 a))
                                          (nth 1 b))
                           (1- (length a))))
                (and (math-known-scalarp b)
-                    (list 'calcFunc-idn (math-mul 
+                    (list 'calcFunc-idn (math-mul
                                          (nth 1 (nth 1 a)) b)
                           (1- (length a))))
                (and (math-known-matrixp b)
@@ -1449,11 +1449,11 @@
       (and (math-identity-matrix-p b t)
            (or (and (eq (car-safe a) 'calcFunc-idn)
                     (= (length a) 2)
-                    (list 'calcFunc-idn (math-mul (nth 1 a) 
+                    (list 'calcFunc-idn (math-mul (nth 1 a)
                                                   (nth 1 (nth 1 b)))
                           (1- (length b))))
                (and (math-known-scalarp a)
-                    (list 'calcFunc-idn (math-mul a (nth 1 (nth 1 b))) 
+                    (list 'calcFunc-idn (math-mul a (nth 1 (nth 1 b)))
                           (1- (length b))))
                (and (math-known-matrixp a)
                     (math-mul a (nth 1 (nth 1 b))))))
@@ -1717,7 +1717,7 @@
 
 (defun math-div-new-non-trig (ntr)
   (if math-div-non-trig
-      (setq math-div-non-trig 
+      (setq math-div-non-trig
             (list '* ntr math-div-non-trig))
     (setq math-div-non-trig ntr)))
 
@@ -1958,7 +1958,7 @@
                       (not (equal a math-simplify-only)))
                  (list '^ a b))
                  ((and (eq (car-safe a) '*)
-                       (or 
+                       (or
                         (and
                          (math-known-matrixp (nth 1 a))
                          (math-known-matrixp (nth 2 a)))
@@ -1970,7 +1970,7 @@
                   (if (and (= b -1)
                            (math-known-square-matrixp (nth 1 a))
                            (math-known-square-matrixp (nth 2 a)))
-                      (math-mul (math-pow-fancy (nth 2 a) -1) 
+                      (math-mul (math-pow-fancy (nth 2 a) -1)
                                 (math-pow-fancy (nth 1 a) -1))
                     (list '^ a b)))
                 ((and (eq (car-safe a) '*)
@@ -2358,7 +2358,7 @@
 
 (defalias 'calcFunc-float 'math-float)
 
-;; The variable math-trunc-prec is local to math-trunc in calc-misc.el, 
+;; The variable math-trunc-prec is local to math-trunc in calc-misc.el,
 ;; but used by math-trunc-fancy which is called by math-trunc.
 (defvar math-trunc-prec)
 
diff --git a/lisp/calc/calc-bin.el b/lisp/calc/calc-bin.el
index ffca7c3..3a7807b 100644
--- a/lisp/calc/calc-bin.el
+++ b/lisp/calc/calc-bin.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -32,7 +32,7 @@
 (defconst math-bignum-logb-digit-size
   (logb math-bignum-digit-size)
   "The logb of the size of a bignum digit.
-This is the largest value of B such that 2^B is less than 
+This is the largest value of B such that 2^B is less than
 the size of a Calc bignum digit.")
 
 (defconst math-bignum-digit-power-of-two
@@ -171,7 +171,7 @@ the size of a Calc bignum digit.")
   (calc-wrapper
    (if (and (>= n 2) (<= n 36))
        (progn
-        (calc-change-mode 
+        (calc-change-mode
           (list 'calc-number-radix 'calc-twos-complement-mode)
           (list n (or arg (calc-is-option))) t)
         ;; also change global value so minibuffer sees it
@@ -424,7 +424,7 @@ the size of a Calc bignum digit.")
       (math-mul-bignum-digit (math-not-bignum (math-norm-bignum (car q))
                                               (- w 
math-bignum-logb-digit-size))
                              math-bignum-digit-power-of-two
-                             (logxor (cdr q) 
+                             (logxor (cdr q)
                                       (1- math-bignum-digit-power-of-two))))))
 
 (defun calcFunc-lsh (a &optional n w)   ; [I I] [Public]
@@ -845,7 +845,7 @@ the size of a Calc bignum digit.")
           (setq num (concat (make-string (- digs len) ?0) num))))
     (when calc-group-digits
       (setq num (math-group-float num)))
-    (concat 
+    (concat
      (number-to-string calc-number-radix)
      "##"
      num)))
diff --git a/lisp/calc/calc-comb.el b/lisp/calc/calc-comb.el
index 91fbb7b..20b2406 100644
--- a/lisp/calc/calc-comb.el
+++ b/lisp/calc/calc-comb.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calc/calc-cplx.el b/lisp/calc/calc-cplx.el
index a00adc0..06c9dc9 100644
--- a/lisp/calc/calc-cplx.el
+++ b/lisp/calc/calc-cplx.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calc/calc-embed.el b/lisp/calc/calc-embed.el
index 14ab97f..bc88401 100644
--- a/lisp/calc/calc-embed.el
+++ b/lisp/calc/calc-embed.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el
index d93a86a..7973fc1 100644
--- a/lisp/calc/calc-ext.el
+++ b/lisp/calc/calc-ext.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calc/calc-fin.el b/lisp/calc/calc-fin.el
index 6475746..92ef8f3 100644
--- a/lisp/calc/calc-fin.el
+++ b/lisp/calc/calc-fin.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calc/calc-forms.el b/lisp/calc/calc-forms.el
index 6aa421e..3389671 100644
--- a/lisp/calc/calc-forms.el
+++ b/lisp/calc/calc-forms.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calc/calc-frac.el b/lisp/calc/calc-frac.el
index d98cdda..3aa9eb8 100644
--- a/lisp/calc/calc-frac.el
+++ b/lisp/calc/calc-frac.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -206,7 +206,7 @@
 (defun calcFunc-fdiv (a b)   ; [R I I] [Public]
   (cond
    ((Math-num-integerp a)
-    (cond 
+    (cond
      ((Math-num-integerp b)
       (if (Math-zerop b)
          (math-reject-arg a "*Division by zero")
@@ -217,7 +217,7 @@
        (math-make-frac (math-mul (math-trunc a) (nth 2 b)) (nth 1 b))))
      (t (math-reject-arg b 'integerp))))
    ((eq (car-safe a) 'frac)
-    (cond 
+    (cond
      ((Math-num-integerp b)
       (if (Math-zerop b)
          (math-reject-arg a "*Division by zero")
@@ -227,7 +227,7 @@
          (math-reject-arg a "*Division by zero")
        (math-make-frac (math-mul (nth 1 a) (nth 2 b)) (math-mul (nth 2 a) (nth 
1 b)))))
      (t (math-reject-arg b 'integerp))))
-   (t 
+   (t
     (math-reject-arg a 'integerp))))
 
 (provide 'calc-frac)
diff --git a/lisp/calc/calc-funcs.el b/lisp/calc/calc-funcs.el
index 2bb460d..1dde2ed 100644
--- a/lisp/calc/calc-funcs.el
+++ b/lisp/calc/calc-funcs.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -564,7 +564,7 @@
        ((Math-lessp '(float 8 0) (math-abs-approx x))
         (let* ((z (math-div '(float 8 0) x))
                (y (math-sqr z))
-               (xx (math-add x 
+               (xx (math-add x
                               (math-read-number-simple "-0.785398164")))
                (a1 (math-poly-eval y
                           (list
@@ -633,7 +633,7 @@
               (setq sc (cons (math-neg (cdr sc)) (car sc)))
             (if (math-negp x)
                 (setq sc (cons (math-neg (car sc)) (math-neg (cdr sc))))))
-          (math-mul (math-sqrt (math-div 
+          (math-mul (math-sqrt (math-div
                                  (math-read-number-simple "0.636619722")
                                  x))
                     (math-sub (math-mul (cdr sc) a1)
@@ -813,39 +813,39 @@
 
 (defvar math-bernoulli-b-cache
   (list
-   (list 'frac 
+   (list 'frac
          -174611
          (math-read-number-simple "802857662698291200000"))
-   (list 'frac 
-         43867 
+   (list 'frac
+         43867
          (math-read-number-simple "5109094217170944000"))
-   (list 'frac 
-         -3617 
+   (list 'frac
+         -3617
          (math-read-number-simple "10670622842880000"))
-   (list 'frac 
-         1 
+   (list 'frac
+         1
          (math-read-number-simple "74724249600"))
-   (list 'frac 
-         -691 
+   (list 'frac
+         -691
          (math-read-number-simple "1307674368000"))
-   (list 'frac 
-         1 
+   (list 'frac
+         1
          (math-read-number-simple "47900160"))
-   (list 'frac 
-         -1 
+   (list 'frac
+         -1
          (math-read-number-simple "1209600"))
-   (list 'frac 
-         1 
-         30240) 
-   (list 'frac 
-         -1 
+   (list 'frac
+         1
+         30240)
+   (list 'frac
+         -1
          720)
-   (list 'frac 
-         1 
-         12) 
+   (list 'frac
+         1
+         12)
    1 ))
 
-(defvar math-bernoulli-B-cache 
+(defvar math-bernoulli-B-cache
   '((frac -174611 330) (frac 43867 798)
     (frac -3617 510) (frac 7 6) (frac -691 2730)
     (frac 5 66) (frac -1 30) (frac 1 42)
diff --git a/lisp/calc/calc-graph.el b/lisp/calc/calc-graph.el
index bc05ffe..c0598e6 100644
--- a/lisp/calc/calc-graph.el
+++ b/lisp/calc/calc-graph.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calc/calc-help.el b/lisp/calc/calc-help.el
index 356e571..3f95799 100644
--- a/lisp/calc/calc-help.el
+++ b/lisp/calc/calc-help.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calc/calc-incom.el b/lisp/calc/calc-incom.el
index 59b5915..1ff50e2 100644
--- a/lisp/calc/calc-incom.el
+++ b/lisp/calc/calc-incom.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calc/calc-keypd.el b/lisp/calc/calc-keypd.el
index dc49f28..cc3bfcf 100644
--- a/lisp/calc/calc-keypd.el
+++ b/lisp/calc/calc-keypd.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calc/calc-lang.el b/lisp/calc/calc-lang.el
index ce1ddb5..50a7eec 100644
--- a/lisp/calc/calc-lang.el
+++ b/lisp/calc/calc-lang.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calc/calc-macs.el b/lisp/calc/calc-macs.el
index b2cd580..394c2e2 100644
--- a/lisp/calc/calc-macs.el
+++ b/lisp/calc/calc-macs.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calc/calc-map.el b/lisp/calc/calc-map.el
index 76a58f4..6f60d2e 100644
--- a/lisp/calc/calc-map.el
+++ b/lisp/calc/calc-map.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -795,8 +795,8 @@
 
 ;;; Do substitutions in parallel to avoid crosstalk.
 
-;; The variables math-ms-temp and math-ms-args are local to 
-;; math-multi-subst, but are used by math-multi-subst-rec, which 
+;; The variables math-ms-temp and math-ms-args are local to
+;; math-multi-subst, but are used by math-multi-subst-rec, which
 ;; is called by math-multi-subst.
 (defvar math-ms-temp)
 (defvar math-ms-args)
@@ -811,7 +811,7 @@
     (math-multi-subst-rec expr)))
 
 (defun math-multi-subst-rec (expr)
-  (cond ((setq math-ms-temp (assoc expr math-ms-args)) 
+  (cond ((setq math-ms-temp (assoc expr math-ms-args))
          (cdr math-ms-temp))
        ((Math-primp expr) expr)
        ((and (eq (car expr) 'calcFunc-lambda) (> (length expr) 2))
@@ -820,7 +820,7 @@
           (while (cdr (setq expr (cdr expr)))
             (setq new (cons (car expr) new))
             (if (assoc (car expr) math-ms-args)
-                (setq math-ms-args (cons (cons (car expr) (car expr)) 
+                (setq math-ms-args (cons (cons (car expr) (car expr))
                                           math-ms-args))))
           (nreverse (cons (math-multi-subst-rec (car expr)) new))))
        (t
diff --git a/lisp/calc/calc-math.el b/lisp/calc/calc-math.el
index 2590761..6d51536 100644
--- a/lisp/calc/calc-math.el
+++ b/lisp/calc/calc-math.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -44,15 +44,15 @@
     (1- n))
   "The number of digits in an Emacs float.")
 
-;;; Find the largest power of 10 which is an Emacs float, 
-;;; then back off by one so that any float d.dddd...eN 
+;;; Find the largest power of 10 which is an Emacs float,
+;;; then back off by one so that any float d.dddd...eN
 ;;; is an Emacs float, for acceptable d.dddd....
 
 (defvar math-largest-emacs-expt
   (let ((x 1)
         (pow 1e2))
-    ;; The following loop is for efficiency; it should stop when 
-    ;; 10^(2x) is too large.  This could be indicated by a range 
+    ;; The following loop is for efficiency; it should stop when
+    ;; 10^(2x) is too large.  This could be indicated by a range
     ;; error when computing 10^(2x) or an infinite value for 10^(2x).
     (while (and
             pow
@@ -102,9 +102,9 @@ If this can't be done, return NIL."
           (condition-case nil
               (math-read-number
                (number-to-string
-                (funcall fn 
-                        (string-to-number 
-                         (let 
+                (funcall fn
+                        (string-to-number
+                         (let
                               ((calc-number-radix 10)
                                (calc-twos-complement-mode nil)
                                (calc-float-format (list 'float 
calc-internal-prec))
@@ -948,7 +948,7 @@ If this can't be done, return NIL."
                                     (math-mul xs (car sc))
                                     (math-sqr (cdr sc)))))))
            (math-make-sdev (calcFunc-sec (nth 1 x))
-                           (math-div 
+                           (math-div
                             (math-mul (nth 2 x)
                                       (calcFunc-sin (nth 1 x)))
                             (math-sqr (calcFunc-cos (nth 1 x)))))))
@@ -1010,7 +1010,7 @@ If this can't be done, return NIL."
                                     (math-mul xs (cdr sc))
                                     (math-sqr (car sc)))))))
            (math-make-sdev (calcFunc-csc (nth 1 x))
-                           (math-div 
+                           (math-div
                             (math-mul (nth 2 x)
                                       (calcFunc-cos (nth 1 x)))
                             (math-sqr (calcFunc-sin (nth 1 x)))))))
@@ -1114,7 +1114,7 @@ If this can't be done, return NIL."
                 (sh (math-mul-float (math-sub-float expx expmx) '(float 5 -1)))
                 (ch (math-mul-float (math-add-float expx expmx) '(float 5 -1)))
                (sc (math-sin-cos-raw (nth 1 x)))
-               (d (math-add-float 
+               (d (math-add-float
                     (math-mul-float (math-sqr (car sc))
                                     (math-sqr sh))
                     (math-mul-float (math-sqr (cdr sc))
@@ -1139,7 +1139,7 @@ If this can't be done, return NIL."
                 (sh (math-mul-float (math-sub-float expx expmx) '(float 5 -1)))
                 (ch (math-mul-float (math-add-float expx expmx) '(float 5 -1)))
                (sc (math-sin-cos-raw (nth 1 x)))
-               (d (math-add-float 
+               (d (math-add-float
                     (math-mul-float (math-sqr (car sc))
                                     (math-sqr ch))
                     (math-mul-float (math-sqr (cdr sc))
@@ -1164,17 +1164,17 @@ If this can't be done, return NIL."
                 (sh (math-mul-float (math-sub-float expx expmx) '(float 5 -1)))
                 (ch (math-mul-float (math-add-float expx expmx) '(float 5 -1)))
                (sc (math-sin-cos-raw (nth 1 x)))
-               (d (math-add-float 
+               (d (math-add-float
                     (math-sqr (car sc))
                     (math-sqr sh))))
           (and (not (eq (nth 1 d) 0))
                (list 'cplx
-                     (math-div-float 
+                     (math-div-float
                        (math-mul-float (car sc) (cdr sc))
                        d)
                       (math-neg
-                       (math-div-float 
-                        (math-mul-float sh ch) 
+                       (math-div-float
+                        (math-mul-float sh ch)
                         d))))))
        ((eq (car x) 'polar)
         (math-polar (math-cot-raw (math-complex x))))
@@ -1223,7 +1223,7 @@ If this can't be done, return NIL."
           (math-cos-raw-2 xmpo2 orgx))
          ((math-lessp-float x (math-neg (math-pi-over-4)))
           (math-neg (math-cos-raw-2 (math-add (math-pi-over-2) x) orgx)))
-         ((math-with-extra-prec -1 (math-nearly-zerop-float x orgx)) 
+         ((math-with-extra-prec -1 (math-nearly-zerop-float x orgx))
            '(float 0 0))
           ((math-use-emacs-fn 'sin x))
          (calc-symbolic-mode (signal 'inexact-result nil))
@@ -1765,7 +1765,7 @@ If this can't be done, return NIL."
         '(float 0 0))
        (calc-symbolic-mode (signal 'inexact-result nil))
        ((math-posp (nth 1 x))    ; positive and real
-         (cond 
+         (cond
           ((math-use-emacs-fn 'log x))
           (t
            (let ((xdigs (1- (math-numdigs (nth 1 x)))))
@@ -1818,7 +1818,7 @@ If this can't be done, return NIL."
 (defconst math-approx-ln-10
   (math-read-number-simple "2.302585092994045684018")
   "An approximation for ln(10).")
-     
+
 (math-defcache math-ln-10 math-approx-ln-10
   (math-ln-raw-2 '(float 1 1)))
 
@@ -1963,7 +1963,7 @@ If this can't be done, return NIL."
             (math-div '(float 2 0) (math-add expx (math-div -1 expx))))))
        ((eq (car-safe x) 'sdev)
         (math-make-sdev (calcFunc-csch (nth 1 x))
-                        (math-mul (nth 2 x) 
+                        (math-mul (nth 2 x)
                                    (math-mul (calcFunc-csch (nth 1 x))
                                              (calcFunc-coth (nth 1 x))))))
        ((eq (car x) 'intv)
diff --git a/lisp/calc/calc-menu.el b/lisp/calc/calc-menu.el
index e0305e3..546e650 100644
--- a/lisp/calc/calc-menu.el
+++ b/lisp/calc/calc-menu.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calc/calc-misc.el b/lisp/calc/calc-misc.el
index e6af092..a3e41ca 100644
--- a/lisp/calc/calc-misc.el
+++ b/lisp/calc/calc-misc.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calc/calc-mode.el b/lisp/calc/calc-mode.el
index 3b37881..4a87281 100644
--- a/lisp/calc/calc-mode.el
+++ b/lisp/calc/calc-mode.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calc/calc-mtx.el b/lisp/calc/calc-mtx.el
index dc97c45..77769e4 100644
--- a/lisp/calc/calc-mtx.el
+++ b/lisp/calc/calc-mtx.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calc/calc-nlfit.el b/lisp/calc/calc-nlfit.el
index 684d0f1..b3335bb 100644
--- a/lisp/calc/calc-nlfit.el
+++ b/lisp/calc/calc-nlfit.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calc/calc-poly.el b/lisp/calc/calc-poly.el
index a362130..b2f69bc 100644
--- a/lisp/calc/calc-poly.el
+++ b/lisp/calc/calc-poly.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calc/calc-prog.el b/lisp/calc/calc-prog.el
index 6e9322f..610e4dc 100644
--- a/lisp/calc/calc-prog.el
+++ b/lisp/calc/calc-prog.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calc/calc-rewr.el b/lisp/calc/calc-rewr.el
index e50f8e1..4f0d71a 100644
--- a/lisp/calc/calc-rewr.el
+++ b/lisp/calc/calc-rewr.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -30,7 +30,7 @@
 
 (defvar math-rewrite-default-iters 100)
 
-;; The variable calc-rewr-sel is local to calc-rewrite-selection and 
+;; The variable calc-rewr-sel is local to calc-rewrite-selection and
 ;; calc-rewrite, but is used by calc-locate-selection-marker.
 (defvar calc-rewr-sel)
 
@@ -219,7 +219,7 @@
                 (not (equal math-rewrite-whole-expr save-expr))))
       (if (symbolp (car sched))
          (progn
-           (setq math-rewrite-whole-expr 
+           (setq math-rewrite-whole-expr
                   (math-normalize (list (car sched) math-rewrite-whole-expr)))
            (if trace-buffer
                (let ((fmt (math-format-stack-value
@@ -490,13 +490,13 @@
 
 ;; The variable math-import-list is local to part of math-compile-rewrites,
 ;; but is also used in a different part, and so the local version could
-;; be affected by the non-local version when math-compile-rewrites calls 
itself. 
+;; be affected by the non-local version when math-compile-rewrites calls 
itself.
 (defvar math-import-list nil)
 
-;; The variables math-regs, math-num-regs, math-prog-last, math-bound-vars, 
+;; The variables math-regs, math-num-regs, math-prog-last, math-bound-vars,
 ;; math-conds, math-copy-neg, math-rhs, math-pattern, math-remembering and
-;; math-aliased-vars are local to math-compile-rewrites, 
-;; but are used by many functions math-rwcomp-*, which are called by 
+;; math-aliased-vars are local to math-compile-rewrites,
+;; but are used by many functions math-rwcomp-*, which are called by
 ;; math-compile-rewrites.
 (defvar math-regs)
 (defvar math-num-regs)
@@ -753,8 +753,8 @@
     (list expr)))
 
 ;; The variables math-rewrite-heads-heads (i.e.; heads for math-rewrite-heads)
-;; math-rewrite-heads-blanks and math-rewrite-heads-skips are local to 
-;; math-rewrite-heads, but used by math-rewrite-heads-rec, which is called by 
+;; math-rewrite-heads-blanks and math-rewrite-heads-skips are local to
+;; math-rewrite-heads, but used by math-rewrite-heads-rec, which is called by
 ;; math-rewrite-heads.
 (defvar math-rewrite-heads-heads)
 (defvar math-rewrite-heads-skips)
@@ -844,7 +844,7 @@
   (cond ((equal expr math-rwcomp-subst-old) math-rwcomp-subst-new)
        ((Math-primp expr) expr)
        (t (if (eq (car expr) math-rwcomp-subst-old-func)
-              (math-build-call math-rwcomp-subst-new-func 
+              (math-build-call math-rwcomp-subst-new-func
                                 (mapcar 'math-rwcomp-subst-rec
                                         (cdr expr)))
             (cons (car expr)
@@ -1489,12 +1489,12 @@
                 (progn (terpri) (princ (car pc))
                        (if (and (natnump (nth 1 (car pc)))
                                 (< (nth 1 (car pc)) (length 
math-apply-rw-regs)))
-                           (princ 
+                           (princ
                              (format "\n  part = %s"
                                      (aref math-apply-rw-regs (nth 1 (car 
pc))))))))
 
            (cond ((eq (setq op (car (setq inst (car pc)))) 'func)
-                  (if (and (consp 
+                  (if (and (consp
                              (setq part (aref math-apply-rw-regs (car (cdr 
inst)))))
                            (eq (car part)
                                (car (setq inst (cdr (cdr inst)))))
@@ -1533,7 +1533,7 @@
                   (aset mark 2 0))
 
                  ((eq op 'try)
-                  (if (and (consp (setq part 
+                  (if (and (consp (setq part
                                          (aref math-apply-rw-regs (car (cdr 
inst)))))
                            (memq (car part) (nth 2 inst))
                            (= (length part) 3)
@@ -1658,7 +1658,7 @@
                         op (aref mark 2))
                   (cond ((eq op 0)
                          (if (setq op (cdr (aref mark 1)))
-                             (aset math-apply-rw-regs (nth 4 inst) 
+                             (aset math-apply-rw-regs (nth 4 inst)
                                     (car (aset mark 1 op)))
                            (if (nth 5 inst)
                                (progn
@@ -1668,7 +1668,7 @@
                              (math-rwfail t))))
                         ((eq op 1)
                          (if (setq op (cdr (aref mark 1)))
-                             (aset math-apply-rw-regs (nth 4 inst) 
+                             (aset math-apply-rw-regs (nth 4 inst)
                                     (car (aset mark 1 op)))
                            (if (= (aref mark 3) 1)
                                (if (nth 5 inst)
@@ -1725,7 +1725,7 @@
                         (t (math-rwfail t))))
 
                  ((eq op 'integer)
-                  (if (Math-integerp (setq part 
+                  (if (Math-integerp (setq part
                                             (aref math-apply-rw-regs (nth 1 
inst))))
                       (setq pc (cdr pc))
                     (if (Math-primp part)
@@ -1756,7 +1756,7 @@
                         (math-rwfail)))))
 
                  ((eq op 'negative)
-                  (if (math-looks-negp (setq part 
+                  (if (math-looks-negp (setq part
                                               (aref math-apply-rw-regs (nth 1 
inst))))
                       (setq pc (cdr pc))
                     (if (Math-primp part)
@@ -1774,7 +1774,7 @@
                       (setq part (math-rweval
                                   (math-simplify
                                    (calcFunc-sign
-                                    (math-sub 
+                                    (math-sub
                                       (aref math-apply-rw-regs (nth 1 inst))
                                       (aref math-apply-rw-regs (nth 3 
inst))))))))
                   (if (cond ((eq op 'calcFunc-eq)
@@ -1793,7 +1793,7 @@
                     (math-rwfail)))
 
                  ((eq op 'func-def)
-                  (if (and 
+                  (if (and
                         (consp (setq part (aref math-apply-rw-regs (car (cdr 
inst)))))
                         (eq (car part)
                             (car (setq inst (cdr (cdr inst))))))
@@ -1815,8 +1815,8 @@
                     (math-rwfail)))
 
                  ((eq op 'func-opt)
-                  (if (or (not 
-                            (and 
+                  (if (or (not
+                            (and
                              (consp
                               (setq part (aref math-apply-rw-regs (car (cdr 
inst)))))
                              (eq (car part) (nth 2 inst))))
@@ -1833,7 +1833,7 @@
                     (setq pc (cdr pc))))
 
                  ((eq op 'mod)
-                  (if (if (Math-zerop 
+                  (if (if (Math-zerop
                             (setq part (aref math-apply-rw-regs (nth 1 inst))))
                           (Math-zerop (nth 3 inst))
                         (and (not (Math-zerop (nth 2 inst)))
@@ -1847,7 +1847,7 @@
                     (math-rwfail)))
 
                  ((eq op 'apply)
-                  (if (and (consp 
+                  (if (and (consp
                              (setq part (aref math-apply-rw-regs (car (cdr 
inst)))))
                            (not (Math-objvecp part))
                            (not (eq (car part) 'var)))
@@ -1860,19 +1860,19 @@
                     (math-rwfail)))
 
                  ((eq op 'cons)
-                  (if (and (consp 
+                  (if (and (consp
                              (setq part (aref math-apply-rw-regs (car (cdr 
inst)))))
                            (eq (car part) 'vec)
                            (cdr part))
                       (progn
                         (aset math-apply-rw-regs (nth 2 inst) (nth 1 part))
-                        (aset math-apply-rw-regs (nth 3 inst) 
+                        (aset math-apply-rw-regs (nth 3 inst)
                                (cons 'vec (cdr (cdr part))))
                         (setq pc (cdr pc)))
                     (math-rwfail)))
 
                  ((eq op 'rcons)
-                  (if (and (consp 
+                  (if (and (consp
                              (setq part (aref math-apply-rw-regs (car (cdr 
inst)))))
                            (eq (car part) 'vec)
                            (cdr part))
@@ -1898,7 +1898,7 @@
                   (setq pc (cdr pc)))
 
                  ((eq op 'copy)
-                  (aset math-apply-rw-regs (nth 2 inst) 
+                  (aset math-apply-rw-regs (nth 2 inst)
                          (aref math-apply-rw-regs (nth 1 inst)))
                   (setq pc (cdr pc)))
 
diff --git a/lisp/calc/calc-rules.el b/lisp/calc/calc-rules.el
index bcace46..b29e5bf 100644
--- a/lisp/calc/calc-rules.el
+++ b/lisp/calc/calc-rules.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calc/calc-sel.el b/lisp/calc/calc-sel.el
index d7f87f4..a363469 100644
--- a/lisp/calc/calc-sel.el
+++ b/lisp/calc/calc-sel.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -140,8 +140,8 @@
         (calc-change-current-selection sel)
        (error "%d is not a valid sub-formula index" num)))))
 
-;; The variables calc-fnp-op and calc-fnp-num are local to 
-;; calc-find-nth-part (and calc-select-previous) but used by 
+;; The variables calc-fnp-op and calc-fnp-num are local to
+;; calc-find-nth-part (and calc-select-previous) but used by
 ;; calc-find-nth-part-rec, which is called by them.
 (defvar calc-fnp-op)
 (defvar calc-fnp-num)
@@ -650,7 +650,7 @@
          alg)
      (let ((calc-dollar-values (list sel))
           (calc-dollar-used 0))
-       (setq alg (calc-do-alg-entry "" "Replace selection with: " nil 
+       (setq alg (calc-do-alg-entry "" "Replace selection with: " nil
                                     'calc-selection-history))
        (and alg
            (progn
diff --git a/lisp/calc/calc-stat.el b/lisp/calc/calc-stat.el
index 2b79712..d70d4cd 100644
--- a/lisp/calc/calc-stat.el
+++ b/lisp/calc/calc-stat.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calc/calc-store.el b/lisp/calc/calc-store.el
index 67931a7..16d35f2 100644
--- a/lisp/calc/calc-store.el
+++ b/lisp/calc/calc-store.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calc/calc-stuff.el b/lisp/calc/calc-stuff.el
index 48e3a34..afdeac1 100644
--- a/lisp/calc/calc-stuff.el
+++ b/lisp/calc/calc-stuff.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calc/calc-trail.el b/lisp/calc/calc-trail.el
index a9e2943..9f94967 100644
--- a/lisp/calc/calc-trail.el
+++ b/lisp/calc/calc-trail.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calc/calc-undo.el b/lisp/calc/calc-undo.el
index 06181f8..17e1633 100644
--- a/lisp/calc/calc-undo.el
+++ b/lisp/calc/calc-undo.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -75,7 +75,7 @@
           (let ((v (intern (nth 1 action))))
             (calc-record-undo (list 'store (nth 1 action)
                                     (and (boundp v) (symbol-value v))))
-            (if (y-or-n-p (format "Un-store variable %s? " 
+            (if (y-or-n-p (format "Un-store variable %s? "
                                    (calc-var-name (nth 1 action))))
                 (progn
                   (if (nth 2 action)
diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el
index a8074ea..b7b43ac 100644
--- a/lisp/calc/calc-units.el
+++ b/lisp/calc/calc-units.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calc/calc-vec.el b/lisp/calc/calc-vec.el
index 0ce0d42..c049933 100644
--- a/lisp/calc/calc-vec.el
+++ b/lisp/calc/calc-vec.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calc/calc-yank.el b/lisp/calc/calc-yank.el
index e97d878..fec2512 100644
--- a/lisp/calc/calc-yank.el
+++ b/lisp/calc/calc-yank.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index 6a9af44..d9e8cff 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calc/calcalg2.el b/lisp/calc/calcalg2.el
index bb4c30e..53e0257 100644
--- a/lisp/calc/calcalg2.el
+++ b/lisp/calc/calcalg2.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calc/calcalg3.el b/lisp/calc/calcalg3.el
index dc6ac93..11e6342 100644
--- a/lisp/calc/calcalg3.el
+++ b/lisp/calc/calcalg3.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -120,7 +120,7 @@
 (defvar calc-curve-fit-history nil
   "History for calc-curve-fit.")
 
-(defun calc-curve-fit (arg &optional calc-curve-model 
+(defun calc-curve-fit (arg &optional calc-curve-model
                            calc-curve-coefnames calc-curve-varnames)
   (interactive "P")
   (calc-slow-wrapper
@@ -148,7 +148,7 @@
                   "P prefix = plot result"
                  "' = alg entry, $ = stack, u = Model1, U = Model2")))
      (while (not calc-curve-model)
-       (message 
+       (message
         "Fit to model: %s:%s%s"
         (nth which msgs)
         (if plot "P" " ")
@@ -194,27 +194,27 @@
                      calc-curve-varnames nil)
                nil))
             ((= key ?1)  ; linear or multilinear
-             (calc-get-fit-variables calc-curve-nvars 
+             (calc-get-fit-variables calc-curve-nvars
                                       (1+ calc-curve-nvars) (and homog 0))
-             (setq calc-curve-model 
+             (setq calc-curve-model
                     (math-mul calc-curve-coefnames
                               (cons 'vec (cons 1 (cdr calc-curve-varnames))))))
             ((and (>= key ?2) (<= key ?9))   ; polynomial
              (calc-get-fit-variables 1 (- key ?0 -1) (and homog 0))
-             (setq calc-curve-model 
+             (setq calc-curve-model
                     (math-build-polynomial-expr (cdr calc-curve-coefnames)
                                                 (nth 1 calc-curve-varnames))))
             ((= key ?i)  ; exact polynomial
              (calc-get-fit-variables 1 (1- (length (nth 1 data)))
                                      (and homog 0))
-             (setq calc-curve-model 
+             (setq calc-curve-model
                     (math-build-polynomial-expr (cdr calc-curve-coefnames)
                                                 (nth 1 calc-curve-varnames))))
             ((= key ?p)  ; power law
-             (calc-get-fit-variables calc-curve-nvars 
+             (calc-get-fit-variables calc-curve-nvars
                                       (1+ calc-curve-nvars) (and homog 1))
-             (setq calc-curve-model 
-                    (math-mul 
+             (setq calc-curve-model
+                    (math-mul
                      (nth 1 calc-curve-coefnames)
                      (calcFunc-reduce
                       '(var mul var-mul)
@@ -223,9 +223,9 @@
                        calc-curve-varnames
                        (cons 'vec (cdr (cdr calc-curve-coefnames))))))))
             ((= key ?^)  ; exponential law
-             (calc-get-fit-variables calc-curve-nvars 
+             (calc-get-fit-variables calc-curve-nvars
                                       (1+ calc-curve-nvars) (and homog 1))
-             (setq calc-curve-model 
+             (setq calc-curve-model
                     (math-mul (nth 1 calc-curve-coefnames)
                               (calcFunc-reduce
                                '(var mul var-mul)
@@ -258,9 +258,9 @@
                                                (cdr (nth 1 plot)))))))
               (calc-fit-hubbert-linear-curve func))
             ((memq key '(?e ?E))
-             (calc-get-fit-variables calc-curve-nvars 
+             (calc-get-fit-variables calc-curve-nvars
                                       (1+ calc-curve-nvars) (and homog 1))
-             (setq calc-curve-model 
+             (setq calc-curve-model
                     (math-mul (nth 1 calc-curve-coefnames)
                               (calcFunc-reduce
                                '(var mul var-mul)
@@ -275,18 +275,18 @@
                                  (cons 'vec (cdr (cdr calc-curve-coefnames)))
                                  calc-curve-varnames))))))
             ((memq key '(?x ?X))
-             (calc-get-fit-variables calc-curve-nvars 
+             (calc-get-fit-variables calc-curve-nvars
                                       (1+ calc-curve-nvars) (and homog 0))
-             (setq calc-curve-model 
+             (setq calc-curve-model
                     (math-mul calc-curve-coefnames
                               (cons 'vec (cons 1 (cdr calc-curve-varnames)))))
              (setq calc-curve-model (if (eq key ?x)
                              (list 'calcFunc-exp calc-curve-model)
                            (list '^ 10 calc-curve-model))))
             ((memq key '(?l ?L))
-             (calc-get-fit-variables calc-curve-nvars 
+             (calc-get-fit-variables calc-curve-nvars
                                       (1+ calc-curve-nvars) (and homog 0))
-             (setq calc-curve-model 
+             (setq calc-curve-model
                     (math-mul calc-curve-coefnames
                               (cons 'vec
                                     (cons 1 (cdr (calcFunc-map
@@ -296,7 +296,7 @@
                                                           var-log10))
                                                   calc-curve-varnames)))))))
             ((= key ?q)
-             (calc-get-fit-variables calc-curve-nvars 
+             (calc-get-fit-variables calc-curve-nvars
                                       (1+ (* 2 calc-curve-nvars)) (and homog 
0))
              (let ((c calc-curve-coefnames)
                    (v calc-curve-varnames))
@@ -310,15 +310,15 @@
                                           (list '- (car v) (nth 1 c))
                                           2)))))))
             ((= key ?g)
-             (setq 
-               calc-curve-model 
-               (math-read-expr 
+             (setq
+               calc-curve-model
+               (math-read-expr
                 "(AFit / BFit sqrt(2 pi)) exp(-0.5 * ((XFit - CFit) / 
BFit)^2)")
                calc-curve-varnames '(vec (var XFit var-XFit))
                calc-curve-coefnames '(vec (var AFit var-AFit)
                                           (var BFit var-BFit)
                                           (var CFit var-CFit)))
-             (calc-get-fit-variables 1 (1- (length calc-curve-coefnames)) 
+             (calc-get-fit-variables 1 (1- (length calc-curve-coefnames))
                                       (and homog 1)))
             ((memq key '(?\$ ?\' ?u ?U))
              (let* ((defvars nil)
@@ -327,7 +327,7 @@
                    (let* ((calc-dollar-values calc-arg-values)
                           (calc-dollar-used 0)
                           (calc-hashes-used 0))
-                     (setq calc-curve-model 
+                     (setq calc-curve-model
                             (calc-do-alg-entry "" "Model formula: "
                                                nil 'calc-curve-fit-history))
                      (if (/= (length calc-curve-model) 1)
@@ -358,19 +358,19 @@
                                 (or (null (nth 3 calc-curve-model))
                                     (math-vectorp (nth 3 calc-curve-model))))
                            (setq calc-curve-varnames (nth 2 calc-curve-model)
-                                 calc-curve-coefnames 
+                                 calc-curve-coefnames
                                   (or (nth 3 calc-curve-model)
                                       (cons 'vec
                                             (math-all-vars-but
-                                             calc-curve-model 
+                                             calc-curve-model
                                              calc-curve-varnames)))
                                  calc-curve-model (nth 1 calc-curve-model))
                          (error "Incorrect model specifier")))))
                (or calc-curve-varnames
-                   (let ((with-y 
+                   (let ((with-y
                            (eq (car-safe calc-curve-model) 'calcFunc-eq)))
                      (if calc-curve-coefnames
-                         (calc-get-fit-variables 
+                         (calc-get-fit-variables
                            (if with-y (1+ calc-curve-nvars) calc-curve-nvars)
                            (1- (length calc-curve-coefnames))
                            (math-all-vars-but
@@ -378,9 +378,9 @@
                            nil with-y)
                        (let* ((coefs (math-all-vars-but calc-curve-model nil))
                               (vars nil)
-                              (n (- 
-                                   (length coefs) 
-                                   calc-curve-nvars 
+                              (n (-
+                                   (length coefs)
+                                   calc-curve-nvars
                                    (if with-y 2 1)))
                               p)
                          (if (< n 0)
@@ -388,12 +388,12 @@
                          (setq p (nthcdr n coefs))
                          (setq vars (cdr p))
                          (setcdr p nil)
-                         (calc-get-fit-variables 
+                         (calc-get-fit-variables
                            (if with-y (1+ calc-curve-nvars) calc-curve-nvars)
                            (length coefs)
                            vars coefs with-y)))))
                (if record-entry
-                   (calc-record (list 'vec calc-curve-model 
+                   (calc-record (list 'vec calc-curve-model
                                        calc-curve-varnames 
calc-curve-coefnames)
                                 "modl"))))
             (t (beep))))
@@ -422,7 +422,7 @@
           (calc-graph-set-styles nil nil)
           (calc-graph-point-style nil))
         (setq plot (cdr (nth 1 plot)))
-        (setq plot 
+        (setq plot
               (list 'intv
                     3
                     (math-sub
@@ -1446,7 +1446,7 @@
 ;;; Open Romberg method; "qromo" in section 4.4.
 
 ;; The variable math-ninteg-temp is local to math-ninteg-romberg,
-;; but is used by math-ninteg-midpoint, which is used by 
+;; but is used by math-ninteg-midpoint, which is used by
 ;; math-ninteg-romberg.
 (defvar math-ninteg-temp)
 
@@ -1564,7 +1564,7 @@
 
 ;; The variables math-fit-first-var, math-fit-first-coef and
 ;; math-fit-new-coefs are local to math-general-fit, but are used by
-;; calcFunc-fitvar, calcFunc-fitparam and calcFunc-fitdummy 
+;; calcFunc-fitvar, calcFunc-fitparam and calcFunc-fitdummy
 ;; (respectively), which are used by math-general-fit.
 (defvar math-fit-first-var)
 (defvar math-fit-first-coef)
@@ -1903,7 +1903,7 @@
          (function (lambda (x y) (string< (nth 1 x) (nth 1 y)))))))
 
 ;; The variables math-all-vars-vars (the vars for math-all-vars) and
-;; math-all-vars-found are local to math-all-vars-in, but are used by 
+;; math-all-vars-found are local to math-all-vars-in, but are used by
 ;; math-all-vars-rec which is called by math-all-vars-in.
 (defvar math-all-vars-vars)
 (defvar math-all-vars-found)
diff --git a/lisp/calc/calccomp.el b/lisp/calc/calccomp.el
index 7c8013a..fe0a882 100644
--- a/lisp/calc/calccomp.el
+++ b/lisp/calc/calccomp.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calc/calcsel2.el b/lisp/calc/calcsel2.el
index 73497f0..2299cd3 100644
--- a/lisp/calc/calcsel2.el
+++ b/lisp/calc/calcsel2.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calculator.el b/lisp/calculator.el
index 5366a9b..e5488b8a 100644
--- a/lisp/calculator.el
+++ b/lisp/calculator.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;;=====================================================================
 ;;; Commentary:
diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el
index 08f1bf4..2fc5040 100644
--- a/lisp/calendar/appt.el
+++ b/lisp/calendar/appt.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calendar/cal-bahai.el b/lisp/calendar/cal-bahai.el
index 6e62454..e0b7f4a 100644
--- a/lisp/calendar/cal-bahai.el
+++ b/lisp/calendar/cal-bahai.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calendar/cal-china.el b/lisp/calendar/cal-china.el
index 72e7675..5761e57 100644
--- a/lisp/calendar/cal-china.el
+++ b/lisp/calendar/cal-china.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calendar/cal-coptic.el b/lisp/calendar/cal-coptic.el
index 920ec7d..bff0ade 100644
--- a/lisp/calendar/cal-coptic.el
+++ b/lisp/calendar/cal-coptic.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calendar/cal-dst.el b/lisp/calendar/cal-dst.el
index be709f5..659b634 100644
--- a/lisp/calendar/cal-dst.el
+++ b/lisp/calendar/cal-dst.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -406,7 +406,7 @@ This function respects the value of 
`calendar-dst-check-each-year-flag'."
                       (cadr (calendar-dst-find-startend year))
                     (nth 4 calendar-current-time-zone-cache))))
         (if expr (eval expr)))
-      ;; New US rules commencing 2007.  ftp://elsie.nci.nih.gov/pub/.
+      ;; New US rules commencing 2007.  https://www.iana.org/time-zones
       (and (not (zerop calendar-daylight-time-offset))
            (calendar-nth-named-day 2 0 3 year))))
 
@@ -417,7 +417,7 @@ This function respects the value of 
`calendar-dst-check-each-year-flag'."
                       (nth 2 (calendar-dst-find-startend year))
                     (nth 5 calendar-current-time-zone-cache))))
         (if expr (eval expr)))
-      ;; New US rules commencing 2007.  ftp://elsie.nci.nih.gov/pub/.
+      ;; New US rules commencing 2007.  https://www.iana.org/time-zones
       (and (not (zerop calendar-daylight-time-offset))
            (calendar-nth-named-day 1 0 11 year))))
 
diff --git a/lisp/calendar/cal-french.el b/lisp/calendar/cal-french.el
index 3ecd90a..ede3821 100644
--- a/lisp/calendar/cal-french.el
+++ b/lisp/calendar/cal-french.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calendar/cal-hebrew.el b/lisp/calendar/cal-hebrew.el
index 15de7cd..ba18b92 100644
--- a/lisp/calendar/cal-hebrew.el
+++ b/lisp/calendar/cal-hebrew.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calendar/cal-html.el b/lisp/calendar/cal-html.el
index f002133..41463cf 100644
--- a/lisp/calendar/cal-html.el
+++ b/lisp/calendar/cal-html.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calendar/cal-islam.el b/lisp/calendar/cal-islam.el
index c647893..3650db4 100644
--- a/lisp/calendar/cal-islam.el
+++ b/lisp/calendar/cal-islam.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calendar/cal-iso.el b/lisp/calendar/cal-iso.el
index c802c84..427fc22 100644
--- a/lisp/calendar/cal-iso.el
+++ b/lisp/calendar/cal-iso.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calendar/cal-julian.el b/lisp/calendar/cal-julian.el
index 40887b4..2ad3017 100644
--- a/lisp/calendar/cal-julian.el
+++ b/lisp/calendar/cal-julian.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calendar/cal-mayan.el b/lisp/calendar/cal-mayan.el
index 2363cf5..8f3a4a4 100644
--- a/lisp/calendar/cal-mayan.el
+++ b/lisp/calendar/cal-mayan.el
@@ -23,7 +23,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calendar/cal-menu.el b/lisp/calendar/cal-menu.el
index 1039b49..90cce28 100644
--- a/lisp/calendar/cal-menu.el
+++ b/lisp/calendar/cal-menu.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calendar/cal-move.el b/lisp/calendar/cal-move.el
index a845348..0ed5dc0 100644
--- a/lisp/calendar/cal-move.el
+++ b/lisp/calendar/cal-move.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calendar/cal-persia.el b/lisp/calendar/cal-persia.el
index 571b397..3365ae7 100644
--- a/lisp/calendar/cal-persia.el
+++ b/lisp/calendar/cal-persia.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calendar/cal-tex.el b/lisp/calendar/cal-tex.el
index 689ba0f..72db03e 100644
--- a/lisp/calendar/cal-tex.el
+++ b/lisp/calendar/cal-tex.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calendar/cal-x.el b/lisp/calendar/cal-x.el
index f7ca369..aca9d1c 100644
--- a/lisp/calendar/cal-x.el
+++ b/lisp/calendar/cal-x.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 1d67493..96ccd94 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index 4ee6719..520c730 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el
index 5b51b16..0a80b79 100644
--- a/lisp/calendar/holidays.el
+++ b/lisp/calendar/holidays.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el
index aa092b2..129cd6d 100644
--- a/lisp/calendar/icalendar.el
+++ b/lisp/calendar/icalendar.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calendar/lunar.el b/lisp/calendar/lunar.el
index 4d39b15..9f7fad9 100644
--- a/lisp/calendar/lunar.el
+++ b/lisp/calendar/lunar.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calendar/parse-time.el b/lisp/calendar/parse-time.el
index b781cb0..dc405b9 100644
--- a/lisp/calendar/parse-time.el
+++ b/lisp/calendar/parse-time.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calendar/solar.el b/lisp/calendar/solar.el
index f5cde3f..5bf0723 100644
--- a/lisp/calendar/solar.el
+++ b/lisp/calendar/solar.el
@@ -23,7 +23,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calendar/time-date.el b/lisp/calendar/time-date.el
index d998623..61722f6 100644
--- a/lisp/calendar/time-date.el
+++ b/lisp/calendar/time-date.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calendar/timeclock.el b/lisp/calendar/timeclock.el
index a4709c3..a70e3ee 100644
--- a/lisp/calendar/timeclock.el
+++ b/lisp/calendar/timeclock.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el
index ba7389c..79fda46 100644
--- a/lisp/calendar/todo-mode.el
+++ b/lisp/calendar/todo-mode.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/case-table.el b/lisp/case-table.el
index 271bb0a..174e3f0 100644
--- a/lisp/case-table.el
+++ b/lisp/case-table.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/cdl.el b/lisp/cdl.el
index 16ba7e7..80ef76a 100644
--- a/lisp/cdl.el
+++ b/lisp/cdl.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/cedet/cedet-cscope.el b/lisp/cedet/cedet-cscope.el
index 913f960..faee7fe 100644
--- a/lisp/cedet/cedet-cscope.el
+++ b/lisp/cedet/cedet-cscope.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/cedet-files.el b/lisp/cedet/cedet-files.el
index 0798e7c..e18e66a 100644
--- a/lisp/cedet/cedet-files.el
+++ b/lisp/cedet/cedet-files.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/cedet-global.el b/lisp/cedet/cedet-global.el
index ee2265b..871fd94 100644
--- a/lisp/cedet/cedet-global.el
+++ b/lisp/cedet/cedet-global.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/cedet-idutils.el b/lisp/cedet/cedet-idutils.el
index dbcce2d..4b6c6b0 100644
--- a/lisp/cedet/cedet-idutils.el
+++ b/lisp/cedet/cedet-idutils.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/cedet.el b/lisp/cedet/cedet.el
index a0b06f2..bedbd98 100644
--- a/lisp/cedet/cedet.el
+++ b/lisp/cedet/cedet.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/cedet/data-debug.el b/lisp/cedet/data-debug.el
index b12e2a3..5325bf5 100644
--- a/lisp/cedet/data-debug.el
+++ b/lisp/cedet/data-debug.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/ede.el b/lisp/cedet/ede.el
index 87d73b2..a78af1b 100644
--- a/lisp/cedet/ede.el
+++ b/lisp/cedet/ede.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/ede/auto.el b/lisp/cedet/ede/auto.el
index 6c0e588..75f2d6b 100644
--- a/lisp/cedet/ede/auto.el
+++ b/lisp/cedet/ede/auto.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/ede/autoconf-edit.el b/lisp/cedet/ede/autoconf-edit.el
index c9783ca..e7481aa 100644
--- a/lisp/cedet/ede/autoconf-edit.el
+++ b/lisp/cedet/ede/autoconf-edit.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/ede/base.el b/lisp/cedet/ede/base.el
index 13d721a..bfb5834 100644
--- a/lisp/cedet/ede/base.el
+++ b/lisp/cedet/ede/base.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/ede/config.el b/lisp/cedet/ede/config.el
index a517ed1..64170fa 100644
--- a/lisp/cedet/ede/config.el
+++ b/lisp/cedet/ede/config.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/ede/cpp-root.el b/lisp/cedet/ede/cpp-root.el
index 319854e..9643578 100644
--- a/lisp/cedet/ede/cpp-root.el
+++ b/lisp/cedet/ede/cpp-root.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/ede/custom.el b/lisp/cedet/ede/custom.el
index 1c4e849..55d4b4a 100644
--- a/lisp/cedet/ede/custom.el
+++ b/lisp/cedet/ede/custom.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/ede/detect.el b/lisp/cedet/ede/detect.el
index 54d48a2..6240d46 100644
--- a/lisp/cedet/ede/detect.el
+++ b/lisp/cedet/ede/detect.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/ede/dired.el b/lisp/cedet/ede/dired.el
index 2555fab..3618818 100644
--- a/lisp/cedet/ede/dired.el
+++ b/lisp/cedet/ede/dired.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/ede/emacs.el b/lisp/cedet/ede/emacs.el
index cac66fa..f3ba4c3 100644
--- a/lisp/cedet/ede/emacs.el
+++ b/lisp/cedet/ede/emacs.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/ede/files.el b/lisp/cedet/ede/files.el
index 889cac8..4ba4ab1 100644
--- a/lisp/cedet/ede/files.el
+++ b/lisp/cedet/ede/files.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/ede/generic.el b/lisp/cedet/ede/generic.el
index f7f98e6..cf91c33 100644
--- a/lisp/cedet/ede/generic.el
+++ b/lisp/cedet/ede/generic.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/ede/linux.el b/lisp/cedet/ede/linux.el
index 22f5c3e..3a183b3 100644
--- a/lisp/cedet/ede/linux.el
+++ b/lisp/cedet/ede/linux.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/ede/locate.el b/lisp/cedet/ede/locate.el
index 845a491..f61ce34 100644
--- a/lisp/cedet/ede/locate.el
+++ b/lisp/cedet/ede/locate.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/ede/make.el b/lisp/cedet/ede/make.el
index 13591f6..8fcaf52 100644
--- a/lisp/cedet/ede/make.el
+++ b/lisp/cedet/ede/make.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/ede/makefile-edit.el b/lisp/cedet/ede/makefile-edit.el
index 90d48fc..e82577f 100644
--- a/lisp/cedet/ede/makefile-edit.el
+++ b/lisp/cedet/ede/makefile-edit.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/ede/pconf.el b/lisp/cedet/ede/pconf.el
index f8d9e0b..8dc7f68 100644
--- a/lisp/cedet/ede/pconf.el
+++ b/lisp/cedet/ede/pconf.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/ede/pmake.el b/lisp/cedet/ede/pmake.el
index 6feb960..c199cae 100644
--- a/lisp/cedet/ede/pmake.el
+++ b/lisp/cedet/ede/pmake.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/ede/proj-archive.el b/lisp/cedet/ede/proj-archive.el
index 460df69..a9f3c70 100644
--- a/lisp/cedet/ede/proj-archive.el
+++ b/lisp/cedet/ede/proj-archive.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/ede/proj-aux.el b/lisp/cedet/ede/proj-aux.el
index 3b60eea..8c5dfa7 100644
--- a/lisp/cedet/ede/proj-aux.el
+++ b/lisp/cedet/ede/proj-aux.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/ede/proj-comp.el b/lisp/cedet/ede/proj-comp.el
index 80950ca..0537946 100644
--- a/lisp/cedet/ede/proj-comp.el
+++ b/lisp/cedet/ede/proj-comp.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/ede/proj-elisp.el b/lisp/cedet/ede/proj-elisp.el
index 9f4e69f..d483115 100644
--- a/lisp/cedet/ede/proj-elisp.el
+++ b/lisp/cedet/ede/proj-elisp.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/ede/proj-info.el b/lisp/cedet/ede/proj-info.el
index d430e08..9ec7392 100644
--- a/lisp/cedet/ede/proj-info.el
+++ b/lisp/cedet/ede/proj-info.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/ede/proj-misc.el b/lisp/cedet/ede/proj-misc.el
index 6d1070a..75e409b 100644
--- a/lisp/cedet/ede/proj-misc.el
+++ b/lisp/cedet/ede/proj-misc.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/ede/proj-obj.el b/lisp/cedet/ede/proj-obj.el
index e7fa773..9fb9412 100644
--- a/lisp/cedet/ede/proj-obj.el
+++ b/lisp/cedet/ede/proj-obj.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/ede/proj-prog.el b/lisp/cedet/ede/proj-prog.el
index 3a14907..2a9ea1a 100644
--- a/lisp/cedet/ede/proj-prog.el
+++ b/lisp/cedet/ede/proj-prog.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/ede/proj-scheme.el b/lisp/cedet/ede/proj-scheme.el
index 5ac2efa..0c6f602 100644
--- a/lisp/cedet/ede/proj-scheme.el
+++ b/lisp/cedet/ede/proj-scheme.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/ede/proj-shared.el b/lisp/cedet/ede/proj-shared.el
index 6c17504..f4c8e7b 100644
--- a/lisp/cedet/ede/proj-shared.el
+++ b/lisp/cedet/ede/proj-shared.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/ede/proj.el b/lisp/cedet/ede/proj.el
index a7f64ac..daedd37 100644
--- a/lisp/cedet/ede/proj.el
+++ b/lisp/cedet/ede/proj.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/ede/project-am.el b/lisp/cedet/ede/project-am.el
index 86b707a..de99b29 100644
--- a/lisp/cedet/ede/project-am.el
+++ b/lisp/cedet/ede/project-am.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/ede/shell.el b/lisp/cedet/ede/shell.el
index 37beea0..dc31840 100644
--- a/lisp/cedet/ede/shell.el
+++ b/lisp/cedet/ede/shell.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/ede/simple.el b/lisp/cedet/ede/simple.el
index d618b93..8f08475 100644
--- a/lisp/cedet/ede/simple.el
+++ b/lisp/cedet/ede/simple.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/ede/source.el b/lisp/cedet/ede/source.el
index d72d0db..b2d7680 100644
--- a/lisp/cedet/ede/source.el
+++ b/lisp/cedet/ede/source.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/cedet/ede/speedbar.el b/lisp/cedet/ede/speedbar.el
index f938f20..4012fda 100644
--- a/lisp/cedet/ede/speedbar.el
+++ b/lisp/cedet/ede/speedbar.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/ede/srecode.el b/lisp/cedet/ede/srecode.el
index 4193684..0658491 100644
--- a/lisp/cedet/ede/srecode.el
+++ b/lisp/cedet/ede/srecode.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/ede/system.el b/lisp/cedet/ede/system.el
index 42172ce..f5ac3e3 100644
--- a/lisp/cedet/ede/system.el
+++ b/lisp/cedet/ede/system.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/ede/util.el b/lisp/cedet/ede/util.el
index eb364d7..5535eff 100644
--- a/lisp/cedet/ede/util.el
+++ b/lisp/cedet/ede/util.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/inversion.el b/lisp/cedet/inversion.el
index ec54276..253336f 100644
--- a/lisp/cedet/inversion.el
+++ b/lisp/cedet/inversion.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/mode-local.el b/lisp/cedet/mode-local.el
index 88ee400..964f5c2 100644
--- a/lisp/cedet/mode-local.el
+++ b/lisp/cedet/mode-local.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/pulse.el b/lisp/cedet/pulse.el
index 913c183..51df5e9 100644
--- a/lisp/cedet/pulse.el
+++ b/lisp/cedet/pulse.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el
index c38afed..682ac89 100644
--- a/lisp/cedet/semantic.el
+++ b/lisp/cedet/semantic.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/analyze.el b/lisp/cedet/semantic/analyze.el
index c7062fb..517e1be 100644
--- a/lisp/cedet/semantic/analyze.el
+++ b/lisp/cedet/semantic/analyze.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/analyze/complete.el 
b/lisp/cedet/semantic/analyze/complete.el
index 1ddbe13..1a45068 100644
--- a/lisp/cedet/semantic/analyze/complete.el
+++ b/lisp/cedet/semantic/analyze/complete.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/analyze/debug.el 
b/lisp/cedet/semantic/analyze/debug.el
index fd218b6..8e68e3b 100644
--- a/lisp/cedet/semantic/analyze/debug.el
+++ b/lisp/cedet/semantic/analyze/debug.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/analyze/fcn.el 
b/lisp/cedet/semantic/analyze/fcn.el
index 1abbca5..29a1ac9 100644
--- a/lisp/cedet/semantic/analyze/fcn.el
+++ b/lisp/cedet/semantic/analyze/fcn.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/analyze/refs.el 
b/lisp/cedet/semantic/analyze/refs.el
index 7fbaa2c..55fcd83 100644
--- a/lisp/cedet/semantic/analyze/refs.el
+++ b/lisp/cedet/semantic/analyze/refs.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/bovine.el b/lisp/cedet/semantic/bovine.el
index 3c33eeb..a3776b8 100644
--- a/lisp/cedet/semantic/bovine.el
+++ b/lisp/cedet/semantic/bovine.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el
index 3200a5c..8dc0488 100644
--- a/lisp/cedet/semantic/bovine/c.el
+++ b/lisp/cedet/semantic/bovine/c.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/bovine/debug.el 
b/lisp/cedet/semantic/bovine/debug.el
index f7bc206..79aa400 100644
--- a/lisp/cedet/semantic/bovine/debug.el
+++ b/lisp/cedet/semantic/bovine/debug.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/bovine/el.el b/lisp/cedet/semantic/bovine/el.el
index ba6b05d..f5931e4 100644
--- a/lisp/cedet/semantic/bovine/el.el
+++ b/lisp/cedet/semantic/bovine/el.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/bovine/gcc.el 
b/lisp/cedet/semantic/bovine/gcc.el
index e4864bc..36f0935 100644
--- a/lisp/cedet/semantic/bovine/gcc.el
+++ b/lisp/cedet/semantic/bovine/gcc.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/bovine/grammar.el 
b/lisp/cedet/semantic/bovine/grammar.el
index d34850f..28af05d 100644
--- a/lisp/cedet/semantic/bovine/grammar.el
+++ b/lisp/cedet/semantic/bovine/grammar.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
@@ -505,7 +505,7 @@ Menu items are appended to the common grammar menu.")
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/bovine/make.el 
b/lisp/cedet/semantic/bovine/make.el
index 2a224bd..691ac0e 100644
--- a/lisp/cedet/semantic/bovine/make.el
+++ b/lisp/cedet/semantic/bovine/make.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/bovine/scm.el 
b/lisp/cedet/semantic/bovine/scm.el
index 2e87993..547ca7a 100644
--- a/lisp/cedet/semantic/bovine/scm.el
+++ b/lisp/cedet/semantic/bovine/scm.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/chart.el b/lisp/cedet/semantic/chart.el
index 4f8ae24..8063f2c 100644
--- a/lisp/cedet/semantic/chart.el
+++ b/lisp/cedet/semantic/chart.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el
index 5bd76f0..ff8e61e 100644
--- a/lisp/cedet/semantic/complete.el
+++ b/lisp/cedet/semantic/complete.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/ctxt.el b/lisp/cedet/semantic/ctxt.el
index 01e1562..13bea30 100644
--- a/lisp/cedet/semantic/ctxt.el
+++ b/lisp/cedet/semantic/ctxt.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/db-debug.el b/lisp/cedet/semantic/db-debug.el
index 9e6d725..8595cce 100644
--- a/lisp/cedet/semantic/db-debug.el
+++ b/lisp/cedet/semantic/db-debug.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/db-ebrowse.el 
b/lisp/cedet/semantic/db-ebrowse.el
index 187f722..5b4e7eb 100644
--- a/lisp/cedet/semantic/db-ebrowse.el
+++ b/lisp/cedet/semantic/db-ebrowse.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/db-el.el b/lisp/cedet/semantic/db-el.el
index 89bbd1c..768af03 100644
--- a/lisp/cedet/semantic/db-el.el
+++ b/lisp/cedet/semantic/db-el.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/db-file.el b/lisp/cedet/semantic/db-file.el
index ed8d7bb..1e398c5 100644
--- a/lisp/cedet/semantic/db-file.el
+++ b/lisp/cedet/semantic/db-file.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el
index c09af59..c678739 100644
--- a/lisp/cedet/semantic/db-find.el
+++ b/lisp/cedet/semantic/db-find.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/db-global.el b/lisp/cedet/semantic/db-global.el
index 0afa661..38fec02 100644
--- a/lisp/cedet/semantic/db-global.el
+++ b/lisp/cedet/semantic/db-global.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/db-javascript.el 
b/lisp/cedet/semantic/db-javascript.el
index e8a3edc..348512a 100644
--- a/lisp/cedet/semantic/db-javascript.el
+++ b/lisp/cedet/semantic/db-javascript.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/db-mode.el b/lisp/cedet/semantic/db-mode.el
index 3bd991b..8072ca9 100644
--- a/lisp/cedet/semantic/db-mode.el
+++ b/lisp/cedet/semantic/db-mode.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/db-ref.el b/lisp/cedet/semantic/db-ref.el
index a75a73c..049420e 100644
--- a/lisp/cedet/semantic/db-ref.el
+++ b/lisp/cedet/semantic/db-ref.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/db-typecache.el 
b/lisp/cedet/semantic/db-typecache.el
index 8c8cf15..68f9e20 100644
--- a/lisp/cedet/semantic/db-typecache.el
+++ b/lisp/cedet/semantic/db-typecache.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/db.el b/lisp/cedet/semantic/db.el
index 0ba9f2f..e7ee879 100644
--- a/lisp/cedet/semantic/db.el
+++ b/lisp/cedet/semantic/db.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/debug.el b/lisp/cedet/semantic/debug.el
index 5c793e4..c0a5fcb 100644
--- a/lisp/cedet/semantic/debug.el
+++ b/lisp/cedet/semantic/debug.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/decorate.el b/lisp/cedet/semantic/decorate.el
index fc00a52..ad866e9 100644
--- a/lisp/cedet/semantic/decorate.el
+++ b/lisp/cedet/semantic/decorate.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/decorate/include.el 
b/lisp/cedet/semantic/decorate/include.el
index c7b5eb5..6876e5f 100644
--- a/lisp/cedet/semantic/decorate/include.el
+++ b/lisp/cedet/semantic/decorate/include.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/decorate/mode.el 
b/lisp/cedet/semantic/decorate/mode.el
index a749fca..fb05a35 100644
--- a/lisp/cedet/semantic/decorate/mode.el
+++ b/lisp/cedet/semantic/decorate/mode.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/dep.el b/lisp/cedet/semantic/dep.el
index 8c3ec0e..f8d830b 100644
--- a/lisp/cedet/semantic/dep.el
+++ b/lisp/cedet/semantic/dep.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/doc.el b/lisp/cedet/semantic/doc.el
index c8be665..d2b0756 100644
--- a/lisp/cedet/semantic/doc.el
+++ b/lisp/cedet/semantic/doc.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/ede-grammar.el 
b/lisp/cedet/semantic/ede-grammar.el
index d982b6e..967af0b 100644
--- a/lisp/cedet/semantic/ede-grammar.el
+++ b/lisp/cedet/semantic/ede-grammar.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/edit.el b/lisp/cedet/semantic/edit.el
index 9c7ae69..78822c4 100644
--- a/lisp/cedet/semantic/edit.el
+++ b/lisp/cedet/semantic/edit.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/find.el b/lisp/cedet/semantic/find.el
index bf8eb9d..0959dfc 100644
--- a/lisp/cedet/semantic/find.el
+++ b/lisp/cedet/semantic/find.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/format.el b/lisp/cedet/semantic/format.el
index b724429..1ec8e68 100644
--- a/lisp/cedet/semantic/format.el
+++ b/lisp/cedet/semantic/format.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/fw.el b/lisp/cedet/semantic/fw.el
index 3527f3e..ea3fc2a 100644
--- a/lisp/cedet/semantic/fw.el
+++ b/lisp/cedet/semantic/fw.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/grammar-wy.el 
b/lisp/cedet/semantic/grammar-wy.el
index 9b53708..6e7a1ad 100644
--- a/lisp/cedet/semantic/grammar-wy.el
+++ b/lisp/cedet/semantic/grammar-wy.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/grammar.el b/lisp/cedet/semantic/grammar.el
index f57c54a..61266bc 100644
--- a/lisp/cedet/semantic/grammar.el
+++ b/lisp/cedet/semantic/grammar.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
@@ -583,7 +583,7 @@ Typically a DEFINE expression should look like this:
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/html.el b/lisp/cedet/semantic/html.el
index 7901d6a..4485a1f 100644
--- a/lisp/cedet/semantic/html.el
+++ b/lisp/cedet/semantic/html.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/ia-sb.el b/lisp/cedet/semantic/ia-sb.el
index 7901dd5..d7e1aca 100644
--- a/lisp/cedet/semantic/ia-sb.el
+++ b/lisp/cedet/semantic/ia-sb.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/ia.el b/lisp/cedet/semantic/ia.el
index 4696388..d4201fc 100644
--- a/lisp/cedet/semantic/ia.el
+++ b/lisp/cedet/semantic/ia.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
@@ -163,7 +163,7 @@ Completion options are calculated with 
`semantic-analyze-possible-completions'."
     (if (not syms)
        (progn
          (message "No smart completions found.")
-          ;; Disabled - see http://debbugs.gnu.org/14522
+          ;; Disabled - see https://debbugs.gnu.org/14522
          ;; (message "No smart completions found.  Trying Senator.")
          ;; (when (semantic-analyze-context-p a)
          ;;   ;; This is a quick way of getting a nice completion list
diff --git a/lisp/cedet/semantic/idle.el b/lisp/cedet/semantic/idle.el
index 7877486..a106725 100644
--- a/lisp/cedet/semantic/idle.el
+++ b/lisp/cedet/semantic/idle.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/imenu.el b/lisp/cedet/semantic/imenu.el
index a521f31..28d6249 100644
--- a/lisp/cedet/semantic/imenu.el
+++ b/lisp/cedet/semantic/imenu.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/java.el b/lisp/cedet/semantic/java.el
index 00f9ee7..3c81b7a 100644
--- a/lisp/cedet/semantic/java.el
+++ b/lisp/cedet/semantic/java.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/lex-spp.el b/lisp/cedet/semantic/lex-spp.el
index cb33e48..35d77a8 100644
--- a/lisp/cedet/semantic/lex-spp.el
+++ b/lisp/cedet/semantic/lex-spp.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/lex.el b/lisp/cedet/semantic/lex.el
index b2a63cd..eec6e67 100644
--- a/lisp/cedet/semantic/lex.el
+++ b/lisp/cedet/semantic/lex.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/mru-bookmark.el 
b/lisp/cedet/semantic/mru-bookmark.el
index 067439d..5fa58e0 100644
--- a/lisp/cedet/semantic/mru-bookmark.el
+++ b/lisp/cedet/semantic/mru-bookmark.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/sb.el b/lisp/cedet/semantic/sb.el
index 41fe885..fbec9f2 100644
--- a/lisp/cedet/semantic/sb.el
+++ b/lisp/cedet/semantic/sb.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/scope.el b/lisp/cedet/semantic/scope.el
index 9bade56..717c2e3 100644
--- a/lisp/cedet/semantic/scope.el
+++ b/lisp/cedet/semantic/scope.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/senator.el b/lisp/cedet/semantic/senator.el
index f1918c4..e866586 100644
--- a/lisp/cedet/semantic/senator.el
+++ b/lisp/cedet/semantic/senator.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/sort.el b/lisp/cedet/semantic/sort.el
index e77b64f..32e39d7 100644
--- a/lisp/cedet/semantic/sort.el
+++ b/lisp/cedet/semantic/sort.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/symref.el b/lisp/cedet/semantic/symref.el
index a16672e..b9fe63d 100644
--- a/lisp/cedet/semantic/symref.el
+++ b/lisp/cedet/semantic/symref.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/symref/cscope.el 
b/lisp/cedet/semantic/symref/cscope.el
index 181e399..502c3ef 100644
--- a/lisp/cedet/semantic/symref/cscope.el
+++ b/lisp/cedet/semantic/symref/cscope.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/symref/filter.el 
b/lisp/cedet/semantic/symref/filter.el
index e386033..53be5e0 100644
--- a/lisp/cedet/semantic/symref/filter.el
+++ b/lisp/cedet/semantic/symref/filter.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/symref/global.el 
b/lisp/cedet/semantic/symref/global.el
index e91ecf0..35f6a24 100644
--- a/lisp/cedet/semantic/symref/global.el
+++ b/lisp/cedet/semantic/symref/global.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/symref/grep.el 
b/lisp/cedet/semantic/symref/grep.el
index 341a083..bc19cd3 100644
--- a/lisp/cedet/semantic/symref/grep.el
+++ b/lisp/cedet/semantic/symref/grep.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/symref/idutils.el 
b/lisp/cedet/semantic/symref/idutils.el
index 3c94f01..290bed1 100644
--- a/lisp/cedet/semantic/symref/idutils.el
+++ b/lisp/cedet/semantic/symref/idutils.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/symref/list.el 
b/lisp/cedet/semantic/symref/list.el
index e1a789d..d0ad239 100644
--- a/lisp/cedet/semantic/symref/list.el
+++ b/lisp/cedet/semantic/symref/list.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/tag-file.el b/lisp/cedet/semantic/tag-file.el
index ac11dbe..65d9e2c 100644
--- a/lisp/cedet/semantic/tag-file.el
+++ b/lisp/cedet/semantic/tag-file.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/tag-ls.el b/lisp/cedet/semantic/tag-ls.el
index 3a66fc7..aa9b4b9 100644
--- a/lisp/cedet/semantic/tag-ls.el
+++ b/lisp/cedet/semantic/tag-ls.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/tag-write.el b/lisp/cedet/semantic/tag-write.el
index 76a1d79..6ce77ed 100644
--- a/lisp/cedet/semantic/tag-write.el
+++ b/lisp/cedet/semantic/tag-write.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/tag.el b/lisp/cedet/semantic/tag.el
index 6b2a495..59788c7 100644
--- a/lisp/cedet/semantic/tag.el
+++ b/lisp/cedet/semantic/tag.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/texi.el b/lisp/cedet/semantic/texi.el
index 79f8798..e9bc341 100644
--- a/lisp/cedet/semantic/texi.el
+++ b/lisp/cedet/semantic/texi.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/util-modes.el 
b/lisp/cedet/semantic/util-modes.el
index 70f3a34..b31fd07 100644
--- a/lisp/cedet/semantic/util-modes.el
+++ b/lisp/cedet/semantic/util-modes.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/util.el b/lisp/cedet/semantic/util.el
index 31562bc..f5d9054 100644
--- a/lisp/cedet/semantic/util.el
+++ b/lisp/cedet/semantic/util.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/wisent.el b/lisp/cedet/semantic/wisent.el
index 90a863b..235f838 100644
--- a/lisp/cedet/semantic/wisent.el
+++ b/lisp/cedet/semantic/wisent.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/wisent/comp.el 
b/lisp/cedet/semantic/wisent/comp.el
index cb19b1b..0ed9ba3 100644
--- a/lisp/cedet/semantic/wisent/comp.el
+++ b/lisp/cedet/semantic/wisent/comp.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/wisent/grammar.el 
b/lisp/cedet/semantic/wisent/grammar.el
index d0dc3e7..29106da 100644
--- a/lisp/cedet/semantic/wisent/grammar.el
+++ b/lisp/cedet/semantic/wisent/grammar.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
@@ -370,7 +370,7 @@ Menu items are appended to the common grammar menu.")
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.")
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.")
 
 (defvar wisent-make-parsers--python-license
   ";; It is derived in part from the Python grammar, used under the
diff --git a/lisp/cedet/semantic/wisent/java-tags.el 
b/lisp/cedet/semantic/wisent/java-tags.el
index 9deb997..479fc7f 100644
--- a/lisp/cedet/semantic/wisent/java-tags.el
+++ b/lisp/cedet/semantic/wisent/java-tags.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
@@ -75,7 +75,7 @@ This function override `get-local-variables'."
     ;; Add 'this' if in a fcn
     (when (semantic-tag-of-class-p ct 'function)
       ;; Append a new tag THIS into our space.
-      (setq vars (cons (semantic-tag-new-variable 
+      (setq vars (cons (semantic-tag-new-variable
                        "this" (semantic-tag-name (semantic-current-tag-parent))
                        nil)
                       vars)))
diff --git a/lisp/cedet/semantic/wisent/javascript.el 
b/lisp/cedet/semantic/wisent/javascript.el
index cf1911b..b73cb01 100644
--- a/lisp/cedet/semantic/wisent/javascript.el
+++ b/lisp/cedet/semantic/wisent/javascript.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/wisent/python.el 
b/lisp/cedet/semantic/wisent/python.el
index 4e7ee3d..591895d 100644
--- a/lisp/cedet/semantic/wisent/python.el
+++ b/lisp/cedet/semantic/wisent/python.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/semantic/wisent/wisent.el 
b/lisp/cedet/semantic/wisent/wisent.el
index 08cad52..d4d2b3d 100644
--- a/lisp/cedet/semantic/wisent/wisent.el
+++ b/lisp/cedet/semantic/wisent/wisent.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/srecode.el b/lisp/cedet/srecode.el
index e824062..c8eee15 100644
--- a/lisp/cedet/srecode.el
+++ b/lisp/cedet/srecode.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/srecode/args.el b/lisp/cedet/srecode/args.el
index facf96e..c4a15a2 100644
--- a/lisp/cedet/srecode/args.el
+++ b/lisp/cedet/srecode/args.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/srecode/compile.el b/lisp/cedet/srecode/compile.el
index 1b6cd70..21ab9b8 100644
--- a/lisp/cedet/srecode/compile.el
+++ b/lisp/cedet/srecode/compile.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/srecode/cpp.el b/lisp/cedet/srecode/cpp.el
index 8f9c083..fe1dd77 100644
--- a/lisp/cedet/srecode/cpp.el
+++ b/lisp/cedet/srecode/cpp.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/srecode/ctxt.el b/lisp/cedet/srecode/ctxt.el
index 28dbd36..664e06d 100644
--- a/lisp/cedet/srecode/ctxt.el
+++ b/lisp/cedet/srecode/ctxt.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/srecode/dictionary.el b/lisp/cedet/srecode/dictionary.el
index 2844c1b..4507581 100644
--- a/lisp/cedet/srecode/dictionary.el
+++ b/lisp/cedet/srecode/dictionary.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/srecode/document.el b/lisp/cedet/srecode/document.el
index babd177..f8fcdef 100644
--- a/lisp/cedet/srecode/document.el
+++ b/lisp/cedet/srecode/document.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/srecode/el.el b/lisp/cedet/srecode/el.el
index 526a2a2..e725074 100644
--- a/lisp/cedet/srecode/el.el
+++ b/lisp/cedet/srecode/el.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/srecode/expandproto.el 
b/lisp/cedet/srecode/expandproto.el
index 74742f6..87bcdb3 100644
--- a/lisp/cedet/srecode/expandproto.el
+++ b/lisp/cedet/srecode/expandproto.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/srecode/extract.el b/lisp/cedet/srecode/extract.el
index 3477185..bbde255 100644
--- a/lisp/cedet/srecode/extract.el
+++ b/lisp/cedet/srecode/extract.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/srecode/fields.el b/lisp/cedet/srecode/fields.el
index 0bef854..7818a66 100644
--- a/lisp/cedet/srecode/fields.el
+++ b/lisp/cedet/srecode/fields.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/srecode/filters.el b/lisp/cedet/srecode/filters.el
index 7b9b979..1be451b 100644
--- a/lisp/cedet/srecode/filters.el
+++ b/lisp/cedet/srecode/filters.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
@@ -54,4 +54,3 @@
 (provide 'srecode/filters)
 
 ;;; srecode/filters.el ends here
-
diff --git a/lisp/cedet/srecode/find.el b/lisp/cedet/srecode/find.el
index 913013c..35b3753 100644
--- a/lisp/cedet/srecode/find.el
+++ b/lisp/cedet/srecode/find.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/srecode/getset.el b/lisp/cedet/srecode/getset.el
index 0b32af2..b23ae8e 100644
--- a/lisp/cedet/srecode/getset.el
+++ b/lisp/cedet/srecode/getset.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el
index c582e32..1e2cbc8 100644
--- a/lisp/cedet/srecode/insert.el
+++ b/lisp/cedet/srecode/insert.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/srecode/java.el b/lisp/cedet/srecode/java.el
index 30734f2..0ede5d2 100644
--- a/lisp/cedet/srecode/java.el
+++ b/lisp/cedet/srecode/java.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/srecode/map.el b/lisp/cedet/srecode/map.el
index d5b4c5f..10541f6 100644
--- a/lisp/cedet/srecode/map.el
+++ b/lisp/cedet/srecode/map.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/srecode/mode.el b/lisp/cedet/srecode/mode.el
index 566ab5d..ddbce0a 100644
--- a/lisp/cedet/srecode/mode.el
+++ b/lisp/cedet/srecode/mode.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/srecode/semantic.el b/lisp/cedet/srecode/semantic.el
index 7e24a32..44c5248 100644
--- a/lisp/cedet/srecode/semantic.el
+++ b/lisp/cedet/srecode/semantic.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/srecode/srt-mode.el b/lisp/cedet/srecode/srt-mode.el
index d3ce72a..602a1ce 100644
--- a/lisp/cedet/srecode/srt-mode.el
+++ b/lisp/cedet/srecode/srt-mode.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/cedet/srecode/srt.el b/lisp/cedet/srecode/srt.el
index 070261c..4c885fe 100644
--- a/lisp/cedet/srecode/srt.el
+++ b/lisp/cedet/srecode/srt.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/srecode/table.el b/lisp/cedet/srecode/table.el
index 98e0c2d..f85a881 100644
--- a/lisp/cedet/srecode/table.el
+++ b/lisp/cedet/srecode/table.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
@@ -288,4 +288,3 @@ Use PREDICATE is the same as for the `sort' function."
 (provide 'srecode/table)
 
 ;;; srecode/table.el ends here
-
diff --git a/lisp/cedet/srecode/template.el b/lisp/cedet/srecode/template.el
index 9551077..7da8969 100644
--- a/lisp/cedet/srecode/template.el
+++ b/lisp/cedet/srecode/template.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cedet/srecode/texi.el b/lisp/cedet/srecode/texi.el
index 5cc57be..9bf52e1 100644
--- a/lisp/cedet/srecode/texi.el
+++ b/lisp/cedet/srecode/texi.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/char-fold.el b/lisp/char-fold.el
index ea44863..18ce5be 100644
--- a/lisp/char-fold.el
+++ b/lisp/char-fold.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/lisp/chistory.el b/lisp/chistory.el
index 8b6f3d1..c270bff 100644
--- a/lisp/chistory.el
+++ b/lisp/chistory.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/cmuscheme.el b/lisp/cmuscheme.el
index 0a41a40..1bf79f3 100644
--- a/lisp/cmuscheme.el
+++ b/lisp/cmuscheme.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/color.el b/lisp/color.el
index 6dbf3d5..2db01a5 100644
--- a/lisp/color.el
+++ b/lisp/color.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -42,7 +42,7 @@
 (defun color-name-to-rgb (color &optional frame)
   "Convert COLOR string to a list of normalized RGB components.
 COLOR should be a color name (e.g. \"white\") or an RGB triplet
-string (e.g. \"#ff12ec\").
+string (e.g. \"#ffff1122eecc\").
 
 Normally the return value is a list of three floating-point
 numbers, (RED GREEN BLUE), each between 0.0 and 1.0 inclusive.
@@ -68,7 +68,8 @@ or 2; use the latter if you need a 24-bit specification of a 
color."
 (defun color-complement (color-name)
   "Return the color that is the complement of COLOR-NAME.
 COLOR-NAME should be a string naming a color (e.g. \"white\"), or
-a string specifying a color's RGB components (e.g. \"#ff12ec\")."
+a string specifying a color's RGB
+components (e.g. \"#ffff1212ecec\")."
   (let ((color (color-name-to-rgb color-name)))
     (list (- 1.0 (nth 0 color))
           (- 1.0 (nth 1 color))
@@ -82,9 +83,10 @@ resulting list."
   (let* ((r (nth 0 start))
         (g (nth 1 start))
         (b (nth 2 start))
-        (r-step (/ (- (nth 0 stop) r) (1+ step-number)))
-        (g-step (/ (- (nth 1 stop) g) (1+ step-number)))
-        (b-step (/ (- (nth 2 stop) b) (1+ step-number)))
+         (interval (float (1+ step-number)))
+        (r-step (/ (- (nth 0 stop) r) interval))
+        (g-step (/ (- (nth 1 stop) g) interval))
+        (b-step (/ (- (nth 2 stop) b) interval))
         result)
     (dotimes (_ step-number)
       (push (list (setq r (+ r r-step))
@@ -177,7 +179,8 @@ each element is between 0.0 and 1.0, inclusive."
                    ((= r max)      (- bc gc))
                    ((= g max)      (+ 2.0 rc (- bc)))
                    (t              (+ 4.0 gc (- rc))))
-                  6.0) 1.0)))
+                  6.0)
+                  1.0)))
        (list h s l)))))
 
 (defun color-srgb-to-xyz (red green blue)
@@ -211,9 +214,18 @@ RED, GREEN and BLUE should be between 0.0 and 1.0, 
inclusive."
               (* 12.92 b)
             (- (* 1.055 (expt b (/ 2.4))) 0.055)))))
 
+(defconst color-d75-xyz '(0.9497 1.0 1.2264)
+  "D75 white point in CIE XYZ.")
+
 (defconst color-d65-xyz '(0.950455 1.0 1.088753)
   "D65 white point in CIE XYZ.")
 
+(defconst color-d55-xyz '(0.9568 1.0 0.9215)
+  "D55 white point in CIE XYZ.")
+
+(defconst color-d50-xyz '(0.9642 1.0 0.8249)
+  "D50 white point in CIE XYZ.")
+
 (defconst color-cie-ε (/ 216 24389.0))
 (defconst color-cie-κ (/ 24389 27.0))
 
@@ -268,6 +280,24 @@ conversion.  If omitted or nil, use `color-d65-xyz'."
   "Convert CIE L*a*b* to RGB."
   (apply 'color-xyz-to-srgb (color-lab-to-xyz L a b)))
 
+(defun color-xyz-to-xyy (X Y Z)
+  "Convert CIE XYZ to xyY."
+  (let ((d (float (+ X Y Z))))
+    (list (/ X d) (/ Y d) Y)))
+
+(defun color-xyy-to-xyz (x y Y)
+  "Convert CIE xyY to XYZ."
+  (let ((y (float y)))
+   (list (/ (* Y x) y) Y (/ (* Y (- 1 x y)) y))))
+
+(defun color-lab-to-lch (L a b)
+  "Convert CIE L*a*b* to L*C*h*"
+  (list L (sqrt (+ (* a a) (* b b))) (atan b a)))
+
+(defun color-lch-to-lab (L C h)
+  "Convert CIE L*a*b* to L*C*h*"
+  (list L (* C (cos h)) (* C (sin h))))
+
 (defun color-cie-de2000 (color1 color2 &optional kL kC kH)
   "Return the CIEDE2000 color distance between COLOR1 and COLOR2.
 Both COLOR1 and COLOR2 should be in CIE L*a*b* format, as
diff --git a/lisp/comint.el b/lisp/comint.el
index 51b6591..17f1ab4 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/completion.el b/lisp/completion.el
index d56ea93..42366ac 100644
--- a/lisp/completion.el
+++ b/lisp/completion.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/composite.el b/lisp/composite.el
index a3e0001..ab39e08 100644
--- a/lisp/composite.el
+++ b/lisp/composite.el
@@ -25,7 +25,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/cus-dep.el b/lisp/cus-dep.el
index ecdda4e..6c51364 100644
--- a/lisp/cus-dep.el
+++ b/lisp/cus-dep.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 6dbb45e..1e13e95 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cus-face.el b/lisp/cus-face.el
index aa5ecd2..0fc084e 100644
--- a/lisp/cus-face.el
+++ b/lisp/cus-face.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index c28b8a1..b197f2f 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/cus-theme.el b/lisp/cus-theme.el
index d2ee14d..1aac7bf 100644
--- a/lisp/cus-theme.el
+++ b/lisp/cus-theme.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/lisp/custom.el b/lisp/custom.el
index ecfa34d..352fc6b 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el
index 86eb4e7..4bdfffe 100644
--- a/lisp/dabbrev.el
+++ b/lisp/dabbrev.el
@@ -24,7 +24,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/delim-col.el b/lisp/delim-col.el
index db89206..120131f 100644
--- a/lisp/delim-col.el
+++ b/lisp/delim-col.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/delsel.el b/lisp/delsel.el
index 8cb7ade..17b46ef 100644
--- a/lisp/delsel.el
+++ b/lisp/delsel.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index b3c9698..12d0016 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/desktop.el b/lisp/desktop.el
index a2260ba..73228ce 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/dframe.el b/lisp/dframe.el
index f60fffe..7f77d89 100644
--- a/lisp/dframe.el
+++ b/lisp/dframe.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 2b89e52..7e2252f 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index bfb5574..78fa5ed 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/dired.el b/lisp/dired.el
index c7e28a4..782d8ff 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/dirtrack.el b/lisp/dirtrack.el
index 6004c7c..137a0cb 100644
--- a/lisp/dirtrack.el
+++ b/lisp/dirtrack.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/disp-table.el b/lisp/disp-table.el
index 59cc8d6..1410e27 100644
--- a/lisp/disp-table.el
+++ b/lisp/disp-table.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/display-line-numbers.el b/lisp/display-line-numbers.el
index c9dd28a..3b6b101 100644
--- a/lisp/display-line-numbers.el
+++ b/lisp/display-line-numbers.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/dnd.el b/lisp/dnd.el
index 3ae5e4f..defd8a8 100644
--- a/lisp/dnd.el
+++ b/lisp/dnd.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index 2eb5558..a222076 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Requirements:
 
diff --git a/lisp/dom.el b/lisp/dom.el
index 4d0d423..70938f5 100644
--- a/lisp/dom.el
+++ b/lisp/dom.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -162,7 +162,7 @@ ATTRIBUTE would typically be `class', `id' or the like."
 
 (defun dom-previous-sibling (dom node)
   "Return the previous sibling of NODE in DOM."
-  (when-let (parent (dom-parent dom node))
+  (when-let* ((parent (dom-parent dom node)))
     (let ((siblings (dom-children parent))
          (previous nil))
       (while siblings
diff --git a/lisp/double.el b/lisp/double.el
index ab9e23b..91dc095 100644
--- a/lisp/double.el
+++ b/lisp/double.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/dynamic-setting.el b/lisp/dynamic-setting.el
index 3d80f9d..41667e6 100644
--- a/lisp/dynamic-setting.el
+++ b/lisp/dynamic-setting.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -92,4 +92,3 @@ Changes can be
 
 (define-key special-event-map [config-changed-event]
   'dynamic-setting-handle-config-changed-event)
-
diff --git a/lisp/ebuff-menu.el b/lisp/ebuff-menu.el
index b399be5..51c33c6 100644
--- a/lisp/ebuff-menu.el
+++ b/lisp/ebuff-menu.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/echistory.el b/lisp/echistory.el
index 2146faa..588f605 100644
--- a/lisp/echistory.el
+++ b/lisp/echistory.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/ecomplete.el b/lisp/ecomplete.el
index 70277fa..ed23d9f 100644
--- a/lisp/ecomplete.el
+++ b/lisp/ecomplete.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/edmacro.el b/lisp/edmacro.el
index 5fefc31..b050f4d 100644
--- a/lisp/edmacro.el
+++ b/lisp/edmacro.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/ehelp.el b/lisp/ehelp.el
index a3719f6..1e89f84 100644
--- a/lisp/ehelp.el
+++ b/lisp/ehelp.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/elec-pair.el b/lisp/elec-pair.el
index 2a4895e..7f523d1 100644
--- a/lisp/elec-pair.el
+++ b/lisp/elec-pair.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/electric.el b/lisp/electric.el
index a71e79f..d792994 100644
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/elide-head.el b/lisp/elide-head.el
index 3904edd..5bede73 100644
--- a/lisp/elide-head.el
+++ b/lisp/elide-head.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el
index 3342bea..32b6a47 100644
--- a/lisp/emacs-lisp/advice.el
+++ b/lisp/emacs-lisp/advice.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;; LCD Archive Entry:
 ;; advice|Hans Chalupsky|address@hidden|
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index e811ee2..27426c4 100644
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -898,7 +898,7 @@ FILE's modification time."
       (autoload--save-buffer))))
 
 ;; FIXME This command should be deprecated.
-;; See http://debbugs.gnu.org/22213#41
+;; See https://debbugs.gnu.org/22213#41
 ;;;###autoload
 (defun update-file-autoloads (file &optional save-after outfile)
   "Update the autoloads for FILE.
@@ -917,7 +917,7 @@ Return FILE if there was no autoload cookie in it, else 
nil."
   (let* ((generated-autoload-file (or outfile generated-autoload-file))
         (autoload-modified-buffers nil)
         ;; We need this only if the output file handles more than one input.
-        ;; See http://debbugs.gnu.org/22213#38 and subsequent.
+        ;; See https://debbugs.gnu.org/22213#38 and subsequent.
         (autoload-timestamps t)
          (no-autoloads (autoload-generate-file-autoloads file)))
     (if autoload-modified-buffers
diff --git a/lisp/emacs-lisp/avl-tree.el b/lisp/emacs-lisp/avl-tree.el
index 32f7d2c..8435b29 100644
--- a/lisp/emacs-lisp/avl-tree.el
+++ b/lisp/emacs-lisp/avl-tree.el
@@ -23,7 +23,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/backquote.el b/lisp/emacs-lisp/backquote.el
index bb877dd..4649cf3 100644
--- a/lisp/emacs-lisp/backquote.el
+++ b/lisp/emacs-lisp/backquote.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/benchmark.el b/lisp/emacs-lisp/benchmark.el
index a2217d2..445e78b 100644
--- a/lisp/emacs-lisp/benchmark.el
+++ b/lisp/emacs-lisp/benchmark.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/bindat.el b/lisp/emacs-lisp/bindat.el
index d345151..0f86923 100644
--- a/lisp/emacs-lisp/bindat.el
+++ b/lisp/emacs-lisp/bindat.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el
index 962a7ae..69f03c5 100644
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index 4fa31dd..c6ad209 100644
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index c3bb777..1b42961 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/cconv.el b/lisp/emacs-lisp/cconv.el
index 4507af7..fe92288 100644
--- a/lisp/emacs-lisp/cconv.el
+++ b/lisp/emacs-lisp/cconv.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/chart.el b/lisp/emacs-lisp/chart.el
index dc108f9..2c37923 100644
--- a/lisp/emacs-lisp/chart.el
+++ b/lisp/emacs-lisp/chart.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/emacs-lisp/check-declare.el b/lisp/emacs-lisp/check-declare.el
index c46426c..6d503ba 100644
--- a/lisp/emacs-lisp/check-declare.el
+++ b/lisp/emacs-lisp/check-declare.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el
index bc67a6b..7997ba6 100644
--- a/lisp/emacs-lisp/checkdoc.el
+++ b/lisp/emacs-lisp/checkdoc.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/emacs-lisp/cl-extra.el b/lisp/emacs-lisp/cl-extra.el
index 99df209..214adbc 100644
--- a/lisp/emacs-lisp/cl-extra.el
+++ b/lisp/emacs-lisp/cl-extra.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/cl-generic.el b/lisp/emacs-lisp/cl-generic.el
index 1a3f8e1..b2f76ab 100644
--- a/lisp/emacs-lisp/cl-generic.el
+++ b/lisp/emacs-lisp/cl-generic.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/cl-indent.el b/lisp/emacs-lisp/cl-indent.el
index df0e0a8..17e2434 100644
--- a/lisp/emacs-lisp/cl-indent.el
+++ b/lisp/emacs-lisp/cl-indent.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/cl-lib.el b/lisp/emacs-lisp/cl-lib.el
index 6ac08d8..da7176f 100644
--- a/lisp/emacs-lisp/cl-lib.el
+++ b/lisp/emacs-lisp/cl-lib.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index eee5953..d90e70d 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -161,9 +161,16 @@ whether X is known at compile time, macroexpand it 
completely in
 
 ;;; Symbols.
 
-(defvaralias 'cl--gensym-counter 'gensym-counter)
+(defvar cl--gensym-counter 0)
 ;;;###autoload
-(cl--defalias 'cl-gensym 'gensym)
+(defun cl-gensym (&optional prefix)
+  "Generate a new uninterned symbol.
+The name is made by appending a number to PREFIX, default \"G\"."
+  (let ((pfix (if (stringp prefix) prefix "G"))
+       (num (if (integerp prefix) prefix
+              (prog1 cl--gensym-counter
+                (setq cl--gensym-counter (1+ cl--gensym-counter))))))
+    (make-symbol (format "%s%d" pfix num))))
 
 (defvar cl--gentemp-counter 0)
 ;;;###autoload
diff --git a/lisp/emacs-lisp/cl-preloaded.el b/lisp/emacs-lisp/cl-preloaded.el
index ab6354d..e550f5a 100644
--- a/lisp/emacs-lisp/cl-preloaded.el
+++ b/lisp/emacs-lisp/cl-preloaded.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/cl-print.el b/lisp/emacs-lisp/cl-print.el
index eb50d75..87c0328 100644
--- a/lisp/emacs-lisp/cl-print.el
+++ b/lisp/emacs-lisp/cl-print.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/cl-seq.el b/lisp/emacs-lisp/cl-seq.el
index 67ff1a0..6a21936 100644
--- a/lisp/emacs-lisp/cl-seq.el
+++ b/lisp/emacs-lisp/cl-seq.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/cl.el b/lisp/emacs-lisp/cl.el
index 306237c..5ac4023 100644
--- a/lisp/emacs-lisp/cl.el
+++ b/lisp/emacs-lisp/cl.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el
index b693613..11569e4 100644
--- a/lisp/emacs-lisp/copyright.el
+++ b/lisp/emacs-lisp/copyright.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/crm.el b/lisp/emacs-lisp/crm.el
index 0fad27c..2a417f1 100644
--- a/lisp/emacs-lisp/crm.el
+++ b/lisp/emacs-lisp/crm.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/cursor-sensor.el b/lisp/emacs-lisp/cursor-sensor.el
index e68b429..b6e25b9 100644
--- a/lisp/emacs-lisp/cursor-sensor.el
+++ b/lisp/emacs-lisp/cursor-sensor.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index 2b87825..0247179 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el
index fffe972..3fa3818 100644
--- a/lisp/emacs-lisp/derived.el
+++ b/lisp/emacs-lisp/derived.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/disass.el b/lisp/emacs-lisp/disass.el
index 66673b4..90d5001 100644
--- a/lisp/emacs-lisp/disass.el
+++ b/lisp/emacs-lisp/disass.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index 158b921..bf087fc 100644
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el
index 4fc9a78..35b2af1 100644
--- a/lisp/emacs-lisp/easymenu.el
+++ b/lisp/emacs-lisp/easymenu.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 3190346..dbc56e2 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/eieio-base.el b/lisp/emacs-lisp/eieio-base.el
index 33c71ec..6b39b4f 100644
--- a/lisp/emacs-lisp/eieio-base.el
+++ b/lisp/emacs-lisp/eieio-base.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/emacs-lisp/eieio-compat.el b/lisp/emacs-lisp/eieio-compat.el
index 8403a8a..bf0bc85 100644
--- a/lisp/emacs-lisp/eieio-compat.el
+++ b/lisp/emacs-lisp/eieio-compat.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/eieio-core.el b/lisp/emacs-lisp/eieio-core.el
index 9d618e1..22bf812 100644
--- a/lisp/emacs-lisp/eieio-core.el
+++ b/lisp/emacs-lisp/eieio-core.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/emacs-lisp/eieio-custom.el b/lisp/emacs-lisp/eieio-custom.el
index e82eaa2..745bd89 100644
--- a/lisp/emacs-lisp/eieio-custom.el
+++ b/lisp/emacs-lisp/eieio-custom.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/emacs-lisp/eieio-datadebug.el 
b/lisp/emacs-lisp/eieio-datadebug.el
index 8ef92df..da8d9a0 100644
--- a/lisp/emacs-lisp/eieio-datadebug.el
+++ b/lisp/emacs-lisp/eieio-datadebug.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/emacs-lisp/eieio-opt.el b/lisp/emacs-lisp/eieio-opt.el
index ba4331f..f464d02 100644
--- a/lisp/emacs-lisp/eieio-opt.el
+++ b/lisp/emacs-lisp/eieio-opt.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/emacs-lisp/eieio-speedbar.el 
b/lisp/emacs-lisp/eieio-speedbar.el
index 36ab2c1..fb57453 100644
--- a/lisp/emacs-lisp/eieio-speedbar.el
+++ b/lisp/emacs-lisp/eieio-speedbar.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el
index 8b92d5b..75f1097 100644
--- a/lisp/emacs-lisp/eieio.el
+++ b/lisp/emacs-lisp/eieio.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index 8c16546..cba9a00 100644
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -256,7 +256,7 @@ Otherwise work like `message'."
       (progn
        (add-hook 'minibuffer-exit-hook
                  (lambda () (setq eldoc-mode-line-string nil
-                             ;; http://debbugs.gnu.org/16920
+                             ;; https://debbugs.gnu.org/16920
                              eldoc-last-message nil))
                  nil t)
        (with-current-buffer
diff --git a/lisp/emacs-lisp/elint.el b/lisp/emacs-lisp/elint.el
index cce9553..8d10a16 100644
--- a/lisp/emacs-lisp/elint.el
+++ b/lisp/emacs-lisp/elint.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/elp.el b/lisp/emacs-lisp/elp.el
index 7bdd749..2be9c9d 100644
--- a/lisp/emacs-lisp/elp.el
+++ b/lisp/emacs-lisp/elp.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/emacs-lisp/ert-x.el b/lisp/emacs-lisp/ert-x.el
index 1413b9c..6d9a7d9 100644
--- a/lisp/emacs-lisp/ert-x.el
+++ b/lisp/emacs-lisp/ert-x.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el
index 579e5e0..d427622 100644
--- a/lisp/emacs-lisp/ert.el
+++ b/lisp/emacs-lisp/ert.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -102,7 +102,7 @@ This is like `equal-including-properties' except that it 
compares
 the property values of text properties structurally (by
 recursing) rather than with `eq'.  Perhaps this is what
 `equal-including-properties' should do in the first place; see
-Emacs bug 6581 at URL `http://debbugs.gnu.org/cgi/bugreport.cgi?bug=6581'."
+Emacs bug 6581 at URL `https://debbugs.gnu.org/cgi/bugreport.cgi?bug=6581'."
   ;; This implementation is inefficient.  Rather than making it
   ;; efficient, let's hope bug 6581 gets fixed so that we can delete
   ;; it altogether.
diff --git a/lisp/emacs-lisp/ewoc.el b/lisp/emacs-lisp/ewoc.el
index cc57456..e1b94a3 100644
--- a/lisp/emacs-lisp/ewoc.el
+++ b/lisp/emacs-lisp/ewoc.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index 9b98f05..29c42f3 100644
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/emacs-lisp/float-sup.el b/lisp/emacs-lisp/float-sup.el
index a33937c..18ba834 100644
--- a/lisp/emacs-lisp/float-sup.el
+++ b/lisp/emacs-lisp/float-sup.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/generator.el b/lisp/emacs-lisp/generator.el
index fe5d2d0..f3597cc 100644
--- a/lisp/emacs-lisp/generator.el
+++ b/lisp/emacs-lisp/generator.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/generic.el b/lisp/emacs-lisp/generic.el
index 165b0d4..1420885 100644
--- a/lisp/emacs-lisp/generic.el
+++ b/lisp/emacs-lisp/generic.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/gv.el b/lisp/emacs-lisp/gv.el
index 42b1c21..892d6e9 100644
--- a/lisp/emacs-lisp/gv.el
+++ b/lisp/emacs-lisp/gv.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/helper.el b/lisp/emacs-lisp/helper.el
index 78611c6..9dc5946 100644
--- a/lisp/emacs-lisp/helper.el
+++ b/lisp/emacs-lisp/helper.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/inline.el b/lisp/emacs-lisp/inline.el
index cf8e2f2..00e5e6e 100644
--- a/lisp/emacs-lisp/inline.el
+++ b/lisp/emacs-lisp/inline.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/let-alist.el b/lisp/emacs-lisp/let-alist.el
index cf82fe3..70a58c4 100644
--- a/lisp/emacs-lisp/let-alist.el
+++ b/lisp/emacs-lisp/let-alist.el
@@ -25,7 +25,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/lisp-mnt.el b/lisp/emacs-lisp/lisp-mnt.el
index a1c5b69..4e4957f 100644
--- a/lisp/emacs-lisp/lisp-mnt.el
+++ b/lisp/emacs-lisp/lisp-mnt.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index fa25a0c..fd12635 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el
index 0c1fe42..c3d62fd 100644
--- a/lisp/emacs-lisp/lisp.el
+++ b/lisp/emacs-lisp/lisp.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el
index 9bc194c..b7496d5 100644
--- a/lisp/emacs-lisp/macroexp.el
+++ b/lisp/emacs-lisp/macroexp.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/emacs-lisp/map-ynp.el b/lisp/emacs-lisp/map-ynp.el
index af7a9ee..d055a54 100644
--- a/lisp/emacs-lisp/map-ynp.el
+++ b/lisp/emacs-lisp/map-ynp.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/map.el b/lisp/emacs-lisp/map.el
index e098eef..0f9a744 100644
--- a/lisp/emacs-lisp/map.el
+++ b/lisp/emacs-lisp/map.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/nadvice.el b/lisp/emacs-lisp/nadvice.el
index c68ecbc..c638d5d 100644
--- a/lisp/emacs-lisp/nadvice.el
+++ b/lisp/emacs-lisp/nadvice.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/package-x.el b/lisp/emacs-lisp/package-x.el
index a3d90f4..923da46 100644
--- a/lisp/emacs-lisp/package-x.el
+++ b/lisp/emacs-lisp/package-x.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 889d794..8b101c1 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -1192,7 +1192,7 @@ errors signaled by ERROR-FORM or by BODY).
                                                  (let ((,b-sym 
(current-buffer)))
                                                    (require 'url-handlers)
                                                    (unless-error ,body
-                                                                 (when-let 
((er (plist-get status :error)))
+                                                                 (when-let* 
((er (plist-get status :error)))
                                                                    (error 
"Error retrieving: %s %S" ,url-sym er))
                                                                  
(with-current-buffer ,b-sym
                                                                    (goto-char 
(point-min))
@@ -1770,8 +1770,8 @@ Only these packages will be in the return value an their 
cdrs are
 destructively set to nil in ONLY."
   (let ((out))
     (dolist (dep (package-desc-reqs package))
-      (when-let ((cell (assq (car dep) only))
-                 (dep-package (cdr-safe cell)))
+      (when-let* ((cell (assq (car dep) only))
+                  (dep-package (cdr-safe cell)))
         (setcdr cell nil)
         (setq out (append (package--sort-deps-in-alist dep-package only)
                           out))))
@@ -1790,7 +1790,7 @@ if all the in-between dependencies are also in 
PACKAGE-LIST."
     (dolist (cell alist out-list)
       ;; `package--sort-deps-in-alist' destructively changes alist, so
       ;; some cells might already be empty.  We check this here.
-      (when-let ((pkg-desc (cdr cell)))
+      (when-let* ((pkg-desc (cdr cell)))
         (setcdr cell nil)
         (setq out-list
               (append (package--sort-deps-in-alist pkg-desc alist)
@@ -1847,7 +1847,7 @@ if all the in-between dependencies are also in 
PACKAGE-LIST."
                ;; Update the old pkg-desc which will be shown on the 
description buffer.
                (setf (package-desc-signed pkg-desc) t)
                ;; Update the new (activated) pkg-desc as well.
-               (when-let ((pkg-descs (cdr (assq (package-desc-name pkg-desc) 
package-alist))))
+               (when-let* ((pkg-descs (cdr (assq (package-desc-name pkg-desc) 
package-alist))))
                  (setf (package-desc-signed (car pkg-descs)) t))))))))))
 
 (defun package-installed-p (package &optional min-version)
@@ -1970,12 +1970,12 @@ to install it but still mark it as selected."
     (unless (or dont-select (package--user-selected-p name))
       (package--save-selected-packages
        (cons name package-selected-packages)))
-    (if-let ((transaction
-              (if (package-desc-p pkg)
-                  (unless (package-installed-p pkg)
-                    (package-compute-transaction (list pkg)
-                                                 (package-desc-reqs pkg)))
-                (package-compute-transaction () (list (list pkg))))))
+    (if-let* ((transaction
+               (if (package-desc-p pkg)
+                   (unless (package-installed-p pkg)
+                     (package-compute-transaction (list pkg)
+                                                  (package-desc-reqs pkg)))
+                 (package-compute-transaction () (list (list pkg))))))
         (package-download-transaction transaction)
       (message "`%s' is already installed" name))))
 
@@ -3281,7 +3281,7 @@ Optional argument NOQUERY non-nil means do not ask the 
user to confirm."
           (package--update-selected-packages .install .delete)
           (package-menu--perform-transaction install-list delete-list)
           (when package-selected-packages
-            (if-let ((removable (package--removable-packages)))
+            (if-let* ((removable (package--removable-packages)))
                 (message "Package menu: Operation finished.  %d packages %s"
                   (length removable)
                   (substitute-command-keys
@@ -3353,7 +3353,7 @@ Store this list in `package-menu--new-package-list'."
 
 (defun package-menu--find-and-notify-upgrades ()
   "Notify the user of upgradable packages."
-  (when-let ((upgrades (package-menu--find-upgrades)))
+  (when-let* ((upgrades (package-menu--find-upgrades)))
     (message "%d package%s can be upgraded; type `%s' to mark %s for 
upgrading."
       (length upgrades)
       (if (= (length upgrades) 1) "" "s")
diff --git a/lisp/emacs-lisp/pcase.el b/lisp/emacs-lisp/pcase.el
index 5935845..c703cae 100644
--- a/lisp/emacs-lisp/pcase.el
+++ b/lisp/emacs-lisp/pcase.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/pp.el b/lisp/emacs-lisp/pp.el
index 7ef46a4..d9cd37e 100644
--- a/lisp/emacs-lisp/pp.el
+++ b/lisp/emacs-lisp/pp.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/radix-tree.el b/lisp/emacs-lisp/radix-tree.el
index b5e7589..053dd45 100644
--- a/lisp/emacs-lisp/radix-tree.el
+++ b/lisp/emacs-lisp/radix-tree.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/re-builder.el b/lisp/emacs-lisp/re-builder.el
index 2eff1d1..84925cb 100644
--- a/lisp/emacs-lisp/re-builder.el
+++ b/lisp/emacs-lisp/re-builder.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/regexp-opt.el b/lisp/emacs-lisp/regexp-opt.el
index 5feaad8..ef91eb4 100644
--- a/lisp/emacs-lisp/regexp-opt.el
+++ b/lisp/emacs-lisp/regexp-opt.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/regi.el b/lisp/emacs-lisp/regi.el
index 351dba5..9f612a1 100644
--- a/lisp/emacs-lisp/regi.el
+++ b/lisp/emacs-lisp/regi.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/ring.el b/lisp/emacs-lisp/ring.el
index b0ec3bc..69754b0 100644
--- a/lisp/emacs-lisp/ring.el
+++ b/lisp/emacs-lisp/ring.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el
index b66f2c6..54755a7 100644
--- a/lisp/emacs-lisp/rx.el
+++ b/lisp/emacs-lisp/rx.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/seq.el b/lisp/emacs-lisp/seq.el
index 23e444f..2861ed7 100644
--- a/lisp/emacs-lisp/seq.el
+++ b/lisp/emacs-lisp/seq.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/shadow.el b/lisp/emacs-lisp/shadow.el
index df58648..103e131 100644
--- a/lisp/emacs-lisp/shadow.el
+++ b/lisp/emacs-lisp/shadow.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el
index 7baccbc..87c4782 100644
--- a/lisp/emacs-lisp/smie.el
+++ b/lisp/emacs-lisp/smie.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/subr-x.el b/lisp/emacs-lisp/subr-x.el
index 849ac19..077ad22 100644
--- a/lisp/emacs-lisp/subr-x.el
+++ b/lisp/emacs-lisp/subr-x.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -83,10 +83,13 @@ threading."
   `(internal--thread-argument nil ,@forms))
 
 (defsubst internal--listify (elt)
-  "Wrap ELT in a list if it is not one."
-  (if (not (listp elt))
-      (list elt)
-    elt))
+  "Wrap ELT in a list if it is not one.
+If ELT is of the form ((EXPR)), listify (EXPR) with a dummy symbol."
+  (cond
+   ((symbolp elt) (list elt elt))
+   ((null (cdr elt))
+    (list (make-symbol "s") (car elt)))
+   (t elt)))
 
 (defsubst internal--check-binding (binding)
   "Check BINDING is properly formed."
@@ -98,7 +101,8 @@ threading."
 
 (defsubst internal--build-binding-value-form (binding prev-var)
   "Build the conditional value form for BINDING using PREV-VAR."
-  `(,(car binding) (and ,prev-var ,(cadr binding))))
+  (let ((var (car binding)))
+    `(,var (and ,prev-var ,(cadr binding)))))
 
 (defun internal--build-binding (binding prev-var)
   "Check and build a single BINDING with PREV-VAR."
@@ -117,44 +121,69 @@ threading."
                 binding))
             bindings)))
 
-(defmacro if-let* (bindings then &rest else)
+(defmacro if-let* (varlist then &rest else)
   "Bind variables according to VARLIST and eval THEN or ELSE.
-Each binding is evaluated in turn with `let*', and evaluation
-stops if a binding value is nil.  If all are non-nil, the value
-of THEN is returned, or the last form in ELSE is returned.
-Each element of VARLIST is a symbol (which is bound to nil)
-or a list (SYMBOL VALUEFORM) (which binds SYMBOL to the value of VALUEFORM).
-In the special case you only want to bind a single value,
-VARLIST can just be a plain tuple.
-\n(fn VARLIST THEN ELSE...)"
+Each binding is evaluated in turn, and evaluation stops if a
+binding value is nil.  If all are non-nil, the value of THEN is
+returned, or the last form in ELSE is returned.
+
+Each element of VARLIST is a list (SYMBOL VALUEFORM) which binds
+SYMBOL to the value of VALUEFORM).  An element can additionally
+be of the form (VALUEFORM), which is evaluated and checked for
+nil; i.e. SYMBOL can be omitted if only the test result is of
+interest."
   (declare (indent 2)
-           (debug ([&or (&rest [&or symbolp (symbolp form)]) (symbolp form)]
+           (debug ((&rest [&or symbolp (symbolp form) (sexp)])
                    form body)))
-  (when (and (<= (length bindings) 2)
-             (not (listp (car bindings))))
-    ;; Adjust the single binding case
-    (setq bindings (list bindings)))
-  `(let* ,(internal--build-bindings bindings)
-     (if ,(car (internal--listify (car (last bindings))))
-         ,then
-       ,@else)))
+  (if varlist
+      `(let* ,(setq varlist (internal--build-bindings varlist))
+         (if ,(caar (last varlist))
+             ,then
+           ,@else))
+    `(let* () ,then)))
+
+(defmacro when-let* (varlist &rest body)
+  "Bind variables according to VARLIST and conditionally eval BODY.
+Each binding is evaluated in turn, and evaluation stops if a
+binding value is nil.  If all are non-nil, the value of the last
+form in BODY is returned.
+
+VARLIST is the same as in `if-let*'."
+  (declare (indent 1) (debug if-let*))
+  (list 'if-let* varlist (macroexp-progn body)))
 
-(defmacro when-let* (bindings &rest body)
+(defmacro and-let* (varlist &rest body)
   "Bind variables according to VARLIST and conditionally eval BODY.
-Each binding is evaluated in turn with `let*', and evaluation
-stops if a binding value is nil.  If all are non-nil, the value
-of the last form in BODY is returned.
-Each element of VARLIST is a symbol (which is bound to nil)
-or a list (SYMBOL VALUEFORM) (which binds SYMBOL to the value of VALUEFORM).
-In the special case you only want to bind a single value,
-VARLIST can just be a plain tuple.
-\n(fn VARLIST BODY...)"
-  (declare (indent 1) (debug if-let))
-  (list 'if-let bindings (macroexp-progn body)))
-
-(defalias 'if-let 'if-let*)
-(defalias 'when-let 'when-let*)
-(defalias 'and-let* 'when-let*)
+Like `when-let*', except if BODY is empty and all the bindings
+are non-nil, then the result is non-nil."
+  (declare (indent 1) (debug when-let*))
+  (let (res)
+    (if varlist
+        `(let* ,(setq varlist (internal--build-bindings varlist))
+           (if ,(setq res (caar (last varlist)))
+               ,@(or body `(,res))))
+      `(let* () ,@(or body '(t))))))
+
+(defmacro if-let (spec then &rest else)
+  "Bind variables according to SPEC and eval THEN or ELSE.
+Like `if-let*' except SPEC can have the form (SYMBOL VALUEFORM)."
+  (declare (indent 2)
+           (debug ([&or (&rest [&or symbolp (symbolp form) (sexp)])
+                        (symbolp form)]
+                   form body))
+           (obsolete "use `if-let*' instead." "26.1"))
+  (when (and (<= (length spec) 2)
+             (not (listp (car spec))))
+    ;; Adjust the single binding case
+    (setq spec (list spec)))
+  (list 'if-let* spec then (macroexp-progn else)))
+
+(defmacro when-let (spec &rest body)
+  "Bind variables according to SPEC and conditionally eval BODY.
+Like `when-let*' except SPEC can have the form (SYMBOL VALUEFORM)."
+  (declare (indent 1) (debug if-let)
+           (obsolete "use `when-let*' instead." "26.1"))
+  (list 'if-let spec (macroexp-progn body)))
 
 (defsubst hash-table-empty-p (hash-table)
   "Check whether HASH-TABLE is empty (has 0 elements)."
diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el
index d1d5176..f613783 100644
--- a/lisp/emacs-lisp/syntax.el
+++ b/lisp/emacs-lisp/syntax.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/tabulated-list.el 
b/lisp/emacs-lisp/tabulated-list.el
index 6844c25..e940588 100644
--- a/lisp/emacs-lisp/tabulated-list.el
+++ b/lisp/emacs-lisp/tabulated-list.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/tcover-ses.el b/lisp/emacs-lisp/tcover-ses.el
index efcaeed..7e4beb6 100644
--- a/lisp/emacs-lisp/tcover-ses.el
+++ b/lisp/emacs-lisp/tcover-ses.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 (require 'testcover)
 
diff --git a/lisp/emacs-lisp/tcover-unsafep.el 
b/lisp/emacs-lisp/tcover-unsafep.el
index f9bf9a4..69ae175 100644
--- a/lisp/emacs-lisp/tcover-unsafep.el
+++ b/lisp/emacs-lisp/tcover-unsafep.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 (require 'testcover)
 
diff --git a/lisp/emacs-lisp/testcover.el b/lisp/emacs-lisp/testcover.el
index 17891fd..691860b 100644
--- a/lisp/emacs-lisp/testcover.el
+++ b/lisp/emacs-lisp/testcover.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 ;;; Commentary:
diff --git a/lisp/emacs-lisp/thunk.el b/lisp/emacs-lisp/thunk.el
index f4c075d..bb6d277 100644
--- a/lisp/emacs-lisp/thunk.el
+++ b/lisp/emacs-lisp/thunk.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/emacs-lisp/timer-list.el b/lisp/emacs-lisp/timer-list.el
index 1a38254..5d00fb2 100644
--- a/lisp/emacs-lisp/timer-list.el
+++ b/lisp/emacs-lisp/timer-list.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -81,6 +81,8 @@
 (defvar timer-list-mode-map
   (let ((map (make-sparse-keymap)))
     (define-key map "c" 'timer-list-cancel)
+    (define-key map "n" 'next-line)
+    (define-key map "p" 'previous-line)
     (easy-menu-define nil map ""
       '("Timers"
        ["Cancel" timer-list-cancel t]))
diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el
index d872256..1de3043 100644
--- a/lisp/emacs-lisp/timer.el
+++ b/lisp/emacs-lisp/timer.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/tq.el b/lisp/emacs-lisp/tq.el
index 3f5d78d..31bb9d1 100644
--- a/lisp/emacs-lisp/tq.el
+++ b/lisp/emacs-lisp/tq.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/trace.el b/lisp/emacs-lisp/trace.el
index 1c57d73..4a83937 100644
--- a/lisp/emacs-lisp/trace.el
+++ b/lisp/emacs-lisp/trace.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;; LCD Archive Entry:
 ;; trace|Hans Chalupsky|address@hidden|
diff --git a/lisp/emacs-lisp/unsafep.el b/lisp/emacs-lisp/unsafep.el
index 1ab65a0..88f053d 100644
--- a/lisp/emacs-lisp/unsafep.el
+++ b/lisp/emacs-lisp/unsafep.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lisp/warnings.el b/lisp/emacs-lisp/warnings.el
index 671d279..2765877 100644
--- a/lisp/emacs-lisp/warnings.el
+++ b/lisp/emacs-lisp/warnings.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emacs-lock.el b/lisp/emacs-lock.el
index dbf6ac8..6624c99 100644
--- a/lisp/emacs-lock.el
+++ b/lisp/emacs-lock.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index 63b8e9b..9d97fee 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 ;;; Commentary:
diff --git a/lisp/emulation/cua-gmrk.el b/lisp/emulation/cua-gmrk.el
index baa430e..9d51f4a 100644
--- a/lisp/emulation/cua-gmrk.el
+++ b/lisp/emulation/cua-gmrk.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emulation/cua-rect.el b/lisp/emulation/cua-rect.el
index 3538181..3392034 100644
--- a/lisp/emulation/cua-rect.el
+++ b/lisp/emulation/cua-rect.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Acknowledgments
 
diff --git a/lisp/emulation/edt-lk201.el b/lisp/emulation/edt-lk201.el
index 9afb25c..354d288 100644
--- a/lisp/emulation/edt-lk201.el
+++ b/lisp/emulation/edt-lk201.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emulation/edt-mapper.el b/lisp/emulation/edt-mapper.el
index 457ad55..963da2b 100644
--- a/lisp/emulation/edt-mapper.el
+++ b/lisp/emulation/edt-mapper.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/emulation/edt-pc.el b/lisp/emulation/edt-pc.el
index 3ea249f..c59ad97 100644
--- a/lisp/emulation/edt-pc.el
+++ b/lisp/emulation/edt-pc.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emulation/edt-vt100.el b/lisp/emulation/edt-vt100.el
index a8c186b..98f51da 100644
--- a/lisp/emulation/edt-vt100.el
+++ b/lisp/emulation/edt-vt100.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emulation/edt.el b/lisp/emulation/edt.el
index a6b2d78..bdb606c 100644
--- a/lisp/emulation/edt.el
+++ b/lisp/emulation/edt.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 
diff --git a/lisp/emulation/keypad.el b/lisp/emulation/keypad.el
index 0c7135e..aea2440 100644
--- a/lisp/emulation/keypad.el
+++ b/lisp/emulation/keypad.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index a697aa7..21200ae 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emulation/viper-ex.el b/lisp/emulation/viper-ex.el
index 185cf99..7d52d5a 100644
--- a/lisp/emulation/viper-ex.el
+++ b/lisp/emulation/viper-ex.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el
index a67dd4d..3fd492b 100644
--- a/lisp/emulation/viper-init.el
+++ b/lisp/emulation/viper-init.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emulation/viper-keym.el b/lisp/emulation/viper-keym.el
index a18833d..6227e33 100644
--- a/lisp/emulation/viper-keym.el
+++ b/lisp/emulation/viper-keym.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emulation/viper-macs.el b/lisp/emulation/viper-macs.el
index 1353f7e..d79fa45 100644
--- a/lisp/emulation/viper-macs.el
+++ b/lisp/emulation/viper-macs.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emulation/viper-mous.el b/lisp/emulation/viper-mous.el
index 2600c50..d36f573 100644
--- a/lisp/emulation/viper-mous.el
+++ b/lisp/emulation/viper-mous.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el
index e32b41f..e09a2bb 100644
--- a/lisp/emulation/viper-util.el
+++ b/lisp/emulation/viper-util.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index bded174..2a66262 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -30,7 +30,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/env.el b/lisp/env.el
index 859f280..5f8c4f5 100644
--- a/lisp/env.el
+++ b/lisp/env.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/epa-dired.el b/lisp/epa-dired.el
index 5eb6ca5..cbf8b97 100644
--- a/lisp/epa-dired.el
+++ b/lisp/epa-dired.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/lisp/epa-file.el b/lisp/epa-file.el
index c97acb8..7b5ad38 100644
--- a/lisp/epa-file.el
+++ b/lisp/epa-file.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/lisp/epa-hook.el b/lisp/epa-hook.el
index c6577c8..5f12a15 100644
--- a/lisp/epa-hook.el
+++ b/lisp/epa-hook.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/lisp/epa-mail.el b/lisp/epa-mail.el
index 7069273..1eb73e3 100644
--- a/lisp/epa-mail.el
+++ b/lisp/epa-mail.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/lisp/epa.el b/lisp/epa.el
index 52963b6..6e908e1 100644
--- a/lisp/epa.el
+++ b/lisp/epa.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/lisp/epg-config.el b/lisp/epg-config.el
index 6aed354..dff5e99 100644
--- a/lisp/epg-config.el
+++ b/lisp/epg-config.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/lisp/epg.el b/lisp/epg.el
index 1e24b8d..8a46966 100644
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/lisp/erc/erc-autoaway.el b/lisp/erc/erc-autoaway.el
index 8275279..aa74957 100644
--- a/lisp/erc/erc-autoaway.el
+++ b/lisp/erc/erc-autoaway.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index 3368d67..8992325 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el
index ee5d6fe..606e1a2 100644
--- a/lisp/erc/erc-button.el
+++ b/lisp/erc/erc-button.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/erc/erc-capab.el b/lisp/erc/erc-capab.el
index 0d3b237..12f6120 100644
--- a/lisp/erc/erc-capab.el
+++ b/lisp/erc/erc-capab.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/erc/erc-compat.el b/lisp/erc/erc-compat.el
index 1ad6680..ec79046 100644
--- a/lisp/erc/erc-compat.el
+++ b/lisp/erc/erc-compat.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el
index 542e190..8003661 100644
--- a/lisp/erc/erc-dcc.el
+++ b/lisp/erc/erc-dcc.el
@@ -23,7 +23,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/erc/erc-desktop-notifications.el 
b/lisp/erc/erc-desktop-notifications.el
index 113f1cf..47504c9 100644
--- a/lisp/erc/erc-desktop-notifications.el
+++ b/lisp/erc/erc-desktop-notifications.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/erc/erc-ezbounce.el b/lisp/erc/erc-ezbounce.el
index 9473578..3af1bd7 100644
--- a/lisp/erc/erc-ezbounce.el
+++ b/lisp/erc/erc-ezbounce.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/erc/erc-fill.el b/lisp/erc/erc-fill.el
index d58ccfa..2ca67d2 100644
--- a/lisp/erc/erc-fill.el
+++ b/lisp/erc/erc-fill.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/erc/erc-goodies.el b/lisp/erc/erc-goodies.el
index 1f27036..a655d48 100644
--- a/lisp/erc/erc-goodies.el
+++ b/lisp/erc/erc-goodies.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/erc/erc-ibuffer.el b/lisp/erc/erc-ibuffer.el
index cb9c21f..03d51d9 100644
--- a/lisp/erc/erc-ibuffer.el
+++ b/lisp/erc/erc-ibuffer.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -189,4 +189,3 @@
 ;; indent-tabs-mode: t
 ;; tab-width: 8
 ;; End:
-
diff --git a/lisp/erc/erc-identd.el b/lisp/erc/erc-identd.el
index 61360f4..c237325 100644
--- a/lisp/erc/erc-identd.el
+++ b/lisp/erc/erc-identd.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -118,4 +118,3 @@ The default port is specified by `erc-identd-port'."
 ;; indent-tabs-mode: t
 ;; tab-width: 8
 ;; End:
-
diff --git a/lisp/erc/erc-imenu.el b/lisp/erc/erc-imenu.el
index 95c2b35..9440cb1 100644
--- a/lisp/erc/erc-imenu.el
+++ b/lisp/erc/erc-imenu.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -134,4 +134,3 @@ Don't rely on this function, read it first!"
 ;; indent-tabs-mode: t
 ;; tab-width: 8
 ;; End:
-
diff --git a/lisp/erc/erc-join.el b/lisp/erc/erc-join.el
index aa83ffe..3c4136c 100644
--- a/lisp/erc/erc-join.el
+++ b/lisp/erc/erc-join.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -218,4 +218,3 @@ This function is run from `erc-nickserv-identified-hook'."
 ;; indent-tabs-mode: t
 ;; tab-width: 8
 ;; End:
-
diff --git a/lisp/erc/erc-lang.el b/lisp/erc/erc-lang.el
index 4aa3152..7551b1d 100644
--- a/lisp/erc/erc-lang.el
+++ b/lisp/erc/erc-lang.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -180,7 +180,7 @@ This is based on the technical contents of ISO 639:1988 
(E/F)
 \"Code for the representation of names of languages\".
 
 Typed by address@hidden 1990-11-30
-   <ftp://dkuug.dk/i18n/ISO_639>
+   <ftp://std.dkuug.dk/i18n/iso_639>
 Minor corrections, 1992-09-08 by Keld Simonsen
 Sundanese corrected, 1992-11-11 by Keld Simonsen
 Telugu corrected, 1995-08-24 by Keld Simonsen
diff --git a/lisp/erc/erc-list.el b/lisp/erc/erc-list.el
index 7d6413e..4248c6a 100644
--- a/lisp/erc/erc-list.el
+++ b/lisp/erc/erc-list.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -228,4 +228,3 @@ to RFC and send the LIST header (#321) at start of list 
transmission."
 ;; indent-tabs-mode: t
 ;; tab-width: 8
 ;; End:
-
diff --git a/lisp/erc/erc-log.el b/lisp/erc/erc-log.el
index 09cffdc..b8b0029 100644
--- a/lisp/erc/erc-log.el
+++ b/lisp/erc/erc-log.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/erc/erc-match.el b/lisp/erc/erc-match.el
index 3f6b1e5..60e9425 100644
--- a/lisp/erc/erc-match.el
+++ b/lisp/erc/erc-match.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/erc/erc-menu.el b/lisp/erc/erc-menu.el
index 9db1e75..79e5831 100644
--- a/lisp/erc/erc-menu.el
+++ b/lisp/erc/erc-menu.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -151,4 +151,3 @@ ERC menu yet.")
 ;; indent-tabs-mode: t
 ;; tab-width: 8
 ;; End:
-
diff --git a/lisp/erc/erc-netsplit.el b/lisp/erc/erc-netsplit.el
index 583e071..71ac010 100644
--- a/lisp/erc/erc-netsplit.el
+++ b/lisp/erc/erc-netsplit.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -151,7 +151,7 @@ join from that split has been detected or not.")
            (when (nth 2 ass)
              ;; There was already a netjoin for this netsplit, it
              ;; seems like the old one didn't get finished...
-             (erc-display-message 
+             (erc-display-message
               parsed 'notice (process-buffer proc)
               'netsplit ?s split)
              (setcar (nthcdr 2 ass) t)
@@ -208,4 +208,3 @@ join from that split has been detected or not.")
 ;; indent-tabs-mode: t
 ;; tab-width: 8
 ;; End:
-
diff --git a/lisp/erc/erc-networks.el b/lisp/erc/erc-networks.el
index 59a9356..bf964bc 100644
--- a/lisp/erc/erc-networks.el
+++ b/lisp/erc/erc-networks.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/erc/erc-notify.el b/lisp/erc/erc-notify.el
index 54c8beb..983773d 100644
--- a/lisp/erc/erc-notify.el
+++ b/lisp/erc/erc-notify.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/erc/erc-page.el b/lisp/erc/erc-page.el
index d441b09..1b453c5 100644
--- a/lisp/erc/erc-page.el
+++ b/lisp/erc/erc-page.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -110,4 +110,3 @@ receive pages if `erc-page-mode' is on."
 ;; indent-tabs-mode: t
 ;; tab-width: 8
 ;; End:
-
diff --git a/lisp/erc/erc-pcomplete.el b/lisp/erc/erc-pcomplete.el
index 6dfe0a7..893bcc0 100644
--- a/lisp/erc/erc-pcomplete.el
+++ b/lisp/erc/erc-pcomplete.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -225,7 +225,7 @@ If optional argument IGNORE-SELF is non-nil, don't return 
the current nick."
                  (erc-get-channel-user-list)))
         (nicks nil))
     (dolist (user users)
-      (unless (or (not user) 
+      (unless (or (not user)
                   (and ignore-self
                        (string= (erc-server-user-nickname (car user))
                                 (erc-current-nick))))
@@ -286,4 +286,3 @@ up to where point is right now."
 ;; Local Variables:
 ;; indent-tabs-mode: nil
 ;; End:
-
diff --git a/lisp/erc/erc-replace.el b/lisp/erc/erc-replace.el
index ec443ec..0b27076 100644
--- a/lisp/erc/erc-replace.el
+++ b/lisp/erc/erc-replace.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -93,4 +93,3 @@ It replaces text according to `erc-replace-alist'."
 ;; indent-tabs-mode: t
 ;; tab-width: 8
 ;; End:
-
diff --git a/lisp/erc/erc-ring.el b/lisp/erc/erc-ring.el
index 4e31ec2..174eac2 100644
--- a/lisp/erc/erc-ring.el
+++ b/lisp/erc/erc-ring.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/erc/erc-services.el b/lisp/erc/erc-services.el
index 6e7c918..bce7711 100644
--- a/lisp/erc/erc-services.el
+++ b/lisp/erc/erc-services.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/erc/erc-sound.el b/lisp/erc/erc-sound.el
index 4ca7a59..8992639 100644
--- a/lisp/erc/erc-sound.el
+++ b/lisp/erc/erc-sound.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -148,4 +148,3 @@ See also `play-sound-file'."
 ;; indent-tabs-mode: t
 ;; tab-width: 8
 ;; End:
-
diff --git a/lisp/erc/erc-speedbar.el b/lisp/erc/erc-speedbar.el
index 4f44f41..f530470 100644
--- a/lisp/erc/erc-speedbar.el
+++ b/lisp/erc/erc-speedbar.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/erc/erc-spelling.el b/lisp/erc/erc-spelling.el
index 9b0e5fa..2ccc54f 100644
--- a/lisp/erc/erc-spelling.el
+++ b/lisp/erc/erc-spelling.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/erc/erc-stamp.el b/lisp/erc/erc-stamp.el
index 7ce22b3..2796722 100644
--- a/lisp/erc/erc-stamp.el
+++ b/lisp/erc/erc-stamp.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -420,4 +420,3 @@ enabled when the message was inserted."
 ;; indent-tabs-mode: t
 ;; tab-width: 8
 ;; End:
-
diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el
index c49971e..b1b893b 100644
--- a/lisp/erc/erc-track.el
+++ b/lisp/erc/erc-track.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/erc/erc-truncate.el b/lisp/erc/erc-truncate.el
index 7f5bb32..a50e2fb 100644
--- a/lisp/erc/erc-truncate.el
+++ b/lisp/erc/erc-truncate.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -115,4 +115,3 @@ Meant to be used in hooks, like `erc-insert-post-hook'."
 ;; indent-tabs-mode: t
 ;; tab-width: 8
 ;; End:
-
diff --git a/lisp/erc/erc-xdcc.el b/lisp/erc/erc-xdcc.el
index 4b0b7b9..290e56e 100644
--- a/lisp/erc/erc-xdcc.el
+++ b/lisp/erc/erc-xdcc.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -136,4 +136,3 @@ being evaluated and should return strings."
 ;; indent-tabs-mode: t
 ;; tab-width: 8
 ;; End:
-
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 8547821..ab36371 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -28,20 +28,20 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
 ;; ERC is a powerful, modular, and extensible IRC client for Emacs.
 
 ;; For more information, see the following URLs:
-;; * http://sv.gnu.org/projects/erc/
+;; * https://sv.gnu.org/projects/erc/
 ;; * http://www.emacswiki.org/cgi-bin/wiki/ERC
 
 
 
 ;; As of 2006-06-13, ERC development is now hosted on Savannah
-;; (http://sv.gnu.org/projects/erc).  I invite everyone who wants to
+;; (https://sv.gnu.org/projects/erc).  I invite everyone who wants to
 ;; hack on it to contact me <address@hidden> in order to get write
 ;; access to the shared Arch archive.
 
diff --git a/lisp/eshell/em-alias.el b/lisp/eshell/em-alias.el
index 990eb02..f951efa65 100644
--- a/lisp/eshell/em-alias.el
+++ b/lisp/eshell/em-alias.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/eshell/em-banner.el b/lisp/eshell/em-banner.el
index aee7daa..268b428 100644
--- a/lisp/eshell/em-banner.el
+++ b/lisp/eshell/em-banner.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/eshell/em-basic.el b/lisp/eshell/em-basic.el
index 47c2cb4..33ce3b5 100644
--- a/lisp/eshell/em-basic.el
+++ b/lisp/eshell/em-basic.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/eshell/em-cmpl.el b/lisp/eshell/em-cmpl.el
index 5713486..c64c2df 100644
--- a/lisp/eshell/em-cmpl.el
+++ b/lisp/eshell/em-cmpl.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/eshell/em-dirs.el b/lisp/eshell/em-dirs.el
index c10ff16..0d87f2a 100644
--- a/lisp/eshell/em-dirs.el
+++ b/lisp/eshell/em-dirs.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/eshell/em-glob.el b/lisp/eshell/em-glob.el
index fee3ff2..11d7ffc 100644
--- a/lisp/eshell/em-glob.el
+++ b/lisp/eshell/em-glob.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/eshell/em-hist.el b/lisp/eshell/em-hist.el
index 5c6e629..1ab3c60 100644
--- a/lisp/eshell/em-hist.el
+++ b/lisp/eshell/em-hist.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/eshell/em-ls.el b/lisp/eshell/em-ls.el
index 38e3813..bb087d2 100644
--- a/lisp/eshell/em-ls.el
+++ b/lisp/eshell/em-ls.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/eshell/em-pred.el b/lisp/eshell/em-pred.el
index 9e6890e..72a7bc4 100644
--- a/lisp/eshell/em-pred.el
+++ b/lisp/eshell/em-pred.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/eshell/em-prompt.el b/lisp/eshell/em-prompt.el
index 2fd1db2..76dd13f 100644
--- a/lisp/eshell/em-prompt.el
+++ b/lisp/eshell/em-prompt.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/eshell/em-rebind.el b/lisp/eshell/em-rebind.el
index a1f9054..07f4318 100644
--- a/lisp/eshell/em-rebind.el
+++ b/lisp/eshell/em-rebind.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/eshell/em-script.el b/lisp/eshell/em-script.el
index b8333ad..bbc2f9a 100644
--- a/lisp/eshell/em-script.el
+++ b/lisp/eshell/em-script.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/eshell/em-smart.el b/lisp/eshell/em-smart.el
index 7181986..f79f463 100644
--- a/lisp/eshell/em-smart.el
+++ b/lisp/eshell/em-smart.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/eshell/em-term.el b/lisp/eshell/em-term.el
index ea38f12..261a32e 100644
--- a/lisp/eshell/em-term.el
+++ b/lisp/eshell/em-term.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/eshell/em-tramp.el b/lisp/eshell/em-tramp.el
index d269722..e322cea 100644
--- a/lisp/eshell/em-tramp.el
+++ b/lisp/eshell/em-tramp.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el
index 86e0d82..a865969 100644
--- a/lisp/eshell/em-unix.el
+++ b/lisp/eshell/em-unix.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/eshell/em-xtra.el b/lisp/eshell/em-xtra.el
index fe839de..7b80f64 100644
--- a/lisp/eshell/em-xtra.el
+++ b/lisp/eshell/em-xtra.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/eshell/esh-arg.el b/lisp/eshell/esh-arg.el
index 7843ca1..b317f4e 100644
--- a/lisp/eshell/esh-arg.el
+++ b/lisp/eshell/esh-arg.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el
index 2434220..6c26af8 100644
--- a/lisp/eshell/esh-cmd.el
+++ b/lisp/eshell/esh-cmd.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/eshell/esh-ext.el b/lisp/eshell/esh-ext.el
index 0b29230..14ae6b4 100644
--- a/lisp/eshell/esh-ext.el
+++ b/lisp/eshell/esh-ext.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/eshell/esh-io.el b/lisp/eshell/esh-io.el
index 97d48c1..ca79198 100644
--- a/lisp/eshell/esh-io.el
+++ b/lisp/eshell/esh-io.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el
index 0999f9c..ea2fe1a 100644
--- a/lisp/eshell/esh-mode.el
+++ b/lisp/eshell/esh-mode.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/eshell/esh-module.el b/lisp/eshell/esh-module.el
index cbff8c8..fe4c88e 100644
--- a/lisp/eshell/esh-module.el
+++ b/lisp/eshell/esh-module.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/lisp/eshell/esh-opt.el b/lisp/eshell/esh-opt.el
index 59757ab..c141fe0 100644
--- a/lisp/eshell/esh-opt.el
+++ b/lisp/eshell/esh-opt.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/eshell/esh-proc.el b/lisp/eshell/esh-proc.el
index ba5cb5c..3e9ac28 100644
--- a/lisp/eshell/esh-proc.el
+++ b/lisp/eshell/esh-proc.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el
index d65839b..c204ec8 100644
--- a/lisp/eshell/esh-util.el
+++ b/lisp/eshell/esh-util.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/eshell/esh-var.el b/lisp/eshell/esh-var.el
index cdd05bd..d038609 100644
--- a/lisp/eshell/esh-var.el
+++ b/lisp/eshell/esh-var.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el
index faf5f89..f85f0e8 100644
--- a/lisp/eshell/eshell.el
+++ b/lisp/eshell/eshell.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/expand.el b/lisp/expand.el
index d06287e..7dab205 100644
--- a/lisp/expand.el
+++ b/lisp/expand.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/ezimage.el b/lisp/ezimage.el
index 25e0ed3..115ebc5 100644
--- a/lisp/ezimage.el
+++ b/lisp/ezimage.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/face-remap.el b/lisp/face-remap.el
index 4e6ada8..129b903 100644
--- a/lisp/face-remap.el
+++ b/lisp/face-remap.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;
 
 ;;; Commentary:
diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index ae5865d..5db640b 100644
--- a/lisp/facemenu.el
+++ b/lisp/facemenu.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/faces.el b/lisp/faces.el
index d9c90fd..f85d31e 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/ffap.el b/lisp/ffap.el
index 8bcfbfc..2228aca 100644
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -6,7 +6,6 @@
 ;; Maintainer: address@hidden
 ;; Created: 29 Mar 1993
 ;; Keywords: files, hypermedia, matching, mouse, convenience
-;; X-URL: ftp://ftp.mathcs.emory.edu/pub/mic/emacs/
 
 ;; This file is part of GNU Emacs.
 
@@ -21,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 ;;; Commentary:
diff --git a/lisp/filecache.el b/lisp/filecache.el
index 02b5f79..38a434b 100644
--- a/lisp/filecache.el
+++ b/lisp/filecache.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/filenotify.el b/lisp/filenotify.el
index 64cfab1..18c44ec 100644
--- a/lisp/filenotify.el
+++ b/lisp/filenotify.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary
 
@@ -71,7 +71,7 @@ struct.")
   "Remove DESCRIPTOR from `file-notify-descriptors'.
 DESCRIPTOR should be an object returned by `file-notify-add-watch'.
 If it is registered in `file-notify-descriptors', a stopped event is sent."
-  (when-let (watch (gethash descriptor file-notify-descriptors))
+  (when-let* ((watch (gethash descriptor file-notify-descriptors)))
     ;; Send `stopped' event.
     (unwind-protect
         (funcall
@@ -106,12 +106,12 @@ It is a form ((DESCRIPTOR ACTION FILE [FILE1-OR-COOKIE]) 
CALLBACK).")
 (defun file-notify--event-watched-file (event)
   "Return file or directory being watched.
 Could be different from the directory watched by the backend library."
-  (when-let (watch (gethash (car event) file-notify-descriptors))
+  (when-let* ((watch (gethash (car event) file-notify-descriptors)))
     (file-notify--watch-absolute-filename watch)))
 
 (defun file-notify--event-file-name (event)
   "Return file name of file notification event, or nil."
-  (when-let (watch (gethash (car event) file-notify-descriptors))
+  (when-let* ((watch (gethash (car event) file-notify-descriptors)))
     (directory-file-name
      (expand-file-name
       (or  (and (stringp (nth 2 event)) (nth 2 event)) "")
@@ -121,7 +121,7 @@ Could be different from the directory watched by the 
backend library."
 (defun file-notify--event-file1-name (event)
   "Return second file name of file notification event, or nil.
 This is available in case a file has been moved."
-  (when-let (watch (gethash (car event) file-notify-descriptors))
+  (when-let* ((watch (gethash (car event) file-notify-descriptors)))
     (and (stringp (nth 3 event))
          (directory-file-name
           (expand-file-name
@@ -375,7 +375,7 @@ FILE is the name of the file whose event is being reported."
 (defun file-notify-rm-watch (descriptor)
   "Remove an existing watch specified by its DESCRIPTOR.
 DESCRIPTOR should be an object returned by `file-notify-add-watch'."
-  (when-let (watch (gethash descriptor file-notify-descriptors))
+  (when-let* ((watch (gethash descriptor file-notify-descriptors)))
     (let ((handler (find-file-name-handler
                     (file-notify--watch-directory watch)
                     'file-notify-rm-watch)))
@@ -399,7 +399,7 @@ DESCRIPTOR should be an object returned by 
`file-notify-add-watch'."
 (defun file-notify-valid-p (descriptor)
   "Check a watch specified by its DESCRIPTOR.
 DESCRIPTOR should be an object returned by `file-notify-add-watch'."
-  (when-let (watch (gethash descriptor file-notify-descriptors))
+  (when-let* ((watch (gethash descriptor file-notify-descriptors)))
     (let ((handler (find-file-name-handler
                     (file-notify--watch-directory watch)
                     'file-notify-valid-p)))
diff --git a/lisp/files-x.el b/lisp/files-x.el
index b7c6f51..6677370 100644
--- a/lisp/files-x.el
+++ b/lisp/files-x.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/files.el b/lisp/files.el
index de9fab8..c55c809 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -517,10 +517,12 @@ updates before the buffer is saved, use 
`before-save-hook'.")
     'write-contents-functions "22.1")
 (defvar write-contents-functions nil
   "List of functions to be called before writing out a buffer to a file.
-Only used by `save-buffer'.
-If one of them returns non-nil, the file is considered already written
-and the rest are not called and neither are the functions in
-`write-file-functions'.
+
+Only used by `save-buffer'.  If one of them returns non-nil, the
+file is considered already written and the rest are not called
+and neither are the functions in `write-file-functions'.  This
+hook can thus be used to create save behavior for buffers that
+are not visiting a file at all.
 
 This variable is meant to be used for hooks that pertain to the
 buffer's contents, not to the particular visited file; thus,
@@ -4875,9 +4877,12 @@ in such cases.")
 
 (defun basic-save-buffer (&optional called-interactively)
   "Save the current buffer in its visited file, if it has been modified.
-The hooks `write-contents-functions' and `write-file-functions' get a chance
-to do the job of saving; if they do not, then the buffer is saved in
-the visited file in the usual way.
+
+The hooks `write-contents-functions', `local-write-file-hooks'
+and `write-file-functions' get a chance to do the job of saving;
+if they do not, then the buffer is saved in the visited file in
+the usual way.
+
 Before and after saving the buffer, this function runs
 `before-save-hook' and `after-save-hook', respectively."
   (interactive '(called-interactively))
@@ -4886,29 +4891,14 @@ Before and after saving the buffer, this function runs
     (if (buffer-base-buffer)
        (set-buffer (buffer-base-buffer)))
     (if (or (buffer-modified-p)
-           ;; handle the case when no modification has been made but
-           ;; the file disappeared since visited
+           ;; Handle the case when no modification has been made but
+           ;; the file disappeared since visited.
            (and buffer-file-name
                 (not (file-exists-p buffer-file-name))))
        (let ((recent-save (recent-auto-save-p))
              setmodes)
-          ;; If buffer has no file name, ask user for one.
-         (or buffer-file-name
-              (let ((filename
-                     (expand-file-name
-                      (read-file-name "File to save in: "
-                                      nil (expand-file-name (buffer-name))))))
-                (if (file-exists-p filename)
-                    (if (file-directory-p filename)
-                        ;; Signal an error if the user specified the name of an
-                        ;; existing directory.
-                        (error "%s is a directory" filename)
-                      (unless (y-or-n-p (format-message
-                                         "File `%s' exists; overwrite? "
-                                         filename))
-                        (error "Canceled"))))
-                (set-visited-file-name filename)))
-         (or (verify-visited-file-modtime (current-buffer))
+         (or (null buffer-file-name)
+              (verify-visited-file-modtime (current-buffer))
              (not (file-exists-p buffer-file-name))
              (yes-or-no-p
               (format
@@ -4920,6 +4910,7 @@ Before and after saving the buffer, this function runs
            (save-excursion
              (and (> (point-max) (point-min))
                   (not find-file-literally)
+                   (null buffer-read-only)
                   (/= (char-after (1- (point-max))) ?\n)
                   (not (and (eq selective-display t)
                             (= (char-after (1- (point-max))) ?\r)))
@@ -4932,46 +4923,65 @@ Before and after saving the buffer, this function runs
                   (save-excursion
                     (goto-char (point-max))
                     (insert ?\n))))
-           ;; Support VC version backups.
-           (vc-before-save)
            ;; Don't let errors prevent saving the buffer.
            (with-demoted-errors (run-hooks 'before-save-hook))
-           (or (run-hook-with-args-until-success 'write-contents-functions)
-               (run-hook-with-args-until-success 'local-write-file-hooks)
-               (run-hook-with-args-until-success 'write-file-functions)
-               ;; If a hook returned t, file is already "written".
-               ;; Otherwise, write it the usual way now.
-               (let ((dir (file-name-directory
-                           (expand-file-name buffer-file-name))))
-                 (unless (file-exists-p dir)
-                   (if (y-or-n-p
-                        (format-message
-                          "Directory `%s' does not exist; create? " dir))
-                       (make-directory dir t)
-                     (error "Canceled")))
-                 (setq setmodes (basic-save-buffer-1))))
+            ;; Give `write-contents-functions' a chance to
+            ;; short-circuit the whole process.
+           (unless (run-hook-with-args-until-success 'write-contents-functions)
+              ;; If buffer has no file name, ask user for one.
+              (or buffer-file-name
+                  (let ((filename
+                         (expand-file-name
+                          (read-file-name "File to save in: "
+                                          nil (expand-file-name 
(buffer-name))))))
+                    (if (file-exists-p filename)
+                        (if (file-directory-p filename)
+                            ;; Signal an error if the user specified the name 
of an
+                            ;; existing directory.
+                            (error "%s is a directory" filename)
+                          (unless (y-or-n-p (format-message
+                                             "File `%s' exists; overwrite? "
+                                             filename))
+                            (error "Canceled"))))
+                    (set-visited-file-name filename)))
+              ;; Support VC version backups.
+             (vc-before-save)
+             (or (run-hook-with-args-until-success 'local-write-file-hooks)
+                 (run-hook-with-args-until-success 'write-file-functions)
+                 ;; If a hook returned t, file is already "written".
+                 ;; Otherwise, write it the usual way now.
+                 (let ((dir (file-name-directory
+                             (expand-file-name buffer-file-name))))
+                   (unless (file-exists-p dir)
+                     (if (y-or-n-p
+                          (format-message
+                            "Directory `%s' does not exist; create? " dir))
+                         (make-directory dir t)
+                       (error "Canceled")))
+                   (setq setmodes (basic-save-buffer-1)))))
            ;; Now we have saved the current buffer.  Let's make sure
            ;; that buffer-file-coding-system is fixed to what
            ;; actually used for saving by binding it locally.
-           (if save-buffer-coding-system
-               (setq save-buffer-coding-system last-coding-system-used)
-             (setq buffer-file-coding-system last-coding-system-used))
-           (setq buffer-file-number
-                 (nthcdr 10 (file-attributes buffer-file-name)))
-           (if setmodes
-               (condition-case ()
-                   (progn
-                     (unless
-                         (with-demoted-errors
-                           (set-file-modes buffer-file-name (car setmodes)))
-                       (set-file-extended-attributes buffer-file-name
-                                                     (nth 1 setmodes))))
-                 (error nil))))
-         ;; If the auto-save file was recent before this command,
-         ;; delete it now.
-         (delete-auto-save-file-if-necessary recent-save)
-         ;; Support VC `implicit' locking.
-         (vc-after-save)
+            (when buffer-file-name
+             (if save-buffer-coding-system
+                 (setq save-buffer-coding-system last-coding-system-used)
+               (setq buffer-file-coding-system last-coding-system-used))
+             (setq buffer-file-number
+                   (nthcdr 10 (file-attributes buffer-file-name)))
+             (if setmodes
+                 (condition-case ()
+                     (progn
+                       (unless
+                           (with-demoted-errors
+                               (set-file-modes buffer-file-name (car 
setmodes)))
+                         (set-file-extended-attributes buffer-file-name
+                                                       (nth 1 setmodes))))
+                   (error nil)))
+              ;; Support VC `implicit' locking.
+             (vc-after-save))
+            ;; If the auto-save file was recent before this command,
+           ;; delete it now.
+           (delete-auto-save-file-if-necessary recent-save))
          (run-hooks 'after-save-hook))
       (or noninteractive
           (not called-interactively)
@@ -5183,7 +5193,9 @@ change the additional actions you can take on files."
                      (and pred
                           (progn
                             (set-buffer buffer)
-                            (and buffer-offer-save (> (buffer-size) 0)))))
+                            (and buffer-offer-save (> (buffer-size) 0))))
+                     (buffer-local-value
+                      'write-contents-functions buffer))
                     (or (not (functionp pred))
                         (with-current-buffer buffer (funcall pred)))
                     (if arg
diff --git a/lisp/filesets.el b/lisp/filesets.el
index 4542d6a..c2bdec0 100644
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/lisp/find-cmd.el b/lisp/find-cmd.el
index 93abe02..9801ee3 100644
--- a/lisp/find-cmd.el
+++ b/lisp/find-cmd.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/find-dired.el b/lisp/find-dired.el
index 2292b5f..2d2540b 100644
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/find-file.el b/lisp/find-file.el
index d369169..8b45c9d 100644
--- a/lisp/find-file.el
+++ b/lisp/find-file.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/find-lisp.el b/lisp/find-lisp.el
index a795211..e079e15 100644
--- a/lisp/find-lisp.el
+++ b/lisp/find-lisp.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/finder.el b/lisp/finder.el
index 361572f..b599c44 100644
--- a/lisp/finder.el
+++ b/lisp/finder.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -209,7 +209,7 @@ from; the default is `load-path'."
 ;; There are multiple files in the tree with the same basename.
 ;; So skipping files based on basename means you randomly (depending
 ;; on which order the files are traversed in) miss some packages.
-;; http://debbugs.gnu.org/14010
+;; https://debbugs.gnu.org/14010
 ;; You might think this could lead to two files providing the same package,
 ;; but it does not, because the duplicates are (at time of writing)
 ;; all due to files in cedet, which end up with package-override set.
diff --git a/lisp/flow-ctrl.el b/lisp/flow-ctrl.el
index c0609b0..5b16ee4 100644
--- a/lisp/flow-ctrl.el
+++ b/lisp/flow-ctrl.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/foldout.el b/lisp/foldout.el
index da69f8b..3f64854 100644
--- a/lisp/foldout.el
+++ b/lisp/foldout.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/follow.el b/lisp/follow.el
index 5dd74f3..761513b 100644
--- a/lisp/follow.el
+++ b/lisp/follow.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/font-core.el b/lisp/font-core.el
index f64e1b6..06b36a2 100644
--- a/lisp/font-core.el
+++ b/lisp/font-core.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 5eedb78..3c9660d 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/format-spec.el b/lisp/format-spec.el
index 95ed000..fecf9d7 100644
--- a/lisp/format-spec.el
+++ b/lisp/format-spec.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/format.el b/lisp/format.el
index cbcba82..dbb4048 100644
--- a/lisp/format.el
+++ b/lisp/format.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/forms.el b/lisp/forms.el
index e13dc17..dacbd8c 100644
--- a/lisp/forms.el
+++ b/lisp/forms.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/frame.el b/lisp/frame.el
index 2a14302..5f0e97d 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/frameset.el b/lisp/frameset.el
index ebf09d3..661f0ae 100644
--- a/lisp/frameset.el
+++ b/lisp/frameset.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/fringe.el b/lisp/fringe.el
index acd13b5..3cb6f9d 100644
--- a/lisp/fringe.el
+++ b/lisp/fringe.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index 8823faa..09a5488 100644
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/gnus/canlock.el b/lisp/gnus/canlock.el
index 5157256..bb666ff 100644
--- a/lisp/gnus/canlock.el
+++ b/lisp/gnus/canlock.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/deuglify.el b/lisp/gnus/deuglify.el
index af8ccf1..897ca70 100644
--- a/lisp/gnus/deuglify.el
+++ b/lisp/gnus/deuglify.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gmm-utils.el b/lisp/gnus/gmm-utils.el
index 4503564..4050046 100644
--- a/lisp/gnus/gmm-utils.el
+++ b/lisp/gnus/gmm-utils.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el
index 93d8652..daf5781 100644
--- a/lisp/gnus/gnus-agent.el
+++ b/lisp/gnus/gnus-agent.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 8fc5eba..986bb47 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -4244,7 +4244,7 @@ If variable `gnus-use-long-file-name' is non-nil, it is
 
 (defun article-verify-x-pgp-sig ()
   "Verify X-PGP-Sig."
-  ;; <ftp://ftp.isc.org/pub/pgpcontrol/FORMAT>
+  ;; <https://ftp.isc.org/pub/pgpcontrol/FORMAT>
   (interactive)
   (if (gnus-buffer-live-p gnus-original-article-buffer)
       (let ((sig (with-current-buffer gnus-original-article-buffer
@@ -6342,8 +6342,9 @@ Provided for backwards compatibility."
       ;; in each element are in the increasing order.
       (dolist (handle (reverse gnus-article-mime-handle-alist))
        (if (stringp (cadr handle))
-           (setq flat (nconc flat (gnus-article-mime-handles
-                                   (cddr handle) (list (car handle)) flat)))
+           (when (cddr handle)
+             (setq flat (nconc flat (gnus-article-mime-handles
+                                     (cddr handle) (list (car handle)) flat))))
          (delq (rassq (cdr handle) flat) flat)
          (setq flat (nconc flat (list (cons (list (car handle))
                                             (cdr handle)))))))
diff --git a/lisp/gnus/gnus-async.el b/lisp/gnus/gnus-async.el
index 11e765d..b9aa763 100644
--- a/lisp/gnus/gnus-async.el
+++ b/lisp/gnus/gnus-async.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus-bcklg.el b/lisp/gnus/gnus-bcklg.el
index ff8fcca..30f377f 100644
--- a/lisp/gnus/gnus-bcklg.el
+++ b/lisp/gnus/gnus-bcklg.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus-bookmark.el b/lisp/gnus/gnus-bookmark.el
index 6558813..cef7df5 100644
--- a/lisp/gnus/gnus-bookmark.el
+++ b/lisp/gnus/gnus-bookmark.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus-cache.el b/lisp/gnus/gnus-cache.el
index fa3df7b..12c8903 100644
--- a/lisp/gnus/gnus-cache.el
+++ b/lisp/gnus/gnus-cache.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus-cite.el b/lisp/gnus/gnus-cite.el
index 3194e96..3cd98ce 100644
--- a/lisp/gnus/gnus-cite.el
+++ b/lisp/gnus/gnus-cite.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus-cloud.el b/lisp/gnus/gnus-cloud.el
index 605dda2..5ea2d69 100644
--- a/lisp/gnus/gnus-cloud.el
+++ b/lisp/gnus/gnus-cloud.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus-cus.el b/lisp/gnus/gnus-cus.el
index e5787e8..600b33f 100644
--- a/lisp/gnus/gnus-cus.el
+++ b/lisp/gnus/gnus-cus.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus-delay.el b/lisp/gnus/gnus-delay.el
index 7b59967..0917b02 100644
--- a/lisp/gnus/gnus-delay.el
+++ b/lisp/gnus/gnus-delay.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus-demon.el b/lisp/gnus/gnus-demon.el
index 81f9650..28e2699 100644
--- a/lisp/gnus/gnus-demon.el
+++ b/lisp/gnus/gnus-demon.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus-diary.el b/lisp/gnus/gnus-diary.el
index b81c6d0..5000486 100644
--- a/lisp/gnus/gnus-diary.el
+++ b/lisp/gnus/gnus-diary.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 ;;; Commentary:
diff --git a/lisp/gnus/gnus-dired.el b/lisp/gnus/gnus-dired.el
index 10533ca..9394c3d 100644
--- a/lisp/gnus/gnus-dired.el
+++ b/lisp/gnus/gnus-dired.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus-draft.el b/lisp/gnus/gnus-draft.el
index 6e7b307..77bf93a 100644
--- a/lisp/gnus/gnus-draft.el
+++ b/lisp/gnus/gnus-draft.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus-dup.el b/lisp/gnus/gnus-dup.el
index f91ebbe..2f21efb 100644
--- a/lisp/gnus/gnus-dup.el
+++ b/lisp/gnus/gnus-dup.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus-eform.el b/lisp/gnus/gnus-eform.el
index 93af05f..6f8722b 100644
--- a/lisp/gnus/gnus-eform.el
+++ b/lisp/gnus/gnus-eform.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus-fun.el b/lisp/gnus/gnus-fun.el
index 787c0e3..1b45847 100644
--- a/lisp/gnus/gnus-fun.el
+++ b/lisp/gnus/gnus-fun.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus-gravatar.el b/lisp/gnus/gnus-gravatar.el
index b4763c7..bcf09f4 100644
--- a/lisp/gnus/gnus-gravatar.el
+++ b/lisp/gnus/gnus-gravatar.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 8a061b7..985efe6 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -2429,7 +2429,7 @@ Valid input formats include:
     (gnus-read-ephemeral-gmane-group group start range)))
 
 (defcustom gnus-bug-group-download-format-alist
-  '((emacs . 
"http://debbugs.gnu.org/cgi/bugreport.cgi?bug=%s;mboxmaint=yes;mboxstat=yes";)
+  '((emacs . 
"https://debbugs.gnu.org/cgi/bugreport.cgi?bug=%s;mboxmaint=yes;mboxstat=yes";)
     (debian
      . 
"http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=%s&mbox=yes;mboxmaint=yes";))
   "Alist of symbols for bug trackers and the corresponding URL format string.
diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el
index d4dccfb..6d52955 100644
--- a/lisp/gnus/gnus-html.el
+++ b/lisp/gnus/gnus-html.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus-icalendar.el b/lisp/gnus/gnus-icalendar.el
index 1f194f8..cca4a81 100644
--- a/lisp/gnus/gnus-icalendar.el
+++ b/lisp/gnus/gnus-icalendar.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus-int.el b/lisp/gnus/gnus-int.el
index aaeba4a..0c738128 100644
--- a/lisp/gnus/gnus-int.el
+++ b/lisp/gnus/gnus-int.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus-kill.el b/lisp/gnus/gnus-kill.el
index c405c04..4c15471 100644
--- a/lisp/gnus/gnus-kill.el
+++ b/lisp/gnus/gnus-kill.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus-logic.el b/lisp/gnus/gnus-logic.el
index b149972..4762025 100644
--- a/lisp/gnus/gnus-logic.el
+++ b/lisp/gnus/gnus-logic.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus-mh.el b/lisp/gnus/gnus-mh.el
index 502b295..9062292 100644
--- a/lisp/gnus/gnus-mh.el
+++ b/lisp/gnus/gnus-mh.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus-ml.el b/lisp/gnus/gnus-ml.el
index 32cf171..e3cdd9c 100644
--- a/lisp/gnus/gnus-ml.el
+++ b/lisp/gnus/gnus-ml.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus-mlspl.el b/lisp/gnus/gnus-mlspl.el
index c42c34a..cd6bbd0 100644
--- a/lisp/gnus/gnus-mlspl.el
+++ b/lisp/gnus/gnus-mlspl.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index 85969ed..7a28be1 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus-notifications.el b/lisp/gnus/gnus-notifications.el
index 288dbe1..e97e6a6 100644
--- a/lisp/gnus/gnus-notifications.el
+++ b/lisp/gnus/gnus-notifications.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus-picon.el b/lisp/gnus/gnus-picon.el
index 41463e3..da56b4e 100644
--- a/lisp/gnus/gnus-picon.el
+++ b/lisp/gnus/gnus-picon.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus-range.el b/lisp/gnus/gnus-range.el
index 0680123..b30b2e9 100644
--- a/lisp/gnus/gnus-range.el
+++ b/lisp/gnus/gnus-range.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el
index 51f6459..466238d 100644
--- a/lisp/gnus/gnus-registry.el
+++ b/lisp/gnus/gnus-registry.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus-rfc1843.el b/lisp/gnus/gnus-rfc1843.el
index a47e19b..6477d01 100644
--- a/lisp/gnus/gnus-rfc1843.el
+++ b/lisp/gnus/gnus-rfc1843.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus-salt.el b/lisp/gnus/gnus-salt.el
index 7037328..ab2ffa9 100644
--- a/lisp/gnus/gnus-salt.el
+++ b/lisp/gnus/gnus-salt.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus-score.el b/lisp/gnus/gnus-score.el
index 19cf799..11a45dd 100644
--- a/lisp/gnus/gnus-score.el
+++ b/lisp/gnus/gnus-score.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -43,7 +43,7 @@ for each score file or each score file directory.  Gnus will 
decide
 by itself what score files are applicable to which group.
 
 Say you want to use the single score file
-\"/address@hidden:/pub/larsi/ding/score/soc.motss.SCORE\" and all
+\"/ftp.gnus.org:/pub/larsi/ding/score/soc.motss.SCORE\" and all
 score files in the \"/ftp.some-where:/pub/score\" directory.
 
  (setq gnus-global-score-files
diff --git a/lisp/gnus/gnus-sieve.el b/lisp/gnus/gnus-sieve.el
index 2c5fd34..00f0636 100644
--- a/lisp/gnus/gnus-sieve.el
+++ b/lisp/gnus/gnus-sieve.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus-spec.el b/lisp/gnus/gnus-spec.el
index 809371d..a614906 100644
--- a/lisp/gnus/gnus-spec.el
+++ b/lisp/gnus/gnus-spec.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus-srvr.el b/lisp/gnus/gnus-srvr.el
index bed5993..82056cf 100644
--- a/lisp/gnus/gnus-srvr.el
+++ b/lisp/gnus/gnus-srvr.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index aaa8ab9..3c3c594 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 0259692..4857109 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -9844,7 +9844,7 @@ IDNA encoded domain names looks like `xn--bar'.  If a 
string
 remain unencoded after running this function, it is likely an
 invalid IDNA string (`xn--bar' is invalid).
 
-You must have GNU Libidn (URL `http://www.gnu.org/software/libidn/')
+You must have GNU Libidn (URL `https://www.gnu.org/software/libidn/')
 installed for this command to work."
   (interactive "P")
   (gnus-summary-select-article)
diff --git a/lisp/gnus/gnus-topic.el b/lisp/gnus/gnus-topic.el
index 6d6e20d..ea42a3e 100644
--- a/lisp/gnus/gnus-topic.el
+++ b/lisp/gnus/gnus-topic.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus-undo.el b/lisp/gnus/gnus-undo.el
index 74e0601..23cabad 100644
--- a/lisp/gnus/gnus-undo.el
+++ b/lisp/gnus/gnus-undo.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index 93541f0..b7477a7 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus-uu.el b/lisp/gnus/gnus-uu.el
index 6219217..526d007 100644
--- a/lisp/gnus/gnus-uu.el
+++ b/lisp/gnus/gnus-uu.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus-vm.el b/lisp/gnus/gnus-vm.el
index 143500c..e05f849 100644
--- a/lisp/gnus/gnus-vm.el
+++ b/lisp/gnus/gnus-vm.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus-win.el b/lisp/gnus/gnus-win.el
index 255bb5f..8e47ae3 100644
--- a/lisp/gnus/gnus-win.el
+++ b/lisp/gnus/gnus-win.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index d3edcd0..8c0846b 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/gssapi.el b/lisp/gnus/gssapi.el
index b569c7f..b6801f7 100644
--- a/lisp/gnus/gssapi.el
+++ b/lisp/gnus/gssapi.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/legacy-gnus-agent.el b/lisp/gnus/legacy-gnus-agent.el
index e51181e..84db6c3 100644
--- a/lisp/gnus/legacy-gnus-agent.el
+++ b/lisp/gnus/legacy-gnus-agent.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/mail-source.el b/lisp/gnus/mail-source.el
index e15d820..3befd46 100644
--- a/lisp/gnus/mail-source.el
+++ b/lisp/gnus/mail-source.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 996b0ac..690dd28 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -5778,7 +5778,10 @@ give as trustworthy answer as possible."
           (not (string-match message-bogus-system-names message-user-fqdn)))
       ;; `message-user-fqdn' seems to be valid
       message-user-fqdn)
-     ((not (string-match message-bogus-system-names sysname))
+     ;; A system name without any dots is unlikely to be a good fully
+     ;; qualified domain name.
+     ((and (string-match "[.]" sysname)
+          (not (string-match message-bogus-system-names sysname)))
       ;; `system-name' returned the right result.
       sysname)
      ;; Try `mail-host-address'.
@@ -8410,7 +8413,7 @@ Used in `message-simplify-recipients'."
     (save-excursion
       (goto-char (point-min))
       (while (not (eobp))
-       (when-let ((props (get-text-property (point) 'display)))
+       (when-let* ((props (get-text-property (point) 'display)))
          (when (and (consp props)
                     (eq (car props) 'image))
            (put-text-property (point) (1+ (point)) 'display nil)
diff --git a/lisp/gnus/mm-archive.el b/lisp/gnus/mm-archive.el
index 103cc89..0451f21 100644
--- a/lisp/gnus/mm-archive.el
+++ b/lisp/gnus/mm-archive.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/mm-bodies.el b/lisp/gnus/mm-bodies.el
index d773289..319d789 100644
--- a/lisp/gnus/mm-bodies.el
+++ b/lisp/gnus/mm-bodies.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index 9b77dad..c6ac056 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/mm-encode.el b/lisp/gnus/mm-encode.el
index 1a9b5ab..248992e 100644
--- a/lisp/gnus/mm-encode.el
+++ b/lisp/gnus/mm-encode.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/mm-extern.el b/lisp/gnus/mm-extern.el
index a6e76ff..79d9ae3 100644
--- a/lisp/gnus/mm-extern.el
+++ b/lisp/gnus/mm-extern.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/mm-partial.el b/lisp/gnus/mm-partial.el
index e3e6f5d..68008ea 100644
--- a/lisp/gnus/mm-partial.el
+++ b/lisp/gnus/mm-partial.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/mm-url.el b/lisp/gnus/mm-url.el
index 5c8f99b..39e1af9 100644
--- a/lisp/gnus/mm-url.el
+++ b/lisp/gnus/mm-url.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index 89f397e..a7db3da 100644
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/mm-uu.el b/lisp/gnus/mm-uu.el
index 177589c..436235c 100644
--- a/lisp/gnus/mm-uu.el
+++ b/lisp/gnus/mm-uu.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el
index fb80e6b..86e2171 100644
--- a/lisp/gnus/mm-view.el
+++ b/lisp/gnus/mm-view.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/mml-sec.el b/lisp/gnus/mml-sec.el
index 57c371a..80bd8d0 100644
--- a/lisp/gnus/mml-sec.el
+++ b/lisp/gnus/mml-sec.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/mml-smime.el b/lisp/gnus/mml-smime.el
index 1821d1a..c6bc612 100644
--- a/lisp/gnus/mml-smime.el
+++ b/lisp/gnus/mml-smime.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index ce28607..9ee2c95 100644
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/mml.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/mml1991.el b/lisp/gnus/mml1991.el
index 0df908f..8637072 100644
--- a/lisp/gnus/mml1991.el
+++ b/lisp/gnus/mml1991.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el
index f973670..11f3f75 100644
--- a/lisp/gnus/mml2015.el
+++ b/lisp/gnus/mml2015.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/nnagent.el b/lisp/gnus/nnagent.el
index 2b48434..025c3d3 100644
--- a/lisp/gnus/nnagent.el
+++ b/lisp/gnus/nnagent.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/nnbabyl.el b/lisp/gnus/nnbabyl.el
index 5aa481e..c61cbc8 100644
--- a/lisp/gnus/nnbabyl.el
+++ b/lisp/gnus/nnbabyl.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/nndiary.el b/lisp/gnus/nndiary.el
index 0390b5b..2589fa8 100644
--- a/lisp/gnus/nndiary.el
+++ b/lisp/gnus/nndiary.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 ;;; Commentary:
diff --git a/lisp/gnus/nndir.el b/lisp/gnus/nndir.el
index 718306a..7eb3e82 100644
--- a/lisp/gnus/nndir.el
+++ b/lisp/gnus/nndir.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/nndoc.el b/lisp/gnus/nndoc.el
index 7f7db87..e9e769c 100644
--- a/lisp/gnus/nndoc.el
+++ b/lisp/gnus/nndoc.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/nndraft.el b/lisp/gnus/nndraft.el
index 12a1b2b..62a1575 100644
--- a/lisp/gnus/nndraft.el
+++ b/lisp/gnus/nndraft.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/nneething.el b/lisp/gnus/nneething.el
index 6850cad..f6bf586 100644
--- a/lisp/gnus/nneething.el
+++ b/lisp/gnus/nneething.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/nnfolder.el b/lisp/gnus/nnfolder.el
index 18c92f9..9b13173 100644
--- a/lisp/gnus/nnfolder.el
+++ b/lisp/gnus/nnfolder.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/nngateway.el b/lisp/gnus/nngateway.el
index 1e57f7c..63bd063 100644
--- a/lisp/gnus/nngateway.el
+++ b/lisp/gnus/nngateway.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/nnheader.el b/lisp/gnus/nnheader.el
index 4440f17..0ea99d5 100644
--- a/lisp/gnus/nnheader.el
+++ b/lisp/gnus/nnheader.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 2943c8d..6e2a735 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -950,7 +950,7 @@ textual parts.")
                            internal-move-group server message-id
                            nnimap-request-articles-find-limit)))))
          ;; Move the article to a different method.
-         (when-let ((result (eval accept-form)))
+         (when-let* ((result (eval accept-form)))
            (nnimap-change-group group server)
            (nnimap-delete-article article)
            result))))))
diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el
index 9640f2c..51147ed 100644
--- a/lisp/gnus/nnir.el
+++ b/lisp/gnus/nnir.el
@@ -25,7 +25,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el
index 71d9631..db5415c 100644
--- a/lisp/gnus/nnmail.el
+++ b/lisp/gnus/nnmail.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/nnmaildir.el b/lisp/gnus/nnmaildir.el
index 03cb445..272240f 100644
--- a/lisp/gnus/nnmaildir.el
+++ b/lisp/gnus/nnmaildir.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/nnmairix.el b/lisp/gnus/nnmairix.el
index a678a79..7c96171 100644
--- a/lisp/gnus/nnmairix.el
+++ b/lisp/gnus/nnmairix.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/nnmbox.el b/lisp/gnus/nnmbox.el
index c854f19..3a33fb9 100644
--- a/lisp/gnus/nnmbox.el
+++ b/lisp/gnus/nnmbox.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/nnmh.el b/lisp/gnus/nnmh.el
index bec174d..050f0cd 100644
--- a/lisp/gnus/nnmh.el
+++ b/lisp/gnus/nnmh.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/nnml.el b/lisp/gnus/nnml.el
index b0c7bf4..b7d1bc2 100644
--- a/lisp/gnus/nnml.el
+++ b/lisp/gnus/nnml.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/nnnil.el b/lisp/gnus/nnnil.el
index e40126d..7d40079 100644
--- a/lisp/gnus/nnnil.el
+++ b/lisp/gnus/nnnil.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/nnoo.el b/lisp/gnus/nnoo.el
index 77e7f2a..be38f8d 100644
--- a/lisp/gnus/nnoo.el
+++ b/lisp/gnus/nnoo.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/nnregistry.el b/lisp/gnus/nnregistry.el
index b1a2416..fac332a 100644
--- a/lisp/gnus/nnregistry.el
+++ b/lisp/gnus/nnregistry.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/nnrss.el b/lisp/gnus/nnrss.el
index 8115057..9a3a562 100644
--- a/lisp/gnus/nnrss.el
+++ b/lisp/gnus/nnrss.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/nnspool.el b/lisp/gnus/nnspool.el
index 1db0a41..b14b5cd 100644
--- a/lisp/gnus/nnspool.el
+++ b/lisp/gnus/nnspool.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index a71f4c7..ad93815 100644
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/nnvirtual.el b/lisp/gnus/nnvirtual.el
index dcd6103..543f7b6 100644
--- a/lisp/gnus/nnvirtual.el
+++ b/lisp/gnus/nnvirtual.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/nnweb.el b/lisp/gnus/nnweb.el
index 8e5b200..4327824 100644
--- a/lisp/gnus/nnweb.el
+++ b/lisp/gnus/nnweb.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/score-mode.el b/lisp/gnus/score-mode.el
index d106cf0..098ecd5 100644
--- a/lisp/gnus/score-mode.el
+++ b/lisp/gnus/score-mode.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/smiley.el b/lisp/gnus/smiley.el
index 763a1cd..3a94863 100644
--- a/lisp/gnus/smiley.el
+++ b/lisp/gnus/smiley.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/smime.el b/lisp/gnus/smime.el
index e3c284f..f62b65a 100644
--- a/lisp/gnus/smime.el
+++ b/lisp/gnus/smime.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/spam-report.el b/lisp/gnus/spam-report.el
index 17a7f89..b45b487 100644
--- a/lisp/gnus/spam-report.el
+++ b/lisp/gnus/spam-report.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/spam-stat.el b/lisp/gnus/spam-stat.el
index 5466cf9..08d382b 100644
--- a/lisp/gnus/spam-stat.el
+++ b/lisp/gnus/spam-stat.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/spam-wash.el b/lisp/gnus/spam-wash.el
index bcdde73..04e6290 100644
--- a/lisp/gnus/spam-wash.el
+++ b/lisp/gnus/spam-wash.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/gnus/spam.el b/lisp/gnus/spam.el
index 5f0ea94..6378e3e 100644
--- a/lisp/gnus/spam.el
+++ b/lisp/gnus/spam.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/help-at-pt.el b/lisp/help-at-pt.el
index 87b9e50..46229bc 100644
--- a/lisp/help-at-pt.el
+++ b/lisp/help-at-pt.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 15b2c07..d75fec2 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/help-macro.el b/lisp/help-macro.el
index c8f93bc..3181a49 100644
--- a/lisp/help-macro.el
+++ b/lisp/help-macro.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index 24dfb91..a98bce0 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/help.el b/lisp/help.el
index bc7ee2c..bc8035d 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -306,7 +306,7 @@ If that doesn't give a function, return nil."
 (defun describe-gnu-project ()
   "Browse online information on the GNU project."
   (interactive)
-  (browse-url "http://www.gnu.org/gnu/thegnuproject.html";))
+  (browse-url "https://www.gnu.org/gnu/thegnuproject.html";))
 
 (define-obsolete-function-alias 'describe-project 'describe-gnu-project "22.2")
 
@@ -1335,7 +1335,7 @@ The result, when formatted by `substitute-command-keys', 
should equal STRING."
 
 ;; The following functions used to be in help-fns.el, which is not preloaded.
 ;; But for various reasons, they are more widely needed, so they were
-;; moved to this file, which is preloaded.  http://debbugs.gnu.org/17001
+;; moved to this file, which is preloaded.  https://debbugs.gnu.org/17001
 
 (defun help-split-fundoc (docstring def)
   "Split a function DOCSTRING into the actual doc and the usage info.
diff --git a/lisp/hex-util.el b/lisp/hex-util.el
index e2e3d7f..5289f06 100644
--- a/lisp/hex-util.el
+++ b/lisp/hex-util.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/hexl.el b/lisp/hexl.el
index 0a598b2..f591439 100644
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/hfy-cmap.el b/lisp/hfy-cmap.el
index 6fcaad0..4dddc17 100644
--- a/lisp/hfy-cmap.el
+++ b/lisp/hfy-cmap.el
@@ -26,7 +26,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el
index 36901c3..e3552fc 100644
--- a/lisp/hi-lock.el
+++ b/lisp/hi-lock.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/hilit-chg.el b/lisp/hilit-chg.el
index 1a41056..4979ed8 100644
--- a/lisp/hilit-chg.el
+++ b/lisp/hilit-chg.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/hippie-exp.el b/lisp/hippie-exp.el
index 8dc53bd..be3fedf 100644
--- a/lisp/hippie-exp.el
+++ b/lisp/hippie-exp.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/hl-line.el b/lisp/hl-line.el
index 38fe683..9ccc354 100644
--- a/lisp/hl-line.el
+++ b/lisp/hl-line.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el
index 74393ff..791b110 100644
--- a/lisp/htmlfontify.el
+++ b/lisp/htmlfontify.el
@@ -29,7 +29,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el
index 2a68f77..686bc39 100644
--- a/lisp/ibuf-ext.el
+++ b/lisp/ibuf-ext.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -375,7 +375,7 @@ format. See `ibuffer-update-saved-filters-format' and
     (let ((fixed (ibuffer-update-saved-filters-format ibuffer-saved-filters)))
       (prog1
           (setq ibuffer-saved-filters (cdr fixed))
-        (when-let (old-format-detected (car fixed))
+        (when-let* ((old-format-detected (car fixed)))
           (let ((warning-series t)
                 (updated-form
                  (with-output-to-string
diff --git a/lisp/ibuf-macs.el b/lisp/ibuf-macs.el
index 2e751ce..e0c91e2 100644
--- a/lisp/ibuf-macs.el
+++ b/lisp/ibuf-macs.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index c83c213..fed9e75 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index a4153e8..038f58f 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/ido.el b/lisp/ido.el
index 23669d2..23c039d3 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 ;;; Commentary:
@@ -497,7 +497,7 @@ as first char even if `ido-enable-prefix' is nil."
   :type 'boolean
   :group 'ido)
 
-;; See http://debbugs.gnu.org/2042 for more info.
+;; See https://debbugs.gnu.org/2042 for more info.
 (defcustom ido-buffer-disable-smart-matches t
   "Non-nil means not to re-order matches for buffer switching.
 By default, Ido arranges matches in the following order:
@@ -4835,7 +4835,7 @@ Modified from `icomplete-completions'."
 (put 'dired 'ido 'dir)
 (put 'dired-other-window 'ido 'dir)
 (put 'dired-other-frame 'ido 'dir)
-;; See http://debbugs.gnu.org/11954 for reasons.
+;; See https://debbugs.gnu.org/11954 for reasons.
 (put 'dired-do-copy 'ido 'ignore)
 (put 'dired-do-rename 'ido 'ignore)
 
diff --git a/lisp/ielm.el b/lisp/ielm.el
index 42b065f..4ec1955 100644
--- a/lisp/ielm.el
+++ b/lisp/ielm.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/iimage.el b/lisp/iimage.el
index abb88ec..7226476 100644
--- a/lisp/iimage.el
+++ b/lisp/iimage.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/image-dired.el b/lisp/image-dired.el
index 49dba52..f48f1a1 100644
--- a/lisp/image-dired.el
+++ b/lisp/image-dired.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/image-file.el b/lisp/image-file.el
index 33cea95..285151d 100644
--- a/lisp/image-file.el
+++ b/lisp/image-file.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 4b92e86..87d18fd 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/image.el b/lisp/image.el
index 8cea7fb..1d07761 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/image/compface.el b/lisp/image/compface.el
index f4c3d5f..ccbd0a3 100644
--- a/lisp/image/compface.el
+++ b/lisp/image/compface.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/image/gravatar.el b/lisp/image/gravatar.el
index 54ca3be..6628195 100644
--- a/lisp/image/gravatar.el
+++ b/lisp/image/gravatar.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/imenu.el b/lisp/imenu.el
index c1fd400..e2c946c 100644
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/indent.el b/lisp/indent.el
index e7a30b8..d5ba0bd 100644
--- a/lisp/indent.el
+++ b/lisp/indent.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/info-look.el b/lisp/info-look.el
index 6963c78..f52f48e 100644
--- a/lisp/info-look.el
+++ b/lisp/info-look.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -31,9 +31,9 @@
 ;;
 ;; Scheme: <URL:http://groups.csail.mit.edu/mac/ftpdir/scm/r5rs.info.tar.gz>
 ;; LaTeX:
-;;  <URL:ftp://ctan.tug.org/tex-archive/info/latex2e-help-texinfo/latex2e.texi>
+;;  
<URL:http://ctan.tug.org/tex-archive/info/latex2e-help-texinfo/latex2e.texi>
 ;;  (or CTAN mirrors)
-;; Perl: <URL:ftp://ftp.cpan.org/pub/CPAN/doc/manual/texinfo/> (or CPAN 
mirrors)
+;; Perl: <URL:http://ftp.cpan.org/pub/CPAN/doc/manual/texinfo/> (or CPAN 
mirrors)
 
 ;; Traditionally, makeinfo quoted `like this', but version 5 and later
 ;; quotes 'like this' or ‘like this’.  Doc specs with patterns
@@ -959,7 +959,7 @@ Return nil if there is nothing appropriate in the buffer 
near point."
  :mode 'scheme-mode
  :regexp "[^()`'‘’,\" \t\n]+"
  :ignore-case t
- ;; Aubrey Jaffer's rendition from <URL:ftp://ftp-swiss.ai.mit.edu/pub/scm>
+ ;; Aubrey Jaffer's rendition from <https://people.csail.mit.edu/jaffer/SCM>
  :doc-spec '(("(r5rs)Index" nil
              "^[ \t]+-+ [^:]+:[ \t]*" "\\b")))
 
diff --git a/lisp/info-xref.el b/lisp/info-xref.el
index 8c029d4..4fc7c4f 100644
--- a/lisp/info-xref.el
+++ b/lisp/info-xref.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/info.el b/lisp/info.el
index b0b4789..993dc07 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -4023,7 +4023,7 @@ If FORK is non-nil, it is passed to `Info-goto-node'."
     (define-key map "h" 'Info-help)
     ;; This is for compatibility with standalone info (>~ version 5.2).
     ;; Though for some time, standalone info had H and h reversed.
-    ;; See <http://debbugs.gnu.org/16455>.
+    ;; See <https://debbugs.gnu.org/16455>.
     (define-key map "H" 'describe-mode)
     (define-key map "i" 'Info-index)
     (define-key map "I" 'Info-virtual-index)
diff --git a/lisp/informat.el b/lisp/informat.el
index b35e2ed..a1ed7a9 100644
--- a/lisp/informat.el
+++ b/lisp/informat.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/international/ccl.el b/lisp/international/ccl.el
index aa9bd2d..0ac7956 100644
--- a/lisp/international/ccl.el
+++ b/lisp/international/ccl.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/international/characters.el b/lisp/international/characters.el
index e48fc83..51d8765 100644
--- a/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@ -24,7 +24,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index 8a1a9cf..c6c62ef 100644
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -24,7 +24,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/international/isearch-x.el b/lisp/international/isearch-x.el
index 40bdb38..dce323e 100644
--- a/lisp/international/isearch-x.el
+++ b/lisp/international/isearch-x.el
@@ -24,7 +24,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/international/iso-ascii.el b/lisp/international/iso-ascii.el
index 39f1e9f..3276575 100644
--- a/lisp/international/iso-ascii.el
+++ b/lisp/international/iso-ascii.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/international/iso-cvt.el b/lisp/international/iso-cvt.el
index ebf90a3..69969d6 100644
--- a/lisp/international/iso-cvt.el
+++ b/lisp/international/iso-cvt.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;; This lisp code is a general framework for translating various
diff --git a/lisp/international/iso-transl.el b/lisp/international/iso-transl.el
index a665a39..8695847 100644
--- a/lisp/international/iso-transl.el
+++ b/lisp/international/iso-transl.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/international/ja-dic-cnv.el b/lisp/international/ja-dic-cnv.el
index 63eede0..f5220b0 100644
--- a/lisp/international/ja-dic-cnv.el
+++ b/lisp/international/ja-dic-cnv.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/international/ja-dic-utl.el b/lisp/international/ja-dic-utl.el
index 7005ba8..86ba374 100644
--- a/lisp/international/ja-dic-utl.el
+++ b/lisp/international/ja-dic-utl.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/international/kinsoku.el b/lisp/international/kinsoku.el
index f87d2e9..9f20b3e 100644
--- a/lisp/international/kinsoku.el
+++ b/lisp/international/kinsoku.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/international/kkc.el b/lisp/international/kkc.el
index 17a3b6c..261c1c6 100644
--- a/lisp/international/kkc.el
+++ b/lisp/international/kkc.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/international/latexenc.el b/lisp/international/latexenc.el
index 4b09bfb..761b964 100644
--- a/lisp/international/latexenc.el
+++ b/lisp/international/latexenc.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/international/latin1-disp.el 
b/lisp/international/latin1-disp.el
index d9b71c8..7919248 100644
--- a/lisp/international/latin1-disp.el
+++ b/lisp/international/latin1-disp.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index a596411..9d22d6e 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -24,7 +24,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el
index a7764b6..d4bdfd4 100644
--- a/lisp/international/mule-conf.el
+++ b/lisp/international/mule-conf.el
@@ -23,7 +23,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el
index 655a5ca..e1e60d1 100644
--- a/lisp/international/mule-diag.el
+++ b/lisp/international/mule-diag.el
@@ -24,7 +24,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/international/mule-util.el b/lisp/international/mule-util.el
index 257f885..ca84a23 100644
--- a/lisp/international/mule-util.el
+++ b/lisp/international/mule-util.el
@@ -24,7 +24,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 6cfb7e6..5f1ef5e 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -24,7 +24,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/international/ogonek.el b/lisp/international/ogonek.el
index cabcf90..bdd621f 100644
--- a/lisp/international/ogonek.el
+++ b/lisp/international/ogonek.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index c94c9fc..448ea8e 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -24,7 +24,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/international/rfc1843.el b/lisp/international/rfc1843.el
index 9b91854..494de1d 100644
--- a/lisp/international/rfc1843.el
+++ b/lisp/international/rfc1843.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -54,9 +54,7 @@ HZ-encoded are decoded."
   "HZ+ decoding support if non-nil.
 HZ+ specification (also known as HZP) is to provide a standardized
 7-bit representation of mixed Big5, GB, and ASCII text for convenient
-e-mail transmission, news posting, etc.
-The document of HZ+ 0.78 specification can be found at
-ftp://ftp.math.psu.edu/pub/simpson/chinese/hzp/hzp.doc";
+e-mail transmission, news posting, etc."
   :type 'boolean
   :group 'mime)
 
diff --git a/lisp/international/robin.el b/lisp/international/robin.el
index 077809b..94d2bf1 100644
--- a/lisp/international/robin.el
+++ b/lisp/international/robin.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el
index 130bc74..5c6db19 100644
--- a/lisp/international/titdic-cnv.el
+++ b/lisp/international/titdic-cnv.el
@@ -24,7 +24,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -647,7 +647,7 @@ To get complete usage, invoke \"emacs -batch -f 
batch-titdic-convert -h\"."
 ;; details.
 ;;
 ;; You should have received a copy of the GNU General Public License along with
-;; CCE.  If not, see <http://www.gnu.org/licenses/>.")
+;; CCE.  If not, see <https://www.gnu.org/licenses/>.")
 
     ("chinese-ziranma" "$AWTH;(B"
      "ziranma.cin" cn-gb-2312 "ZIRANMA.el"
@@ -675,7 +675,7 @@ To get complete usage, invoke \"emacs -batch -f 
batch-titdic-convert -h\"."
 ;; details.
 ;;
 ;; You should have received a copy of the GNU General Public License along with
-;; CCE.  If not, see <http://www.gnu.org/licenses/>.")
+;; CCE.  If not, see <https://www.gnu.org/licenses/>.")
 
     ("chinese-ctlau" "$AAuTA(B"
      "CTLau.html" cn-gb-2312 "CTLau.el"
@@ -700,7 +700,7 @@ To get complete usage, invoke \"emacs -batch -f 
batch-titdic-convert -h\"."
 ;; # GNU General Public License for more details.
 ;; #
 ;; # You should have received a copy of the GNU General Public License
-;; # along with this program.  If not, see <http://www.gnu.org/licenses/>.")
+;; # along with this program.  If not, see <https://www.gnu.org/licenses/>.")
 
     ("chinese-ctlaub" "$(0N,Gn(B"
      "CTLau-b5.html" big5 "CTLau-b5.el"
@@ -725,7 +725,7 @@ To get complete usage, invoke \"emacs -batch -f 
batch-titdic-convert -h\"."
 ;; # GNU General Public License for more details.
 ;; #
 ;; # You should have received a copy of the GNU General Public License
-;; # along with this program.  If not, see <http://www.gnu.org/licenses/>.")
+;; # along with this program.  If not, see <https://www.gnu.org/licenses/>.")
     ))
 
 ;; Generate a code of a Quail package in the current buffer from Tsang
diff --git a/lisp/international/ucs-normalize.el 
b/lisp/international/ucs-normalize.el
index b510fe1..0823108 100644
--- a/lisp/international/ucs-normalize.el
+++ b/lisp/international/ucs-normalize.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/international/utf-7.el b/lisp/international/utf-7.el
index 16942ce..82f725c 100644
--- a/lisp/international/utf-7.el
+++ b/lisp/international/utf-7.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -79,7 +79,7 @@ ESC and SKIP-CHARS are adjusted for the normal and IMAP 
versions."
         (esc (if imap ?& ?+))
         ;; These are characters which can be encoded asis.
         (skip-chars (if imap
-                        "\t\n\r\x20-\x25\x27-\x7e" ; rfc2060 
+                        "\t\n\r\x20-\x25\x27-\x7e" ; rfc2060
                       ;; This includes the rfc2152 optional set.
                       ;; Perhaps it shouldn't (like iconv).
                       "\t\n\r -*,-[]-}"))
diff --git a/lisp/international/utf7.el b/lisp/international/utf7.el
index f245d7e..68081b2 100644
--- a/lisp/international/utf7.el
+++ b/lisp/international/utf7.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 5f34dca..7c576a6 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/isearchb.el b/lisp/isearchb.el
index 16a08dc..86275f8 100644
--- a/lisp/isearchb.el
+++ b/lisp/isearchb.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el
index 8537dae..33a9416 100644
--- a/lisp/jit-lock.el
+++ b/lisp/jit-lock.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -602,7 +602,7 @@ non-nil in a repeated invocation of this function."
          (save-restriction
             ;; Don't be blindsided by narrowing that starts in the middle
             ;; of a jit-lock-defer-multiline.
-           (widen) 
+           (widen)
            (when (and (>= jit-lock-context-unfontify-pos (point-min))
                       (< jit-lock-context-unfontify-pos (point-max)))
              ;; If we're in text that matches a complex multi-line
diff --git a/lisp/jka-cmpr-hook.el b/lisp/jka-cmpr-hook.el
index 0dedaa5..b1bdc27 100644
--- a/lisp/jka-cmpr-hook.el
+++ b/lisp/jka-cmpr-hook.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el
index 9e780f8..07b9033 100644
--- a/lisp/jka-compr.el
+++ b/lisp/jka-compr.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/json.el b/lisp/json.el
index 025a77d..d5f05fe 100644
--- a/lisp/json.el
+++ b/lisp/json.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -187,29 +187,30 @@ Unlike `reverse', this keeps the property-value pairs 
intact."
 
 ;; Reader utilities
 
-(defsubst json-advance (&optional n)
+(define-inline json-advance (&optional n)
   "Advance N characters forward."
-  (forward-char n))
+  (inline-quote (forward-char ,n)))
 
-(defsubst json-peek ()
+(define-inline json-peek ()
   "Return the character at point."
-  (following-char))
+  (inline-quote (following-char)))
 
-(defsubst json-pop ()
+(define-inline json-pop ()
   "Advance past the character at point, returning it."
-  (let ((char (json-peek)))
-    (if (zerop char)
-        (signal 'json-end-of-file nil)
-      (json-advance)
-      char)))
-
-(defun json-skip-whitespace ()
+  (inline-quote
+   (let ((char (json-peek)))
+     (if (zerop char)
+         (signal 'json-end-of-file nil)
+       (json-advance)
+       char))))
+
+(define-inline json-skip-whitespace ()
   "Skip past the whitespace at point."
   ;; See
   ;; https://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf
   ;; or https://tools.ietf.org/html/rfc7159#section-2 for the
   ;; definition of whitespace in JSON.
-  (skip-chars-forward "\t\r\n "))
+  (inline-quote (skip-chars-forward "\t\r\n ")))
 
 
 
@@ -303,7 +304,8 @@ KEYWORD is the keyword expected."
                             (thing-at-point 'word)))))
           (json-advance))
         keyword)
-  (unless (looking-at "\\(\\s-\\|[],}]\\|$\\)")
+  (json-skip-whitespace)
+  (unless (looking-at "\\([],}]\\|$\\)")
     (signal 'json-unknown-keyword
             (list (save-excursion
                     (backward-word-strictly 1)
@@ -470,11 +472,10 @@ Returns the updated object, which you should save, e.g.:
     (setq obj (json-add-to-object obj \"foo\" \"bar\"))
 Please see the documentation of `json-object-type' and `json-key-type'."
   (let ((json-key-type
-         (if (eq json-key-type nil)
+         (or json-key-type
              (cdr (assq json-object-type '((hash-table . string)
                                            (alist . symbol)
-                                           (plist . keyword))))
-           json-key-type)))
+                                           (plist . keyword)))))))
     (setq key
           (cond ((eq json-key-type 'string)
                  key)
diff --git a/lisp/kermit.el b/lisp/kermit.el
index f1900b4..8863f2e 100644
--- a/lisp/kermit.el
+++ b/lisp/kermit.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/kmacro.el b/lisp/kmacro.el
index 2db8061..582a58e 100644
--- a/lisp/kmacro.el
+++ b/lisp/kmacro.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/language/burmese.el b/lisp/language/burmese.el
index 420e8d7..25425ec 100644
--- a/lisp/language/burmese.el
+++ b/lisp/language/burmese.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -56,4 +56,3 @@
                 (vector "." 0 'font-shape-gstring))))
   (set-char-table-range composition-function-table '(#x1000 . #x107F) elt)
   (set-char-table-range composition-function-table '(#xAA60 . #xAA7B) elt))
-
diff --git a/lisp/language/cham.el b/lisp/language/cham.el
index a025ff0..4749f2e 100644
--- a/lisp/language/cham.el
+++ b/lisp/language/cham.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/language/china-util.el b/lisp/language/china-util.el
index 955c299..f5174fb 100644
--- a/lisp/language/china-util.el
+++ b/lisp/language/china-util.el
@@ -24,7 +24,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/language/chinese.el b/lisp/language/chinese.el
index a412838..9ba178d 100644
--- a/lisp/language/chinese.el
+++ b/lisp/language/chinese.el
@@ -24,7 +24,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/language/cyril-util.el b/lisp/language/cyril-util.el
index a96f2fb..7644064 100644
--- a/lisp/language/cyril-util.el
+++ b/lisp/language/cyril-util.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/language/cyrillic.el b/lisp/language/cyrillic.el
index 1e47057..ba985a4 100644
--- a/lisp/language/cyrillic.el
+++ b/lisp/language/cyrillic.el
@@ -25,7 +25,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/language/czech.el b/lisp/language/czech.el
index 0ebf2cb..21213c6 100644
--- a/lisp/language/czech.el
+++ b/lisp/language/czech.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/language/english.el b/lisp/language/english.el
index fefb241..3e8f312 100644
--- a/lisp/language/english.el
+++ b/lisp/language/english.el
@@ -24,7 +24,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/language/ethio-util.el b/lisp/language/ethio-util.el
index 4d7ccd1..cdf41ba 100644
--- a/lisp/language/ethio-util.el
+++ b/lisp/language/ethio-util.el
@@ -24,7 +24,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;; Author: TAKAHASHI Naoto <address@hidden>
 
diff --git a/lisp/language/ethiopic.el b/lisp/language/ethiopic.el
index 3e71d43..f0bb049 100644
--- a/lisp/language/ethiopic.el
+++ b/lisp/language/ethiopic.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;; Author: TAKAHASHI Naoto <address@hidden>
 
diff --git a/lisp/language/european.el b/lisp/language/european.el
index 6c0232e..d9ce05c 100644
--- a/lisp/language/european.el
+++ b/lisp/language/european.el
@@ -24,7 +24,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/language/georgian.el b/lisp/language/georgian.el
index 14e3510..4371809 100644
--- a/lisp/language/georgian.el
+++ b/lisp/language/georgian.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/language/greek.el b/lisp/language/greek.el
index 357f063..1a40148 100644
--- a/lisp/language/greek.el
+++ b/lisp/language/greek.el
@@ -25,7 +25,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/language/hanja-util.el b/lisp/language/hanja-util.el
index 200ae89..6af4798 100644
--- a/lisp/language/hanja-util.el
+++ b/lisp/language/hanja-util.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/language/hebrew.el b/lisp/language/hebrew.el
index 4e33fb6..9e049de 100644
--- a/lisp/language/hebrew.el
+++ b/lisp/language/hebrew.el
@@ -25,7 +25,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/language/ind-util.el b/lisp/language/ind-util.el
index 930cba1..fc8f4c9 100644
--- a/lisp/language/ind-util.el
+++ b/lisp/language/ind-util.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/language/indian.el b/lisp/language/indian.el
index c84c8fe..0bb123e 100644
--- a/lisp/language/indian.el
+++ b/lisp/language/indian.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -116,7 +116,7 @@ South Indian Language Telugu is supported in this language 
environment."))
             (sample-text . "Kannada (ಕನ್ನಡ)    ನಮಸ್ಕಾರ")
             (documentation . "\
 Kannada language and script is supported in this language
-environment.")) 
+environment."))
  '("Indian"))
 
 (set-language-info-alist
@@ -140,7 +140,7 @@ South Indian language Malayalam is supported in this 
language environment."))
 (defconst devanagari-composable-pattern
   (let ((table
         '(("a" . "[\u0900-\u0902]")    ; vowel modifier (above)
-          ("A" . "\u0903")             ; vowel modifier (post) 
+          ("A" . "\u0903")             ; vowel modifier (post)
           ("V" . "[\u0904-\u0914\u0960-\u0961\u0972]") ; independent vowel
           ("C" . "[\u0915-\u0939\u0958-\u095F\u0979-\u097F]") ; consonant
           ("R" . "\u0930")             ; RA
@@ -347,7 +347,7 @@ South Indian language Malayalam is supported in this 
language environment."))
   (let ((table
         '(("A" . "[\u0D02-\u0D03]")    ; SIGN ANUSVARA .. VISARGA
           ("V" . "[\u0D05-\u0D14\u0D60-\u0D61]") ; independent vowel
-          ("C" . "[\u0D15-\u0D39]")              ; consonant 
+          ("C" . "[\u0D15-\u0D39]")              ; consonant
           ("Y" . "[\u0D2F-\u0D30\u0D32\u0D35]")  ; YA, RA, LA, VA
           ("v" . "[\u0D3E-\u0D4C\u0D57\u0D62-\u0D63]") ; postbase matra
           ("H" . "\u0D4D")                       ; SIGN VIRAMA
diff --git a/lisp/language/japan-util.el b/lisp/language/japan-util.el
index 01cdd8b..988b925 100644
--- a/lisp/language/japan-util.el
+++ b/lisp/language/japan-util.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/language/japanese.el b/lisp/language/japanese.el
index 4203c4c..57147f6 100644
--- a/lisp/language/japanese.el
+++ b/lisp/language/japanese.el
@@ -24,7 +24,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -185,7 +185,7 @@ eucJP-ms is defined in 
<http://www.opengroup.or.jp/jvc/cde/appendix.html>."
   "Shift_JIS 8-bit encoding for Japanese (MIME:SHIFT_JIS-2004)"
   :coding-type 'shift-jis
   :mnemonic ?S
-  :charset-list '(ascii katakana-jisx0201 
+  :charset-list '(ascii katakana-jisx0201
                         japanese-jisx0213.2004-1 japanese-jisx0213-2))
 
 (define-coding-system-alias 'shift_jis-2004 'japanese-shift-jis-2004)
@@ -197,15 +197,15 @@ eucJP-ms is defined in 
<http://www.opengroup.or.jp/jvc/cde/appendix.html>."
              (tutorial . "TUTORIAL.ja")
              (charset japanese-jisx0208
                       japanese-jisx0212 latin-jisx0201 katakana-jisx0201
-                      japanese-jisx0213.2004-1 japanese-jisx0213-1 
+                      japanese-jisx0213.2004-1 japanese-jisx0213-1
                       japanese-jisx0213-2 japanese-jisx0208-1978)
              (coding-system iso-2022-jp japanese-iso-8bit
                             japanese-shift-jis japanese-iso-7bit-1978-irv
                              iso-2022-jp-2004 japanese-shift-jis-2004
                              euc-jis-2004)
              (coding-priority iso-2022-jp japanese-iso-8bit
-                              japanese-shift-jis 
-                               iso-2022-jp-2004 euc-jis-2004 
+                              japanese-shift-jis
+                               iso-2022-jp-2004 euc-jis-2004
                                japanese-shift-jis-2004
                                iso-2022-jp-2)
              (input-method . "japanese")
diff --git a/lisp/language/khmer.el b/lisp/language/khmer.el
index 8663ff2..4a07032 100644
--- a/lisp/language/khmer.el
+++ b/lisp/language/khmer.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/lisp/language/korea-util.el b/lisp/language/korea-util.el
index 12bb1e1..c49e627 100644
--- a/lisp/language/korea-util.el
+++ b/lisp/language/korea-util.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/language/korean.el b/lisp/language/korean.el
index a8a3011..52560d6 100644
--- a/lisp/language/korean.el
+++ b/lisp/language/korean.el
@@ -24,7 +24,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/language/lao-util.el b/lisp/language/lao-util.el
index 28b2043..94504ff 100644
--- a/lisp/language/lao-util.el
+++ b/lisp/language/lao-util.el
@@ -24,7 +24,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/language/lao.el b/lisp/language/lao.el
index 03519c9..266c3c6 100644
--- a/lisp/language/lao.el
+++ b/lisp/language/lao.el
@@ -24,7 +24,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/language/misc-lang.el b/lisp/language/misc-lang.el
index c03fd42..2843c7c 100644
--- a/lisp/language/misc-lang.el
+++ b/lisp/language/misc-lang.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/language/romanian.el b/lisp/language/romanian.el
index 421ddcd..00deb69 100644
--- a/lisp/language/romanian.el
+++ b/lisp/language/romanian.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/language/sinhala.el b/lisp/language/sinhala.el
index 037d753..efd8aac 100644
--- a/lisp/language/sinhala.el
+++ b/lisp/language/sinhala.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
@@ -30,7 +30,7 @@
             (sample-text . "Sinhala (සිංහල)    ආයුබෝවන්")
             (documentation . t)))
 
-(set-char-table-range 
+(set-char-table-range
  composition-function-table
  '(#xD80 . #xDFF)
  (list (vector
diff --git a/lisp/language/slovak.el b/lisp/language/slovak.el
index 6c72942..9682722 100644
--- a/lisp/language/slovak.el
+++ b/lisp/language/slovak.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/language/tai-viet.el b/lisp/language/tai-viet.el
index f4074ae..3c58910 100644
--- a/lisp/language/tai-viet.el
+++ b/lisp/language/tai-viet.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/language/thai-util.el b/lisp/language/thai-util.el
index db421eb..c8c844f 100644
--- a/lisp/language/thai-util.el
+++ b/lisp/language/thai-util.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/language/thai-word.el b/lisp/language/thai-word.el
index d3c00f9..e67dd09 100644
--- a/lisp/language/thai-word.el
+++ b/lisp/language/thai-word.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;; The used Thai word list has been taken from IBM's ICU4J project
 ;; (file `thai6.ucs', version 1.4, converted to TIS encoding, with
diff --git a/lisp/language/thai.el b/lisp/language/thai.el
index 4d19984..945ea31 100644
--- a/lisp/language/thai.el
+++ b/lisp/language/thai.el
@@ -24,7 +24,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/language/tibet-util.el b/lisp/language/tibet-util.el
index 624da5c..f3648c9 100644
--- a/lisp/language/tibet-util.el
+++ b/lisp/language/tibet-util.el
@@ -23,7 +23,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; History:
 ;; 1997.03.13 Modification in treatment of text properties;
diff --git a/lisp/language/tibetan.el b/lisp/language/tibetan.el
index f24e3b3..962dd2b 100644
--- a/lisp/language/tibetan.el
+++ b/lisp/language/tibetan.el
@@ -26,7 +26,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; History:
 
diff --git a/lisp/language/tv-util.el b/lisp/language/tv-util.el
index ba1ee66..a667956 100644
--- a/lisp/language/tv-util.el
+++ b/lisp/language/tv-util.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code
 
@@ -72,7 +72,7 @@
        (tone-rule '(tr . bl))
        (prev-viet nil)
        ch info pos components overhang)
-    (while (< from to) 
+    (while (< from to)
       (or ch
          (setq ch (char-after from)
                info (aref tai-viet-glyph-info ch)))
@@ -138,4 +138,3 @@
 
 ;;
 (provide 'tai-viet-util)
-
diff --git a/lisp/language/utf-8-lang.el b/lisp/language/utf-8-lang.el
index 40aec43..4156bf5 100644
--- a/lisp/language/utf-8-lang.el
+++ b/lisp/language/utf-8-lang.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/language/viet-util.el b/lisp/language/viet-util.el
index ca670d8..f1946f6 100644
--- a/lisp/language/viet-util.el
+++ b/lisp/language/viet-util.el
@@ -24,7 +24,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/language/vietnamese.el b/lisp/language/vietnamese.el
index cd36580..c170216 100644
--- a/lisp/language/vietnamese.el
+++ b/lisp/language/vietnamese.el
@@ -24,7 +24,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/leim/quail/arabic.el b/lisp/leim/quail/arabic.el
index 22d6117..b027d40 100644
--- a/lisp/leim/quail/arabic.el
+++ b/lisp/leim/quail/arabic.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/leim/quail/croatian.el b/lisp/leim/quail/croatian.el
index 7ebf875..a9b1ca8 100644
--- a/lisp/leim/quail/croatian.el
+++ b/lisp/leim/quail/croatian.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/leim/quail/cyril-jis.el b/lisp/leim/quail/cyril-jis.el
index 609b601..210fe97 100644
--- a/lisp/leim/quail/cyril-jis.el
+++ b/lisp/leim/quail/cyril-jis.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/leim/quail/cyrillic.el b/lisp/leim/quail/cyrillic.el
index 600193d..95b443f 100644
--- a/lisp/leim/quail/cyrillic.el
+++ b/lisp/leim/quail/cyrillic.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/leim/quail/czech.el b/lisp/leim/quail/czech.el
index 762d702..26f30f3 100644
--- a/lisp/leim/quail/czech.el
+++ b/lisp/leim/quail/czech.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/leim/quail/ethiopic.el b/lisp/leim/quail/ethiopic.el
index eaf3a03..8d19a23 100644
--- a/lisp/leim/quail/ethiopic.el
+++ b/lisp/leim/quail/ethiopic.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;; Author: TAKAHASHI Naoto <address@hidden>
 
diff --git a/lisp/leim/quail/georgian.el b/lisp/leim/quail/georgian.el
index df29715..bc3b5d2 100644
--- a/lisp/leim/quail/georgian.el
+++ b/lisp/leim/quail/georgian.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/leim/quail/greek.el b/lisp/leim/quail/greek.el
index 05351e0..d1414ab 100644
--- a/lisp/leim/quail/greek.el
+++ b/lisp/leim/quail/greek.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/leim/quail/hangul.el b/lisp/leim/quail/hangul.el
index 782d8d5..5d509c9 100644
--- a/lisp/leim/quail/hangul.el
+++ b/lisp/leim/quail/hangul.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/leim/quail/hanja-jis.el b/lisp/leim/quail/hanja-jis.el
index 2c7eebb..79730b8 100644
--- a/lisp/leim/quail/hanja-jis.el
+++ b/lisp/leim/quail/hanja-jis.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/leim/quail/hanja.el b/lisp/leim/quail/hanja.el
index 8c00ad1..9c659e2 100644
--- a/lisp/leim/quail/hanja.el
+++ b/lisp/leim/quail/hanja.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/leim/quail/hanja3.el b/lisp/leim/quail/hanja3.el
index c140f90..0b58f67 100644
--- a/lisp/leim/quail/hanja3.el
+++ b/lisp/leim/quail/hanja3.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/leim/quail/hebrew.el b/lisp/leim/quail/hebrew.el
index d90b362..772da70 100644
--- a/lisp/leim/quail/hebrew.el
+++ b/lisp/leim/quail/hebrew.el
@@ -23,7 +23,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/leim/quail/indian.el b/lisp/leim/quail/indian.el
index 8f549ae..c1a9b2e 100644
--- a/lisp/leim/quail/indian.el
+++ b/lisp/leim/quail/indian.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/leim/quail/ipa-praat.el b/lisp/leim/quail/ipa-praat.el
index 42bc201..2c1c8df 100644
--- a/lisp/leim/quail/ipa-praat.el
+++ b/lisp/leim/quail/ipa-praat.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/leim/quail/ipa.el b/lisp/leim/quail/ipa.el
index 6f0368c..e513c5f 100644
--- a/lisp/leim/quail/ipa.el
+++ b/lisp/leim/quail/ipa.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/leim/quail/japanese.el b/lisp/leim/quail/japanese.el
index 98865ac..2d39d5e 100644
--- a/lisp/leim/quail/japanese.el
+++ b/lisp/leim/quail/japanese.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/leim/quail/lao.el b/lisp/leim/quail/lao.el
index 14cf926..af3b589 100644
--- a/lisp/leim/quail/lao.el
+++ b/lisp/leim/quail/lao.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/leim/quail/latin-alt.el b/lisp/leim/quail/latin-alt.el
index cc72134..a6a5ac8 100644
--- a/lisp/leim/quail/latin-alt.el
+++ b/lisp/leim/quail/latin-alt.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;; Author (of latin-post.el): TAKAHASHI Naoto <address@hidden>
 
diff --git a/lisp/leim/quail/latin-ltx.el b/lisp/leim/quail/latin-ltx.el
index ac8d5b4..313de99 100644
--- a/lisp/leim/quail/latin-ltx.el
+++ b/lisp/leim/quail/latin-ltx.el
@@ -23,7 +23,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/leim/quail/latin-post.el b/lisp/leim/quail/latin-post.el
index a556448..238b0ef 100644
--- a/lisp/leim/quail/latin-post.el
+++ b/lisp/leim/quail/latin-post.el
@@ -24,7 +24,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;; Author: TAKAHASHI Naoto <address@hidden>
 
diff --git a/lisp/leim/quail/latin-pre.el b/lisp/leim/quail/latin-pre.el
index 9e4726a..ca9c5f6 100644
--- a/lisp/leim/quail/latin-pre.el
+++ b/lisp/leim/quail/latin-pre.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/leim/quail/lrt.el b/lisp/leim/quail/lrt.el
index d3cfce6..bad4155 100644
--- a/lisp/leim/quail/lrt.el
+++ b/lisp/leim/quail/lrt.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/leim/quail/persian.el b/lisp/leim/quail/persian.el
index 56ba145..093d306 100644
--- a/lisp/leim/quail/persian.el
+++ b/lisp/leim/quail/persian.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
@@ -215,7 +215,7 @@
  (">" ?<)
  ("?" ?؟)
 
- ;; Level 3 Entered with \ 
+ ;; Level 3 Entered with \
  ;;
  ("\\" ?\\)  ;; خط اريب وارو
  ("\\\\" ?\\)
diff --git a/lisp/leim/quail/programmer-dvorak.el 
b/lisp/leim/quail/programmer-dvorak.el
index 1dc8edc..00d9a3c 100644
--- a/lisp/leim/quail/programmer-dvorak.el
+++ b/lisp/leim/quail/programmer-dvorak.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/leim/quail/py-punct.el b/lisp/leim/quail/py-punct.el
index 9fe06c0..39809af 100644
--- a/lisp/leim/quail/py-punct.el
+++ b/lisp/leim/quail/py-punct.el
@@ -23,7 +23,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/leim/quail/pypunct-b5.el b/lisp/leim/quail/pypunct-b5.el
index 37c1265..ef58631 100644
--- a/lisp/leim/quail/pypunct-b5.el
+++ b/lisp/leim/quail/pypunct-b5.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/leim/quail/rfc1345.el b/lisp/leim/quail/rfc1345.el
index 74f7d09..5b66d91 100644
--- a/lisp/leim/quail/rfc1345.el
+++ b/lisp/leim/quail/rfc1345.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/leim/quail/sgml-input.el b/lisp/leim/quail/sgml-input.el
index c334b51..7383683 100644
--- a/lisp/leim/quail/sgml-input.el
+++ b/lisp/leim/quail/sgml-input.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/leim/quail/sisheng.el b/lisp/leim/quail/sisheng.el
index 8a1ddcf..bbc251a 100644
--- a/lisp/leim/quail/sisheng.el
+++ b/lisp/leim/quail/sisheng.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/leim/quail/slovak.el b/lisp/leim/quail/slovak.el
index 817dcd0..779f9b0 100644
--- a/lisp/leim/quail/slovak.el
+++ b/lisp/leim/quail/slovak.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/leim/quail/symbol-ksc.el b/lisp/leim/quail/symbol-ksc.el
index 31e839b..70a54c7 100644
--- a/lisp/leim/quail/symbol-ksc.el
+++ b/lisp/leim/quail/symbol-ksc.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; 94.10.24   Written for Mule Ver.2.0 (address@hidden)
 ;;; 94.11.04   Updated for Mule Ver.2.1 (address@hidden)
diff --git a/lisp/leim/quail/tamil-dvorak.el b/lisp/leim/quail/tamil-dvorak.el
index a625d90..d080f7e 100644
--- a/lisp/leim/quail/tamil-dvorak.el
+++ b/lisp/leim/quail/tamil-dvorak.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/leim/quail/thai.el b/lisp/leim/quail/thai.el
index 02f8b78..7cf11da 100644
--- a/lisp/leim/quail/thai.el
+++ b/lisp/leim/quail/thai.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/leim/quail/tibetan.el b/lisp/leim/quail/tibetan.el
index 4e1c5b5..8971b1d 100644
--- a/lisp/leim/quail/tibetan.el
+++ b/lisp/leim/quail/tibetan.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;; Author: Toru TOMABECHI <address@hidden>
 
diff --git a/lisp/leim/quail/uni-input.el b/lisp/leim/quail/uni-input.el
index 595155e..744edc6 100644
--- a/lisp/leim/quail/uni-input.el
+++ b/lisp/leim/quail/uni-input.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/leim/quail/viqr.el b/lisp/leim/quail/viqr.el
index 879fba4..b7591b1 100644
--- a/lisp/leim/quail/viqr.el
+++ b/lisp/leim/quail/viqr.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/leim/quail/vntelex.el b/lisp/leim/quail/vntelex.el
index 074b806..210e26a 100644
--- a/lisp/leim/quail/vntelex.el
+++ b/lisp/leim/quail/vntelex.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/leim/quail/vnvni.el b/lisp/leim/quail/vnvni.el
index 5d21030..327ebb8 100644
--- a/lisp/leim/quail/vnvni.el
+++ b/lisp/leim/quail/vnvni.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/leim/quail/welsh.el b/lisp/leim/quail/welsh.el
index 7b0ca2c..c524139 100644
--- a/lisp/leim/quail/welsh.el
+++ b/lisp/leim/quail/welsh.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/linum.el b/lisp/linum.el
index 9cfb94d..3bee384 100644
--- a/lisp/linum.el
+++ b/lisp/linum.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/loadhist.el b/lisp/loadhist.el
index 18c30f7..5d42ed9 100644
--- a/lisp/loadhist.el
+++ b/lisp/loadhist.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/loadup.el b/lisp/loadup.el
index af42cd9..d048f07 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -337,7 +337,7 @@
   ;; We reset load-path after dumping.
   ;; For a permanent change in load-path, use configure's
   ;; --enable-locallisppath option.
-  ;; See http://debbugs.gnu.org/16107 for more details.
+  ;; See https://debbugs.gnu.org/16107 for more details.
   (or (equal lp load-path)
       (message "Warning: Change in load-path due to site-load will be \
 lost after dumping")))
diff --git a/lisp/locate.el b/lisp/locate.el
index 738c333..20b05c2 100644
--- a/lisp/locate.el
+++ b/lisp/locate.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/lpr.el b/lisp/lpr.el
index 4c8dc2c..b0a6e94 100644
--- a/lisp/lpr.el
+++ b/lisp/lpr.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el
index 9a81ef0..280e7f4 100644
--- a/lisp/ls-lisp.el
+++ b/lisp/ls-lisp.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/macros.el b/lisp/macros.el
index fc65489..34e81f6 100644
--- a/lisp/macros.el
+++ b/lisp/macros.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mail/binhex.el b/lisp/mail/binhex.el
index 1d6828b..f055215 100644
--- a/lisp/mail/binhex.el
+++ b/lisp/mail/binhex.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mail/blessmail.el b/lisp/mail/blessmail.el
index fc3b961..c5e6346 100644
--- a/lisp/mail/blessmail.el
+++ b/lisp/mail/blessmail.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index c1aec69..7bd9078 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -187,7 +187,7 @@ Prompts for bug subject.  Leaves you in a mail buffer."
         'face 'link
         'help-echo (concat "mouse-2, RET: Follow this link")
         'action (lambda (button)
-                  (browse-url "http://debbugs.gnu.org/";))
+                  (browse-url "https://debbugs.gnu.org/";))
         'follow-link t)
 
        (insert ".  Please check that
diff --git a/lisp/mail/flow-fill.el b/lisp/mail/flow-fill.el
index 860d353..130e164 100644
--- a/lisp/mail/flow-fill.el
+++ b/lisp/mail/flow-fill.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mail/footnote.el b/lisp/mail/footnote.el
index 07e24bd..5e18d89 100644
--- a/lisp/mail/footnote.el
+++ b/lisp/mail/footnote.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mail/hashcash.el b/lisp/mail/hashcash.el
index 71567b4..ff00ce4 100644
--- a/lisp/mail/hashcash.el
+++ b/lisp/mail/hashcash.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mail/ietf-drums.el b/lisp/mail/ietf-drums.el
index fd793a2..86496be 100644
--- a/lisp/mail/ietf-drums.el
+++ b/lisp/mail/ietf-drums.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el
index 180d195..81af0d5 100644
--- a/lisp/mail/mail-extr.el
+++ b/lisp/mail/mail-extr.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mail/mail-hist.el b/lisp/mail/mail-hist.el
index b056739..b525d89 100644
--- a/lisp/mail/mail-hist.el
+++ b/lisp/mail/mail-hist.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mail/mail-parse.el b/lisp/mail/mail-parse.el
index 0578b98..49df82c 100644
--- a/lisp/mail/mail-parse.el
+++ b/lisp/mail/mail-parse.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mail/mail-prsvr.el b/lisp/mail/mail-prsvr.el
index 07f6509..9703e47 100644
--- a/lisp/mail/mail-prsvr.el
+++ b/lisp/mail/mail-prsvr.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mail/mail-utils.el b/lisp/mail/mail-utils.el
index c23af87..0164ffd 100644
--- a/lisp/mail/mail-utils.el
+++ b/lisp/mail/mail-utils.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mail/mailabbrev.el b/lisp/mail/mailabbrev.el
index 4e3a3f9..ef0e40f 100644
--- a/lisp/mail/mailabbrev.el
+++ b/lisp/mail/mailabbrev.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mail/mailalias.el b/lisp/mail/mailalias.el
index 8f3f901..56fdd26 100644
--- a/lisp/mail/mailalias.el
+++ b/lisp/mail/mailalias.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mail/mailclient.el b/lisp/mail/mailclient.el
index 8862419..102730f 100644
--- a/lisp/mail/mailclient.el
+++ b/lisp/mail/mailclient.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mail/mailheader.el b/lisp/mail/mailheader.el
index bceba77..b388c32 100644
--- a/lisp/mail/mailheader.el
+++ b/lisp/mail/mailheader.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mail/metamail.el b/lisp/mail/metamail.el
index 4e08028..e4886ea 100644
--- a/lisp/mail/metamail.el
+++ b/lisp/mail/metamail.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mail/mspools.el b/lisp/mail/mspools.el
index 21856c3..13a39e5 100644
--- a/lisp/mail/mspools.el
+++ b/lisp/mail/mspools.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mail/qp.el b/lisp/mail/qp.el
index 262191d..9533697 100644
--- a/lisp/mail/qp.el
+++ b/lisp/mail/qp.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mail/reporter.el b/lisp/mail/reporter.el
index b13da94..6cb5e4a 100644
--- a/lisp/mail/reporter.el
+++ b/lisp/mail/reporter.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mail/rfc2045.el b/lisp/mail/rfc2045.el
index 11a6151..f5185d2 100644
--- a/lisp/mail/rfc2045.el
+++ b/lisp/mail/rfc2045.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;; RFC 2045 is: "Multipurpose Internet Mail Extensions (MIME) Part
 ;; One:  Format of Internet Message Bodies".
diff --git a/lisp/mail/rfc2047.el b/lisp/mail/rfc2047.el
index e2af86b..0c93331 100644
--- a/lisp/mail/rfc2047.el
+++ b/lisp/mail/rfc2047.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mail/rfc2231.el b/lisp/mail/rfc2231.el
index 66f539f..e27113a 100644
--- a/lisp/mail/rfc2231.el
+++ b/lisp/mail/rfc2231.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mail/rfc2368.el b/lisp/mail/rfc2368.el
index 6cb243c..3f09f87 100644
--- a/lisp/mail/rfc2368.el
+++ b/lisp/mail/rfc2368.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/mail/rfc822.el b/lisp/mail/rfc822.el
index 5edcef5..e8bbea3 100644
--- a/lisp/mail/rfc822.el
+++ b/lisp/mail/rfc822.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mail/rmail-spam-filter.el b/lisp/mail/rmail-spam-filter.el
index 648aa22..dee2d1c 100644
--- a/lisp/mail/rmail-spam-filter.el
+++ b/lisp/mail/rmail-spam-filter.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;; -----------
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index b240588..12b1191 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mail/rmailedit.el b/lisp/mail/rmailedit.el
index e9bb556..b91a815 100644
--- a/lisp/mail/rmailedit.el
+++ b/lisp/mail/rmailedit.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mail/rmailkwd.el b/lisp/mail/rmailkwd.el
index 761a58f..b366e5c 100644
--- a/lisp/mail/rmailkwd.el
+++ b/lisp/mail/rmailkwd.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index 1ffd466..60b2066 100644
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mail/rmailmsc.el b/lisp/mail/rmailmsc.el
index ac151f9..b53b95e 100644
--- a/lisp/mail/rmailmsc.el
+++ b/lisp/mail/rmailmsc.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mail/rmailout.el b/lisp/mail/rmailout.el
index a2f9320..8b918ec 100644
--- a/lisp/mail/rmailout.el
+++ b/lisp/mail/rmailout.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mail/rmailsort.el b/lisp/mail/rmailsort.el
index 681a9c4..a668d2e 100644
--- a/lisp/mail/rmailsort.el
+++ b/lisp/mail/rmailsort.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index 37ac46c..95d9b63 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 12d69aa..3e22fd8 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 93bfe0e..aff90d3 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -24,7 +24,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mail/supercite.el b/lisp/mail/supercite.el
index f3a6e31..c0dd7aa 100644
--- a/lisp/mail/supercite.el
+++ b/lisp/mail/supercite.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;; LCD Archive Entry
 ;; supercite|Barry A. Warsaw|address@hidden
diff --git a/lisp/mail/uce.el b/lisp/mail/uce.el
index 3dce1c6..db50c4e 100644
--- a/lisp/mail/uce.el
+++ b/lisp/mail/uce.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mail/undigest.el b/lisp/mail/undigest.el
index 73d7464..77e97c7 100644
--- a/lisp/mail/undigest.el
+++ b/lisp/mail/undigest.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mail/unrmail.el b/lisp/mail/unrmail.el
index 2ff6646..16e1ba3 100644
--- a/lisp/mail/unrmail.el
+++ b/lisp/mail/unrmail.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mail/uudecode.el b/lisp/mail/uudecode.el
index e68acbd..2811b0b 100644
--- a/lisp/mail/uudecode.el
+++ b/lisp/mail/uudecode.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mail/yenc.el b/lisp/mail/yenc.el
index c8e2d2c..b84b161 100644
--- a/lisp/mail/yenc.el
+++ b/lisp/mail/yenc.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/makesum.el b/lisp/makesum.el
index 48f51de..ffebf15 100644
--- a/lisp/makesum.el
+++ b/lisp/makesum.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/man.el b/lisp/man.el
index 4a14f63..7a892c6 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/master.el b/lisp/master.el
index 07e9ee5..3745e21 100644
--- a/lisp/master.el
+++ b/lisp/master.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mb-depth.el b/lisp/mb-depth.el
index 57fe7ab..5bdf8b9 100644
--- a/lisp/mb-depth.el
+++ b/lisp/mb-depth.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/md4.el b/lisp/md4.el
index 23d00ab..10f3d18 100644
--- a/lisp/md4.el
+++ b/lisp/md4.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 75ffd1e..972f84e 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;; Avishai Yacobi suggested some menu rearrangements.
 
diff --git a/lisp/mh-e/mh-acros.el b/lisp/mh-e/mh-acros.el
index d424247..86248fe 100644
--- a/lisp/mh-e/mh-acros.el
+++ b/lisp/mh-e/mh-acros.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mh-e/mh-alias.el b/lisp/mh-e/mh-alias.el
index d62ac67..7e69e75 100644
--- a/lisp/mh-e/mh-alias.el
+++ b/lisp/mh-e/mh-alias.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mh-e/mh-buffers.el b/lisp/mh-e/mh-buffers.el
index 233f898..e088bca 100644
--- a/lisp/mh-e/mh-buffers.el
+++ b/lisp/mh-e/mh-buffers.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el
index c052398..98067ce 100644
--- a/lisp/mh-e/mh-comp.el
+++ b/lisp/mh-e/mh-comp.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mh-e/mh-compat.el b/lisp/mh-e/mh-compat.el
index dbdadb1..3dc7a62 100644
--- a/lisp/mh-e/mh-compat.el
+++ b/lisp/mh-e/mh-compat.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index 38558f2..f511bf7 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -3035,12 +3035,12 @@ XEmacs. For more information, see URL
 `ftp://ftp.cs.indiana.edu/pub/faces/compface/compface.tar.z'). Recent
 versions of XEmacs have internal support for \"X-Face:\" images. If
 your version of XEmacs does not, then you'll need both \"uncompface\"
-and the x-face package (see URL `ftp://ftp.jpl.org/pub/elisp/').
+and the x-face package (see URL `http://www.jpl.org/ftp/pub/elisp/').
 
 Finally, MH-E will display images referenced by the \"X-Image-URL:\"
 header field if neither the \"Face:\" nor the \"X-Face:\" fields are
 present. The display of the images requires \"wget\" (see URL
-`http://www.gnu.org/software/wget/wget.html'), \"fetch\", or \"curl\"
+`https://www.gnu.org/software/wget/wget.html'), \"fetch\", or \"curl\"
 to fetch the image and the \"convert\" program from the ImageMagick
 suite (see URL `http://www.imagemagick.org/'). Of the three header
 fields this is the most efficient in terms of network usage since the
diff --git a/lisp/mh-e/mh-folder.el b/lisp/mh-e/mh-folder.el
index f846f17..49cf3d3 100644
--- a/lisp/mh-e/mh-folder.el
+++ b/lisp/mh-e/mh-folder.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mh-e/mh-funcs.el b/lisp/mh-e/mh-funcs.el
index 5252f92..cfff8cb 100644
--- a/lisp/mh-e/mh-funcs.el
+++ b/lisp/mh-e/mh-funcs.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mh-e/mh-gnus.el b/lisp/mh-e/mh-gnus.el
index 318759d..3367325 100644
--- a/lisp/mh-e/mh-gnus.el
+++ b/lisp/mh-e/mh-gnus.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mh-e/mh-identity.el b/lisp/mh-e/mh-identity.el
index ecc7f7e..9518e96 100644
--- a/lisp/mh-e/mh-identity.el
+++ b/lisp/mh-e/mh-identity.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mh-e/mh-inc.el b/lisp/mh-e/mh-inc.el
index a7ff8f3..fcdb3f0 100644
--- a/lisp/mh-e/mh-inc.el
+++ b/lisp/mh-e/mh-inc.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mh-e/mh-junk.el b/lisp/mh-e/mh-junk.el
index 25e116c..9057af4 100644
--- a/lisp/mh-e/mh-junk.el
+++ b/lisp/mh-e/mh-junk.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mh-e/mh-letter.el b/lisp/mh-e/mh-letter.el
index ca4ec39..28c18e4 100644
--- a/lisp/mh-e/mh-letter.el
+++ b/lisp/mh-e/mh-letter.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mh-e/mh-limit.el b/lisp/mh-e/mh-limit.el
index bc4a006..280bcc6 100644
--- a/lisp/mh-e/mh-limit.el
+++ b/lisp/mh-e/mh-limit.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el
index 7238de0..9d1edf0 100644
--- a/lisp/mh-e/mh-mime.el
+++ b/lisp/mh-e/mh-mime.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mh-e/mh-print.el b/lisp/mh-e/mh-print.el
index 906899d..d7b686c 100644
--- a/lisp/mh-e/mh-print.el
+++ b/lisp/mh-e/mh-print.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mh-e/mh-scan.el b/lisp/mh-e/mh-scan.el
index 1e708e5..936d451 100644
--- a/lisp/mh-e/mh-scan.el
+++ b/lisp/mh-e/mh-scan.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mh-e/mh-search.el b/lisp/mh-e/mh-search.el
index b0fdfce..95a5a08 100644
--- a/lisp/mh-e/mh-search.el
+++ b/lisp/mh-e/mh-search.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mh-e/mh-seq.el b/lisp/mh-e/mh-seq.el
index 6fc518b..9d3bd2d 100644
--- a/lisp/mh-e/mh-seq.el
+++ b/lisp/mh-e/mh-seq.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mh-e/mh-show.el b/lisp/mh-e/mh-show.el
index ab320ca..ce843a6 100644
--- a/lisp/mh-e/mh-show.el
+++ b/lisp/mh-e/mh-show.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mh-e/mh-speed.el b/lisp/mh-e/mh-speed.el
index 8d14d85..4438bf2 100644
--- a/lisp/mh-e/mh-speed.el
+++ b/lisp/mh-e/mh-speed.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mh-e/mh-thread.el b/lisp/mh-e/mh-thread.el
index b1b1512..9b9ef34 100644
--- a/lisp/mh-e/mh-thread.el
+++ b/lisp/mh-e/mh-thread.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mh-e/mh-tool-bar.el b/lisp/mh-e/mh-tool-bar.el
index 07dd29b..3add54f 100644
--- a/lisp/mh-e/mh-tool-bar.el
+++ b/lisp/mh-e/mh-tool-bar.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mh-e/mh-utils.el b/lisp/mh-e/mh-utils.el
index 1ed2e0f..7cb52ff 100644
--- a/lisp/mh-e/mh-utils.el
+++ b/lisp/mh-e/mh-utils.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mh-e/mh-xface.el b/lisp/mh-e/mh-xface.el
index dbfaa35..92afd63 100644
--- a/lisp/mh-e/mh-xface.el
+++ b/lisp/mh-e/mh-xface.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/midnight.el b/lisp/midnight.el
index b9893fb..dfe0df3 100644
--- a/lisp/midnight.el
+++ b/lisp/midnight.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/minibuf-eldef.el b/lisp/minibuf-eldef.el
index 0968001..1d223e6 100644
--- a/lisp/minibuf-eldef.el
+++ b/lisp/minibuf-eldef.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index e5b1029..f13f1fa 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/misc.el b/lisp/misc.el
index dc47c37..8806ac8 100644
--- a/lisp/misc.el
+++ b/lisp/misc.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/misearch.el b/lisp/misearch.el
index 884b330..89b437f 100644
--- a/lisp/misearch.el
+++ b/lisp/misearch.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mouse-copy.el b/lisp/mouse-copy.el
index 44d9973..4da25de 100644
--- a/lisp/mouse-copy.el
+++ b/lisp/mouse-copy.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mouse-drag.el b/lisp/mouse-drag.el
index 5a83e57..775a464 100644
--- a/lisp/mouse-drag.el
+++ b/lisp/mouse-drag.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 2fbaaad..3f448f0 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mpc.el b/lisp/mpc.el
index cce7527..c23d8ce 100644
--- a/lisp/mpc.el
+++ b/lisp/mpc.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -1029,12 +1029,12 @@ If PLAYLIST is t or nil or missing, use the main 
playlist."
                      (let ((dir (file-name-directory (cdr (assq 'file info)))))
                        ;; (debug)
                        (push `(equal ',dir (file-name-directory (cdr (assq 
'file info)))) pred)
-                       (if-let ((covers '(".folder.png" "cover.jpg" 
"folder.jpg"))
-                                (cover (cl-loop for file in (directory-files 
(mpc-file-local-copy dir))
-                                                if (member (downcase file) 
covers)
-                                                return (concat dir file)))
-                                (file (with-demoted-errors "MPC: %s"
-                                        (mpc-file-local-copy cover))))
+                       (if-let* ((covers '(".folder.png" "cover.jpg" 
"folder.jpg"))
+                                 (cover (cl-loop for file in (directory-files 
(mpc-file-local-copy dir))
+                                                 if (member (downcase file) 
covers)
+                                                 return (concat dir file)))
+                                 (file (with-demoted-errors "MPC: %s"
+                                         (mpc-file-local-copy cover))))
                            (let (image)
                              (if (null size) (setq image (create-image file))
                                (let ((tempfile (make-temp-file "mpc" nil 
".jpg")))
diff --git a/lisp/msb.el b/lisp/msb.el
index 7b48af7..c2ab2f5 100644
--- a/lisp/msb.el
+++ b/lisp/msb.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/mwheel.el b/lisp/mwheel.el
index 1428e5f..2956ba5 100644
--- a/lisp/mwheel.el
+++ b/lisp/mwheel.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 80b8476..73f62c8 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 20ae072..b104148 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -1317,7 +1317,7 @@ used instead of `browse-url-new-window-flag'."
               (if (file-exists-p
                    (setq pidfile (format "/tmp/Mosaic.%d" pid)))
                   (delete-file pidfile))
-              ;; http://debbugs.gnu.org/17428.  Use O_EXCL.
+              ;; https://debbugs.gnu.org/17428.  Use O_EXCL.
               (write-region nil nil pidfile nil 'silent nil 'excl)))
          ;; Send signal SIGUSR to Mosaic
          (message "Signaling Mosaic...")
diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index d740829..e79e326 100644
--- a/lisp/net/dbus.el
+++ b/lisp/net/dbus.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/dig.el b/lisp/net/dig.el
index 7e73367..ee98e5c 100644
--- a/lisp/net/dig.el
+++ b/lisp/net/dig.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/dns.el b/lisp/net/dns.el
index 8615813..b4500bd 100644
--- a/lisp/net/dns.el
+++ b/lisp/net/dns.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/eudc-bob.el b/lisp/net/eudc-bob.el
index 661ef51..899cdb0 100644
--- a/lisp/net/eudc-bob.el
+++ b/lisp/net/eudc-bob.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/eudc-export.el b/lisp/net/eudc-export.el
index 2226732..1077cc4 100644
--- a/lisp/net/eudc-export.el
+++ b/lisp/net/eudc-export.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/eudc-hotlist.el b/lisp/net/eudc-hotlist.el
index 083fd7f..05f682d 100644
--- a/lisp/net/eudc-hotlist.el
+++ b/lisp/net/eudc-hotlist.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/eudc-vars.el b/lisp/net/eudc-vars.el
index 79d6f2e..6a831b1 100644
--- a/lisp/net/eudc-vars.el
+++ b/lisp/net/eudc-vars.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/eudc.el b/lisp/net/eudc.el
index 644df7a..b19a838 100644
--- a/lisp/net/eudc.el
+++ b/lisp/net/eudc.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;    This package provides a common interface to query directory servers using
diff --git a/lisp/net/eudcb-bbdb.el b/lisp/net/eudcb-bbdb.el
index bfca103..8dff028 100644
--- a/lisp/net/eudcb-bbdb.el
+++ b/lisp/net/eudcb-bbdb.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;    This library provides an interface to use BBDB as a backend of
diff --git a/lisp/net/eudcb-ldap.el b/lisp/net/eudcb-ldap.el
index e1900e7..bdc72ef 100644
--- a/lisp/net/eudcb-ldap.el
+++ b/lisp/net/eudcb-ldap.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;    This library provides specific LDAP protocol support for the
diff --git a/lisp/net/eudcb-mab.el b/lisp/net/eudcb-mab.el
index 43384e2..2653cfa 100644
--- a/lisp/net/eudcb-mab.el
+++ b/lisp/net/eudcb-mab.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;    This library provides an interface to use the Mac's AddressBook,
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 03d9172..bff592c 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -521,7 +521,7 @@ Currently this means either text/html or 
application/xhtml+xml."
 (defun eww-tag-meta (dom)
   (when (and (cl-equalp (dom-attr dom 'http-equiv) "refresh")
              (< eww-redirect-level 5))
-    (when-let (refresh (dom-attr dom 'content))
+    (when-let* ((refresh (dom-attr dom 'content)))
       (when (or (string-match "^\\([0-9]+\\) *;.*url=\"\\([^\"]+\\)\"" refresh)
                 (string-match "^\\([0-9]+\\) *;.*url='\\([^']+\\)'" refresh)
                 (string-match "^\\([0-9]+\\) *;.*url=\\([^ ]+\\)" refresh))
@@ -1110,13 +1110,13 @@ just re-display the HTML already fetched."
 See URL `https://developer.mozilla.org/en-US/docs/Web/HTML/Element/Input'.")
 
 (defun eww-process-text-input (beg end replace-length)
-  (when-let (pos (and (< (1+ end) (point-max))
-                     (> (1- end) (point-min))
-                     (cond
-                      ((get-text-property (1+ end) 'eww-form)
-                       (1+ end))
-                      ((get-text-property (1- end) 'eww-form)
-                       (1- end)))))
+  (when-let* ((pos (and (< (1+ end) (point-max))
+                       (> (1- end) (point-min))
+                       (cond
+                        ((get-text-property (1+ end) 'eww-form)
+                         (1+ end))
+                        ((get-text-property (1- end) 'eww-form)
+                         (1- end))))))
     (let* ((form (get-text-property pos 'eww-form))
           (properties (text-properties-at pos))
            (buffer-undo-list t)
@@ -1799,8 +1799,8 @@ If CHARSET is nil then use UTF-8."
   (setq eww-data (list :title ""))
   ;; Don't let the history grow infinitely.  We store quite a lot of
   ;; data per page.
-  (when-let (tail (and eww-history-limit
-                      (nthcdr eww-history-limit eww-history)))
+  (when-let* ((tail (and eww-history-limit
+                        (nthcdr eww-history-limit eww-history))))
     (setcdr tail nil)))
 
 (defvar eww-current-buffer)
diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el
index 5db8732..d4943a3 100644
--- a/lisp/net/gnutls.el
+++ b/lisp/net/gnutls.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/goto-addr.el b/lisp/net/goto-addr.el
index 2c2274d..6356b90 100644
--- a/lisp/net/goto-addr.el
+++ b/lisp/net/goto-addr.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/hmac-def.el b/lisp/net/hmac-def.el
index 2466834..24246af 100644
--- a/lisp/net/hmac-def.el
+++ b/lisp/net/hmac-def.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/hmac-md5.el b/lisp/net/hmac-md5.el
index 53fa153..b4ef540 100644
--- a/lisp/net/hmac-md5.el
+++ b/lisp/net/hmac-md5.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/imap.el b/lisp/net/imap.el
index 7b29392..34206ef 100644
--- a/lisp/net/imap.el
+++ b/lisp/net/imap.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index d530338..22873ba 100644
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/mailcap.el b/lisp/net/mailcap.el
index f943015..ed35c22 100644
--- a/lisp/net/mailcap.el
+++ b/lisp/net/mailcap.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/mairix.el b/lisp/net/mairix.el
index 00806a1..5dd190c 100644
--- a/lisp/net/mairix.el
+++ b/lisp/net/mairix.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/net-utils.el b/lisp/net/net-utils.el
index 280c667..d15df69 100644
--- a/lisp/net/net-utils.el
+++ b/lisp/net/net-utils.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/netrc.el b/lisp/net/netrc.el
index a30d9f6..46a93ee 100644
--- a/lisp/net/netrc.el
+++ b/lisp/net/netrc.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el
index bf60eee..7d8f996 100644
--- a/lisp/net/network-stream.el
+++ b/lisp/net/network-stream.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/newst-backend.el b/lisp/net/newst-backend.el
index 8f748c1..5f68dea 100644
--- a/lisp/net/newst-backend.el
+++ b/lisp/net/newst-backend.el
@@ -23,7 +23,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;; ======================================================================
 
diff --git a/lisp/net/newst-plainview.el b/lisp/net/newst-plainview.el
index eab3e24..d5c9d32 100644
--- a/lisp/net/newst-plainview.el
+++ b/lisp/net/newst-plainview.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;; ======================================================================
 ;;; Commentary:
diff --git a/lisp/net/newst-reader.el b/lisp/net/newst-reader.el
index c781f0d..97bb21e 100644
--- a/lisp/net/newst-reader.el
+++ b/lisp/net/newst-reader.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;; ======================================================================
 ;;; Commentary:
diff --git a/lisp/net/newst-ticker.el b/lisp/net/newst-ticker.el
index 93198e3..913b89b 100644
--- a/lisp/net/newst-ticker.el
+++ b/lisp/net/newst-ticker.el
@@ -23,7 +23,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;; ======================================================================
 
diff --git a/lisp/net/newst-treeview.el b/lisp/net/newst-treeview.el
index e93da3e..61b9816 100644
--- a/lisp/net/newst-treeview.el
+++ b/lisp/net/newst-treeview.el
@@ -23,7 +23,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;; ======================================================================
 ;;; Commentary:
diff --git a/lisp/net/newsticker.el b/lisp/net/newsticker.el
index 971bdf6..075671e 100644
--- a/lisp/net/newsticker.el
+++ b/lisp/net/newsticker.el
@@ -23,7 +23,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 (defconst newsticker-version "1.99" "Version number of newsticker.el.")
 (make-obsolete-variable 'newsticker-version 'emacs-version "25.1")
diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el
index 8d3463e..e2053a0 100644
--- a/lisp/net/nsm.el
+++ b/lisp/net/nsm.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/ntlm.el b/lisp/net/ntlm.el
index 4baa8f2..137231c 100644
--- a/lisp/net/ntlm.el
+++ b/lisp/net/ntlm.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/pinentry.el b/lisp/net/pinentry.el
index 3e43b7d..f8d81fd 100644
--- a/lisp/net/pinentry.el
+++ b/lisp/net/pinentry.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/pop3.el b/lisp/net/pop3.el
index 2ef6321..91408b8 100644
--- a/lisp/net/pop3.el
+++ b/lisp/net/pop3.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/puny.el b/lisp/net/puny.el
index bdd59be..af9b031 100644
--- a/lisp/net/puny.el
+++ b/lisp/net/puny.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/quickurl.el b/lisp/net/quickurl.el
index 652eb2f..c9b1793 100644
--- a/lisp/net/quickurl.el
+++ b/lisp/net/quickurl.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
@@ -39,7 +39,7 @@
 ;; where <Lookup> is a string that acts as the keyword lookup and <URL> is
 ;; the URL associated with it. An example might be:
 ;;
-;;    ("GNU" . "http://www.gnu.org/";)
+;;    ("GNU" . "https://www.gnu.org/";)
 ;;
 ;; A list entry looks like:
 ;;
@@ -50,12 +50,12 @@
 ;; used when presenting a list of URLS using `quickurl-list'. An example
 ;; might be:
 ;;
-;;    ("FSF" "http://www.fsf.org/"; "The Free Software Foundation")
+;;    ("FSF" "https://www.fsf.org/"; "The Free Software Foundation")
 ;;
 ;; Given the above, your quickurl file might look like:
 ;;
-;; (("GNU"    . "http://www.gnu.org/";)
-;;  ("FSF"      "http://www.fsf.org/"; "The Free Software Foundation")
+;; (("GNU"    . "https://www.gnu.org/";)
+;;  ("FSF"      "https://www.fsf.org/"; "The Free Software Foundation")
 ;;  ("emacs"  . "http://www.emacs.org/";)
 ;;  ("davep"    "http://www.davep.org/"; "Dave's homepage"))
 ;;
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 6377f79..127290e 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <httpss://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/rfc2104.el b/lisp/net/rfc2104.el
index 71cf5bd..7d85c34 100644
--- a/lisp/net/rfc2104.el
+++ b/lisp/net/rfc2104.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/rlogin.el b/lisp/net/rlogin.el
index a07c490..ab7135a 100644
--- a/lisp/net/rlogin.el
+++ b/lisp/net/rlogin.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/sasl-cram.el b/lisp/net/sasl-cram.el
index cd6c7e1..269e9a5 100644
--- a/lisp/net/sasl-cram.el
+++ b/lisp/net/sasl-cram.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/sasl-digest.el b/lisp/net/sasl-digest.el
index 445d4bf..e74b90d 100644
--- a/lisp/net/sasl-digest.el
+++ b/lisp/net/sasl-digest.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/sasl-ntlm.el b/lisp/net/sasl-ntlm.el
index cb6961b..606aa03 100644
--- a/lisp/net/sasl-ntlm.el
+++ b/lisp/net/sasl-ntlm.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/sasl-scram-rfc.el b/lisp/net/sasl-scram-rfc.el
index 1dc4803..1841535 100644
--- a/lisp/net/sasl-scram-rfc.el
+++ b/lisp/net/sasl-scram-rfc.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/sasl.el b/lisp/net/sasl.el
index 6128b91..2a166db 100644
--- a/lisp/net/sasl.el
+++ b/lisp/net/sasl.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/secrets.el b/lisp/net/secrets.el
index 9bcfc37..fa49b64 100644
--- a/lisp/net/secrets.el
+++ b/lisp/net/secrets.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/shr-color.el b/lisp/net/shr-color.el
index b0c706e..65ab544 100644
--- a/lisp/net/shr-color.el
+++ b/lisp/net/shr-color.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index fe93fc3..7af6148 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -1363,7 +1363,7 @@ ones, in case fg and bg are nil."
       plist)))
 
 (defun shr-tag-base (dom)
-  (when-let (base (dom-attr dom 'href))
+  (when-let* ((base (dom-attr dom 'href)))
     (setq shr-base (shr-parse-base base)))
   (shr-generic dom))
 
@@ -1388,7 +1388,7 @@ ones, in case fg and bg are nil."
   (unless shr-inhibit-images
     (let ((start (point))
          url multimedia image)
-      (when-let (type (dom-attr dom 'type))
+      (when-let* ((type (dom-attr dom 'type)))
        (when (string-match "\\`image/svg" type)
          (setq url (dom-attr dom 'data)
                image t)))
@@ -2178,7 +2178,7 @@ flags that control whether to collect or render objects."
            (when (and (not (stringp column))
                       (or (memq (dom-tag column) '(td th))
                           (not column)))
-             (when-let (span (dom-attr column 'rowspan))
+             (when-let* ((span (dom-attr column 'rowspan)))
                (aset rowspans i (+ (aref rowspans i)
                                    (1- (string-to-number span)))))
              ;; Sanity check for invalid column-spans.
diff --git a/lisp/net/sieve-manage.el b/lisp/net/sieve-manage.el
index 1a54e1a..832b443 100644
--- a/lisp/net/sieve-manage.el
+++ b/lisp/net/sieve-manage.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/sieve-mode.el b/lisp/net/sieve-mode.el
index 87bb3a2..165bbbd 100644
--- a/lisp/net/sieve-mode.el
+++ b/lisp/net/sieve-mode.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/sieve.el b/lisp/net/sieve.el
index 665a0a8..c3acd36 100644
--- a/lisp/net/sieve.el
+++ b/lisp/net/sieve.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/snmp-mode.el b/lisp/net/snmp-mode.el
index e6a27f4..413882a 100644
--- a/lisp/net/snmp-mode.el
+++ b/lisp/net/snmp-mode.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/soap-client.el b/lisp/net/soap-client.el
index c0b71cd..4fdd038 100644
--- a/lisp/net/soap-client.el
+++ b/lisp/net/soap-client.el
@@ -24,7 +24,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/net/soap-inspect.el b/lisp/net/soap-inspect.el
index 2516bc9..722d4d6 100644
--- a/lisp/net/soap-inspect.el
+++ b/lisp/net/soap-inspect.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/net/socks.el b/lisp/net/socks.el
index f18e695..63a6506 100644
--- a/lisp/net/socks.el
+++ b/lisp/net/socks.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/starttls.el b/lisp/net/starttls.el
index 4de3d69..276807a 100644
--- a/lisp/net/starttls.el
+++ b/lisp/net/starttls.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -42,7 +42,7 @@
 ;; it performs more verification of the certificates.
 
 ;; The GnuTLS support requires GnuTLS 0.9.90 (released 2003-10-08) or
-;; later, from <http://www.gnu.org/software/gnutls/>, or "starttls"
+;; later, from <https://www.gnu.org/software/gnutls/>, or "starttls"
 ;; from <ftp://ftp.opaopa.org/pub/elisp/>.
 
 ;; Usage is similar to `open-network-stream'.  For example:
diff --git a/lisp/net/telnet.el b/lisp/net/telnet.el
index b38ef6c..0356941 100644
--- a/lisp/net/telnet.el
+++ b/lisp/net/telnet.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/tls.el b/lisp/net/tls.el
index 11aae63..76c39b0 100644
--- a/lisp/net/tls.el
+++ b/lisp/net/tls.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -106,7 +106,7 @@ successful negotiation."
          (repeat :inline t :tag "Other" (string)))
     (list :tag "List of commands"
          (repeat :tag "Command" (string))))
-  :version "25.3"                       ; remove s_client
+  :version "26.1"                       ; remove s_client
   :group 'tls)
 
 (defcustom tls-process-connection-type nil
diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el
index 6e8dd2f..c22869d 100644
--- a/lisp/net/tramp-adb.el
+++ b/lisp/net/tramp-adb.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -739,7 +739,8 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are 
completely ignored."
                     (signal (car err) (cdr err))))
 
                ;; Remote newname.
-               (when (file-directory-p newname)
+               (when (and (file-directory-p newname)
+                          (directory-name-p newname))
                  (setq newname
                        (expand-file-name
                         (file-name-nondirectory filename) newname)))
diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el
index a162ab0..dc97501 100644
--- a/lisp/net/tramp-cache.el
+++ b/lisp/net/tramp-cache.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/tramp-cmds.el b/lisp/net/tramp-cmds.el
index 4c5a12d..78ef1a3 100644
--- a/lisp/net/tramp-cmds.el
+++ b/lisp/net/tramp-cmds.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el
index 9a50d62..5d9a1fd 100644
--- a/lisp/net/tramp-compat.el
+++ b/lisp/net/tramp-compat.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/tramp-ftp.el b/lisp/net/tramp-ftp.el
index 85afd52..9fd2e6d 100644
--- a/lisp/net/tramp-ftp.el
+++ b/lisp/net/tramp-ftp.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index 6567991..e55dd11 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 01fe335..7df5aa3 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -23,7 +23,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
@@ -1984,24 +1984,26 @@ tramp-sh-handle-file-name-all-completions: internal 
error accessing `%s': `%s'"
                     (tramp-dissect-file-name newname)))))
          ;; scp or rsync DTRT.
          (progn
+           (when (and (file-directory-p newname)
+                      (not (directory-name-p newname)))
+             (tramp-error v 'file-already-exists newname))
            (setq dirname (directory-file-name (expand-file-name dirname))
                  newname (directory-file-name (expand-file-name newname)))
-           (if (and (file-directory-p newname)
-                    (not (string-equal (file-name-nondirectory dirname)
-                                       (file-name-nondirectory newname))))
-               (setq newname
-                     (expand-file-name
-                      (file-name-nondirectory dirname) newname)))
-           (if (not (file-directory-p (file-name-directory newname)))
+           (when (and (file-directory-p newname)
+                      (not (string-equal (file-name-nondirectory dirname)
+                                         (file-name-nondirectory newname))))
+             (setq newname
+                   (expand-file-name
+                    (file-name-nondirectory dirname) newname)))
+           (when (not (file-directory-p (file-name-directory newname)))
                (make-directory (file-name-directory newname) parents))
            (tramp-do-copy-or-rename-file-out-of-band
             'copy dirname newname keep-date))
+
        ;; We must do it file-wise.
        (tramp-run-real-handler
         'copy-directory
-        (if copy-contents
-            (list dirname newname keep-date parents copy-contents)
-          (list dirname newname keep-date parents))))
+        (list dirname newname keep-date parents copy-contents)))
 
       ;; When newname did exist, we have wrong cached values.
       (when t2
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el
index 8368cff..4969566 100644
--- a/lisp/net/tramp-smb.el
+++ b/lisp/net/tramp-smb.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -414,6 +414,9 @@ pass to the OPERATION."
       (with-parsed-tramp-file-name (if t1 dirname newname) nil
        (with-tramp-progress-reporter
            v 0 (format "Copying %s to %s" dirname newname)
+         (when (and (file-directory-p newname)
+                    (not (directory-name-p newname)))
+           (tramp-error v 'file-already-exists newname))
          (cond
           ;; We must use a local temporary directory.
           ((and t1 t2)
@@ -425,7 +428,8 @@ pass to the OPERATION."
              (unwind-protect
                  (progn
                    (make-directory tmpdir)
-                   (copy-directory dirname tmpdir keep-date 'parents)
+                   (copy-directory
+                    dirname (file-name-as-directory tmpdir) keep-date 'parents)
                    (copy-directory
                     (expand-file-name (file-name-nondirectory dirname) tmpdir)
                     newname keep-date parents))
@@ -569,8 +573,7 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are 
completely ignored."
       0 (format "Copying %s to %s" filename newname)
 
     (if (file-directory-p filename)
-       (copy-directory
-        filename newname keep-date 'parents 'copy-contents)
+       (copy-directory filename newname keep-date 'parents 'copy-contents)
 
       (let ((tmpfile (file-local-copy filename)))
        (if tmpfile
@@ -582,7 +585,8 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are 
completely ignored."
               (signal (car err) (cdr err))))
 
          ;; Remote newname.
-         (when (file-directory-p newname)
+         (when (and (file-directory-p newname)
+                    (directory-name-p newname))
            (setq newname
                  (expand-file-name (file-name-nondirectory filename) newname)))
 
diff --git a/lisp/net/tramp-uu.el b/lisp/net/tramp-uu.el
index 5e5f05d..12d4cd4 100644
--- a/lisp/net/tramp-uu.el
+++ b/lisp/net/tramp-uu.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 1462459..4577607 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -40,7 +40,7 @@
 ;; Also see the todo list at the bottom of this file.
 ;;
 ;; The current version of Tramp can be retrieved from the following URL:
-;;            http://ftp.gnu.org/gnu/tramp/
+;;            https://ftp.gnu.org/gnu/tramp/
 ;;
 ;; There's a mailing list for this, as well.  Its name is:
 ;;            address@hidden
@@ -49,7 +49,7 @@
 ;;
 ;; For the adventurous, the current development sources are available
 ;; via Git.  You can find instructions about this at the following URL:
-;;            http://savannah.gnu.org/projects/tramp/
+;;            https://savannah.gnu.org/projects/tramp/
 ;;
 ;; Don't forget to put on your asbestos longjohns, first!
 
diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index 527630d..91222bd 100644
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
@@ -68,7 +68,8 @@
         ("2.1.20" . "23.3") ("2.1.21-pre" . "23.4")
         ("2.2.3-24.1" . "24.1") ("2.2.3-24.1" . "24.2") ("2.2.6-24.3" . "24.3")
         ("2.2.9-24.4" . "24.4") ("2.2.11-24.5" . "24.5")
-        ("2.2.13.25.1" . "25.1") ("2.2.13.25.2" . "25.2")))
+        ("2.2.13.25.1" . "25.1") ("2.2.13.25.2" . "25.2")
+        ("2.2.13.25.2" . "25.3")))
 
 (add-hook 'tramp-unload-hook
          (lambda ()
diff --git a/lisp/net/webjump.el b/lisp/net/webjump.el
index f6e0cf8..79a0602 100644
--- a/lisp/net/webjump.el
+++ b/lisp/net/webjump.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -76,9 +76,9 @@
   '(
     ;; FSF, not including Emacs-specific.
     ("GNU Project FTP Archive" .
-     ;; GNU FTP Mirror List from http://www.gnu.org/order/ftp.html
-     [mirrors "ftp://ftp.gnu.org/pub/gnu/";
-              "http://ftpmirror.gnu.org";])
+     ;; GNU FTP Mirror List from https://www.gnu.org/order/ftp.html
+     [mirrors "https://ftp.gnu.org/pub/gnu/";
+              "https://ftpmirror.gnu.org";])
     ("GNU Project Home Page" . "www.gnu.org")
 
     ;; Emacs.
diff --git a/lisp/net/zeroconf.el b/lisp/net/zeroconf.el
index 393f3a5..7ad9c9f 100644
--- a/lisp/net/zeroconf.el
+++ b/lisp/net/zeroconf.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index 8772b523..2a0f8a8 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/notifications.el b/lisp/notifications.el
index 194b089..9290f71 100644
--- a/lisp/notifications.el
+++ b/lisp/notifications.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/novice.el b/lisp/novice.el
index a5ad2a0..72c16af 100644
--- a/lisp/novice.el
+++ b/lisp/novice.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/nxml/nxml-enc.el b/lisp/nxml/nxml-enc.el
index b359076..1a82b91 100644
--- a/lisp/nxml/nxml-enc.el
+++ b/lisp/nxml/nxml-enc.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -91,7 +91,7 @@
             ;; no-conversion gives the user a chance to fix it.
             'no-conversion)
            ;; There are other things we might try here in the future
-           ;; eg UTF-8 BOM, UTF-16 with no BOM 
+           ;; eg UTF-8 BOM, UTF-16 with no BOM
            ;; translate to EBCDIC
            (t
             (let ((enc-pos (xmltok-get-declared-encoding-position limit)))
diff --git a/lisp/nxml/nxml-maint.el b/lisp/nxml/nxml-maint.el
index 55abca1..9ba2b32 100644
--- a/lisp/nxml/nxml-maint.el
+++ b/lisp/nxml/nxml-maint.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el
index 7e33e74..3f4dce2 100644
--- a/lisp/nxml/nxml-mode.el
+++ b/lisp/nxml/nxml-mode.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/nxml/nxml-ns.el b/lisp/nxml/nxml-ns.el
index a9388d9..c4845a6 100644
--- a/lisp/nxml/nxml-ns.el
+++ b/lisp/nxml/nxml-ns.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/nxml/nxml-outln.el b/lisp/nxml/nxml-outln.el
index 2c414e4..5a2ecae 100644
--- a/lisp/nxml/nxml-outln.el
+++ b/lisp/nxml/nxml-outln.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/nxml/nxml-parse.el b/lisp/nxml/nxml-parse.el
index bce8cc9..6c00dc7 100644
--- a/lisp/nxml/nxml-parse.el
+++ b/lisp/nxml/nxml-parse.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/nxml/nxml-rap.el b/lisp/nxml/nxml-rap.el
index 0132a2b..daec948 100644
--- a/lisp/nxml/nxml-rap.el
+++ b/lisp/nxml/nxml-rap.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/nxml/nxml-util.el b/lisp/nxml/nxml-util.el
index 9f08545..dcb3ef4 100644
--- a/lisp/nxml/nxml-util.el
+++ b/lisp/nxml/nxml-util.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/nxml/rng-cmpct.el b/lisp/nxml/rng-cmpct.el
index a09c77c..b35774f 100644
--- a/lisp/nxml/rng-cmpct.el
+++ b/lisp/nxml/rng-cmpct.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/nxml/rng-dt.el b/lisp/nxml/rng-dt.el
index 6e60609..b62ba57 100644
--- a/lisp/nxml/rng-dt.el
+++ b/lisp/nxml/rng-dt.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/nxml/rng-loc.el b/lisp/nxml/rng-loc.el
index 359a717..891f101 100644
--- a/lisp/nxml/rng-loc.el
+++ b/lisp/nxml/rng-loc.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/nxml/rng-maint.el b/lisp/nxml/rng-maint.el
index 8378b1d..8561482 100644
--- a/lisp/nxml/rng-maint.el
+++ b/lisp/nxml/rng-maint.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/nxml/rng-match.el b/lisp/nxml/rng-match.el
index e340174..075695b 100644
--- a/lisp/nxml/rng-match.el
+++ b/lisp/nxml/rng-match.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/nxml/rng-nxml.el b/lisp/nxml/rng-nxml.el
index caa3d63..e878cfe 100644
--- a/lisp/nxml/rng-nxml.el
+++ b/lisp/nxml/rng-nxml.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/nxml/rng-parse.el b/lisp/nxml/rng-parse.el
index f3afbdd..9796c8a 100644
--- a/lisp/nxml/rng-parse.el
+++ b/lisp/nxml/rng-parse.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/nxml/rng-pttrn.el b/lisp/nxml/rng-pttrn.el
index 29b5581..6975f3c 100644
--- a/lisp/nxml/rng-pttrn.el
+++ b/lisp/nxml/rng-pttrn.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/nxml/rng-uri.el b/lisp/nxml/rng-uri.el
index 6b3190a..4bd619e 100644
--- a/lisp/nxml/rng-uri.el
+++ b/lisp/nxml/rng-uri.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/nxml/rng-util.el b/lisp/nxml/rng-util.el
index a804771..f49a681 100644
--- a/lisp/nxml/rng-util.el
+++ b/lisp/nxml/rng-util.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/nxml/rng-valid.el b/lisp/nxml/rng-valid.el
index 6837424..a96aedf 100644
--- a/lisp/nxml/rng-valid.el
+++ b/lisp/nxml/rng-valid.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/nxml/rng-xsd.el b/lisp/nxml/rng-xsd.el
index 51a05f8..79039ab 100644
--- a/lisp/nxml/rng-xsd.el
+++ b/lisp/nxml/rng-xsd.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/nxml/xmltok.el b/lisp/nxml/xmltok.el
index 69dc541..5d31392 100644
--- a/lisp/nxml/xmltok.el
+++ b/lisp/nxml/xmltok.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/nxml/xsd-regexp.el b/lisp/nxml/xsd-regexp.el
index d56960c..e22d6f7 100644
--- a/lisp/nxml/xsd-regexp.el
+++ b/lisp/nxml/xsd-regexp.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/obarray.el b/lisp/obarray.el
index b1160eb..0915e22 100644
--- a/lisp/obarray.el
+++ b/lisp/obarray.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/obsolete/abbrevlist.el b/lisp/obsolete/abbrevlist.el
index ebef215..34393b3 100644
--- a/lisp/obsolete/abbrevlist.el
+++ b/lisp/obsolete/abbrevlist.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/obsolete/assoc.el b/lisp/obsolete/assoc.el
index eab8d13..6313006 100644
--- a/lisp/obsolete/assoc.el
+++ b/lisp/obsolete/assoc.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/obsolete/bruce.el b/lisp/obsolete/bruce.el
index 6af597d..99f33b0 100644
--- a/lisp/obsolete/bruce.el
+++ b/lisp/obsolete/bruce.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -39,7 +39,7 @@
 ;; reading your meeting schedule notices or other email boring to everyone
 ;; but you and (you hope) the recipient. See below (I left in the original
 ;; writeup when I made this conversion), or the emacs documentation at
-;; ftp://prep.ai.mit.edu/pub/gnu/emacs-manual*.
+;; https://www.gnu.org/software/emacs/manual/.
 
 ;; Bruce is a direct copy of spook, with the word "spook" replaced with
 ;; the word "bruce". Thanks to "esr", whoever he, she or it may be, this
diff --git a/lisp/obsolete/cc-compat.el b/lisp/obsolete/cc-compat.el
index c9fdf73..6d05eec 100644
--- a/lisp/obsolete/cc-compat.el
+++ b/lisp/obsolete/cc-compat.el
@@ -23,7 +23,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
@@ -106,7 +106,7 @@ This is in addition to c-continued-statement-offset.")
     (if (eq (char-before) ?{)
        (forward-char -1)
       (goto-char (cdr langelem)))
-    (let* ((curcol (save-excursion 
+    (let* ((curcol (save-excursion
                     (goto-char (cdr langelem))
                     (current-column)))
          (bocm-lossage
@@ -138,7 +138,7 @@ This is in addition to c-continued-statement-offset.")
 (defun cc-block-close-offset (langelem)
   (save-excursion
     (let* ((here (point))
-          bracep 
+          bracep
           (curcol (progn
                     (goto-char (cdr langelem))
                     (current-column)))
@@ -154,7 +154,7 @@ This is in addition to c-continued-statement-offset.")
                           (current-column))))
       (- bocm-lossage curcol
         (if bracep 0 c-indent-level)))))
-      
+
 
 (defun cc-substatement-open-offset (langelem)
   (+ c-continued-statement-offset c-continued-brace-offset))
diff --git a/lisp/obsolete/cl-compat.el b/lisp/obsolete/cl-compat.el
index 930b59e..d021c68 100644
--- a/lisp/obsolete/cl-compat.el
+++ b/lisp/obsolete/cl-compat.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/obsolete/complete.el b/lisp/obsolete/complete.el
index 6a7fdc5..7b33de9 100644
--- a/lisp/obsolete/complete.el
+++ b/lisp/obsolete/complete.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/obsolete/crisp.el b/lisp/obsolete/crisp.el
index aa13be1..85fd4dc 100644
--- a/lisp/obsolete/crisp.el
+++ b/lisp/obsolete/crisp.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/obsolete/cust-print.el b/lisp/obsolete/cust-print.el
index b9aef43..8c12306 100644
--- a/lisp/obsolete/cust-print.el
+++ b/lisp/obsolete/cust-print.el
@@ -24,7 +24,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/obsolete/erc-hecomplete.el b/lisp/obsolete/erc-hecomplete.el
index 4b0b8ef..b1201eb 100644
--- a/lisp/obsolete/erc-hecomplete.el
+++ b/lisp/obsolete/erc-hecomplete.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -219,4 +219,3 @@ Window configurations are stored in
 ;; indent-tabs-mode: t
 ;; tab-width: 8
 ;; End:
-
diff --git a/lisp/obsolete/eudcb-ph.el b/lisp/obsolete/eudcb-ph.el
index 06d6f52..28b9be0 100644
--- a/lisp/obsolete/eudcb-ph.el
+++ b/lisp/obsolete/eudcb-ph.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/obsolete/fast-lock.el b/lisp/obsolete/fast-lock.el
index d1e2c24..ebcdd23 100644
--- a/lisp/obsolete/fast-lock.el
+++ b/lisp/obsolete/fast-lock.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/obsolete/gs.el b/lisp/obsolete/gs.el
index 5bc77d8..c821ebf 100644
--- a/lisp/obsolete/gs.el
+++ b/lisp/obsolete/gs.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/obsolete/gulp.el b/lisp/obsolete/gulp.el
index 11a7e02..5aa4fb4 100644
--- a/lisp/obsolete/gulp.el
+++ b/lisp/obsolete/gulp.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/obsolete/html2text.el b/lisp/obsolete/html2text.el
index f60b04a..d1dc876 100644
--- a/lisp/obsolete/html2text.el
+++ b/lisp/obsolete/html2text.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/obsolete/iswitchb.el b/lisp/obsolete/iswitchb.el
index 71cc917..59c2ee7 100644
--- a/lisp/obsolete/iswitchb.el
+++ b/lisp/obsolete/iswitchb.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/obsolete/landmark.el b/lisp/obsolete/landmark.el
index b6bbca4..99fd551 100644
--- a/lisp/obsolete/landmark.el
+++ b/lisp/obsolete/landmark.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 ;;; Commentary:
diff --git a/lisp/obsolete/lazy-lock.el b/lisp/obsolete/lazy-lock.el
index 5fa8fa4..6430439 100644
--- a/lisp/obsolete/lazy-lock.el
+++ b/lisp/obsolete/lazy-lock.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/obsolete/ledit.el b/lisp/obsolete/ledit.el
index 3dde96c..9cf6f76 100644
--- a/lisp/obsolete/ledit.el
+++ b/lisp/obsolete/ledit.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/obsolete/levents.el b/lisp/obsolete/levents.el
index e445b1a..24de489 100644
--- a/lisp/obsolete/levents.el
+++ b/lisp/obsolete/levents.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/obsolete/lmenu.el b/lisp/obsolete/lmenu.el
index a790d21..44ef617 100644
--- a/lisp/obsolete/lmenu.el
+++ b/lisp/obsolete/lmenu.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/obsolete/longlines.el b/lisp/obsolete/longlines.el
index a6c6a0c..b45b4a4 100644
--- a/lisp/obsolete/longlines.el
+++ b/lisp/obsolete/longlines.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/obsolete/lucid.el b/lisp/obsolete/lucid.el
index bf8347b..562c60a 100644
--- a/lisp/obsolete/lucid.el
+++ b/lisp/obsolete/lucid.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/obsolete/messcompat.el b/lisp/obsolete/messcompat.el
index 46adf83..6dc4df0 100644
--- a/lisp/obsolete/messcompat.el
+++ b/lisp/obsolete/messcompat.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/obsolete/mouse-sel.el b/lisp/obsolete/mouse-sel.el
index 3e67372..aee1ef8 100644
--- a/lisp/obsolete/mouse-sel.el
+++ b/lisp/obsolete/mouse-sel.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/obsolete/old-emacs-lock.el b/lisp/obsolete/old-emacs-lock.el
index 233c105..61986fe 100644
--- a/lisp/obsolete/old-emacs-lock.el
+++ b/lisp/obsolete/old-emacs-lock.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/obsolete/old-whitespace.el b/lisp/obsolete/old-whitespace.el
index defd18b..0b96c52 100644
--- a/lisp/obsolete/old-whitespace.el
+++ b/lisp/obsolete/old-whitespace.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/obsolete/options.el b/lisp/obsolete/options.el
index 2a61dc0..ae1ad3b 100644
--- a/lisp/obsolete/options.el
+++ b/lisp/obsolete/options.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/obsolete/otodo-mode.el b/lisp/obsolete/otodo-mode.el
index 5784601..c7a05ad 100644
--- a/lisp/obsolete/otodo-mode.el
+++ b/lisp/obsolete/otodo-mode.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;; ---------------------------------------------------------------------------
 
diff --git a/lisp/obsolete/pc-mode.el b/lisp/obsolete/pc-mode.el
index c1b7ff9..fe282ff 100644
--- a/lisp/obsolete/pc-mode.el
+++ b/lisp/obsolete/pc-mode.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/obsolete/pc-select.el b/lisp/obsolete/pc-select.el
index 59da293..5353859 100644
--- a/lisp/obsolete/pc-select.el
+++ b/lisp/obsolete/pc-select.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/obsolete/pgg-def.el b/lisp/obsolete/pgg-def.el
index 8d59c68..2582726 100644
--- a/lisp/obsolete/pgg-def.el
+++ b/lisp/obsolete/pgg-def.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/lisp/obsolete/pgg-gpg.el b/lisp/obsolete/pgg-gpg.el
index 189b119b..1c08755 100644
--- a/lisp/obsolete/pgg-gpg.el
+++ b/lisp/obsolete/pgg-gpg.el
@@ -23,7 +23,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/lisp/obsolete/pgg-parse.el b/lisp/obsolete/pgg-parse.el
index b441177..019d53d 100644
--- a/lisp/obsolete/pgg-parse.el
+++ b/lisp/obsolete/pgg-parse.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/obsolete/pgg-pgp.el b/lisp/obsolete/pgg-pgp.el
index 507fbbb..cac5240 100644
--- a/lisp/obsolete/pgg-pgp.el
+++ b/lisp/obsolete/pgg-pgp.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/lisp/obsolete/pgg-pgp5.el b/lisp/obsolete/pgg-pgp5.el
index 8fd976f..1504283 100644
--- a/lisp/obsolete/pgg-pgp5.el
+++ b/lisp/obsolete/pgg-pgp5.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/lisp/obsolete/pgg.el b/lisp/obsolete/pgg.el
index f99d759..d84dc92 100644
--- a/lisp/obsolete/pgg.el
+++ b/lisp/obsolete/pgg.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/lisp/obsolete/rcompile.el b/lisp/obsolete/rcompile.el
index dd25068..1ad4f5a 100644
--- a/lisp/obsolete/rcompile.el
+++ b/lisp/obsolete/rcompile.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/obsolete/s-region.el b/lisp/obsolete/s-region.el
index 8a85f3c..9898f5f 100644
--- a/lisp/obsolete/s-region.el
+++ b/lisp/obsolete/s-region.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/obsolete/sregex.el b/lisp/obsolete/sregex.el
index f57befa..9790e7f 100644
--- a/lisp/obsolete/sregex.el
+++ b/lisp/obsolete/sregex.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/obsolete/sup-mouse.el b/lisp/obsolete/sup-mouse.el
index 4aabe41..28822e1 100644
--- a/lisp/obsolete/sup-mouse.el
+++ b/lisp/obsolete/sup-mouse.el
@@ -23,7 +23,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/obsolete/terminal.el b/lisp/obsolete/terminal.el
index e5d85e6..4e5f369 100644
--- a/lisp/obsolete/terminal.el
+++ b/lisp/obsolete/terminal.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/obsolete/tpu-edt.el b/lisp/obsolete/tpu-edt.el
index ee1c277..cebb426 100644
--- a/lisp/obsolete/tpu-edt.el
+++ b/lisp/obsolete/tpu-edt.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;; TPU-edt is based on tpu.el by Jeff Kowalski and Bob Covey.
 
diff --git a/lisp/obsolete/tpu-extras.el b/lisp/obsolete/tpu-extras.el
index 06291ce..56ccbf0 100644
--- a/lisp/obsolete/tpu-extras.el
+++ b/lisp/obsolete/tpu-extras.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/obsolete/tpu-mapper.el b/lisp/obsolete/tpu-mapper.el
index bb7e28b..c44eba2 100644
--- a/lisp/obsolete/tpu-mapper.el
+++ b/lisp/obsolete/tpu-mapper.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/obsolete/vc-arch.el b/lisp/obsolete/vc-arch.el
index 92eaa62..d153f9a 100644
--- a/lisp/obsolete/vc-arch.el
+++ b/lisp/obsolete/vc-arch.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/obsolete/vip.el b/lisp/obsolete/vip.el
index 4d70d6a..c6a5d23 100644
--- a/lisp/obsolete/vip.el
+++ b/lisp/obsolete/vip.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/obsolete/ws-mode.el b/lisp/obsolete/ws-mode.el
index 62cccf7..c276cfc 100644
--- a/lisp/obsolete/ws-mode.el
+++ b/lisp/obsolete/ws-mode.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/obsolete/xesam.el b/lisp/obsolete/xesam.el
index c553d00..62844b9 100644
--- a/lisp/obsolete/xesam.el
+++ b/lisp/obsolete/xesam.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/obsolete/yow.el b/lisp/obsolete/yow.el
index 55f19a8..df8302e 100644
--- a/lisp/obsolete/yow.el
+++ b/lisp/obsolete/yow.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-C.el b/lisp/org/ob-C.el
index 2bdda68..86047ee 100644
--- a/lisp/org/ob-C.el
+++ b/lisp/org/ob-C.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-J.el b/lisp/org/ob-J.el
index ff4190b..eaccac8 100644
--- a/lisp/org/ob-J.el
+++ b/lisp/org/ob-J.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-R.el b/lisp/org/ob-R.el
index 3accade..ded825b 100644
--- a/lisp/org/ob-R.el
+++ b/lisp/org/ob-R.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-abc.el b/lisp/org/ob-abc.el
index 9fbe35b..693c5d8 100644
--- a/lisp/org/ob-abc.el
+++ b/lisp/org/ob-abc.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-asymptote.el b/lisp/org/ob-asymptote.el
index 1dbf484..819273a 100644
--- a/lisp/org/ob-asymptote.el
+++ b/lisp/org/ob-asymptote.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-awk.el b/lisp/org/ob-awk.el
index 2db4eea..e2eec9b 100644
--- a/lisp/org/ob-awk.el
+++ b/lisp/org/ob-awk.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-calc.el b/lisp/org/ob-calc.el
index d4b7260..76d36cf 100644
--- a/lisp/org/ob-calc.el
+++ b/lisp/org/ob-calc.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-clojure.el b/lisp/org/ob-clojure.el
index 3956157..b99035b 100644
--- a/lisp/org/ob-clojure.el
+++ b/lisp/org/ob-clojure.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-comint.el b/lisp/org/ob-comint.el
index 7b21808..2a1d274 100644
--- a/lisp/org/ob-comint.el
+++ b/lisp/org/ob-comint.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-coq.el b/lisp/org/ob-coq.el
index 93d2b1f..76bfc5a 100644
--- a/lisp/org/ob-coq.el
+++ b/lisp/org/ob-coq.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-core.el b/lisp/org/ob-core.el
index 527fb22..e187168 100644
--- a/lisp/org/ob-core.el
+++ b/lisp/org/ob-core.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 (require 'cl-lib)
diff --git a/lisp/org/ob-css.el b/lisp/org/ob-css.el
index 4203b12..b3982db 100644
--- a/lisp/org/ob-css.el
+++ b/lisp/org/ob-css.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-ditaa.el b/lisp/org/ob-ditaa.el
index 89b5d24..2a7c755 100644
--- a/lisp/org/ob-ditaa.el
+++ b/lisp/org/ob-ditaa.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-dot.el b/lisp/org/ob-dot.el
index 81442bf..8c8e2fb 100644
--- a/lisp/org/ob-dot.el
+++ b/lisp/org/ob-dot.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-ebnf.el b/lisp/org/ob-ebnf.el
index 0fceb5f..6bb9b81 100644
--- a/lisp/org/ob-ebnf.el
+++ b/lisp/org/ob-ebnf.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-emacs-lisp.el b/lisp/org/ob-emacs-lisp.el
index 989561d..4736d89 100644
--- a/lisp/org/ob-emacs-lisp.el
+++ b/lisp/org/ob-emacs-lisp.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-eval.el b/lisp/org/ob-eval.el
index 324cf5f..4ce91c7 100644
--- a/lisp/org/ob-eval.el
+++ b/lisp/org/ob-eval.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-exp.el b/lisp/org/ob-exp.el
index f87d0f8..dc9c53a 100644
--- a/lisp/org/ob-exp.el
+++ b/lisp/org/ob-exp.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 (require 'ob-core)
diff --git a/lisp/org/ob-forth.el b/lisp/org/ob-forth.el
index 152cf72..bb8d9af 100644
--- a/lisp/org/ob-forth.el
+++ b/lisp/org/ob-forth.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-fortran.el b/lisp/org/ob-fortran.el
index d059245..50b12fc 100644
--- a/lisp/org/ob-fortran.el
+++ b/lisp/org/ob-fortran.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-gnuplot.el b/lisp/org/ob-gnuplot.el
index 400823b..f353747 100644
--- a/lisp/org/ob-gnuplot.el
+++ b/lisp/org/ob-gnuplot.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-groovy.el b/lisp/org/ob-groovy.el
index 69993c0..1e602dd 100644
--- a/lisp/org/ob-groovy.el
+++ b/lisp/org/ob-groovy.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;; Currently only supports the external execution.  No session support yet.
diff --git a/lisp/org/ob-haskell.el b/lisp/org/ob-haskell.el
index ecce6dc..cc78bec 100644
--- a/lisp/org/ob-haskell.el
+++ b/lisp/org/ob-haskell.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-io.el b/lisp/org/ob-io.el
index 5dd6110..35b92ef6 100644
--- a/lisp/org/ob-io.el
+++ b/lisp/org/ob-io.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;; Currently only supports the external execution.  No session support yet.
diff --git a/lisp/org/ob-java.el b/lisp/org/ob-java.el
index 7e72023..608e2e8 100644
--- a/lisp/org/ob-java.el
+++ b/lisp/org/ob-java.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-js.el b/lisp/org/ob-js.el
index 91be6b0..e344b7a 100644
--- a/lisp/org/ob-js.el
+++ b/lisp/org/ob-js.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-keys.el b/lisp/org/ob-keys.el
index f5fb910..170c006 100644
--- a/lisp/org/ob-keys.el
+++ b/lisp/org/ob-keys.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-latex.el b/lisp/org/ob-latex.el
index 763ffb1..6964fde 100644
--- a/lisp/org/ob-latex.el
+++ b/lisp/org/ob-latex.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-ledger.el b/lisp/org/ob-ledger.el
index c02069e..4f10ebe 100644
--- a/lisp/org/ob-ledger.el
+++ b/lisp/org/ob-ledger.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-lilypond.el b/lisp/org/ob-lilypond.el
index 37a7a6b..3320a7e 100644
--- a/lisp/org/ob-lilypond.el
+++ b/lisp/org/ob-lilypond.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-lisp.el b/lisp/org/ob-lisp.el
index 1e381d0..d98098e 100644
--- a/lisp/org/ob-lisp.el
+++ b/lisp/org/ob-lisp.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-lob.el b/lisp/org/ob-lob.el
index b6f50d3..8a52b57 100644
--- a/lisp/org/ob-lob.el
+++ b/lisp/org/ob-lob.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 (require 'cl-lib)
diff --git a/lisp/org/ob-lua.el b/lisp/org/ob-lua.el
index 877d895..4fd7a32 100644
--- a/lisp/org/ob-lua.el
+++ b/lisp/org/ob-lua.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;; Requirements:
 ;; for session support, lua-mode is needed.
diff --git a/lisp/org/ob-makefile.el b/lisp/org/ob-makefile.el
index 2aa04fd..14190ac 100644
--- a/lisp/org/ob-makefile.el
+++ b/lisp/org/ob-makefile.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-matlab.el b/lisp/org/ob-matlab.el
index 23cfa36..e30ce8d 100644
--- a/lisp/org/ob-matlab.el
+++ b/lisp/org/ob-matlab.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-maxima.el b/lisp/org/ob-maxima.el
index 0a4d835..b2680aa 100644
--- a/lisp/org/ob-maxima.el
+++ b/lisp/org/ob-maxima.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-mscgen.el b/lisp/org/ob-mscgen.el
index 5c9dccc..784e0a9 100644
--- a/lisp/org/ob-mscgen.el
+++ b/lisp/org/ob-mscgen.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/org/ob-ocaml.el b/lisp/org/ob-ocaml.el
index 7997ff0..fd0ddf8 100644
--- a/lisp/org/ob-ocaml.el
+++ b/lisp/org/ob-ocaml.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-octave.el b/lisp/org/ob-octave.el
index 90735b1..0f51606 100644
--- a/lisp/org/ob-octave.el
+++ b/lisp/org/ob-octave.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-org.el b/lisp/org/ob-org.el
index 5683b96..232c2d0 100644
--- a/lisp/org/ob-org.el
+++ b/lisp/org/ob-org.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-perl.el b/lisp/org/ob-perl.el
index 62df8c5..2f462cf 100644
--- a/lisp/org/ob-perl.el
+++ b/lisp/org/ob-perl.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-picolisp.el b/lisp/org/ob-picolisp.el
index f577381..a1dbe6d 100644
--- a/lisp/org/ob-picolisp.el
+++ b/lisp/org/ob-picolisp.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-plantuml.el b/lisp/org/ob-plantuml.el
index e90021a..20dc25f 100644
--- a/lisp/org/ob-plantuml.el
+++ b/lisp/org/ob-plantuml.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-processing.el b/lisp/org/ob-processing.el
index a18a53c..4e09abc 100644
--- a/lisp/org/ob-processing.el
+++ b/lisp/org/ob-processing.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-python.el b/lisp/org/ob-python.el
index 302f8bd..60ec5fa 100644
--- a/lisp/org/ob-python.el
+++ b/lisp/org/ob-python.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-ref.el b/lisp/org/ob-ref.el
index f8b9ea4..323cdc7 100644
--- a/lisp/org/ob-ref.el
+++ b/lisp/org/ob-ref.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-ruby.el b/lisp/org/ob-ruby.el
index d055783..d9525ea 100644
--- a/lisp/org/ob-ruby.el
+++ b/lisp/org/ob-ruby.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-sass.el b/lisp/org/ob-sass.el
index a9a2a9f..769c901 100644
--- a/lisp/org/ob-sass.el
+++ b/lisp/org/ob-sass.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-scala.el b/lisp/org/ob-scala.el
index 7d5f299..d00b97c 100644
--- a/lisp/org/ob-scala.el
+++ b/lisp/org/ob-scala.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;; Currently only supports the external execution.  No session support yet.
diff --git a/lisp/org/ob-scheme.el b/lisp/org/ob-scheme.el
index cd8c386..2782853 100644
--- a/lisp/org/ob-scheme.el
+++ b/lisp/org/ob-scheme.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -32,7 +32,7 @@
 ;;; Requirements:
 
 ;; - a working scheme implementation
-;;   (e.g. guile http://www.gnu.org/software/guile/guile.html)
+;;   (e.g. guile https://www.gnu.org/software/guile/guile.html)
 ;;
 ;; - for session based evaluation geiser is required, which is available from
 ;;   ELPA.
diff --git a/lisp/org/ob-screen.el b/lisp/org/ob-screen.el
index 554f8c4..fbf167e 100644
--- a/lisp/org/ob-screen.el
+++ b/lisp/org/ob-screen.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-sed.el b/lisp/org/ob-sed.el
index f249d32..7bd0bfb 100644
--- a/lisp/org/ob-sed.el
+++ b/lisp/org/ob-sed.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-shell.el b/lisp/org/ob-shell.el
index 3787c26..af64adb 100644
--- a/lisp/org/ob-shell.el
+++ b/lisp/org/ob-shell.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-shen.el b/lisp/org/ob-shen.el
index 6bf36c6..6a4a3f1 100644
--- a/lisp/org/ob-shen.el
+++ b/lisp/org/ob-shen.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-sql.el b/lisp/org/ob-sql.el
index 6d39e95..7c3ee12 100644
--- a/lisp/org/ob-sql.el
+++ b/lisp/org/ob-sql.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-sqlite.el b/lisp/org/ob-sqlite.el
index 8094019..50e8ac1 100644
--- a/lisp/org/ob-sqlite.el
+++ b/lisp/org/ob-sqlite.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-stan.el b/lisp/org/ob-stan.el
index 40dd0ef..40fd8d9 100644
--- a/lisp/org/ob-stan.el
+++ b/lisp/org/ob-stan.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-table.el b/lisp/org/ob-table.el
index 4de8936..3169f3d 100644
--- a/lisp/org/ob-table.el
+++ b/lisp/org/ob-table.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob-tangle.el b/lisp/org/ob-tangle.el
index 2dc55ca..ed09ff5 100644
--- a/lisp/org/ob-tangle.el
+++ b/lisp/org/ob-tangle.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ob.el b/lisp/org/ob.el
index 736f588..c5ce0c0 100644
--- a/lisp/org/ob.el
+++ b/lisp/org/ob.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 (require 'org-macs)
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index 5984618..a1ff76b 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
diff --git a/lisp/org/org-archive.el b/lisp/org/org-archive.el
index ce1f35d..41b7566 100644
--- a/lisp/org/org-archive.el
+++ b/lisp/org/org-archive.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
diff --git a/lisp/org/org-attach.el b/lisp/org/org-attach.el
index a026eee..1feb99c 100644
--- a/lisp/org/org-attach.el
+++ b/lisp/org/org-attach.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/org-bbdb.el b/lisp/org/org-bbdb.el
index bf6a79a..2189b20 100644
--- a/lisp/org/org-bbdb.el
+++ b/lisp/org/org-bbdb.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
diff --git a/lisp/org/org-bibtex.el b/lisp/org/org-bibtex.el
index d52b947..9c10393 100644
--- a/lisp/org/org-bibtex.el
+++ b/lisp/org/org-bibtex.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;
 ;;; Commentary:
 ;;
diff --git a/lisp/org/org-capture.el b/lisp/org/org-capture.el
index 4320730..4a438d0 100644
--- a/lisp/org/org-capture.el
+++ b/lisp/org/org-capture.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el
index aa5c375..7d7640d 100644
--- a/lisp/org/org-clock.el
+++ b/lisp/org/org-clock.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
diff --git a/lisp/org/org-colview.el b/lisp/org/org-colview.el
index ac8f36a..d800652 100644
--- a/lisp/org/org-colview.el
+++ b/lisp/org/org-colview.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
diff --git a/lisp/org/org-compat.el b/lisp/org/org-compat.el
index 68a1166..26ac54e 100644
--- a/lisp/org/org-compat.el
+++ b/lisp/org/org-compat.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
diff --git a/lisp/org/org-crypt.el b/lisp/org/org-crypt.el
index 3c431e4..48c3ff0 100644
--- a/lisp/org/org-crypt.el
+++ b/lisp/org/org-crypt.el
@@ -23,7 +23,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/org-ctags.el b/lisp/org/org-ctags.el
index 98eb806..fe6caf2 100644
--- a/lisp/org/org-ctags.el
+++ b/lisp/org/org-ctags.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;
 ;; Synopsis
diff --git a/lisp/org/org-datetree.el b/lisp/org/org-datetree.el
index 540753d..b7852ba 100644
--- a/lisp/org/org-datetree.el
+++ b/lisp/org/org-datetree.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
diff --git a/lisp/org/org-docview.el b/lisp/org/org-docview.el
index dfad893..3361b0e 100644
--- a/lisp/org/org-docview.el
+++ b/lisp/org/org-docview.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
diff --git a/lisp/org/org-element.el b/lisp/org/org-element.el
index f4fe644..f370eb0 100644
--- a/lisp/org/org-element.el
+++ b/lisp/org/org-element.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/org/org-entities.el b/lisp/org/org-entities.el
index 05ccf0c..573ffa0 100644
--- a/lisp/org/org-entities.el
+++ b/lisp/org/org-entities.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
diff --git a/lisp/org/org-eshell.el b/lisp/org/org-eshell.el
index 34cc4ff..b0e9631 100644
--- a/lisp/org/org-eshell.el
+++ b/lisp/org/org-eshell.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/org-eww.el b/lisp/org/org-eww.el
index c14ae11..372b543 100644
--- a/lisp/org/org-eww.el
+++ b/lisp/org/org-eww.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 ;;; Commentary:
diff --git a/lisp/org/org-faces.el b/lisp/org/org-faces.el
index cd43d37..53538e6 100644
--- a/lisp/org/org-faces.el
+++ b/lisp/org/org-faces.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
diff --git a/lisp/org/org-feed.el b/lisp/org/org-feed.el
index 6ebe5ec..0119864 100644
--- a/lisp/org/org-feed.el
+++ b/lisp/org/org-feed.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
diff --git a/lisp/org/org-footnote.el b/lisp/org/org-footnote.el
index b9f23f1..e039ab7 100644
--- a/lisp/org/org-footnote.el
+++ b/lisp/org/org-footnote.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
diff --git a/lisp/org/org-gnus.el b/lisp/org/org-gnus.el
index b9d0989..ba57971 100644
--- a/lisp/org/org-gnus.el
+++ b/lisp/org/org-gnus.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
diff --git a/lisp/org/org-habit.el b/lisp/org/org-habit.el
index 1f61565..6ca9b79 100644
--- a/lisp/org/org-habit.el
+++ b/lisp/org/org-habit.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
diff --git a/lisp/org/org-id.el b/lisp/org/org-id.el
index f07d243..a508e76 100644
--- a/lisp/org/org-id.el
+++ b/lisp/org/org-id.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
diff --git a/lisp/org/org-indent.el b/lisp/org/org-indent.el
index 4a22b15..b34586e 100644
--- a/lisp/org/org-indent.el
+++ b/lisp/org/org-indent.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
diff --git a/lisp/org/org-info.el b/lisp/org/org-info.el
index 79b9bcc..088e0c7 100644
--- a/lisp/org/org-info.el
+++ b/lisp/org/org-info.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
@@ -92,11 +92,11 @@
     "smtpmail" "speedbar" "srecode" "todo-mode" "tramp" "url" "vip" "viper"
     "widget" "wisent" "woman")
   "List of emacs documents available.
-Taken from <http://www.gnu.org/software/emacs/manual/html_mono/.>")
+Taken from <https://www.gnu.org/software/emacs/manual/html_mono/.>")
 
 (defconst org-info-other-documents
-  '(("libc" . "http://www.gnu.org/software/libc/manual/html_mono/libc.html";)
-    ("make" . "http://www.gnu.org/software/make/manual/make.html";))
+  '(("libc" . "https://www.gnu.org/software/libc/manual/html_mono/libc.html";)
+    ("make" . "https://www.gnu.org/software/make/manual/make.html";))
   "Alist of documents generated from Texinfo source.
 When converting info links to HTML, links to any one of these manuals are
 converted to use these URL.")
@@ -108,7 +108,7 @@ the official page for that document, e.g., use \"gnu.org\" 
for all Emacs
 related documents.  Otherwise, append \".html\" extension to FILENAME.
 See `org-info-emacs-documents' and `org-info-other-documents' for details."
   (cond ((member filename org-info-emacs-documents)
-        (format "http://www.gnu.org/software/emacs/manual/html_mono/%s.html";
+        (format "https://www.gnu.org/software/emacs/manual/html_mono/%s.html";
                 filename))
        ((cdr (assoc filename org-info-other-documents)))
        (t (concat filename ".html"))))
diff --git a/lisp/org/org-inlinetask.el b/lisp/org/org-inlinetask.el
index 2918d40..360b1bc 100644
--- a/lisp/org/org-inlinetask.el
+++ b/lisp/org/org-inlinetask.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
diff --git a/lisp/org/org-irc.el b/lisp/org/org-irc.el
index 92537fc..5889f6d 100644
--- a/lisp/org/org-irc.el
+++ b/lisp/org/org-irc.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/org-lint.el b/lisp/org/org-lint.el
index 9007bf8..2b95851 100644
--- a/lisp/org/org-lint.el
+++ b/lisp/org/org-lint.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el
index a3e2625..e4848f9 100644
--- a/lisp/org/org-list.el
+++ b/lisp/org/org-list.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
diff --git a/lisp/org/org-macro.el b/lisp/org/org-macro.el
index 3b8f814..cddc09e 100644
--- a/lisp/org/org-macro.el
+++ b/lisp/org/org-macro.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/org-macs.el b/lisp/org/org-macs.el
index aae59d3..e656eaa 100644
--- a/lisp/org/org-macs.el
+++ b/lisp/org/org-macs.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
diff --git a/lisp/org/org-mhe.el b/lisp/org/org-mhe.el
index 4142ae4..f06fea7 100644
--- a/lisp/org/org-mhe.el
+++ b/lisp/org/org-mhe.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
diff --git a/lisp/org/org-mobile.el b/lisp/org/org-mobile.el
index 192ccad..a548930 100644
--- a/lisp/org/org-mobile.el
+++ b/lisp/org/org-mobile.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
diff --git a/lisp/org/org-mouse.el b/lisp/org/org-mouse.el
index d6a4727..8e61cfc 100644
--- a/lisp/org/org-mouse.el
+++ b/lisp/org/org-mouse.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/org/org-pcomplete.el b/lisp/org/org-pcomplete.el
index 61ec5fa..3c2561d 100644
--- a/lisp/org/org-pcomplete.el
+++ b/lisp/org/org-pcomplete.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Code:
diff --git a/lisp/org/org-plot.el b/lisp/org/org-plot.el
index 449143a..a802832 100644
--- a/lisp/org/org-plot.el
+++ b/lisp/org/org-plot.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/org-protocol.el b/lisp/org/org-protocol.el
index cd4b216..6e61a8d 100644
--- a/lisp/org/org-protocol.el
+++ b/lisp/org/org-protocol.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Commentary:
diff --git a/lisp/org/org-rmail.el b/lisp/org/org-rmail.el
index 31c59a1..332c669 100644
--- a/lisp/org/org-rmail.el
+++ b/lisp/org/org-rmail.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
diff --git a/lisp/org/org-src.el b/lisp/org/org-src.el
index 9a3ff53..da08777 100644
--- a/lisp/org/org-src.el
+++ b/lisp/org/org-src.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index 6b4e21b..60f5579 100644
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
diff --git a/lisp/org/org-timer.el b/lisp/org/org-timer.el
index 58eb4bd..88dc1a8 100644
--- a/lisp/org/org-timer.el
+++ b/lisp/org/org-timer.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
diff --git a/lisp/org/org-w3m.el b/lisp/org/org-w3m.el
index e9bbeff..f396814 100644
--- a/lisp/org/org-w3m.el
+++ b/lisp/org/org-w3m.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 87758fd..f8a2596 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;
 ;;; Commentary:
 ;;
diff --git a/lisp/org/ox-ascii.el b/lisp/org/ox-ascii.el
index 8dc31be..ad78995 100644
--- a/lisp/org/ox-ascii.el
+++ b/lisp/org/ox-ascii.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/org/ox-beamer.el b/lisp/org/ox-beamer.el
index 82651d3..bb08d0c 100644
--- a/lisp/org/ox-beamer.el
+++ b/lisp/org/ox-beamer.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/org/ox-html.el b/lisp/org/ox-html.el
index aeb38eb..aec4efc 100644
--- a/lisp/org/ox-html.el
+++ b/lisp/org/ox-html.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -1318,7 +1318,7 @@ like that: \"%%\"."
   :type 'string)
 
 (defcustom org-html-creator-string
-  (format "<a href=\"http://www.gnu.org/software/emacs/\";>Emacs</a> %s (<a 
href=\"http://orgmode.org\";>Org</a> mode %s)"
+  (format "<a href=\"https://www.gnu.org/software/emacs/\";>Emacs</a> %s (<a 
href=\"http://orgmode.org\";>Org</a> mode %s)"
          emacs-version
          (if (fboundp 'org-version) (org-version) "unknown version"))
   "Information about the creator of the HTML document.
diff --git a/lisp/org/ox-icalendar.el b/lisp/org/ox-icalendar.el
index e1956cc..ecec752 100644
--- a/lisp/org/ox-icalendar.el
+++ b/lisp/org/ox-icalendar.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/org/ox-latex.el b/lisp/org/ox-latex.el
index ec4b495..f1a510e 100644
--- a/lisp/org/ox-latex.el
+++ b/lisp/org/ox-latex.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/org/ox-man.el b/lisp/org/ox-man.el
index d0e4976..fb8f7be 100644
--- a/lisp/org/ox-man.el
+++ b/lisp/org/ox-man.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/org/ox-md.el b/lisp/org/ox-md.el
index 2478cc6..e2fefa3 100644
--- a/lisp/org/ox-md.el
+++ b/lisp/org/ox-md.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ox-odt.el b/lisp/org/ox-odt.el
index 7555468..f70f570 100644
--- a/lisp/org/ox-odt.el
+++ b/lisp/org/ox-odt.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ox-org.el b/lisp/org/ox-org.el
index a52ecc8..6c6a29a 100644
--- a/lisp/org/ox-org.el
+++ b/lisp/org/ox-org.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ox-publish.el b/lisp/org/ox-publish.el
index 508209a..bece11a 100644
--- a/lisp/org/ox-publish.el
+++ b/lisp/org/ox-publish.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/ox-texinfo.el b/lisp/org/ox-texinfo.el
index 35927d9..f70b7c4 100644
--- a/lisp/org/ox-texinfo.el
+++ b/lisp/org/ox-texinfo.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/org/ox.el b/lisp/org/ox.el
index 7d2f3d1..4e85066 100644
--- a/lisp/org/ox.el
+++ b/lisp/org/ox.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/outline.el b/lisp/outline.el
index 9ace604..fe1df76 100644
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/paren.el b/lisp/paren.el
index 5ccfa5f..190922a 100644
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -60,7 +60,7 @@ active, you must toggle the mode off and on again for this to 
take effect."
 
 (defcustom show-paren-priority 1000
   "Priority of paren highlighting overlays."
-  :type 'integer 
+  :type 'integer
   :version "21.1")
 
 (defcustom show-paren-ring-bell-on-mismatch nil
diff --git a/lisp/password-cache.el b/lisp/password-cache.el
index cbc248b..18f30a8 100644
--- a/lisp/password-cache.el
+++ b/lisp/password-cache.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/pcmpl-cvs.el b/lisp/pcmpl-cvs.el
index c03be64..6ab962f 100644
--- a/lisp/pcmpl-cvs.el
+++ b/lisp/pcmpl-cvs.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/pcmpl-gnu.el b/lisp/pcmpl-gnu.el
index 73a0fe5..78cc001 100644
--- a/lisp/pcmpl-gnu.el
+++ b/lisp/pcmpl-gnu.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/pcmpl-linux.el b/lisp/pcmpl-linux.el
index 84fb4b9..0e27489 100644
--- a/lisp/pcmpl-linux.el
+++ b/lisp/pcmpl-linux.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/pcmpl-rpm.el b/lisp/pcmpl-rpm.el
index ce5f053..c2083c8 100644
--- a/lisp/pcmpl-rpm.el
+++ b/lisp/pcmpl-rpm.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/pcmpl-unix.el b/lisp/pcmpl-unix.el
index 9bcce8b..41968bf 100644
--- a/lisp/pcmpl-unix.el
+++ b/lisp/pcmpl-unix.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/pcmpl-x.el b/lisp/pcmpl-x.el
index 7aeff54..1dde324 100644
--- a/lisp/pcmpl-x.el
+++ b/lisp/pcmpl-x.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el
index 6e45f38..745a813 100644
--- a/lisp/pcomplete.el
+++ b/lisp/pcomplete.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/pixel-scroll.el b/lisp/pixel-scroll.el
index 18c0bc8..4f183ad 100644
--- a/lisp/pixel-scroll.el
+++ b/lisp/pixel-scroll.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;; Usage:
 ;;
diff --git a/lisp/play/5x5.el b/lisp/play/5x5.el
index 312764b..dad2048 100644
--- a/lisp/play/5x5.el
+++ b/lisp/play/5x5.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/play/animate.el b/lisp/play/animate.el
index d074a74..80bb746 100644
--- a/lisp/play/animate.el
+++ b/lisp/play/animate.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/play/blackbox.el b/lisp/play/blackbox.el
index d935b02..e25978c 100644
--- a/lisp/play/blackbox.el
+++ b/lisp/play/blackbox.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/play/bubbles.el b/lisp/play/bubbles.el
index 4c9754a..35abbc8 100644
--- a/lisp/play/bubbles.el
+++ b/lisp/play/bubbles.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/play/cookie1.el b/lisp/play/cookie1.el
index 88627d6..b9605dc 100644
--- a/lisp/play/cookie1.el
+++ b/lisp/play/cookie1.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/play/decipher.el b/lisp/play/decipher.el
index 61a63bd..f68e78d 100644
--- a/lisp/play/decipher.el
+++ b/lisp/play/decipher.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/play/dissociate.el b/lisp/play/dissociate.el
index 6bd7f69..23d7847 100644
--- a/lisp/play/dissociate.el
+++ b/lisp/play/dissociate.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/play/doctor.el b/lisp/play/doctor.el
index f90e1d0..e1c4d2a 100644
--- a/lisp/play/doctor.el
+++ b/lisp/play/doctor.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/play/dunnet.el b/lisp/play/dunnet.el
index 6acdf36..ed1cd5e 100644
--- a/lisp/play/dunnet.el
+++ b/lisp/play/dunnet.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/play/fortune.el b/lisp/play/fortune.el
index 7b60465..0b83b62 100644
--- a/lisp/play/fortune.el
+++ b/lisp/play/fortune.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;; This utility allows you to automatically cut regions to a fortune
diff --git a/lisp/play/gamegrid.el b/lisp/play/gamegrid.el
index 0386a89..6214e07 100644
--- a/lisp/play/gamegrid.el
+++ b/lisp/play/gamegrid.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/play/gametree.el b/lisp/play/gametree.el
index 3954c1d..9442052 100644
--- a/lisp/play/gametree.el
+++ b/lisp/play/gametree.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/play/gomoku.el b/lisp/play/gomoku.el
index a2d3447..7c31845 100644
--- a/lisp/play/gomoku.el
+++ b/lisp/play/gomoku.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/play/handwrite.el b/lisp/play/handwrite.el
index 06b37be..0b572d1 100644
--- a/lisp/play/handwrite.el
+++ b/lisp/play/handwrite.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/play/life.el b/lisp/play/life.el
index c5907a9..a5a3f1e 100644
--- a/lisp/play/life.el
+++ b/lisp/play/life.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/play/morse.el b/lisp/play/morse.el
index 85d9db0..d55e0a4 100644
--- a/lisp/play/morse.el
+++ b/lisp/play/morse.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/play/mpuz.el b/lisp/play/mpuz.el
index 8152030..5fc4f2d 100644
--- a/lisp/play/mpuz.el
+++ b/lisp/play/mpuz.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/play/pong.el b/lisp/play/pong.el
index fb826fb..c5af6f1 100644
--- a/lisp/play/pong.el
+++ b/lisp/play/pong.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/play/snake.el b/lisp/play/snake.el
index d5904a4..d6a2141 100644
--- a/lisp/play/snake.el
+++ b/lisp/play/snake.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/play/solitaire.el b/lisp/play/solitaire.el
index 850b805..f1aa046 100644
--- a/lisp/play/solitaire.el
+++ b/lisp/play/solitaire.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/play/spook.el b/lisp/play/spook.el
index e672772..fd2e811 100644
--- a/lisp/play/spook.el
+++ b/lisp/play/spook.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/play/tetris.el b/lisp/play/tetris.el
index d20ac0a..2b06d8f 100644
--- a/lisp/play/tetris.el
+++ b/lisp/play/tetris.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/play/zone.el b/lisp/play/zone.el
index a718d07..254b76c 100644
--- a/lisp/play/zone.el
+++ b/lisp/play/zone.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/plstore.el b/lisp/plstore.el
index 26c53b3..b49e3d4 100644
--- a/lisp/plstore.el
+++ b/lisp/plstore.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary
 
diff --git a/lisp/printing.el b/lisp/printing.el
index 9970b85..328cbe0 100644
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -28,7 +28,7 @@ Please send all bug fixes and enhancements to
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -58,7 +58,7 @@ Please send all bug fixes and enhancements to
 ;; On GNU or Unix system, `printing' depends on gs and gv utilities.
 ;; On NT system, `printing' depends on gstools (gswin32.exe and gsview32.exe).
 ;; To obtain ghostscript, ghostview and GSview see the URL
-;; `http://www.gnu.org/software/ghostscript/ghostscript.html'.
+;; `https://www.gnu.org/software/ghostscript/ghostscript.html'.
 ;;
 ;; `printing' depends on ps-print package to generate PostScript files, to
 ;; spool and to despool PostScript buffer.  So, `printing' provides an
@@ -958,7 +958,7 @@ Please send all bug fixes and enhancements to
 ;;
 ;; * For GNU or Unix system:
 ;;
-;;    gs, gv         `http://www.gnu.org/software/ghostscript/ghostscript.html'
+;;    gs, gv         
`https://www.gnu.org/software/ghostscript/ghostscript.html'
 ;;    enscript       `http://people.ssh.fi/mtr/genscript/'
 ;;    psnup          `http://www.knackered.org/angus/psutils/'
 ;;    mpage          `http://www.mesa.nl/pub/mpage/'
@@ -966,7 +966,7 @@ Please send all bug fixes and enhancements to
 ;; * For Windows system:
 ;;
 ;;    gswin32, gsview32
-;;                   `http://www.gnu.org/software/ghostscript/ghostscript.html'
+;;                   
`https://www.gnu.org/software/ghostscript/ghostscript.html'
 ;;    gsprint        `http://www.cs.wisc.edu/~ghost/gsview/gsprint.htm'.
 ;;    enscript       `http://people.ssh.fi/mtr/genscript/'
 ;;    psnup          `http://gnuwin32.sourceforge.net/packages/psutils.htm'
@@ -2249,7 +2249,7 @@ See also `pr-path-alist'.
 Useful links:
 
 * GNU gv manual
-  `http://www.gnu.org/software/gv/manual/gv.html'
+  `https://www.gnu.org/software/gv/manual/gv.html'
 
 * GSview Help
   `http://www.cs.wisc.edu/~ghost/gsview/gsviewen.htm'
diff --git a/lisp/proced.el b/lisp/proced.el
index 18693f4..f5ea10b 100644
--- a/lisp/proced.el
+++ b/lisp/proced.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/profiler.el b/lisp/profiler.el
index 15ff9b6..0eed79e 100644
--- a/lisp/profiler.el
+++ b/lisp/profiler.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index ab3ff3a..05d8038 100644
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;; This mode is a major mode for editing Ada code.  This is a major
diff --git a/lisp/progmodes/ada-prj.el b/lisp/progmodes/ada-prj.el
index f1b9087..b86982a 100644
--- a/lisp/progmodes/ada-prj.el
+++ b/lisp/progmodes/ada-prj.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/ada-stmt.el b/lisp/progmodes/ada-stmt.el
index 2b39068..c8f70b0 100644
--- a/lisp/progmodes/ada-stmt.el
+++ b/lisp/progmodes/ada-stmt.el
@@ -23,7 +23,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;; This file is now automatically loaded from ada-mode.el, and creates a 
submenu
diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el
index 4e19650..5f79afe 100644
--- a/lisp/progmodes/ada-xref.el
+++ b/lisp/progmodes/ada-xref.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/antlr-mode.el b/lisp/progmodes/antlr-mode.el
index 2d09e43..f84d94a 100644
--- a/lisp/progmodes/antlr-mode.el
+++ b/lisp/progmodes/antlr-mode.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/asm-mode.el b/lisp/progmodes/asm-mode.el
index 2a1dad6..f6e2d78 100644
--- a/lisp/progmodes/asm-mode.el
+++ b/lisp/progmodes/asm-mode.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/autoconf.el b/lisp/progmodes/autoconf.el
index 6d58faa..6e591c1 100644
--- a/lisp/progmodes/autoconf.el
+++ b/lisp/progmodes/autoconf.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/bat-mode.el b/lisp/progmodes/bat-mode.el
index 1dd2e37..f4852fe 100644
--- a/lisp/progmodes/bat-mode.el
+++ b/lisp/progmodes/bat-mode.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/progmodes/bug-reference.el b/lisp/progmodes/bug-reference.el
index 13c52a4..7e004ce 100644
--- a/lisp/progmodes/bug-reference.el
+++ b/lisp/progmodes/bug-reference.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -44,7 +44,7 @@
     map)
   "Keymap used by bug reference buttons.")
 
-;; E.g., "http://gcc.gnu.org/PR%s";
+;; E.g., "https://gcc.gnu.org/PR%s";
 (defvar bug-reference-url-format nil
   "Format used to turn a bug number into a URL.
 The bug number is supplied as a string, so this should have a single %s.
diff --git a/lisp/progmodes/cc-align.el b/lisp/progmodes/cc-align.el
index dbedb59..4b32602 100644
--- a/lisp/progmodes/cc-align.el
+++ b/lisp/progmodes/cc-align.el
@@ -26,7 +26,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -1231,7 +1231,7 @@ Works with: Any syntactic symbol which has an anchor 
position."
   (save-excursion
     (goto-char (c-langelem-pos langelem))
     (vector (current-column))))
-    
+
 
 (defun c-lineup-dont-change (_langelem)
   "Do not change the indentation of the current line.
diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el
index 662329b..488b93e 100644
--- a/lisp/progmodes/cc-awk.el
+++ b/lisp/progmodes/cc-awk.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/cc-bytecomp.el b/lisp/progmodes/cc-bytecomp.el
index f15d28e..d4bce32 100644
--- a/lisp/progmodes/cc-bytecomp.el
+++ b/lisp/progmodes/cc-bytecomp.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el
index dec59c5..5c8bbeb 100644
--- a/lisp/progmodes/cc-cmds.el
+++ b/lisp/progmodes/cc-cmds.el
@@ -26,7 +26,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el
index dda343d..bff1c9e 100644
--- a/lisp/progmodes/cc-defs.el
+++ b/lisp/progmodes/cc-defs.el
@@ -26,7 +26,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 9ea0b20..d5083ed 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -26,7 +26,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -11799,7 +11799,7 @@ comment at the start of cc-engine.el for more info."
              (cond
               ((c-backward-over-enum-header)
                (setq placeholder (c-point 'boi)))
-              ((consp (setq placeholder 
+              ((consp (setq placeholder
                             (c-looking-at-or-maybe-in-bracelist
                              containing-sexp lim)))
                (setq tmpsymbol (and (cdr placeholder) 'topmost-intro-cont))
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
index 95246f9..5aefdea 100644
--- a/lisp/progmodes/cc-fonts.el
+++ b/lisp/progmodes/cc-fonts.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/cc-guess.el b/lisp/progmodes/cc-guess.el
index c8cd6fb..00d8bf0 100644
--- a/lisp/progmodes/cc-guess.el
+++ b/lisp/progmodes/cc-guess.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index 8a4adf1..ef6b88c 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -26,7 +26,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/cc-menus.el b/lisp/progmodes/cc-menus.el
index 126b419..6746651 100644
--- a/lisp/progmodes/cc-menus.el
+++ b/lisp/progmodes/cc-menus.el
@@ -25,7 +25,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 663a51c..354dee8 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -25,7 +25,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/cc-styles.el b/lisp/progmodes/cc-styles.el
index b1c94c3..1a8d90b 100644
--- a/lisp/progmodes/cc-styles.el
+++ b/lisp/progmodes/cc-styles.el
@@ -26,7 +26,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el
index 2ae90ce..6818b5e 100644
--- a/lisp/progmodes/cc-vars.el
+++ b/lisp/progmodes/cc-vars.el
@@ -26,7 +26,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/cfengine.el b/lisp/progmodes/cfengine.el
index 5bc7b66..10881cd 100644
--- a/lisp/progmodes/cfengine.el
+++ b/lisp/progmodes/cfengine.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/cmacexp.el b/lisp/progmodes/cmacexp.el
index cafd5ac..883515e 100644
--- a/lisp/progmodes/cmacexp.el
+++ b/lisp/progmodes/cmacexp.el
@@ -27,7 +27,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 8c84398..b3d0903 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index c69eca2..abd77bd 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Corrections made by Ilya Zakharevich address@hidden
 
@@ -701,24 +701,7 @@ This way enabling/disabling of menu items is more correct."
 ;;; Short extra-docs.
 
 (defvar cperl-tips 'please-ignore-this-line
-  "Get maybe newer version of this package from
-  http://ilyaz.org/software/emacs
-Subdirectory `cperl-mode' may contain yet newer development releases and/or
-patches to related files.
-
-For best results apply to an older Emacs the patches from
-  ftp://ftp.math.ohio-state.edu/pub/users/ilya/cperl-mode/patches
-\(this upgrades syntax-parsing abilities of Emacsen v19.34 and
-v20.2 up to the level of Emacs v20.3 - a must for a good Perl
-mode.)  As of beginning of 2003, XEmacs may provide a similar ability.
-
-Get support packages choose-color.el (or font-lock-extra.el before
-19.30), imenu-go.el from the same place.  \(Look for other files there
-too... ;-).  Get a patch for imenu.el in 19.29.  Note that for 19.30 and
-later you should use choose-color.el *instead* of font-lock-extra.el
-\(and you will not get smart highlighting in C :-().
-
-Note that to enable Compile choices in the menu you need to install
+  "Note that to enable Compile choices in the menu you need to install
 mode-compile.el.
 
 If your Emacs does not default to `cperl-mode' on Perl files, and you
diff --git a/lisp/progmodes/cpp.el b/lisp/progmodes/cpp.el
index e35a76e..8aaebdd 100644
--- a/lisp/progmodes/cpp.el
+++ b/lisp/progmodes/cpp.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/cwarn.el b/lisp/progmodes/cwarn.el
index 1c6905a..4b28d5a 100644
--- a/lisp/progmodes/cwarn.el
+++ b/lisp/progmodes/cwarn.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/dcl-mode.el b/lisp/progmodes/dcl-mode.el
index eb0850e..6681af5 100644
--- a/lisp/progmodes/dcl-mode.el
+++ b/lisp/progmodes/dcl-mode.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/ebnf-abn.el b/lisp/progmodes/ebnf-abn.el
index a3780eb..f73efe4 100644
--- a/lisp/progmodes/ebnf-abn.el
+++ b/lisp/progmodes/ebnf-abn.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/ebnf-bnf.el b/lisp/progmodes/ebnf-bnf.el
index a257d39..7d426f9 100644
--- a/lisp/progmodes/ebnf-bnf.el
+++ b/lisp/progmodes/ebnf-bnf.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/ebnf-dtd.el b/lisp/progmodes/ebnf-dtd.el
index 2bea954..545e210 100644
--- a/lisp/progmodes/ebnf-dtd.el
+++ b/lisp/progmodes/ebnf-dtd.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/ebnf-ebx.el b/lisp/progmodes/ebnf-ebx.el
index 84c67df..048a0a1 100644
--- a/lisp/progmodes/ebnf-ebx.el
+++ b/lisp/progmodes/ebnf-ebx.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/ebnf-iso.el b/lisp/progmodes/ebnf-iso.el
index 8847c40..c50bcb8 100644
--- a/lisp/progmodes/ebnf-iso.el
+++ b/lisp/progmodes/ebnf-iso.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/ebnf-otz.el b/lisp/progmodes/ebnf-otz.el
index 31dfd95..7d5d0d6 100644
--- a/lisp/progmodes/ebnf-otz.el
+++ b/lisp/progmodes/ebnf-otz.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/ebnf-yac.el b/lisp/progmodes/ebnf-yac.el
index 3aa02a8..d7b2070 100644
--- a/lisp/progmodes/ebnf-yac.el
+++ b/lisp/progmodes/ebnf-yac.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el
index a8229df..a813d42 100644
--- a/lisp/progmodes/ebnf2ps.el
+++ b/lisp/progmodes/ebnf2ps.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 (defconst ebnf-version "4.4"
   "ebnf2ps.el, v 4.4 <2007/02/12 vinicius>
diff --git a/lisp/progmodes/ebrowse.el b/lisp/progmodes/ebrowse.el
index 0b5d7aa..661c55d 100644
--- a/lisp/progmodes/ebrowse.el
+++ b/lisp/progmodes/ebrowse.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index 0bf8857..2f8e081 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index 222dea1..619c2ed 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/executable.el b/lisp/progmodes/executable.el
index ebdb516..00c898d 100644
--- a/lisp/progmodes/executable.el
+++ b/lisp/progmodes/executable.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index 49e072c..6421ba6 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/flymake-proc.el b/lisp/progmodes/flymake-proc.el
index af16e52..df1a075 100644
--- a/lisp/progmodes/flymake-proc.el
+++ b/lisp/progmodes/flymake-proc.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/progmodes/flymake-ui.el b/lisp/progmodes/flymake-ui.el
index 69f0c77..bf5218c 100644
--- a/lisp/progmodes/flymake-ui.el
+++ b/lisp/progmodes/flymake-ui.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 6ae2280..059bce9 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el
index b15da92..b73ee25 100644
--- a/lisp/progmodes/fortran.el
+++ b/lisp/progmodes/fortran.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index cc9205c..7723f70 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Credits:
 
diff --git a/lisp/progmodes/glasses.el b/lisp/progmodes/glasses.el
index f476ac0..699ef2e 100644
--- a/lisp/progmodes/glasses.el
+++ b/lisp/progmodes/glasses.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 466b524..01bdb04 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index e9ca7ea..3ef1d90 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el
index b34ea1c..3974483 100644
--- a/lisp/progmodes/hideif.el
+++ b/lisp/progmodes/hideif.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el
index 5328526..f3abf37 100644
--- a/lisp/progmodes/hideshow.el
+++ b/lisp/progmodes/hideshow.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/icon.el b/lisp/progmodes/icon.el
index 92a89fe..a164b70 100644
--- a/lisp/progmodes/icon.el
+++ b/lisp/progmodes/icon.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/idlw-complete-structtag.el 
b/lisp/progmodes/idlw-complete-structtag.el
index d2758cc..a7e49b6 100644
--- a/lisp/progmodes/idlw-complete-structtag.el
+++ b/lisp/progmodes/idlw-complete-structtag.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -148,9 +148,9 @@ an up-to-date completion list."
                   (not (equal start idlwave-current-tags-completion-pos)))
              (idlwave-prepare-structure-tag-completion var))
           (setq idlwave-current-tags-completion-pos start)
-         (setq idlwave-completion-help-info 
+         (setq idlwave-completion-help-info
                (list 'idlwave-complete-structure-tag-help))
-         (idlwave-complete-in-buffer 'structtag 'structtag 
+         (idlwave-complete-in-buffer 'structtag 'structtag
                                      idlwave-current-struct-tags nil
                                      "Select a structure tag" "structure tag")
          t) ; we did the completion: return t to skip other completions
@@ -169,7 +169,7 @@ an up-to-date completion list."
   (if (derived-mode-p 'idlwave-shell-mode)
       ;; OK, we are in the shell, do it dynamically
       (progn
-        (message "preparing shell tags") 
+        (message "preparing shell tags")
         ;; The following call puts the tags into `idlwave-current-struct-tags'
         (idlwave-complete-structure-tag-query-shell var)
         ;; initialize
@@ -191,7 +191,7 @@ an up-to-date completion list."
             ;; Find possible definitions of the structure.
             (while (idlwave-find-structure-definition var nil 'all)
               (let ((tags (idlwave-struct-tags)))
-                (when tags 
+                (when tags
                   ;; initialize
                   (setq idlwave-sint-structtags nil
                         idlwave-current-tags-buffer (current-buffer)
diff --git a/lisp/progmodes/idlw-help.el b/lisp/progmodes/idlw-help.el
index e82ed06..244e2b3 100644
--- a/lisp/progmodes/idlw-help.el
+++ b/lisp/progmodes/idlw-help.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el
index e7497e8..39d24d4 100644
--- a/lisp/progmodes/idlw-shell.el
+++ b/lisp/progmodes/idlw-shell.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/progmodes/idlw-toolbar.el b/lisp/progmodes/idlw-toolbar.el
index 2fda49d..c53e5e5 100644
--- a/lisp/progmodes/idlw-toolbar.el
+++ b/lisp/progmodes/idlw-toolbar.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index f070000..9231e11 100644
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/inf-lisp.el b/lisp/progmodes/inf-lisp.el
index 7de3a79..e398c3e 100644
--- a/lisp/progmodes/inf-lisp.el
+++ b/lisp/progmodes/inf-lisp.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index cd315fb..2bbacf7 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary
 
diff --git a/lisp/progmodes/ld-script.el b/lisp/progmodes/ld-script.el
index 7a666e9..980ef90 100644
--- a/lisp/progmodes/ld-script.el
+++ b/lisp/progmodes/ld-script.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/m4-mode.el b/lisp/progmodes/m4-mode.el
index b48654f..ebb66fa 100644
--- a/lisp/progmodes/m4-mode.el
+++ b/lisp/progmodes/m4-mode.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index 5cda7bb..4c926f4 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/mantemp.el b/lisp/progmodes/mantemp.el
index 7a3c0fb..93119b1 100644
--- a/lisp/progmodes/mantemp.el
+++ b/lisp/progmodes/mantemp.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/meta-mode.el b/lisp/progmodes/meta-mode.el
index 3377226..a47ae28 100644
--- a/lisp/progmodes/meta-mode.el
+++ b/lisp/progmodes/meta-mode.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/mixal-mode.el b/lisp/progmodes/mixal-mode.el
index f884de1..6d2d64a 100644
--- a/lisp/progmodes/mixal-mode.el
+++ b/lisp/progmodes/mixal-mode.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;; Major mode for the mix asm language.
@@ -30,7 +30,7 @@
 ;; For optimal use, also use GNU MDK.  Compiling needs mixasm, running
 ;; and debugging needs mixvm and mixvm.el from GNU MDK.  You can get
 ;; GNU MDK from `https://savannah.gnu.org/projects/mdk/' and
-;; `ftp://ftp.gnu.org/pub/gnu/mdk'.
+;; `https://ftp.gnu.org/pub/gnu/mdk'.
 ;;
 ;; To use this mode, place the following in your init file:
 ;; `(load-file "/PATH-TO-FILE/mixal-mode.el")'.
diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el
index ac9ba63..7e91201 100644
--- a/lisp/progmodes/octave.el
+++ b/lisp/progmodes/octave.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -37,7 +37,7 @@
 (defgroup octave nil
   "Editing Octave code."
   :link '(custom-manual "(octave-mode)Top")
-  :link '(url-link "http://www.gnu.org/s/octave";)
+  :link '(url-link "https://www.gnu.org/s/octave";)
   :link '(custom-group-link :tag "Font Lock Faces group" font-lock-faces)
   :group 'languages)
 
@@ -612,7 +612,7 @@ Key bindings:
 
 (defcustom inferior-octave-prompt
   ;; For Octave >= 3.8, default is always 'octave', see
-  ;; http://hg.savannah.gnu.org/hgweb/octave/rev/708173343c50
+  ;; https://hg.savannah.gnu.org/hgweb/octave/rev/708173343c50
   
"\\(?:^octave\\(?:.bin\\|.exe\\)?\\(?:-[.0-9]+\\)?\\(?::[0-9]+\\)?\\|^debug\\|^\\)>+
 "
   "Regexp to match prompts for the inferior Octave process."
   :type 'regexp)
@@ -839,7 +839,7 @@ startup file, `~/.emacs-octave'."
     (inferior-octave-send-list-and-digest
      (list "more off;\n"
            (unless (equal inferior-octave-output-string ">> ")
-             ;; See http://hg.savannah.gnu.org/hgweb/octave/rev/708173343c50
+             ;; See https://hg.savannah.gnu.org/hgweb/octave/rev/708173343c50
              "PS1 ('octave> ');\n")
            (when (and inferior-octave-startup-file
                       (file-exists-p inferior-octave-startup-file))
@@ -867,7 +867,7 @@ startup file, `~/.emacs-octave'."
 
 (defun inferior-octave-completion-at-point ()
   "Return the data to complete the Octave symbol at point."
-  ;; http://debbugs.gnu.org/14300
+  ;; https://debbugs.gnu.org/14300
   (unless (string-match-p "/" (or (comint--match-partial-filename) ""))
     (let ((beg (save-excursion
                  (skip-syntax-backward "w_" (comint-line-beginning-position))
diff --git a/lisp/progmodes/opascal.el b/lisp/progmodes/opascal.el
index 6a61564..12353c4 100644
--- a/lisp/progmodes/opascal.el
+++ b/lisp/progmodes/opascal.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/pascal.el b/lisp/progmodes/pascal.el
index a7d0624..5f893b8 100644
--- a/lisp/progmodes/pascal.el
+++ b/lisp/progmodes/pascal.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index 5e199fb..2f9a4c3 100644
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -23,7 +23,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/prog-mode.el b/lisp/progmodes/prog-mode.el
index 8f66f1c..f727e45 100644
--- a/lisp/progmodes/prog-mode.el
+++ b/lisp/progmodes/prog-mode.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -225,11 +225,11 @@ on the symbol."
       (apply #'font-lock-flush prettify-symbols--current-symbol-bounds)
       (setq prettify-symbols--current-symbol-bounds nil))
     ;; Unprettify the current symbol.
-    (when-let ((c (get-prop-as-list 'composition))
-              (s (get-prop-as-list 'prettify-symbols-start))
-              (e (get-prop-as-list 'prettify-symbols-end))
-              (s (apply #'min s))
-              (e (apply #'max e)))
+    (when-let* ((c (get-prop-as-list 'composition))
+               (s (get-prop-as-list 'prettify-symbols-start))
+               (e (get-prop-as-list 'prettify-symbols-end))
+               (s (apply #'min s))
+               (e (apply #'max e)))
       (with-silent-modifications
        (setq prettify-symbols--current-symbol-bounds (list s e))
        (remove-text-properties s e '(composition))))))
diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index ed1d564..9dc0da4 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el
index f2b487d..13cd6be 100644
--- a/lisp/progmodes/prolog.el
+++ b/lisp/progmodes/prolog.el
@@ -26,7 +26,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;; Original author: Masanobu UMEDA <umerin(at)mse(dot)kyutech(dot)ac(dot)jp>
 ;; Parts of this file was taken from a modified version of the original
diff --git a/lisp/progmodes/ps-mode.el b/lisp/progmodes/ps-mode.el
index 7e2b7fd..69ea3a7 100644
--- a/lisp/progmodes/ps-mode.el
+++ b/lisp/progmodes/ps-mode.el
@@ -28,7 +28,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 444167f..f3513ce 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -23,7 +23,7 @@
 ;; General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -80,7 +80,7 @@
 
 ;; Using the "console" subcommand to start IPython in server-client
 ;; mode is known to fail intermittently due a bug on IPython itself
-;; (see URL `http://debbugs.gnu.org/cgi/bugreport.cgi?bug=18052#27').
+;; (see URL `https://debbugs.gnu.org/cgi/bugreport.cgi?bug=18052#27').
 ;; There seems to be a race condition in the IPython server (A.K.A
 ;; kernel) when code is sent while it is still initializing, sometimes
 ;; causing the shell to get stalled.  With that said, if an IPython
@@ -97,7 +97,7 @@
 
 ;; Missing or delayed output used to happen due to differences between
 ;; Operating Systems' pipe buffering (e.g. CPython 3.3.4 in Windows 7.
-;; See URL `http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17304').  To
+;; See URL `https://debbugs.gnu.org/cgi/bugreport.cgi?bug=17304').  To
 ;; avoid this, the `python-shell-unbuffered' defaults to non-nil and
 ;; controls whether `python-shell-calculate-process-environment'
 ;; should set the "PYTHONUNBUFFERED" environment variable on startup:
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 6f431ec..0024957 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/scheme.el b/lisp/progmodes/scheme.el
index 0dcf9b4..bb75595 100644
--- a/lisp/progmodes/scheme.el
+++ b/lisp/progmodes/scheme.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index ea2e984..0bda8bc 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/simula.el b/lisp/progmodes/simula.el
index 505a2ea..6f98d68 100644
--- a/lisp/progmodes/simula.el
+++ b/lisp/progmodes/simula.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index 48e2160..b8ce326 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Michael Mauger <address@hidden>
 ;; Version: 3.6
 ;; Keywords: comm languages processes
-;; URL: http://savannah.gnu.org/projects/emacs/
+;; URL: https://savannah.gnu.org/projects/emacs/
 
 ;; This file is part of GNU Emacs.
 
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/subword.el b/lisp/progmodes/subword.el
index ede2f42..6428b56 100644
--- a/lisp/progmodes/subword.el
+++ b/lisp/progmodes/subword.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/tcl.el b/lisp/progmodes/tcl.el
index de0cd50..dbb71ef 100644
--- a/lisp/progmodes/tcl.el
+++ b/lisp/progmodes/tcl.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;; BEFORE USE:
 ;;
diff --git a/lisp/progmodes/vera-mode.el b/lisp/progmodes/vera-mode.el
index 0663600..05d1a5f 100644
--- a/lisp/progmodes/vera-mode.el
+++ b/lisp/progmodes/vera-mode.el
@@ -32,7 +32,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Commentary:
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el
index 6e79b1a..a6e3ae5 100644
--- a/lisp/progmodes/verilog-mode.el
+++ b/lisp/progmodes/verilog-mode.el
@@ -32,7 +32,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index 06ffd54..3f2d7e1 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -32,7 +32,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Commentary:
@@ -17897,7 +17897,7 @@ references:
 
 [3] European Space Agency.
     \"VHDL Modelling Guidelines\".
-    ftp://ftp.estec.esa.nl/pub/vhdl/doc/ModelGuide.{pdf,ps}
+    https://amstel.estec.esa.int/tecedm/website/docs_generic/ModelGuide.pdf
 
 Use user options `vhdl-highlight-special-words' and `vhdl-special-syntax-alist'
 to visually support naming conventions.")
diff --git a/lisp/progmodes/which-func.el b/lisp/progmodes/which-func.el
index 4151334..adfe7b3 100644
--- a/lisp/progmodes/which-func.el
+++ b/lisp/progmodes/which-func.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index 35a5c88..623c9c4 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/progmodes/xscheme.el b/lisp/progmodes/xscheme.el
index bdfe30a..4939649 100644
--- a/lisp/progmodes/xscheme.el
+++ b/lisp/progmodes/xscheme.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/ps-bdf.el b/lisp/ps-bdf.el
index f49cbd7..04e69a3 100644
--- a/lisp/ps-bdf.el
+++ b/lisp/ps-bdf.el
@@ -27,7 +27,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/ps-def.el b/lisp/ps-def.el
index ea51c2a..ea77b6b 100644
--- a/lisp/ps-def.el
+++ b/lisp/ps-def.el
@@ -23,7 +23,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/ps-mule.el b/lisp/ps-mule.el
index 0a59010..393de9f 100644
--- a/lisp/ps-mule.el
+++ b/lisp/ps-mule.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index 7476ab3..b503638 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -35,7 +35,7 @@ Please send all bug fixes and enhancements to
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/ps-samp.el b/lisp/ps-samp.el
index f86e526..15f5c7c 100644
--- a/lisp/ps-samp.el
+++ b/lisp/ps-samp.el
@@ -25,7 +25,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/recentf.el b/lisp/recentf.el
index 462ccb6..d78d7ce 100644
--- a/lisp/recentf.el
+++ b/lisp/recentf.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/rect.el b/lisp/rect.el
index a85101f..12e62b6 100644
--- a/lisp/rect.el
+++ b/lisp/rect.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/register.el b/lisp/register.el
index e395963..9133807 100644
--- a/lisp/register.el
+++ b/lisp/register.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/registry.el b/lisp/registry.el
index 27664dc..17dc23d 100644
--- a/lisp/registry.el
+++ b/lisp/registry.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/repeat.el b/lisp/repeat.el
index c55a50a..f75d9d0 100644
--- a/lisp/repeat.el
+++ b/lisp/repeat.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/replace.el b/lisp/replace.el
index 09972b4..a5548f4 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/reposition.el b/lisp/reposition.el
index ce24d29..833b65a 100644
--- a/lisp/reposition.el
+++ b/lisp/reposition.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/reveal.el b/lisp/reveal.el
index 66f5bc4..1b6cd33 100644
--- a/lisp/reveal.el
+++ b/lisp/reveal.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/rfn-eshadow.el b/lisp/rfn-eshadow.el
index f5df7f8..6620412 100644
--- a/lisp/rfn-eshadow.el
+++ b/lisp/rfn-eshadow.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/rot13.el b/lisp/rot13.el
index 20a0dbe..886085b 100644
--- a/lisp/rot13.el
+++ b/lisp/rot13.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/rtree.el b/lisp/rtree.el
index b4c9d48..9db03c4 100644
--- a/lisp/rtree.el
+++ b/lisp/rtree.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/ruler-mode.el b/lisp/ruler-mode.el
index 1627797..bfe2059 100644
--- a/lisp/ruler-mode.el
+++ b/lisp/ruler-mode.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/savehist.el b/lisp/savehist.el
index 9a3c5cf..c1f17f7 100644
--- a/lisp/savehist.el
+++ b/lisp/savehist.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/saveplace.el b/lisp/saveplace.el
index 603ab65..54599c7 100644
--- a/lisp/saveplace.el
+++ b/lisp/saveplace.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/sb-image.el b/lisp/sb-image.el
index b94978a..6faa66d 100644
--- a/lisp/sb-image.el
+++ b/lisp/sb-image.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/scroll-all.el b/lisp/scroll-all.el
index 59efe8c..90365fa 100644
--- a/lisp/scroll-all.el
+++ b/lisp/scroll-all.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;    This mode allows multiple buffers to be 'locked' so that scrolling
diff --git a/lisp/scroll-bar.el b/lisp/scroll-bar.el
index 5835274..8f02f2f 100644
--- a/lisp/scroll-bar.el
+++ b/lisp/scroll-bar.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/scroll-lock.el b/lisp/scroll-lock.el
index 50868e7..837189c 100644
--- a/lisp/scroll-lock.el
+++ b/lisp/scroll-lock.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/select.el b/lisp/select.el
index 579c5c7..d950d70 100644
--- a/lisp/select.el
+++ b/lisp/select.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/server.el b/lisp/server.el
index 209bfaa..8aafa1c 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -23,7 +23,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/ses.el b/lisp/ses.el
index 8c5ff21..9221476 100644
--- a/lisp/ses.el
+++ b/lisp/ses.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/shadowfile.el b/lisp/shadowfile.el
index 21d0f0a..53718ab 100644
--- a/lisp/shadowfile.el
+++ b/lisp/shadowfile.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/shell.el b/lisp/shell.el
index ea7f0be..9c83762 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/simple.el b/lisp/simple.el
index ff0aa06..1ffe181 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/skeleton.el b/lisp/skeleton.el
index dbfa87e..d182bdf 100644
--- a/lisp/skeleton.el
+++ b/lisp/skeleton.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/sort.el b/lisp/sort.el
index 88a784f..17f2cb0 100644
--- a/lisp/sort.el
+++ b/lisp/sort.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/soundex.el b/lisp/soundex.el
index a83bab8..0903b80 100644
--- a/lisp/soundex.el
+++ b/lisp/soundex.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index 3113471..c66cc89 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -25,7 +25,7 @@ this version is not backward compatible to 0.14 or earlier.")
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/startup.el b/lisp/startup.el
index 0fbba1b..7cf6fee 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -1463,18 +1463,18 @@ If this is nil, no message will be displayed."
   `((:face (variable-pitch font-lock-comment-face)
      "Welcome to "
      :link ("GNU Emacs"
-           ,(lambda (_button) (browse-url 
"http://www.gnu.org/software/emacs/";))
-           "Browse http://www.gnu.org/software/emacs/";)
+           ,(lambda (_button) (browse-url 
"https://www.gnu.org/software/emacs/";))
+           "Browse https://www.gnu.org/software/emacs/";)
      ", one component of the "
      :link
      ,(lambda ()
        (if (eq system-type 'gnu/linux)
             `("GNU/Linux"
-              ,(lambda (_button) (browse-url 
"http://www.gnu.org/gnu/linux-and-gnu.html";))
-            "Browse http://www.gnu.org/gnu/linux-and-gnu.html";)
+              ,(lambda (_button) (browse-url 
"https://www.gnu.org/gnu/linux-and-gnu.html";))
+            "Browse https://www.gnu.org/gnu/linux-and-gnu.html";)
           `("GNU" ,(lambda (_button)
-                    (browse-url "http://www.gnu.org/gnu/thegnuproject.html";))
-           "Browse http://www.gnu.org/gnu/thegnuproject.html";)))
+                    (browse-url "https://www.gnu.org/gnu/thegnuproject.html";))
+           "Browse https://www.gnu.org/gnu/thegnuproject.html";)))
      " operating system.\n\n"
      :face variable-pitch
      :link ("Emacs Tutorial" ,(lambda (_button) (help-with-tutorial)))
@@ -1506,8 +1506,8 @@ If this is nil, no message will be displayed."
      "\n"
      :link ("Emacs Guided Tour"
            ,(lambda (_button)
-               (browse-url "http://www.gnu.org/software/emacs/tour/";))
-           "Browse http://www.gnu.org/software/emacs/tour/";)
+               (browse-url "https://www.gnu.org/software/emacs/tour/";))
+           "Browse https://www.gnu.org/software/emacs/tour/";)
      "\tOverview of Emacs features at gnu.org\n"
      :link ("View Emacs Manual" ,(lambda (_button) (info-emacs-manual)))
      "\tView the Emacs manual using Info\n"
@@ -1529,16 +1529,16 @@ Each element in the list should be a list of strings or 
pairs
   `((:face (variable-pitch font-lock-comment-face)
      "This is "
      :link ("GNU Emacs"
-           ,(lambda (_button) (browse-url 
"http://www.gnu.org/software/emacs/";))
-           "Browse http://www.gnu.org/software/emacs/";)
+           ,(lambda (_button) (browse-url 
"https://www.gnu.org/software/emacs/";))
+           "Browse https://www.gnu.org/software/emacs/";)
      ", one component of the "
      :link
      ,(lambda ()
        (if (eq system-type 'gnu/linux)
           `("GNU/Linux"
             ,(lambda (_button)
-                (browse-url "http://www.gnu.org/gnu/linux-and-gnu.html";))
-            "Browse http://www.gnu.org/gnu/linux-and-gnu.html";)
+                (browse-url "https://www.gnu.org/gnu/linux-and-gnu.html";))
+            "Browse https://www.gnu.org/gnu/linux-and-gnu.html";)
         `("GNU" ,(lambda (_button) (describe-gnu-project))
           "Display info on the GNU project.")))
      " operating system.\n"
@@ -1597,8 +1597,8 @@ Each element in the list should be a list of strings or 
pairs
      "\n"
      :link ("Emacs Guided Tour"
            ,(lambda (_button)
-               (browse-url "http://www.gnu.org/software/emacs/tour/";))
-           "Browse http://www.gnu.org/software/emacs/tour/";)
+               (browse-url "https://www.gnu.org/software/emacs/tour/";))
+           "Browse https://www.gnu.org/software/emacs/tour/";)
      "\tSee an overview of Emacs features at gnu.org"))
   "A list of texts to show in the middle part of the About screen.
 Each element in the list should be a list of strings or pairs
@@ -1706,8 +1706,8 @@ a face or button specification."
        ;; Insert the image with a help-echo and a link.
        (make-button (prog1 (point) (insert-image img)) (point)
                     'face 'default
-                    'help-echo "mouse-2, RET: Browse http://www.gnu.org/";
-                    'action (lambda (_button) (browse-url 
"http://www.gnu.org/";))
+                    'help-echo "mouse-2, RET: Browse https://www.gnu.org/";
+                    'action (lambda (_button) (browse-url 
"https://www.gnu.org/";))
                     'follow-link t)
        (insert "\n\n")))))
 
diff --git a/lisp/strokes.el b/lisp/strokes.el
index a70c3f5..33a2ea6 100644
--- a/lisp/strokes.el
+++ b/lisp/strokes.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/subr.el b/lisp/subr.el
index ebb8b53..79ae1f4 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;; Beware: while this file has tag `utf-8', before it's compiled, it gets
 ;; loaded as "raw-text", so non-ASCII chars won't work right during bootstrap.
@@ -286,13 +286,10 @@ without silencing all errors."
 (defun gensym (&optional prefix)
   "Return a new uninterned symbol.
 The name is made by appending `gensym-counter' to PREFIX.
-PREFIX can be a string, and defaults to \"G\".
-If PREFIX is a number, it replaces the value of `gensym-counter'."
-  (let ((pfix (if (stringp prefix) prefix "G"))
-        (num (if (integerp prefix) prefix
-               (prog1 gensym-counter
-                 (setq gensym-counter (1+ gensym-counter))))))
-    (make-symbol (format "%s%d" pfix num))))
+PREFIX is a string, and defaults to \"g\"."
+  (let ((num (prog1 gensym-counter
+               (setq gensym-counter (1+ gensym-counter)))))
+    (make-symbol (format "%s%d" prefix num))))
 
 (defun ignore (&rest _ignore)
   "Do nothing and return nil.
diff --git a/lisp/svg.el b/lisp/svg.el
index fc1a6d6..6a0c49b 100644
--- a/lisp/svg.el
+++ b/lisp/svg.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -264,10 +264,10 @@ If the SVG is later changed, the image will also be 
updated."
 
 (defun svg-remove (svg id)
   "Remove the element identified by ID from SVG."
-  (when-let ((node (car (dom-by-id
-                         svg
-                         (concat "\\`" (regexp-quote id)
-                                 "\\'")))))
+  (when-let* ((node (car (dom-by-id
+                          svg
+                          (concat "\\`" (regexp-quote id)
+                                  "\\'")))))
     (dom-remove-node svg node)))
 
 (provide 'svg)
diff --git a/lisp/t-mouse.el b/lisp/t-mouse.el
index 2ed2fcb..75e8804 100644
--- a/lisp/t-mouse.el
+++ b/lisp/t-mouse.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/tabify.el b/lisp/tabify.el
index 75ff61d..93a0fc2 100644
--- a/lisp/tabify.el
+++ b/lisp/tabify.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/talk.el b/lisp/talk.el
index f35f934..a471a50 100644
--- a/lisp/talk.el
+++ b/lisp/talk.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el
index b0d3177..21fccc4 100644
--- a/lisp/tar-mode.el
+++ b/lisp/tar-mode.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/tempo.el b/lisp/tempo.el
index e4c5003..3470d48 100644
--- a/lisp/tempo.el
+++ b/lisp/tempo.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/term.el b/lisp/term.el
index 12a37ca..c748c45 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;; Marck 13 2001
 ;; Fixes for CJK support by Yong Lu <address@hidden>.
diff --git a/lisp/term/AT386.el b/lisp/term/AT386.el
index ac02774..62a6c58 100644
--- a/lisp/term/AT386.el
+++ b/lisp/term/AT386.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/term/README b/lisp/term/README
index 9cb844b..25b9e5d 100644
--- a/lisp/term/README
+++ b/lisp/term/README
@@ -262,4 +262,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/lisp/term/common-win.el b/lisp/term/common-win.el
index cce8458..2cf1e84 100644
--- a/lisp/term/common-win.el
+++ b/lisp/term/common-win.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/term/internal.el b/lisp/term/internal.el
index 00a908a..f16189e 100644
--- a/lisp/term/internal.el
+++ b/lisp/term/internal.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/term/iris-ansi.el b/lisp/term/iris-ansi.el
index d3ddb19..24a5642 100644
--- a/lisp/term/iris-ansi.el
+++ b/lisp/term/iris-ansi.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/term/news.el b/lisp/term/news.el
index 241db33..1c23f1c 100644
--- a/lisp/term/news.el
+++ b/lisp/term/news.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index cfce83f..68b659b 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el
index b6f2acc..0355350 100644
--- a/lisp/term/pc-win.el
+++ b/lisp/term/pc-win.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/term/rxvt.el b/lisp/term/rxvt.el
index d80bb78..d88b12b 100644
--- a/lisp/term/rxvt.el
+++ b/lisp/term/rxvt.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/term/sun.el b/lisp/term/sun.el
index 88e63d2..64c67ae 100644
--- a/lisp/term/sun.el
+++ b/lisp/term/sun.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/term/tty-colors.el b/lisp/term/tty-colors.el
index 9cfe30a..3b86aa7 100644
--- a/lisp/term/tty-colors.el
+++ b/lisp/term/tty-colors.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/term/tvi970.el b/lisp/term/tvi970.el
index 862cd79..abcd149 100644
--- a/lisp/term/tvi970.el
+++ b/lisp/term/tvi970.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -73,7 +73,7 @@
                ("\e5"  [S-send])              ;; Not an X keysym
                ))
       (define-key map (car key-binding) (nth 1 key-binding)))
-             
+
 
     ;; The numeric keypad keys.
     (dotimes (i 10)
diff --git a/lisp/term/vt100.el b/lisp/term/vt100.el
index bc17138..44bee80 100644
--- a/lisp/term/vt100.el
+++ b/lisp/term/vt100.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index be895a0..4e0e54a 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -275,7 +275,8 @@ See the documentation of `create-fontset-from-fontset-spec' 
for the format.")
           '(gnutls "libgnutls-30.dll")
         '(gnutls "libgnutls-28.dll" "libgnutls-26.dll"))
        '(libxml2 "libxml2-2.dll" "libxml2.dll")
-       '(zlib "zlib1.dll" "libz-1.dll")))
+       '(zlib "zlib1.dll" "libz-1.dll")
+       '(lcms2 "liblcms2-2.dll")))
 
 ;;; multi-tty support
 (defvar w32-initialized nil
diff --git a/lisp/term/w32console.el b/lisp/term/w32console.el
index f8b8b3c..b6e0466 100644
--- a/lisp/term/w32console.el
+++ b/lisp/term/w32console.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/term/wyse50.el b/lisp/term/wyse50.el
index a6b2e7c..f6abc79 100644
--- a/lisp/term/wyse50.el
+++ b/lisp/term/wyse50.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index dd42dda..b769444 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index e6d224d..4f79703 100644
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -610,7 +610,7 @@ Return the pasted text as a string."
 ;; Set up colors, for those versions of xterm that support it.
 (defvar xterm-standard-colors
   ;; The names in the comments taken from XTerm-col.ad in the xterm
-  ;; distribution, see ftp://dickey.his.com/xterm/.  RGB values are
+  ;; distribution, see https://invisible-island.net/xterm/.  RGB values are
   ;; from rgb.txt.
   '(("black"          0 (  0   0   0)) ; black
     ("red"            1 (205   0   0)) ; red3
diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el
index cdc2af4..10e7881 100644
--- a/lisp/textmodes/artist.el
+++ b/lisp/textmodes/artist.el
@@ -27,7 +27,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/bib-mode.el b/lisp/textmodes/bib-mode.el
index 2f3c17b..d6bb636 100644
--- a/lisp/textmodes/bib-mode.el
+++ b/lisp/textmodes/bib-mode.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/bibtex-style.el b/lisp/textmodes/bibtex-style.el
index 393bbd1..bd36b97 100644
--- a/lisp/textmodes/bibtex-style.el
+++ b/lisp/textmodes/bibtex-style.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el
index 2128e50..b6b12e6 100644
--- a/lisp/textmodes/bibtex.el
+++ b/lisp/textmodes/bibtex.el
@@ -25,7 +25,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/conf-mode.el b/lisp/textmodes/conf-mode.el
index d03ee5e..33dc372 100644
--- a/lisp/textmodes/conf-mode.el
+++ b/lisp/textmodes/conf-mode.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index 1e49ca8..dde9e6a 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -1045,7 +1045,7 @@ This function simply drops any transparency."
   "Check whether STR, seen at point, is CSS named color.
 Returns STR if it is a valid color.  Special care is taken
 to exclude some SCSS constructs."
-  (when-let ((color (assoc str css--color-map)))
+  (when-let* ((color (assoc str css--color-map)))
     (save-excursion
       (goto-char start-point)
       (forward-comment (- (point)))
@@ -1154,7 +1154,7 @@ for determining whether point is within a selector."
 
 (defun css--colon-inside-funcall ()
   "Return t if point is inside a function call."
-  (when-let (opening-paren-pos (nth 1 (syntax-ppss)))
+  (when-let* ((opening-paren-pos (nth 1 (syntax-ppss))))
     (save-excursion
       (goto-char opening-paren-pos)
       (eq (char-after) ?\())))
diff --git a/lisp/textmodes/dns-mode.el b/lisp/textmodes/dns-mode.el
index 72eb66b..df03bea 100644
--- a/lisp/textmodes/dns-mode.el
+++ b/lisp/textmodes/dns-mode.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/enriched.el b/lisp/textmodes/enriched.el
index 5319db7..d90c207 100644
--- a/lisp/textmodes/enriched.el
+++ b/lisp/textmodes/enriched.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index ee523ed..9602326 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index ecf729d..dc6da4a 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
@@ -231,7 +231,7 @@ Ispell's ultimate default dictionary."
   "Non-nil means check even inside TeX math environment.
 TeX math environments are discovered by `texmathp', implemented
 inside AUCTeX package.  That package may be found at
-URL `http://www.gnu.org/software/auctex/'"
+URL `https://www.gnu.org/software/auctex/'"
   :group 'flyspell
   :type 'boolean)
 
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 87a3b7a..0c0a51e 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/less-css-mode.el b/lisp/textmodes/less-css-mode.el
index b38f259..b665f91 100644
--- a/lisp/textmodes/less-css-mode.el
+++ b/lisp/textmodes/less-css-mode.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/makeinfo.el b/lisp/textmodes/makeinfo.el
index 9edc759..34fdb96 100644
--- a/lisp/textmodes/makeinfo.el
+++ b/lisp/textmodes/makeinfo.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/mhtml-mode.el b/lisp/textmodes/mhtml-mode.el
index 2f2257d..b6cd157 100644
--- a/lisp/textmodes/mhtml-mode.el
+++ b/lisp/textmodes/mhtml-mode.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/lisp/textmodes/nroff-mode.el b/lisp/textmodes/nroff-mode.el
index cea0c60..ce4c155 100644
--- a/lisp/textmodes/nroff-mode.el
+++ b/lisp/textmodes/nroff-mode.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/page-ext.el b/lisp/textmodes/page-ext.el
index 8542b95..d744bd2 100644
--- a/lisp/textmodes/page-ext.el
+++ b/lisp/textmodes/page-ext.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/page.el b/lisp/textmodes/page.el
index 936896c..fa2a7d1 100644
--- a/lisp/textmodes/page.el
+++ b/lisp/textmodes/page.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/paragraphs.el b/lisp/textmodes/paragraphs.el
index f0671f4..645d3ff 100644
--- a/lisp/textmodes/paragraphs.el
+++ b/lisp/textmodes/paragraphs.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/picture.el b/lisp/textmodes/picture.el
index 09d0a2f..0fb120e 100644
--- a/lisp/textmodes/picture.el
+++ b/lisp/textmodes/picture.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/po.el b/lisp/textmodes/po.el
index 822596c..648eef5 100644
--- a/lisp/textmodes/po.el
+++ b/lisp/textmodes/po.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/refbib.el b/lisp/textmodes/refbib.el
index 6b72126..62c299b 100644
--- a/lisp/textmodes/refbib.el
+++ b/lisp/textmodes/refbib.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/refer.el b/lisp/textmodes/refer.el
index 74dec30..ee18221 100644
--- a/lisp/textmodes/refer.el
+++ b/lisp/textmodes/refer.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/refill.el b/lisp/textmodes/refill.el
index f65c9ad..e005b58 100644
--- a/lisp/textmodes/refill.el
+++ b/lisp/textmodes/refill.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/reftex-auc.el b/lisp/textmodes/reftex-auc.el
index 1e0a564..ac57ce7 100644
--- a/lisp/textmodes/reftex-auc.el
+++ b/lisp/textmodes/reftex-auc.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/reftex-cite.el b/lisp/textmodes/reftex-cite.el
index 7f1887c..9ff2d0a 100644
--- a/lisp/textmodes/reftex-cite.el
+++ b/lisp/textmodes/reftex-cite.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/reftex-dcr.el b/lisp/textmodes/reftex-dcr.el
index 16bc621..894f08b 100644
--- a/lisp/textmodes/reftex-dcr.el
+++ b/lisp/textmodes/reftex-dcr.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/reftex-global.el b/lisp/textmodes/reftex-global.el
index 91d2b48..d07a528 100644
--- a/lisp/textmodes/reftex-global.el
+++ b/lisp/textmodes/reftex-global.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/reftex-index.el b/lisp/textmodes/reftex-index.el
index 6544029..120370a 100644
--- a/lisp/textmodes/reftex-index.el
+++ b/lisp/textmodes/reftex-index.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/reftex-parse.el b/lisp/textmodes/reftex-parse.el
index af2810d..67a3dd2 100644
--- a/lisp/textmodes/reftex-parse.el
+++ b/lisp/textmodes/reftex-parse.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/reftex-ref.el b/lisp/textmodes/reftex-ref.el
index dd18354..c2c5ca3 100644
--- a/lisp/textmodes/reftex-ref.el
+++ b/lisp/textmodes/reftex-ref.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/reftex-sel.el b/lisp/textmodes/reftex-sel.el
index a4533ad..65720f4 100644
--- a/lisp/textmodes/reftex-sel.el
+++ b/lisp/textmodes/reftex-sel.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/reftex-toc.el b/lisp/textmodes/reftex-toc.el
index 4f7c738..c7a598c 100644
--- a/lisp/textmodes/reftex-toc.el
+++ b/lisp/textmodes/reftex-toc.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/reftex-vars.el b/lisp/textmodes/reftex-vars.el
index 03da584..528232b 100644
--- a/lisp/textmodes/reftex-vars.el
+++ b/lisp/textmodes/reftex-vars.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -264,7 +264,7 @@ distribution.  Mixed-case symbols are convenience aliases.")
   "LaTeX label and citation support."
   :tag "RefTeX"
   :link '(url-link :tag "Home Page"
-                   "http://www.gnu.org/software/auctex/reftex.html";)
+                   "https://www.gnu.org/software/auctex/reftex.html";)
   :link '(emacs-commentary-link :tag "Commentary in reftex.el" "reftex.el")
   :link '(custom-manual "(reftex)Top")
   :prefix "reftex-"
diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el
index d46bd0d..d9393ff 100644
--- a/lisp/textmodes/reftex.el
+++ b/lisp/textmodes/reftex.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -36,13 +36,13 @@
 ;;
 ;; The documentation in various formats is also available at
 ;;
-;;     http://www.gnu.org/software/auctex/manual/reftex.index.html
+;;     https://www.gnu.org/software/auctex/manual/reftex.index.html
 ;;
 ;; RefTeX is bundled with Emacs and available as a plug-in package for
 ;; XEmacs 21.x.  If you need to install it yourself, you can find a
 ;; distribution at
 ;;
-;;    http://www.gnu.org/software/auctex/reftex.html
+;;    https://www.gnu.org/software/auctex/reftex.html
 ;;
 ;; RefTeX was written by Carsten Dominik <address@hidden> with
 ;; contributions from Stephen Eglen.  It is currently maintained by
@@ -2369,7 +2369,7 @@ information about your RefTeX version and configuration."
 what in fact did happen.
 
 Check if the bug is reproducible with an up-to-date version of
-RefTeX available from http://www.gnu.org/software/auctex/.
+RefTeX available from https://www.gnu.org/software/auctex/.
 
 If the bug is triggered by a specific \(La)TeX file, you should try
 to produce a minimal sample file showing the problem and include it
diff --git a/lisp/textmodes/remember.el b/lisp/textmodes/remember.el
index 388e49c..b20ee8f 100644
--- a/lisp/textmodes/remember.el
+++ b/lisp/textmodes/remember.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el
index 490ea23..5534294 100644
--- a/lisp/textmodes/rst.el
+++ b/lisp/textmodes/rst.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index 1f99786..7ae3036 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -2242,8 +2242,8 @@ The result is cached in `html--buffer-classes-cache'."
              (classes
               (seq-mapcat
                (lambda (el)
-                 (when-let (class-list
-                            (cdr (assq 'class (dom-attributes el))))
+                 (when-let* ((class-list
+                              (cdr (assq 'class (dom-attributes el)))))
                    (split-string class-list)))
                (dom-by-class dom ""))))
         (setq-local html--buffer-classes-cache (cons tick classes))
@@ -2260,8 +2260,8 @@ The result is cached in `html--buffer-ids-cache'."
              (ids
               (seq-mapcat
                (lambda (el)
-                 (when-let (id-list
-                            (cdr (assq 'id (dom-attributes el))))
+                 (when-let* ((id-list
+                              (cdr (assq 'id (dom-attributes el)))))
                    (split-string id-list)))
                (dom-by-id dom ""))))
         (setq-local html--buffer-ids-cache (cons tick ids))
diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el
index 5e967b5..d408d20 100644
--- a/lisp/textmodes/table.el
+++ b/lisp/textmodes/table.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index ba6d696..5c4d540 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el
index 1d2a9e5..647ae1b 100644
--- a/lisp/textmodes/texinfmt.el
+++ b/lisp/textmodes/texinfmt.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/texinfo.el b/lisp/textmodes/texinfo.el
index f962dec..be8bcc5 100644
--- a/lisp/textmodes/texinfo.el
+++ b/lisp/textmodes/texinfo.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Todo:
 
diff --git a/lisp/textmodes/texnfo-upd.el b/lisp/textmodes/texnfo-upd.el
index aa5346d..46977e1 100644
--- a/lisp/textmodes/texnfo-upd.el
+++ b/lisp/textmodes/texnfo-upd.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/text-mode.el b/lisp/textmodes/text-mode.el
index 7d63556..1661ebe 100644
--- a/lisp/textmodes/text-mode.el
+++ b/lisp/textmodes/text-mode.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/tildify.el b/lisp/textmodes/tildify.el
index e4920b7..0d7b15d 100644
--- a/lisp/textmodes/tildify.el
+++ b/lisp/textmodes/tildify.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/two-column.el b/lisp/textmodes/two-column.el
index c6203fd..293a106 100644
--- a/lisp/textmodes/two-column.el
+++ b/lisp/textmodes/two-column.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/textmodes/underline.el b/lisp/textmodes/underline.el
index f018260..9f7a6eb 100644
--- a/lisp/textmodes/underline.el
+++ b/lisp/textmodes/underline.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el
index 7c3d73e..13f761e 100644
--- a/lisp/thingatpt.el
+++ b/lisp/thingatpt.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/thumbs.el b/lisp/thumbs.el
index d0b5e22..e8ef052 100644
--- a/lisp/thumbs.el
+++ b/lisp/thumbs.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/time-stamp.el b/lisp/time-stamp.el
index fa7621b..959f0ca 100644
--- a/lisp/time-stamp.el
+++ b/lisp/time-stamp.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/time.el b/lisp/time.el
index 6a46ea6..5c0eac0 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/timezone.el b/lisp/timezone.el
index 023cc68..762147b 100644
--- a/lisp/timezone.el
+++ b/lisp/timezone.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/tmm.el b/lisp/tmm.el
index 8755971..ca6a37d 100644
--- a/lisp/tmm.el
+++ b/lisp/tmm.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/tool-bar.el b/lisp/tool-bar.el
index 2386fe6..ee01a69 100644
--- a/lisp/tool-bar.el
+++ b/lisp/tool-bar.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/tooltip.el b/lisp/tooltip.el
index c011f1b..18ddd25 100644
--- a/lisp/tooltip.el
+++ b/lisp/tooltip.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/tree-widget.el b/lisp/tree-widget.el
index 6baf4c4..130d8af 100644
--- a/lisp/tree-widget.el
+++ b/lisp/tree-widget.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/tutorial.el b/lisp/tutorial.el
index 785dbdf..7823f76 100644
--- a/lisp/tutorial.el
+++ b/lisp/tutorial.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/type-break.el b/lisp/type-break.el
index 8cb81d4..faf44b3 100644
--- a/lisp/type-break.el
+++ b/lisp/type-break.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/uniquify.el b/lisp/uniquify.el
index c6a50ed..aa1fcd9 100644
--- a/lisp/uniquify.el
+++ b/lisp/uniquify.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/url/url-about.el b/lisp/url/url-about.el
index c98e076..f0860e5 100644
--- a/lisp/url/url-about.el
+++ b/lisp/url/url-about.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/url/url-auth.el b/lisp/url/url-auth.el
index 2885d4e..65c718e 100644
--- a/lisp/url/url-auth.el
+++ b/lisp/url/url-auth.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/lisp/url/url-cache.el b/lisp/url/url-cache.el
index a7247df..1cffc06 100644
--- a/lisp/url/url-cache.el
+++ b/lisp/url/url-cache.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/lisp/url/url-cid.el b/lisp/url/url-cid.el
index 218ec0d..ce160c6 100644
--- a/lisp/url/url-cid.el
+++ b/lisp/url/url-cid.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/lisp/url/url-cookie.el b/lisp/url/url-cookie.el
index 0edc93c..453d4fe 100644
--- a/lisp/url/url-cookie.el
+++ b/lisp/url/url-cookie.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/url/url-dav.el b/lisp/url/url-dav.el
index 59b836c..ba20d67 100644
--- a/lisp/url/url-dav.el
+++ b/lisp/url/url-dav.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;; DAV is in RFC 2518.
 
diff --git a/lisp/url/url-dired.el b/lisp/url/url-dired.el
index f7ed13c..53df2bf 100644
--- a/lisp/url/url-dired.el
+++ b/lisp/url/url-dired.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/lisp/url/url-domsuf.el b/lisp/url/url-domsuf.el
index b24f245..e0ebba4 100644
--- a/lisp/url/url-domsuf.el
+++ b/lisp/url/url-domsuf.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/url/url-expand.el b/lisp/url/url-expand.el
index 9ceaa02..04f06c3 100644
--- a/lisp/url/url-expand.el
+++ b/lisp/url/url-expand.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
@@ -60,7 +60,7 @@
   "Convert URL to a fully specified URL, and canonicalize it.
 Second arg DEFAULT is a URL to start with if URL is relative.
 If DEFAULT is nil or missing, the current buffer's URL is used.
-Path components that are `.' are removed, and 
+Path components that are `.' are removed, and
 path components followed by `..' are removed, along with the `..' itself."
   (if (and url (not (string-match "^#" url)))
       ;; Need to nuke newlines and spaces in the URL, or we open
diff --git a/lisp/url/url-file.el b/lisp/url/url-file.el
index 1dda1d3..0252896 100644
--- a/lisp/url/url-file.el
+++ b/lisp/url/url-file.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/url/url-ftp.el b/lisp/url/url-ftp.el
index da2fbde..baae0a7 100644
--- a/lisp/url/url-ftp.el
+++ b/lisp/url/url-ftp.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/url/url-future.el b/lisp/url/url-future.el
index 5394eb0..abf3004 100644
--- a/lisp/url/url-future.el
+++ b/lisp/url/url-future.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/url/url-gw.el b/lisp/url/url-gw.el
index 28acde6..c1c0825 100644
--- a/lisp/url/url-gw.el
+++ b/lisp/url/url-gw.el
@@ -19,11 +19,12 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
 (require 'url-vars)
+(require 'url-parse)
 
 ;; Fixme: support SSH explicitly or via a url-gateway-rlogin-program?
 
@@ -245,8 +246,9 @@ overriding the value of `url-gateway-method'."
                           name buffer host service
                           :type gw-method
                           ;; Use non-blocking socket if we can.
-                          :nowait (featurep 'make-network-process
-                                             '(:nowait t))))
+                          :nowait (and (featurep 'make-network-process)
+                                        (url-asynchronous url-current-object)
+                                        '(:nowait t))))
                          (`socks
                          (socks-open-network-stream name buffer host service))
                         (`telnet
diff --git a/lisp/url/url-handlers.el b/lisp/url/url-handlers.el
index ba30623..55a478a 100644
--- a/lisp/url/url-handlers.el
+++ b/lisp/url/url-handlers.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -341,7 +341,7 @@ if it had been inserted from a file named URL."
     (unless buffer (signal 'file-error (list url "No Data")))
     (with-current-buffer buffer
       ;; XXX: This is HTTP/S specific and should be moved to url-http
-      ;; instead.  See http://debbugs.gnu.org/17549.
+      ;; instead.  See https://debbugs.gnu.org/17549.
       (when (bound-and-true-p url-http-response-status)
         ;; Don't signal an error if VISIT is non-nil, because
         ;; 'insert-file-contents' doesn't.  This is required to
@@ -354,7 +354,7 @@ if it had been inserted from a file named URL."
                          (< url-http-response-status 300)))
           (let ((desc (nth 2 (assq url-http-response-status url-http-codes))))
             (kill-buffer buffer)
-            ;; Signal file-error per http://debbugs.gnu.org/16733.
+            ;; Signal file-error per https://debbugs.gnu.org/16733.
             (signal 'file-error (list url desc))))))
     (url-insert-buffer-contents buffer url visit beg end replace)))
 
diff --git a/lisp/url/url-history.el b/lisp/url/url-history.el
index 8657d19..fc1b499 100644
--- a/lisp/url/url-history.el
+++ b/lisp/url/url-history.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 06d3286..9e8c58b 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/url/url-imap.el b/lisp/url/url-imap.el
index b8fe4ed..6384ba6 100644
--- a/lisp/url/url-imap.el
+++ b/lisp/url/url-imap.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/url/url-irc.el b/lisp/url/url-irc.el
index 1d0a46e..5a268aa 100644
--- a/lisp/url/url-irc.el
+++ b/lisp/url/url-irc.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/url/url-ldap.el b/lisp/url/url-ldap.el
index d9a18e5..c23a55f 100644
--- a/lisp/url/url-ldap.el
+++ b/lisp/url/url-ldap.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/url/url-mailto.el b/lisp/url/url-mailto.el
index 8c49546..c83a1d6 100644
--- a/lisp/url/url-mailto.el
+++ b/lisp/url/url-mailto.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -102,7 +102,7 @@
            (goto-char (point-min))
            (or (search-forward (concat "\n" mail-header-separator "\n") nil t)
                (goto-char (point-max)))
-           (insert (mapconcat 
+           (insert (mapconcat
                     #'(lambda (string)
                         (replace-regexp-in-string "\r\n" "\n" string))
                     (cdar args) "\n")))
diff --git a/lisp/url/url-methods.el b/lisp/url/url-methods.el
index 9f41f35..00b2572 100644
--- a/lisp/url/url-methods.el
+++ b/lisp/url/url-methods.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/url/url-misc.el b/lisp/url/url-misc.el
index 3515feb..a5422bb 100644
--- a/lisp/url/url-misc.el
+++ b/lisp/url/url-misc.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/lisp/url/url-news.el b/lisp/url/url-news.el
index 5130b0c..c6e0562 100644
--- a/lisp/url/url-news.el
+++ b/lisp/url/url-news.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/lisp/url/url-nfs.el b/lisp/url/url-nfs.el
index 898d304..d8e68fc 100644
--- a/lisp/url/url-nfs.el
+++ b/lisp/url/url-nfs.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/url/url-ns.el b/lisp/url/url-ns.el
index ada716d..dcbdf62 100644
--- a/lisp/url/url-ns.el
+++ b/lisp/url/url-ns.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/lisp/url/url-parse.el b/lisp/url/url-parse.el
index 4738163..4f6ab6b 100644
--- a/lisp/url/url-parse.el
+++ b/lisp/url/url-parse.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -36,7 +36,8 @@
                                      target attributes fullness))
             (:copier nil))
   type user password host portspec filename target attributes fullness
-  silent (use-cookies t))
+  silent (use-cookies t)
+  (asynchronous t))
 
 (defsubst url-port (urlobj)
   "Return the port number for the URL specified by URLOBJ.
diff --git a/lisp/url/url-privacy.el b/lisp/url/url-privacy.el
index 90dfb27..ab9a6a6 100644
--- a/lisp/url/url-privacy.el
+++ b/lisp/url/url-privacy.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/lisp/url/url-proxy.el b/lisp/url/url-proxy.el
index 790cb47..706cb68 100644
--- a/lisp/url/url-proxy.el
+++ b/lisp/url/url-proxy.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/lisp/url/url-queue.el b/lisp/url/url-queue.el
index dd1699b..06a7740 100644
--- a/lisp/url/url-queue.el
+++ b/lisp/url/url-queue.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/url/url-tramp.el b/lisp/url/url-tramp.el
index 50bfa7c..c28cf6c 100644
--- a/lisp/url/url-tramp.el
+++ b/lisp/url/url-tramp.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/url/url-util.el b/lisp/url/url-util.el
index a3c9655..1d9e386 100644
--- a/lisp/url/url-util.el
+++ b/lisp/url/url-util.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el
index f08779f..14c5652 100644
--- a/lisp/url/url-vars.el
+++ b/lisp/url/url-vars.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/lisp/url/url.el b/lisp/url/url.el
index be6377c..9a6b732 100644
--- a/lisp/url/url.el
+++ b/lisp/url/url.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -119,6 +119,8 @@ variable in the original buffer as a forwarding pointer.")
 
 (defvar url-retrieve-number-of-calls 0)
 (autoload 'url-cache-prune-cache "url-cache")
+(defvar url-asynchronous t
+  "Bind to nil before calling `url-retrieve' to signal :nowait connections.")
 
 ;;;###autoload
 (defun url-retrieve (url callback &optional cbargs silent inhibit-cookies)
@@ -190,6 +192,7 @@ URL-encoded before it's used."
   (unless (url-type url)
     (error "Bad url: %s" (url-recreate-url url)))
   (setf (url-silent url) silent)
+  (setf (url-asynchronous url) url-asynchronous)
   (setf (url-use-cookies url) (not inhibit-cookies))
   ;; Once in a while, remove old entries from the URL cache.
   (when (zerop (% url-retrieve-number-of-calls 1000))
@@ -232,6 +235,7 @@ how long to wait for a response before giving up."
 
   (let ((retrieval-done nil)
        (start-time (current-time))
+        (url-asynchronous nil)
         (asynch-buffer nil))
     (setq asynch-buffer
          (url-retrieve url (lambda (&rest ignored)
diff --git a/lisp/userlock.el b/lisp/userlock.el
index a8eb24b..1d45b3a 100644
--- a/lisp/userlock.el
+++ b/lisp/userlock.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el
index 91c6920..392147b 100644
--- a/lisp/vc/add-log.el
+++ b/lisp/vc/add-log.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/vc/compare-w.el b/lisp/vc/compare-w.el
index 11e84ae..f5571c6 100644
--- a/lisp/vc/compare-w.el
+++ b/lisp/vc/compare-w.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/vc/cvs-status.el b/lisp/vc/cvs-status.el
index c170809..770791a 100644
--- a/lisp/vc/cvs-status.el
+++ b/lisp/vc/cvs-status.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index 1d4af54..1e835f6 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/vc/diff.el b/lisp/vc/diff.el
index 7fdd103..a267908 100644
--- a/lisp/vc/diff.el
+++ b/lisp/vc/diff.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el
index b957bdc..f36d018 100644
--- a/lisp/vc/ediff-diff.el
+++ b/lisp/vc/ediff-diff.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/vc/ediff-help.el b/lisp/vc/ediff-help.el
index 339d3a5..3df0dc7 100644
--- a/lisp/vc/ediff-help.el
+++ b/lisp/vc/ediff-help.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/vc/ediff-hook.el b/lisp/vc/ediff-hook.el
index 37f8ef5..6a65f0d 100644
--- a/lisp/vc/ediff-hook.el
+++ b/lisp/vc/ediff-hook.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el
index 59d97c3..21d040d 100644
--- a/lisp/vc/ediff-init.el
+++ b/lisp/vc/ediff-init.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/vc/ediff-merg.el b/lisp/vc/ediff-merg.el
index d91d044..39cf44d 100644
--- a/lisp/vc/ediff-merg.el
+++ b/lisp/vc/ediff-merg.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/vc/ediff-mult.el b/lisp/vc/ediff-mult.el
index 5bf94a5..4ed6661 100644
--- a/lisp/vc/ediff-mult.el
+++ b/lisp/vc/ediff-mult.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/vc/ediff-ptch.el b/lisp/vc/ediff-ptch.el
index 6c8e925..d80db5c 100644
--- a/lisp/vc/ediff-ptch.el
+++ b/lisp/vc/ediff-ptch.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index bcf446a..3430d04 100644
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/vc/ediff-vers.el b/lisp/vc/ediff-vers.el
index efd8e93..134b41d 100644
--- a/lisp/vc/ediff-vers.el
+++ b/lisp/vc/ediff-vers.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/vc/ediff-wind.el b/lisp/vc/ediff-wind.el
index 31dcf3b..c2b7678 100644
--- a/lisp/vc/ediff-wind.el
+++ b/lisp/vc/ediff-wind.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el
index 4751bb6..d0f8e63 100644
--- a/lisp/vc/ediff.el
+++ b/lisp/vc/ediff.el
@@ -29,7 +29,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/vc/log-edit.el b/lisp/vc/log-edit.el
index cd8ba19..44e7cd7 100644
--- a/lisp/vc/log-edit.el
+++ b/lisp/vc/log-edit.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/vc/log-view.el b/lisp/vc/log-view.el
index e8efc1e..52f56ed 100644
--- a/lisp/vc/log-view.el
+++ b/lisp/vc/log-view.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/vc/pcvs-defs.el b/lisp/vc/pcvs-defs.el
index 72caafc..9575b5f 100644
--- a/lisp/vc/pcvs-defs.el
+++ b/lisp/vc/pcvs-defs.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/vc/pcvs-info.el b/lisp/vc/pcvs-info.el
index 8dd513c..239a226 100644
--- a/lisp/vc/pcvs-info.el
+++ b/lisp/vc/pcvs-info.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/vc/pcvs-parse.el b/lisp/vc/pcvs-parse.el
index 2315938..f0bb894 100644
--- a/lisp/vc/pcvs-parse.el
+++ b/lisp/vc/pcvs-parse.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/vc/pcvs-util.el b/lisp/vc/pcvs-util.el
index de45141..9b62780 100644
--- a/lisp/vc/pcvs-util.el
+++ b/lisp/vc/pcvs-util.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/vc/pcvs.el b/lisp/vc/pcvs.el
index 3ab3423..4e74d5f 100644
--- a/lisp/vc/pcvs.el
+++ b/lisp/vc/pcvs.el
@@ -27,7 +27,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index f94f8a6..112a9bc 100644
--- a/lisp/vc/smerge-mode.el
+++ b/lisp/vc/smerge-mode.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -1094,7 +1094,7 @@ used to replace chars to try and eliminate some spurious 
differences."
                               ;; also and more importantly because otherwise it
                               ;; may happen that diff doesn't behave like
                               ;; smerge-refine-weight-hack expects it to.
-                              ;; See 
http://thread.gmane.org/gmane.emacs.devel/82685, aka 
https://lists.gnu.org/archive/html/emacs-devel/2007-11/msg00401.html
+                              ;; See 
http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg00401.html
                               "-awd" "-ad")
                           file1 file2))
           ;; Process diff's output.
diff --git a/lisp/vc/vc-annotate.el b/lisp/vc/vc-annotate.el
index 12df680..a6c0e5a 100644
--- a/lisp/vc/vc-annotate.el
+++ b/lisp/vc/vc-annotate.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index d0e9f77..51b104c 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el
index bab835c..36cb2e5 100644
--- a/lisp/vc/vc-cvs.el
+++ b/lisp/vc/vc-cvs.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/vc/vc-dav.el b/lisp/vc/vc-dav.el
index 4aa1851..f951c67 100644
--- a/lisp/vc/vc-dav.el
+++ b/lisp/vc/vc-dav.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el
index 0363aab..41c44e2 100644
--- a/lisp/vc/vc-dir.el
+++ b/lisp/vc/vc-dir.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Credits:
 
diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el
index c71030a..479003e 100644
--- a/lisp/vc/vc-dispatcher.el
+++ b/lisp/vc/vc-dispatcher.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Credits:
 
diff --git a/lisp/vc/vc-filewise.el b/lisp/vc/vc-filewise.el
index 16f833c..87a2e33 100644
--- a/lisp/vc/vc-filewise.el
+++ b/lisp/vc/vc-filewise.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index cc3e295..095f184 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -951,6 +951,10 @@ This prompts for a branch to merge from."
                                 "DU" "AA" "UU"))
             (push (expand-file-name file directory) files)))))))
 
+;; Everywhere but here, follows vc-git-command, which uses vc-do-command
+;; from vc-dispatcher.
+(autoload 'vc-resynch-buffer "vc-dispatcher")
+
 (defun vc-git-resolve-when-done ()
   "Call \"git add\" if the conflict markers have been removed."
   (save-excursion
@@ -964,6 +968,7 @@ This prompts for a branch to merge from."
                                                 (vc-git-root 
buffer-file-name)))
                (vc-git-conflicted-files (vc-git-root buffer-file-name)))
         (vc-git-command nil 0 nil "reset"))
+      (vc-resynch-buffer buffer-file-name t t)
       ;; Remove the hook so that it is not called multiple times.
       (remove-hook 'after-save-hook 'vc-git-resolve-when-done t))))
 
@@ -1450,10 +1455,6 @@ This command shares argument histories with \\[rgrep] 
and \\[grep]."
        (if (eq next-error-last-buffer (current-buffer))
            (setq default-directory dir))))))
 
-;; Everywhere but here, follows vc-git-command, which uses vc-do-command
-;; from vc-dispatcher.
-(autoload 'vc-resynch-buffer "vc-dispatcher")
-
 (defun vc-git-stash (name)
   "Create a stash."
   (interactive "sStash name: ")
@@ -1554,7 +1555,7 @@ The difference to vc-do-command is that this function 
always invokes
          (or coding-system-for-write vc-git-commits-coding-system))
         (process-environment (cons "GIT_DIR" process-environment)))
     (apply 'vc-do-command (or buffer "*vc*") okstatus vc-git-program
-          ;; http://debbugs.gnu.org/16897
+          ;; https://debbugs.gnu.org/16897
           (unless (and (not (cdr-safe file-or-list))
                        (let ((file (or (car-safe file-or-list)
                                        file-or-list)))
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index 4be5296..7a04a54 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index 2c2534a..4c94280 100644
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/vc/vc-mtn.el b/lisp/vc/vc-mtn.el
index ac95da0..eed4bd0 100644
--- a/lisp/vc/vc-mtn.el
+++ b/lisp/vc/vc-mtn.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el
index afeb5ef..9dffc14 100644
--- a/lisp/vc/vc-rcs.el
+++ b/lisp/vc/vc-rcs.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/vc/vc-sccs.el b/lisp/vc/vc-sccs.el
index fd27db3..f873fbf 100644
--- a/lisp/vc/vc-sccs.el
+++ b/lisp/vc/vc-sccs.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/vc/vc-src.el b/lisp/vc/vc-src.el
index 0e47cc1..0a219ff 100644
--- a/lisp/vc/vc-src.el
+++ b/lisp/vc/vc-src.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el
index f1e8985..f0987bf 100644
--- a/lisp/vc/vc-svn.el
+++ b/lisp/vc/vc-svn.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 9379bcf..b80f0e6 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Credits:
 
diff --git a/lisp/vcursor.el b/lisp/vcursor.el
index 22727bc..0d7a5ff 100644
--- a/lisp/vcursor.el
+++ b/lisp/vcursor.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/version.el b/lisp/version.el
index ea6f1b4..1792a81 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/view.el b/lisp/view.el
index fb478e1..2d26a11 100644
--- a/lisp/view.el
+++ b/lisp/view.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/vt-control.el b/lisp/vt-control.el
index 8755420..7ea6881 100644
--- a/lisp/vt-control.el
+++ b/lisp/vt-control.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/vt100-led.el b/lisp/vt100-led.el
index c86a826..a6f43fb 100644
--- a/lisp/vt100-led.el
+++ b/lisp/vt100-led.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el
index 93551de..1ba6403 100644
--- a/lisp/w32-fns.el
+++ b/lisp/w32-fns.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/w32-vars.el b/lisp/w32-vars.el
index 50f6255..3309db3 100644
--- a/lisp/w32-vars.el
+++ b/lisp/w32-vars.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/wdired.el b/lisp/wdired.el
index 179b51b..b8de02d 100644
--- a/lisp/wdired.el
+++ b/lisp/wdired.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index 4198b9b..1424764 100644
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/wid-browse.el b/lisp/wid-browse.el
index f105de2..d8054e3 100644
--- a/lisp/wid-browse.el
+++ b/lisp/wid-browse.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index 6687bec..f071c40 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Wishlist items (from widget.texi):
 
diff --git a/lisp/widget.el b/lisp/widget.el
index 30d2818..baa9140 100644
--- a/lisp/widget.el
+++ b/lisp/widget.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/windmove.el b/lisp/windmove.el
index 0797ef8..14656c9 100644
--- a/lisp/windmove.el
+++ b/lisp/windmove.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;
 ;; --------------------------------------------------------------------
 
diff --git a/lisp/window.el b/lisp/window.el
index 7aea9ae..5ba9a30 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/winner.el b/lisp/winner.el
index 7b04833..61ea4d4 100644
--- a/lisp/winner.el
+++ b/lisp/winner.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/woman.el b/lisp/woman.el
index 6620ce4..111086e 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -22,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el
index 80ec410..acbdcb9 100644
--- a/lisp/x-dnd.el
+++ b/lisp/x-dnd.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/xdg.el b/lisp/xdg.el
index 183d050..e94fa8e 100644
--- a/lisp/xdg.el
+++ b/lisp/xdg.el
@@ -19,7 +19,7 @@
 ;; General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/xml.el b/lisp/xml.el
index 88dc70b..3688088 100644
--- a/lisp/xml.el
+++ b/lisp/xml.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/xt-mouse.el b/lisp/xt-mouse.el
index acb3018..772a72d 100644
--- a/lisp/xt-mouse.el
+++ b/lisp/xt-mouse.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index c908f1a..5e37209 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 ;;
 ;; --------------------------------------------------------------------
 
diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in
index ee7a204..148002a 100644
--- a/lwlib/Makefile.in
+++ b/lwlib/Makefile.in
@@ -16,7 +16,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 # This was taken from the output of Imake using Lucid's Imakefile.
diff --git a/lwlib/deps.mk b/lwlib/deps.mk
index 525c9f1..5bdf1af 100644
--- a/lwlib/deps.mk
+++ b/lwlib/deps.mk
@@ -16,7 +16,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ### Commentary:
 
diff --git a/lwlib/lwlib-Xaw.c b/lwlib/lwlib-Xaw.c
index ec33e78..ce007ae 100644
--- a/lwlib/lwlib-Xaw.c
+++ b/lwlib/lwlib-Xaw.c
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/lwlib/lwlib-Xlw.c b/lwlib/lwlib-Xlw.c
index 10ed326..0d58a03 100644
--- a/lwlib/lwlib-Xlw.c
+++ b/lwlib/lwlib-Xlw.c
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c
index b184290..2ac543c 100644
--- a/lwlib/lwlib-Xm.c
+++ b/lwlib/lwlib-Xm.c
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/lwlib/lwlib-Xm.h b/lwlib/lwlib-Xm.h
index 043ebc7..09b1920 100644
--- a/lwlib/lwlib-Xm.h
+++ b/lwlib/lwlib-Xm.h
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef LWLIB_XM_H
 #define LWLIB_XM_H
diff --git a/lwlib/lwlib-int.h b/lwlib/lwlib-int.h
index 5b73997..ae195a3 100644
--- a/lwlib/lwlib-int.h
+++ b/lwlib/lwlib-int.h
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 #ifndef LWLIB_INTERNAL_H
diff --git a/lwlib/lwlib-utils.c b/lwlib/lwlib-utils.c
index 3c7a7a6..6f33e51 100644
--- a/lwlib/lwlib-utils.c
+++ b/lwlib/lwlib-utils.c
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/lwlib/lwlib-widget.h b/lwlib/lwlib-widget.h
index 6a88d2a..6863b90 100644
--- a/lwlib/lwlib-widget.h
+++ b/lwlib/lwlib-widget.h
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* This part is separate from lwlib.h because it does not need X,
    and thus can be used by non-X code in Emacs proper.  */
diff --git a/lwlib/lwlib.c b/lwlib/lwlib.c
index fffb17f..30fa046 100644
--- a/lwlib/lwlib.c
+++ b/lwlib/lwlib.c
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/lwlib/lwlib.h b/lwlib/lwlib.h
index f885369..e28d0e8 100644
--- a/lwlib/lwlib.h
+++ b/lwlib/lwlib.h
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 #ifndef LWLIB_H
diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c
index 1ce4aea..cfd20ba 100644
--- a/lwlib/xlwmenu.c
+++ b/lwlib/xlwmenu.c
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Created by address@hidden */
 
diff --git a/lwlib/xlwmenu.h b/lwlib/xlwmenu.h
index a6aed48..7c27839 100644
--- a/lwlib/xlwmenu.h
+++ b/lwlib/xlwmenu.h
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef _XlwMenu_h
 #define _XlwMenu_h
diff --git a/lwlib/xlwmenuP.h b/lwlib/xlwmenuP.h
index a89934c..e7be866 100644
--- a/lwlib/xlwmenuP.h
+++ b/lwlib/xlwmenuP.h
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef _XlwMenuP_h
 #define _XlwMenuP_h
diff --git a/m4/getgroups.m4 b/m4/getgroups.m4
index 02ce235..17f7409 100644
--- a/m4/getgroups.m4
+++ b/m4/getgroups.m4
@@ -12,7 +12,7 @@ dnl A wrapper around AC_FUNC_GETGROUPS.
 m4_version_prereq([2.70], [] ,[
 
 # This is taken from the following Autoconf patch:
-# 
http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=7fbb553727ed7e0e689a17594b58559ecf3ea6e9
+# 
https://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=7fbb553727ed7e0e689a17594b58559ecf3ea6e9
 AC_DEFUN([AC_FUNC_GETGROUPS],
 [
   AC_REQUIRE([AC_TYPE_GETGROUPS])dnl
diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4
index 13504a8..c551752 100644
--- a/m4/gnulib-comp.m4
+++ b/m4/gnulib-comp.m4
@@ -12,7 +12,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this file.  If not, see <http://www.gnu.org/licenses/>.
+# along with this file.  If not, see <https://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License,
 # this file may be distributed as part of a program that
diff --git a/m4/std-gnu11.m4 b/m4/std-gnu11.m4
index 9dae9b1..bd34aa1 100644
--- a/m4/std-gnu11.m4
+++ b/m4/std-gnu11.m4
@@ -20,7 +20,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # Written by David MacKenzie, with help from
 # Akim Demaille, Paul Eggert,
diff --git a/m4/stdalign.m4 b/m4/stdalign.m4
index 0652a1e..f091aa5 100644
--- a/m4/stdalign.m4
+++ b/m4/stdalign.m4
@@ -18,7 +18,7 @@ AC_DEFUN([gl_STDALIGN_H],
 
             /* Test that alignof yields a result consistent with offsetof.
                This catches GCC bug 52023
-               <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>.  */
+               <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>.  */
             #ifdef __cplusplus
                template <class t> struct alignof_helper { char a; t b; };
             # define ao(type) offsetof (alignof_helper<type>, b)
diff --git a/m4/sys_types_h.m4 b/m4/sys_types_h.m4
index ec0860b..34224d7 100644
--- a/m4/sys_types_h.m4
+++ b/m4/sys_types_h.m4
@@ -40,7 +40,7 @@ AC_DEFUN([gl_SYS_TYPES_H_DEFAULTS],
 m4_version_prereq([2.70], [], [
 
 # This is taken from the following Autoconf patch:
-# http://git.sv.gnu.org/cgit/autoconf.git/commit/?id=e17a30e98
+# https://git.sv.gnu.org/cgit/autoconf.git/commit/?id=e17a30e98
 
 m4_undefine([AC_HEADER_MAJOR])
 AC_DEFUN([AC_HEADER_MAJOR],
diff --git a/make-dist b/make-dist
index b466784..934f83e 100755
--- a/make-dist
+++ b/make-dist
@@ -17,7 +17,7 @@
 ## GNU General Public License for more details.
 
 ## You should have received a copy of the GNU General Public License
-## along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+## along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ### Commentary:
 
diff --git a/modules/modhelp.py b/modules/modhelp.py
index ab2ce5c..78fadda 100755
--- a/modules/modhelp.py
+++ b/modules/modhelp.py
@@ -17,7 +17,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 import os
 import string
diff --git a/nextstep/Cocoa/Emacs.base/Contents/Resources/Credits.html 
b/nextstep/Cocoa/Emacs.base/Contents/Resources/Credits.html
index 9a9e2f3..df79ec9 100644
--- a/nextstep/Cocoa/Emacs.base/Contents/Resources/Credits.html
+++ b/nextstep/Cocoa/Emacs.base/Contents/Resources/Credits.html
@@ -1 +1 @@
-<font face="lucida grande" size="-1"><a 
href="http://www.gnu.org/software/emacs";>http://www.gnu.org/software/emacs</a></font>
+<font face="lucida grande" size="-1"><a 
href="https://www.gnu.org/software/emacs";>https://www.gnu.org/software/emacs</a></font>
diff --git a/nextstep/INSTALL b/nextstep/INSTALL
index b7e84e0..326e02a 100644
--- a/nextstep/INSTALL
+++ b/nextstep/INSTALL
@@ -65,4 +65,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/nextstep/Makefile.in b/nextstep/Makefile.in
index ad1abb0..5ddf484 100644
--- a/nextstep/Makefile.in
+++ b/nextstep/Makefile.in
@@ -15,7 +15,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+## along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ### Commentary:
 
diff --git a/nextstep/README b/nextstep/README
index 94993d8..03d69b1 100644
--- a/nextstep/README
+++ b/nextstep/README
@@ -120,4 +120,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/nextstep/templates/Info.plist.in b/nextstep/templates/Info.plist.in
index b1dae4e..5d2eb7d 100644
--- a/nextstep/templates/Info.plist.in
+++ b/nextstep/templates/Info.plist.in
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 -->
 
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" 
"http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
diff --git a/nt/INSTALL b/nt/INSTALL
index b7f47a5..c6182c2 100644
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -486,6 +486,8 @@ build will run on Windows 9X and newer systems).
        Does Emacs use a gif library?                           yes
        Does Emacs use a png library?                           yes
        Does Emacs use -lrsvg-2?                                yes
+       Does Emacs use cairo?                                   no
+       Does Emacs use -llcms2?                                 yes
        Does Emacs use imagemagick?                             no
        Does Emacs support sound?                               no
        Does Emacs use -lgpm?                                   no
@@ -797,6 +799,13 @@ build will run on Windows 9X and newer systems).
   (This library is also a prerequisite for several image libraries, so
   you may already have it; look for zlib1.dll or libz-1.dll.)
 
+* Optional support for lcms2 library
+
+  Emacs can expose some capabilities of the Little CMS color
+  management engine to Lisp programs using the lcms2 library.
+  Prebuilt binaries of lcms2 DLL (for 32-bit builds of Emacs) are
+  available from the ezwinports site and from the MSYS2 project.
+
 
 This file is part of GNU Emacs.
 
diff --git a/nt/INSTALL.W64 b/nt/INSTALL.W64
index b40f223..cb13473 100644
--- a/nt/INSTALL.W64
+++ b/nt/INSTALL.W64
@@ -63,6 +63,7 @@ packages (you can copy and paste it into the shell with Shift 
+ Insert):
   mingw-w64-x86_64-libpng \
   mingw-w64-x86_64-libjpeg-turbo \
   mingw-w64-x86_64-librsvg \
+  mingw-w64-x86_64-liblcms2 \
   mingw-w64-x86_64-libxml2 \
   mingw-w64-x86_64-gnutls \
   mingw-w64-x86_64-zlib
diff --git a/nt/README b/nt/README
index 09d6820..19ffd50 100644
--- a/nt/README
+++ b/nt/README
@@ -9,9 +9,9 @@
   subprocesses, windowing features (fonts, colors, scroll bars, multiple
   frames, etc.), and networking support.
 
-  Precompiled distributions are also available; ftp to
+  Precompiled distributions are also available; see:
 
-       ftp://ftp.gnu.org/gnu/emacs/windows/
+       https://ftp.gnu.org/gnu/emacs/windows/
 
   for the latest precompiled distributions.
 
diff --git a/nt/README.W32 b/nt/README.W32
index 1141e8a..a670687 100644
--- a/nt/README.W32
+++ b/nt/README.W32
@@ -8,7 +8,7 @@ See the end of the file for license conditions.
   can find the precompiled distribution on the ftp.gnu.org server and
   its mirrors:
 
-       ftp://ftp.gnu.org/gnu/emacs/windows/
+       https://ftp.gnu.org/gnu/emacs/windows/
 
   This server contains other distributions, including the full Emacs
   source distribution, as well as older releases of Emacs for Windows.
diff --git a/oldXMenu/Activate.c b/oldXMenu/Activate.c
index 876cb3d..c27005f 100644
--- a/oldXMenu/Activate.c
+++ b/oldXMenu/Activate.c
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /*
  * XMenu:      MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/Create.c b/oldXMenu/Create.c
index a091368..83e6c8e 100644
--- a/oldXMenu/Create.c
+++ b/oldXMenu/Create.c
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 /*
diff --git a/oldXMenu/FindSel.c b/oldXMenu/FindSel.c
index 7440b3d..37a87a8 100644
--- a/oldXMenu/FindSel.c
+++ b/oldXMenu/FindSel.c
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
 /*
diff --git a/oldXMenu/Internal.c b/oldXMenu/Internal.c
index bc4ed22..9139044 100644
--- a/oldXMenu/Internal.c
+++ b/oldXMenu/Internal.c
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 /*
diff --git a/oldXMenu/Makefile.in b/oldXMenu/Makefile.in
index 7a5c998..59a6c74 100644
--- a/oldXMenu/Makefile.in
+++ b/oldXMenu/Makefile.in
@@ -28,7 +28,7 @@
 ## GNU General Public License for more details.
 
 ## You should have received a copy of the GNU General Public License
-## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+## along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 
 ### Commentary:
diff --git a/oldXMenu/deps.mk b/oldXMenu/deps.mk
index bbd98ca..acb42e4 100644
--- a/oldXMenu/deps.mk
+++ b/oldXMenu/deps.mk
@@ -28,7 +28,7 @@
 ## GNU General Public License for more details.
 
 ## You should have received a copy of the GNU General Public License
-## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+## along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ### Commentary:
 
diff --git a/oldXMenu/insque.c b/oldXMenu/insque.c
index 2906f9c..0c6afc6 100644
--- a/oldXMenu/insque.c
+++ b/oldXMenu/insque.c
@@ -12,7 +12,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* This file implements the emacs_insque and emacs_remque functions,
    clones of the insque and remque functions of BSD.  They and all
diff --git a/src/.gdbinit b/src/.gdbinit
index 21cdca5..60f6348 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -13,7 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 # Force loading of symbols, enough to give us VALBITS etc.
 set $dummy = main + 8
diff --git a/src/Makefile.in b/src/Makefile.in
index dde3f1d..0e55ad4 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -16,7 +16,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 # Note that this file is edited by msdos/sed1v2.inp for MSDOS.  That
@@ -234,6 +234,8 @@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@
 
 GETADDRINFO_A_LIBS = @GETADDRINFO_A_LIBS@
 
+LIBLCMS2 = @LIBLCMS2@
+
 LIBZ = @LIBZ@
 
 ## system-specific libs for dynamic modules, else empty
@@ -389,7 +391,7 @@ base_obj = dispnew.o frame.o scroll.o xdisp.o menu.o 
$(XMENU_OBJ) window.o \
        syntax.o $(UNEXEC_OBJ) bytecode.o \
        process.o gnutls.o callproc.o \
        region-cache.o sound.o atimer.o \
-       doprnt.o intervals.o textprop.o composite.o xml.o $(NOTIFY_OBJ) \
+       doprnt.o intervals.o textprop.o composite.o xml.o lcms.o $(NOTIFY_OBJ) \
        $(XWIDGETS_OBJ) \
        profiler.o decompress.o \
        thread.o systhread.o \
@@ -490,7 +492,7 @@ LIBES = $(LIBS) $(W32_LIBS) $(LIBS_GNUSTEP) $(LIBX_BASE) 
$(LIBIMAGE) \
    $(LIBXML2_LIBS) $(LIBGPM) $(LIBS_SYSTEM) $(CAIRO_LIBS) \
    $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \
    $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \
-   $(LIBGNUTLS_LIBS) $(LIB_PTHREAD) $(GETADDRINFO_A_LIBS) \
+   $(LIBGNUTLS_LIBS) $(LIB_PTHREAD) $(GETADDRINFO_A_LIBS) $(LIBLCMS2) \
    $(NOTIFY_LIBS) $(LIB_MATH) $(LIBZ) $(LIBMODULES) $(LIBSYSTEMD_LIBS)
 
 ## FORCE it so that admin/unidata can decide whether these files
diff --git a/src/README b/src/README
index fef2ff4..4790c04 100644
--- a/src/README
+++ b/src/README
@@ -27,4 +27,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/src/alloc.c b/src/alloc.c
index 300f5e4..87e9ef0 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/src/atimer.c b/src/atimer.c
index 5feb1f6..0abd6c1 100644
--- a/src/atimer.c
+++ b/src/atimer.c
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <stdio.h>
diff --git a/src/atimer.h b/src/atimer.h
index 30a5856..fb85193 100644
--- a/src/atimer.h
+++ b/src/atimer.h
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef EMACS_ATIMER_H
 #define EMACS_ATIMER_H
diff --git a/src/bidi.c b/src/bidi.c
index 7637974..fd73b54 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Eli Zaretskii <address@hidden>.
 
diff --git a/src/blockinput.h b/src/blockinput.h
index d57c5ba..1ca3b47 100644
--- a/src/blockinput.h
+++ b/src/blockinput.h
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef EMACS_BLOCKINPUT_H
 #define EMACS_BLOCKINPUT_H
diff --git a/src/buffer.c b/src/buffer.c
index f2689b6..bc28ac7 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/src/buffer.h b/src/buffer.h
index 46ca6aa..ac7c5a5 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef EMACS_BUFFER_H
 #define EMACS_BUFFER_H
diff --git a/src/bytecode.c b/src/bytecode.c
index a473dfb..50c7abe 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/src/callint.c b/src/callint.c
index 9643611..105ec07 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 #include <config.h>
diff --git a/src/callproc.c b/src/callproc.c
index b93d361..9375ce5 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 #include <config.h>
diff --git a/src/casefiddle.c b/src/casefiddle.c
index 443d62b..8f564ed 100644
--- a/src/casefiddle.c
+++ b/src/casefiddle.c
@@ -17,7 +17,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 #include <config.h>
diff --git a/src/casetab.c b/src/casetab.c
index 6108bb6..924bf9a 100644
--- a/src/casetab.c
+++ b/src/casetab.c
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/src/category.c b/src/category.c
index b633f65..eced906 100644
--- a/src/category.c
+++ b/src/category.c
@@ -22,7 +22,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 /* Here we handle three objects: category, category set, and category
diff --git a/src/category.h b/src/category.h
index 247f909..c4feedd 100644
--- a/src/category.h
+++ b/src/category.h
@@ -20,7 +20,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef EMACS_CATEGORY_H
 #define EMACS_CATEGORY_H
diff --git a/src/ccl.c b/src/ccl.c
index b2caf41..dc7afc5 100644
--- a/src/ccl.c
+++ b/src/ccl.c
@@ -21,7 +21,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
@@ -730,7 +730,7 @@ while (0)
 #endif
 
 /* Use "&" rather than "&&" to suppress a bogus GCC warning; see
-   <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43772>.  */
+   <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=43772>.  */
 #define ASCENDING_ORDER(lo, med, hi) (((lo) <= (med)) & ((med) <= (hi)))
 
 #define GET_CCL_RANGE(var, ccl_prog, ic, lo, hi)               \
diff --git a/src/ccl.h b/src/ccl.h
index 10860f5..8eb9d7e 100644
--- a/src/ccl.h
+++ b/src/ccl.h
@@ -20,7 +20,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 #ifndef EMACS_CCL_H
diff --git a/src/character.c b/src/character.c
index 1c6020e..c8ffa2b 100644
--- a/src/character.c
+++ b/src/character.c
@@ -20,7 +20,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* At first, see the document in `character.h' to understand the code
    in this file.  */
diff --git a/src/character.h b/src/character.h
index b073a0d..c716885 100644
--- a/src/character.h
+++ b/src/character.h
@@ -18,7 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef EMACS_CHARACTER_H
 #define EMACS_CHARACTER_H
diff --git a/src/charset.c b/src/charset.c
index 6ce2f90..ab207ea 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -24,7 +24,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/src/charset.h b/src/charset.h
index a26d643..2b6875c 100644
--- a/src/charset.h
+++ b/src/charset.h
@@ -22,7 +22,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef EMACS_CHARSET_H
 #define EMACS_CHARSET_H
diff --git a/src/chartab.c b/src/chartab.c
index 8392c0c..065ae4f 100644
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/src/cm.c b/src/cm.c
index 9a90f37..f3f4154 100644
--- a/src/cm.c
+++ b/src/cm.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 #include <config.h>
diff --git a/src/cm.h b/src/cm.h
index 83ef512..1002672 100644
--- a/src/cm.h
+++ b/src/cm.h
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef EMACS_CM_H
 #define EMACS_CM_H
diff --git a/src/cmds.c b/src/cmds.c
index 6f2db86..e4c0c86 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 #include <config.h>
diff --git a/src/coding.c b/src/coding.c
index 50ad206..d790ad0 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -21,7 +21,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /*** TABLE OF CONTENTS ***
 
diff --git a/src/coding.h b/src/coding.h
index 8ed851d..66d125b 100644
--- a/src/coding.h
+++ b/src/coding.h
@@ -21,7 +21,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef EMACS_CODING_H
 #define EMACS_CODING_H
diff --git a/src/commands.h b/src/commands.h
index 03e1b73..5dc1100 100644
--- a/src/commands.h
+++ b/src/commands.h
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef EMACS_COMMANDS_H
 #define EMACS_COMMANDS_H
diff --git a/src/composite.c b/src/composite.c
index 05a2963..c01e2e3 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -20,7 +20,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/src/composite.h b/src/composite.h
index dc1e7ce..7f0cc1c 100644
--- a/src/composite.h
+++ b/src/composite.h
@@ -20,7 +20,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef EMACS_COMPOSITE_H
 #define EMACS_COMPOSITE_H
diff --git a/src/conf_post.h b/src/conf_post.h
index e1d6a93..febdb8b 100644
--- a/src/conf_post.h
+++ b/src/conf_post.h
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Put the code here rather than in configure.ac using AH_BOTTOM.
    This way, the code does not get processed by autoheader.  For
@@ -255,7 +255,27 @@ extern int emacs_setenv_TZ (char const *);
 #if GNUC_PREREQ (4, 4, 0) && defined __GLIBC_MINOR__
 # define PRINTF_ARCHETYPE __gnu_printf__
 #elif GNUC_PREREQ (4, 4, 0) && defined __MINGW32__
-# define PRINTF_ARCHETYPE __ms_printf__
+# ifdef MINGW_W64
+/* When __USE_MINGW_ANSI_STDIO is non-zero (as set by config.h),
+   MinGW64 replaces printf* with its own versions that are
+   __gnu_printf__ compatible, and emits warnings for MS native %I64d
+   format spec.  */
+#  if __USE_MINGW_ANSI_STDIO
+#   define PRINTF_ARCHETYPE __gnu_printf__
+#  else
+#   define PRINTF_ARCHETYPE __ms_printf__
+#  endif
+# else /* mingw.org's MinGW */
+/* Starting from runtime v5.0.0, mingw.org's MinGW with GCC 6 and
+   later turns on __USE_MINGW_ANSI_STDIO by default, replaces printf*
+   with its own __mingw_printf__ version, which still recognizes
+   %I64d.  */
+#  if GNUC_PREREQ (6, 0, 0) && __MINGW32_MAJOR_VERSION >= 5
+#   define PRINTF_ARCHETYPE __mingw_printf__
+#  else  /* __MINGW32_MAJOR_VERSION < 5 */
+#   define PRINTF_ARCHETYPE __ms_printf__
+#  endif  /* __MINGW32_MAJOR_VERSION < 5 */
+# endif         /* MinGW */
 #else
 # define PRINTF_ARCHETYPE __printf__
 #endif
diff --git a/src/data.c b/src/data.c
index c9818b6..feca0a6 100644
--- a/src/data.c
+++ b/src/data.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 #include <config.h>
diff --git a/src/dbusbind.c b/src/dbusbind.c
index 0d9d3e5..4a70684 100644
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/src/decompress.c b/src/decompress.c
index a53a66d..12b1f6c 100644
--- a/src/decompress.c
+++ b/src/decompress.c
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/src/deps.mk b/src/deps.mk
index b56d880..a94d198 100644
--- a/src/deps.mk
+++ b/src/deps.mk
@@ -16,7 +16,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+## along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ## Commentary:
 ##
diff --git a/src/dired.c b/src/dired.c
index 128493a..28d1cff 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 #include <config.h>
diff --git a/src/dispextern.h b/src/dispextern.h
index 1df769a..2f55d8c 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* New redisplay written by Gerd Moellmann <address@hidden>.  */
 
diff --git a/src/dispnew.c b/src/dispnew.c
index 93ef6a5..4a319cc 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
@@ -386,6 +386,7 @@ adjust_glyph_matrix (struct window *w, struct glyph_matrix 
*matrix, int x, int y
      Do nothing if MATRIX' size, position, vscroll, and marginal areas
      haven't changed.  This optimization is important because preserving
      the matrix means preventing redisplay.  */
+  eassume (w != NULL || matrix->pool != NULL);
   if (matrix->pool == NULL)
     {
       left = margin_glyphs_to_reserve (w, dim.width, w->left_margin_cols);
diff --git a/src/disptab.h b/src/disptab.h
index cdfb080..592a1fa 100644
--- a/src/disptab.h
+++ b/src/disptab.h
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Access the slots of a display-table, according to their purpose.  */
 
diff --git a/src/doc.c b/src/doc.c
index 345e18b..3286c12 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 #include <config.h>
@@ -538,7 +538,7 @@ the same file name is found in the `doc-directory'.  */)
   char const *dirname;
   ptrdiff_t dirlen;
   /* Preloaded defcustoms using custom-initialize-delay are added to
-     this list, but kept unbound.  See http://debbugs.gnu.org/11565  */
+     this list, but kept unbound.  See https://debbugs.gnu.org/11565  */
   Lisp_Object delayed_init =
     find_symbol_value (intern ("custom-delayed-init-variables"));
 
diff --git a/src/doprnt.c b/src/doprnt.c
index 418601a..89d7e99 100644
--- a/src/doprnt.c
+++ b/src/doprnt.c
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* If you think about replacing this with some similar standard C function of
    the printf family (such as vsnprintf), please note that this function
diff --git a/src/dynlib.c b/src/dynlib.c
index 47ba5e3..a6d7048 100644
--- a/src/dynlib.c
+++ b/src/dynlib.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 /* Assume modules are enabled on modern systems...  *Yes*, the
diff --git a/src/dynlib.h b/src/dynlib.h
index 1d53b8e..5669995 100644
--- a/src/dynlib.h
+++ b/src/dynlib.h
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef DYNLIB_H
 #define DYNLIB_H
diff --git a/src/editfns.c b/src/editfns.c
index d54c9c1..b03eb94 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 #include <config.h>
diff --git a/src/emacs-icon.h b/src/emacs-icon.h
index b5ba89e..f126458 100644
--- a/src/emacs-icon.h
+++ b/src/emacs-icon.h
@@ -18,7 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Note that the GTK port uses gdk to display the icon, so Emacs need
    not have XPM support compiled in.  */
diff --git a/src/emacs-module.c b/src/emacs-module.c
index ad6c8fb..e5833a1 100644
--- a/src/emacs-module.c
+++ b/src/emacs-module.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/src/emacs-module.h.in b/src/emacs-module.h.in
index 40b6448..d83cd43 100644
--- a/src/emacs-module.h.in
+++ b/src/emacs-module.h.in
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef EMACS_MODULE_H
 #define EMACS_MODULE_H
diff --git a/src/emacs.c b/src/emacs.c
index 44f6285..1ad8af7 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #define INLINE EXTERN_INLINE
 #include <config.h>
@@ -1546,6 +1546,10 @@ Using an Emacs configured with --with-x-toolkit=lucid 
does not have this problem
       syms_of_xml ();
 #endif
 
+#ifdef HAVE_LCMS2
+      syms_of_lcms2 ();
+#endif
+
 #ifdef HAVE_ZLIB
       syms_of_decompress ();
 #endif
diff --git a/src/emacsgtkfixed.c b/src/emacsgtkfixed.c
index 75cb3c1..1a00e0f 100644
--- a/src/emacsgtkfixed.c
+++ b/src/emacsgtkfixed.c
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/src/emacsgtkfixed.h b/src/emacsgtkfixed.h
index 776ac45..8f2acd6 100644
--- a/src/emacsgtkfixed.h
+++ b/src/emacsgtkfixed.h
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef EMACSGTKFIXED_H
 #define EMACSGTKFIXED_H
diff --git a/src/epaths.in b/src/epaths.in
index c491d3b..8f77b0a 100644
--- a/src/epaths.in
+++ b/src/epaths.in
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 /* Together with PATH_SITELOADSEARCH, this gives the default value of
@@ -75,4 +75,3 @@ along with GNU Emacs.  If not, see 
<http://www.gnu.org/licenses/>.  */
 
 /* Where Emacs should look for the application default file. */
 #define PATH_X_DEFAULTS 
"/usr/lib/X11/%L/%T/%N%C%S:/usr/lib/X11/%l/%T/%N%C%S:/usr/lib/X11/%T/%N%C%S:/usr/lib/X11/%L/%T/%N%S:/usr/lib/X11/%l/%T/%N%S:/usr/lib/X11/%T/%N%S"
-
diff --git a/src/eval.c b/src/eval.c
index a6612b9..62e2196 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 #include <config.h>
diff --git a/src/fileio.c b/src/fileio.c
index 3195348..adb3534 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <limits.h>
@@ -2046,7 +2046,7 @@ permissions.  */)
     {
       /* Set the modified context back to the file.  */
       bool fail = fsetfilecon (ofd, con) != 0;
-      /* See http://debbugs.gnu.org/11245 for ENOTSUP.  */
+      /* See https://debbugs.gnu.org/11245 for ENOTSUP.  */
       if (fail && errno != ENOTSUP)
        report_file_error ("Doing fsetfilecon", newname);
 
@@ -2943,7 +2943,7 @@ or if Emacs was not compiled with SELinux support.  */)
          fail = (lsetfilecon (SSDATA (encoded_absname),
                               context_str (parsed_con))
                  != 0);
-          /* See http://debbugs.gnu.org/11245 for ENOTSUP.  */
+          /* See https://debbugs.gnu.org/11245 for ENOTSUP.  */
          if (fail && errno != ENOTSUP)
            report_file_error ("Doing lsetfilecon", absname);
 
diff --git a/src/filelock.c b/src/filelock.c
index fd4f0aa..a8bc17c 100644
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -19,7 +19,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 #include <config.h>
diff --git a/src/firstfile.c b/src/firstfile.c
index c952e38..43f45f2 100644
--- a/src/firstfile.c
+++ b/src/firstfile.c
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 #include <config.h>
diff --git a/src/floatfns.c b/src/floatfns.c
index 47553f2..47e94b8 100644
--- a/src/floatfns.c
+++ b/src/floatfns.c
@@ -18,7 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 /* C89 requires only the following math.h functions, and Emacs omits
diff --git a/src/fns.c b/src/fns.c
index ef9a175..4524ff9 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
@@ -37,7 +37,7 @@ along with GNU Emacs.  If not, see 
<http://www.gnu.org/licenses/>.  */
 #include "puresize.h"
 #include "gnutls.h"
 
-#ifdef WINDOWSNT
+#if defined WINDOWSNT && defined HAVE_GNUTLS3
 # define gnutls_rnd w32_gnutls_rnd
 #endif
 
diff --git a/src/font.c b/src/font.c
index a5e5b6a..51625b4 100644
--- a/src/font.c
+++ b/src/font.c
@@ -18,7 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <float.h>
diff --git a/src/font.h b/src/font.h
index 53e3fc2..8f2e27f 100644
--- a/src/font.h
+++ b/src/font.h
@@ -17,7 +17,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef EMACS_FONT_H
 #define EMACS_FONT_H
diff --git a/src/fontset.c b/src/fontset.c
index 7401806..35586ad 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -22,7 +22,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <stdio.h>
diff --git a/src/fontset.h b/src/fontset.h
index 8bf9f75..cd6709d 100644
--- a/src/fontset.h
+++ b/src/fontset.h
@@ -21,7 +21,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef EMACS_FONTSET_H
 #define EMACS_FONTSET_H
diff --git a/src/frame.c b/src/frame.c
index 6e0c51b..39e5cc9 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
@@ -1913,7 +1913,7 @@ delete_frame (Lisp_Object frame, Lisp_Object force)
 
       /* Look for another visible frame on the same terminal.
         Do not call next_frame here because it may loop forever.
-        See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=15025.  */
+        See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=15025.  */
       FOR_EACH_FRAME (tail, frame1)
        if (!EQ (frame, frame1)
            && (FRAME_TERMINAL (XFRAME (frame))
diff --git a/src/frame.h b/src/frame.h
index 4b7e448..d1c21da 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef EMACS_FRAME_H
 #define EMACS_FRAME_H
diff --git a/src/fringe.c b/src/fringe.c
index 5d3108a..087ef33 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <stdio.h>
diff --git a/src/ftcrfont.c b/src/ftcrfont.c
index 9b592e6..ad68ce8 100644
--- a/src/ftcrfont.c
+++ b/src/ftcrfont.c
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 #include <config.h>
diff --git a/src/ftfont.c b/src/ftfont.c
index 5600bde..35f5923 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -17,7 +17,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <stdio.h>
diff --git a/src/ftfont.h b/src/ftfont.h
index 90abb45..4201b2c 100644
--- a/src/ftfont.h
+++ b/src/ftfont.h
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 #ifndef EMACS_FTFONT_H
diff --git a/src/ftxfont.c b/src/ftxfont.c
index 8c829bb..3b27da6 100644
--- a/src/ftxfont.c
+++ b/src/ftxfont.c
@@ -17,7 +17,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <stdio.h>
diff --git a/src/getpagesize.h b/src/getpagesize.h
index 75b25b8..9519730 100644
--- a/src/getpagesize.h
+++ b/src/getpagesize.h
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef HAVE_GETPAGESIZE
 
diff --git a/src/gfilenotify.c b/src/gfilenotify.c
index fa4854c..13a3eae 100644
--- a/src/gfilenotify.c
+++ b/src/gfilenotify.c
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/src/gmalloc.c b/src/gmalloc.c
index baaff58..2bda95e 100644
--- a/src/gmalloc.c
+++ b/src/gmalloc.c
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
GNU
 General Public License for more details.
 
 You should have received a copy of the GNU General Public
-License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+License along with this library.  If not, see <https://www.gnu.org/licenses/>.
 
    The author may be reached (Email) at the address address@hidden,
    or (US mail) as Mike Haertel c/o Free Software Foundation.  */
@@ -308,7 +308,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the GNU
 General Public License for more details.
 
 You should have received a copy of the GNU General Public
-License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+License along with this library.  If not, see <https://www.gnu.org/licenses/>.
 
    The author may be reached (Email) at the address address@hidden,
    or (US mail) as Mike Haertel c/o Free Software Foundation.  */
@@ -965,7 +965,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the GNU
 General Public License for more details.
 
 You should have received a copy of the GNU General Public
-License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+License along with this library.  If not, see <https://www.gnu.org/licenses/>.
 
    The author may be reached (Email) at the address address@hidden,
    or (US mail) as Mike Haertel c/o Free Software Foundation.  */
@@ -1275,7 +1275,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the GNU
 General Public License for more details.
 
 You should have received a copy of the GNU General Public
-License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+License along with this library.  If not, see <https://www.gnu.org/licenses/>.
 
    The author may be reached (Email) at the address address@hidden,
    or (US mail) as Mike Haertel c/o Free Software Foundation.  */
@@ -1445,7 +1445,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the GNU
 General Public License for more details.
 
 You should have received a copy of the GNU General Public
-License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+License along with this library.  If not, see <https://www.gnu.org/licenses/>.
 
    The author may be reached (Email) at the address address@hidden,
    or (US mail) as Mike Haertel c/o Free Software Foundation.  */
@@ -1483,7 +1483,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with the GNU C Library.  If not, see <http://www.gnu.org/licenses/>.  */
+along with the GNU C Library.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* uClibc defines __GNU_LIBRARY__, but it is not completely
    compatible.  */
@@ -1530,7 +1530,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the GNU
 General Public License for more details.
 
 You should have received a copy of the GNU General Public
-License along with this library.  If not, see <http://www.gnu.org/licenses/>.  
*/
+License along with this library.  If not, see <https://www.gnu.org/licenses/>. 
 */
 
 void *
 aligned_alloc (size_t alignment, size_t size)
@@ -1662,7 +1662,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the GNU
 General Public License for more details.
 
 You should have received a copy of the GNU General Public
-License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+License along with this library.  If not, see <https://www.gnu.org/licenses/>.
 
    The author may be reached (Email) at the address address@hidden,
    or (US mail) as Mike Haertel c/o Free Software Foundation.  */
@@ -1847,7 +1847,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the GNU
 General Public License for more details.
 
 You should have received a copy of the GNU General Public
-License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+License along with this library.  If not, see <https://www.gnu.org/licenses/>.
 
    The author may be reached (Email) at the address address@hidden,
    or (US mail) as Mike Haertel c/o Free Software Foundation.  */
diff --git a/src/gnutls.c b/src/gnutls.c
index 188f995..d7a1399 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <errno.h>
@@ -554,7 +554,7 @@ emacs_gnutls_nonblock_errno (gnutls_transport_ptr_t ptr)
     {
 #  ifdef _AIX
       /* This is taken from the GnuTLS system_errno function circa 2016;
-        see <http://savannah.gnu.org/support/?107464>.  */
+        see <https://savannah.gnu.org/support/?107464>.  */
     case 0:
       errno = EAGAIN;
       /* Fall through.  */
@@ -1355,7 +1355,7 @@ gnutls_verify_boot (Lisp_Object proc, Lisp_Object 
proplist)
   c_hostname = SSDATA (hostname);
 
   /* Now verify the peer, following
-     
http://www.gnu.org/software/gnutls/manual/html_node/Verifying-peer_0027s-certificate.html.
+     
https://www.gnu.org/software/gnutls/manual/html_node/Verifying-peer_0027s-certificate.html.
      The peer should present at least one certificate in the chain; do a
      check of the certificate's hostname with
      gnutls_x509_crt_check_hostname against :hostname.  */
diff --git a/src/gnutls.h b/src/gnutls.h
index 9323cd1..00fa55b 100644
--- a/src/gnutls.h
+++ b/src/gnutls.h
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef EMACS_GNUTLS_DEFINED
 #define EMACS_GNUTLS_DEFINED
diff --git a/src/gtkutil.c b/src/gtkutil.c
index a2e322b..0203a5d 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/src/gtkutil.h b/src/gtkutil.h
index f0f2981..f71f4bb 100644
--- a/src/gtkutil.h
+++ b/src/gtkutil.h
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef GTKUTIL_H
 #define GTKUTIL_H
diff --git a/src/image.c b/src/image.c
index 7f5cf1a..3dac708 100644
--- a/src/image.c
+++ b/src/image.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
@@ -7148,7 +7148,7 @@ tiff_size_of_memory (thandle_t data)
 
 /* GCC 3.x on x86 Windows targets has a bug that triggers an internal
    compiler error compiling tiff_handler, see Bugzilla bug #17406
-   (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=17406).  Declaring
+   (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=17406).  Declaring
    this function as external works around that problem.  */
 # if defined (__MINGW32__) && __GNUC__ == 3
 #  define MINGW_STATIC
diff --git a/src/indent.c b/src/indent.c
index d76ac02..26507b5 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <stdio.h>
diff --git a/src/indent.h b/src/indent.h
index 42ae126..27a3c58 100644
--- a/src/indent.h
+++ b/src/indent.h
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef EMACS_INDENT_H
 #define EMACS_INDENT_H
diff --git a/src/inotify.c b/src/inotify.c
index 3d5d3d2..c0fc1db 100644
--- a/src/inotify.c
+++ b/src/inotify.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/src/insdel.c b/src/insdel.c
index 0a2e07a..5dfc628 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 #include <config.h>
diff --git a/src/intervals.c b/src/intervals.c
index e65c229..e711212 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 /* NOTES:
diff --git a/src/intervals.h b/src/intervals.h
index 9140e0c..7dec6e5 100644
--- a/src/intervals.h
+++ b/src/intervals.h
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef EMACS_INTERVALS_H
 #define EMACS_INTERVALS_H
diff --git a/src/keyboard.c b/src/keyboard.c
index 97069a2..4db50be 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/src/keyboard.h b/src/keyboard.h
index 2219c01..a2a5f8f 100644
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef EMACS_KEYBOARD_H
 #define EMACS_KEYBOARD_H
diff --git a/src/keymap.c b/src/keymap.c
index db9aa7c..ccf8ce7 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Old BUGS:
    - [M-C-a] != [?\M-\C-a]
diff --git a/src/keymap.h b/src/keymap.h
index af0affb..2a1945a 100644
--- a/src/keymap.h
+++ b/src/keymap.h
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef KEYMAP_H
 #define KEYMAP_H
diff --git a/src/kqueue.c b/src/kqueue.c
index 30922ef..221b003 100644
--- a/src/kqueue.c
+++ b/src/kqueue.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/src/lastfile.c b/src/lastfile.c
index f146602..2901f14 100644
--- a/src/lastfile.c
+++ b/src/lastfile.c
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 /* How this works:
diff --git a/src/lcms.c b/src/lcms.c
new file mode 100644
index 0000000..49af402
--- /dev/null
+++ b/src/lcms.c
@@ -0,0 +1,268 @@
+/* Interface to Little CMS
+   Copyright (C) 2017 Free Software Foundation, Inc.
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#ifdef HAVE_LCMS2
+
+#include <lcms2.h>
+#include <math.h>
+
+#include "lisp.h"
+
+#ifdef WINDOWSNT
+# include <windows.h>
+# include "w32.h"
+
+DEF_DLL_FN (cmsFloat64Number, cmsCIE2000DeltaE,
+           (const cmsCIELab* Lab1, const cmsCIELab* Lab2, cmsFloat64Number Kl,
+            cmsFloat64Number Kc, cmsFloat64Number Kh));
+DEF_DLL_FN (cmsHANDLE, cmsCIECAM02Init,
+           (cmsContext ContextID, const cmsViewingConditions* pVC));
+DEF_DLL_FN (void, cmsCIECAM02Forward,
+           (cmsHANDLE hModel, const cmsCIEXYZ* pIn, cmsJCh* pOut));
+DEF_DLL_FN (void, cmsCIECAM02Done, (cmsHANDLE hModel));
+
+static bool lcms_initialized;
+
+static bool
+init_lcms_functions (void)
+{
+  HMODULE library = w32_delayed_load (Qlcms2);
+
+  if (!library)
+    return false;
+
+  LOAD_DLL_FN (library, cmsCIE2000DeltaE);
+  LOAD_DLL_FN (library, cmsCIECAM02Init);
+  LOAD_DLL_FN (library, cmsCIECAM02Forward);
+  LOAD_DLL_FN (library, cmsCIECAM02Done);
+  return true;
+}
+
+# undef cmsCIE2000DeltaE
+# undef cmsCIECAM02Init
+# undef cmsCIECAM02Forward
+# undef cmsCIECAM02Done
+
+# define cmsCIE2000DeltaE   fn_cmsCIE2000DeltaE
+# define cmsCIECAM02Init    fn_cmsCIECAM02Init
+# define cmsCIECAM02Forward fn_cmsCIECAM02Forward
+# define cmsCIECAM02Done    fn_cmsCIECAM02Done
+
+#endif /* WINDOWSNT */
+
+static bool
+parse_lab_list (Lisp_Object lab_list, cmsCIELab *color)
+{
+#define PARSE_LAB_LIST_FIELD(field)                                    \
+  if (CONSP (lab_list) && NUMBERP (XCAR (lab_list)))                   \
+    {                                                                  \
+      color->field = XFLOATINT (XCAR (lab_list));                      \
+      lab_list = XCDR (lab_list);                                      \
+    }                                                                  \
+  else                                                                 \
+    return false;
+
+  PARSE_LAB_LIST_FIELD (L);
+  PARSE_LAB_LIST_FIELD (a);
+  PARSE_LAB_LIST_FIELD (b);
+
+  return true;
+}
+
+/* http://www.ece.rochester.edu/~gsharma/ciede2000/ciede2000noteCRNA.pdf> */
+
+DEFUN ("lcms-cie-de2000", Flcms_cie_de2000, Slcms_cie_de2000, 2, 5, 0,
+       doc: /* Compute CIEDE2000 metric distance between COLOR1 and COLOR2.
+Each color is a list of L*a*b* coordinates, where the L* channel ranges from
+0 to 100, and the a* and b* channels range from -128 to 128.
+Optional arguments KL, KC, KH are weighting parameters for lightness,
+chroma, and hue, respectively. The parameters each default to 1. */)
+  (Lisp_Object color1, Lisp_Object color2,
+   Lisp_Object kL, Lisp_Object kC, Lisp_Object kH)
+{
+  cmsCIELab Lab1, Lab2;
+  cmsFloat64Number Kl, Kc, Kh;
+
+#ifdef WINDOWSNT
+  if (!lcms_initialized)
+    lcms_initialized = init_lcms_functions ();
+  if (!lcms_initialized)
+    {
+      message1 ("lcms2 library not found");
+      return Qnil;
+    }
+#endif
+
+  if (!(CONSP (color1) && parse_lab_list (color1, &Lab1)))
+    signal_error ("Invalid color", color1);
+  if (!(CONSP (color2) && parse_lab_list (color2, &Lab2)))
+    signal_error ("Invalid color", color1);
+  if (NILP (kL))
+    Kl = 1.0f;
+  else if (!(NUMBERP (kL) && (Kl = XFLOATINT(kL))))
+    wrong_type_argument(Qnumberp, kL);
+  if (NILP (kC))
+    Kc = 1.0f;
+  else if (!(NUMBERP (kC) && (Kc = XFLOATINT(kC))))
+    wrong_type_argument(Qnumberp, kC);
+  if (NILP (kL))
+    Kh = 1.0f;
+  else if (!(NUMBERP (kH) && (Kh = XFLOATINT(kH))))
+    wrong_type_argument(Qnumberp, kH);
+
+  return make_float (cmsCIE2000DeltaE (&Lab1, &Lab2, Kl, Kc, Kh));
+}
+
+/* FIXME: code duplication */
+
+static bool
+parse_xyz_list (Lisp_Object xyz_list, cmsCIEXYZ *color)
+{
+#define PARSE_XYZ_LIST_FIELD(field)                                    \
+  if (CONSP (xyz_list) && NUMBERP (XCAR (xyz_list)))                   \
+    {                                                                  \
+      color->field = 100.0 * XFLOATINT (XCAR (xyz_list));              \
+      xyz_list = XCDR (xyz_list);                                      \
+    }                                                                  \
+  else                                                                 \
+    return false;
+
+  PARSE_XYZ_LIST_FIELD (X);
+  PARSE_XYZ_LIST_FIELD (Y);
+  PARSE_XYZ_LIST_FIELD (Z);
+
+  return true;
+}
+
+DEFUN ("lcms-cam02-ucs", Flcms_cam02_ucs, Slcms_cam02_ucs, 2, 3, 0,
+       doc: /* Compute CAM02-UCS metric distance between COLOR1 and COLOR2.
+Each color is a list of XYZ coordinates, with Y scaled to unity.
+Optional argument is the XYZ white point, which defaults to illuminant D65. */)
+  (Lisp_Object color1, Lisp_Object color2, Lisp_Object whitepoint)
+{
+  cmsViewingConditions vc;
+  cmsJCh jch1, jch2;
+  cmsHANDLE h1, h2;
+  cmsCIEXYZ xyz1, xyz2, xyzw;
+  double Jp1, ap1, bp1, Jp2, ap2, bp2;
+  double Mp1, Mp2, FL, k, k4;
+
+#ifdef WINDOWSNT
+  if (!lcms_initialized)
+    lcms_initialized = init_lcms_functions ();
+  if (!lcms_initialized)
+    {
+      message1 ("lcms2 library not found");
+      return Qnil;
+    }
+#endif
+
+  if (!(CONSP (color1) && parse_xyz_list (color1, &xyz1)))
+    signal_error ("Invalid color", color1);
+  if (!(CONSP (color2) && parse_xyz_list (color2, &xyz2)))
+    signal_error ("Invalid color", color1);
+  if (NILP (whitepoint))
+    {
+      xyzw.X = 95.047;
+      xyzw.Y = 100.0;
+      xyzw.Z = 108.883;
+    }
+  else if (!(CONSP (whitepoint) && parse_xyz_list(whitepoint, &xyzw)))
+    signal_error("Invalid white point", whitepoint);
+
+  vc.whitePoint.X = xyzw.X;
+  vc.whitePoint.Y = xyzw.Y;
+  vc.whitePoint.Z = xyzw.Z;
+  vc.Yb = 20;
+  vc.La = 100;
+  vc.surround = AVG_SURROUND;
+  vc.D_value = 1.0;
+
+  h1 = cmsCIECAM02Init (0, &vc);
+  h2 = cmsCIECAM02Init (0, &vc);
+  cmsCIECAM02Forward (h1, &xyz1, &jch1);
+  cmsCIECAM02Forward (h2, &xyz2, &jch2);
+  cmsCIECAM02Done (h1);
+  cmsCIECAM02Done (h2);
+
+  /* Now have colors in JCh, need to calculate J'a'b'
+
+     M = C * F_L^0.25
+     J' = 1.7 J / (1 + 0.007 J)
+     M' = 43.86 ln(1 + 0.0228 M)
+     a' = M' cos(h)
+     b' = M' sin(h)
+
+     where
+
+     F_L = 0.2 k^4 (5 L_A) + 0.1 (1 - k^4)^2 (5 L_A)^(1/3),
+     k = 1/(5 L_A + 1)
+  */
+  k = 1.0 / (1.0 + (5.0 * vc.La));
+  k4 = k * k * k * k;
+  FL = vc.La * k4 + 0.1 * (1 - k4) * (1 - k4) * cbrt (5.0 * vc.La);
+  Mp1 = 43.86 * log (1.0 + 0.0228 * (jch1.C * sqrt (sqrt (FL))));
+  Mp2 = 43.86 * log (1.0 + 0.0228 * (jch2.C * sqrt (sqrt (FL))));
+  Jp1 = 1.7 * jch1.J / (1.0 + (0.007 * jch1.J));
+  Jp2 = 1.7 * jch2.J / (1.0 + (0.007 * jch2.J));
+  ap1 = Mp1 * cos (jch1.h);
+  ap2 = Mp2 * cos (jch2.h);
+  bp1 = Mp1 * sin (jch1.h);
+  bp2 = Mp2 * sin (jch2.h);
+
+  return make_float (sqrt ((Jp2 - Jp1) * (Jp2 - Jp1) +
+                           (ap2 - ap1) * (ap2 - ap1) +
+                           (bp2 - bp1) * (bp2 - bp1)));
+}
+
+DEFUN ("lcms2-available-p", Flcms2_available_p, Slcms2_available_p, 0, 0, 0,
+       doc: /* Return t if lcms2 color calculations are available in this 
instance of Emacs.  */)
+     (void)
+{
+#ifdef WINDOWSNT
+  Lisp_Object found = Fassq (Qlcms2, Vlibrary_cache);
+  if (CONSP (found))
+    return XCDR (found);
+  else
+    {
+      Lisp_Object status;
+      lcms_initialized = init_lcms_functions ();
+      status = lcms_initialized ? Qt : Qnil;
+      Vlibrary_cache = Fcons (Fcons (Qlcms2, status), Vlibrary_cache);
+      return status;
+    }
+#else  /* !WINDOWSNT */
+  return Qt;
+#endif
+}
+
+
+/* Initialization */
+void
+syms_of_lcms2 (void)
+{
+  defsubr (&Slcms_cie_de2000);
+  defsubr (&Slcms_cam02_ucs);
+  defsubr (&Slcms2_available_p);
+
+  Fprovide (intern_c_string ("lcms2"), Qnil);
+}
+
+#endif /* HAVE_LCMS2 */
diff --git a/src/lisp.h b/src/lisp.h
index 81f8d6a..c503082 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef EMACS_LISP_H
 #define EMACS_LISP_H
@@ -94,9 +94,17 @@ typedef long long int EMACS_INT;
 typedef unsigned long long int EMACS_UINT;
 enum { EMACS_INT_WIDTH = LLONG_WIDTH, EMACS_UINT_WIDTH = ULLONG_WIDTH };
 #  define EMACS_INT_MAX LLONG_MAX
-#  ifdef __MINGW32__
+/* MinGW supports %lld only if __USE_MINGW_ANSI_STDIO is non-zero,
+   which is arranged by config.h, and (for mingw.org) if GCC is 6.0 or
+   later and the runtime version is 5.0.0 or later.  Otherwise,
+   printf-like functions are declared with __ms_printf__ attribute,
+   which will cause a warning for %lld etc.  */
+#  if defined __MINGW32__                                              \
+  && (!defined __USE_MINGW_ANSI_STDIO                                  \
+      || (!defined MINGW_W64                                           \
+         && !(GNUC_PREREQ (6, 0, 0) && __MINGW32_MAJOR_VERSION >= 5)))
 #   define pI "I64"
-#  else
+#  else         /* ! MinGW */
 #   define pI "ll"
 #  endif
 # else
@@ -4396,6 +4404,11 @@ extern void syms_of_xml (void);
 extern void xml_cleanup_parser (void);
 #endif
 
+#ifdef HAVE_LCMS2
+/* Defined in lcms.c.  */
+extern void syms_of_lcms2 (void);
+#endif
+
 #ifdef HAVE_ZLIB
 /* Defined in decompress.c.  */
 extern void syms_of_decompress (void);
diff --git a/src/lread.c b/src/lread.c
index dbaadce..6bc93b1 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Tell globals.h to define tables needed by init_obarray.  */
 #define DEFINE_SYMBOLS
diff --git a/src/macfont.h b/src/macfont.h
index 909336c..5ac604b 100644
--- a/src/macfont.h
+++ b/src/macfont.h
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 Original author: YAMAMOTO Mitsuharu
 */
diff --git a/src/macfont.m b/src/macfont.m
index 5989135..9787950 100644
--- a/src/macfont.m
+++ b/src/macfont.m
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 Original author: YAMAMOTO Mitsuharu
 */
diff --git a/src/macros.c b/src/macros.c
index f0ffda3..b32d730 100644
--- a/src/macros.c
+++ b/src/macros.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 #include <config.h>
diff --git a/src/macros.h b/src/macros.h
index 31aece4..dde3eb0 100644
--- a/src/macros.h
+++ b/src/macros.h
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef EMACS_MACROS_H
 #define EMACS_MACROS_H
diff --git a/src/marker.c b/src/marker.c
index f0c357f..2f7e649 100644
--- a/src/marker.c
+++ b/src/marker.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 #include <config.h>
diff --git a/src/menu.c b/src/menu.c
index 99a2ce8..d569b4b 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <stdio.h>
diff --git a/src/menu.h b/src/menu.h
index 2bb79ee..1469cc8 100644
--- a/src/menu.h
+++ b/src/menu.h
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef MENU_H
 #define MENU_H
diff --git a/src/minibuf.c b/src/minibuf.c
index 0101529..a2f3324 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 #include <config.h>
diff --git a/src/nsfns.m b/src/nsfns.m
index b00441e..ba36362 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /*
 Originally by Carl Edman
diff --git a/src/nsfont.m b/src/nsfont.m
index 1bfc3df..bcddd72 100644
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 Author: Adrian Robert (address@hidden)
 */
@@ -301,7 +301,7 @@ ns_charset_covers(NSCharacterSet *set1, NSCharacterSet 
*set2, float pct)
     int i, off = 0, tot = 0;
 
     /* Work around what appears to be a GNUstep bug.
-       See <http://bugs.gnu.org/11853>.  */
+       See <https://bugs.gnu.org/11853>.  */
     if (! (bytes1 && bytes2))
       return NO;
 
diff --git a/src/nsgui.h b/src/nsgui.h
index a06eecf..e20f3e3 100644
--- a/src/nsgui.h
+++ b/src/nsgui.h
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef __NSGUI_H__
 #define __NSGUI_H__
diff --git a/src/nsimage.m b/src/nsimage.m
index ea2f1ec..9d45b06 100644
--- a/src/nsimage.m
+++ b/src/nsimage.m
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /*
 Originally by Carl Edman
diff --git a/src/nsmenu.m b/src/nsmenu.m
index 93e0670..6ef7b60 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /*
 By Adrian Robert, based on code from original nsmenu.m (Carl Edman,
diff --git a/src/nsselect.m b/src/nsselect.m
index 8b38dae..067c778 100644
--- a/src/nsselect.m
+++ b/src/nsselect.m
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /*
 Originally by Carl Edman
diff --git a/src/nsterm.h b/src/nsterm.h
index 65b7a03..de96e0d 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 #include "dispextern.h"
diff --git a/src/nsterm.m b/src/nsterm.m
index 001e457..2751533 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /*
 Originally by Carl Edman
@@ -6076,7 +6076,7 @@ not_in_argv (NSString *arg)
               /*  GNUstep uses incompatible keycodes, even for those that are
                   supposed to be hardware independent.  Just check for delete.
                   Keypad delete does not have keysym 0xFFFF.
-                  See http://savannah.gnu.org/bugs/?25395
+                  See https://savannah.gnu.org/bugs/?25395
               */
               || (fnKeysym == 0xFFFF && code == 127)
 #endif
diff --git a/src/print.c b/src/print.c
index 12edf01..f280616 100644
--- a/src/print.c
+++ b/src/print.c
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 #include <config.h>
diff --git a/src/process.c b/src/process.c
index c45a3f6..2733fa3 100644
--- a/src/process.c
+++ b/src/process.c
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 #include <config.h>
@@ -142,7 +142,7 @@ extern int sys_select (int, fd_set *, fd_set *, fd_set *,
 #endif
 
 /* Work around GCC 4.3.0 bug with strict overflow checking; see
-   <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52904>.
+   <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52904>.
    This bug appears to be fixed in GCC 5.1, so don't work around it there.  */
 #if GNUC_PREREQ (4, 3, 0) && ! GNUC_PREREQ (5, 1, 0)
 # pragma GCC diagnostic ignored "-Wstrict-overflow"
@@ -7102,6 +7102,10 @@ deliver_child_signal (int sig)
 static Lisp_Object
 exec_sentinel_error_handler (Lisp_Object error_val)
 {
+  /* Make sure error_val is a cons cell, as all the rest of error
+     handling expects that, and will barf otherwise.  */
+  if (!CONSP (error_val))
+    error_val = Fcons (Qerror, error_val);
   cmd_error_internal (error_val, "error in process sentinel: ");
   Vinhibit_quit = Qt;
   update_echo_area ();
diff --git a/src/process.h b/src/process.h
index 2c174cc..5a044f6 100644
--- a/src/process.h
+++ b/src/process.h
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef EMACS_PROCESS_H
 #define EMACS_PROCESS_H
diff --git a/src/profiler.c b/src/profiler.c
index 6dc0d8c..d9d7d0b 100644
--- a/src/profiler.c
+++ b/src/profiler.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include "lisp.h"
diff --git a/src/puresize.h b/src/puresize.h
index b90b697..0824437 100644
--- a/src/puresize.h
+++ b/src/puresize.h
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef EMACS_PURESIZE_H
 #define EMACS_PURESIZE_H
diff --git a/src/ralloc.c b/src/ralloc.c
index 8a3d2b7..59a15e0 100644
--- a/src/ralloc.c
+++ b/src/ralloc.c
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* NOTES:
 
diff --git a/src/regex.c b/src/regex.c
index 0dbb473..330f2f7 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -15,7 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* TODO:
    - structure the opcode space into opcode+flag.
diff --git a/src/regex.h b/src/regex.h
index 5e3a797..9fa8356 100644
--- a/src/regex.h
+++ b/src/regex.h
@@ -15,7 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef _REGEX_H
 #define _REGEX_H 1
diff --git a/src/region-cache.c b/src/region-cache.c
index 36c8759..a00b28e 100644
--- a/src/region-cache.c
+++ b/src/region-cache.c
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 #include <config.h>
diff --git a/src/region-cache.h b/src/region-cache.h
index 6327e2d..483ee36 100644
--- a/src/region-cache.h
+++ b/src/region-cache.h
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef EMACS_REGION_CACHE_H
 #define EMACS_REGION_CACHE_H
diff --git a/src/scroll.c b/src/scroll.c
index 482a026..7004dcd 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 #include <config.h>
diff --git a/src/search.c b/src/search.c
index 19e789d..0cb1ec4 100644
--- a/src/search.c
+++ b/src/search.c
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 #include <config.h>
diff --git a/src/sheap.c b/src/sheap.c
index f7028b0..09c1342 100644
--- a/src/sheap.c
+++ b/src/sheap.c
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/src/sheap.h b/src/sheap.h
index 023db8c..f18eb2f 100644
--- a/src/sheap.h
+++ b/src/sheap.h
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <stddef.h>
 #include "lisp.h"
diff --git a/src/sound.c b/src/sound.c
index 75c27a9..7a7f03d 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Gerd Moellmann <address@hidden>.  Tested with Luigi's
    driver on FreeBSD 2.2.7 with a SoundBlaster 16.  */
diff --git a/src/syntax.c b/src/syntax.c
index dcaca22..80603b4 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 #include <config.h>
diff --git a/src/syntax.h b/src/syntax.h
index f0bb956..2a7ba54 100644
--- a/src/syntax.h
+++ b/src/syntax.h
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef EMACS_SYNTAX_H
 #define EMACS_SYNTAX_H
diff --git a/src/sysdep.c b/src/sysdep.c
index f5050e6..1e6e0d0 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
@@ -2689,7 +2689,7 @@ renameat_noreplace (int srcfd, char const *src, int 
dstfd, char const *dst)
 {
 #if defined SYS_renameat2 && defined RENAME_NOREPLACE
   return syscall (SYS_renameat2, srcfd, src, dstfd, dst, RENAME_NOREPLACE);
-#elif defined RENAME_NOREPLACE /* Cygwin >= 2.9.0. */
+#elif defined CYGWIN && defined RENAME_NOREPLACE
   return renameat2 (srcfd, src, dstfd, dst, RENAME_NOREPLACE);
 #elif defined RENAME_EXCL
   return renameatx_np (srcfd, src, dstfd, dst, RENAME_EXCL);
diff --git a/src/sysselect.h b/src/sysselect.h
index 2ddea66..8295aeb 100644
--- a/src/sysselect.h
+++ b/src/sysselect.h
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef SYSSELECT_H
 #define SYSSELECT_H 1
diff --git a/src/syssignal.h b/src/syssignal.h
index 8b815a2..61e1c5f 100644
--- a/src/syssignal.h
+++ b/src/syssignal.h
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef EMACS_SYSSIGNAL_H
 #define EMACS_SYSSIGNAL_H
diff --git a/src/sysstdio.h b/src/sysstdio.h
index 7fbcefc..87d62af 100644
--- a/src/sysstdio.h
+++ b/src/sysstdio.h
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef EMACS_SYSSTDIO_H
 #define EMACS_SYSSTDIO_H
diff --git a/src/systhread.c b/src/systhread.c
index aee12a9..ee89a1e 100644
--- a/src/systhread.c
+++ b/src/systhread.c
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <setjmp.h>
diff --git a/src/systhread.h b/src/systhread.h
index c7999c0..443dc55 100644
--- a/src/systhread.h
+++ b/src/systhread.h
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef SYSTHREAD_H
 #define SYSTHREAD_H
diff --git a/src/systime.h b/src/systime.h
index d79eb21..f9f1db3 100644
--- a/src/systime.h
+++ b/src/systime.h
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef EMACS_SYSTIME_H
 #define EMACS_SYSTIME_H
diff --git a/src/systty.h b/src/systty.h
index 9f2c61e..a5ffc7b 100644
--- a/src/systty.h
+++ b/src/systty.h
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef EMACS_SYSTTY_H
 #define EMACS_SYSTTY_H
diff --git a/src/syswait.h b/src/syswait.h
index 055562a..939c16f 100644
--- a/src/syswait.h
+++ b/src/syswait.h
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Define the structure that the wait system call stores.
    On many systems, there is a structure defined for this.
diff --git a/src/term.c b/src/term.c
index c1d7b04..a2ae8c2 100644
--- a/src/term.c
+++ b/src/term.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* New redisplay, TTY faces by Gerd Moellmann <address@hidden>.  */
 
diff --git a/src/termcap.c b/src/termcap.c
index a0e558d..6942c33 100644
--- a/src/termcap.c
+++ b/src/termcap.c
@@ -13,7 +13,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Emacs config.h may rename various library functions such as malloc.  */
 #include <config.h>
diff --git a/src/termchar.h b/src/termchar.h
index cf061a9..3e1695d 100644
--- a/src/termchar.h
+++ b/src/termchar.h
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef EMACS_TERMCHAR_H
 #define EMACS_TERMCHAR_H
diff --git a/src/termhooks.h b/src/termhooks.h
index 14ec397..97c128b 100644
--- a/src/termhooks.h
+++ b/src/termhooks.h
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef EMACS_TERMHOOKS_H
 #define EMACS_TERMHOOKS_H
diff --git a/src/terminal.c b/src/terminal.c
index 367f2ac..0edaad6 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/src/terminfo.c b/src/terminfo.c
index 1a0c013..046d00a 100644
--- a/src/terminfo.c
+++ b/src/terminfo.c
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include "tparam.h"
diff --git a/src/termopts.h b/src/termopts.h
index a78c5f0..e1c5f2b 100644
--- a/src/termopts.h
+++ b/src/termopts.h
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef EMACS_TERMOPTS_H
 #define EMACS_TERMOPTS_H
diff --git a/src/textprop.c b/src/textprop.c
index 225ff28..513780c 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/src/thread.c b/src/thread.c
index 1f7ced3..42d7791 100644
--- a/src/thread.c
+++ b/src/thread.c
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 #include <config.h>
diff --git a/src/thread.h b/src/thread.h
index 52b16f1..7fce867 100644
--- a/src/thread.h
+++ b/src/thread.h
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef THREAD_H
 #define THREAD_H
diff --git a/src/tparam.c b/src/tparam.c
index 92fa5b1..ff14572 100644
--- a/src/tparam.c
+++ b/src/tparam.c
@@ -13,7 +13,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Emacs config.h may rename various library functions such as malloc.  */
 #include <config.h>
diff --git a/src/tparam.h b/src/tparam.h
index 02136b6..7ae2a10 100644
--- a/src/tparam.h
+++ b/src/tparam.h
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef EMACS_TPARAM_H
 #define EMACS_TPARAM_H
diff --git a/src/undo.c b/src/undo.c
index a4ae40c..d9a5687 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 #include <config.h>
diff --git a/src/unexaix.c b/src/unexaix.c
index 75a79c6..7698af0 100644
--- a/src/unexaix.c
+++ b/src/unexaix.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /*
 In other words, you are welcome to use, share and improve this program.
diff --git a/src/unexcoff.c b/src/unexcoff.c
index 9852c14..1a42c84 100644
--- a/src/unexcoff.c
+++ b/src/unexcoff.c
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 /*
diff --git a/src/unexcw.c b/src/unexcw.c
index 8e5d7e8..55206cc 100644
--- a/src/unexcw.c
+++ b/src/unexcw.c
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include "unexec.h"
diff --git a/src/unexelf.c b/src/unexelf.c
index 5129784..1cdcfeb 100644
--- a/src/unexelf.c
+++ b/src/unexelf.c
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /*
 In other words, you are welcome to use, share and improve this program.
diff --git a/src/unexmacosx.c b/src/unexmacosx.c
index 3b1efa3..7fb5750 100644
--- a/src/unexmacosx.c
+++ b/src/unexmacosx.c
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Contributed by Andrew Choi (address@hidden).  */
 
diff --git a/src/unexw32.c b/src/unexw32.c
index 5259b2a..0c6b483 100644
--- a/src/unexw32.c
+++ b/src/unexw32.c
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /*
    Geoff Voelker (address@hidden)                         8-12-94
@@ -470,6 +470,12 @@ get_section_info (file_data *p_infile)
     }
 }
 
+/* Format to print a DWORD_PTR value.  */
+#ifdef MINGW_W64
+# define pDWP  "16llx"
+#else
+# define pDWP  "08lx"
+#endif
 
 /* The dump routines.  */
 
@@ -490,13 +496,13 @@ copy_executable_and_dump_data (file_data *p_infile,
 #define COPY_CHUNK(message, src, size, verbose)                                
        \
   do {                                                                         
\
     unsigned char *s = (void *)(src);                                          
\
-    unsigned long count = (size);                                              
\
+    DWORD_PTR count = (size);                                          \
     if (verbose)                                                               
\
       {                                                                        
        \
        printf ("%s\n", (message));                                             
\
-       printf ("\t0x%08x Offset in input file.\n", s - p_infile->file_base);   
\
-       printf ("\t0x%08x Offset in output file.\n", dst - 
p_outfile->file_base); \
-       printf ("\t0x%08lx Size in bytes.\n", count);                           
\
+       printf ("\t0x%"pDWP" Offset in input file.\n", (DWORD_PTR)(s - 
p_infile->file_base)); \
+       printf ("\t0x%"pDWP" Offset in output file.\n", (DWORD_PTR)(dst - 
p_outfile->file_base)); \
+       printf ("\t0x%"pDWP" Size in bytes.\n", count);                         
\
       }                                                                        
        \
     memcpy (dst, s, count);                                                    
\
     dst += count;                                                              
\
@@ -505,15 +511,15 @@ copy_executable_and_dump_data (file_data *p_infile,
 #define COPY_PROC_CHUNK(message, src, size, verbose)                           
\
   do {                                                                         
\
     unsigned char *s = (void *)(src);                                          
\
-    unsigned long count = (size);                                              
\
+    DWORD_PTR count = (size);                                          \
     if (verbose)                                                               
\
       {                                                                        
        \
        printf ("%s\n", (message));                                             
\
        printf ("\t0x%p Address in process.\n", s);                             
\
        printf ("\t0x%p Base       output file.\n", p_outfile->file_base); \
-       printf ("\t0x%p Offset  in output file.\n", dst - 
p_outfile->file_base); \
+       printf ("\t0x%"pDWP" Offset  in output file.\n", (DWORD_PTR)(dst - 
p_outfile->file_base)); \
        printf ("\t0x%p Address in output file.\n", dst); \
-       printf ("\t0x%p Size in bytes.\n", count);                              
\
+       printf ("\t0x%"pDWP" Size in bytes.\n", count);                         
\
       }                                                                        
        \
     memcpy (dst, s, count);                                                    
\
     dst += count;                                                              
\
diff --git a/src/vm-limit.c b/src/vm-limit.c
index bb38b44..703238b 100644
--- a/src/vm-limit.c
+++ b/src/vm-limit.c
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <unistd.h> /* for 'environ', on AIX */
diff --git a/src/w32fns.c b/src/w32fns.c
index 6b93afa..a774644 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -10405,6 +10405,7 @@ syms_of_w32fns (void)
   DEFSYM (Qlibxml2, "libxml2");
   DEFSYM (Qserif, "serif");
   DEFSYM (Qzlib, "zlib");
+  DEFSYM (Qlcms2, "lcms2");
 
   Fput (Qundefined_color, Qerror_conditions,
        listn (CONSTYPE_PURE, 2, Qundefined_color, Qerror));
diff --git a/src/w32heap.c b/src/w32heap.c
index cd1324c..510f676 100644
--- a/src/w32heap.c
+++ b/src/w32heap.c
@@ -118,7 +118,7 @@ typedef struct _RTL_HEAP_PARAMETERS {
 #if defined _WIN64 || defined WIDE_EMACS_INT
 # define DUMPED_HEAP_SIZE (21*1024*1024)
 #else
-# define DUMPED_HEAP_SIZE (12*1024*1024)
+# define DUMPED_HEAP_SIZE (13*1024*1024)
 #endif
 
 static unsigned char dumped_data[DUMPED_HEAP_SIZE];
diff --git a/src/w32term.c b/src/w32term.c
index e62ae7e..a7a510b 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -1645,6 +1645,7 @@ w32_setup_relief_color (struct frame *f, struct relief 
*relief, double factor,
   if (w32_alloc_lighter_color (f, &pixel, factor, delta))
     xgcv.foreground = relief->pixel = pixel;
 
+  xgcv.font = NULL;    /* avoid compiler warnings */
   if (relief->gc == 0)
     {
 #if 0 /* TODO: stipple */
@@ -3087,8 +3088,8 @@ parse_button (int message, int xbutton, int * pbutton, 
int * pup)
 static Lisp_Object
 construct_mouse_click (struct input_event *result, W32Msg *msg, struct frame 
*f)
 {
-  int button;
-  int up;
+  int button = 0;
+  int up = 0;
 
   parse_button (msg->msg.message, HIWORD (msg->msg.wParam),
                &button, &up);
@@ -4976,8 +4977,8 @@ w32_read_socket (struct terminal *terminal,
             /* If we decide we want to generate an event to be seen
                by the rest of Emacs, we put it here.  */
            bool tool_bar_p = 0;
-           int button;
-           int up;
+           int button = 0;
+           int up = 0;
 
            f = (x_mouse_grabbed (dpyinfo) ? dpyinfo->last_mouse_frame
                 : x_window_to_frame (dpyinfo, msg.msg.hwnd));
diff --git a/src/widget.c b/src/widget.c
index 585039d..d5f720e 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Emacs 19 face widget ported by Fred Pierresteguy */
 
diff --git a/src/widget.h b/src/widget.h
index 97dd6ab..07cc665 100644
--- a/src/widget.h
+++ b/src/widget.h
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Emacs 19 face widget ported by Fred Pierresteguy */
 
diff --git a/src/widgetprv.h b/src/widgetprv.h
index 309aed7..ac49e8c 100644
--- a/src/widgetprv.h
+++ b/src/widgetprv.h
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Emacs 19 face widget ported by Fred Pierresteguy */
 
diff --git a/src/window.c b/src/window.c
index 18adb62..ba86d73 100644
--- a/src/window.c
+++ b/src/window.c
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/src/window.h b/src/window.h
index e9040f816..df7c23f 100644
--- a/src/window.h
+++ b/src/window.h
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef WINDOW_H_INCLUDED
 #define WINDOW_H_INCLUDED
diff --git a/src/xdisp.c b/src/xdisp.c
index 5e8188c..8ca9037 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* New redisplay written by Gerd Moellmann <address@hidden>.
 
diff --git a/src/xfaces.c b/src/xfaces.c
index 86bb9b0..b309c16 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* New face implementation by Gerd Moellmann <address@hidden>.  */
 
@@ -4088,12 +4088,15 @@ color_distance (XColor *x, XColor *y)
 }
 
 
-DEFUN ("color-distance", Fcolor_distance, Scolor_distance, 2, 3, 0,
+DEFUN ("color-distance", Fcolor_distance, Scolor_distance, 2, 4, 0,
        doc: /* Return an integer distance between COLOR1 and COLOR2 on FRAME.
 COLOR1 and COLOR2 may be either strings containing the color name,
-or lists of the form (RED GREEN BLUE).
-If FRAME is unspecified or nil, the current frame is used.  */)
-  (Lisp_Object color1, Lisp_Object color2, Lisp_Object frame)
+or lists of the form (RED GREEN BLUE), each in the range 0 to 65535 inclusive.
+If FRAME is unspecified or nil, the current frame is used.
+If METRIC is specified, it should be a function that accepts
+two lists of the form (RED GREEN BLUE) aforementioned. */)
+  (Lisp_Object color1, Lisp_Object color2, Lisp_Object frame,
+   Lisp_Object metric)
 {
   struct frame *f = decode_live_frame (frame);
   XColor cdef1, cdef2;
@@ -4107,7 +4110,16 @@ If FRAME is unspecified or nil, the current frame is 
used.  */)
           && defined_color (f, SSDATA (color2), &cdef2, false)))
     signal_error ("Invalid color", color2);
 
-  return make_number (color_distance (&cdef1, &cdef2));
+  if (NILP (metric))
+    return make_number (color_distance (&cdef1, &cdef2));
+  else
+    return call2 (metric,
+                  list3 (make_number (cdef1.red),
+                         make_number (cdef1.green),
+                         make_number (cdef1.blue)),
+                  list3 (make_number (cdef2.red),
+                         make_number (cdef2.green),
+                         make_number (cdef2.blue)));
 }
 
 
diff --git a/src/xfns.c b/src/xfns.c
index 40f06e2..69955fe 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <stdio.h>
diff --git a/src/xfont.c b/src/xfont.c
index 85fccf0..3891c8b 100644
--- a/src/xfont.c
+++ b/src/xfont.c
@@ -17,7 +17,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <stdio.h>
@@ -877,7 +877,7 @@ xfont_close (struct font *font)
      the logically different X connection after the previous display
      connection was closed.  That's why we also check whether font's
      ID matches the one recorded in x_display_info for this display.
-     See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16069.  */
+     See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=16069.  */
   if (xfi->xfont
       && ((xdi = x_display_info_for_display (xfi->display))
          && xfi->x_display_id == xdi->x_id))
diff --git a/src/xftfont.c b/src/xftfont.c
index 137d5ba..ff8a59f 100644
--- a/src/xftfont.c
+++ b/src/xftfont.c
@@ -17,7 +17,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <stdio.h>
diff --git a/src/xgselect.c b/src/xgselect.c
index 26a2d27..885563c 100644
--- a/src/xgselect.c
+++ b/src/xgselect.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/src/xgselect.h b/src/xgselect.h
index 5baf8a8..a4280cc 100644
--- a/src/xgselect.h
+++ b/src/xgselect.h
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef XGSELECT_H
 #define XGSELECT_H
diff --git a/src/xmenu.c b/src/xmenu.c
index 64df151..3935307 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* X pop-up deck-of-cards menu facility for GNU Emacs.
  *
diff --git a/src/xml.c b/src/xml.c
index 7953491..d087a34 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/src/xrdb.c b/src/xrdb.c
index 5611a33..15a0147 100644
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -18,7 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/src/xselect.c b/src/xselect.c
index 2249828..7fbb233 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 /* Rewritten by jwz */
diff --git a/src/xsettings.c b/src/xsettings.c
index 4d56ad1..f73b791 100644
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/src/xsettings.h b/src/xsettings.h
index ba2a310..27717aa 100644
--- a/src/xsettings.h
+++ b/src/xsettings.h
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef XSETTINGS_H
 #define XSETTINGS_H
diff --git a/src/xsmfns.c b/src/xsmfns.c
index d3b4d4d..2cb4f3e 100644
--- a/src/xsmfns.c
+++ b/src/xsmfns.c
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/src/xterm.c b/src/xterm.c
index 0b94933..0b32190 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* New display code by Gerd Moellmann <address@hidden>.  */
 /* Xt features made by Fred Pierresteguy.  */
@@ -8005,7 +8005,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
             {
 #ifdef USE_GTK
               /* This seems to be needed for GTK 2.6 and later, see
-                 http://debbugs.gnu.org/cgi/bugreport.cgi?bug=15398.  */
+                 https://debbugs.gnu.org/cgi/bugreport.cgi?bug=15398.  */
               x_clear_area (f,
                             event->xexpose.x, event->xexpose.y,
                             event->xexpose.width, event->xexpose.height);
@@ -12268,7 +12268,7 @@ static void
 x_setup_pointer_blanking (struct x_display_info *dpyinfo)
 {
   /* FIXME: the brave tester should set EMACS_XFIXES because we're suspecting
-     X server bug, see http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17609.  */
+     X server bug, see https://debbugs.gnu.org/cgi/bugreport.cgi?bug=17609.  */
   if (egetenv ("EMACS_XFIXES") && x_probe_xfixes_extension (dpyinfo->display))
     dpyinfo->toggle_visible_pointer = xfixes_toggle_visible_pointer;
   else
diff --git a/src/xterm.h b/src/xterm.h
index b16d302..6274630 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef XTERM_H
 #define XTERM_H
diff --git a/src/xwidget.c b/src/xwidget.c
index e6de5da..a0c9e03 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/src/xwidget.h b/src/xwidget.h
index d43b401..22a8eb3 100644
--- a/src/xwidget.h
+++ b/src/xwidget.h
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef XWIDGET_H_INCLUDED
 #define XWIDGET_H_INCLUDED
diff --git a/test/Makefile.in b/test/Makefile.in
index e32920f..17ab36f 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ### Commentary:
 
diff --git a/test/README b/test/README
index fca2016..aced1a4 100644
--- a/test/README
+++ b/test/README
@@ -61,4 +61,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/test/data/emacs-module/mod-test.c 
b/test/data/emacs-module/mod-test.c
index 42e1c2b..4193f21 100644
--- a/test/data/emacs-module/mod-test.c
+++ b/test/data/emacs-module/mod-test.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/test/lib-src/emacsclient-tests.el 
b/test/lib-src/emacsclient-tests.el
index beca972..f455da7 100644
--- a/test/lib-src/emacsclient-tests.el
+++ b/test/lib-src/emacsclient-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/abbrev-tests.el b/test/lisp/abbrev-tests.el
index 1ffcd6a..1f1a7fb 100644
--- a/test/lisp/abbrev-tests.el
+++ b/test/lisp/abbrev-tests.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/arc-mode-tests.el b/test/lisp/arc-mode-tests.el
index 8c8465d..63e5579 100644
--- a/test/lisp/arc-mode-tests.el
+++ b/test/lisp/arc-mode-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 (require 'ert)
diff --git a/test/lisp/auth-source-pass-tests.el 
b/test/lisp/auth-source-pass-tests.el
index 689fed3..9b6b568 100644
--- a/test/lisp/auth-source-pass-tests.el
+++ b/test/lisp/auth-source-pass-tests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/auth-source-tests.el b/test/lisp/auth-source-tests.el
index 41bd8c9..07effa7 100644
--- a/test/lisp/auth-source-tests.el
+++ b/test/lisp/auth-source-tests.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/autorevert-tests.el b/test/lisp/autorevert-tests.el
index c6f1033..55dbb34 100644
--- a/test/lisp/autorevert-tests.el
+++ b/test/lisp/autorevert-tests.el
@@ -15,7 +15,7 @@
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see `http://www.gnu.org/licenses/'.
+;; along with this program.  If not, see `https://www.gnu.org/licenses/'.
 
 ;;; Commentary:
 
diff --git a/test/lisp/buff-menu-tests.el b/test/lisp/buff-menu-tests.el
index 21ffb2e..82b34d3 100644
--- a/test/lisp/buff-menu-tests.el
+++ b/test/lisp/buff-menu-tests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -26,7 +26,7 @@
 (require 'ert)
 
 (ert-deftest buff-menu-24962 ()
-  "Test for http://debbugs.gnu.org/24962 ."
+  "Test for https://debbugs.gnu.org/24962 ."
   (let* ((file (make-temp-file "foo"))
          (buf (find-file file)))
     (unwind-protect
diff --git a/test/lisp/calc/calc-tests.el b/test/lisp/calc/calc-tests.el
index e4b4335..727ab04 100644
--- a/test/lisp/calc/calc-tests.el
+++ b/test/lisp/calc/calc-tests.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -87,7 +87,7 @@ An existing calc stack is reused, otherwise a new one is 
created."
                            '(* -100 (var cm var-cm)))))
 
 (ert-deftest test-calc-23889 ()
-  "Test for http://debbugs.gnu.org/23889 and 25652."
+  "Test for https://debbugs.gnu.org/23889 and 25652."
   (skip-unless (>= math-bignum-digit-length 9))
   (dolist (mode '(deg rad))
     (let ((calc-angle-mode mode))
@@ -135,5 +135,5 @@ An existing calc stack is reused, otherwise a new one is 
created."
 ;;; calc-tests.el ends here
 
 ;; Local Variables:
-;; bug-reference-url-format: "http://debbugs.gnu.org/%s";
+;; bug-reference-url-format: "https://debbugs.gnu.org/%s";
 ;; End:
diff --git a/test/lisp/calendar/icalendar-tests.el 
b/test/lisp/calendar/icalendar-tests.el
index 3e09002..80a79db 100644
--- a/test/lisp/calendar/icalendar-tests.el
+++ b/test/lisp/calendar/icalendar-tests.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/calendar/parse-time-tests.el 
b/test/lisp/calendar/parse-time-tests.el
index 26b4e9e..0ad0b36 100644
--- a/test/lisp/calendar/parse-time-tests.el
+++ b/test/lisp/calendar/parse-time-tests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/calendar/todo-mode-tests.el 
b/test/lisp/calendar/todo-mode-tests.el
index 4763d27..66ddbbc 100644
--- a/test/lisp/calendar/todo-mode-tests.el
+++ b/test/lisp/calendar/todo-mode-tests.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/char-fold-tests.el b/test/lisp/char-fold-tests.el
index 00bc3c8..83d6fa7 100644
--- a/test/lisp/char-fold-tests.el
+++ b/test/lisp/char-fold-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/lisp/color-tests.el b/test/lisp/color-tests.el
new file mode 100644
index 0000000..bc942c3
--- /dev/null
+++ b/test/lisp/color-tests.el
@@ -0,0 +1,251 @@
+;;; color-tests.el --- Tests for color.el  -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2017 Free Software Foundation, Inc.
+
+;; Author: Simen Heggestøyl <address@hidden>
+;; Keywords:
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'color)
+(require 'ert)
+(require 'seq)
+
+(defun color-tests--approx-equal (color1 color2)
+  "Return t if COLOR1 and COLOR2 are approximately equal."
+  (seq-every-p
+   (lambda (x) (< (abs x) 0.00001))
+   (cl-mapcar #'- color1 color2)))
+
+(ert-deftest color-tests-name-to-rgb ()
+  (should (equal (color-name-to-rgb "black") '(0.0 0.0 0.0)))
+  (should (equal (color-name-to-rgb "white") '(1.0 1.0 1.0)))
+  (should (equal (color-name-to-rgb "red") '(1.0 0.0 0.0)))
+  (should (equal (color-name-to-rgb "green") '(0.0 1.0 0.0)))
+  (should (equal (color-name-to-rgb "blue") '(0.0 0.0 1.0)))
+  (should (equal (color-name-to-rgb "#000000000000") '(0.0 0.0 0.0)))
+  (should (equal (color-name-to-rgb "#ffffffffffff") '(1.0 1.0 1.0)))
+  (should (equal (color-name-to-rgb "#ffff00000000") '(1.0 0.0 0.0)))
+  (should (equal (color-name-to-rgb "#0000ffff0000") '(0.0 1.0 0.0)))
+  (should (equal (color-name-to-rgb "#00000000ffff") '(0.0 0.0 1.0))))
+
+(ert-deftest color-tests-rgb-to-hex ()
+  (should (equal (color-rgb-to-hex 0 0 0) "#000000000000"))
+  (should (equal (color-rgb-to-hex 0 0 0 2) "#000000"))
+  (should (equal (color-rgb-to-hex 1 0 0) "#ffff00000000"))
+  (should (equal (color-rgb-to-hex 1 0 0 2) "#ff0000"))
+  (should (equal (color-rgb-to-hex 0.1 0.2 0.3) "#199933334ccc"))
+  (should (equal (color-rgb-to-hex 0.1 0.2 0.3 2) "#19334c")))
+
+(ert-deftest color-tests-complement ()
+  (should (equal (color-complement "white") '(0.0 0.0 0.0)))
+  (should (equal (color-complement "#ffffffffffff") '(0.0 0.0 0.0)))
+  (should (equal (color-complement "red") '(0.0 1.0 1.0))))
+
+(ert-deftest color-tests-gradient ()
+  (should-not (color-gradient '(0 0 0) '(255 255 255) 0))
+  (should
+   (equal (color-gradient '(0 0 0) '(255 255 255) 1)
+          '((127.5 127.5 127.5))))
+  (should
+   (equal (color-gradient '(0 0 0) '(255 255 255) 2)
+          '((85.0 85.0 85.0) (170.0 170.0 170.0))))
+  (should
+   (equal
+    (color-gradient '(255 192 203) '(250 128 114) 3)
+    '((253.75 176.0 180.75) (252.5 160.0 158.5) (251.25 144.0 136.25)))))
+
+(ert-deftest color-tests-hsl-to-rgb ()
+  (should (equal (color-hsl-to-rgb 0 0 0) '(0 0 0)))
+  (should (equal (color-hsl-to-rgb 360 0.5 0.5) '(0.75 0.25 0.25)))
+  (should (equal (color-hsl-to-rgb 123 0.2 0.9) '(0.92 0.88 0.88))))
+
+(ert-deftest color-tests-complement-hex ()
+  (should
+   (equal (color-complement-hex "#000000000000") "#ffffffffffff"))
+  (should
+   (equal (color-complement-hex "#ffff00000000") "#0000ffffffff")))
+
+(ert-deftest color-tests-rgb-to-hsv ()
+  (should (equal (color-rgb-to-hsv 0 0 0) '(0.0 0.0 0.0)))
+  (should (equal (color-rgb-to-hsv 1 1 1) '(0.0 0.0 1.0)))
+  (should (equal (color-rgb-to-hsv 1 0 0) '(0.0 1.0 1.0)))
+  (should (equal (color-rgb-to-hsv 0.5 0.3 0.3) '(0.0 0.4 0.5))))
+
+(ert-deftest color-tests-rgb-to-hsl ()
+  (should (equal (color-rgb-to-hsl 0 0 0) '(0.0 0.0 0.0)))
+  (should (equal (color-rgb-to-hsl 1 1 1) '(0.0 0.0 1.0)))
+  (should (equal (color-rgb-to-hsl 1 0 0) '(0.0 1 0.5)))
+  (should (equal (color-rgb-to-hsl 0.5 0.3 0.3) '(0.0 0.25 0.4))))
+
+(ert-deftest color-tests-srgb-to-xyz ()
+  (should (equal (color-srgb-to-xyz 0 0 0) '(0.0 0.0 0.0)))
+  (should
+   (equal (color-srgb-to-xyz 0 0 1) '(0.1804375 0.072175 0.9503041)))
+  (should
+   (color-tests--approx-equal
+    (color-srgb-to-xyz 0.1 0.2 0.3) '(0.0291865 0.031092 0.073738))))
+
+(ert-deftest color-tests-xyz-to-srgb ()
+  (should (equal (color-xyz-to-srgb 0 0 0) '(0.0 0.0 0.0)))
+  (should
+   (color-tests--approx-equal
+    (color-xyz-to-srgb 0.1804375 0.072175 0.9503041) '(0 0 1)))
+  (should
+   (color-tests--approx-equal
+    (color-xyz-to-srgb 0.0291865 0.031092 0.073738) '(0.1 0.2 0.3))))
+
+(ert-deftest color-tests-xyz-to-lab ()
+  (should (equal (color-xyz-to-lab 0 0 0) '(0.0 0.0 0.0)))
+  (should
+   (color-tests--approx-equal
+    (color-xyz-to-lab 0.1804375 0.072175 0.9503041)
+    '(32.2970109 79.1890315 -107.8646674)))
+  (should
+   (color-tests--approx-equal
+    (color-xyz-to-lab 0.1804375 0.072175 0.9503041 '(1 1 1))
+    '(32.2970109 74.3625763 -113.3597823)))
+  (should
+   (color-tests--approx-equal
+    (color-xyz-to-lab 0.0291865 0.031092 0.073738)
+    '(20.4760281 -0.6500752 -18.6340169))))
+
+(ert-deftest color-tests-lab-to-xyz ()
+  (should (equal (color-lab-to-xyz 0 0 0) '(0.0 0.0 0.0)))
+  (should
+   (color-tests--approx-equal
+    (color-lab-to-xyz 32.2970109 79.1890315 -107.8646674)
+    '(0.1804375 0.072175 0.9503041)))
+  (should
+   (color-tests--approx-equal
+    (color-lab-to-xyz 32.2970109 74.3625763 -113.3597823 '(1 1 1))
+    '(0.1804375 0.072175 0.9503041)))
+  (should
+   (color-tests--approx-equal
+    (color-lab-to-xyz 20.4760281 -0.6500752 -18.6340169)
+    '(0.0291865 0.031092 0.073738))))
+
+(ert-deftest color-tests-srgb-to-lab ()
+  (should (equal (color-srgb-to-lab 0 0 0) '(0.0 0.0 0.0)))
+  (should
+   (color-tests--approx-equal
+    (color-srgb-to-lab 0 1 0) '(87.7347223 -86.1808176 83.1770651)))
+  (should
+   (color-tests--approx-equal
+    (color-srgb-to-lab 0.1 0.2 0.3)
+    '(20.4762218 -0.6508996 -18.6340085))))
+
+(ert-deftest color-tests-lab-to-srgb ()
+  (should (equal (color-lab-to-srgb 0 0 0) '(0.0 0.0 0.0)))
+  (should
+   (color-tests--approx-equal
+    (color-lab-to-srgb 87.7347223 -86.1808176 83.1770651) '(0 1 0)))
+  (should
+   (color-tests--approx-equal
+    (color-lab-to-srgb 20.4762218 -0.6508996 -18.6340085)
+    '(0.1 0.2 0.3))))
+
+(ert-deftest color-tests-cie-de2000 ()
+  (should (= (color-cie-de2000 '(0 0 0) '(0 0 0)) 0.0))
+  (should
+   (color-tests--approx-equal
+    (list
+     (color-cie-de2000
+      (color-srgb-to-lab 1 0 0) (color-srgb-to-lab 0 0 1)))
+    '(52.8803934)))
+  (should
+   (color-tests--approx-equal
+    (list
+     (color-cie-de2000
+      (color-srgb-to-lab 0.8 0 0) (color-srgb-to-lab 0.9 0 0)))
+    '(5.3844503))))
+
+(ert-deftest color-tests-clamp ()
+  (should (= (color-clamp 0) 0.0))
+  (should (= (color-clamp -1) 0.0))
+  (should (= (color-clamp 0.5) 0.5))
+  (should (= (color-clamp 1) 1.0))
+  (should (= (color-clamp 1.1) 1.0)))
+
+(ert-deftest color-tests-saturate-hsl ()
+  (should (equal (color-saturate-hsl 360 0.5 0.5 0) '(360 0.5 0.5)))
+  (should (equal (color-saturate-hsl 360 0.5 0.5 -10) '(360 0.4 0.5)))
+  (should
+   (equal (color-saturate-hsl 360 0.5 0.5 -500) '(360 0.0 0.5)))
+  (should (equal (color-saturate-hsl 120 0.5 0.8 5) '(120 0.55 0.8)))
+  (should
+   (equal (color-saturate-hsl 120 0.5 0.8 500) '(120 1.0 0.8))))
+
+(ert-deftest color-tests-saturate-name ()
+  (should (equal (color-saturate-name "black" 100) "#000000000000"))
+  (should (equal (color-saturate-name "white" 100) "#ffffffffffff"))
+  (should (equal (color-saturate-name "red" 0) "#ffff00000000"))
+  (should (equal (color-saturate-name "red" 50) "#ffff00000000")))
+
+(ert-deftest color-tests-desaturate-hsl ()
+  (should (equal (color-desaturate-hsl 360 0.5 0.5 0) '(360 0.5 0.5)))
+  (should
+   (equal (color-desaturate-hsl 360 0.5 0.5 -10) '(360 0.6 0.5)))
+  (should
+   (equal (color-desaturate-hsl 360 0.5 0.5 -500) '(360 1.0 0.5)))
+  (should
+   (equal (color-desaturate-hsl 120 0.5 0.8 5) '(120 0.45 0.8)))
+  (should
+   (equal (color-desaturate-hsl 120 0.5 0.8 500) '(120 0.0 0.8))))
+
+(ert-deftest color-tests-desaturate-name ()
+  (should (equal (color-desaturate-name "black" 100) "#000000000000"))
+  (should (equal (color-desaturate-name "white" 100) "#ffffffffffff"))
+  (should (equal (color-desaturate-name "red" 0) "#ffff00000000")))
+
+(ert-deftest color-tests-lighten-hsl ()
+  (should (equal (color-lighten-hsl 360 0.5 0.5 0) '(360 0.5 0.5)))
+  (should (equal (color-lighten-hsl 360 0.5 0.5 -10) '(360 0.5 0.4)))
+  (should (equal (color-lighten-hsl 360 0.5 0.5 -500) '(360 0.5 0.0)))
+  (should
+   (color-tests--approx-equal
+    (color-lighten-hsl 120 0.5 0.8 5) '(120 0.5 0.85)))
+  (should
+   (equal (color-lighten-hsl 120 0.5 0.8 500) '(120 0.5 1.0))))
+
+(ert-deftest color-tests-lighten-name ()
+  (should (equal (color-lighten-name "black" 100) "#ffffffffffff"))
+  (should (equal (color-lighten-name "white" 100) "#ffffffffffff"))
+  (should (equal (color-lighten-name "red" 0) "#ffff00000000"))
+  (should (equal (color-lighten-name "red" 10) "#ffff33323332")))
+
+(ert-deftest color-tests-darken-hsl ()
+  (should (equal (color-darken-hsl 360 0.5 0.5 0) '(360 0.5 0.5)))
+  (should (equal (color-darken-hsl 360 0.5 0.5 -10) '(360 0.5 0.6)))
+  (should (equal (color-darken-hsl 360 0.5 0.5 -500) '(360 0.5 1.0)))
+  (should (equal (color-darken-hsl 120 0.5 0.8 5) '(120 0.5 0.75)))
+  (should (equal (color-darken-hsl 120 0.5 0.8 500) '(120 0.5 0.0))))
+
+(ert-deftest color-tests-darken-name ()
+  (should (equal (color-darken-name "black" 100) "#000000000000"))
+  (should (equal (color-darken-name "white" 100) "#000000000000"))
+  (should (equal (color-darken-name "red" 0) "#ffff00000000"))
+  (should (equal (color-darken-name "red" 10) "#cccc00000000")))
+
+(provide 'color-tests)
+;;; color-tests.el ends here
diff --git a/test/lisp/comint-tests.el b/test/lisp/comint-tests.el
index 3205c9e..06a39eb 100644
--- a/test/lisp/comint-tests.el
+++ b/test/lisp/comint-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/dabbrev-tests.el b/test/lisp/dabbrev-tests.el
index 5baa315..ca1d00a 100644
--- a/test/lisp/dabbrev-tests.el
+++ b/test/lisp/dabbrev-tests.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/descr-text-tests.el b/test/lisp/descr-text-tests.el
index df0f845..538464a 100644
--- a/test/lisp/descr-text-tests.el
+++ b/test/lisp/descr-text-tests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/dired-aux-tests.el b/test/lisp/dired-aux-tests.el
index 9e02af2..d41feb1 100644
--- a/test/lisp/dired-aux-tests.el
+++ b/test/lisp/dired-aux-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 (require 'ert)
@@ -23,7 +23,7 @@
 
 
 (ert-deftest dired-test-bug27496 ()
-  "Test for http://debbugs.gnu.org/27496 ."
+  "Test for https://debbugs.gnu.org/27496 ."
   (skip-unless (executable-find shell-file-name))
   (let* ((foo (make-temp-file "foo"))
          (files (list foo)))
diff --git a/test/lisp/dired-tests.el b/test/lisp/dired-tests.el
index 1f6e060..99006ec 100644
--- a/test/lisp/dired-tests.el
+++ b/test/lisp/dired-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 (require 'ert)
@@ -32,7 +32,7 @@
      'dired-jump))))
 
 (ert-deftest dired-test-bug22694 ()
-  "Test for http://debbugs.gnu.org/22694 ."
+  "Test for https://debbugs.gnu.org/22694 ."
   (let* ((dir       (expand-file-name "bug22694" default-directory))
          (file      "test")
          (full-name (expand-file-name file dir))
@@ -56,7 +56,7 @@
 
 (defvar dired-dwim-target)
 (ert-deftest dired-test-bug25609 ()
-  "Test for http://debbugs.gnu.org/25609 ."
+  "Test for https://debbugs.gnu.org/25609 ."
   (let* ((from (make-temp-file "foo" 'dir))
          ;; Make sure we have long file-names in 'from' and 'to', not
          ;; their 8+3 short aliases, because the latter will confuse
@@ -109,7 +109,7 @@
       (advice-remove 'completing-read "advice-completing-read"))))
 
 ;; (ert-deftest dired-test-bug27243 ()
-;;   "Test for http://debbugs.gnu.org/27243 ."
+;;   "Test for https://debbugs.gnu.org/27243 ."
 ;;   (let ((test-dir (make-temp-file "test-dir-" t))
 ;;         (dired-auto-revert-buffer t) buffers)
 ;;     (with-current-buffer (find-file-noselect test-dir)
@@ -254,7 +254,7 @@
       (delete-directory test-dir t))))
 
 (ert-deftest dired-test-bug7131 ()
-  "Test for http://debbugs.gnu.org/7131 ."
+  "Test for https://debbugs.gnu.org/7131 ."
   (let* ((dir (expand-file-name "lisp" source-directory))
          (buf (dired dir)))
     (unwind-protect
@@ -270,7 +270,7 @@
       (when (buffer-live-p buf) (kill-buffer buf)))))
 
 (ert-deftest dired-test-bug27631 ()
-  "Test for http://debbugs.gnu.org/27631 ."
+  "Test for https://debbugs.gnu.org/27631 ."
   ;; For dired using 'ls' emulation we test for this bug in
   ;; ls-lisp-tests.el and em-ls-tests.el.
   (skip-unless (and (not (featurep 'ls-lisp))
@@ -293,7 +293,7 @@
       (when (buffer-live-p buf) (kill-buffer buf)))))
 
 (ert-deftest dired-test-bug27899 ()
-  "Test for http://debbugs.gnu.org/27899 ."
+  "Test for https://debbugs.gnu.org/27899 ."
   (let* ((dir (expand-file-name "src" source-directory))
         (buf (dired (list dir "cygw32.c" "alloc.c" "w32xfns.c" "xdisp.c")))
          (orig dired-hide-details-mode))
@@ -309,7 +309,7 @@
       (dired-hide-details-mode orig))))
 
 (ert-deftest dired-test-bug27968 ()
-  "Test for http://debbugs.gnu.org/27968 ."
+  "Test for https://debbugs.gnu.org/27968 ."
   (let* ((top-dir (make-temp-file "top-dir" t))
          (subdir (expand-file-name "subdir" top-dir))
          (header-len-fn (lambda ()
@@ -379,7 +379,7 @@
          (kill-buffer (current-buffer))))))
 
 (ert-deftest dired-test-bug27940 ()
-  "Test for http://debbugs.gnu.org/27940 ."
+  "Test for https://debbugs.gnu.org/27940 ."
   ;; If just empty dirs we shouldn't be prompted.
   (dired-test-with-temp-dirs
    'just-empty-dirs
diff --git a/test/lisp/dired-x-tests.el b/test/lisp/dired-x-tests.el
index e8352a4..a64cff1 100644
--- a/test/lisp/dired-x-tests.el
+++ b/test/lisp/dired-x-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 (require 'ert)
@@ -23,7 +23,7 @@
 
 
 (ert-deftest dired-test-bug25942 ()
-  "Test for http://debbugs.gnu.org/25942 ."
+  "Test for https://debbugs.gnu.org/25942 ."
   (let* ((dirs (list "Public" "Music"))
          (files (list ".bashrc" "bar.c" "foo.c" "c" ".c"))
          (all-but-c
diff --git a/test/lisp/dom-tests.el b/test/lisp/dom-tests.el
index 24d4b93..f44fe3b 100644
--- a/test/lisp/dom-tests.el
+++ b/test/lisp/dom-tests.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/electric-tests.el b/test/lisp/electric-tests.el
index c6ffccc..fc69919 100644
--- a/test/lisp/electric-tests.el
+++ b/test/lisp/electric-tests.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/emacs-lisp/benchmark-tests.el 
b/test/lisp/emacs-lisp/benchmark-tests.el
index 14426ae..e1b67f1 100644
--- a/test/lisp/emacs-lisp/benchmark-tests.el
+++ b/test/lisp/emacs-lisp/benchmark-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/lisp/emacs-lisp/bytecomp-tests.el 
b/test/lisp/emacs-lisp/bytecomp-tests.el
index ab70b30..30d2a47 100644
--- a/test/lisp/emacs-lisp/bytecomp-tests.el
+++ b/test/lisp/emacs-lisp/bytecomp-tests.el
@@ -21,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/emacs-lisp/checkdoc-tests.el 
b/test/lisp/emacs-lisp/checkdoc-tests.el
index 6998550..d832a86 100644
--- a/test/lisp/emacs-lisp/checkdoc-tests.el
+++ b/test/lisp/emacs-lisp/checkdoc-tests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/emacs-lisp/cl-extra-tests.el 
b/test/lisp/emacs-lisp/cl-extra-tests.el
index 5b2371e..c37caa1 100644
--- a/test/lisp/emacs-lisp/cl-extra-tests.el
+++ b/test/lisp/emacs-lisp/cl-extra-tests.el
@@ -15,7 +15,7 @@
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see `http://www.gnu.org/licenses/'.
+;; along with this program.  If not, see `https://www.gnu.org/licenses/'.
 
 ;;; Code:
 
diff --git a/test/lisp/emacs-lisp/cl-generic-tests.el 
b/test/lisp/emacs-lisp/cl-generic-tests.el
index 31f6541..9b2b04b 100644
--- a/test/lisp/emacs-lisp/cl-generic-tests.el
+++ b/test/lisp/emacs-lisp/cl-generic-tests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/emacs-lisp/cl-lib-tests.el 
b/test/lisp/emacs-lisp/cl-lib-tests.el
index 7763d06..13c9af9 100644
--- a/test/lisp/emacs-lisp/cl-lib-tests.el
+++ b/test/lisp/emacs-lisp/cl-lib-tests.el
@@ -15,7 +15,7 @@
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see `http://www.gnu.org/licenses/'.
+;; along with this program.  If not, see `https://www.gnu.org/licenses/'.
 
 ;;; Commentary:
 
diff --git a/test/lisp/emacs-lisp/cl-macs-tests.el 
b/test/lisp/emacs-lisp/cl-macs-tests.el
index 16cb4fb..575f170 100644
--- a/test/lisp/emacs-lisp/cl-macs-tests.el
+++ b/test/lisp/emacs-lisp/cl-macs-tests.el
@@ -15,7 +15,7 @@
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see `http://www.gnu.org/licenses/'.
+;; along with this program.  If not, see `https://www.gnu.org/licenses/'.
 
 ;;; Commentary:
 
diff --git a/test/lisp/emacs-lisp/cl-print-tests.el 
b/test/lisp/emacs-lisp/cl-print-tests.el
index 6448a1b..a5dd5ab 100644
--- a/test/lisp/emacs-lisp/cl-print-tests.el
+++ b/test/lisp/emacs-lisp/cl-print-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/emacs-lisp/cl-seq-tests.el 
b/test/lisp/emacs-lisp/cl-seq-tests.el
index 61e3d72..8c0d556 100644
--- a/test/lisp/emacs-lisp/cl-seq-tests.el
+++ b/test/lisp/emacs-lisp/cl-seq-tests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -27,7 +27,7 @@
 (require 'cl-seq)
 
 (ert-deftest cl-union-test-00 ()
-  "Test for http://debbugs.gnu.org/22729 ."
+  "Test for https://debbugs.gnu.org/22729 ."
   (let ((str1 "foo")
         (str2 (make-string 3 ?o)))
     ;; Emacs may make two string literals eql when reading.
@@ -293,7 +293,7 @@ Body are forms defining the test."
     (should (= 3 (cl-search (nthcdr 2 list) list2)))))
 
 (ert-deftest cl-seq-test-bug24264 ()
-  "Test for http://debbugs.gnu.org/24264 ."
+  "Test for https://debbugs.gnu.org/24264 ."
   (let ((list  (append (make-list 8000005 1) '(8)))
         (list2 (make-list 8000005 2)))
     (should (cl-position 8 list))
diff --git a/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el 
b/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el
index 3df2157..818b3e7 100644
--- a/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el
+++ b/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/test/lisp/emacs-lisp/eieio-tests/eieio-test-persist.el 
b/test/lisp/emacs-lisp/eieio-tests/eieio-test-persist.el
index da4cc5f..e2cff3f 100644
--- a/test/lisp/emacs-lisp/eieio-tests/eieio-test-persist.el
+++ b/test/lisp/emacs-lisp/eieio-tests/eieio-test-persist.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
@@ -104,7 +104,7 @@ This is usually a symbol that starts with `:'."
 
 ;;; Slot Writers
 ;;
-;; Replica of the test in eieio-tests.el - 
+;; Replica of the test in eieio-tests.el -
 
 (defclass persist-:printer (eieio-persistent)
   ((slot1 :initarg :slot1
@@ -164,7 +164,7 @@ persistent class.")
          "persist wos 1"
          :pnp (persist-not-persistent "pnp 1" :slot1 3)
          :file (concat default-directory "test-ps3.pt"))))
-                                            
+
     (persist-test-save-and-compare persist-wos)
     (delete-file (oref persist-wos file))))
 
@@ -187,11 +187,11 @@ persistent class.")
 
 (ert-deftest eieio-test-non-persistent-as-slot-child ()
   (let ((persist-woss
-        (persistent-with-objs-slot-subs 
+        (persistent-with-objs-slot-subs
          "persist woss 1"
          :pnp (persist-not-persistent-subclass "pnps 1" :slot1 3)
          :file (concat default-directory "test-ps4.pt"))))
-                                            
+
     (persist-test-save-and-compare persist-woss)
     (delete-file (oref persist-woss file))))
 
@@ -206,13 +206,13 @@ persistent class.")
 
 (ert-deftest eieio-test-slot-with-list-of-objects ()
   (let ((persist-wols
-        (persistent-with-objs-list-slot 
+        (persistent-with-objs-list-slot
          "persist wols 1"
          :pnp (list (persist-not-persistent "pnp 1" :slot1 3)
                     (persist-not-persistent "pnp 2" :slot1 4)
                     (persist-not-persistent "pnp 3" :slot1 5))
          :file (concat default-directory "test-ps5.pt"))))
-                                            
+
     (persist-test-save-and-compare persist-wols)
     (delete-file (oref persist-wols file))))
 
diff --git a/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el 
b/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el
index 1a6ab9d..fbdb989 100644
--- a/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el
+++ b/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/test/lisp/emacs-lisp/ert-tests.el 
b/test/lisp/emacs-lisp/ert-tests.el
index 2fbc188..b620a66 100644
--- a/test/lisp/emacs-lisp/ert-tests.el
+++ b/test/lisp/emacs-lisp/ert-tests.el
@@ -17,7 +17,7 @@
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see `http://www.gnu.org/licenses/'.
+;; along with this program.  If not, see `https://www.gnu.org/licenses/'.
 
 ;;; Commentary:
 
diff --git a/test/lisp/emacs-lisp/ert-x-tests.el 
b/test/lisp/emacs-lisp/ert-x-tests.el
index 4615d08..0cc89ac 100644
--- a/test/lisp/emacs-lisp/ert-x-tests.el
+++ b/test/lisp/emacs-lisp/ert-x-tests.el
@@ -18,7 +18,7 @@
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see `http://www.gnu.org/licenses/'.
+;; along with this program.  If not, see `https://www.gnu.org/licenses/'.
 
 ;;; Commentary:
 
diff --git a/test/lisp/emacs-lisp/generator-tests.el 
b/test/lisp/emacs-lisp/generator-tests.el
index 1a567ac..4cc6c84 100644
--- a/test/lisp/emacs-lisp/generator-tests.el
+++ b/test/lisp/emacs-lisp/generator-tests.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/emacs-lisp/gv-tests.el b/test/lisp/emacs-lisp/gv-tests.el
index f19af02..93f7082 100644
--- a/test/lisp/emacs-lisp/gv-tests.el
+++ b/test/lisp/emacs-lisp/gv-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/lisp/emacs-lisp/let-alist-tests.el 
b/test/lisp/emacs-lisp/let-alist-tests.el
index d046457..edcfe8a 100644
--- a/test/lisp/emacs-lisp/let-alist-tests.el
+++ b/test/lisp/emacs-lisp/let-alist-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/lisp/emacs-lisp/lisp-mode-tests.el 
b/test/lisp/emacs-lisp/lisp-mode-tests.el
index cc196be..6bc916f 100644
--- a/test/lisp/emacs-lisp/lisp-mode-tests.el
+++ b/test/lisp/emacs-lisp/lisp-mode-tests.el
@@ -13,7 +13,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/lisp/emacs-lisp/lisp-tests.el 
b/test/lisp/emacs-lisp/lisp-tests.el
index ddbf378..ae1302b 100644
--- a/test/lisp/emacs-lisp/lisp-tests.el
+++ b/test/lisp/emacs-lisp/lisp-tests.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/emacs-lisp/map-tests.el 
b/test/lisp/emacs-lisp/map-tests.el
index fc0a6a5..0a888d8 100644
--- a/test/lisp/emacs-lisp/map-tests.el
+++ b/test/lisp/emacs-lisp/map-tests.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/emacs-lisp/nadvice-tests.el 
b/test/lisp/emacs-lisp/nadvice-tests.el
index b228da6..5cee61e 100644
--- a/test/lisp/emacs-lisp/nadvice-tests.el
+++ b/test/lisp/emacs-lisp/nadvice-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/emacs-lisp/package-tests.el 
b/test/lisp/emacs-lisp/package-tests.el
index 62fdc75..33209d3 100644
--- a/test/lisp/emacs-lisp/package-tests.el
+++ b/test/lisp/emacs-lisp/package-tests.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/emacs-lisp/pcase-tests.el 
b/test/lisp/emacs-lisp/pcase-tests.el
index ef0b2f6..3bd14ed 100644
--- a/test/lisp/emacs-lisp/pcase-tests.el
+++ b/test/lisp/emacs-lisp/pcase-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/emacs-lisp/pp-tests.el b/test/lisp/emacs-lisp/pp-tests.el
index b9ed79c..aed2d37 100644
--- a/test/lisp/emacs-lisp/pp-tests.el
+++ b/test/lisp/emacs-lisp/pp-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/lisp/emacs-lisp/regexp-opt-tests.el 
b/test/lisp/emacs-lisp/regexp-opt-tests.el
index 9262631..4beb7bf 100644
--- a/test/lisp/emacs-lisp/regexp-opt-tests.el
+++ b/test/lisp/emacs-lisp/regexp-opt-tests.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/lisp/emacs-lisp/ring-tests.el 
b/test/lisp/emacs-lisp/ring-tests.el
index c869f9d..00bcf84 100644
--- a/test/lisp/emacs-lisp/ring-tests.el
+++ b/test/lisp/emacs-lisp/ring-tests.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/emacs-lisp/rx-tests.el b/test/lisp/emacs-lisp/rx-tests.el
index 8f353b7..d9ebb76 100644
--- a/test/lisp/emacs-lisp/rx-tests.el
+++ b/test/lisp/emacs-lisp/rx-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/emacs-lisp/seq-tests.el 
b/test/lisp/emacs-lisp/seq-tests.el
index 495cf1e..5aa794a 100644
--- a/test/lisp/emacs-lisp/seq-tests.el
+++ b/test/lisp/emacs-lisp/seq-tests.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/emacs-lisp/subr-x-tests.el 
b/test/lisp/emacs-lisp/subr-x-tests.el
index 2b2a5cd..2c6740a 100644
--- a/test/lisp/emacs-lisp/subr-x-tests.el
+++ b/test/lisp/emacs-lisp/subr-x-tests.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -28,13 +28,13 @@
 (require 'subr-x)
 
 
-;; if-let tests
+;; `if-let*' tests
 
-(ert-deftest subr-x-test-if-let-single-binding-expansion ()
+(ert-deftest subr-x-test-if-let*-single-binding-expansion ()
   "Test single bindings are expanded properly."
   (should (equal
            (macroexpand
-            '(if-let (a 1)
+            '(if-let* ((a 1))
                  (- a)
                "no"))
            '(let* ((a (and t 1)))
@@ -43,53 +43,53 @@
                 "no"))))
   (should (equal
            (macroexpand
-            '(if-let (a)
+            '(if-let* (a)
                  (- a)
                "no"))
-           '(let* ((a (and t nil)))
+           '(let* ((a (and t a)))
               (if a
                   (- a)
                 "no")))))
 
-(ert-deftest subr-x-test-if-let-single-symbol-expansion ()
+(ert-deftest subr-x-test-if-let*-single-symbol-expansion ()
   "Test single symbol bindings are expanded properly."
   (should (equal
            (macroexpand
-            '(if-let (a)
+            '(if-let* (a)
                  (- a)
                "no"))
-           '(let* ((a (and t nil)))
+           '(let* ((a (and t a)))
               (if a
                   (- a)
                 "no"))))
   (should (equal
            (macroexpand
-            '(if-let (a b c)
+            '(if-let* (a b c)
                  (- a)
                "no"))
-           '(let* ((a (and t nil))
-                   (b (and a nil))
-                   (c (and b nil)))
+           '(let* ((a (and t a))
+                   (b (and a b))
+                   (c (and b c)))
               (if c
                   (- a)
                 "no"))))
   (should (equal
            (macroexpand
-            '(if-let (a (b 2) c)
+            '(if-let* (a (b 2) c)
                  (- a)
                "no"))
-           '(let* ((a (and t nil))
+           '(let* ((a (and t a))
                    (b (and a 2))
-                   (c (and b nil)))
+                   (c (and b c)))
               (if c
                   (- a)
                 "no")))))
 
-(ert-deftest subr-x-test-if-let-nil-related-expansion ()
+(ert-deftest subr-x-test-if-let*-nil-related-expansion ()
   "Test nil is processed properly."
   (should (equal
            (macroexpand
-            '(if-let (nil)
+            '(if-let* (nil)
                  (- a)
                "no"))
            '(let* ((nil (and t nil)))
@@ -98,27 +98,7 @@
                 "no"))))
   (should (equal
            (macroexpand
-            '(if-let ((nil))
-                 (- a)
-               "no"))
-           '(let* ((nil (and t nil)))
-              (if nil
-                  (- a)
-                "no"))))
-  (should (equal
-           (macroexpand
-            '(if-let ((a 1) (nil) (b 2))
-                 (- a)
-               "no"))
-           '(let* ((a (and t 1))
-                   (nil (and a nil))
-                   (b (and nil 2)))
-              (if b
-                  (- a)
-                "no"))))
-  (should (equal
-           (macroexpand
-            '(if-let ((a 1) nil (b 2))
+            '(if-let* ((a 1) nil (b 2))
                  (- a)
                "no"))
            '(let* ((a (and t 1))
@@ -128,104 +108,106 @@
                   (- a)
                 "no")))))
 
-(ert-deftest subr-x-test-if-let-malformed-binding ()
+(ert-deftest subr-x-test-if-let*-malformed-binding ()
   "Test malformed bindings trigger errors."
   (should-error (macroexpand
-                 '(if-let (_ (a 1 1) (b 2) (c 3) d)
+                 '(if-let* (_ (a 1 1) (b 2) (c 3) d)
                       (- a)
                     "no"))
                 :type 'error)
   (should-error (macroexpand
-                 '(if-let (_ (a 1) (b 2 2) (c 3) d)
+                 '(if-let* (_ (a 1) (b 2 2) (c 3) d)
                       (- a)
                     "no"))
                 :type 'error)
   (should-error (macroexpand
-                 '(if-let (_ (a 1) (b 2) (c 3 3) d)
+                 '(if-let* (_ (a 1) (b 2) (c 3 3) d)
                       (- a)
                     "no"))
                 :type 'error)
   (should-error (macroexpand
-                 '(if-let ((a 1 1))
+                 '(if-let* ((a 1 1))
                       (- a)
                     "no"))
                 :type 'error))
 
-(ert-deftest subr-x-test-if-let-true ()
+(ert-deftest subr-x-test-if-let*-true ()
   "Test `if-let' with truthy bindings."
   (should (equal
-           (if-let (a 1)
+           (if-let* ((a 1))
                a
              "no")
            1))
   (should (equal
-           (if-let ((a 1) (b 2) (c 3))
+           (if-let* ((a 1) (b 2) (c 3))
                (list a b c)
              "no")
            (list 1 2 3))))
 
-(ert-deftest subr-x-test-if-let-false ()
+(ert-deftest subr-x-test-if-let*-false ()
   "Test `if-let' with falsie bindings."
   (should (equal
-           (if-let (a nil)
+           (if-let* ((a nil))
                (list a b c)
              "no")
            "no"))
   (should (equal
-           (if-let ((a nil) (b 2) (c 3))
+           (if-let* ((a nil) (b 2) (c 3))
                (list a b c)
              "no")
            "no"))
   (should (equal
-           (if-let ((a 1) (b nil) (c 3))
+           (if-let* ((a 1) (b nil) (c 3))
                (list a b c)
              "no")
            "no"))
   (should (equal
-           (if-let ((a 1) (b 2) (c nil))
+           (if-let* ((a 1) (b 2) (c nil))
                (list a b c)
              "no")
            "no"))
   (should (equal
-           (if-let (z (a 1) (b 2) (c 3))
-               (list a b c)
-             "no")
+           (let (z)
+             (if-let* (z (a 1) (b 2) (c 3))
+                 (list a b c)
+               "no"))
            "no"))
   (should (equal
-           (if-let ((a 1) (b 2) (c 3) d)
-               (list a b c)
-             "no")
+           (let (d)
+             (if-let* ((a 1) (b 2) (c 3) d)
+                 (list a b c)
+               "no"))
            "no")))
 
-(ert-deftest subr-x-test-if-let-bound-references ()
+(ert-deftest subr-x-test-if-let*-bound-references ()
   "Test `if-let' bindings can refer to already bound symbols."
   (should (equal
-           (if-let ((a (1+ 0)) (b (1+ a)) (c (1+ b)))
+           (if-let* ((a (1+ 0)) (b (1+ a)) (c (1+ b)))
                (list a b c)
              "no")
            (list 1 2 3))))
 
-(ert-deftest subr-x-test-if-let-and-laziness-is-preserved ()
+(ert-deftest subr-x-test-if-let*-and-laziness-is-preserved ()
   "Test `if-let' respects `and' laziness."
   (let (a-called b-called c-called)
     (should (equal
-             (if-let ((a nil)
-                      (b (setq b-called t))
-                      (c (setq c-called t)))
+             (if-let* ((a nil)
+                       (b (setq b-called t))
+                       (c (setq c-called t)))
                  "yes"
                (list a-called b-called c-called))
              (list nil nil nil))))
   (let (a-called b-called c-called)
     (should (equal
-             (if-let ((a (setq a-called t))
-                      (b nil)
-                      (c (setq c-called t)))
+             (if-let* ((a (setq a-called t))
+                       (b nil)
+                       (c (setq c-called t)))
                  "yes"
                (list a-called b-called c-called))
              (list t nil nil))))
   (let (a-called b-called c-called)
     (should (equal
-             (if-let ((a (setq a-called t))
+             (if-let* ((a (setq a-called t))
                       (b (setq b-called t))
                       (c nil)
                       (d (setq c-called t)))
@@ -234,13 +216,13 @@
              (list t t nil)))))
 
 
-;; when-let tests
+;; `when-let*' tests
 
-(ert-deftest subr-x-test-when-let-body-expansion ()
+(ert-deftest subr-x-test-when-let*-body-expansion ()
   "Test body allows for multiple sexps wrapping with progn."
   (should (equal
            (macroexpand
-            '(when-let (a 1)
+            '(when-let* ((a 1))
                (message "opposite")
                (- a)))
            '(let* ((a (and t 1)))
@@ -249,79 +231,46 @@
                     (message "opposite")
                     (- a)))))))
 
-(ert-deftest subr-x-test-when-let-single-binding-expansion ()
-  "Test single bindings are expanded properly."
-  (should (equal
-           (macroexpand
-            '(when-let (a 1)
-               (- a)))
-           '(let* ((a (and t 1)))
-              (if a
-                  (- a)))))
-  (should (equal
-           (macroexpand
-            '(when-let (a)
-               (- a)))
-           '(let* ((a (and t nil)))
-              (if a
-                  (- a))))))
-
-(ert-deftest subr-x-test-when-let-single-symbol-expansion ()
+(ert-deftest subr-x-test-when-let*-single-symbol-expansion ()
   "Test single symbol bindings are expanded properly."
   (should (equal
            (macroexpand
-            '(when-let (a)
+            '(when-let* (a)
                (- a)))
-           '(let* ((a (and t nil)))
+           '(let* ((a (and t a)))
               (if a
                   (- a)))))
   (should (equal
            (macroexpand
-            '(when-let (a b c)
+            '(when-let* (a b c)
                (- a)))
-           '(let* ((a (and t nil))
-                   (b (and a nil))
-                   (c (and b nil)))
+           '(let* ((a (and t a))
+                   (b (and a b))
+                   (c (and b c)))
               (if c
                   (- a)))))
   (should (equal
            (macroexpand
-            '(when-let (a (b 2) c)
+            '(when-let* (a (b 2) c)
                (- a)))
-           '(let* ((a (and t nil))
+           '(let* ((a (and t a))
                    (b (and a 2))
-                   (c (and b nil)))
+                   (c (and b c)))
               (if c
                   (- a))))))
 
-(ert-deftest subr-x-test-when-let-nil-related-expansion ()
+(ert-deftest subr-x-test-when-let*-nil-related-expansion ()
   "Test nil is processed properly."
   (should (equal
            (macroexpand
-            '(when-let (nil)
-               (- a)))
-           '(let* ((nil (and t nil)))
-              (if nil
-                  (- a)))))
-  (should (equal
-           (macroexpand
-            '(when-let ((nil))
+            '(when-let* (nil)
                (- a)))
            '(let* ((nil (and t nil)))
               (if nil
                   (- a)))))
   (should (equal
            (macroexpand
-            '(when-let ((a 1) (nil) (b 2))
-               (- a)))
-           '(let* ((a (and t 1))
-                   (nil (and a nil))
-                   (b (and nil 2)))
-              (if b
-                  (- a)))))
-  (should (equal
-           (macroexpand
-            '(when-let ((a 1) nil (b 2))
+            '(when-let* ((a 1) nil (b 2))
                (- a)))
            '(let* ((a (and t 1))
                    (nil (and a nil))
@@ -329,108 +278,171 @@
               (if b
                   (- a))))))
 
-(ert-deftest subr-x-test-when-let-malformed-binding ()
+(ert-deftest subr-x-test-when-let*-malformed-binding ()
   "Test malformed bindings trigger errors."
   (should-error (macroexpand
-                 '(when-let (_ (a 1 1) (b 2) (c 3) d)
+                 '(when-let* (_ (a 1 1) (b 2) (c 3) d)
                     (- a)))
                 :type 'error)
   (should-error (macroexpand
-                 '(when-let (_ (a 1) (b 2 2) (c 3) d)
+                 '(when-let* (_ (a 1) (b 2 2) (c 3) d)
                     (- a)))
                 :type 'error)
   (should-error (macroexpand
-                 '(when-let (_ (a 1) (b 2) (c 3 3) d)
+                 '(when-let* (_ (a 1) (b 2) (c 3 3) d)
                     (- a)))
                 :type 'error)
   (should-error (macroexpand
-                 '(when-let ((a 1 1))
+                 '(when-let* ((a 1 1))
                     (- a)))
                 :type 'error))
 
-(ert-deftest subr-x-test-when-let-true ()
+(ert-deftest subr-x-test-when-let*-true ()
   "Test `when-let' with truthy bindings."
   (should (equal
-           (when-let (a 1)
+           (when-let* ((a 1))
              a)
            1))
   (should (equal
-           (when-let ((a 1) (b 2) (c 3))
+           (when-let* ((a 1) (b 2) (c 3))
              (list a b c))
            (list 1 2 3))))
 
-(ert-deftest subr-x-test-when-let-false ()
+(ert-deftest subr-x-test-when-let*-false ()
   "Test `when-let' with falsie bindings."
   (should (equal
-           (when-let (a nil)
+           (when-let* ((a nil))
              (list a b c)
              "no")
            nil))
   (should (equal
-           (when-let ((a nil) (b 2) (c 3))
+           (when-let* ((a nil) (b 2) (c 3))
              (list a b c)
              "no")
            nil))
   (should (equal
-           (when-let ((a 1) (b nil) (c 3))
+           (when-let* ((a 1) (b nil) (c 3))
              (list a b c)
              "no")
            nil))
   (should (equal
-           (when-let ((a 1) (b 2) (c nil))
+           (when-let* ((a 1) (b 2) (c nil))
              (list a b c)
              "no")
            nil))
   (should (equal
-           (when-let (z (a 1) (b 2) (c 3))
-             (list a b c)
-             "no")
+           (let (z)
+             (when-let* (z (a 1) (b 2) (c 3))
+               (list a b c)
+               "no"))
            nil))
   (should (equal
-           (when-let ((a 1) (b 2) (c 3) d)
-             (list a b c)
-             "no")
+           (let (d)
+             (when-let* ((a 1) (b 2) (c 3) d)
+               (list a b c)
+               "no"))
            nil)))
 
-(ert-deftest subr-x-test-when-let-bound-references ()
+(ert-deftest subr-x-test-when-let*-bound-references ()
   "Test `when-let' bindings can refer to already bound symbols."
   (should (equal
-           (when-let ((a (1+ 0)) (b (1+ a)) (c (1+ b)))
+           (when-let* ((a (1+ 0)) (b (1+ a)) (c (1+ b)))
              (list a b c))
            (list 1 2 3))))
 
-(ert-deftest subr-x-test-when-let-and-laziness-is-preserved ()
+(ert-deftest subr-x-test-when-let*-and-laziness-is-preserved ()
   "Test `when-let' respects `and' laziness."
   (let (a-called b-called c-called)
     (should (equal
              (progn
-               (when-let ((a nil)
-                          (b (setq b-called t))
-                          (c (setq c-called t)))
+               (when-let* ((a nil)
+                           (b (setq b-called t))
+                           (c (setq c-called t)))
                  "yes")
                (list a-called b-called c-called))
              (list nil nil nil))))
   (let (a-called b-called c-called)
     (should (equal
              (progn
-               (when-let ((a (setq a-called t))
-                          (b nil)
-                          (c (setq c-called t)))
+               (when-let* ((a (setq a-called t))
+                           (b nil)
+                           (c (setq c-called t)))
                  "yes")
                (list a-called b-called c-called))
              (list t nil nil))))
   (let (a-called b-called c-called)
     (should (equal
              (progn
-               (when-let ((a (setq a-called t))
-                          (b (setq b-called t))
-                          (c nil)
-                          (d (setq c-called t)))
+               (when-let* ((a (setq a-called t))
+                           (b (setq b-called t))
+                           (c nil)
+                           (d (setq c-called t)))
                  "yes")
                (list a-called b-called c-called))
              (list t t nil)))))
 
 
+;; `and-let*' tests
+
+;; Adapted from the Guile tests
+;; 
https://git.savannah.gnu.org/cgit/guile.git/tree/test-suite/tests/srfi-2.test
+
+(ert-deftest subr-x-and-let*-test-empty-varlist ()
+  (should (equal 1 (and-let* () 1)))
+  (should (equal 2 (and-let* () 1 2)))
+  (should (equal t (and-let* ()))))
+
+(ert-deftest subr-x-and-let*-test-group-1 ()
+   (should (equal nil (let ((x nil)) (and-let* (x)))))
+   (should (equal 1 (let ((x 1)) (and-let* (x)))))
+   (should (equal nil (and-let* ((x nil)))))
+   (should (equal 1 (and-let* ((x 1)))))
+   (should-error (and-let* (nil (x 1))) :type 'setting-constant)
+   (should (equal nil (and-let* ((nil) (x 1)))))
+   (should-error (and-let* (2 (x 1))) :type 'wrong-type-argument)
+   (should (equal 1 (and-let* ((2) (x 1)))))
+   (should (equal 2 (and-let* ((x 1) (2)))))
+   (should (equal nil (let ((x nil)) (and-let* (x) x))))
+   (should (equal "" (let ((x "")) (and-let* (x) x))))
+   (should (equal "" (let ((x "")) (and-let* (x)))))
+   (should (equal 2 (let ((x 1)) (and-let* (x) (+ x 1)))))
+   (should (equal nil (let ((x nil)) (and-let* (x) (+ x 1)))))
+   (should (equal 2 (let ((x 1)) (and-let* (((> x 0))) (+ x 1)))))
+   (should (equal t (let ((x 1)) (and-let* (((> x 0)))))))
+   (should (equal nil (let ((x 0)) (and-let* (((> x 0))) (+ x 1)))))
+   (should (equal 3
+                  (let ((x 1)) (and-let* (((> x 0)) (x (+ x 1))) (+ x 1))))))
+
+(ert-deftest subr-x-and-let*-test-rebind ()
+   (should
+    (equal 4
+           (let ((x 1))
+             (and-let* (((> x 0)) (x (+ x 1)) (x (+ x 1))) (+ x 1))))))
+
+(ert-deftest subr-x-and-let*-test-group-2 ()
+   (should
+    (equal 2 (let ((x 1)) (and-let* (x ((> x 0))) (+ x 1)))))
+   (should
+    (equal 2 (let ((x 1)) (and-let* (((progn x)) ((> x 0))) (+ x 1)))))
+   (should (equal nil (let ((x 0)) (and-let* (x ((> x 0))) (+ x 1)))))
+   (should (equal nil (let ((x nil)) (and-let* (x ((> x 0))) (+ x 1)))))
+   (should
+    (equal nil (let ((x nil)) (and-let* (((progn x)) ((> x 0))) (+ x 1))))))
+
+(ert-deftest subr-x-and-let*-test-group-3 ()
+   (should
+    (equal nil (let ((x 1)) (and-let* (x (y (- x 1)) ((> y 0))) (/ x y)))))
+   (should
+    (equal nil (let ((x 0)) (and-let* (x (y (- x 1)) ((> y 0))) (/ x y)))))
+   (should
+    (equal nil
+           (let ((x nil)) (and-let* (x (y (- x 1)) ((> y 0))) (/ x y)))))
+   (should
+    (equal (/ 3.0 2)
+           (let ((x 3.0)) (and-let* (x (y (- x 1)) ((> y 0))) (/ x y))))))
+
+
+
 ;; Thread first tests
 
 (ert-deftest subr-x-test-thread-first-no-forms ()
diff --git a/test/lisp/emacs-lisp/tabulated-list-test.el 
b/test/lisp/emacs-lisp/tabulated-list-test.el
index b3a09ee..30a4f8f 100644
--- a/test/lisp/emacs-lisp/tabulated-list-test.el
+++ b/test/lisp/emacs-lisp/tabulated-list-test.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/lisp/emacs-lisp/testcover-resources/testcases.el 
b/test/lisp/emacs-lisp/testcover-resources/testcases.el
index c9a5a6d..edb539f 100644
--- a/test/lisp/emacs-lisp/testcover-resources/testcases.el
+++ b/test/lisp/emacs-lisp/testcover-resources/testcases.el
@@ -17,7 +17,7 @@
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see `http://www.gnu.org/licenses/'.
+;; along with this program.  If not, see `https://www.gnu.org/licenses/'.
 
 ;;; Commentary:
 
diff --git a/test/lisp/emacs-lisp/testcover-tests.el 
b/test/lisp/emacs-lisp/testcover-tests.el
index d31379c..0f0ee9a 100644
--- a/test/lisp/emacs-lisp/testcover-tests.el
+++ b/test/lisp/emacs-lisp/testcover-tests.el
@@ -17,7 +17,7 @@
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see `http://www.gnu.org/licenses/'.
+;; along with this program.  If not, see `https://www.gnu.org/licenses/'.
 
 ;;; Commentary:
 
diff --git a/test/lisp/emacs-lisp/thunk-tests.el 
b/test/lisp/emacs-lisp/thunk-tests.el
index 89bf1f5..973a14b 100644
--- a/test/lisp/emacs-lisp/thunk-tests.el
+++ b/test/lisp/emacs-lisp/thunk-tests.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/emacs-lisp/timer-tests.el 
b/test/lisp/emacs-lisp/timer-tests.el
index b12a365..916625c 100644
--- a/test/lisp/emacs-lisp/timer-tests.el
+++ b/test/lisp/emacs-lisp/timer-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/emulation/viper-tests.el 
b/test/lisp/emulation/viper-tests.el
index 67ce5b6..938d5ed 100644
--- a/test/lisp/emulation/viper-tests.el
+++ b/test/lisp/emulation/viper-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/epg-tests.el b/test/lisp/epg-tests.el
index 36db478..cdb5f36 100644
--- a/test/lisp/epg-tests.el
+++ b/test/lisp/epg-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/erc/erc-track-tests.el b/test/lisp/erc/erc-track-tests.el
index da119ed..6e36ed4 100644
--- a/test/lisp/erc/erc-track-tests.el
+++ b/test/lisp/erc/erc-track-tests.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/lisp/eshell/em-ls-tests.el b/test/lisp/eshell/em-ls-tests.el
index 8e7b91d..35d6171 100644
--- a/test/lisp/eshell/em-ls-tests.el
+++ b/test/lisp/eshell/em-ls-tests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -28,7 +28,7 @@
 (require 'em-ls)
 
 (ert-deftest em-ls-test-bug27631 ()
-  "Test for http://debbugs.gnu.org/27631 ."
+  "Test for https://debbugs.gnu.org/27631 ."
   (let* ((dir (make-temp-file "bug27631" 'dir))
          (dir1 (expand-file-name "dir1" dir))
          (dir2 (expand-file-name "dir2" dir))
@@ -50,7 +50,7 @@
       (when (buffer-live-p buf) (kill-buffer buf)))))
 
 (ert-deftest em-ls-test-bug27817 ()
-  "Test for http://debbugs.gnu.org/27817 ."
+  "Test for https://debbugs.gnu.org/27817 ."
   (let ((orig eshell-ls-use-in-dired)
         (dired-use-ls-dired 'unspecified)
         buf insert-directory-program)
@@ -62,7 +62,7 @@
       (and (buffer-live-p buf) (kill-buffer)))))
 
 (ert-deftest em-ls-test-bug27843 ()
-  "Test for http://debbugs.gnu.org/27843 ."
+  "Test for https://debbugs.gnu.org/27843 ."
   (let ((orig eshell-ls-use-in-dired)
         (dired-use-ls-dired 'unspecified)
         buf insert-directory-program)
@@ -76,7 +76,7 @@
       (and (buffer-live-p buf) (kill-buffer)))))
 
 (ert-deftest em-ls-test-bug27844 ()
-  "Test for http://debbugs.gnu.org/27844 ."
+  "Test for https://debbugs.gnu.org/27844 ."
   (let ((orig eshell-ls-use-in-dired)
         (dired-use-ls-dired 'unspecified)
         buf insert-directory-program)
diff --git a/test/lisp/eshell/eshell-tests.el b/test/lisp/eshell/eshell-tests.el
index 363ef52..4e0d6dc 100644
--- a/test/lisp/eshell/eshell-tests.el
+++ b/test/lisp/eshell/eshell-tests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/faces-tests.el b/test/lisp/faces-tests.el
index 2b3456d..056af68 100644
--- a/test/lisp/faces-tests.el
+++ b/test/lisp/faces-tests.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/lisp/ffap-tests.el b/test/lisp/ffap-tests.el
index 1862c6c..0b90d64 100644
--- a/test/lisp/ffap-tests.el
+++ b/test/lisp/ffap-tests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -28,7 +28,7 @@
 (require 'ffap)
 
 (ert-deftest ffap-tests-25243 ()
-  "Test for http://debbugs.gnu.org/25243 ."
+  "Test for https://debbugs.gnu.org/25243 ."
   (let ((file (make-temp-file "test-Bug#25243")))
     (unwind-protect
         (with-temp-file file
@@ -72,12 +72,12 @@ Host = example.com\n")
 left alone when opening a URL in an external browser."
   (cl-letf* ((old (current-window-configuration))
              ((symbol-function 'ffap-prompter)
-              (lambda () "http://www.gnu.org";))
+              (lambda () "https://www.gnu.org";))
              (urls nil)
              (ffap-url-fetcher (lambda (url) (push url urls) nil)))
     (should-not (ffap-other-window))
     (should (equal (current-window-configuration) old))
-    (should (equal urls '("http://www.gnu.org";)))))
+    (should (equal urls '("https://www.gnu.org";)))))
 
 (provide 'ffap-tests)
 
diff --git a/test/lisp/filenotify-tests.el b/test/lisp/filenotify-tests.el
index 3456d31..17840e8 100644
--- a/test/lisp/filenotify-tests.el
+++ b/test/lisp/filenotify-tests.el
@@ -15,7 +15,7 @@
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see `http://www.gnu.org/licenses/'.
+;; along with this program.  If not, see `https://www.gnu.org/licenses/'.
 
 ;;; Commentary:
 
diff --git a/test/lisp/files-tests.el b/test/lisp/files-tests.el
index b52965a..ef216c3 100644
--- a/test/lisp/files-tests.el
+++ b/test/lisp/files-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
@@ -153,7 +153,7 @@ form.")
   "Test file for bug#18141.")
 
 (ert-deftest files-test-bug-18141 ()
-  "Test for http://debbugs.gnu.org/18141 ."
+  "Test for https://debbugs.gnu.org/18141 ."
   (skip-unless (executable-find "gzip"))
   (let ((tempfile (make-temp-file "files-test-bug-18141" nil ".gz")))
     (unwind-protect
@@ -184,7 +184,7 @@ form.")
 
 
 (ert-deftest files-test-bug-21454 ()
-  "Test for http://debbugs.gnu.org/21454 ."
+  "Test for https://debbugs.gnu.org/21454 ."
   :expected-result :failed
   (let ((input-result
          '(("/foo/bar//baz/:/bar/foo/baz//" nil ("/foo/bar/baz/" 
"/bar/foo/baz/"))
@@ -365,6 +365,33 @@ be invoked with the right arguments."
     (should-error (make-directory a/b))
     (should-not (make-directory a/b t))))
 
+(ert-deftest files-test-no-file-write-contents ()
+  "Test that `write-contents-functions' permits saving a file.
+Usually `basic-save-buffer' will prompt for a file name if the
+current buffer has none.  It should first call the functions in
+`write-contents-functions', and if one of them returns non-nil,
+consider the buffer saved, without prompting for a file
+name (Bug#28412)."
+  (let ((read-file-name-function
+         (lambda (&rest _ignore)
+           (error "Prompting for file name"))))
+    ;; With contents function, and no file.
+    (with-temp-buffer
+      (setq write-contents-functions (lambda () t))
+      (set-buffer-modified-p t)
+      (should (null (save-buffer))))
+    ;; With no contents function and no file.  This should reach the
+    ;; `read-file-name' prompt.
+    (with-temp-buffer
+      (set-buffer-modified-p t)
+      (should-error (save-buffer) :type 'error))
+    ;; Then a buffer visiting a file: should save normally.
+    (files-tests--with-temp-file temp-file-name
+      (with-current-buffer (find-file-noselect temp-file-name)
+        (setq write-contents-functions nil)
+        (insert "p")
+        (should (null (save-buffer)))
+        (should (eq (buffer-size) 1))))))
 
 (provide 'files-tests)
 ;;; files-tests.el ends here
diff --git a/test/lisp/files-x-tests.el b/test/lisp/files-x-tests.el
index 21d0087..21cb01c 100644
--- a/test/lisp/files-x-tests.el
+++ b/test/lisp/files-x-tests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/lisp/gnus/gnus-tests.el b/test/lisp/gnus/gnus-tests.el
index 47c49b3..c2a41d7 100644
--- a/test/lisp/gnus/gnus-tests.el
+++ b/test/lisp/gnus/gnus-tests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/gnus/message-tests.el b/test/lisp/gnus/message-tests.el
index 4036725..f905ba3 100644
--- a/test/lisp/gnus/message-tests.el
+++ b/test/lisp/gnus/message-tests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/help-fns-tests.el b/test/lisp/help-fns-tests.el
index 0ab6c3c..98e6b33 100644
--- a/test/lisp/help-fns-tests.el
+++ b/test/lisp/help-fns-tests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -40,7 +40,7 @@ Return first line of the output of (describe-function-1 
FUNC)."
     (match-string-no-properties 1 string)))
 
 (ert-deftest help-fns-test-bug17410 ()
-  "Test for http://debbugs.gnu.org/17410 ."
+  "Test for https://debbugs.gnu.org/17410 ."
   (let ((regexp "autoloaded Lisp macro")
         (result (help-fns-tests--describe-function 'help-fns-test--macro)))
     (should (string-match regexp result))))
@@ -76,7 +76,7 @@ Return first line of the output of (describe-function-1 
FUNC)."
     (should (string-match regexp result))))
 
 (ert-deftest help-fns-test-bug23887 ()
-  "Test for http://debbugs.gnu.org/23887 ."
+  "Test for https://debbugs.gnu.org/23887 ."
   (let ((regexp "an alias for .re-search-forward. in .subr\.el")
         (result (help-fns-tests--describe-function 'search-forward-regexp)))
     (should (string-match regexp result))))
diff --git a/test/lisp/hi-lock-tests.el b/test/lisp/hi-lock-tests.el
index 9e24019..dfe5834 100644
--- a/test/lisp/hi-lock-tests.el
+++ b/test/lisp/hi-lock-tests.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
@@ -24,7 +24,7 @@
 (require 'hi-lock)
 
 (ert-deftest hi-lock-bug26666 ()
-  "Test for http://debbugs.gnu.org/26666 ."
+  "Test for https://debbugs.gnu.org/26666 ."
   (let ((faces hi-lock-face-defaults))
     (with-temp-buffer
       (insert "a A b B\n")
diff --git a/test/lisp/htmlfontify-tests.el b/test/lisp/htmlfontify-tests.el
index 4a1d566..0ad775d 100644
--- a/test/lisp/htmlfontify-tests.el
+++ b/test/lisp/htmlfontify-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 (require 'ert)
diff --git a/test/lisp/ibuffer-tests.el b/test/lisp/ibuffer-tests.el
index af75aa0..d65acf6 100644
--- a/test/lisp/ibuffer-tests.el
+++ b/test/lisp/ibuffer-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 (require 'ert)
@@ -43,7 +43,7 @@
      'ibuffer-mark-unsaved-buffers))))
 
 (ert-deftest ibuffer-test-Bug24997 ()
-  "Test for http://debbugs.gnu.org/24997 ."
+  "Test for https://debbugs.gnu.org/24997 ."
   (ibuffer)
   (let ((orig ibuffer-filtering-qualifiers))
     (unwind-protect
@@ -58,7 +58,7 @@
       (ibuffer-update nil t))))
 
 (ert-deftest ibuffer-test-Bug25000 ()
-  "Test for http://debbugs.gnu.org/25000 ."
+  "Test for https://debbugs.gnu.org/25000 ."
   (let ((case-fold-search t)
         (buf1 (generate-new-buffer "ibuffer-test-Bug25000-buf1"))
         (buf2 (generate-new-buffer "ibuffer-test-Bug25000-buf2")))
@@ -104,7 +104,7 @@
     (should (equal (cdr (assoc "test3" ibuffer-saved-filters)) test3))))
 
 (ert-deftest ibuffer-test-Bug25058 ()
-  "Test for http://debbugs.gnu.org/25058 ."
+  "Test for https://debbugs.gnu.org/25058 ."
   (ibuffer)
   (let ((orig-filters ibuffer-saved-filter-groups)
         (tmp-filters '(("saved-filters"
@@ -137,7 +137,7 @@
 
 
 (ert-deftest ibuffer-test-Bug25042 ()
-  "Test for http://debbugs.gnu.org/25042 ."
+  "Test for https://debbugs.gnu.org/25042 ."
   (ibuffer)
   (let ((filters ibuffer-filtering-qualifiers))
     (unwind-protect
diff --git a/test/lisp/ido-tests.el b/test/lisp/ido-tests.el
index df11096..a325f49 100644
--- a/test/lisp/ido-tests.el
+++ b/test/lisp/ido-tests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/imenu-tests.el b/test/lisp/imenu-tests.el
index 9309094..aedc90e 100644
--- a/test/lisp/imenu-tests.el
+++ b/test/lisp/imenu-tests.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/lisp/info-xref-tests.el b/test/lisp/info-xref-tests.el
index 9ae07c3..0a2038a 100644
--- a/test/lisp/info-xref-tests.el
+++ b/test/lisp/info-xref-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/international/mule-tests.el 
b/test/lisp/international/mule-tests.el
index d745333..4265cec 100644
--- a/test/lisp/international/mule-tests.el
+++ b/test/lisp/international/mule-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/international/mule-util-tests.el 
b/test/lisp/international/mule-util-tests.el
index 356ee33..01f40a2 100644
--- a/test/lisp/international/mule-util-tests.el
+++ b/test/lisp/international/mule-util-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/international/ucs-normalize-tests.el 
b/test/lisp/international/ucs-normalize-tests.el
index 02a4bba..94bf776 100644
--- a/test/lisp/international/ucs-normalize-tests.el
+++ b/test/lisp/international/ucs-normalize-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/isearch-tests.el b/test/lisp/isearch-tests.el
index e5cae82..b2981c0 100644
--- a/test/lisp/isearch-tests.el
+++ b/test/lisp/isearch-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/lisp/jit-lock-tests.el b/test/lisp/jit-lock-tests.el
index 22d1e01..5847eac 100644
--- a/test/lisp/jit-lock-tests.el
+++ b/test/lisp/jit-lock-tests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/json-tests.el b/test/lisp/json-tests.el
index 1d13ccf..fe5f466 100644
--- a/test/lisp/json-tests.el
+++ b/test/lisp/json-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/lisp/kmacro-tests.el b/test/lisp/kmacro-tests.el
index 04a4271..a691ec8 100644
--- a/test/lisp/kmacro-tests.el
+++ b/test/lisp/kmacro-tests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/ls-lisp-tests.el b/test/lisp/ls-lisp-tests.el
index 1698e09..8e419d5 100644
--- a/test/lisp/ls-lisp-tests.el
+++ b/test/lisp/ls-lisp-tests.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -28,14 +28,14 @@
 (require 'ls-lisp)
 
 (ert-deftest ls-lisp-unload ()
-  "Test for http://debbugs.gnu.org/xxxxx ."
+  "Test for https://debbugs.gnu.org/xxxxx ."
   (should (advice-member-p 'ls-lisp--insert-directory 'insert-directory))
   (unload-feature 'ls-lisp 'force)
   (should-not (advice-member-p 'ls-lisp--insert-directory 'insert-directory))
   (require 'ls-lisp))
 
 (ert-deftest ls-lisp-test-bug27762 ()
-  "Test for http://debbugs.gnu.org/27762 ."
+  "Test for https://debbugs.gnu.org/27762 ."
   (let* ((dir source-directory)
          (default-directory dir)
          (files (mapcar (lambda (f) (concat "src/" f))
@@ -57,7 +57,7 @@
       (when (buffer-live-p buf) (kill-buffer buf)))))
 
 (ert-deftest ls-lisp-test-bug27631 ()
-  "Test for http://debbugs.gnu.org/27631 ."
+  "Test for https://debbugs.gnu.org/27631 ."
   (let* ((dir (make-temp-file "bug27631" 'dir))
          (dir1 (expand-file-name "dir1" dir))
          (dir2 (expand-file-name "dir2" dir))
@@ -76,7 +76,7 @@
       (when (buffer-live-p buf) (kill-buffer buf)))))
 
 (ert-deftest ls-lisp-test-bug27693 ()
-  "Test for http://debbugs.gnu.org/27693 ."
+  "Test for https://debbugs.gnu.org/27693 ."
   (let ((dir (expand-file-name "lisp" source-directory))
         (size "")
         ls-lisp-use-insert-directory-program buf)
diff --git a/test/lisp/mail/rmail-tests.el b/test/lisp/mail/rmail-tests.el
index 6cf9053..b0b8676 100644
--- a/test/lisp/mail/rmail-tests.el
+++ b/test/lisp/mail/rmail-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 (require 'ert)
diff --git a/test/lisp/man-tests.el b/test/lisp/man-tests.el
index b9f47f5..9294994 100644
--- a/test/lisp/man-tests.el
+++ b/test/lisp/man-tests.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/lisp/md4-tests.el b/test/lisp/md4-tests.el
index 169ed83..42b13c9 100644
--- a/test/lisp/md4-tests.el
+++ b/test/lisp/md4-tests.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/minibuffer-tests.el b/test/lisp/minibuffer-tests.el
index 7c5fcb4..c27b338 100644
--- a/test/lisp/minibuffer-tests.el
+++ b/test/lisp/minibuffer-tests.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/mouse-tests.el b/test/lisp/mouse-tests.el
index a8eca28..f8c9100 100644
--- a/test/lisp/mouse-tests.el
+++ b/test/lisp/mouse-tests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/net/dbus-tests.el b/test/lisp/net/dbus-tests.el
index 0a59e3b..cdae9cc 100644
--- a/test/lisp/net/dbus-tests.el
+++ b/test/lisp/net/dbus-tests.el
@@ -15,7 +15,7 @@
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see `http://www.gnu.org/licenses/'.
+;; along with this program.  If not, see `https://www.gnu.org/licenses/'.
 
 ;;; Code:
 
diff --git a/test/lisp/net/gnutls-tests.el b/test/lisp/net/gnutls-tests.el
index 9dbb6c0..fd0b5de 100644
--- a/test/lisp/net/gnutls-tests.el
+++ b/test/lisp/net/gnutls-tests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/net/mailcap-tests.el b/test/lisp/net/mailcap-tests.el
index 9e32931..cbeb61a 100644
--- a/test/lisp/net/mailcap-tests.el
+++ b/test/lisp/net/mailcap-tests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/net/network-stream-tests.el 
b/test/lisp/net/network-stream-tests.el
index 9ee3a28..e0ecfca 100644
--- a/test/lisp/net/network-stream-tests.el
+++ b/test/lisp/net/network-stream-tests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/net/newsticker-tests.el 
b/test/lisp/net/newsticker-tests.el
index 56064f7..def7c2a 100644
--- a/test/lisp/net/newsticker-tests.el
+++ b/test/lisp/net/newsticker-tests.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/net/puny-tests.el b/test/lisp/net/puny-tests.el
index b06364e..3f69b60 100644
--- a/test/lisp/net/puny-tests.el
+++ b/test/lisp/net/puny-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/lisp/net/sasl-scram-rfc-tests.el 
b/test/lisp/net/sasl-scram-rfc-tests.el
index 96cec77..4fb6f6c 100644
--- a/test/lisp/net/sasl-scram-rfc-tests.el
+++ b/test/lisp/net/sasl-scram-rfc-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/net/shr-tests.el b/test/lisp/net/shr-tests.el
index c82338a..3a30141 100644
--- a/test/lisp/net/shr-tests.el
+++ b/test/lisp/net/shr-tests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index d5fec30..e851530 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -15,7 +15,7 @@
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see `http://www.gnu.org/licenses/'.
+;; along with this program.  If not, see `https://www.gnu.org/licenses/'.
 
 ;;; Commentary:
 
@@ -39,7 +39,6 @@
 
 (require 'dired)
 (require 'ert)
-(require 'seq)
 (require 'tramp)
 (require 'vc)
 (require 'vc-bzr)
@@ -1862,11 +1861,8 @@ This checks also `file-name-as-directory', 
`file-name-directory',
            ;; Do not overwrite if excluded.
            (cl-letf (((symbol-function 'y-or-n-p) (lambda (_prompt) t)))
              (write-region "foo" nil tmp-name nil nil nil 'mustbenew))
-           ;; `mustbenew' is passed to Tramp since Emacs 26.1.  We
-           ;; have no test for this, so we check function
-           ;; `temporary-file-directory', which has been added to
-           ;; Emacs 26.1 as well.
-           (when (fboundp 'temporary-file-directory)
+           ;; `mustbenew' is passed to Tramp since Emacs 26.1.
+           (when (tramp--test-emacs26-p)
              (should-error
               (cl-letf (((symbol-function 'y-or-n-p) 'ignore))
                 (write-region "foo" nil tmp-name nil nil nil 'mustbenew))
@@ -1905,9 +1901,11 @@ This checks also `file-name-as-directory', 
`file-name-directory',
             :type 'file-already-exists)
            (copy-file tmp-name1 tmp-name2 'ok)
            (make-directory tmp-name3)
-           (should-error
-            (copy-file tmp-name1 tmp-name3)
-            :type 'file-already-exists)
+           ;; This has been changed in Emacs 26.1.
+           (when (tramp--test-emacs26-p)
+             (should-error
+              (copy-file tmp-name1 tmp-name3)
+              :type 'file-already-exists))
            (copy-file tmp-name1 (file-name-as-directory tmp-name3))
            (should
             (file-exists-p
@@ -1932,9 +1930,11 @@ This checks also `file-name-as-directory', 
`file-name-directory',
             :type 'file-already-exists)
            (copy-file tmp-name1 tmp-name4 'ok)
            (make-directory tmp-name5)
-           (should-error
-            (copy-file tmp-name1 tmp-name5)
-            :type 'file-already-exists)
+           ;; This has been changed in Emacs 26.1.
+           (when (tramp--test-emacs26-p)
+             (should-error
+              (copy-file tmp-name1 tmp-name5)
+              :type 'file-already-exists))
            (copy-file tmp-name1 (file-name-as-directory tmp-name5))
            (should
             (file-exists-p
@@ -1959,9 +1959,11 @@ This checks also `file-name-as-directory', 
`file-name-directory',
             :type 'file-already-exists)
            (copy-file tmp-name4 tmp-name1 'ok)
            (make-directory tmp-name3)
-           (should-error
-            (copy-file tmp-name4 tmp-name3)
-            :type 'file-already-exists)
+           ;; This has been changed in Emacs 26.1.
+           (when (tramp--test-emacs26-p)
+             (should-error
+              (copy-file tmp-name4 tmp-name3)
+              :type 'file-already-exists))
            (copy-file tmp-name4 (file-name-as-directory tmp-name3))
            (should
             (file-exists-p
@@ -2003,9 +2005,11 @@ This checks also `file-name-as-directory', 
`file-name-directory',
            (should-not (file-exists-p tmp-name1))
            (write-region "foo" nil tmp-name1)
            (make-directory tmp-name3)
-           (should-error
-            (rename-file tmp-name1 tmp-name3)
-            :type 'file-already-exists)
+           ;; This has been changed in Emacs 26.1.
+           (when (tramp--test-emacs26-p)
+             (should-error
+              (rename-file tmp-name1 tmp-name3)
+              :type 'file-already-exists))
            (rename-file tmp-name1 (file-name-as-directory tmp-name3))
            (should-not (file-exists-p tmp-name1))
            (should
@@ -2035,9 +2039,11 @@ This checks also `file-name-as-directory', 
`file-name-directory',
            (should-not (file-exists-p tmp-name1))
            (write-region "foo" nil tmp-name1)
            (make-directory tmp-name5)
-           (should-error
-            (rename-file tmp-name1 tmp-name5)
-            :type 'file-already-exists)
+           ;; This has been changed in Emacs 26.1.
+           (when (tramp--test-emacs26-p)
+             (should-error
+              (rename-file tmp-name1 tmp-name5)
+              :type 'file-already-exists))
            (rename-file tmp-name1 (file-name-as-directory tmp-name5))
            (should-not (file-exists-p tmp-name1))
            (should
@@ -2067,9 +2073,11 @@ This checks also `file-name-as-directory', 
`file-name-directory',
            (should-not (file-exists-p tmp-name4))
            (write-region "foo" nil tmp-name4 nil 'nomessage)
            (make-directory tmp-name3)
-           (should-error
-            (rename-file tmp-name4 tmp-name3)
-            :type 'file-already-exists)
+           ;; This has been changed in Emacs 26.1.
+           (when (tramp--test-emacs26-p)
+             (should-error
+              (rename-file tmp-name4 tmp-name3)
+              :type 'file-already-exists))
            (rename-file tmp-name4 (file-name-as-directory tmp-name3))
            (should-not (file-exists-p tmp-name4))
            (should
@@ -2147,9 +2155,11 @@ This tests also `file-directory-p' and 
`file-accessible-directory-p'."
            (should (file-directory-p tmp-name2))
            (should (file-exists-p tmp-name5))
            ;; Target directory does exist already.
-           (should-error
-            (copy-directory tmp-name1 tmp-name2)
-            :type 'file-error)
+           ;; This has been changed in Emacs 26.1.
+           (when (tramp--test-emacs26-p)
+             (should-error
+              (copy-directory tmp-name1 tmp-name2)
+              :type 'file-error))
            (copy-directory tmp-name1 (file-name-as-directory tmp-name2))
            (should (file-directory-p tmp-name3))
            (should (file-exists-p tmp-name6)))
@@ -2240,30 +2250,44 @@ This tests also `file-directory-p' and 
`file-accessible-directory-p'."
            (should (file-exists-p tmp-name3))
            (should (file-exists-p tmp-name4))
 
-           ;; We cannot use `sort', it works destructive.
-           (should (equal (file-expand-wildcards "*")
-                          (seq-sort 'string< '("foo" "bar" "baz"))))
-           (should (equal (file-expand-wildcards "ba?")
-                          (seq-sort 'string< '("bar" "baz"))))
-           (should (equal (file-expand-wildcards "ba[rz]")
-                          (seq-sort 'string< '("bar" "baz"))))
-
-           (should (equal (file-expand-wildcards "*" 'full)
-                          (seq-sort
-                           'string< `(,tmp-name2 ,tmp-name3 ,tmp-name4))))
-           (should (equal (file-expand-wildcards "ba?" 'full)
-                          (seq-sort 'string< `(,tmp-name3 ,tmp-name4))))
-           (should (equal (file-expand-wildcards "ba[rz]" 'full)
-                          (seq-sort 'string< `(,tmp-name3 ,tmp-name4))))
-
-           (should (equal (file-expand-wildcards (concat tmp-name1 "/" "*"))
-                          (seq-sort
-                           'string< `(,tmp-name2 ,tmp-name3 ,tmp-name4))))
-           (should (equal (file-expand-wildcards (concat tmp-name1 "/" "ba?"))
-                          (seq-sort 'string< `(,tmp-name3 ,tmp-name4))))
-           (should (equal (file-expand-wildcards
-                           (concat tmp-name1 "/" "ba[rz]"))
-                          (seq-sort 'string< `(,tmp-name3 ,tmp-name4)))))
+           ;; `sort' works destructive.
+           (should
+            (equal (file-expand-wildcards "*")
+                   (sort (copy-sequence '("foo" "bar" "baz")) 'string<)))
+           (should
+            (equal (file-expand-wildcards "ba?")
+                   (sort (copy-sequence '("bar" "baz")) 'string<)))
+           (should
+            (equal (file-expand-wildcards "ba[rz]")
+                   (sort (copy-sequence '("bar" "baz")) 'string<)))
+
+           (should
+            (equal
+             (file-expand-wildcards "*" 'full)
+             (sort
+              (copy-sequence `(,tmp-name2 ,tmp-name3 ,tmp-name4)) 'string<)))
+           (should
+            (equal
+             (file-expand-wildcards "ba?" 'full)
+             (sort (copy-sequence `(,tmp-name3 ,tmp-name4)) 'string<)))
+           (should
+            (equal
+             (file-expand-wildcards "ba[rz]" 'full)
+             (sort (copy-sequence `(,tmp-name3 ,tmp-name4)) 'string<)))
+
+           (should
+            (equal
+             (file-expand-wildcards (concat tmp-name1 "/" "*"))
+             (sort
+              (copy-sequence `(,tmp-name2 ,tmp-name3 ,tmp-name4)) 'string<)))
+           (should
+            (equal
+             (file-expand-wildcards (concat tmp-name1 "/" "ba?"))
+             (sort (copy-sequence `(,tmp-name3 ,tmp-name4)) 'string<)))
+           (should
+            (equal
+             (file-expand-wildcards (concat tmp-name1 "/" "ba[rz]"))
+             (sort (copy-sequence `(,tmp-name3 ,tmp-name4)) 'string<))))
 
        ;; Cleanup.
        (ignore-errors
@@ -2616,6 +2640,9 @@ This tests also `file-executable-p', `file-writable-p' 
and `set-file-modes'."
   "Check `file-symlink-p'.
 This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
   (skip-unless (tramp--test-enabled))
+  ;; The semantics has changed heavily in Emacs 26.1.  We cannot test
+  ;; older Emacsen, therefore.
+  (skip-unless (tramp--test-emacs26-p))
 
   (dolist (quoted (if tramp--test-expensive-test '(nil t) '(nil)))
     ;; We must use `file-truename' for the temporary directory,
@@ -3648,6 +3675,12 @@ This tests also `make-symbolic-link', `file-truename' 
and `add-name-to-file'."
     (delete-directory tmp-file)
     (should-not (file-exists-p tmp-file))))
 
+(defun tramp--test-emacs26-p ()
+  "Check for Emacs version >= 26.1.
+Some semantics has been changed for there, w/o new functions or
+variables, so we check function Emacs version directly."
+  (>= emacs-major-version 26))
+
 (defun tramp--test-adb-p ()
   "Check, whether the remote host runs Android.
 This requires restrictions of file name syntax."
diff --git a/test/lisp/obarray-tests.el b/test/lisp/obarray-tests.el
index 4908b88..dca7c85 100644
--- a/test/lisp/obarray-tests.el
+++ b/test/lisp/obarray-tests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/progmodes/bat-mode-tests.el 
b/test/lisp/progmodes/bat-mode-tests.el
index 565718e..71660ca 100644
--- a/test/lisp/progmodes/bat-mode-tests.el
+++ b/test/lisp/progmodes/bat-mode-tests.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/progmodes/cc-mode-tests.el 
b/test/lisp/progmodes/cc-mode-tests.el
index 10f424f..402bf47 100644
--- a/test/lisp/progmodes/cc-mode-tests.el
+++ b/test/lisp/progmodes/cc-mode-tests.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 
 ;;; Commentary:
diff --git a/test/lisp/progmodes/compile-tests.el 
b/test/lisp/progmodes/compile-tests.el
index 5c8c9c2..2de52da 100644
--- a/test/lisp/progmodes/compile-tests.el
+++ b/test/lisp/progmodes/compile-tests.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/progmodes/elisp-mode-tests.el 
b/test/lisp/progmodes/elisp-mode-tests.el
index 675aa31..a6c64ed 100644
--- a/test/lisp/progmodes/elisp-mode-tests.el
+++ b/test/lisp/progmodes/elisp-mode-tests.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/lisp/progmodes/etags-tests.el 
b/test/lisp/progmodes/etags-tests.el
index 845f3fe..f839331 100644
--- a/test/lisp/progmodes/etags-tests.el
+++ b/test/lisp/progmodes/etags-tests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/lisp/progmodes/f90-tests.el b/test/lisp/progmodes/f90-tests.el
index 533a671..0c03a19 100644
--- a/test/lisp/progmodes/f90-tests.el
+++ b/test/lisp/progmodes/f90-tests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -71,7 +71,7 @@ end program progname
     (should (string-equal (buffer-string) f90-test-indent))))
 
 (ert-deftest f90-test-bug3729 ()
-  "Test for http://debbugs.gnu.org/3729 ."
+  "Test for https://debbugs.gnu.org/3729 ."
   :expected-result :failed
   (with-temp-buffer
     (f90-mode)
@@ -90,7 +90,7 @@ end subroutine test")
     (should (= 0 (current-indentation)))))
 
 (ert-deftest f90-test-bug3730 ()
-  "Test for http://debbugs.gnu.org/3730 ."
+  "Test for https://debbugs.gnu.org/3730 ."
   (with-temp-buffer
     (f90-mode)
     (insert "a" )
@@ -104,7 +104,7 @@ end subroutine test")
 ;; TODO bug#5593
 
 (ert-deftest f90-test-bug8691 ()
-  "Test for http://debbugs.gnu.org/8691 ."
+  "Test for https://debbugs.gnu.org/8691 ."
   (with-temp-buffer
     (f90-mode)
     (insert "module modname
@@ -119,13 +119,13 @@ end module modname")
 ;; TODO bug#8812
 
 (ert-deftest f90-test-bug8820 ()
-  "Test for http://debbugs.gnu.org/8820 ."
+  "Test for https://debbugs.gnu.org/8820 ."
   (with-temp-buffer
     (f90-mode)
     (should (eq (char-syntax ?%) (string-to-char ".")))))
 
 (ert-deftest f90-test-bug9553a ()
-  "Test for http://debbugs.gnu.org/9553 ."
+  "Test for https://debbugs.gnu.org/9553 ."
   (with-temp-buffer
     (f90-mode)
     (insert "!!!")
@@ -136,7 +136,7 @@ end module modname")
     (should (equal "!!! a" (buffer-substring (point) (+ 5 (point)))))))
 
 (ert-deftest f90-test-bug9553b ()
-  "Test for http://debbugs.gnu.org/9553 ."
+  "Test for https://debbugs.gnu.org/9553 ."
   (with-temp-buffer
     (f90-mode)
     (insert "!!!")
@@ -147,7 +147,7 @@ end module modname")
     (should (equal "!!! a" (buffer-substring (point) (+ 5 (point)))))))
 
 (ert-deftest f90-test-bug9690 ()
-  "Test for http://debbugs.gnu.org/9690 ."
+  "Test for https://debbugs.gnu.org/9690 ."
   (with-temp-buffer
     (f90-mode)
     (insert "#include \"foo.h\"")
@@ -155,7 +155,7 @@ end module modname")
     (should (= 0 (current-indentation)))))
 
 (ert-deftest f90-test-bug13138 ()
-  "Test for http://debbugs.gnu.org/13138 ."
+  "Test for https://debbugs.gnu.org/13138 ."
   (with-temp-buffer
     (f90-mode)
     (insert "program prog
@@ -174,7 +174,7 @@ end program prog")
     (should (= 0 (current-indentation)))))
 
 (ert-deftest f90-test-bug-19809 ()
-  "Test for http://debbugs.gnu.org/19809 ."
+  "Test for https://debbugs.gnu.org/19809 ."
   (with-temp-buffer
     (f90-mode)
     ;; The Fortran standard says that continued strings should have
@@ -189,7 +189,7 @@ end program prog")
     (should (= (point) (point-max)))))
 
 (ert-deftest f90-test-bug20680 ()
-  "Test for http://debbugs.gnu.org/20680 ."
+  "Test for https://debbugs.gnu.org/20680 ."
   (with-temp-buffer
     (f90-mode)
     (insert "module modname
@@ -202,7 +202,7 @@ end module modname")
     (should (= 2 (current-indentation)))))
 
 (ert-deftest f90-test-bug20680b ()
-  "Test for http://debbugs.gnu.org/20680 ."
+  "Test for https://debbugs.gnu.org/20680 ."
   (with-temp-buffer
     (f90-mode)
     (insert "module modname
@@ -215,7 +215,7 @@ end module modname")
     (should (= 2 (current-indentation)))))
 
 (ert-deftest f90-test-bug20969 ()
-  "Test for http://debbugs.gnu.org/20969 ."
+  "Test for https://debbugs.gnu.org/20969 ."
   (with-temp-buffer
     (f90-mode)
     (insert "module modname
@@ -228,7 +228,7 @@ end module modname")
     (should (= 2 (current-indentation)))))
 
 (ert-deftest f90-test-bug20969b ()
-  "Test for http://debbugs.gnu.org/20969 ."
+  "Test for https://debbugs.gnu.org/20969 ."
   (with-temp-buffer
     (f90-mode)
     (insert "module modname
@@ -241,7 +241,7 @@ end module modname")
     (should (= 2 (current-indentation)))))
 
 (ert-deftest f90-test-bug21794 ()
-  "Test for http://debbugs.gnu.org/21794 ."
+  "Test for https://debbugs.gnu.org/21794 ."
   (with-temp-buffer
     (f90-mode)
     (insert "program prog
@@ -256,7 +256,7 @@ end program prog")
     (should (= 5 (current-indentation)))))
 
 (ert-deftest f90-test-bug25039 ()
-  "Test for http://debbugs.gnu.org/25039 ."
+  "Test for https://debbugs.gnu.org/25039 ."
   (with-temp-buffer
     (f90-mode)
     (insert "program prog
diff --git a/test/lisp/progmodes/flymake-tests.el 
b/test/lisp/progmodes/flymake-tests.el
index 9bf6e7a..b04346f 100644
--- a/test/lisp/progmodes/flymake-tests.el
+++ b/test/lisp/progmodes/flymake-tests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -41,7 +41,7 @@
           (setq-local flymake-warning-predicate predicate)
           (goto-char (point-min))
           (flymake-mode 1)
-          ;; Weirdness here...  http://debbugs.gnu.org/17647#25
+          ;; Weirdness here...  https://debbugs.gnu.org/17647#25
           (while (and flymake-is-running (< (setq i (1+ i)) 10))
             (sleep-for (+ 0.5 flymake-no-changes-timeout)))
           (flymake-goto-next-error)
diff --git a/test/lisp/progmodes/js-tests.el b/test/lisp/progmodes/js-tests.el
index 4e27913..35143b1 100644
--- a/test/lisp/progmodes/js-tests.el
+++ b/test/lisp/progmodes/js-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/progmodes/python-tests.el 
b/test/lisp/progmodes/python-tests.el
index 57e40ff..a598856 100644
--- a/test/lisp/progmodes/python-tests.el
+++ b/test/lisp/progmodes/python-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/progmodes/ruby-mode-tests.el 
b/test/lisp/progmodes/ruby-mode-tests.el
index f04483f..aa177e3 100644
--- a/test/lisp/progmodes/ruby-mode-tests.el
+++ b/test/lisp/progmodes/ruby-mode-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/progmodes/sql-tests.el b/test/lisp/progmodes/sql-tests.el
index f75005f..ad22906 100644
--- a/test/lisp/progmodes/sql-tests.el
+++ b/test/lisp/progmodes/sql-tests.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/progmodes/subword-tests.el 
b/test/lisp/progmodes/subword-tests.el
index 39512ef..66fe147 100644
--- a/test/lisp/progmodes/subword-tests.el
+++ b/test/lisp/progmodes/subword-tests.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -58,12 +58,12 @@
       (insert line)
 
       ;; Test forward motion.
-      
+
       (goto-char (point-min))
       (let ((stops (make-string (length fwrd) ?\ )))
         (while (progn
                  (aset stops (1- (point)) ?\*)
-                 (not (eobp)))          
+                 (not (eobp)))
           (forward-word))
         (should (equal stops fwrd)))
 
@@ -73,7 +73,7 @@
       (let ((stops (make-string (length bkwd) ?\ )))
         (while (progn
                  (aset stops (1- (point)) ?\*)
-                 (not (bobp)))          
+                 (not (bobp)))
           (backward-word))
         (should (equal stops bkwd))))))
 
diff --git a/test/lisp/progmodes/xref-tests.el 
b/test/lisp/progmodes/xref-tests.el
index b7f0f05..465aab5 100644
--- a/test/lisp/progmodes/xref-tests.el
+++ b/test/lisp/progmodes/xref-tests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/ps-print-tests.el b/test/lisp/ps-print-tests.el
index e1df37b..0eb65aa 100644
--- a/test/lisp/ps-print-tests.el
+++ b/test/lisp/ps-print-tests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/register-tests.el b/test/lisp/register-tests.el
index 2e31602..fd6d1ed 100644
--- a/test/lisp/register-tests.el
+++ b/test/lisp/register-tests.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -28,7 +28,7 @@
 (require 'cl-lib)
 
 (ert-deftest register-test-bug27634 ()
-  "Test for http://debbugs.gnu.org/27634 ."
+  "Test for https://debbugs.gnu.org/27634 ."
   (dolist (event (list ?\C-g 'escape ?\C-\[))
     (cl-letf (((symbol-function 'read-key) #'ignore)
               (last-input-event event)
diff --git a/test/lisp/replace-tests.el b/test/lisp/replace-tests.el
index a8bc540..b98406d 100644
--- a/test/lisp/replace-tests.el
+++ b/test/lisp/replace-tests.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/lisp/rot13-tests.el b/test/lisp/rot13-tests.el
index 70fe345..1eae397 100644
--- a/test/lisp/rot13-tests.el
+++ b/test/lisp/rot13-tests.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/ses-tests.el b/test/lisp/ses-tests.el
index 8fff6f7..3194b26 100644
--- a/test/lisp/ses-tests.el
+++ b/test/lisp/ses-tests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/lisp/shell-tests.el b/test/lisp/shell-tests.el
index 6eb9cdc..c511500 100644
--- a/test/lisp/shell-tests.el
+++ b/test/lisp/shell-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/simple-tests.el b/test/lisp/simple-tests.el
index 7cb7107..90a627f 100644
--- a/test/lisp/simple-tests.el
+++ b/test/lisp/simple-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/lisp/sort-tests.el b/test/lisp/sort-tests.el
index f6cbe90..a53b8e5 100644
--- a/test/lisp/sort-tests.el
+++ b/test/lisp/sort-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/lisp/soundex-tests.el b/test/lisp/soundex-tests.el
index d1bc99d..59bdfa4 100644
--- a/test/lisp/soundex-tests.el
+++ b/test/lisp/soundex-tests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/subr-tests.el b/test/lisp/subr-tests.el
index a59f0ca..ac9e2df 100644
--- a/test/lisp/subr-tests.el
+++ b/test/lisp/subr-tests.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -293,7 +293,7 @@ cf. Bug#25477."
                 :type 'wrong-type-argument))
 
 (ert-deftest subr-tests-bug22027 ()
-  "Test for http://debbugs.gnu.org/22027 ."
+  "Test for https://debbugs.gnu.org/22027 ."
   (let ((default "foo") res)
     (cl-letf (((symbol-function 'read-string)
                (lambda (_prompt _init _hist def) def)))
diff --git a/test/lisp/tar-mode-tests.el b/test/lisp/tar-mode-tests.el
index 76ec058..e005c2d 100644
--- a/test/lisp/tar-mode-tests.el
+++ b/test/lisp/tar-mode-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 (require 'ert)
diff --git a/test/lisp/textmodes/css-mode-tests.el 
b/test/lisp/textmodes/css-mode-tests.el
index 68946a0..f93fdbb 100644
--- a/test/lisp/textmodes/css-mode-tests.el
+++ b/test/lisp/textmodes/css-mode-tests.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/textmodes/dns-mode-tests.el 
b/test/lisp/textmodes/dns-mode-tests.el
index 34e8620..f71f904 100644
--- a/test/lisp/textmodes/dns-mode-tests.el
+++ b/test/lisp/textmodes/dns-mode-tests.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/lisp/textmodes/mhtml-mode-tests.el 
b/test/lisp/textmodes/mhtml-mode-tests.el
index 020ad03..df49f67 100644
--- a/test/lisp/textmodes/mhtml-mode-tests.el
+++ b/test/lisp/textmodes/mhtml-mode-tests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/textmodes/reftex-tests.el 
b/test/lisp/textmodes/reftex-tests.el
index 55db66c..0b67b2e 100644
--- a/test/lisp/textmodes/reftex-tests.el
+++ b/test/lisp/textmodes/reftex-tests.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/lisp/textmodes/sgml-mode-tests.el 
b/test/lisp/textmodes/sgml-mode-tests.el
index e1aa3e8..4281ab8 100644
--- a/test/lisp/textmodes/sgml-mode-tests.el
+++ b/test/lisp/textmodes/sgml-mode-tests.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/textmodes/tildify-tests.el 
b/test/lisp/textmodes/tildify-tests.el
index f958fbc..3003829 100644
--- a/test/lisp/textmodes/tildify-tests.el
+++ b/test/lisp/textmodes/tildify-tests.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/thingatpt-tests.el b/test/lisp/thingatpt-tests.el
index 1285342..aeee3b5 100644
--- a/test/lisp/thingatpt-tests.el
+++ b/test/lisp/thingatpt-tests.el
@@ -15,23 +15,23 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
 (require 'ert)
 
 (defvar thing-at-point-test-data
-  '(("http://1.gnu.org"; 1  url "http://1.gnu.org";)
-    ("http://2.gnu.org"; 6 url "http://2.gnu.org";)
-    ("http://3.gnu.org"; 19 url "http://3.gnu.org";)
+  '(("https://1.gnu.org"; 1  url "https://1.gnu.org";)
+    ("https://2.gnu.org"; 6 url "https://2.gnu.org";)
+    ("https://3.gnu.org"; 19 url "https://3.gnu.org";)
     ("https://4.gnu.org"; 1  url "https://4.gnu.org";)
     ("A geo URI (geo:3.14159,-2.71828)." 12 url "geo:3.14159,-2.71828")
-    ("Visit http://5.gnu.org now." 5 url nil)
-    ("Visit http://6.gnu.org now." 7 url "http://6.gnu.org";)
-    ("Visit http://7.gnu.org now." 22 url "http://7.gnu.org";)
-    ("Visit http://8.gnu.org now." 22 url "http://8.gnu.org";)
-    ("Visit http://9.gnu.org now." 24 url nil)
+    ("Visit https://5.gnu.org now." 5 url nil)
+    ("Visit https://6.gnu.org now." 7 url "https://6.gnu.org";)
+    ("Visit https://7.gnu.org now." 22 url "https://7.gnu.org";)
+    ("Visit https://8.gnu.org now." 22 url "https://8.gnu.org";)
+    ("Visit https://9.gnu.org now." 25 url nil)
     ;; Invalid URIs
     ("<<<<" 2 url nil)
     ("<>" 1 url nil)
@@ -48,13 +48,13 @@
     ("Url: <url:foo://2.example.com>..." 30 url "foo://2.example.com")
     ("Url: <url:foo://www.gnu.org/a bc>..." 20 url "foo://www.gnu.org/a bc")
     ;; Hack used by thing-at-point: drop punctuation at end of URI.
-    ("Go to http://www.gnu.org, for details" 7 url "http://www.gnu.org";)
-    ("Go to http://www.gnu.org."; 24 url "http://www.gnu.org";)
+    ("Go to https://www.gnu.org, for details" 7 url "https://www.gnu.org";)
+    ("Go to https://www.gnu.org."; 24 url "https://www.gnu.org";)
     ;; Standard URI delimiters
-    ("Go to \"http://10.gnu.org\"."; 8 url "http://10.gnu.org";)
-    ("Go to \"http://11.gnu.org/\"."; 26 url "http://11.gnu.org/";)
-    ("Go to <http://12.gnu.org> now." 8 url "http://12.gnu.org";)
-    ("Go to <http://13.gnu.org> now." 24 url "http://13.gnu.org";)
+    ("Go to \"https://10.gnu.org\"."; 8 url "https://10.gnu.org";)
+    ("Go to \"https://11.gnu.org/\"."; 26 url "https://11.gnu.org/";)
+    ("Go to <https://12.gnu.org> now." 8 url "https://12.gnu.org";)
+    ("Go to <https://13.gnu.org> now." 24 url "https://13.gnu.org";)
     ;; Parenthesis handling (non-standard)
     ("http://example.com/a(b)c" 21 url "http://example.com/a(b)c")
     ("http://example.com/a(b)" 21 url "http://example.com/a(b)")
@@ -87,7 +87,7 @@ position to retrieve THING.")
 ;; These tests reflect the actual behavior of
 ;; `thing-at-point-bounds-of-list-at-point'.
 (ert-deftest thing-at-point-bug24627 ()
-  "Test for http://debbugs.gnu.org/24627 ."
+  "Test for https://debbugs.gnu.org/24627 ."
   (let ((string-result '(("(a \"b\" c)" . (a "b" c))
                          (";(a \"b\" c)")
                          ("(a \"b\" c\n)" . (a "b" c))
diff --git a/test/lisp/url/url-auth-tests.el b/test/lisp/url/url-auth-tests.el
index 30636db..e7aeb6e 100644
--- a/test/lisp/url/url-auth-tests.el
+++ b/test/lisp/url/url-auth-tests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/url/url-expand-tests.el 
b/test/lisp/url/url-expand-tests.el
index 2debbde..d147bdd 100644
--- a/test/lisp/url/url-expand-tests.el
+++ b/test/lisp/url/url-expand-tests.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/url/url-future-tests.el 
b/test/lisp/url/url-future-tests.el
index 64d0452..e7bcbd6 100644
--- a/test/lisp/url/url-future-tests.el
+++ b/test/lisp/url/url-future-tests.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/lisp/url/url-parse-tests.el b/test/lisp/url/url-parse-tests.el
index fd8abb0..56be313 100644
--- a/test/lisp/url/url-parse-tests.el
+++ b/test/lisp/url/url-parse-tests.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/url/url-util-tests.el b/test/lisp/url/url-util-tests.el
index c337589..0d9ad90 100644
--- a/test/lisp/url/url-util-tests.el
+++ b/test/lisp/url/url-util-tests.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/lisp/vc/add-log-tests.el b/test/lisp/vc/add-log-tests.el
index 3e7bc7f..746c216 100644
--- a/test/lisp/vc/add-log-tests.el
+++ b/test/lisp/vc/add-log-tests.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/lisp/vc/diff-mode-tests.el b/test/lisp/vc/diff-mode-tests.el
index 807a411..d27ea66 100644
--- a/test/lisp/vc/diff-mode-tests.el
+++ b/test/lisp/vc/diff-mode-tests.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
@@ -89,7 +89,7 @@ index 8858f0d..86e8ea5 100644
  wrongheadedness
 -xylophonists
  youthfulness
--- 
+--
 2.11.0
 
 ")
@@ -186,7 +186,7 @@ youthfulness
               (diff-apply-hunk)
               (diff-apply-hunk)
               (diff-apply-hunk))
-            
+
             (should (equal (with-current-buffer buf (buffer-string))
                            fil_after))
             (should (equal (with-current-buffer buf2 (buffer-string))
diff --git a/test/lisp/vc/ediff-diff-tests.el b/test/lisp/vc/ediff-diff-tests.el
index 566f592..09aa106 100644
--- a/test/lisp/vc/ediff-diff-tests.el
+++ b/test/lisp/vc/ediff-diff-tests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/vc/ediff-ptch-tests.el b/test/lisp/vc/ediff-ptch-tests.el
index 6fbc1b0..368d00a 100644
--- a/test/lisp/vc/ediff-ptch-tests.el
+++ b/test/lisp/vc/ediff-ptch-tests.el
@@ -15,7 +15,7 @@
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see `http://www.gnu.org/licenses/'.
+;; along with this program.  If not, see `https://www.gnu.org/licenses/'.
 
 ;;; Code:
 
@@ -23,7 +23,7 @@
 (require 'ediff-ptch)
 
 (ert-deftest ediff-ptch-test-bug25010 ()
-  "Test for http://debbugs.gnu.org/25010 ."
+  "Test for https://debbugs.gnu.org/25010 ."
   (with-temp-buffer
     (insert "diff --git a/lisp/vc/ediff-ptch.el b/lisp/vc/ediff-ptch.el
 index 6a07f80..6e8e947 100644
@@ -40,7 +40,7 @@ index 6a07f80..6e8e947 100644
 
 
 (ert-deftest ediff-ptch-test-bug26084 ()
-  "Test for http://debbugs.gnu.org/26084 ."
+  "Test for https://debbugs.gnu.org/26084 ."
   (skip-unless (executable-find "git"))
   (skip-unless (executable-find ediff-patch-program))
   (let* ((tmpdir (make-temp-file "ediff-ptch-test" t))
diff --git a/test/lisp/vc/vc-bzr-tests.el b/test/lisp/vc/vc-bzr-tests.el
index fc7d8f8..e751f56 100644
--- a/test/lisp/vc/vc-bzr-tests.el
+++ b/test/lisp/vc/vc-bzr-tests.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -29,7 +29,7 @@
 (require 'vc-dir)
 
 (ert-deftest vc-bzr-test-bug9726 ()
-  "Test for http://debbugs.gnu.org/9726 ."
+  "Test for https://debbugs.gnu.org/9726 ."
   (skip-unless (executable-find vc-bzr-program))
   ;; Bzr wants to access HOME, e.g. to write ~/.bzr.log.
   ;; This is a problem on hydra, where HOME is non-existent.
@@ -71,7 +71,7 @@
 
 ;; Not specific to bzr.
 (ert-deftest vc-bzr-test-bug9781 ()
-  "Test for http://debbugs.gnu.org/9781 ."
+  "Test for https://debbugs.gnu.org/9781 ."
   (skip-unless (executable-find vc-bzr-program))
   (let* ((homedir (make-temp-file "vc-bzr-test" t))
          (bzrdir (expand-file-name "bzr" homedir))
diff --git a/test/lisp/vc/vc-hg-tests.el b/test/lisp/vc/vc-hg-tests.el
index 284e06a..96fc41e 100644
--- a/test/lisp/vc/vc-hg-tests.el
+++ b/test/lisp/vc/vc-hg-tests.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/vc/vc-tests.el b/test/lisp/vc/vc-tests.el
index 1104085..b970be8 100644
--- a/test/lisp/vc/vc-tests.el
+++ b/test/lisp/vc/vc-tests.el
@@ -15,7 +15,7 @@
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see `http://www.gnu.org/licenses/'.
+;; along with this program.  If not, see `https://www.gnu.org/licenses/'.
 
 ;;; Commentary:
 
diff --git a/test/lisp/whitespace-tests.el b/test/lisp/whitespace-tests.el
index 1e45535..ba99ddc 100644
--- a/test/lisp/whitespace-tests.el
+++ b/test/lisp/whitespace-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/lisp/xdg-tests.el b/test/lisp/xdg-tests.el
index 2630e1e..e3c9a74 100644
--- a/test/lisp/xdg-tests.el
+++ b/test/lisp/xdg-tests.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/xml-tests.el b/test/lisp/xml-tests.el
index 16945b0..ba69349 100644
--- a/test/lisp/xml-tests.el
+++ b/test/lisp/xml-tests.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/xt-mouse-tests.el b/test/lisp/xt-mouse-tests.el
index c0e97f5..53844a6 100644
--- a/test/lisp/xt-mouse-tests.el
+++ b/test/lisp/xt-mouse-tests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/manual/biditest.el b/test/manual/biditest.el
index c315749..667e537 100644
--- a/test/manual/biditest.el
+++ b/test/manual/biditest.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/manual/cedet/cedet-utests.el 
b/test/manual/cedet/cedet-utests.el
index b8396b8..19a144f 100644
--- a/test/manual/cedet/cedet-utests.el
+++ b/test/manual/cedet/cedet-utests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/test/manual/cedet/ede-tests.el b/test/manual/cedet/ede-tests.el
index fdad01c..e24bdf7 100644
--- a/test/manual/cedet/ede-tests.el
+++ b/test/manual/cedet/ede-tests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/manual/cedet/semantic-ia-utest.el 
b/test/manual/cedet/semantic-ia-utest.el
index cf89daf..7861fd7 100644
--- a/test/manual/cedet/semantic-ia-utest.el
+++ b/test/manual/cedet/semantic-ia-utest.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/test/manual/cedet/semantic-tests.el 
b/test/manual/cedet/semantic-tests.el
index bfcba7e..3a19328 100644
--- a/test/manual/cedet/semantic-tests.el
+++ b/test/manual/cedet/semantic-tests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/manual/cedet/semantic-utest-c.el 
b/test/manual/cedet/semantic-utest-c.el
index 26ce400..6adfb1f 100644
--- a/test/manual/cedet/semantic-utest-c.el
+++ b/test/manual/cedet/semantic-utest-c.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/test/manual/cedet/semantic-utest.el 
b/test/manual/cedet/semantic-utest.el
index f735e55..6d499ee 100644
--- a/test/manual/cedet/semantic-utest.el
+++ b/test/manual/cedet/semantic-utest.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/test/manual/cedet/srecode-tests.el 
b/test/manual/cedet/srecode-tests.el
index 36256a7..5d387a2 100644
--- a/test/manual/cedet/srecode-tests.el
+++ b/test/manual/cedet/srecode-tests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/manual/cedet/tests/test.c b/test/manual/cedet/tests/test.c
index a464869..c5958c4 100644
--- a/test/manual/cedet/tests/test.c
+++ b/test/manual/cedet/tests/test.c
@@ -17,7 +17,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+   along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 */
 
 /* Attempt to include as many aspects of the C language as possible.
@@ -54,7 +54,7 @@ struct {
   int slot31;
   char slot32;
   float slot33;
-} var_of_anonymous_struct;  
+} var_of_anonymous_struct;
 
 typedef struct mystruct1 typedef_of_mystruct1;
 typedef struct mystruct1 *typedef_of_pointer_mystruct1;
@@ -80,7 +80,7 @@ struct {
   int slot61;
   char slot72;
   float slot83;
-} var_of_anonymous_union;  
+} var_of_anonymous_union;
 
 typedef union myunion1 typedef_of_myunion1;
 typedef union myunion1 *typedef_of_pointer_myunion1;
@@ -235,8 +235,7 @@ int funk3(arg_51, arg_53)
 int funk4_fixme(arg_61, arg_62)
      int arg_61, arg_62;
 {
-  
+
 }
 
 /* End of C tests */
-
diff --git a/test/manual/cedet/tests/test.el b/test/manual/cedet/tests/test.el
index a0efd40..299bea0 100644
--- a/test/manual/cedet/tests/test.el
+++ b/test/manual/cedet/tests/test.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Require
 ;;
diff --git a/test/manual/cedet/tests/test.make 
b/test/manual/cedet/tests/test.make
index 46421da..ff16957 100644
--- a/test/manual/cedet/tests/test.make
+++ b/test/manual/cedet/tests/test.make
@@ -17,7 +17,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 top=
 ede_FILES=Project.ede Makefile
@@ -42,7 +42,7 @@ all: example semantic Languages tools senator semantic.info
 test ${B}: foo bar
        @echo ${A}
 
-example: 
+example:
        @
 
 init: $(init_LISP)
diff --git a/test/manual/cedet/tests/testdoublens.cpp 
b/test/manual/cedet/tests/testdoublens.cpp
index e9a6ba5..c9a2f99 100644
--- a/test/manual/cedet/tests/testdoublens.cpp
+++ b/test/manual/cedet/tests/testdoublens.cpp
@@ -17,7 +17,7 @@
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+// along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 #include "testdoublens.hpp"
 
@@ -163,4 +163,3 @@ namespace d {
 
   } // namespace f
 } // namespace d
-
diff --git a/test/manual/cedet/tests/testdoublens.hpp 
b/test/manual/cedet/tests/testdoublens.hpp
index 556f068..59eec74 100644
--- a/test/manual/cedet/tests/testdoublens.hpp
+++ b/test/manual/cedet/tests/testdoublens.hpp
@@ -17,7 +17,7 @@
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+// along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 namespace Name1 {
   namespace Name2 {
@@ -34,7 +34,7 @@ namespace Name1 {
       void publishStuff(int a, int b);
 
       void sendStuff(int a, int b);
-    
+
       Mumble* pMumble;
     };
 
@@ -67,4 +67,3 @@ namespace a {
 
   } // namespace b
 } // namespace a
-
diff --git a/test/manual/cedet/tests/testjavacomp.java 
b/test/manual/cedet/tests/testjavacomp.java
index c32a17c..743aaca 100644
--- a/test/manual/cedet/tests/testjavacomp.java
+++ b/test/manual/cedet/tests/testjavacomp.java
@@ -17,7 +17,7 @@
 //  GNU General Public License for more details.
 
 //  You should have received a copy of the GNU General Public License
-//  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+//  along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 package tests.testjavacomp;
 
diff --git a/test/manual/cedet/tests/testpolymorph.cpp 
b/test/manual/cedet/tests/testpolymorph.cpp
index 27aa08b..86bc75c 100644
--- a/test/manual/cedet/tests/testpolymorph.cpp
+++ b/test/manual/cedet/tests/testpolymorph.cpp
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include <cmath>
diff --git a/test/manual/cedet/tests/testspp.c 
b/test/manual/cedet/tests/testspp.c
index 02eab53..dc8f4a5 100644
--- a/test/manual/cedet/tests/testspp.c
+++ b/test/manual/cedet/tests/testspp.c
@@ -17,7 +17,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+   along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 */
 
 int some_fcn (){}
@@ -99,4 +99,3 @@ int no_show_moose_elif_2() {}
 #else
 int show_moose_elif_else() {}
 #endif
-
diff --git a/test/manual/cedet/tests/testsppreplace.c 
b/test/manual/cedet/tests/testsppreplace.c
index 56ef320..5c63a09 100644
--- a/test/manual/cedet/tests/testsppreplace.c
+++ b/test/manual/cedet/tests/testsppreplace.c
@@ -16,7 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+   along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 */
 
 /* TEST: The EMU keyword doesn't screw up the function defn. */
@@ -151,4 +151,3 @@ int STARTMACRO () {
 
 
 /* END */
-
diff --git a/test/manual/cedet/tests/testsppreplaced.c 
b/test/manual/cedet/tests/testsppreplaced.c
index 3ba90aa..f60be8b 100644
--- a/test/manual/cedet/tests/testsppreplaced.c
+++ b/test/manual/cedet/tests/testsppreplaced.c
@@ -16,7 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+   along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 */
 
 /* What the SPP replace file would looklike with MACROS replaced: */
diff --git a/test/manual/cedet/tests/testsubclass.cpp 
b/test/manual/cedet/tests/testsubclass.cpp
index e74ca43..df8399e 100644
--- a/test/manual/cedet/tests/testsubclass.cpp
+++ b/test/manual/cedet/tests/testsubclass.cpp
@@ -17,7 +17,7 @@
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+// along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 //#include <iostream>
 #include "testsubclass.hh"
@@ -246,4 +246,3 @@ bool sneaky::bugalope::testAccess() //^9^
     // #14# ( "fBugPrivate" "fBugProtected" "fBugPublic" "fQuadPublic" 
"testAccess" )
     ;
 }
-
diff --git a/test/manual/cedet/tests/testsubclass.hh 
b/test/manual/cedet/tests/testsubclass.hh
index 6f199c2..fe07b6f 100644
--- a/test/manual/cedet/tests/testsubclass.hh
+++ b/test/manual/cedet/tests/testsubclass.hh
@@ -17,7 +17,7 @@
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+// along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 //#include <cmath>
 // #include <stdio.h>
@@ -40,7 +40,7 @@ namespace animal {
 
     enum moose_enum {
       NAME1, NAME2, NAME3 };
-      
+
 
   protected:
 
@@ -50,7 +50,7 @@ namespace animal {
   private:
     int fFeet; // Usually 2 or 4.
     bool fIsPrivateBool;
-    
+
   }; // moose
 
   int two_prototypes();
@@ -188,4 +188,3 @@ namespace sneaky {
 };
 
 #endif
-
diff --git a/test/manual/cedet/tests/testtypedefs.cpp 
b/test/manual/cedet/tests/testtypedefs.cpp
index e6c91f7..5bc79fc 100644
--- a/test/manual/cedet/tests/testtypedefs.cpp
+++ b/test/manual/cedet/tests/testtypedefs.cpp
@@ -17,7 +17,7 @@
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+// along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 // Thanks Ming-Wei Chang for these examples.
 
@@ -78,4 +78,3 @@ int main()
   // #4# ("otherFunc")
   return 0;
 }
-
diff --git a/test/manual/cedet/tests/testvarnames.c 
b/test/manual/cedet/tests/testvarnames.c
index dbc4afb..a328f97 100644
--- a/test/manual/cedet/tests/testvarnames.c
+++ b/test/manual/cedet/tests/testvarnames.c
@@ -18,7 +18,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+   along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 */
 
 struct independent {
diff --git a/test/manual/etags/c-src/emacs/src/gmalloc.c 
b/test/manual/etags/c-src/emacs/src/gmalloc.c
index 79b2040..3f8cad8 100644
--- a/test/manual/etags/c-src/emacs/src/gmalloc.c
+++ b/test/manual/etags/c-src/emacs/src/gmalloc.c
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
GNU
 General Public License for more details.
 
 You should have received a copy of the GNU General Public
-License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+License along with this library.  If not, see <https://www.gnu.org/licenses/>.
 
    The author may be reached (Email) at the address address@hidden,
    or (US mail) as Mike Haertel c/o Free Software Foundation.  */
@@ -339,7 +339,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the GNU
 General Public License for more details.
 
 You should have received a copy of the GNU General Public
-License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+License along with this library.  If not, see <https://www.gnu.org/licenses/>.
 
    The author may be reached (Email) at the address address@hidden,
    or (US mail) as Mike Haertel c/o Free Software Foundation.  */
@@ -991,7 +991,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the GNU
 General Public License for more details.
 
 You should have received a copy of the GNU General Public
-License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+License along with this library.  If not, see <https://www.gnu.org/licenses/>.
 
    The author may be reached (Email) at the address address@hidden,
    or (US mail) as Mike Haertel c/o Free Software Foundation.  */
@@ -1297,7 +1297,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the GNU
 General Public License for more details.
 
 You should have received a copy of the GNU General Public
-License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+License along with this library.  If not, see <https://www.gnu.org/licenses/>.
 
    The author may be reached (Email) at the address address@hidden,
    or (US mail) as Mike Haertel c/o Free Software Foundation.  */
@@ -1467,7 +1467,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the GNU
 General Public License for more details.
 
 You should have received a copy of the GNU General Public
-License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+License along with this library.  If not, see <https://www.gnu.org/licenses/>.
 
    The author may be reached (Email) at the address address@hidden,
    or (US mail) as Mike Haertel c/o Free Software Foundation.  */
@@ -1505,7 +1505,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with the GNU C Library.  If not, see <http://www.gnu.org/licenses/>.  */
+along with the GNU C Library.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* uClibc defines __GNU_LIBRARY__, but it is not completely
    compatible.  */
@@ -1549,7 +1549,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the GNU
 General Public License for more details.
 
 You should have received a copy of the GNU General Public
-License along with this library.  If not, see <http://www.gnu.org/licenses/>.  
*/
+License along with this library.  If not, see <https://www.gnu.org/licenses/>. 
 */
 
 void *(*__memalign_hook) (size_t size, size_t alignment);
 
@@ -1686,7 +1686,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the GNU
 General Public License for more details.
 
 You should have received a copy of the GNU General Public
-License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+License along with this library.  If not, see <https://www.gnu.org/licenses/>.
 
    The author may be reached (Email) at the address address@hidden,
    or (US mail) as Mike Haertel c/o Free Software Foundation.  */
@@ -1775,7 +1775,7 @@ hybrid_aligned_alloc (size_t alignment, size_t size)
 #endif
 }
 #endif
-  
+
 void *
 hybrid_realloc (void *ptr, size_t size)
 {
@@ -1835,7 +1835,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the GNU
 General Public License for more details.
 
 You should have received a copy of the GNU General Public
-License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+License along with this library.  If not, see <https://www.gnu.org/licenses/>.
 
    The author may be reached (Email) at the address address@hidden,
    or (US mail) as Mike Haertel c/o Free Software Foundation.  */
diff --git a/test/manual/etags/c-src/emacs/src/keyboard.c 
b/test/manual/etags/c-src/emacs/src/keyboard.c
index 5a65149..960e5c7 100644
--- a/test/manual/etags/c-src/emacs/src/keyboard.c
+++ b/test/manual/etags/c-src/emacs/src/keyboard.c
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/test/manual/etags/c-src/emacs/src/lisp.h 
b/test/manual/etags/c-src/emacs/src/lisp.h
index 6885896..c4b78fc 100644
--- a/test/manual/etags/c-src/emacs/src/lisp.h
+++ b/test/manual/etags/c-src/emacs/src/lisp.h
@@ -16,7 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef EMACS_LISP_H
 #define EMACS_LISP_H
diff --git a/test/manual/etags/c-src/emacs/src/regex.h 
b/test/manual/etags/c-src/emacs/src/regex.h
index 2ed6238..595b9bb 100644
--- a/test/manual/etags/c-src/emacs/src/regex.h
+++ b/test/manual/etags/c-src/emacs/src/regex.h
@@ -15,7 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef _REGEX_H
 #define _REGEX_H 1
diff --git a/test/manual/etags/c-src/etags.c b/test/manual/etags/c-src/etags.c
index e8321f0..b412ef5 100644
--- a/test/manual/etags/c-src/etags.c
+++ b/test/manual/etags/c-src/etags.c
@@ -44,7 +44,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 
 /* NB To comply with the above BSD license, copyright information is
diff --git a/test/manual/etags/el-src/emacs/lisp/progmodes/etags.el 
b/test/manual/etags/el-src/emacs/lisp/progmodes/etags.el
index 9558598..090645c 100644
--- a/test/manual/etags/el-src/emacs/lisp/progmodes/etags.el
+++ b/test/manual/etags/el-src/emacs/lisp/progmodes/etags.el
@@ -20,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/manual/etags/html-src/software.html 
b/test/manual/etags/html-src/software.html
index f1abba7..7a85b9a 100644
--- a/test/manual/etags/html-src/software.html
+++ b/test/manual/etags/html-src/software.html
@@ -122,7 +122,7 @@ Matlab) and so I adapted it and <A
 HREF="ftp://fly.cnuce.cnr.it/pub/software/octave/leasqr/";>published</A> it.
 Since then, the original authors Richard I. Shrager, A.Jutan, Ray Muzic, and
 Sean Brennan agreed to put it under the <A
-HREF="http://www.gnu.org/licenses/gpl.html";>GPL</A>.  Matthias Jueschke tested
+HREF="https://www.gnu.org/licenses/gpl.html";>GPL</A>.  Matthias Jueschke tested
 the program using a non-linear optimization <A
 HREF="http://www.itl.nist.gov/div898/strd/nls/nls_main.shtml";>test suite</A>,
 and was satisfied with the results.
@@ -148,7 +148,7 @@ if that happens so I can update this page.
   Etags
 </H5>
 
-<P> On behalf of the <A HREF="http://www.gnu.org/fsf/fsf.html";>Free
+<P> On behalf of the <A HREF="https://www.gnu.org/fsf/fsf.html";>Free
     Software Foundation (FSF)</A> I currently volunteer to maintain
     <CITE>etags</CITE>, a program that can be compiled either as a replacement
     of the classic <CITE>ctags</CITE> Unix program or as <CITE>etags</CITE>,
diff --git a/test/manual/etags/html-src/softwarelibero.html 
b/test/manual/etags/html-src/softwarelibero.html
index b374273..6d75a1f 100644
--- a/test/manual/etags/html-src/softwarelibero.html
+++ b/test/manual/etags/html-src/softwarelibero.html
@@ -27,7 +27,7 @@
   Fu Richard M. Stallman, nei primi anni Ottanta, a formalizzare per la
   prima volta il concetto di software libero.  La <A TITLE="definizione
   di software libero secondo FSF"
-  href="http://www.it.gnu.org/philosophy/free-sw.it.html";>definizione</A>
+  href="https://www.it.gnu.org/philosophy/free-sw.it.html";>definizione</A>
   di Stallman, che da subito assurse al ruolo di definizione per
   eccellenza di software libero, assume la forma di quattro principi di
   libertà:
@@ -55,7 +55,7 @@
   detto <Q><EM>software libero</EM></Q> (in inglese <Q><EM>free
   software</EM></Q>).  Nel 1984 Richard M. Stallman <A TITLE="storia
   del progetto GNU"
-  HREF="http://www.it.gnu.org/gnu/thegnuproject.it.html";>diede vita al
+  HREF="https://www.it.gnu.org/gnu/thegnuproject.it.html";>diede vita al
   progetto GNU</A>, con lo scopo di tradurre in pratica il concetto di
   software libero, e creò la <Q>Free Software Foundation</Q> per
   dare supporto logistico, legale ed economico al progetto GNU.
@@ -97,7 +97,7 @@
   Con un gioco di parole, il nome dato a questo tipo di protezione
   è <EM>permesso d'autore</EM> (in inglese <A TITLE="definizione di
   copyleft (inglese)" LANG="en"
-  HREF="http://www.it.gnu.org/copyleft/copyleft.html";><EM>copyleft</EM></A>):
+  HREF="https://www.it.gnu.org/copyleft/copyleft.html";><EM>copyleft</EM></A>):
   è il criterio che prevede che le modifiche ad un programma possano
   essere distribuite solo con la stessa licenza del programma originale.
   Le licenze proprietarie usano le norme sul diritto d'autore (copyright
@@ -108,7 +108,7 @@
 <P>
   La GNU GPL non è unica nel suo genere.  Diverse <A TITLE="lista di
   licenze libere e non"
-  HREF="http://www.it.gnu.org/licenses/license-list.it.html";>altre
+  HREF="https://www.it.gnu.org/licenses/license-list.it.html";>altre
   licenze</A> garantiscono le quattro libertà e si possono pertanto
   qualificare come licenze per il software libero.  Fra queste, merita
   una speciale menzione per la sua diffusione la <A TITLE="la licenza
@@ -234,7 +234,7 @@
 <P>
   La <A TITLE="usi commerciali del software libero, di Alessandro
   Rubini"
-  
HREF="http://www.it.gnu.org/philosophy/software-libre-commercial-viability.it.html";>rilevanza
+  
HREF="https://www.it.gnu.org/philosophy/software-libre-commercial-viability.it.html";>rilevanza
   economica</A> del software libero è ancora molto ridotta, ma è in
   fortissima crescita ormai da alcuni anni, e tutto consente di supporre
   che tale crescita <A TITLE="prospettive del software libero, gruppo di
diff --git a/test/manual/image-size-tests.el b/test/manual/image-size-tests.el
index ad43426..509623b 100644
--- a/test/manual/image-size-tests.el
+++ b/test/manual/image-size-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;; To test: Load the file and eval (image-size-tests).
 ;; A non-erroring result is a success.
diff --git a/test/manual/indent/octave.m b/test/manual/indent/octave.m
index 4758f99..3052a6d 100644
--- a/test/manual/indent/octave.m
+++ b/test/manual/indent/octave.m
@@ -81,7 +81,7 @@ endfunction
 ##
 ## You should have received a copy of the GNU General Public License
 ## along with Octave; see the file COPYING.  If not, see
-## <http://www.gnu.org/licenses/>.
+## <https://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
 ## @deftypefn  {Command} pkg @var{command} @var{pkg_name}
diff --git a/test/manual/indent/pascal.pas b/test/manual/indent/pascal.pas
index fd225fd..35e919f 100644
--- a/test/manual/indent/pascal.pas
+++ b/test/manual/indent/pascal.pas
@@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
GNU
 General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 As a special exception, if you incorporate even large parts of the
 code of this demo program into another program with substantially
diff --git a/test/manual/redisplay-testsuite.el 
b/test/manual/redisplay-testsuite.el
index defc3fe..ea178c3 100644
--- a/test/manual/redisplay-testsuite.el
+++ b/test/manual/redisplay-testsuite.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -350,4 +350,3 @@ static unsigned char x_bits[] = {0xff, 0x81, 0xbd, 0xa5, 
0xa5, 0xbd, 0x81, 0xff
     (test-redisplay-4)
     (test-redisplay-5)
     (goto-char (point-min))))
-
diff --git a/test/manual/rmailmm.el b/test/manual/rmailmm.el
index fc570fa..8ec10d8 100644
--- a/test/manual/rmailmm.el
+++ b/test/manual/rmailmm.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/manual/scroll-tests.el b/test/manual/scroll-tests.el
index 95647ce..e7f55e1 100644
--- a/test/manual/scroll-tests.el
+++ b/test/manual/scroll-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/src/alloc-tests.el b/test/src/alloc-tests.el
index 1cf1fc3..aff480c 100644
--- a/test/src/alloc-tests.el
+++ b/test/src/alloc-tests.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/src/buffer-tests.el b/test/src/buffer-tests.el
index 8740674..834acaf 100644
--- a/test/src/buffer-tests.el
+++ b/test/src/buffer-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/src/callproc-tests.el b/test/src/callproc-tests.el
index 853d56e..fcba691 100644
--- a/test/src/callproc-tests.el
+++ b/test/src/callproc-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/src/casefiddle-tests.el b/test/src/casefiddle-tests.el
index 234d233..0a9b6c2 100644
--- a/test/src/casefiddle-tests.el
+++ b/test/src/casefiddle-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/src/charset-tests.el b/test/src/charset-tests.el
index 515a4ea..c3f09ec 100644
--- a/test/src/charset-tests.el
+++ b/test/src/charset-tests.el
@@ -13,7 +13,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/src/chartab-tests.el b/test/src/chartab-tests.el
index 54fcdcf..2c57f27 100644
--- a/test/src/chartab-tests.el
+++ b/test/src/chartab-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/src/cmds-tests.el b/test/src/cmds-tests.el
index 207ae75..a545d0e 100644
--- a/test/src/cmds-tests.el
+++ b/test/src/cmds-tests.el
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/src/coding-tests.el b/test/src/coding-tests.el
index cfcd080..e0cefa9 100644
--- a/test/src/coding-tests.el
+++ b/test/src/coding-tests.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/src/data-tests.el b/test/src/data-tests.el
index 00a3055..5dc2634 100644
--- a/test/src/data-tests.el
+++ b/test/src/data-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/src/decompress-tests.el b/test/src/decompress-tests.el
index eaec0d0..8a6f4d1 100644
--- a/test/src/decompress-tests.el
+++ b/test/src/decompress-tests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/src/doc-tests.el b/test/src/doc-tests.el
index 8e5446e..d8e4320 100644
--- a/test/src/doc-tests.el
+++ b/test/src/doc-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/src/editfns-tests.el b/test/src/editfns-tests.el
index a3ea8ab..1c3fde8 100644
--- a/test/src/editfns-tests.el
+++ b/test/src/editfns-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/src/emacs-module-tests.el b/test/src/emacs-module-tests.el
index 6a7ba55..4b41fc2 100644
--- a/test/src/emacs-module-tests.el
+++ b/test/src/emacs-module-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 (require 'ert)
 
diff --git a/test/src/eval-tests.el b/test/src/eval-tests.el
index b98de0a..7ff60dd 100644
--- a/test/src/eval-tests.el
+++ b/test/src/eval-tests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/src/fileio-tests.el b/test/src/fileio-tests.el
index 7ac70a5..a56fb44 100644
--- a/test/src/fileio-tests.el
+++ b/test/src/fileio-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 (require 'ert)
 
diff --git a/test/src/floatfns-tests.el b/test/src/floatfns-tests.el
index de3e443..aa4e55e 100644
--- a/test/src/floatfns-tests.el
+++ b/test/src/floatfns-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 (require 'ert)
 
diff --git a/test/src/fns-tests.el b/test/src/fns-tests.el
index 73c6593..d751acb 100644
--- a/test/src/fns-tests.el
+++ b/test/src/fns-tests.el
@@ -15,7 +15,7 @@
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see `http://www.gnu.org/licenses/'.
+;; along with this program.  If not, see `https://www.gnu.org/licenses/'.
 
 ;;; Commentary:
 
diff --git a/test/src/font-tests.el b/test/src/font-tests.el
index dc48577..d86139b 100644
--- a/test/src/font-tests.el
+++ b/test/src/font-tests.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/src/inotify-tests.el b/test/src/inotify-tests.el
index 987e1fc..9f8abb0 100644
--- a/test/src/inotify-tests.el
+++ b/test/src/inotify-tests.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/src/keymap-tests.el b/test/src/keymap-tests.el
index c5b9d0c..bc2b424 100644
--- a/test/src/keymap-tests.el
+++ b/test/src/keymap-tests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/src/lread-tests.el b/test/src/lread-tests.el
index dd5a200..ac730b4 100644
--- a/test/src/lread-tests.el
+++ b/test/src/lread-tests.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -160,7 +160,7 @@ literals (Bug#20852)."
      (should (eq (read (concat "\\" str)) (intern str))))))
 
 (ert-deftest lread-test-bug26837 ()
-  "Test for http://debbugs.gnu.org/26837 ."
+  "Test for https://debbugs.gnu.org/26837 ."
   (let ((load-path (cons
                     (file-name-as-directory
                      (expand-file-name "data" (getenv "EMACS_TEST_DIRECTORY")))
diff --git a/test/src/marker-tests.el b/test/src/marker-tests.el
index 20ce8f4..2540f15 100644
--- a/test/src/marker-tests.el
+++ b/test/src/marker-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/src/minibuf-tests.el b/test/src/minibuf-tests.el
index cb14819..aba5ca5 100644
--- a/test/src/minibuf-tests.el
+++ b/test/src/minibuf-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/src/print-tests.el b/test/src/print-tests.el
index b3ffc23..b8f6c79 100644
--- a/test/src/print-tests.el
+++ b/test/src/print-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/src/process-tests.el b/test/src/process-tests.el
index 04dc903..b26f939 100644
--- a/test/src/process-tests.el
+++ b/test/src/process-tests.el
@@ -13,7 +13,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/src/regex-tests.el b/test/src/regex-tests.el
index 1364bf6..b1f1ea7 100644
--- a/test/src/regex-tests.el
+++ b/test/src/regex-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/src/syntax-tests.el b/test/src/syntax-tests.el
index 6edde0b..67e7ec3 100644
--- a/test/src/syntax-tests.el
+++ b/test/src/syntax-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/src/textprop-tests.el b/test/src/textprop-tests.el
index d4c8925..1dcfa8e 100644
--- a/test/src/textprop-tests.el
+++ b/test/src/textprop-tests.el
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/src/thread-tests.el b/test/src/thread-tests.el
index 849b2e3..10b2f07 100644
--- a/test/src/thread-tests.el
+++ b/test/src/thread-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code:
 
diff --git a/test/src/undo-tests.el b/test/src/undo-tests.el
index 0cf7fc9..3ff75ae 100644
--- a/test/src/undo-tests.el
+++ b/test/src/undo-tests.el
@@ -15,7 +15,7 @@
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see `http://www.gnu.org/licenses/'.
+;; along with this program.  If not, see `https://www.gnu.org/licenses/'.
 
 ;;; Commentary:
 
@@ -200,7 +200,7 @@
                   '(error "Unrecognized entry in undo list \"bogus\""))))
         (buffer-string))))))
 
-;; http://debbugs.gnu.org/14824
+;; https://debbugs.gnu.org/14824
 (ert-deftest undo-test-buffer-modified ()
   "Test undoing marks buffer unmodified."
   (with-temp-buffer
@@ -326,7 +326,7 @@ undo-make-selective-list."
     (insert "This sentence corrupted?")
     (undo-boundary)
     ;; Same as recipe at
-    ;; http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16411
+    ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=16411
     (insert "aaa")
     (undo-boundary)
     (undo)
diff --git a/test/src/xml-tests.el b/test/src/xml-tests.el
index 1550887..557e6da 100644
--- a/test/src/xml-tests.el
+++ b/test/src/xml-tests.el
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]