maint: shorten https://lists.gnu.org/archive/html/... links

author: Paul Eggert 2017-11-25 22:45:41 -0800
committer: Paul Eggert 2017-11-25 22:48:12 -0800
commit: a89f0b6f33f9eb8910a1fceda9028d76ef50b05d (patch)
tree: 7055882872b7cad587e5d5e9ac706056f04ff777
parent: 8be3aee2813f528b02bc913ca4d79e34e72b1754 (diff)
download: emacs-a89f0b6f33f9eb8910a1fceda9028d76ef50b05d.tar.gz
emacs-a89f0b6f33f9eb8910a1fceda9028d76ef50b05d.zip
110 files changed, 715 insertions, 716 deletions
diff --git a/ChangeLog.1 b/ChangeLog.1
index bb49169fb97..2fcf7aafa25 100644
--- a/ChangeLog.1
+++ b/ChangeLog.1
@@ -33,7 +33,7 @@
        Fix 'commit-msg' to cite 'CONTRIBUTE'
        As suggested in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-03/msg00947.html
+        https://lists.gnu.org/r/emacs-devel/2015-03/msg00947.html
        Also, have the two files match better.
        * CONTRIBUTE: Match what's in build-aux/git-hooks/commit-msg.
        * build-aux/git-hooks/commit-msg: Mention 'CONTRIBUTE'.
@@ -145,7 +145,7 @@
        * configure.ac (HAVE_W32): Abort with error message if
        --without-toolkit-scroll-bars was specified.  See
-        https://lists.gnu.org/archive/html/emacs-devel/2015-01/msg00525.html
+        https://lists.gnu.org/r/emacs-devel/2015-01/msg00525.html
        for the details.
 2015-01-27  Paul Eggert  <eggert@cs.ucla.edu>
@@ -156,7 +156,7 @@
        configuration.  The downside is that patch applications won't be
        checked, but that's better than autogen.sh failing.
        Problem reported by Sam Steingold in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-01/msg00898.html
+        https://lists.gnu.org/r/emacs-devel/2015-01/msg00898.html
 2015-01-26  Paul Eggert  <eggert@cs.ucla.edu>
@@ -184,7 +184,7 @@
        Give up on -Wsuggest-attribute=const
        The attribute doesn't help performance significantly, and the
        warning seems to be more trouble than it's worth.  See the thread at:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-01/msg00361.html
+        https://lists.gnu.org/r/emacs-devel/2015-01/msg00361.html
        * configure.ac (WERROR_CFLAGS): Don't use -Wsuggest-attribute=const.
 2015-01-11  Paul Eggert  <eggert@cs.ucla.edu>
@@ -297,7 +297,7 @@
 2014-12-13  Paul Eggert  <eggert@cs.ucla.edu>
        Port commit-msg to mawk.  Reported by Ted Zlatanov in:
-        https://lists.gnu.org/archive/html/emacs-devel/2014-12/msg01093.html
+        https://lists.gnu.org/r/emacs-devel/2014-12/msg01093.html
        * build-aux/git-hooks/commit-msg (space, non_space, non_print):
        New vars.  Use them as approximations to POSIX bracket expressions,
        on implementations like mawk that do not support POSIX regexps.
@@ -313,7 +313,7 @@
        Port commit-message checking to FreeBSD 9.
        Reported by Jan Djärv in:
-        https://lists.gnu.org/archive/html/emacs-devel/2014-12/msg00704.html
+        https://lists.gnu.org/r/emacs-devel/2014-12/msg00704.html
        along with some other issues I noticed while testing with FreeBSD.
        * build-aux/git-hooks/commit-msg: Prefer gawk if available.
        Prefer en_US.UTF-8 to en_US.utf8, as it's more portable.
@@ -391,7 +391,7 @@
        Add a.out to .gitignore.
        Suggested by Lee Duhem in:
-        https://lists.gnu.org/archive/html/emacs-devel/2014-11/msg01665.html
+        https://lists.gnu.org/r/emacs-devel/2014-11/msg01665.html
        * .gitignore: Add a.out.
        Move *.log next to *.tmp, since it's generic.
        Put *.exe before non-generics.
@@ -442,7 +442,7 @@
        Restore 'Bug#' -> 'debbugs:' rewrite in log-edit-mode.
        * .dir-locals.el (log-edit-mode): Restore the (log-edit-rewrite-fixes
        "[ \n](bug#\\([0-9]+\\))" . "debbugs:\\1").  See Glenn Morris in:
-        https://lists.gnu.org/archive/html/emacs-devel/2014-11/msg01187.html
+        https://lists.gnu.org/r/emacs-devel/2014-11/msg01187.html
        Simplify and fix doc-related .gitignore files.
        This fixes some unwanted 'git status' output after 'make docs'.
@@ -913,7 +913,7 @@
        Omit redundant extern decls.
        Most of this patch is from Dmitry Antipov, in:
-        https://lists.gnu.org/archive/html/emacs-devel/2014-06/msg00263.html
+        https://lists.gnu.org/r/emacs-devel/2014-06/msg00263.html
        * configure.ac (WERROR_CFLAGS): Add -Wredundant-decls.
        Merge from gnulib, incorporating:
@@ -969,7 +969,7 @@
        Rely on AC_CANONICAL_HOST to detect whether we're using mingw.
        See the thread containing:
-        https://lists.gnu.org/archive/html/emacs-devel/2014-06/msg00206.html
+        https://lists.gnu.org/r/emacs-devel/2014-06/msg00206.html
        * configure.ac (AC_CANONICAL_HOST): Invoke this as early as we
        can, which is just after AM_INIT_AUTOMAKE.  Then check for mingw
        just after that.
@@ -1517,7 +1517,7 @@
        * configure.ac (LIBXML2_CFLAGS): Fix xcrun-related quoting problem.
        Reported by YAMAMOTO Mitsuharu in:
-        https://lists.gnu.org/archive/html/emacs-devel/2013-12/msg00995.html
+        https://lists.gnu.org/r/emacs-devel/2013-12/msg00995.html
 2013-12-28  Jan Djärv  <jan.h.d@swipnet.se>
@@ -1529,7 +1529,7 @@
        * configure.ac: Don't set MAKE unless 'make' doesn't work.
        Set it only in the environment, not in the makefile.
        Reported by Glenn Morris in:
-        https://lists.gnu.org/archive/html/emacs-devel/2013-12/msg00969.html
+        https://lists.gnu.org/r/emacs-devel/2013-12/msg00969.html
 2013-12-27  Paul Eggert  <eggert@cs.ucla.edu>
@@ -1635,7 +1635,7 @@
        Remove the option of using libcrypto.
        This scorches the earth and waits for spring;
        see Ted Zlatanov and Stefan Monnier in
-        <https://lists.gnu.org/archive/html/emacs-devel/2013-12/msg00323.html>.
+        <https://lists.gnu.org/r/emacs-devel/2013-12/msg00323.html>.
        * configure.ac (with_openssl_default, HAVE_LIB_CRYPTO): Remove.
        Do not say whether Emacs is configured to use a crypto library,
        since it's no longer an option.
@@ -1666,7 +1666,7 @@
        On commonly used platform libcrypto uses architecture-specific
        assembly code, which is significantly faster than the C code we
        were using.  See Pádraig Brady's note in
-        <https://lists.gnu.org/archive/html/bug-gnulib/2013-12/msg00000.html>.
+        <https://lists.gnu.org/r/bug-gnulib/2013-12/msg00000.html>.
        Merge from gnulib, incorporating:
        2013-12-07 md5, sha1, sha256, sha512: add gl_SET_CRYPTO_CHECK_DEFAULT
        2013-12-07 md5, sha1, sha256, sha512: add 'auto', and set-default method
@@ -1987,7 +1987,7 @@
        Work around performance bug on OS X 10.8 and earlier.
        Perhaps Apple will fix this bug some day.
        See the thread starting with Daniel Colascione's email in:
-        https://lists.gnu.org/archive/html/emacs-devel/2013-09/msg00343.html
+        https://lists.gnu.org/r/emacs-devel/2013-09/msg00343.html
        * configure.ac (FORTIFY_SOUR): New verbatim section.
 2013-09-19  Paul Eggert  <eggert@cs.ucla.edu>
@@ -2003,9 +2003,9 @@
        * configure.ac <srcdir> [MINGW32]: Make sure the value of 'srcdir'
        is in the full /d/foo/bar form.  See the discussion in
-        https://lists.gnu.org/archive/html/emacs-devel/2013-09/msg00210.html,
+        https://lists.gnu.org/r/emacs-devel/2013-09/msg00210.html,
        and in particular
-        https://lists.gnu.org/archive/html/emacs-devel/2013-09/msg00252.html
+        https://lists.gnu.org/r/emacs-devel/2013-09/msg00252.html
        and its followups, for the details.
 2013-09-17  Dmitry Antipov  <dmantipov@yandex.ru>
@@ -2617,7 +2617,7 @@
        Merge from gnulib, incorporating:
        2013-03-29 stdalign: port to stricter ISO C11
        This helps to run 'configure' on MS-Windows; see Eli Zaretskii in
-        <https://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00999.html>.
+        <https://lists.gnu.org/r/emacs-devel/2013-03/msg00999.html>.
 2013-03-27  Paul Eggert  <eggert@cs.ucla.edu>
@@ -2812,7 +2812,7 @@
        Enable conservative stack scanning for all architectures.
        Suggested by Stefan Monnier in
-        <https://lists.gnu.org/archive/html/emacs-devel/2013-01/msg00183.html>.
+        <https://lists.gnu.org/r/emacs-devel/2013-01/msg00183.html>.
        * configure.ac (GC_MARK_STACK): Remove.
 2013-01-11  Paul Eggert  <eggert@cs.ucla.edu>
@@ -3182,7 +3182,7 @@
        Check more robustly for timer_settime.
        This should fix an OS X build problem reported by Ivan Andrus in
-        <https://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00671.html>.
+        <https://lists.gnu.org/r/emacs-devel/2012-09/msg00671.html>.
        * configure.ac (gl_THREADLIB): Define to empty, since Emacs
        does threads its own way.
        * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
@@ -3196,7 +3196,7 @@
        * Makefile.in (bootstrap): Simplify build procedure.
        Suggested by Wolfgang Jenker in
-        <https://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00456.html>.
+        <https://lists.gnu.org/r/emacs-devel/2012-09/msg00456.html>.
        Merge from gnulib, incorporating:
        2012-09-22 sockets, sys_stat: remove AC_C_INLINE in MSVC-only cases
@@ -3216,14 +3216,14 @@
        * Makefile.in: Fix build error on FreeBSD.
        ($(MAKEFILE_NAME)): Pass MAKE='$(MAKE)' to config.status's env.
        Suggested by Wolfgang Jenker in
-        <https://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00430.html>.
+        <https://lists.gnu.org/r/emacs-devel/2012-09/msg00430.html>.
        (MAKE_CONFIG_STATUS): Remove.  Remaining use expanded.
        This undoes part of the 2012-09-10 patch.
        (bootstrap): Run ./configure, rather than trying to run config.status
        if it exists.  That builds src/epaths.h more reliably.
        Run autogen/copy_autogen if autogen.sh fails,
        to create 'configure'.  Reported by Andreas Schwab in
-        <https://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00438.html>.
+        <https://lists.gnu.org/r/emacs-devel/2012-09/msg00438.html>.
        * autogen.sh: Exit with status 1 when failing due to missing tools,
        reverting the 2012-09-10 change to this file.
        * autogen/copy_autogen: Fail if one of the subsidiary actions fail.
@@ -3360,7 +3360,7 @@
        * configure.ac (WARN_CFLAGS): Omit -Wjump-misses-init.
        It generates false alarms in doc.c, regex.c, xdisp.c.  See
-        <https://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00040.html>.
+        <https://lists.gnu.org/r/emacs-devel/2012-09/msg00040.html>.
        Merge from gnulib, incorporating:
        2012-08-29 stdbool: be more compatible with mixed C/C++ compiles
@@ -3375,7 +3375,7 @@
        * configure.ac (_FORTIFY_SOURCE): Define only when optimizing.
        This ports to glibc 2.15 or later, when configured with
        --enable-gcc-warnings.  See Eric Blake in
-        <https://lists.gnu.org/archive/html/bug-grep/2012-09/msg00000.html>.
+        <https://lists.gnu.org/r/bug-grep/2012-09/msg00000.html>.
 2012-09-01  Daniel Colascione  <dan.colascione@gmail.com>
@@ -3812,7 +3812,7 @@
        Improve static checking when configured --with-ns.
        See Samuel Bronson's remarks in
-        <https://lists.gnu.org/archive/html/emacs-devel/2012-07/msg00146.html>.
+        <https://lists.gnu.org/r/emacs-devel/2012-07/msg00146.html>.
        * configure.in (WARN_CFLAGS): Omit -Wunreachable-code, as it's
        a no-op with recent GCC and harmful in earlier ones.
        Omit -Wsync-nand, as it's irrelevant to Emacs and provokes a
@@ -4072,7 +4072,7 @@
        Remove --disable-maintainer-mode option from 'configure'.  (Bug#11555)
        It is confusingly named and rarely useful.  See, for example,
-        <https://lists.gnu.org/archive/html/emacs-devel/2011-12/msg00089.html>.
+        <https://lists.gnu.org/r/emacs-devel/2011-12/msg00089.html>.
        * INSTALL.BZR: Don't mention --disable-maintainer-mode.
        * Makefile.in (MAINTAINER_MODE_FLAG): Remove; all uses removed.
        * configure.in: Remove --disable-maintainer-mode.
@@ -4555,7 +4555,7 @@
        Check pkg-config exit status when configuring (Bug#10626).
        * configure.in (PKG_CHECK_MODULES): Do not assume that pkg-config
        works; check its exit status.  Reported by Jordi Gutiérrez Hermoso in
-        <https://lists.gnu.org/archive/html/emacs-devel/2012-01/msg00787.html>.
+        <https://lists.gnu.org/r/emacs-devel/2012-01/msg00787.html>.
 2012-04-07  Glenn Morris  <rgm@gnu.org>
@@ -4628,7 +4628,7 @@
        * configure.in (HAVE_PTHREAD): Check for pthread_atfork if linking
        to gmalloc.c.  This should prevent a MirBSD 10 build failure reported
        by Nelson H. F. Beebe in
-        <https://lists.gnu.org/archive/html/emacs-devel/2011-12/msg00065.html>.
+        <https://lists.gnu.org/r/emacs-devel/2011-12/msg00065.html>.
 2011-12-10  Juanma Barranquero  <lekktu@gmail.com>
@@ -4775,7 +4775,7 @@
        Merge from gnulib, improving some licensing wording.
        This clarifies and fixes some licensing issues raised by Glenn Morris
-        <https://lists.gnu.org/archive/html/bug-gnulib/2011-09/msg00397.html>.
+        <https://lists.gnu.org/r/bug-gnulib/2011-09/msg00397.html>.
        It also merges the latest version of texinfo.tex and has some
        MSVC-related changes that don't affect Emacs.
        * Makefile.in (GNULIB_TOOL_FLAGS): Avoid msvc-inval, msvc-nothrow,
@@ -4944,7 +4944,7 @@
        test, which runs afoul of Automake installations where, for example,
        /usr/share/aclocal contains a copy of gl_THREADLIB.
        Reported by Sven Joachim in
-        <https://lists.gnu.org/archive/html/emacs-devel/2011-07/msg00529.html>.
+        <https://lists.gnu.org/r/emacs-devel/2011-07/msg00529.html>.
        This is just a quick temporary fix, specific to Emacs; I'll work
        with the other gnulib maintainers to get a more-permanent fix.
@@ -5556,7 +5556,7 @@
        * arg-nonnull.h, c++defs.h, warn-on-use.h: Fix licenses.
        Sync from gnulib, which has been patched to fix the problem
        with the license notices.  Reported by Glenn Morris in
-        <https://lists.gnu.org/archive/html/emacs-devel/2011-02/msg00403.html>.
+        <https://lists.gnu.org/r/emacs-devel/2011-02/msg00403.html>.
 2011-02-09  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -5590,7 +5590,7 @@
        gnulib: adjust to upstream _HEADERS change
        * lib/Makefile.am (EXTRA_HEADERS, nodist_pkginclude_HEADERS):
        New empty macros, to accommodate recent changes to gnulib.  See
-        <https://lists.gnu.org/archive/html/bug-gnulib/2011-02/msg00068.html>.
+        <https://lists.gnu.org/r/bug-gnulib/2011-02/msg00068.html>.
        * c++defs.h, lib/Makefile.in, lib/ftoastr.h, lib/getopt.in.h:
        * lib/gnulib.mk, lib/ignore-value.h, lib/stdbool.in.h, lib/stddef.in.h:
        * lib/time.in.h, lib/unistd.in.h:
@@ -5664,7 +5664,7 @@
        * lib/mktime.c (long_int_is_wide_enough): Move this assertion to
        the top level, to make it clearer that the assumption about
        long_int width is being checked.  See
-        <https://lists.gnu.org/archive/html/bug-gnulib/2011-01/msg00554.html>.
+        <https://lists.gnu.org/r/bug-gnulib/2011-01/msg00554.html>.
        2011-01-29  Paul Eggert  <eggert@cs.ucla.edu>
@@ -5673,7 +5673,7 @@
        negative number, which the C Standard says has undefined behavior.
        In practice this is not a problem, but might as well do it by the book.
        Reported by Rich Felker and Eric Blake; see
-        <https://lists.gnu.org/archive/html/bug-gnulib/2011-01/msg00493.html>.
+        <https://lists.gnu.org/r/bug-gnulib/2011-01/msg00493.html>.
        * m4/mktime.m4 (AC_FUNC_MKTIME): Likewise.
        * lib/mktime.c (TYPE_MAXIMUM): Redo slightly to match the others.
@@ -5691,7 +5691,7 @@
        mktime: fix some integer overflow issues and sidestep the rest
        This was prompted by a bug report by Benjamin Lindner for MinGW
-        <https://lists.gnu.org/archive/html/bug-gnulib/2011-01/msg00472.html>.
+        <https://lists.gnu.org/r/bug-gnulib/2011-01/msg00472.html>.
        His bug is due to signed integer overflow (0 - INT_MIN), and I
        I scanned through mktime.c looking for other integer overflow
        problems, fixing all the bugs I found.
@@ -5710,7 +5710,7 @@
        no need to test for alternatives.  All uses removed.
        (TYPE_MAXIMUM): Don't rely here on overflow behavior not defined by
        the C standard.  Reported by Rich Felker in
-        <https://lists.gnu.org/archive/html/bug-gnulib/2011-01/msg00488.html>.
+        <https://lists.gnu.org/r/bug-gnulib/2011-01/msg00488.html>.
        (twos_complement_arithmetic): Also check long_int and time_t.
        (time_t_avg, time_t_add_ok, time_t_int_add_ok): New functions.
        (guess_time_tm, ranged_convert, __mktime_internal): Use them.
@@ -5810,7 +5810,7 @@
        aclocal.m4: put this file back into repository
        This way, we don't have to assume that the maintainer has
        the automake package installed.  See
-        <https://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00746.html>.
+        <https://lists.gnu.org/r/emacs-devel/2011-01/msg00746.html>.
        * .bzrignore: Remove aclocal.m4, undoing the previous change.
        * Makefile.in (top_maintainer_clean): Do not remove aclocal.m4,
        undoing the previous change.
@@ -5837,7 +5837,7 @@
        aclocal.m4: tweaks to regenerate more conveniently
        This attempts to act better when the source is in a weird state.  See
-        <https://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00734.html>.
+        <https://lists.gnu.org/r/emacs-devel/2011-01/msg00734.html>.
        * Makefile.in (am--refresh): Add aclocal.m4, configure, config.in.
        * .bzrignore: Add aclocal.m4.
@@ -5848,12 +5848,12 @@
        the most recent change here.
        * aclocal.m4: Remove from bzr repository.  This file is
        auto-generated and isn't needed to run 'configure'.  See
-        <https://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00698.html>.
+        <https://lists.gnu.org/r/emacs-devel/2011-01/msg00698.html>.
 2011-01-19  Paul Eggert  <eggert@cs.ucla.edu>
        Minor Makefile.in tweaks to build from gnulib better.
-        <https://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00673.html>
+        <https://lists.gnu.org/r/emacs-devel/2011-01/msg00673.html>
        * Makefile.in (sync-from-gnulib): Also run autoreconf -I m4.
        (top_maintainer_clean): Don't remove aclocal.m4.
@@ -5881,7 +5881,7 @@
        * Makefile.in (GNULIB_MODULES): Change ftoastr to dtoastr.
        This avoids building ftoastr and ldtoastr, which aren't needed.  See
-        <https://lists.gnu.org/archive/html/bug-gnulib/2011-01/msg00199.html>.
+        <https://lists.gnu.org/r/bug-gnulib/2011-01/msg00199.html>.
        * .bzrignore: Add .h files that are host-dependent.
        Add lib/.deps/, lib/arg-nonnull.h, lib/c++defs.h, lib/getopt.h,
diff --git a/ChangeLog.2 b/ChangeLog.2
index cab30d82a59..c971397a134 100644
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -118,7 +118,7 @@
        org-src fontify buffers" the hooks were enabled also for modifications
        to the original org buffer.  This causes fontification errors when
        combined with certain packages, as reported in
-        https://lists.gnu.org/archive/html/emacs-orgmode/2017-03/msg00420.html.
+        https://lists.gnu.org/r/emacs-orgmode/2017-03/msg00420.html.
        * lisp/org/org-src.el (org-src-font-lock-fontify-block): Reduce scope
        of inhibit-modification-hooks let-binding.
@@ -776,7 +776,7 @@
        * lisp/emacs-lisp/easy-mmode.el (define-minor-mode): Fix docstring
        so that it matches the actual implementation.
-        See https://lists.gnu.org/archive/html/help-gnu-emacs/2016-04/msg00071.html
+        See https://lists.gnu.org/r/help-gnu-emacs/2016-04/msg00071.html
 2016-12-07  Noam Postavsky  <npostavs@gmail.com>
@@ -1508,7 +1508,7 @@
        This should make ralloc-related bugs less likely on GNU/Linux
        systems with bleeding-edge glibc.  See the email thread containing:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-10/msg00801.html
+        https://lists.gnu.org/r/emacs-devel/2016-10/msg00801.html
        Do not merge to master.
        * configure.ac (REL_ALLOC): Default to 'no' on all platforms, not
        merely on platforms with Doug Lea malloc.  Although bleeding-edge
@@ -2046,7 +2046,7 @@
        See this thread for discussion:
-          https://lists.gnu.org/archive/html/emacs-devel/2016-09/threads.html#00329
+          https://lists.gnu.org/r/emacs-devel/2016-09/threads.html#00329
          From: Karl Fogel
          To: Emacs Devel
          Subject: Question about intended behavior of 'insert-for-yank-1'.
@@ -2381,7 +2381,7 @@
        parameters restored by desktop.el take precedence over the
        customizations in the init file, and explain how to countermand
        that.  For the details of the issue, see
-        https://lists.gnu.org/archive/html/emacs-devel/2016-09/msg00318.html.
+        https://lists.gnu.org/r/emacs-devel/2016-09/msg00318.html.
 2016-09-15  Nicolas Petton  <nicolas@petton.fr>
@@ -2424,7 +2424,7 @@
        * lisp/url/url-http.el (url-http-create-request): Make sure the
        cookie headers are a unibyte string.  For the details, see
-        https://lists.gnu.org/archive/html/emacs-devel/2016-09/msg00202.html.
+        https://lists.gnu.org/r/emacs-devel/2016-09/msg00202.html.
 2016-09-08  Martin Rudalics  <rudalics@gmx.at>
@@ -2945,9 +2945,9 @@
        * src/indent.c (Fvertical_motion): Don't return uninitialized
        value in non-interactive session.  This fixes random errors in
        batch mode, see
-        https://lists.gnu.org/archive/html/emacs-devel/2016-06/msg00609.html
+        https://lists.gnu.org/r/emacs-devel/2016-06/msg00609.html
        and
-        https://lists.gnu.org/archive/html/emacs-devel/2016-07/msg00500.html
+        https://lists.gnu.org/r/emacs-devel/2016-07/msg00500.html
        for the details.
 2016-07-10  Andreas Schwab  <schwab@linux-m68k.org>
@@ -3287,7 +3287,7 @@
        * src/xfns.c (x_get_monitor_attributes_xrandr): Use #if, not #ifdef.
        This ports to systems that predate xrandr 1.3. See Christian Lynbech in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-06/msg00198.html
+        https://lists.gnu.org/r/emacs-devel/2016-06/msg00198.html
        (cherry picked from commit dce99f222f1ca33265cd56ddb157817be1dc078e)
@@ -3305,7 +3305,7 @@
        * lisp/calendar/todo-mode.el (todo-read-category): Use
        set-keymap-parent instead of copy-keymap, and default (as
        previously) to the global binding (for rationale, see
-        https://lists.gnu.org/archive/html/emacs-devel/2016-06/msg00217.html).
+        https://lists.gnu.org/r/emacs-devel/2016-06/msg00217.html).
 2016-06-14  Stephen Berman  <stephen.berman@gmx.net>
@@ -3889,7 +3889,7 @@
        * lisp/replace.el (replace-char-fold): Rename from replace-character-fold.
        * test/automated/char-fold-tests.el: Rename from character-fold-tests.el.
-        https://lists.gnu.org/archive/html/emacs-devel/2015-12/msg00529.html
+        https://lists.gnu.org/r/emacs-devel/2015-12/msg00529.html
 2016-05-17  Nicolas Petton  <nicolas@petton.fr>
@@ -5047,7 +5047,7 @@
        * lisp/faces.el (variable-pitch) [w32]: Name a variable-pitch font
        explicitly, to avoid Emacs picking up a bold-italic variant on
        some MS-Windows systems.  See this thread for details:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-04/msg00746.html.
+        https://lists.gnu.org/r/emacs-devel/2016-04/msg00746.html.
 2016-04-29  Alan Mackenzie  <acm@muc.de>
@@ -5461,7 +5461,7 @@
        buffer text was overwritten with binary nulls, because
        mmap_realloc copied only part of buffer text when extending it.
        See
-        https://lists.gnu.org/archive/html/emacs-devel/2016-04/msg00325.html
+        https://lists.gnu.org/r/emacs-devel/2016-04/msg00325.html
        and https://debbugs.gnu.org/cgi/bugreport.cgi?bug=23223#55 for two
        examples of the related problems.
@@ -6031,7 +6031,7 @@
        * lisp/progmodes/prog-mode.el: (prog-indentation-context)
        (prog-first-column, prog-widen): Remove, as discussed in
-        https://lists.gnu.org/archive/html/emacs-devel/2016-03/msg01425.html.
+        https://lists.gnu.org/r/emacs-devel/2016-03/msg01425.html.
        * doc/lispref/text.texi (Mode-Specific Indent): Remove references
        to them.
@@ -6662,7 +6662,7 @@
        * etc/NEWS, nextstep/README: Prefer curved quotes in the
        recently-changed text documentation.  See:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-03/msg00860.html
+        https://lists.gnu.org/r/emacs-devel/2016-03/msg00860.html
 2016-03-14  Paul Eggert  <eggert@cs.ucla.edu>
@@ -7594,7 +7594,7 @@
        * lisp/progmodes/ruby-mode.el (ruby-mode-syntax-table): Change the
        syntax classes of $, : and @ to "prefix character"
-        (https://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00272.html).
+        (https://lists.gnu.org/r/emacs-devel/2016-01/msg00272.html).
        (ruby-syntax-propertize): Undo that specifically for colons
        followed by an opening paren or bracket.
        (ruby-font-lock-keyword-beg-re): Include colon character.
@@ -7690,7 +7690,7 @@
        (xref-show-location-at-point): Make an effort to avoid the
        original window when showing the location.
        (xref-goto-xref): Don't quit the xref window (bug#20487 and
-        https://lists.gnu.org/archive/html/emacs-devel/2016-01/msg01133.html).
+        https://lists.gnu.org/r/emacs-devel/2016-01/msg01133.html).
        (xref--query-replace-1): Use xref--with-dedicated-window as well.
        (xref--next-error-function): Call xref--show-location instead of
        xref--pop-to-location.
@@ -8535,7 +8535,7 @@
        Port to FreeBSD 11-CURRENT i386
        Problem reported by Herbert J. Skuhra in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-02/msg00354.html
+        https://lists.gnu.org/r/emacs-devel/2016-02/msg00354.html
        Instead of trying
        * src/alloc.c (lmalloc, lrealloc, laligned): New functions.
        (xmalloc, xzalloc, xrealloc, lisp_malloc): Use them.
@@ -8581,7 +8581,7 @@
        Fix test for dladdr
        Problem reported by Andreas Schwab in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-02/msg00327.html
+        https://lists.gnu.org/r/emacs-devel/2016-02/msg00327.html
        * configure.ac (dladdr): Link with LIBMODULES when checking for
        this function.
@@ -8920,7 +8920,7 @@
        Remove 'def X' from the example
        * test/etags/ruby-src/test1.ru (A::B): Remove 'def X'
-        (https://lists.gnu.org/archive/html/emacs-devel/2016-02/msg00167.html).
+        (https://lists.gnu.org/r/emacs-devel/2016-02/msg00167.html).
        * test/etags/CTAGS.good:
        * test/etags/ETAGS.good_1:
        * test/etags/ETAGS.good_2:
@@ -9272,7 +9272,7 @@
        my edits today to http://www.emacswiki.org/emacs/GitForEmacsDevs and
        to emacswiki.org/emacs/GitQuickStartForEmacsDevs.  See also the thread
        "Recommend these .gitconfig settings for git integrity." at
-        https://lists.gnu.org/archive/html/emacs-devel/2016-01/threads.html#01802.
+        https://lists.gnu.org/r/emacs-devel/2016-01/threads.html#01802.
 2016-02-01  Martin Rudalics  <rudalics@gmx.at>
@@ -9354,7 +9354,7 @@
        autogen.sh now arranges for git to check hashes
        Suggested by Karl Fogel in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-01/msg01802.html
+        https://lists.gnu.org/r/emacs-devel/2016-01/msg01802.html
        * autogen.sh: Do "git config transfer.fsckObjects true".
 2016-01-31  Paul Eggert  <eggert@cs.ucla.edu>
@@ -9646,7 +9646,7 @@
        (project-find-file-in): Use it.
        (project-file-completion-table): Move the default
        implementation inside the cl-defgeneric form.
-        (https://lists.gnu.org/archive/html/emacs-devel/2016-01/msg01720.html)
+        (https://lists.gnu.org/r/emacs-devel/2016-01/msg01720.html)
 2016-01-30  Dmitry Gutov  <dgutov@yandex.ru>
@@ -9777,8 +9777,8 @@
        * doc/lispref/control.texi (Pattern matching case statement):
        Improve the documentation of 'pcase' per comments.  See two
        discussion threads on emacs-devel@gnu.org for the details:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-01/msg01335.html
+        https://lists.gnu.org/r/emacs-devel/2016-01/msg01335.html
-        https://lists.gnu.org/archive/html/emacs-devel/2016-01/msg01336.html.
+        https://lists.gnu.org/r/emacs-devel/2016-01/msg01336.html.
 2016-01-29  Glenn Morris  <rgm@gnu.org>
@@ -10047,7 +10047,7 @@
        Port "$@" to OpenIndiana ksh93
-        In https://lists.gnu.org/archive/html/bug-autoconf/2015-12/msg00000.html
+        In https://lists.gnu.org/r/bug-autoconf/2015-12/msg00000.html
        Pavel Raiskup reports that ${1+"$@"} runs afoul of a bug in /bin/sh
        (derived from ksh 93t+ 2010-03-05).  ${1+"$@"} works around an ancient
        bug in long-dead shells, so remove the workaround.
@@ -10197,7 +10197,7 @@
        * lisp/progmodes/xref.el(xref-query-replace):
        Rename to xref-query-replace-in-results.
-        (https://lists.gnu.org/archive/html/emacs-devel/2016-01/msg01240.html)
+        (https://lists.gnu.org/r/emacs-devel/2016-01/msg01240.html)
        * lisp/progmodes/xref.el (xref--xref-buffer-mode-map):
        * lisp/dired-aux.el (dired-do-find-regexp-and-replace):
@@ -10220,7 +10220,7 @@
        * lisp/progmodes/xref.el (xref--xref-buffer-mode):
        Comment out next-error-function integration
-        (https://lists.gnu.org/archive/html/emacs-devel/2016-01/msg01286.html).
+        (https://lists.gnu.org/r/emacs-devel/2016-01/msg01286.html).
 2016-01-23  John Wiegley  <johnw@newartisans.com>
@@ -10289,7 +10289,7 @@
        Pacify --enable-gcc-warnings --with-cairo
        Problem reported by Alexander Kuleshov in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-01/msg01289.html
+        https://lists.gnu.org/r/emacs-devel/2016-01/msg01289.html
        * src/gtkutil.c (xg_get_page_setup):
        Use switch rather than if-then-else.
        * src/image.c (COLOR_TABLE_SUPPORT):
@@ -10529,7 +10529,7 @@
        No need to configure gobject-introspection
        It wasn’t needed for the recently-installed xwidget_mvp code; see:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-01/msg01154.html
+        https://lists.gnu.org/r/emacs-devel/2016-01/msg01154.html
        * configure.ac (DOES_XWIDGETS_USE_GIR, GIR_REQUIRED, GIR_MODULES):
        (HAVE_GIR):
        * src/Makefile.in (GIR_LIBS, GIR_CFLAGS):
@@ -10811,7 +10811,7 @@
        * lisp/dired-aux.el (dired-do-find-regexp)
        (dired-do-find-regexp-and-replace): New commands.
-        https://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00864.html
+        https://lists.gnu.org/r/emacs-devel/2016-01/msg00864.html
        * lisp/dired.el (dired-mode-map): Change bindings for `A' and
        `Q' to the new commands.
@@ -10834,7 +10834,7 @@
        * doc/emacs/maintaining.texi (Xref, Find Identifiers)
        (Looking Up Identifiers, Identifier Search, List Identifiers):
        Adjudicate comments by Dmitry Gutov <dgutov@yandex.ru>.  See
-        https://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00650.html
+        https://lists.gnu.org/r/emacs-devel/2016-01/msg00650.html
        for the details.
 2016-01-18  Eli Zaretskii  <eliz@gnu.org>
@@ -11009,7 +11009,7 @@
        Use it instead of the literal MB_ERR_INVALID_CHARS.
        (maybe_load_unicows_dll): Initialize multiByteToWideCharFlags as
        appropriate for the underlying OS version.  For details, see
-        https://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00835.html.
+        https://lists.gnu.org/r/emacs-devel/2016-01/msg00835.html.
        * src/w32.h: Declare multiByteToWideCharFlags.
        * src/w32fns.c (Fx_file_dialog, Fw32_shell_execute)
        (add_tray_notification): Use multiByteToWideCharFlags instead of
@@ -11025,7 +11025,7 @@
        * etc/PROBLEMS (MS-Windows): Mention the problem with Shell32.dll
        on Windows NT4.  For the details, see
-        https://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00835.html.
+        https://lists.gnu.org/r/emacs-devel/2016-01/msg00835.html.
 2016-01-16  Jussi Lahdenniemi  <jussi@aprikoodi.fi>  (tiny change)
@@ -11035,7 +11035,7 @@
        special functions on Windows 9X.  Refuse to dump Emacs on Windows 9X.
        (malloc_after_dump_9x, realloc_after_dump_9x)
        (free_after_dump_9x): New functions.  (Bug#22379)  See also
-        https://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00852.html
+        https://lists.gnu.org/r/emacs-devel/2016-01/msg00852.html
        for more details about the original problem.
        * nt/inc/ms-w32.h (malloc_after_dump_9x, realloc_after_dump_9x)
@@ -11180,7 +11180,7 @@
        Un-obsolete tags-loop-continue
        * lisp/progmodes/etags.el (tags-loop-continue): Un-obsolete.
-        https://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00682.html
+        https://lists.gnu.org/r/emacs-devel/2016-01/msg00682.html
 2016-01-13  Eli Zaretskii  <eliz@gnu.org>
@@ -11402,7 +11402,7 @@
        (vc-hg-annotate-extract-revision-at-line-with-filename)
        (vc-hg-annotate-extract-revision-at-line-with-both):
        Don't refer to source-directory.
-        https://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00755.html
+        https://lists.gnu.org/r/emacs-devel/2016-01/msg00755.html
 2016-01-11  Michael Albinus  <michael.albinus@gmx.de>
@@ -11469,7 +11469,7 @@
        This use of 'noexcept' runs afoul of the C++11 standard.
        Problem reported by Philipp Stephani in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00706.html
+        https://lists.gnu.org/r/emacs-devel/2016-01/msg00706.html
        * src/emacs-module.c (emacs_finalizer_function):
        Move this typedef here ...
        * src/emacs-module.h: ... from here, and use only the C
@@ -11633,7 +11633,7 @@
        Fix (error ...) error
        Problem reported by Glenn Morris in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00561.html
+        https://lists.gnu.org/r/emacs-devel/2016-01/msg00561.html
        * lisp/vc/add-log.el (change-log-goto-source): Fix typos
        introduced in my Aug 28 change, where I got confused by the
        two meanings of (error ...).
@@ -11784,7 +11784,7 @@
        * src/xdisp.c (message_to_stderr): If coding-system-for-write has
        a non-nil value, use it to encode output in preference to
        locale-coding-system.  See the discussions in
-        https://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00048.html
+        https://lists.gnu.org/r/emacs-devel/2016-01/msg00048.html
        for the details.
        * doc/lispref/os.texi (Terminal Output): Document how to send
@@ -11798,7 +11798,7 @@
        * doc/misc/efaq.texi (Packages that do not come with Emacs):
        Update the URI of MELPA and marmalade-repo.  Reported by CHENG Gao
        <chenggao@royau.me> in
-        https://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00390.html.
+        https://lists.gnu.org/r/emacs-devel/2016-01/msg00390.html.
 2016-01-06  Maksim Golubev  <maksim.golubev72@gmail.com>  (tiny change)
@@ -12419,7 +12419,7 @@
        * lisp/mail/emacsbug.el (report-emacs-bug): Future-proof the
        recent "built on" change to deterministic builds where
        emacs-build-system will be nil.  See:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-12/msg01369.html
+        https://lists.gnu.org/r/emacs-devel/2015-12/msg01369.html
 2015-12-29  Jose A. Ortega Ruiz  <jao@gnu.org>  (tiny change)
@@ -12619,7 +12619,7 @@
        * lisp/startup.el (initial-scratch-message):
        Reword to avoid apostrophes, and to make it shorter.
        See the thread starting in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-12/msg01241.html
+        https://lists.gnu.org/r/emacs-devel/2015-12/msg01241.html
 2015-12-26  Leo Liu  <sdl.web@gmail.com>
@@ -13443,7 +13443,7 @@
        commands for interactive Python and Guile interpreters.
        (gdb-send): Recognize various ways of exiting from Python and
        Guile interpreters and returning to GDB.  For details, see
-        https://lists.gnu.org/archive/html/emacs-devel/2015-12/msg00693.html
+        https://lists.gnu.org/r/emacs-devel/2015-12/msg00693.html
        and http://stackoverflow.com/questions/31514741.
 2015-12-16  Paul Eggert  <eggert@cs.ucla.edu>
@@ -13452,7 +13452,7 @@
        C11 threads are not needed for Emacs now, and their use is causing
        hassles on FreeBSD 10.x.  Problem reported by Ashish SHUKLA in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-12/msg00648.html
+        https://lists.gnu.org/r/emacs-devel/2015-12/msg00648.html
        * configure.ac: Do not check for C11 threads. Remove unnecessary
        fiddling with CPPFLAGS when configuring pthreads.
        * src/emacs-module.c (main_thread, check_main_thread)
@@ -13613,7 +13613,7 @@
        Fix performance regression with gcc -O0
        This fixes the smaller performance hit that I noted in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-12/msg00357.html
+        https://lists.gnu.org/r/emacs-devel/2015-12/msg00357.html
        * src/alloc.c (macro_XPNTR_OR_SYMBOL_OFFSET, macro_XPNTR):
        * src/puresize.h (puresize_h_PURE_P)
        (puresize_h_CHECK_IMPURE):
@@ -13991,7 +13991,7 @@
        * src/lisp.h (XSYMBOL): Remove eassert incorrectly added in
        previous change.  It breaks on MS-Windows --with-wide-int.
        Problem reported by Eli Zaretskii in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-12/msg00275.html
+        https://lists.gnu.org/r/emacs-devel/2015-12/msg00275.html
 2015-12-06  Paul Eggert  <eggert@cs.ucla.edu>
@@ -14426,7 +14426,7 @@
        * lisp/progmodes/xref.el (xref-backend-functions):
        Use APPEND when adding the default element
-        (https://lists.gnu.org/archive/html/emacs-devel/2015-12/msg00061.html).
+        (https://lists.gnu.org/r/emacs-devel/2015-12/msg00061.html).
 2015-12-01  Eli Zaretskii  <eliz@gnu.org>
@@ -14918,7 +14918,7 @@
        Matches".  Improve wording.  Fix lost extra whitespace.
        (Search Customizations): Improve wording.  (Bug#22036)
        See also comments in
-        https://lists.gnu.org/archive/html/emacs-devel/2015-11/msg02376.html.
+        https://lists.gnu.org/r/emacs-devel/2015-11/msg02376.html.
        * lisp/replace.el (query-replace, query-replace-regexp)
        (query-replace-regexp-eval, replace-string, replace-regexp):
@@ -15021,7 +15021,7 @@
        (module_non_local_exit_signal_1, module_non_local_exit_throw_1):
        Do nothing and return with failure indication immediately, if some
        previous module call signaled an error or wants to throw.  See
-        https://lists.gnu.org/archive/html/emacs-devel/2015-11/msg02133.html
+        https://lists.gnu.org/r/emacs-devel/2015-11/msg02133.html
        for the relevant discussions.
 2015-11-27  Eli Zaretskii  <eliz@gnu.org>
@@ -15215,7 +15215,7 @@
        * src/emacs-module.c (module_format_fun_env):
        exprintf doesn’t support %p, so use %x.  Reported by Eli Zaretskii in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-11/msg02122.html
+        https://lists.gnu.org/r/emacs-devel/2015-11/msg02122.html
 2015-11-25  Paul Eggert  <eggert@cs.ucla.edu>
@@ -15224,7 +15224,7 @@
        * lisp/help-fns.el (describe-variable): Quote the
        variable’s value if it is a symbol other than t or nil.
        See: T.V Raman in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-11/msg02147.html
+        https://lists.gnu.org/r/emacs-devel/2015-11/msg02147.html
 2015-11-25  Dmitry Gutov  <dgutov@yandex.ru>
@@ -15701,7 +15701,7 @@
        Although the patch does fix Bug#21688 and prevents a core dump,
        it also makes the message-mode-propertize test fail; see:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-11/msg01667.html
+        https://lists.gnu.org/r/emacs-devel/2015-11/msg01667.html
        Perhaps someone else can come up with a better fix some day.
        * src/syntax.c (update_syntax_table_forward):
        Propertize even when truncated.
@@ -16002,7 +16002,7 @@
          Message-ID: \
            <CAAdUY-KN06pvCMy5bt3+Buk3yeKjf6n9iB2FaSTTOPpCqPwyhA@mail.gmail.com>
-          https://lists.gnu.org/archive/html/emacs-devel/2015-11/msg01707.html
+          https://lists.gnu.org/r/emacs-devel/2015-11/msg01707.html
 2015-11-20  Paul Eggert  <eggert@cs.ucla.edu>
@@ -16272,7 +16272,7 @@
        Be more systematic about quoting symbols `like-this' rather than
        `like-this or 'like-this' in docstrings.  This follows up Artur
        Malabarba's email in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-11/msg01647.html
+        https://lists.gnu.org/r/emacs-devel/2015-11/msg01647.html
 2015-11-18  Peder O. Klingenberg  <peder@klingenberg.no>
@@ -16332,7 +16332,7 @@
        Fix docstring quoting problems with ‘ '’
        Problem reported by Artur Malabarba in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-11/msg01513.html
+        https://lists.gnu.org/r/emacs-devel/2015-11/msg01513.html
        Most of these fixes are to documentation; many involve fixing
        longstanding quoting glitches that are independent of the
        recent substitute-command-keys changes.  The changes to code are:
@@ -17362,7 +17362,7 @@
          Date: Wed, 28 Oct 2015 18:45:29 -0700
          Message-ID: <m2y4emqwg6.fsf@newartisans.com>
-          https://lists.gnu.org/archive/html/emacs-devel/2015-10/msg02372.html
+          https://lists.gnu.org/r/emacs-devel/2015-10/msg02372.html
 2015-11-10  David Reitter  <david.reitter@gmail.com>
@@ -17778,7 +17778,7 @@
        * lisp/progmodes/project.el (project-library-roots):
        Remove directories inside the project roots from the result.
-        (https://lists.gnu.org/archive/html/emacs-devel/2015-11/msg00536.html)
+        (https://lists.gnu.org/r/emacs-devel/2015-11/msg00536.html)
 2015-11-08  Dmitry Gutov  <dgutov@yandex.ru>
@@ -17990,7 +17990,7 @@
        Avoid division by zero crash observed by Yuan MEI
-        See https://lists.gnu.org/archive/html/emacs-devel/2015-11/msg00194.html.
+        See https://lists.gnu.org/r/emacs-devel/2015-11/msg00194.html.
        * src/dispnew.c (required_matrix_height, required_matrix_width):
        Avoid division by zero.
@@ -18324,7 +18324,7 @@
        * etc/PROBLEMS: Describe the problem with pinning Emacs to taskbar
        on Windows 10.  For the details, see the discussion starting at
-        https://lists.gnu.org/archive/html/help-emacs-windows/2015-09/msg00000.html.
+        https://lists.gnu.org/r/help-emacs-windows/2015-09/msg00000.html.
 2015-10-30  Artur Malabarba  <bruce.connor.am@gmail.com>
@@ -18390,7 +18390,7 @@
        * lisp/ielm.el (ielm-indent-line): Use non-nil arg of comint-bol
        to go to the beginning of text line instead of command line.
-        https://lists.gnu.org/archive/html/emacs-devel/2015-10/msg02360.html
+        https://lists.gnu.org/r/emacs-devel/2015-10/msg02360.html
 2015-10-29  Eli Zaretskii  <eliz@gnu.org>
@@ -18521,7 +18521,7 @@
        * src/fileio.c (unhandled-file-name-directory): Default to calling
        `file-name-as-directory'
-        (https://lists.gnu.org/archive/html/emacs-devel/2015-10/msg02294.html).
+        (https://lists.gnu.org/r/emacs-devel/2015-10/msg02294.html).
 2015-10-28  Artur Malabarba  <bruce.connor.am@gmail.com>
@@ -18684,7 +18684,7 @@
        * lisp/vc/vc-hg.el (vc-hg-log-format): Pipe commit description
        through 'tabindent'.
        (vc-hg-log-view-mode): Set tab-width to 2 locally.
-        (https://lists.gnu.org/archive/html/emacs-devel/2015-10/msg02259.html)
+        (https://lists.gnu.org/r/emacs-devel/2015-10/msg02259.html)
 2015-10-27  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -18752,7 +18752,7 @@
        * lisp/vc/vc-hg.el (vc-hg-log-format): New variable.
        (vc-hg-print-log, vc-hg-expanded-log-entry): Use it.
-        (https://lists.gnu.org/archive/html/emacs-devel/2015-10/msg02191.html)
+        (https://lists.gnu.org/r/emacs-devel/2015-10/msg02191.html)
 2015-10-27  Nicolas Petton  <nicolas@petton.fr>
@@ -20044,7 +20044,7 @@
        (/ N) now returns the reciprocal of N
        This is more compatible with Common Lisp and XEmacs (Bug#21690).  See:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-10/msg01053.html
+        https://lists.gnu.org/r/emacs-devel/2015-10/msg01053.html
        * lisp/color.el (color-hue-to-rgb, color-hsl-to-rgb)
        (color-xyz-to-srgb, color-xyz-to-lab):
        * lisp/emacs-lisp/cl-extra.el (cl-float-limits):
@@ -20097,7 +20097,7 @@
        Add an entry for the default directory compression (to *.tar.g).
        (dired-compress-file): Update.
-        See https://lists.gnu.org/archive/html/emacs-devel/2015-10/msg00949.html.
+        See https://lists.gnu.org/r/emacs-devel/2015-10/msg00949.html.
 2015-10-20  Michael Sperber  <mike@xemacs.org>
@@ -21639,7 +21639,7 @@
        * src/window.c (Fpos_visible_in_window_p): Clarify the meaning of
        t for POS.  See
-        https://lists.gnu.org/archive/html/emacs-devel/2015-09/msg01040.html
+        https://lists.gnu.org/r/emacs-devel/2015-09/msg01040.html
        for the original report.
        * doc/lispref/windows.texi (Window Start and End): Clarify the
@@ -22140,7 +22140,7 @@
        Improve git diff hunk headers for .el, .texi
        Problem reported by Alan Mackenzie in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-09/msg00826.html
+        https://lists.gnu.org/r/emacs-devel/2015-09/msg00826.html
        * .gitattributes (*.el, *.texi): New patterns.
        * autogen.sh: Configure diff.elisp.xfuncname and
        diff.texinfo.xfuncname if using Git.
@@ -22415,7 +22415,7 @@
        a revision to checkin.
        * lisp/vc/vc.el (vc-next-action): Allow to optionally specify the
        revision when checking in files.
-        See https://lists.gnu.org/archive/html/emacs-devel/2015-09/msg00688.html
+        See https://lists.gnu.org/r/emacs-devel/2015-09/msg00688.html
        for the details.
 2015-09-18  Wilson Snyder  <wsnyder@wsnyder.org>
@@ -22600,7 +22600,7 @@
        winner no longer holds on to dead frames
        * lisp/winner.el (winner-change-fun): Cull dead frames.
        This prevents a potentially massive memory leak.  See:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-09/msg00619.html
+        https://lists.gnu.org/r/emacs-devel/2015-09/msg00619.html
 2015-09-16  Michael Albinus  <michael.albinus@gmx.de>
@@ -23035,7 +23035,7 @@
        Port Unicode char detection to FreeBSD+svgalib
        Problem reported by Ashish SHUKLA in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-09/msg00531.html
+        https://lists.gnu.org/r/emacs-devel/2015-09/msg00531.html
        * configure.ac: Check for struct unipair.unicode instead of for
        <linux/kd.h>, since that’s more specific to what the code
        actually needs.
@@ -23170,7 +23170,7 @@
        Revert some stray curved quotes I missed earlier
        Problem reported by David Kastrup in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-09/msg00440.html
+        https://lists.gnu.org/r/emacs-devel/2015-09/msg00440.html
        * lisp/international/mule-cmds.el (leim-list-header):
        Use format-message with an ASCII-only format.
@@ -23200,12 +23200,12 @@
        Add patch-sending instructions to git-workflow
        From a suggestion by Mitchel Humpherys in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-09/msg00421.html
+        https://lists.gnu.org/r/emacs-devel/2015-09/msg00421.html
        * admin/notes/git-workflow (Sending patches): New section.
        Port to GIFLIB 5.0.6 and later
        Problem reported by Mitchel Humpherys in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-09/msg00420.html
+        https://lists.gnu.org/r/emacs-devel/2015-09/msg00420.html
        * src/image.c (HAVE_GIFERRORSTRING) [HAVE_GIF]: New macro.
        (GifErrorString, init_gif_functions) [HAVE_GIF && WINDOWSNT]:
        (gif_load) [HAVE_GIF]: Use it.
@@ -23223,7 +23223,7 @@
        Refix movemail GCC pacification
        Problem reported by Ken Brown in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-09/msg00406.html
+        https://lists.gnu.org/r/emacs-devel/2015-09/msg00406.html
        * lib-src/movemail.c (main): Fix previous change.
 2015-09-09  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -23282,7 +23282,7 @@
        Define internal-char-font even if --without-x
        The function is used now even in non-graphical environments.
        Problem reported by Glenn Morris in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-09/msg00401.html
+        https://lists.gnu.org/r/emacs-devel/2015-09/msg00401.html
        * src/font.c (Finternal_char_font): Move here ...
        * src/fontset.c (Finternal_char_font): ... from here.
@@ -23324,7 +23324,7 @@
        Also, undo the recent change that caused text-quoting-style to
        affect quote display on terminals, so that the two features are
        independent.  See Alan Mackenzie in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-09/msg00244.html
+        https://lists.gnu.org/r/emacs-devel/2015-09/msg00244.html
        Finally, add a style parameter to startup--setup-quote-display,
        so that this function can also be invoked after startup, with
        different styles depending on user preference at the time.
@@ -23994,7 +23994,7 @@
        Follow text-quoting-style in display table init
        This attempts to fix a problem reported by Alan Mackenzie in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-09/msg00112.html
+        https://lists.gnu.org/r/emacs-devel/2015-09/msg00112.html
        * doc/lispref/display.texi (Active Display Table):
        Mention how text-quoting-style affects it.
        * doc/lispref/help.texi (Keys in Documentation):
@@ -24362,7 +24362,7 @@
        Make ‘text-quoting-style’ a plain defvar
        It doesn’t need customization, as it’s likely useful only by experts.
        Suggested by Stefan Monnier in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-08/msg01020.html
+        https://lists.gnu.org/r/emacs-devel/2015-08/msg01020.html
        * lisp/cus-start.el: Remove doc.c section for builtin customized vars.
        Quoting fixes in lisp/textmodes
@@ -24645,7 +24645,7 @@
        Assume GC_MARK_STACK == GC_MAKE_GCPROS_NOOPS
        This removes the need for GCPRO1 etc.  Suggested by Stefan Monnier in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-08/msg00918.html
+        https://lists.gnu.org/r/emacs-devel/2015-08/msg00918.html
        * doc/lispref/internals.texi (Writing Emacs Primitives):
        * etc/NEWS:
        Document the change.
@@ -24822,7 +24822,7 @@
        That way, the caller doesn’t have to use curved quotes to
        get diagnostics that match the text-quoting-style preferences.
        Suggested by Dmitry Gutov in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-08/msg00893.html
+        https://lists.gnu.org/r/emacs-devel/2015-08/msg00893.html
        This means we no longer need %qs, so remove that format.
        While we’re at it, fix an unlikely bug and lessen the pressure
        on the garbage collector by processing the string once rather
@@ -24979,7 +24979,7 @@
        This is simpler and easier to explain, and should encourage better
        typography.  Do this in Electric Quote mode and when translating
        quotes in docstrings.  Inspired by a suggestion by Dmitry Gutov in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-08/msg00806.html
+        https://lists.gnu.org/r/emacs-devel/2015-08/msg00806.html
        * doc/emacs/text.texi (Quotation Marks):
        * doc/lispref/help.texi (Keys in Documentation):
        * etc/NEWS:
@@ -25129,8 +25129,8 @@
        and using the new function instead of ‘format’ only in contexts
        where this seems appropriate.
        Problem reported by Dmitry Gutov and Andreas Schwab in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-08/msg00826.html
+        https://lists.gnu.org/r/emacs-devel/2015-08/msg00826.html
-        https://lists.gnu.org/archive/html/emacs-devel/2015-08/msg00827.html
+        https://lists.gnu.org/r/emacs-devel/2015-08/msg00827.html
        * doc/lispref/commands.texi (Using Interactive):
        * doc/lispref/control.texi (Signaling Errors, Signaling Errors):
        * doc/lispref/display.texi (Displaying Messages, Progress):
@@ -26222,7 +26222,7 @@
        When run with --batch, check that curved quotes are compatible with
        the system locale before outputting them in diagnostics.
        Problem reported by Eli Zaretskii in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-08/msg00594.html
+        https://lists.gnu.org/r/emacs-devel/2015-08/msg00594.html
        * lisp/startup.el (command-line): Set internal--text-quoting-flag
        after the standard display table is initialized.
        * src/doc.c (default_to_grave_quoting_style): New function.
@@ -26813,7 +26813,7 @@
        unread-command-events and unread-post-input-method-events are
        always recorded by record_char.  Reported by David Kastrup
        <dak@gnu.org>, see
-        https://lists.gnu.org/archive/html/emacs-devel/2015-08/msg00193.html.
+        https://lists.gnu.org/r/emacs-devel/2015-08/msg00193.html.
 2015-08-10  Samer Masterson  <samer@samertm.com>
@@ -26869,7 +26869,7 @@
        ChangeLog.2 ignores remote-tracking merges
        * build-aux/gitlog-to-emacslog: Ignore commit logs matching
        "Merge remote-tracking branch '.*'" too.  See Eli Zaretskii in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-08/msg00384.html
+        https://lists.gnu.org/r/emacs-devel/2015-08/msg00384.html
 2015-08-09  Nicolas Richard  <youngfrog@members.fsf.org>
@@ -27096,7 +27096,7 @@
        Preserve window point in xref-find-definitions-other-window
        Fix the problem reported by Ingo Logmar in
-        https://lists.gnu.org/archive/html/emacs-devel/2015-08/msg00152.html
+        https://lists.gnu.org/r/emacs-devel/2015-08/msg00152.html
        * lisp/progmodes/xref.el (xref--goto-char): Extract from
        xref--goto-location.
        (xref--pop-to-location): Use it.  Replace xref--goto-location with
@@ -27182,9 +27182,9 @@
        Rename help-quote-translation to text-quoting-style,
        and use symbols rather than characters as values.
        This follows suggestions along these lines by Alan Mackenzie in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-06/msg00343.html
+        https://lists.gnu.org/r/emacs-devel/2015-06/msg00343.html
        and by Drew Adams in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-08/msg00048.html
+        https://lists.gnu.org/r/emacs-devel/2015-08/msg00048.html
        * doc/lispref/help.texi (Keys in Documentation)
        * etc/NEWS:
        * lisp/cus-start.el (standard):
@@ -27214,7 +27214,7 @@
        Also mention "curly quotes"
        See Drew Adams's email in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-08/msg00040.html
+        https://lists.gnu.org/r/emacs-devel/2015-08/msg00040.html
        * doc/lispref/help.texi (Keys in Documentation):
        Add index entry "curly quotes".
        * etc/NEWS: Use the phrase "curly quotes" too.
@@ -27484,7 +27484,7 @@
        Don't worry about $ac_cv_header_sys_resource_h and
        $ac_cv_func_getrlimit, as they're no longer needed for this.
        Problem reported by Eli Zaretskii in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-07/msg00443.html
+        https://lists.gnu.org/r/emacs-devel/2015-07/msg00443.html
 2015-07-28  Andy Moreton  <andrewjmoreton@gmail.com>  (tiny change)
@@ -27866,7 +27866,7 @@
        (xref-pulse-momentarily): Rename from xref--maybe-pulse.
        (xref--pop-to-location, xref--display-position)
        (xref-pop-marker-stack): Use the new hooks, as requested in
-        https://lists.gnu.org/archive/html/emacs-devel/2015-07/msg00213.html
+        https://lists.gnu.org/r/emacs-devel/2015-07/msg00213.html
 2015-07-19  Bozhidar Batsov  <bozhidar@batsov.com>
@@ -27953,7 +27953,7 @@
        Fix hang with large yanks This should fix the bug fixed by Mike
        Crowe's patch in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-07/msg00106.html
+        https://lists.gnu.org/r/emacs-devel/2015-07/msg00106.html
        A problem in this area has been reported by several users; see
        Bug#16737, Bug#17101, Bug#17026, Bug#17172, Bug#19320, Bug#20283.
        This fix differs from Mike Crowe's patch in that it should avoid a
@@ -28671,7 +28671,7 @@
        * src/frame.c (x_set_font): If font_spec_from_name returns nil,
        don't barf; instead, request a new fontset to be generated.  This
        avoids unnecessarily rejecting fonts named against XLFD rules.  See
-        https://lists.gnu.org/archive/html/help-emacs-windows/2015-06/msg00001.html,
+        https://lists.gnu.org/r/help-emacs-windows/2015-06/msg00001.html,
        for the description of the original problem.
        * lisp/faces.el (set-face-attribute): Don't be fooled too easily
        by a hyphen in a font's name.
@@ -28845,7 +28845,7 @@
        * src/font.c (font_load_for_lface): If the font-spec didn't match
        any available fonts, try again without interpreting trailing "-NN"
        as the font size.  For the description of the original problem, see
-        https://lists.gnu.org/archive/html/help-emacs-windows/2015-06/msg00001.html
+        https://lists.gnu.org/r/help-emacs-windows/2015-06/msg00001.html
        .gdbinit followup to changes in !USE_LSB_TAG
        * src/.gdbinit (xgetsym): Don't left-shift $ptr even under
@@ -28935,7 +28935,7 @@
        Improve docstring for macroexp-let2
        * lisp/emacs-lisp/macroexp.el (macroexp-let2):
        Improve as per suggestion by RMS in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-06/msg00621.html
+        https://lists.gnu.org/r/emacs-devel/2015-06/msg00621.html
        Also, rename args to match new doc string.
 2015-06-27  Eli Zaretskii  <eliz@gnu.org>
@@ -29025,7 +29025,7 @@
        * lisp/term/w32console.el (terminal-init-w32console):
        * src/doc.c (Fsubstitute_command_keys, Vhelp_quote_translation):
        If ‘ is not displayable, transliterate it to `, not to '.  See:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-06/msg00542.html
+        https://lists.gnu.org/r/emacs-devel/2015-06/msg00542.html
        Fix C99 incompatibilities in Cairo code
        * src/image.c (xpm_load) [USE_CAIRO]:
@@ -29811,7 +29811,7 @@
        * lisp/emacs-lisp/derived.el (derived-mode-make-docstring):
        Nest regexp-quote inside format, not the reverse.
        Problem reported by Artur Malabarba in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-06/msg00206.html
+        https://lists.gnu.org/r/emacs-devel/2015-06/msg00206.html
 2015-06-15  Eli Zaretskii  <eliz@gnu.org>
@@ -30843,7 +30843,7 @@
        use CRLF (or CR!) termination for lines.
        Update .gitattributes to match current sources
-        https://lists.gnu.org/archive/html/emacs-devel/2015-05/msg00879.html
+        https://lists.gnu.org/r/emacs-devel/2015-05/msg00879.html
        * .gitattributes: Accommodate tests that insist on DOS format.
        Remove test/automated/data/decompress/foo-gzipped.
        Add etc/e/eterm-color.
@@ -30868,7 +30868,7 @@
        Use list for the tags completion table, not obarray
        * lisp/progmodes/etags.el (etags-tags-completion-table): Return a
        list instead of an obarray
-        (https://lists.gnu.org/archive/html/emacs-devel/2015-05/msg00876.html).
+        (https://lists.gnu.org/r/emacs-devel/2015-05/msg00876.html).
        (tags-completion-table): Combine those lists.
        (tags-completion-table): Update the docstring.
@@ -31783,7 +31783,7 @@
        Revert doc string changes to f90.el
        Problem reported by Glenn Morris in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-05/msg00596.html
+        https://lists.gnu.org/r/emacs-devel/2015-05/msg00596.html
        * lisp/progmodes/f90.el (f90-mode, f90-abbrev-start):
        Revert recent changes to doc strings, as it's intended that they
        use grave accent, not quote.
@@ -31869,7 +31869,7 @@
        Prefer "this" to “this” in doc strings
        This mostly just straightens quotes introduced in my previous patch.
        Suggested by Dmitry Gutov in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-05/msg00565.html
+        https://lists.gnu.org/r/emacs-devel/2015-05/msg00565.html
        * lisp/faces.el, lisp/gnus/gnus-group.el, lisp/ldefs-boot.el:
        * lisp/mail/supercite.el, lisp/net/tramp.el, lisp/recentf.el:
        * lisp/textmodes/artist.el, lisp/textmodes/rst.el:
@@ -31979,8 +31979,8 @@
        New command icomplete-force-complete-and-exit
        * lisp/icomplete.el (icomplete-force-complete-and-exit):
        New command
-        (https://lists.gnu.org/archive/html/emacs-devel/2015-05/msg00461.html)
+        (https://lists.gnu.org/r/emacs-devel/2015-05/msg00461.html)
-        (https://lists.gnu.org/archive/html/emacs-devel/2015-05/msg00516.html).
+        (https://lists.gnu.org/r/emacs-devel/2015-05/msg00516.html).
        (icomplete-minibuffer-map): Bind C-j to it.
        (icomplete-forward-completions, icomplete-backward-completions):
        Mention the new command in the docstring.
@@ -32807,7 +32807,7 @@
        Fix tagging of symbols in C enumerations
        * lib-src/etags.c (consider_token): Don't tag symbols in
        expressions that assign values to enum constants.  See
-        https://lists.gnu.org/archive/html/emacs-devel/2015-05/msg00291.html
+        https://lists.gnu.org/r/emacs-devel/2015-05/msg00291.html
        for details.
        (C_entries): Reset fvdef to fvnone after processing a preprocessor
        conditional and after a comma outside of parentheses.
@@ -32966,7 +32966,7 @@
        Remove tag-symbol-match-p from etags-xref-find-definitions-tag-order
        * lisp/progmodes/etags.el (etags-xref-find-definitions-tag-order):
        Remove tag-symbol-match-p from the default value
-        (https://lists.gnu.org/archive/html/emacs-devel/2015-05/msg00292.html).
+        (https://lists.gnu.org/r/emacs-devel/2015-05/msg00292.html).
        Declare find-tag obsolete
        * lisp/progmodes/etags.el (find-tag): Declare obsolete in favor of
@@ -33162,7 +33162,7 @@
        * lisp/cedet/pulse.el (pulse-momentary-unhighlight): Only cancel
        timer when it is non-nil
-        (https://lists.gnu.org/archive/html/emacs-devel/2015-05/msg00223.html).
+        (https://lists.gnu.org/r/emacs-devel/2015-05/msg00223.html).
 2015-05-06  Glenn Morris  <rgm@gnu.org>
@@ -33262,7 +33262,7 @@
        * lisp/cedet/pulse.el (pulse-momentary-stop-time): New variable.
        (pulse-momentary-highlight-overlay): Set up the timer instead of
        calling `pulse'
-        (https://lists.gnu.org/archive/html/emacs-devel/2015-05/).
+        (https://lists.gnu.org/r/emacs-devel/2015-05/).
        (pulse-tick): New function.
        (pulse-momentary-unhighlight): Cut off the stop time.
        (pulse-delay): Update the docstring WRT to not using sit-for.
@@ -33455,7 +33455,7 @@
        (pulse-momentary-highlight-region): Add autoload cookie.
        * lisp/progmodes/xref.el (xref--maybe-pulse): Don't highlight the
        indentation, or the newline, if the line's non-empty
-        (https://lists.gnu.org/archive/html/emacs-devel/2015-05/msg00118.html).
+        (https://lists.gnu.org/r/emacs-devel/2015-05/msg00118.html).
 2015-05-04  Daniel Colascione  <dancol@dancol.org>
@@ -33822,7 +33822,7 @@
        * lisp/progmodes/xref.el (xref--xref-buffer-mode):
        Set `next-error-function' and `next-error-last-buffer'.
        (xref--next-error-function): New function.
-        (https://lists.gnu.org/archive/html/emacs-devel/2015-04/msg01311.html)
+        (https://lists.gnu.org/r/emacs-devel/2015-04/msg01311.html)
 2015-04-29  Fabián Ezequiel Gallina  <fgallina@gnu.org>
@@ -34096,7 +34096,7 @@
        Introduce xref-prompt-for-identifier
        * lisp/progmodes/xref.el (xref-prompt-for-identifier): New option.
        (xref--read-identifier): Use it
-        (https://lists.gnu.org/archive/html/emacs-devel/2015-04/msg01205.html).
+        (https://lists.gnu.org/r/emacs-devel/2015-04/msg01205.html).
 2015-04-26  João Távora  <joaotavora@gmail.com>
@@ -34113,7 +34113,7 @@
        Pass `id' to `completing-read' as def instead of initial input
        * lisp/progmodes/xref.el (xref--read-identifier): Pass `id' to
        `completing-read' as the default value instead of initial input
-        (https://lists.gnu.org/archive/html/emacs-devel/2015-04/msg01182.html).
+        (https://lists.gnu.org/r/emacs-devel/2015-04/msg01182.html).
 2015-04-25  Paul Eggert  <eggert@cs.ucla.edu>
@@ -34724,7 +34724,7 @@
        Standardize names of ChangeLog history files
        Suggested by Glenn Morris in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-04/msg00678.html
+        https://lists.gnu.org/r/emacs-devel/2015-04/msg00678.html
        * Makefile.in (install-man): Don't treat ChangeLog.1 as a man page.
        * doc/man/ChangeLog.1: Rename back from doc/man/ChangeLog.01.
        * lisp/erc/ChangeLog.1: New file, containing the old contents of ...
@@ -34737,7 +34737,7 @@
        This more clearly distingiushes pre-April-7 ChangeLog entries (which
        are for top-level files only) from post-April-7 entries (which are
        about files at all levels.  Problem reported by Glenn Morris in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-04/msg00678.html
+        https://lists.gnu.org/r/emacs-devel/2015-04/msg00678.html
        * ChangeLog.1: Move post-April-7 entries from here ...
        * ChangeLog.2: ... to this new file.
        * Makefile.in (CHANGELOG_HISTORY_INDEX_MAX): Bump to 2.
@@ -35131,7 +35131,7 @@
        * doc/man/ChangeLog.01: Rename from doc/man/ChangeLog.1.
        That way, 'make install' won't think it's a man page.
        Reported by Ashish SHUKLA in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-04/msg00656.html
+        https://lists.gnu.org/r/emacs-devel/2015-04/msg00656.html
        Improve 'make change-history' prereq tests
        * Makefile.in (gen_origin): Fix to match what's in the master branch.
@@ -35320,7 +35320,7 @@
        Port commit-msg to MSYS Bash+Gawk
        See Eli Zaretskii in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-04/msg00610.html
+        https://lists.gnu.org/r/emacs-devel/2015-04/msg00610.html
        * build-aux/git-hooks/commit-msg (cent_sign_utf8_format)
        (cent_sign, print_at_sign, at_sign): Revert previous change.
        (print_at_sign): Prepend "BEGIN".
@@ -35330,7 +35330,7 @@
        * build-aux/git-hooks/commit-msg (cent_sign):
        Just use UTF-8 here rather than ASCII + printf, as the latter fails
        on a broken MS-Windows shell.  Reported by Eli Zaretskii in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-04/msg00592.html
+        https://lists.gnu.org/r/emacs-devel/2015-04/msg00592.html
 2015-04-11  Chris Zheng  <chriszheng99@gmail.com>  (tiny change)
@@ -35365,7 +35365,7 @@
        Add a FIXME comment.
        (log-edit-changelog-entries): Extract from
        `log-edit-changelog-entries', handle FILE being a directory
-        (https://lists.gnu.org/archive/html/emacs-devel/2015-04/msg00555.html).
+        (https://lists.gnu.org/r/emacs-devel/2015-04/msg00555.html).
 2015-04-10  Paul Eggert  <eggert@cs.ucla.edu>
@@ -35377,19 +35377,19 @@
        * build-aux/git-hooks/commit-msg:
        Ignore every line after a scissors line, such as a line generated
        by 'git commit -v'.  Problem reported by Johan Bockgård in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-04/msg00580.html
+        https://lists.gnu.org/r/emacs-devel/2015-04/msg00580.html
        port commit-msg to Gawk 3.0.4 (1999)
        * build-aux/git-hooks/commit-msg (cent_sign_utf8_format, cent_sign)
        (print_at_sign, at_sign): New vars.  Use them to avoid problems
        Eli Zaretskii encountered with Gawk 3.0.4 (1999) on MSYS.  See:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-04/msg00566.html
+        https://lists.gnu.org/r/emacs-devel/2015-04/msg00566.html
        Have commit-msg report commit failure
        * build-aux/git-hooks/commit-msg: If the commit is aborted,
        say so.  Simplify by doing this at the end.  Problem reported
        by Eli Zaretskii in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-04/msg00566.html
+        https://lists.gnu.org/r/emacs-devel/2015-04/msg00566.html
 2015-04-10  Thomas Fitzsimmons  <fitzsim@fitzsim.org>
@@ -35463,7 +35463,7 @@
        vmotion, for the same reason.  Fix the clipping of the argument
        value to support scroll-margin in all cases and avoid unwarranted
        recentering.  Reported by Milan Stanojević <milanst@gmail.com> in
-        https://lists.gnu.org/archive/html/help-gnu-emacs/2015-04/msg00092.html,
+        https://lists.gnu.org/r/help-gnu-emacs/2015-04/msg00092.html,
        which see.
 2015-04-09  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -35554,7 +35554,7 @@
        for copyright notice prototype, so that we get a proper "coding:"
        cookie.  Use 'mv -i' to avoid unconditionally overwriting an
        existing ChangeLog.  Problems reported by Eli Zaretskii in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-04/msg00504.html
+        https://lists.gnu.org/r/emacs-devel/2015-04/msg00504.html
        Merge from gnulib
        * build-aux/gitlog-to-changelog: Update from gnulib, incorporating:
diff --git a/ChangeLog.3 b/ChangeLog.3
index 17f18c0fad3..46d98d80262 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -261,7 +261,7 @@
        Add line-number faces to the display-line-numbers group
-        See https://lists.gnu.org/archive/html/emacs-devel/2017-10/msg00151.html
+        See https://lists.gnu.org/r/emacs-devel/2017-10/msg00151.html
        and its resulting thread.
        * lisp/display-line-numbers.el (display-line-numbers): Add to the
@@ -425,7 +425,7 @@
        Fix bug in recent styled_format change
        Problem reported by Kaushal Modi in:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-10/msg00141.html
+        https://lists.gnu.org/r/emacs-devel/2017-10/msg00141.html
        * src/editfns.c (styled_format): Fix bug where USE_SAFE_ALLOCA was
        not always followed by SAFE_FREE.  This bug was introduced in my
        patch 2017-09-26T23:31:57Z!eggert@cs.ucla.edu entitled "Avoid some
@@ -1108,7 +1108,7 @@
        Remove old flymake-display-err-menu-for-current-line, it's useless
-        See https://lists.gnu.org/archive/html/emacs-devel/2017-09/msg00949.html
+        See https://lists.gnu.org/r/emacs-devel/2017-09/msg00949.html
        * lisp/progmodes/flymake-ui.el
        (flymake-popup-current-error-menu): Remove.
@@ -1797,8 +1797,8 @@
           See:
-             https://lists.gnu.org/archive/html/emacs-devel/2017-09/msg01020.html
+             https://lists.gnu.org/r/emacs-devel/2017-09/msg01020.html
-             https://lists.gnu.org/archive/html/emacs-devel/2017-09/msg01030.html
+             https://lists.gnu.org/r/emacs-devel/2017-09/msg01030.html
        This means that those two commits MUST be merged to master AFTER ALL.
@@ -2074,7 +2074,7 @@
        * doc/emacs/maintaining.texi (VC Change Log): Mention the new binding.
        * doc/emacs/vc1-xtra.texi (Version Headers): Remove the association of
        'C-x v h' with `vc-insert-headers'.
-        (https://lists.gnu.org/archive/html/emacs-devel/2017-09/msg00957.html)
+        (https://lists.gnu.org/r/emacs-devel/2017-09/msg00957.html)
 2017-09-30  Allen Li  <vianchielfaura@gmail.com>  (tiny change)
@@ -2284,7 +2284,7 @@
        Don't merge this back to master as development happening there builds
        upon this work. See also
-        https://lists.gnu.org/archive/html/emacs-devel/2017-09/msg00932.html.
+        https://lists.gnu.org/r/emacs-devel/2017-09/msg00932.html.
 2017-09-28  João Távora  <joaotavora@gmail.com>
@@ -2294,7 +2294,7 @@
        Don't merge this back to master as development happening there builds
        upon this work. See also
-        https://lists.gnu.org/archive/html/emacs-devel/2017-09/msg00932.html
+        https://lists.gnu.org/r/emacs-devel/2017-09/msg00932.html
 2017-09-27  Paul Eggert  <eggert@cs.ucla.edu>
@@ -2648,7 +2648,7 @@
        * doc/emacs/cmdargs.texi (Action Arguments): Don't mention
        'find-file', as the implementation has changed.  Reported by
        Everton J. Carpes <everton.carpes@gmail.com> in
-        https://lists.gnu.org/archive/html/help-gnu-emacs/2017-09/msg00146.html.
+        https://lists.gnu.org/r/help-gnu-emacs/2017-09/msg00146.html.
 2017-09-19  Eli Zaretskii  <eliz@gnu.org>
@@ -2843,7 +2843,7 @@
        * src/eval.c (push_handler_nosignal): Use CACHEABLE to work around
        GCC compilation warning.  Suggested by Paul Eggert <eggert@cs.ucla.edu>
-        in https://lists.gnu.org/archive/html/emacs-devel/2017-09/msg00492.html.
+        in https://lists.gnu.org/r/emacs-devel/2017-09/msg00492.html.
 2017-09-17  Michael Albinus  <michael.albinus@gmx.de>
@@ -3162,7 +3162,7 @@
        * src/lisp.h (pI) [__MINGW32__]: Provide definition that will
        hopefully DTRT with both MinGW64 and mingw.org's MinGW.  See
-        https://lists.gnu.org/archive/html/emacs-devel/2017-09/msg00171.html
+        https://lists.gnu.org/r/emacs-devel/2017-09/msg00171.html
        for the details.
        * src/conf_post.h (PRINTF_ARCHETYPE) [MINGW_W64]: Separate
        definition specific to MinGW64.
@@ -3198,7 +3198,7 @@
        Port renameat_noreplace to openSUSE 12.3
        Problem reported by M. Nomiya in:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-09/msg00363.html
+        https://lists.gnu.org/r/emacs-devel/2017-09/msg00363.html
        * src/sysdep.c (renameat_noreplace):
        Call renameat2 only if CYGWIN.
@@ -3402,7 +3402,7 @@
        * doc/misc/gnus.texi (Saving Articles):
        Document behavior with directory name targets (Bug#27986).
        Problem reported by Katsumi Yamaoka in:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-09/msg00216.html
+        https://lists.gnu.org/r/emacs-devel/2017-09/msg00216.html
 2017-09-12  Mark Oteiza  <mvoteiza@udel.edu>
@@ -3774,7 +3774,7 @@
        * configure.ac (srcdir) [mingw32]: Downcase the drive letter, to
        avoid warnings from find-file-noselect when making autoloads.  For
        the details, see
-        https://lists.gnu.org/archive/html/emacs-devel/2017-09/msg00049.html.
+        https://lists.gnu.org/r/emacs-devel/2017-09/msg00049.html.
 2017-09-10  Mark Oteiza  <mvoteiza@udel.edu>
@@ -4006,7 +4006,7 @@
        bit-shifting, to avoid compiler warnings.
        (w32font_text_extents): Tell GCC NGLYPHS is non-negative, to avoid
        a warning.  For details of the warning, see
-        https://lists.gnu.org/archive/html/emacs-devel/2017-09/msg00093.html.
+        https://lists.gnu.org/r/emacs-devel/2017-09/msg00093.html.
        * src/term.c (keys) [WINDOWSNT]: Don't define, as it is not used
        in that build.
        * src/sound.c (sound_perror): Ifdef away on WINDOWSNT, as this
@@ -4093,7 +4093,7 @@
        autogen.sh: omit bogus chatter if no .git
        Problem reported by Angelo Graziosi in:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-09/msg00045.html
+        https://lists.gnu.org/r/emacs-devel/2017-09/msg00045.html
        * autogen.sh (git_config): Do not execut 'git' if $do_git fails.
 2017-09-07  Glenn Morris  <rgm@gnu.org>
@@ -4112,7 +4112,7 @@
        * doc/lispref/functions.texi (Mapping Functions): Fix the order of
        @example and @group.  For the details, see
-        https://lists.gnu.org/archive/html/bug-texinfo/2017-09/msg00007.html.
+        https://lists.gnu.org/r/bug-texinfo/2017-09/msg00007.html.
 2017-09-06  Mark Oteiza  <mvoteiza@udel.edu>
@@ -4231,7 +4231,7 @@
        Fix configure test for Xpm
        Problem reported by Ashish Shukla in
-        https://lists.gnu.org/archive/html/emacs-devel/2017-09/msg00020.html.
+        https://lists.gnu.org/r/emacs-devel/2017-09/msg00020.html.
        * configure.ac (HAVE_XPM) [HAVE_X11]: Include X11/xpm.h instead of
        noX/xpm.h in configure test.
@@ -4240,7 +4240,7 @@
        Revert recent float→double Motif change
        Problem reported by Martin Rudalics in:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-09/msg00014.html
+        https://lists.gnu.org/r/emacs-devel/2017-09/msg00014.html
        * src/xterm.c (xm_scroll_callback, xaw_jump_callback)
        (x_set_toolkit_scroll_bar_thumb)
        (x_set_toolkit_horizontal_scroll_bar_thumb):
@@ -5390,7 +5390,7 @@
        * src/w32term.c (x_get_scale_factor):
        * src/xterm.c (x_get_scale_factor): Don't let the scale factors
        become less than 1.  Reported by Yuri D'Elia <wavexx@thregr.org> in
-        https://lists.gnu.org/archive/html/emacs-devel/2017-08/msg00459.html.
+        https://lists.gnu.org/r/emacs-devel/2017-08/msg00459.html.
 2017-08-21  Sam Steingold  <sds@gnu.org>
@@ -5940,7 +5940,7 @@
        Apparently Gitlab doesn’t create .git/hooks, like regular Git does.
        Problem reported by Ted Zlatanov in:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-08/msg00380.html
+        https://lists.gnu.org/r/emacs-devel/2017-08/msg00380.html
        * autogen.sh (git_sample_hook_src): New function.  Use it to work
        even if .git/hooks or its samples do not exist.
@@ -6209,7 +6209,7 @@
        Default autogen.sh to 'all'
        This addresses a problem noted by RMS in:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-08/msg00052.html
+        https://lists.gnu.org/r/emacs-devel/2017-08/msg00052.html
        * autogen.sh (do_git): Set to true if this script is invoked
        with no arguments and there is a .git subdirectory.
@@ -6689,7 +6689,7 @@
        Fix some crashes on self-modifying Elisp code
        Prompted by a problem report by Alex in:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-08/msg00143.html
+        https://lists.gnu.org/r/emacs-devel/2017-08/msg00143.html
        * src/eval.c (For, Fprogn, Fsetq, FletX, eval_sub):
        Compute XCDR (x) near XCAR (x); although this doesn't fix any bugs,
        it is likely to run a bit faster with typical hardware caches.
@@ -6775,7 +6775,7 @@
        changes; this happen, for instance, if we add new files.
        Instead, line numbers are invariant under shrinks/enlargements
        of the file header.
-        https://lists.gnu.org/archive/html/emacs-devel/2017-07/msg01092.html
+        https://lists.gnu.org/r/emacs-devel/2017-07/msg01092.html
        * lisp/dired.el (dired-save-positions): Save the line numbers at point.
        (dired-restore-positions): Use forward-line to restore the original
        position (Bug#27968).
@@ -6912,7 +6912,7 @@
        Use 'file-expand-wildcards' instead of 'eshell-extended-glob' to
        expand the wildcards.
        Suggested by Fabrice Popineau in:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-08/msg00108.html
+        https://lists.gnu.org/r/emacs-devel/2017-08/msg00108.html
        * lisp/ls-lisp.el (ls-lisp--dired): Use file-expand-wildcards.
 2017-08-04  Tino Calancha  <tino.calancha@gmail.com>
@@ -6937,7 +6937,7 @@
        Fix 2 tests that fail in MS-Windows
-        https://lists.gnu.org/archive/html/emacs-devel/2017-08/msg00018.html
+        https://lists.gnu.org/r/emacs-devel/2017-08/msg00018.html
        * test/lisp/vc/ediff-ptch-tests.el (ediff-ptch-test-bug26084):
        Add comments to explain the test logic.
        Pass '--binary' option to 'patch' program in windows environments.
@@ -6976,7 +6976,7 @@
        Port recent rename changes to RHEL 7 + NFS
        Problem reported by Ted Zlatanov in:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-08/msg00082.html
+        https://lists.gnu.org/r/emacs-devel/2017-08/msg00082.html
        * src/fileio.c (Frename_file): On RHEL 7 + NFS, renameat2 can fail
        with errno == EINVAL when it is not supported.  So treat that case
        like errno == ENOSYS.  Also, when ok_if_already_exists is neither
@@ -7009,7 +7009,7 @@
        * configure.ac (with_mailutils): Default to 'yes' if GNU Mailutils
        is installed.  See:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-08/msg00054.html
+        https://lists.gnu.org/r/emacs-devel/2017-08/msg00054.html
 2017-08-02  Paul Eggert  <eggert@cs.ucla.edu>
@@ -7082,7 +7082,7 @@
        Move dired tests using ls emulation to different files
        Suggested in:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-08/msg00018.html
+        https://lists.gnu.org/r/emacs-devel/2017-08/msg00018.html
        * test/lisp/dired-tests.el (dired-test-bug27693)
        (dired-test-bug27762, dired-test-bug27817)
        (dired-test-bug27631, dired-test-bug27843): Delete those
@@ -7171,7 +7171,7 @@
        Some dired tests fail intermittently in hydra.  Add few
        more should form calls for debugging.
        See:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-07/msg01092.html
+        https://lists.gnu.org/r/emacs-devel/2017-07/msg01092.html
        * test/lisp/dired-tests.el (dired-test-bug27243-01): Add few more should
        forms for debugging.
@@ -7245,7 +7245,7 @@
        Require em-glob inside 'ls-lisp--dired'.  This is necessary to
        not break the Emacs build.
        See following thread for details:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-07/msg01083.html
+        https://lists.gnu.org/r/emacs-devel/2017-07/msg01083.html
        * lisp/ls-lisp.el (dired-goto-next-file)
        (dired-read-dir-and-switches, eshell-extended-glob):
        Add function declarations.
@@ -7772,8 +7772,8 @@
        It turns out that this change is not needed, and it leaves several
        command loops settings not done.
-        https://lists.gnu.org/archive/html/emacs-devel/2017-07/msg00757.html
+        https://lists.gnu.org/r/emacs-devel/2017-07/msg00757.html
-        https://lists.gnu.org/archive/html/emacs-devel/2017-07/msg00840.html
+        https://lists.gnu.org/r/emacs-devel/2017-07/msg00840.html
 2017-07-22  Alexander Gramiak  <agrambot@gmail.com>
@@ -8075,7 +8075,7 @@
        bury-buffer to exit todo-mode.  This restores the desired behavior
        of not immediately returning to the exited todo-mode buffer on
        quitting another buffer, which a dired bug fix had changed (see
-        https://lists.gnu.org/archive/html/emacs-devel/2017-07/msg00739.html).
+        https://lists.gnu.org/r/emacs-devel/2017-07/msg00739.html).
 2017-07-19  Tino Calancha  <tino.calancha@gmail.com>
@@ -8146,8 +8146,8 @@
        Port gnutls.c to older (buggier?) GnuTLS
        Problem reported for GnuTLS 3.2.1 by Glenn Morris in:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-07/msg00716.html
+        https://lists.gnu.org/r/emacs-devel/2017-07/msg00716.html
-        https://lists.gnu.org/archive/html/emacs-devel/2017-07/msg00742.html
+        https://lists.gnu.org/r/emacs-devel/2017-07/msg00742.html
        Although I don't see how this bug can occur with vanilla GnuTLS 3.2.1,
        perhaps hydra was using a modified GnuTLS.
        * src/gnutls.c (Fgnutls_ciphers): Don't assume GNUTLS_CIPHER_NULL
@@ -8663,8 +8663,8 @@
        * lisp/faces.el (line-number): Don't use a fixed-pitch font, by
        popular demand.  For relevant discussions, see
-         https://lists.gnu.org/archive/html/emacs-devel/2017-07/msg00433.html
+         https://lists.gnu.org/r/emacs-devel/2017-07/msg00433.html
-         https://lists.gnu.org/archive/html/emacs-devel/2017-07/msg00445.html
+         https://lists.gnu.org/r/emacs-devel/2017-07/msg00445.html
 2017-07-14  Paul Eggert  <eggert@cs.ucla.edu>
@@ -9770,7 +9770,7 @@
        Substitute "`?`" inside command with the current file name.
        See details in:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-06/msg00618.html
+        https://lists.gnu.org/r/emacs-devel/2017-06/msg00618.html
        * lisp/dired-aux.el (dired-quark-subst-regexp, dired-star-subst-regexp):
        Mark as obsolete.
        (dired-isolated-string-re): New defun.
@@ -10603,7 +10603,7 @@
        Adjust lm-verify to accept current notices
        Problem reported by Mike Kupfer in:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-06/msg00512.html
+        https://lists.gnu.org/r/emacs-devel/2017-06/msg00512.html
        * lisp/emacs-lisp/lisp-mnt.el (lm-crack-copyright):
        Do not require later lines in a copyright notice to have more
        indentation than earlier lines.
@@ -11161,7 +11161,7 @@
        emacs-module.h: Create emacs_env_26
        This was part of the original design of the module
-        API (https://lists.gnu.org/archive/html/emacs-devel/2015-02/msg00960.html),
+        API (https://lists.gnu.org/r/emacs-devel/2015-02/msg00960.html),
        but I didn't take it into account when adding the should_quit
        function.
@@ -12009,7 +12009,7 @@
        (gdb-send): Don't increment gdb-control-level if the command
        matches gdb-python-guile-commands-regexp and has non-empty
        arguments.  Reported by David Boles <boles@ieee.org> in
-        https://lists.gnu.org/archive/html/emacs-devel/2017-06/msg00009.html.
+        https://lists.gnu.org/r/emacs-devel/2017-06/msg00009.html.
 2017-06-10  Eli Zaretskii  <eliz@gnu.org>
@@ -12707,7 +12707,7 @@
        * src/doprnt.c (doprnt): Format "%%" correctly.
        Problem reported by Philipp Stephani in:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-05/msg00901.html
+        https://lists.gnu.org/r/emacs-devel/2017-05/msg00901.html
 2017-06-01  Paul Eggert  <eggert@cs.ucla.edu>
@@ -12806,7 +12806,7 @@
        * lisp/emacs-lisp/eldoc.el (eldoc--supported-p): New function.
        (turn-on-eldoc-mode, eldoc-mode): Use it.
-        (https://lists.gnu.org/archive/html/emacs-devel/2017-05/msg00865.html)
+        (https://lists.gnu.org/r/emacs-devel/2017-05/msg00865.html)
 2017-05-30  Glenn Morris  <rgm@gnu.org>
@@ -13258,7 +13258,7 @@
        test-calc-23889: Skip test on 32-bit platforms
        This test fails on some 32-bit platforms as mentioned in
-        https://lists.gnu.org/archive/html/emacs-devel/2017-05/msg00737.html
+        https://lists.gnu.org/r/emacs-devel/2017-05/msg00737.html
        * test/lisp/calc/calc-tests.el (test-calc-23889): Skip when
        the Lisp integer is not big enough.
@@ -13638,7 +13638,7 @@
        * lisp/net/tls.el (tls-program, tls-checktrust): Remove s_client.
        Ref http://bugs.debian.org/766397
-        https://lists.gnu.org/archive/html/emacs-devel/2014-10/msg00803.html
+        https://lists.gnu.org/r/emacs-devel/2014-10/msg00803.html
        (cherry picked from commit 6e45de6bacc508db11b15b2c8ba86aad8c0570df)
@@ -13690,7 +13690,7 @@
        Fix definition of whitespace in JSON
        See
-        https://lists.gnu.org/archive/html/emacs-devel/2017-05/msg00115.html.
+        https://lists.gnu.org/r/emacs-devel/2017-05/msg00115.html.
        * lisp/json.el (json-skip-whitespace): Fix definition.
        * test/lisp/json-tests.el (test-json-skip-whitespace): Adapt unit
@@ -14070,7 +14070,7 @@
        * src/emacs-module.c (module_reset_handlerlist):
        Check handlerlist.  Suggested by Philipp Stephani in:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-05/msg00521.html
+        https://lists.gnu.org/r/emacs-devel/2017-05/msg00521.html
 2017-05-20  Paul Eggert  <eggert@cs.ucla.edu>
@@ -14078,7 +14078,7 @@
        * configure.ac (WERROR_CFLAGS): Omit -Wmissing-braces for Clang,
        to shut off a false alarm.  Problem reportd by Philipp Stephani in:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-05/msg00521.html
+        https://lists.gnu.org/r/emacs-devel/2017-05/msg00521.html
 2017-05-20  Noam Postavsky  <npostavs@gmail.com>
@@ -14150,7 +14150,7 @@
        * etc/PROBLEMS: Describe problems with Microsoft Intellipoint and
        mouse-2 events.  For the details, see
-        https://lists.gnu.org/archive/html/help-emacs-windows/2017-05/msg00009.html.
+        https://lists.gnu.org/r/help-emacs-windows/2017-05/msg00009.html.
 2017-05-19  Nick Helm  <nick@tenpoint.co.nz>  (tiny change)
@@ -14245,7 +14245,7 @@
        Attempt to work around macOS vfork bug
        Problem reported by YAMAMOTO Mitsuharu in:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-05/msg00342.html
+        https://lists.gnu.org/r/emacs-devel/2017-05/msg00342.html
        This is related to the fix for Bug#26397.
        * src/callproc.c (call_process_cleanup, call_process) [!MSDOS]:
        Report internal error if wait_for_termination fails.
@@ -14269,7 +14269,7 @@
        Don’t compile the (DARWIN_OS_CASE_SENSITIVE_FIXME == 2)
        code unless DARWIN_OS_CASE_SENSITIVE_FIXME is 2.
        Problem reported by Philipp Stephani in:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-05/msg00495.html
+        https://lists.gnu.org/r/emacs-devel/2017-05/msg00495.html
 2017-05-19  Paul Eggert  <eggert@cs.ucla.edu>
@@ -14277,7 +14277,7 @@
        * configure.ac (WERROR_CFLAGS): Omit -Wdouble-promotion if clang.
        Problem reported by Philipp Stephani in:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-05/msg00495.html
+        https://lists.gnu.org/r/emacs-devel/2017-05/msg00495.html
 2017-05-19  Paul Eggert  <eggert@cs.ucla.edu>
@@ -14362,7 +14362,7 @@
        Avoid undefined behavior in struct sockaddr
        Problem noted by Philipp Stephani in:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-05/msg00391.html
+        https://lists.gnu.org/r/emacs-devel/2017-05/msg00391.html
        * src/conf_post.h (ATTRIBUTE_MAY_ALIAS, DECLARE_POINTER_ALIAS):
        New macros.
        * src/process.c (conv_sockaddr_to_lisp, conv_lisp_to_sockaddr)
@@ -14387,7 +14387,7 @@
        Work around AddressSanitizer bug with vfork
        Problem reported by Jim Meyering in:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-05/msg00246.html
+        https://lists.gnu.org/r/emacs-devel/2017-05/msg00246.html
        * src/conf_post.h (vfork) [ADDRESS_SANITIZER]: Define to fork.
        Unfortunately with the AddressSanitizer in Fedora 25 x86-64, the
        vforked child messes up the parent’s shadow memory.  This is too
@@ -14452,7 +14452,7 @@
        multiple calls and struct literals in the last case of a switch.
        The old code ran afoul of GCC bug 80659, which caused an internal
        compiler error.  Problem reported by Jim Meyering in:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-05/msg00182.html
+        https://lists.gnu.org/r/emacs-devel/2017-05/msg00182.html
        https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80659
 2017-05-16  Paul Eggert  <eggert@cs.ucla.edu>
@@ -14563,9 +14563,9 @@
        * src/process.c (connect_network_socket):
        Use struct sockaddr_storage, not struct sockaddr_in, to store info
        about a socket address.  Problem reported by Philipp Stephani in:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-05/msg00314.html
+        https://lists.gnu.org/r/emacs-devel/2017-05/msg00314.html
        This fix is based on a patch by Philipp in:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-05/msg00357.html
+        https://lists.gnu.org/r/emacs-devel/2017-05/msg00357.html
 2017-05-14  Gemini Lasswell  <gazally@runbox.com>
@@ -15156,7 +15156,7 @@
        Compare unqualified type to Lisp_Object, to do the right thing
        when the expression has type ‘Lisp_Object const’.
        Problem reported by Eli Zaretskii in:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-05/msg00138.html
+        https://lists.gnu.org/r/emacs-devel/2017-05/msg00138.html
 2017-05-06  Paul Eggert  <eggert@cs.ucla.edu>
@@ -15295,7 +15295,7 @@
        * lisp/emacs-lisp/cl-generic.el (cl-defmethod): Denote the
        edebug spec part for qualifiers as [&rest atom], per
-        https://lists.gnu.org/archive/html/emacs-devel/2017-05/msg00053.html.
+        https://lists.gnu.org/r/emacs-devel/2017-05/msg00053.html.
 2017-05-05  Mike Kupfer  <mkupfer@alum.berkeley.edu>
@@ -16077,7 +16077,7 @@
        * lisp/net/tls.el (tls-program, tls-checktrust): Remove s_client.
        Ref http://bugs.debian.org/766397
-        https://lists.gnu.org/archive/html/emacs-devel/2014-10/msg00803.html
+        https://lists.gnu.org/r/emacs-devel/2014-10/msg00803.html
 2017-04-25  Glenn Morris  <rgm@gnu.org>
@@ -16706,7 +16706,7 @@
        * src/lisp.h (STRING_SET_CHARS): Add an assertion and commentary
        to prevent incorrect usage.  For details, see this discussion:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-04/msg00412.html.
+        https://lists.gnu.org/r/emacs-devel/2017-04/msg00412.html.
 2017-04-16  Eli Zaretskii  <eliz@gnu.org>
@@ -18130,7 +18130,7 @@
        * lisp/emacs-lisp/package.el (package-archives):
        Default to https for elpa.gnu.org if gnutls is available.  Ref:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-05/msg00130.html
+        https://lists.gnu.org/r/emacs-devel/2015-05/msg00130.html
 2017-04-04  Paul Eggert  <eggert@cs.ucla.edu>
@@ -18304,7 +18304,7 @@
        Fix a test that breaks the test suite when it is run within a
        virtual environment.
        See following link for details:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-03/msg00857.html
+        https://lists.gnu.org/r/emacs-devel/2017-03/msg00857.html
        * test/lisp/progmodes/python-tests.el
        (python-shell-calculate-process-environment-7): Bind
        python-shell-virtualenv-root to VIRTUAL_ENV when this var is set; otherwise
@@ -18369,7 +18369,7 @@
        Fix bugs in simplified test dependencies
        Problem reported by Glenn Morris in:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-04/msg00017.html
+        https://lists.gnu.org/r/emacs-devel/2017-04/msg00017.html
        * test/Makefile.in (LOGFILES, TESTS): Omit leading "./".
        (TESTS): Omit unnecessary patsubst.
        (test_template): Redo dependency heuristic, hopefully
@@ -18778,7 +18778,7 @@
        Fix redisplay glitches due to recent change in redisplay_internal
        * src/xdisp.c (redisplay_internal): A better fix for bug#26097.
-        See https://lists.gnu.org/archive/html/emacs-devel/2017-03/msg00695.html
+        See https://lists.gnu.org/r/emacs-devel/2017-03/msg00695.html
        for the problems caused by the original fix.
 2017-03-26  Michael Albinus  <michael.albinus@gmx.de>
@@ -18938,7 +18938,7 @@
        Don’t require chown/chgrp for game installation
        Problem reported by Joseph Mingrone in:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-03/msg00622.html
+        https://lists.gnu.org/r/emacs-devel/2017-03/msg00622.html
        * lib-src/Makefile.in (exp_archlibdir): Don’t fail if chown or
        chgrp fails with update-game-score and the game directory.
        Instead, expect the installer to fix this up afterwards.
@@ -19072,7 +19072,7 @@
        Don’t remove dependency files when configuring
        Problem reported by Tom Tromey in:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-03/msg00533.html
+        https://lists.gnu.org/r/emacs-devel/2017-03/msg00533.html
        * configure.ac: Don’t remove */*.o and */deps/* when
        --enable-autodepend is in effect.
@@ -19081,7 +19081,7 @@
        Make --without-pop the default.
        Suggested by Angelo Graziosi in:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-03/msg00431.html
+        https://lists.gnu.org/r/emacs-devel/2017-03/msg00431.html
        * configure.ac: Change the default from --with-pop to
        --without-pop.  Adjust diagnostics to match.
@@ -19118,7 +19118,7 @@
        org-src fontify buffers" the hooks were enabled also for modifications
        to the original org buffer.  This causes fontification errors when
        combined with certain packages, as reported in
-        https://lists.gnu.org/archive/html/emacs-orgmode/2017-03/msg00420.html.
+        https://lists.gnu.org/r/emacs-orgmode/2017-03/msg00420.html.
        * lisp/org/org-src.el (org-src-font-lock-fontify-block): Reduce scope
        of inhibit-modification-hooks let-binding.
@@ -19175,7 +19175,7 @@
        Fix problem with out-of-date dependencies
        Problem reported by Robert Marshall in:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-03/msg00501.html
+        https://lists.gnu.org/r/emacs-devel/2017-03/msg00501.html
        Although this problem has been with us for a while, the recent
        change from Automake to GNU Make exposed it again.
        * configure.ac (AUTO_DEPEND): When autodepending, clean out any
@@ -19405,7 +19405,7 @@
        Port out-of-source builds to windows-nt
        Problem reported by Angelo Graziosi in:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-03/msg00431.html
+        https://lists.gnu.org/r/emacs-devel/2017-03/msg00431.html
        * lib/Makefile.in: Prepend $(srcdir) to ../nt/gnulib-cfg.mk,
        to handle out-of-source builds if windows-nt.
@@ -20082,7 +20082,7 @@
        overlay, protect against that overlay's end point being outside of
        the narrowed region.
        Reported by Filipe Silva <filipe.silva@gmail.com> in
-        https://lists.gnu.org/archive/html/emacs-devel/2017-03/msg00176.html.
+        https://lists.gnu.org/r/emacs-devel/2017-03/msg00176.html.
 2017-03-10  Glenn Morris  <rgm@gnu.org>
@@ -20221,7 +20221,7 @@
        min and max should not return markers
        Problem reported by Glenn Morris in:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-03/msg00147.html
+        https://lists.gnu.org/r/emacs-devel/2017-03/msg00147.html
        * src/data.c (minmax_driver): Convert any marker result to an
        integer, since some callers assume this.
        * test/src/data-tests.el (data-tests-max, data-tests-min):
@@ -22803,9 +22803,9 @@
        Make FOR_EACH_TAIL more like other FOR_EACH macros
        See comments by Stefan Monnier in:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-02/msg00181.html
+        https://lists.gnu.org/r/emacs-devel/2017-02/msg00181.html
        and by Eli Zaretskii in:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-02/msg00207.html
+        https://lists.gnu.org/r/emacs-devel/2017-02/msg00207.html
        * src/fns.c (internal_equal): Do not bypass check for depth
        overflow when tail-recursing via a dotted list tail or an overlay
        plist, to avoid a rare infloop.
@@ -23174,7 +23174,7 @@
        * lisp/progmodes/xref.el (xref-collect-matches): Use '-E'
        together with '-e', as suggested by Noam Postavsky
-        (https://lists.gnu.org/archive/html/emacs-devel/2017-01/msg00780.html).
+        (https://lists.gnu.org/r/emacs-devel/2017-01/msg00780.html).
 2017-02-03  Paul Eggert  <eggert@cs.ucla.edu>
@@ -23245,7 +23245,7 @@
        Allow occur command to operate on the region
        See discussion in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-12/msg01084.html
+        https://lists.gnu.org/r/emacs-devel/2016-12/msg01084.html
        * lisp/replace.el (occur--region-start, occur--region-end)
        (occur--matches-threshold): New variables.
        (occur-engine): Use them.
@@ -23260,7 +23260,7 @@
        Another step in the long history of list-buffers-directory.  A thread
        branch discussing the meaning/use of the variable starts here
-        https://lists.gnu.org/archive/html/emacs-devel/2009-09/msg00684.html
+        https://lists.gnu.org/r/emacs-devel/2009-09/msg00684.html
        Also see (info "(elisp) Buffer File Name").
        * lisp/buff-menu.el: Relocate special case code into info.el.  Nix
        Info-* defvars.
@@ -23301,7 +23301,7 @@
        Fix quitting bug when buffers are frozen
        Problem noted by Eli Zaretskii in:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-01/msg00721.html
+        https://lists.gnu.org/r/emacs-devel/2017-01/msg00721.html
        This patch also fixes some other issues in that report.
        * src/lisp.h (incr_rarely_quit): Remove.
        All callers changed to use rarely_quit directly.
@@ -23319,7 +23319,7 @@
        This fixes some infinite loops that cannot be quitted out of,
        e.g., (defun foo () (nth most-positive-fixnum '#1=(1 . #1#)))
        when byte-compiled and when run under X.  See:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-01/msg00577.html
+        https://lists.gnu.org/r/emacs-devel/2017-01/msg00577.html
        This also attempts to keep the performance improvements I recently
        added, as much as possible under the constraint that the infloops
        must be caught.  In some cases this fixes infloop bugs recently
@@ -23448,7 +23448,7 @@
        * lisp/net/tramp.el (tramp-accept-process-output): Change argument
        list.  Make it work when called inside a timer.  See
-        <https://lists.gnu.org/archive/html/tramp-devel/2017-01/msg00010.html>.
+        <https://lists.gnu.org/r/tramp-devel/2017-01/msg00010.html>.
 2017-01-31  Eli Zaretskii  <eliz@gnu.org>
@@ -23835,7 +23835,7 @@
        * lisp/textmodes/reftex-vars.el (reftex-cite-format-builtin): Add
        \citetitle[*] to `reftex-cite-format' and bind them to keys i/I
        per user request
-        https://lists.gnu.org/archive/html/auctex/2017-01/msg00049.html.
+        https://lists.gnu.org/r/auctex/2017-01/msg00049.html.
 2017-01-27  Lars Ingebrigtsen  <larsi@gnus.org>
@@ -23872,7 +23872,7 @@
        * lisp/shell.el (shell-mode): Use setq-local.  Set
        scroll-conservatively to 101 locally.  See the discussion at
-        https://lists.gnu.org/archive/html/emacs-devel/2016-12/msg00736.html
+        https://lists.gnu.org/r/emacs-devel/2016-12/msg00736.html
        for the reasons.
 2017-01-27  Michael Hoffman  <emacs-hoffman@sneakemail.com>  (tiny change)
@@ -24534,7 +24534,7 @@
        * lisp/simple.el (region-bounds): New function.
        (region-noncontiguous-p): Use it.
-        https://lists.gnu.org/archive/html/emacs-devel/2017-01/msg00044.html
+        https://lists.gnu.org/r/emacs-devel/2017-01/msg00044.html
 2017-01-21  Alan Mackenzie  <acm@muc.de>
@@ -25369,7 +25369,7 @@
        * lisp/textmodes/ispell.el (ispell-begin-skip-region-regexp):
        Protect against 'ispell-skip-region-alist' being nil.  Reported by
        Ernest Adrogué <nfdisco@gmail.com>, see
-        https://lists.gnu.org/archive/html/help-gnu-emacs/2017-01/msg00007.html.
+        https://lists.gnu.org/r/help-gnu-emacs/2017-01/msg00007.html.
 2017-01-06  Philipp Stephani  <phst@google.com>
@@ -25662,7 +25662,7 @@
        Remove mistakenly-added files
        Problem reported by Glenn Morris in:
-        https://lists.gnu.org/archive/html/emacs-devel/2017-01/msg00008.html
+        https://lists.gnu.org/r/emacs-devel/2017-01/msg00008.html
        * lisp/gnus/gnus-ems.el, lisp/gnus/gnus-sync.el:
        * lisp/gnus/messcompat.el, lisp/nxml/nxml-glyph.el:
        * lisp/nxml/nxml-uchnm.el, lisp/obsolete/awk-mode.el:
@@ -25982,7 +25982,7 @@
        This avoids the confusion of using two different phrases "main thread"
        and "primary thread" internally to mean the same thing.  See:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-12/msg01142.html
+        https://lists.gnu.org/r/emacs-devel/2016-12/msg01142.html
        * src/thread.c (main_thread): Rename from primary_thread,
        since the new name no longer clashes with main_thread_id
        and Emacs internals normally call this the "main thread".
@@ -26175,7 +26175,7 @@
        Simplify prog1 implementation
        Inspired by a suggestion from Chris Gregory in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-12/msg00965.html
+        https://lists.gnu.org/r/emacs-devel/2016-12/msg00965.html
        On my platform, this generates exactly the same machine insns.
        * src/eval.c (prog_ignore): Rename from unwind_body, since
        it’s more general than that.  All callers changed.
@@ -26585,7 +26585,7 @@
        therefore don't need to be inserted into the red-black tree, so
        mem_find will never find them.  Reported by Daniel Colascione
        <dancol@dancol.org> in
-        https://lists.gnu.org/archive/html/emacs-devel/2016-12/msg00817.html.
+        https://lists.gnu.org/r/emacs-devel/2016-12/msg00817.html.
 2016-12-21  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -26618,7 +26618,7 @@
        Port dumping better to WSL
        Problem reported by Angelo Graziosi in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-12/msg00822.html
+        https://lists.gnu.org/r/emacs-devel/2016-12/msg00822.html
        * src/sysdep.c (disable_address_randomization):
        Detect buggy platforms where 'personality' always returns 0.
@@ -26671,7 +26671,7 @@
        Add several new filters and improve documentation.
        See discussion on:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-11/msg00399.html
+        https://lists.gnu.org/r/emacs-devel/2016-11/msg00399.html
        * lisp/ibuf-ext.el: Add paragraph to file commentary.
        (ibuffer-saved-filters, ibuffer-filtering-qualifiers)
        (ibuffer-filter-groups): Update doc string.
@@ -26967,7 +26967,7 @@
        needs to be, which then causes copy_executable_and_dump_data to
        write beyond the requested size of the file mapping, thus relying
        on the OS roundup to page boundary to save us from ourselves.  See
-        https://lists.gnu.org/archive/html/emacs-devel/2016-12/msg00642.html
+        https://lists.gnu.org/r/emacs-devel/2016-12/msg00642.html
        for the details.
        * lib/stdio-impl.h: Revert the workaround fix of not including
@@ -27501,7 +27501,7 @@
        Use C99 syntax for font drivers
        Problem reported by Daniel Colascione in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-12/msg00515.html
+        https://lists.gnu.org/r/emacs-devel/2016-12/msg00515.html
        * src/ftcrfont.c (ftcrfont_driver):
        * src/ftfont.c (ftfont_driver):
        * src/ftxfont.c (ftxfont_driver):
@@ -28810,7 +28810,7 @@
        * lisp/emacs-lisp/easy-mmode.el (define-minor-mode): Fix docstring
        so that it matches the actual implementation.
-        See https://lists.gnu.org/archive/html/help-gnu-emacs/2016-04/msg00071.html
+        See https://lists.gnu.org/r/help-gnu-emacs/2016-04/msg00071.html
 2016-12-07  Tino Calancha  <tino.calancha@gmail.com>
@@ -29763,7 +29763,7 @@
        ash, lsh avoid code duplication
        See discussion in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-11/msg00469.html
+        https://lists.gnu.org/r/emacs-devel/2016-11/msg00469.html
        * src/data.c (ash_lsh_impl): New function.
        (ash, lsh): Use it.
@@ -29984,7 +29984,7 @@
        Fix another CANNOT_DUMP problem
        Reported by Robert Pluim in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-11/msg00468.html
+        https://lists.gnu.org/r/emacs-devel/2016-11/msg00468.html
        * src/emacs.c (might_dump) [CANNOT_DUMP]: Move enum decl from here ...
        * src/lisp.h: ... to here.
@@ -30024,7 +30024,7 @@
        Fix undefined refs on some GNU/Linux hosts
        Problem reported by Ken Raeburn in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-11/msg00463.html
+        https://lists.gnu.org/r/emacs-devel/2016-11/msg00463.html
        * src/emacs.c (heap_bss_diff) [CANNOT_DUMP]: Remove, as this is
        not needed in the CANNOT_UNDUMP case.  All uses removed.  This
        removes unwanted references to my_endbss and my_endbss_static,
@@ -30612,7 +30612,7 @@
        tabulated-list: extend truncation into next align-right column
        See discussion on:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-10/msg01101.html
+        https://lists.gnu.org/r/emacs-devel/2016-10/msg01101.html
        * lisp/emacs-lisp/tabulated-list.el
        (tabulated-list--near-rows): New variable.
        (tabulated-list-print, tabulated-list-set-col): Use it.
@@ -31830,7 +31830,7 @@
        * lisp/info.el (Info-fontify-node): Don't fontify random numbers
        in parentheses as if they were footnote references.  See
-        https://lists.gnu.org/archive/html/bug-texinfo/2016-10/msg00007.html
+        https://lists.gnu.org/r/bug-texinfo/2016-10/msg00007.html
        for the details.
 2016-10-20  Philipp Stephani  <phst@google.com>
@@ -32477,7 +32477,7 @@
        Ibuffer: 'w' and 'B' default to buffer at current line
        See discussion in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-09/msg00384.html
+        https://lists.gnu.org/r/emacs-devel/2016-09/msg00384.html
        * lisp/ibuffer.el (ibuffer--near-buffers): New defun;
        return buffers near current line.
        * lisp/ibuf-ext.el (ibuffer-copy-buffername-as-kill): Use it.
@@ -32497,7 +32497,7 @@
        dired-mark-extension: Unmark if called with C-u prefix
        See discussion in #Bug2518 and:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-09/msg00711.html
+        https://lists.gnu.org/r/emacs-devel/2016-09/msg00711.html
        * lisp/dired-x.el (dired-mark-extension):
        Update interactive calls: a prefix arg C-u unmark files;
        a prefix C-u C-u prompt for MARKER-CHAR and mark files with it.
@@ -32520,7 +32520,7 @@
        See this thread for discussion:
-          https://lists.gnu.org/archive/html/emacs-devel/2016-09/threads.html#00329
+          https://lists.gnu.org/r/emacs-devel/2016-09/threads.html#00329
          From: Karl Fogel
          To: Emacs Devel
          Subject: Question about intended behavior of 'insert-for-yank-1'.
@@ -33043,7 +33043,7 @@
        Define _GNU_SOURCE in files delaying config.h
        Problem reported by Richard Copley in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-09/msg00440.html
+        https://lists.gnu.org/r/emacs-devel/2016-09/msg00440.html
        * src/w32.c, src/w32notify.c, src/w32proc.c (_GNU_SOURCE):
        Define early.
@@ -33085,7 +33085,7 @@
        Define _GNU_SOURCE in unexmacosx.c
        Problem reported by Bob Halley in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-09/msg00427.html
+        https://lists.gnu.org/r/emacs-devel/2016-09/msg00427.html
        * src/unexmacosx.c (_GNU_SOURCE): Define if not already defined.
 2016-09-16  Alan Mackenzie  <acm@muc.de>
@@ -33326,7 +33326,7 @@
        on each function using an external program: when the executable
        is not available signal an error.
        See discussion on:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-09/msg00135.html
+        https://lists.gnu.org/r/emacs-devel/2016-09/msg00135.html
        * lisp/image-dired.el (image-dired--check-executable-exists): New defun.
        Throw and error when the executable arg is missing.
        (image-dired-display-image, image-dired-rotate-thumbnail)
@@ -33763,7 +33763,7 @@
        image-dired: Report when a necessary executable is not found
        See discussion on:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-08/msg00552.html
+        https://lists.gnu.org/r/emacs-devel/2016-08/msg00552.html
        * lisp/image-dired.el (image-dired-cmd-rotate-original-program)
        (image-dired-cmd-create-thumbnail-program)
        (image-dired-cmd-create-temp-image-program)
@@ -33803,7 +33803,7 @@
        * lisp/image.el (image-increase-size, image-decrease-size):
        Compute a floating point division.
        Problem reported in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-09/msg00067.html
+        https://lists.gnu.org/r/emacs-devel/2016-09/msg00067.html
 2016-09-03  Robert Cochran  <robert-git@cochranmail.com>
@@ -33888,14 +33888,14 @@
        * nt/inc/ms-w32.h (execve) [MINGW_W64]: Make the prototype match
        the GCC 6 builtin, to avoid warnings.  For more details, see
-        https://lists.gnu.org/archive/html/emacs-devel/2016-08/msg00721.html.
+        https://lists.gnu.org/r/emacs-devel/2016-08/msg00721.html.
 2016-08-31  Paul Eggert  <eggert@cs.ucla.edu>
        Fix over-substitution of quotes on error
        Problem reported by Tino Calancha in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-09/msg00000.html
+        https://lists.gnu.org/r/emacs-devel/2016-09/msg00000.html
        * src/print.c (print_error_message):
        Substitute quotes in errmsg only when gotten from a property.
@@ -34014,7 +34014,7 @@
        See this thread for discussion:
-          https://lists.gnu.org/archive/html/emacs-devel/2016-08/msg00611.html
+          https://lists.gnu.org/r/emacs-devel/2016-08/msg00611.html
          From: Karl Fogel <kfogel {_AT_} red-bean.com>
          To: Emacs Development <emacs-devel {_AT_} gnu.org>
          Subject: [PATCH] Have LaTeX mode use normal double quotes in comments.
@@ -34134,7 +34134,7 @@
        * src/keyboard.c (parse_solitary_modifier): If the argument SYMBOL
        is not a symbol, don't try to recognize it.  See
-        https://lists.gnu.org/archive/html/emacs-devel/2016-08/msg00502.html
+        https://lists.gnu.org/r/emacs-devel/2016-08/msg00502.html
        for the details.
        * test/src/keymap-tests.el (keymap-where-is-internal-test): New
@@ -34247,7 +34247,7 @@
        Rename option to shell-command-dont-erase-buffer
        Suggested by Clément Pit--Claudel in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-08/msg00487.html
+        https://lists.gnu.org/r/emacs-devel/2016-08/msg00487.html
        * lisp/simple.el (shell-command-dont-erase-buffer):
        (shell-command--save-pos-or-erase):
        (shell-command--set-point-after-cmd):
@@ -34293,7 +34293,7 @@
        * lisp/frame.el (delete-other-frames): Delete other frames on
        FRAME's terminal instead of the current terminal.  Delete
        non-minibuffer-only surrogate frames too.  See
-        https://lists.gnu.org/archive/html/emacs-devel/2016-08/msg00467.html
+        https://lists.gnu.org/r/emacs-devel/2016-08/msg00467.html
        * doc/lispref/frames.texi (Deleting Frames): Minor fixes for
        docs of `delete-frame' and `frame-live-p'.  Add entry for
        `delete-other-frames'.
@@ -34524,7 +34524,7 @@
        (a frame with a root window plus a minibuffer window) and the
        frame's minibuffer window for a minibuffer-less frame (a frame
        whose minibuffer window is on another frame).  See also:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-07/msg01259.html
+        https://lists.gnu.org/r/emacs-devel/2016-07/msg01259.html
        * src/frame.c (make_frame, make_frame_without_minibuffer)
        (make_minibuffer_frame): When assigning the frame's minibuffer
@@ -34613,7 +34613,7 @@
        * lisp/server.el (server-reply-print): Fix check for truncated quote
        sequence at end of message. Problem reported in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-08/msg00101.html
+        https://lists.gnu.org/r/emacs-devel/2016-08/msg00101.html
 2016-08-18  Eli Zaretskii  <eliz@gnu.org>
@@ -34690,7 +34690,7 @@
        Return a sublist of the attributes returned by 'file-attributes'.
        Suggested by Ted Zlatanov in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-07/msg01195.html
+        https://lists.gnu.org/r/emacs-devel/2016-07/msg01195.html
 2016-08-17  Michael Albinus  <michael.albinus@gmx.de>
@@ -34730,7 +34730,7 @@
        * doc/emacs/misc.texi (shell-command-not-erase-buffer):
        Document this feature in the manual.
        See discussion on:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-07/msg00610.html
+        https://lists.gnu.org/r/emacs-devel/2016-07/msg00610.html
 2016-08-16  Michael Albinus  <michael.albinus@gmx.de>
@@ -35539,7 +35539,7 @@
        a second time; although it doesn’t hurt, it’s not needed.
        * src/sysdep.c [!HAVE_GNUTLS]: Don’t include gnutls/crypto.h,
        as it may not be available.  Problem reported by Glenn Morris in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-08/msg00100.html
+        https://lists.gnu.org/r/emacs-devel/2016-08/msg00100.html
 2016-08-03  Michal Nazarewicz  <mina86@mina86.com>
@@ -35571,7 +35571,7 @@
        Port to systems lacking GNUTLS_NONBLOCK
        Problem reported by Colin Baxter in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-08/msg00096.html
+        https://lists.gnu.org/r/emacs-devel/2016-08/msg00096.html
        * src/gnutls.c (Fgnutls_boot): Don’t assume GNUTLS_NONBLOCK is defined.
 2016-08-03  Paul Eggert  <eggert@cs.ucla.edu>
@@ -35854,7 +35854,7 @@
        * src/process.c (connect_network_socket):
        Reverse sense of previous fix.  Problem reported by Ken Brown in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-08/msg00004.html
+        https://lists.gnu.org/r/emacs-devel/2016-08/msg00004.html
 2016-08-01  Glenn Morris  <rgm@gnu.org>
@@ -37048,7 +37048,7 @@
        * lisp/ibuffer.el (ibuffer-mode-map): 'ibuffer-mark-by-content-regexp'
        just bound to '% g'.
        As suggested in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-07/msg00165.html
+        https://lists.gnu.org/r/emacs-devel/2016-07/msg00165.html
 2016-07-07  Tino Calancha  <tino.calancha@gmail.com>
@@ -37389,7 +37389,7 @@
        strings which affect the stringiness of a piece of text.  This fixes the
        bug
        reported in
-        https://lists.gnu.org/archive/html/emacs-devel/2016-06/msg00695.html.
+        https://lists.gnu.org/r/emacs-devel/2016-06/msg00695.html.
        * lisp/progmodes/cc-engine.el (c-truncate-semi-nonlit-pos-cache): new
        defsubst.
@@ -37635,7 +37635,7 @@
        Fix GNUC_PREREQ for GCC 2.8.1 etc.
        Problem reported by Eli Zaretskii in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-06/msg00608.html
+        https://lists.gnu.org/r/emacs-devel/2016-06/msg00608.html
        * src/conf_post.h (GNUC_PREREQ): Port to GCC versions like GCC
        2.8.1 (1998), which come before GCC 3.0 and which have nonzero
        patchlevel numbers.
@@ -37661,7 +37661,7 @@
        Fix GNUC_PREREQ off-by-1 typo
        Problem reported by Martin Rudalics in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-06/msg00587.html
+        https://lists.gnu.org/r/emacs-devel/2016-06/msg00587.html
        * src/conf_post.h (GNUC_PREREQ) [__GNUC_PATCHLEVEL__]:
        Fix < vs <= typo.
@@ -37929,7 +37929,7 @@
        * src/lread.c (Fload): Don't overwrite the last character of the
        file name in FOUND with 'c', unless the file name ended in ".elc"
        to begin with.  Don't treat empty files as byte-compiled.  See
-        https://lists.gnu.org/archive/html/emacs-devel/2016-06/msg00463.html
+        https://lists.gnu.org/r/emacs-devel/2016-06/msg00463.html
        for more details of the problem this caused.
 2016-06-22  Eli Zaretskii  <eliz@gnu.org>
@@ -38360,7 +38360,7 @@
        * src/xfns.c (x_get_monitor_attributes_xrandr): Use #if, not #ifdef.
        This ports to systems that predate xrandr 1.3. See Christian Lynbech in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-06/msg00198.html
+        https://lists.gnu.org/r/emacs-devel/2016-06/msg00198.html
 2016-06-14  Paul Eggert  <eggert@cs.ucla.edu>
@@ -38982,7 +38982,7 @@
        * lisp/version.el (emacs-repository-get-version):
        Parse .git/packed-refs if it exists.
        Problem reported by Martin Rudalics in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-05/msg00554.html
+        https://lists.gnu.org/r/emacs-devel/2016-05/msg00554.html
 2016-06-01  Michael Albinus  <michael.albinus@gmx.de>
@@ -39315,7 +39315,7 @@
        Don’t document declare-function internals
        Suggested by Stefan Monnier in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-05/msg00618.html
+        https://lists.gnu.org/r/emacs-devel/2016-05/msg00618.html
        * doc/lispref/functions.texi (Declaring Functions):
        * lisp/subr.el (declare-function):
        * lisp/emacs-lisp/bytecomp.el:
@@ -39401,7 +39401,7 @@
        Fix byte-compiler pacification for declare-function
        Problem reported by Michael Heerdegen in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-05/msg00590.html
+        https://lists.gnu.org/r/emacs-devel/2016-05/msg00590.html
        * lisp/emacs-lisp/bytecomp.el:
        (byte-compile-macroexpand-declare-function):
        Revert signature to previous value.
@@ -39648,7 +39648,7 @@
        Don’t use only last protocol from getaddrinfo
        Problem reported by Ken Brown in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-05/msg00483.html
+        https://lists.gnu.org/r/emacs-devel/2016-05/msg00483.html
        * src/process.c (conv_addrinfo_to_lisp): New function.
        (connect_network_socket): Arg is now a list of addrinfos, not
        merely IP addresses.  All uses changed.  Use protocol from
@@ -39666,7 +39666,7 @@
        * lisp/image.el (image--get-image): Require seq here, not at the
        top level, to avoid ‘(require seq) while preparing to dump’ while
        bootstrapping.  Suggested by Tino Calancha in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-05/msg00477.html
+        https://lists.gnu.org/r/emacs-devel/2016-05/msg00477.html
 2016-05-22  Nicolas Petton  <nicolas@petton.fr>
@@ -40183,7 +40183,7 @@
        Port autogen.sh to Git 2.4
        Problem reported by Michael Brand in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-05/msg00367.html
+        https://lists.gnu.org/r/emacs-devel/2016-05/msg00367.html
        * autogen.sh (git_config): Don't assume that git rev-parse
        groks --git-common-dir.
@@ -41121,7 +41121,7 @@
        * src/buffer.c (Fgenerate_new_buffer_name): Increment count just
        once each time through the loop.  Reported by Lars Ingebrigtsen in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-04/msg00918.html
+        https://lists.gnu.org/r/emacs-devel/2016-04/msg00918.html
 2016-04-30  Lars Ingebrigtsen  <larsi@gnus.org>
@@ -41896,7 +41896,7 @@
        Fix socketd fd startup bug that I introduced
        Problem reported by Matthew Leach in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-04/msg00778.html
+        https://lists.gnu.org/r/emacs-devel/2016-04/msg00778.html
        * src/emacs.c (main): Indicate more clearly the coupling between
        the --daemon option and init_process_emacs.
        * src/lisp.h: Adjust to API changes.
@@ -41956,7 +41956,7 @@
        This also fixes the mishandling of "\N{CJK COMPATIBILITY
        IDEOGRAPH-F900}", "\N{VARIATION SELECTOR-1}", etc.
        Problem reported by Eli Zaretskii in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-04/msg00614.html
+        https://lists.gnu.org/r/emacs-devel/2016-04/msg00614.html
        * doc/lispref/nonascii.texi (Character Codes), etc/NEWS: Document this.
        * lisp/international/mule-cmds.el (char-from-name): New function.
        (read-char-by-name): Use it.  Document that "BED" is treated as
@@ -42027,7 +42027,7 @@
        Remove the previous change.
        (vc-state): Same.  And update the old, incorrect comment about
        unregistered files
-        (https://lists.gnu.org/archive/html/emacs-devel/2016-04/msg00526.html).
+        (https://lists.gnu.org/r/emacs-devel/2016-04/msg00526.html).
        * test/lisp/vc/vc-tests.el (vc-test--state): Remove the check
        calling `vc-state' on default-directory (VC state is undefined
@@ -42361,7 +42361,7 @@
        Avoid AC_PREPROC_IFELSE glitch in configure.ac
        Problem reported by Angelo Graziosi in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-04/msg00545.html
+        https://lists.gnu.org/r/emacs-devel/2016-04/msg00545.html
        * configure.ac (gl_gcc_warnings): Work around an Autoconf glitch:
        AC_PREPROC_IFELSE doesn’t generate a simple shell command.
@@ -42419,7 +42419,7 @@
        * lisp/emacs-lisp/easy-mmode.el (define-minor-mode): Fix docstring
        so that it matches the actual implementation.
-        See https://lists.gnu.org/archive/html/help-gnu-emacs/2016-04/msg00071.html
+        See https://lists.gnu.org/r/help-gnu-emacs/2016-04/msg00071.html
 2016-04-18  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -42558,7 +42558,7 @@
        Port ‘./autogen.sh git’ to non-clones
        Problem reported by Angelo Graziosi in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-04/msg00341.html
+        https://lists.gnu.org/r/emacs-devel/2016-04/msg00341.html
        * autogen.sh (do_git): Default to false when the arg is ‘all’ but
        there is no ‘.git’.
        (git_common_dir, hooks): New vars.
@@ -42864,7 +42864,7 @@
        Port redirect-debugging-output to MS-Windows
        Suggested by Eli Zaretskii in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-04/msg00037.html
+        https://lists.gnu.org/r/emacs-devel/2016-04/msg00037.html
        * src/print.c [WINDOWSNT]: Include sys/socket.h.
        * src/w32.c (sys_dup2): Work around problem with MS-Windows _dup2.
@@ -42873,7 +42873,7 @@
        Port redirect-debugging-output to non-GNU/Linux
        Problem reported by Kylie McClain for musl in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-03/msg01592.html
+        https://lists.gnu.org/r/emacs-devel/2016-03/msg01592.html
        * etc/DEBUG, etc/NEWS: Mention this.
        * src/callproc.c (child_setup) [!MSDOS]:
        * src/dispnew.c (init_display):
@@ -43459,7 +43459,7 @@
        Compute a better commit message for merges
        Problem reported by David Engster in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-03/msg01270.html
+        https://lists.gnu.org/r/emacs-devel/2016-03/msg01270.html
        * admin/gitmerge.el (gitmerge-commit-message):
        Truncate the computed commit message to at most 72 characters per line.
        (gitmerge-maybe-resume): Don’t use "-" as the commit message for
@@ -43499,7 +43499,7 @@
        * admin/gitmerge.el (gitmerge-skip-regexp): Omit "merge", as it
        causes false positives.  See:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-03/msg01234.html
+        https://lists.gnu.org/r/emacs-devel/2016-03/msg01234.html
 2016-03-22  Paul Eggert  <eggert@cs.ucla.edu>
@@ -44216,7 +44216,7 @@
        Unbreak the MinGW64 build
        * nt/inc/ms-w32.h [MINGW_W64]: Undefine HAVE_GAI_STRERROR.  See
-        https://lists.gnu.org/archive/html/emacs-devel/2016-03/msg00130.html
+        https://lists.gnu.org/r/emacs-devel/2016-03/msg00130.html
        for the details.  Reported by Angelo Graziosi
        <angelo.graziosi@alice.it>.
@@ -44251,7 +44251,7 @@
        Implement getaddrinfo fallback for MS-Windows
-        See https://lists.gnu.org/archive/html/emacs-devel/2016-02/msg01602.html
+        See https://lists.gnu.org/r/emacs-devel/2016-02/msg01602.html
        for more details.
        * nt/mingw-cfg.site (ac_cv_func_getaddrinfo)
@@ -45594,7 +45594,7 @@
        Port recent filevercmp addition to MS-Windows
        Reported by Andy Moreton in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-02/msg01302.html
+        https://lists.gnu.org/r/emacs-devel/2016-02/msg01302.html
        * nt/gnulib.mk (libgnu_a_SOURCES): Add filevercmp.c.
        (EXTRA_DIST): Add filevercmp.h.
@@ -47197,7 +47197,7 @@
        * src/alloc.c (aligned_alloc): Define to private name when a
        static function, to avoid collision with lisp.h extern decl.
        Reported by John Yates in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-02/msg00439.html
+        https://lists.gnu.org/r/emacs-devel/2016-02/msg00439.html
 2016-02-08  David Edmondson  <dme@dme.org>
@@ -47448,7 +47448,7 @@
        Port to FreeBSD x86
        Reported by Herbert J. Skuhra in:
-        https://lists.gnu.org/archive/html/emacs-devel/2016-02/msg00336.html
+        https://lists.gnu.org/r/emacs-devel/2016-02/msg00336.html
        * src/lisp.h (NONPOINTER_BITS) [__FreeBSD__]: Zero in this case too,
        since malloc always returns a multiple of 8 in FreeBSD.
@@ -49218,7 +49218,7 @@
        2f32cb5 * doc/misc/efaq.texi (Packages that do not come with Emacs):
                Update the URI of MELPA and marmalade-repo.
                Reported by CHENG Goa <chenggao@royau.me> in
-                https://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00390.html.
+                https://lists.gnu.org/r/emacs-devel/2016-01/msg00390.html.
        d2937aa * lisp/progmodes/opascal.el (opascal-mode-syntax-table):
        5330c25 * lisp/progmodes/xscheme.el (xscheme-prompt-for-expression-exit):
        7380990 Remove function wrongly on AWK Mode value of context
diff --git a/Makefile.in b/Makefile.in
index 8ad3f99a249..3f46d0acafa 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -511,7 +511,7 @@ install-nt:
 ## For them, it is empty.
 INSTALL_ARCH_INDEP_EXTRA = @INSTALL_ARCH_INDEP_EXTRA@
-## https://lists.gnu.org/archive/html/emacs-devel/2007-10/msg01672.html
+## https://lists.gnu.org/r/emacs-devel/2007-10/msg01672.html
 ## Needs to be the user running install, so configure can't set it.
 set_installuser=for installuser in $${LOGNAME} $${USERNAME} $${USER} \
          `id -un 2> /dev/null`; do \
@@ -550,11 +550,11 @@ set_installuser=for installuser in $${LOGNAME} $${USERNAME} $${USER} \
 ## Note that we use tar instead of plain old cp -R/-r because the latter
 ## is apparently not portable (even in 2012!).
-## https://lists.gnu.org/archive/html/emacs-devel/2012-05/msg00278.html
+## https://lists.gnu.org/r/emacs-devel/2012-05/msg00278.html
 ## I have no idea which platforms Emacs supports where cp -R does not
 ## work correctly, and therefore no idea when tar can be replaced.
 ## See also these comments from 2004 about cp -r working fine:
-## https://lists.gnu.org/archive/html/autoconf-patches/2004-11/msg00005.html
+## https://lists.gnu.org/r/autoconf-patches/2004-11/msg00005.html
 install-arch-indep: lisp install-info install-man ${INSTALL_ARCH_INDEP_EXTRA}
        -set ${COPYDESTS} ; \
        unset CDPATH; \
diff --git a/admin/ChangeLog.1 b/admin/ChangeLog.1
index b0dfb139306..90401799a66 100644
--- a/admin/ChangeLog.1
+++ b/admin/ChangeLog.1
@@ -1547,7 +1547,7 @@
        * make-tarball.txt: Suggest 'autoreconf -I m4 --force'
        rather than doing rm and autoconf by hand.  See
-        <https://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00673.html>.
+        <https://lists.gnu.org/r/emacs-devel/2011-01/msg00673.html>.
 2011-01-17  Paul Eggert  <eggert@cs.ucla.edu>
diff --git a/admin/notes/bugtracker b/admin/notes/bugtracker
index 0b1625fdb8a..c39458184f6 100644
--- a/admin/notes/bugtracker
+++ b/admin/notes/bugtracker
@@ -487,7 +487,7 @@ the bug web-pages.
 *** Debian stuff
-https://lists.gnu.org/archive/html/emacs-devel/2009-11/msg00440.html
+https://lists.gnu.org/r/emacs-devel/2009-11/msg00440.html
 ** Gnus-specific voodoo
@@ -510,8 +510,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]:
-https://lists.gnu.org/archive/html/savannah-hackers/2008-03/msg00074.html
+https://lists.gnu.org/r/savannah-hackers/2008-03/msg00074.html
-https://lists.gnu.org/archive/html/savannah-hackers/2008-04/msg00034.html
+https://lists.gnu.org/r/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):
@@ -555,7 +555,7 @@ 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:
-https://lists.gnu.org/archive/html/emacs-devel/2009-11/msg01211.html
+https://lists.gnu.org/r/emacs-devel/2009-11/msg01211.html
 ** Mailing list recipient/sender filters.
 The following mailman filters are useful to stop messages being
diff --git a/admin/notes/copyright b/admin/notes/copyright
index f4c8b847a57..5d449763d3e 100644
--- a/admin/notes/copyright
+++ b/admin/notes/copyright
@@ -86,7 +86,7 @@ in a README file in each directory with images. (Legal advice says
 that we need not add notices to each image file individually, if they
 allow for that.). It is recommended to use the word "convert" to
 describe the automatic process of changing an image from one format to
-another (https://lists.gnu.org/archive/html/emacs-devel/2007-02/msg00618.html).
+another (https://lists.gnu.org/r/emacs-devel/2007-02/msg00618.html).
 When installing a file with an "unusual" license (after checking first
@@ -159,7 +159,7 @@ etc/future-bug
 etc/letter.pbm,letter.xpm
  - trivial, no notice needed.
-<https://lists.gnu.org/archive/html/emacs-devel/2007-02/msg00324.html>
+<https://lists.gnu.org/r/emacs-devel/2007-02/msg00324.html>
 etc/FTP, ORDERS
  - trivial (at time of writing), no license needed
@@ -214,7 +214,7 @@ lib-src/etags.c
  from a legal point of view.
 lisp/cedet/semantic/imenu.el
-  - See https://lists.gnu.org/archive/html/emacs-devel/2010-03/msg00410.html
+  - See https://lists.gnu.org/r/emacs-devel/2010-03/msg00410.html
   in which Eric Ludlam established that the remaining contributions
   from authors other than himself were negligible.
@@ -223,7 +223,7 @@ lisp/play/tetris.el
  (2007/1) there is no problem with our use of the name "tetris" or
  the concept.
  rms: "My understanding is that game rules as such are not copyrightable."
-  <https://lists.gnu.org/archive/html/emacs-devel/2007-01/msg00960.html>
+  <https://lists.gnu.org/r/emacs-devel/2007-01/msg00960.html>
  rms: Legal advice is that we are ok and need not worry about this.
@@ -307,8 +307,8 @@ doc/*/*.texi - All manuals should be under GFDL (but see below), and
 should include a copy of it, so that they can be distributed
 separately. faq.texi has a different license, for some reason no-one
 can remember.
-https://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00583.html
+https://lists.gnu.org/r/emacs-devel/2007-04/msg00583.html
-https://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00618.html
+https://lists.gnu.org/r/emacs-devel/2007-04/msg00618.html
 doc/misc/mh-e.texi is dual-licensed (GPL and GFDL) per agreement with
 FSF (reconfirmed by rms Aug 25 2008).  Discussion with
@@ -397,7 +397,7 @@ lisp/term/README
  Accordingly, FSF copyright was added.
 src/unexhp9k800.c
-  https://lists.gnu.org/archive/html/emacs-devel/2007-02/msg00138.html
+  https://lists.gnu.org/r/emacs-devel/2007-02/msg00138.html
  - briefly removed due to legal uncertainly Jan-Mar 2007. The
  relevant assignment is under "hp9k800" in copyright.list. File was
  written by John V. Morris at HP, and disclaimed by the author and
@@ -406,10 +406,10 @@ src/unexhp9k800.c
 lisp/progmodes/python.el
 Dave Love alerted us to a potential legal problem:
-https://lists.gnu.org/archive/html/emacs-pretest-bug/2007-04/msg00459.html
+https://lists.gnu.org/r/emacs-pretest-bug/2007-04/msg00459.html
 On consultation with a lawyer, we found there was no problem:
-https://lists.gnu.org/archive/html/emacs-devel/2007-05/msg00466.html
+https://lists.gnu.org/r/emacs-devel/2007-05/msg00466.html
 ** Issues that are "fixed" for the release of Emacs 22, but we may
@@ -527,7 +527,7 @@ None known.
 The EMACS_22_BASE branch was changed to GPLv3 (or later) 2007/07/25.
 Some notes:
-(see https://lists.gnu.org/archive/html/emacs-devel/2007-07/msg01431.html)
+(see https://lists.gnu.org/r/emacs-devel/2007-07/msg01431.html)
 1. There are some files in the Emacs tree which are not part of Emacs (eg
 those included from Gnulib). These are all copyright FSF and (at time
diff --git a/admin/notes/documentation b/admin/notes/documentation
index fc9c720bd08..d894175e212 100644
--- a/admin/notes/documentation
+++ b/admin/notes/documentation
@@ -5,7 +5,7 @@ Some documentation tips culled from emacs-devel postings.
 ** Manual indices
-https://lists.gnu.org/archive/html/emacs-devel/2008-10/msg00400.html
+https://lists.gnu.org/r/emacs-devel/2008-10/msg00400.html
 For example, this text:
@@ -51,7 +51,7 @@ combine them into a single entry, e.g.:
 ** Point is a proper name
-https://lists.gnu.org/archive/html/emacs-devel/2008-10/msg00414.html
+https://lists.gnu.org/r/emacs-devel/2008-10/msg00414.html
 In Emacs tradition, we treat "point" as a proper name when it refers
 to the current editing location. It should not have an article.
@@ -65,7 +65,7 @@ referring to point, please fix it.
 ** Don't use passive verbs
-https://lists.gnu.org/archive/html/emacs-devel/2008-10/msg00414.html
+https://lists.gnu.org/r/emacs-devel/2008-10/msg00414.html
 Documentation is clearer if it avoids the passive voice whenever
 possible.  For example, rather than saying "Point does not move", say
@@ -80,7 +80,7 @@ often provides important information which makes the text clearer, too.
 *** Why Antinews is useful
-https://lists.gnu.org/archive/html/emacs-devel/2008-11/msg00893.html
+https://lists.gnu.org/r/emacs-devel/2008-11/msg00893.html
 The usefulness of Antinews is to help people who buy the printed
 manual and are still using the previous Emacs version.  That's why we
@@ -91,7 +91,7 @@ Of course, we try to make it amusing as well.
 *** Don't mention in Antinews too many features absent in old versions
-https://lists.gnu.org/archive/html/emacs-devel/2008-11/msg01054.html
+https://lists.gnu.org/r/emacs-devel/2008-11/msg01054.html
 Since the purpose of Antinews is to help people use the previous Emacs
 version, there is usually no need to mention features that are simply
@@ -114,4 +114,4 @@ In those cases, the user might have trouble figuring out how to use
 the old version without some sort of help.
 ** To indicate possession, write Emacs's rather than Emacs'.
-https://lists.gnu.org/archive/html/emacs-devel/2012-02/msg00649.html
+https://lists.gnu.org/r/emacs-devel/2012-02/msg00649.html
diff --git a/admin/notes/git-workflow b/admin/notes/git-workflow
index 2e4bbac70fe..83e81c68ef0 100644
--- a/admin/notes/git-workflow
+++ b/admin/notes/git-workflow
@@ -12,7 +12,7 @@ git config --global user.email "fchu@example.com"
 git config --global transfer.fsckObjects true
 (See the thread "Recommend these .gitconfig settings for git integrity."
-[https://lists.gnu.org/archive/html/emacs-devel/2016-01/threads.html#01802]
+[https://lists.gnu.org/r/emacs-devel/2016-01/threads.html#01802]
 for more details about why that last line is there.)
 Initial setup
diff --git a/admin/notes/hydra b/admin/notes/hydra
index a0c46df08e4..6c40f6b3022 100644
--- a/admin/notes/hydra
+++ b/admin/notes/hydra
@@ -11,7 +11,7 @@ https://hydra.nixos.org/jobset/gnu/emacs-trunk
 * It builds Emacs on various platforms.
 Sometimes jobs fail due to hydra problems rather than Emacs problems.
 Eg it seems like the darwin build will never work again.
-https://lists.gnu.org/archive/html/hydra-users/2016-01/msg00000.html
+https://lists.gnu.org/r/hydra-users/2016-01/msg00000.html
 * Mail notifications
 In addition to the web interface, Hydra can send notifications by
diff --git a/admin/notes/repo b/admin/notes/repo
index 827d6ed1b98..f6004a97db1 100644
--- a/admin/notes/repo
+++ b/admin/notes/repo
@@ -11,7 +11,7 @@ install it only on the emacs-24 branch, not on the master as well.
 Installing things manually into more than one branch makes merges more
 difficult.
-https://lists.gnu.org/archive/html/emacs-devel/2010-03/msg01124.html
+https://lists.gnu.org/r/emacs-devel/2010-03/msg01124.html
 The exception is, if you know that the change will be difficult to
 merge to the master (eg because the master code has changed a lot).
@@ -40,7 +40,7 @@ so interim merges are unnecessary.
 Or use shelves; or rebase; or do something else.  See the thread for
 yet another fun excursion into the exciting world of version control.
-https://lists.gnu.org/archive/html/emacs-devel/2010-04/msg00086.html
+https://lists.gnu.org/r/emacs-devel/2010-04/msg00086.html
 * Installing changes from gnulib
diff --git a/admin/notes/tags b/admin/notes/tags
index 16565ea00de..1e2a38347da 100644
--- a/admin/notes/tags
+++ b/admin/notes/tags
@@ -3,7 +3,7 @@ Apparently these date from ye olden days, when tags were common
 to several GNU projects.  So many of them had no relevance to Emacs,
 and hence were removed.  See:
-https://lists.gnu.org/archive/html/emacs-devel/2012-04/msg00042.html
+https://lists.gnu.org/r/emacs-devel/2012-04/msg00042.html
 In the unlikely event that you need them, the removed tags were:
diff --git a/admin/notes/versioning b/admin/notes/versioning
index dbd563cdc75..9428dc76710 100644
--- a/admin/notes/versioning
+++ b/admin/notes/versioning
@@ -1,6 +1,6 @@
 GNU EMACS VERSIONING                                   -*- org -*-
-Ref: https://lists.gnu.org/archive/html/emacs-devel/2014-09/msg00872.html
+Ref: https://lists.gnu.org/r/emacs-devel/2014-09/msg00872.html
 Emacs version numbers have the form
diff --git a/admin/notes/years b/admin/notes/years
index 268ef85c5d4..b56d94a1eda 100644
--- a/admin/notes/years
+++ b/admin/notes/years
@@ -37,4 +37,4 @@ but should keep the full list in a comment in the source.
 --RMS, 2005-07-13
 [1] Note that this includes 2001 - see
-<https://lists.gnu.org/archive/html/emacs-pretest-bug/2006-12/msg00119.html>
+<https://lists.gnu.org/r/emacs-pretest-bug/2006-12/msg00119.html>
diff --git a/configure.ac b/configure.ac
index 3c72f168a3d..f1ca7cc81b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -403,7 +403,7 @@ OPTION_DEFAULT_OFF([xwidgets],
 ## For the times when you want to build Emacs but don't have
 ## a suitable makeinfo, and can live without the manuals.
-dnl https://lists.gnu.org/archive/html/emacs-devel/2008-04/msg01844.html
+dnl https://lists.gnu.org/r/emacs-devel/2008-04/msg01844.html
 OPTION_DEFAULT_ON([makeinfo],[don't require makeinfo for building manuals])
 ## Makefile.in needs the cache file name.
@@ -529,7 +529,7 @@ fi
 dnl The name of this option is unfortunate.  It predates, and has no
 dnl relation to, the "sampling-based elisp profiler" added in 24.3.
 dnl Actually, it stops it working.
-dnl https://lists.gnu.org/archive/html/emacs-devel/2012-11/msg00393.html
+dnl https://lists.gnu.org/r/emacs-devel/2012-11/msg00393.html
 AC_ARG_ENABLE(profiling,
 [AS_HELP_STRING([--enable-profiling],
                [build emacs with low-level, gprof profiling support.
@@ -961,7 +961,7 @@ AS_IF([test $gl_gcc_warnings = no],
  nw="$nw -Wbad-function-cast"      # These casts are no worse than others.
  # Emacs doesn't care about shadowing; see
-  # <https://lists.gnu.org/archive/html/emacs-diffs/2011-11/msg00265.html>.
+  # <https://lists.gnu.org/r/emacs-diffs/2011-11/msg00265.html>.
  nw="$nw -Wshadow"
  # Emacs's use of alloca inhibits protecting the stack.
@@ -1183,7 +1183,7 @@ dnl AC_PROG_LN_S sets LN_S to 'cp -pR' for MinGW, on the premise that 'ln'
 dnl doesn't support links to directories, as in "ln file dir".  But that
 dnl use is non-portable, and OTOH MinGW wants to use hard links for Emacs
 dnl executables at "make install" time.
-dnl See https://lists.gnu.org/archive/html/emacs-devel/2013-04/msg00475.html
+dnl See https://lists.gnu.org/r/emacs-devel/2013-04/msg00475.html
 dnl for more details.
 if test "$opsys" = "mingw32"; then
  LN_S="/bin/ln"
@@ -1329,7 +1329,7 @@ dnl   Eg "make LDFLAGS=... all" could run into problems,
 dnl   https://bugs.debian.org/684788
 dnl * unnecessary, since temacs is the only thing that actually needs it.
 dnl   Indeed this is where it was originally, prior to:
-dnl   https://lists.gnu.org/archive/html/emacs-pretest-bug/2004-03/msg00170.html
+dnl   https://lists.gnu.org/r/emacs-pretest-bug/2004-03/msg00170.html
 if test x$GCC = xyes; then
  LDFLAGS_NOCOMBRELOC="-Wl,-znocombreloc"
 else
diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in
index f7cc2e112c3..61e870b80fb 100644
--- a/doc/emacs/Makefile.in
+++ b/doc/emacs/Makefile.in
@@ -58,7 +58,7 @@ HTML_OPTS = --no-split --html
 # Options used only when making info output.
 # --no-split is only needed because of MS-DOS.
 # For a possible alternative, see
-# https://lists.gnu.org/archive/html/emacs-devel/2011-01/msg01182.html
+# https://lists.gnu.org/r/emacs-devel/2011-01/msg01182.html
 INFO_OPTS= --no-split
 INSTALL = @INSTALL@
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 2559b0646c0..2c3312d7a83 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -1503,7 +1503,7 @@ Neal Ziring, Teodor Zlatanov, and Detlev Zundel.
 advanced, self-documenting, customizable, extensible editor Emacs.
 (The @samp{G} in
 @c Workaround makeinfo 4 bug.
-@c https://lists.gnu.org/archive/html/bug-texinfo/2004-08/msg00009.html
+@c https://lists.gnu.org/r/bug-texinfo/2004-08/msg00009.html
 @iftex
 @acronym{GNU, @acronym{GNU}'s Not Unix}
 @end iftex
diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi
index 8a4d91f80bf..9ef31102455 100644
--- a/doc/emacs/mule.texi
+++ b/doc/emacs/mule.texi
@@ -1356,7 +1356,7 @@ fontset}, the @dfn{startup fontset} and the @dfn{default fontset}.
 @c FIXME?  The doc of *standard*-fontset-spec says:
 @c "You have the biggest chance to display international characters
 @c with correct glyphs by using the *standard* fontset." (my emphasis)
-@c See https://lists.gnu.org/archive/html/emacs-devel/2012-04/msg00430.html
+@c See https://lists.gnu.org/r/emacs-devel/2012-04/msg00430.html
 The default fontset is most likely to have fonts for a wide variety of
 non-@acronym{ASCII} characters, and is the default fallback for the
 other two fontsets, and if you set a default font rather than fontset.
diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi
index d0b3419a991..4a836c3224b 100644
--- a/doc/emacs/trouble.texi
+++ b/doc/emacs/trouble.texi
@@ -524,7 +524,7 @@ The @samp{emacs-pretest-bug} mailing list.  This list is no longer
 used, and is mainly of historical interest.  At one time, it was used
 for bug reports in development (i.e., not yet released) versions of
 Emacs.  You can read the archives for 2003 to mid 2007 at
-@url{https://lists.gnu.org/archive/html/emacs-pretest-bug/}.  Nowadays,
+@url{https://lists.gnu.org/r/emacs-pretest-bug/}.  Nowadays,
 it is an alias for @samp{bug-gnu-emacs}.
 @item
diff --git a/doc/lispref/ChangeLog.1 b/doc/lispref/ChangeLog.1
index 3fab757c963..c461f9a42b1 100644
--- a/doc/lispref/ChangeLog.1
+++ b/doc/lispref/ChangeLog.1
@@ -497,7 +497,7 @@
        Improve doc for use of 'int', and discuss 'ssize_t'.
        * internals.texi (C Integer Types): Mention 'int' for other
        randomish values that lie in 'int' range.  Mention 'ssize_t'.  See:
-        https://lists.gnu.org/archive/html/emacs-devel/2014-10/msg00019.html
+        https://lists.gnu.org/r/emacs-devel/2014-10/msg00019.html
        Use AUTO_CONS instead of SCOPED_CONS, etc.
        * internals.texi (Stack-allocated Objects):
@@ -2154,7 +2154,7 @@
        * internals.texi (C Integer Types): New section.
        This follows up and records an email in
-        <https://lists.gnu.org/archive/html/emacs-devel/2012-07/msg00496.html>.
+        <https://lists.gnu.org/r/emacs-devel/2012-07/msg00496.html>.
 2012-12-10  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -6288,7 +6288,7 @@
 2009-04-11  Eli Zaretskii  <eliz@gnu.org>
        * display.texi (Overlays): Overlays don't scale well.  See
-        https://lists.gnu.org/archive/html/emacs-devel/2009-04/msg00243.html.
+        https://lists.gnu.org/r/emacs-devel/2009-04/msg00243.html.
 2009-04-10  Chong Yidong  <cyd@stupidchicken.com>
diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi
index b48278e8b8c..c7ef1d8f5cb 100644
--- a/doc/misc/cl.texi
+++ b/doc/misc/cl.texi
@@ -317,7 +317,7 @@ This is analogous to the @code{defsubst} form;
 @code{cl-defsubst} uses a different method (compiler macros) which
 works in all versions of Emacs, and also generates somewhat more
 @c For some examples,
-@c see https://lists.gnu.org/archive/html/emacs-devel/2012-11/msg00009.html
+@c see https://lists.gnu.org/r/emacs-devel/2012-11/msg00009.html
 efficient inline expansions.  In particular, @code{cl-defsubst}
 arranges for the processing of keyword arguments, default values,
 etc., to be done at compile-time whenever possible.
diff --git a/doc/misc/efaq-w32.texi b/doc/misc/efaq-w32.texi
index eb05e8be438..b66aaeb3198 100644
--- a/doc/misc/efaq-w32.texi
+++ b/doc/misc/efaq-w32.texi
@@ -2286,7 +2286,7 @@ The official mailing list for Windows specific help and discussion is
 @url{https://lists.gnu.org/mailman/listinfo/help-emacs-windows,
 help-emacs-windows}.  See that link for information on how to subscribe
 or unsubscribe.  The
-@uref{https://lists.gnu.org/archive/html/help-emacs-windows/, list archives}
+@uref{https://lists.gnu.org/r/help-emacs-windows/, list archives}
 are available online.
 @c ------------------------------------------------------------
diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index 167aa45c281..df3d09a6337 100644
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -421,7 +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
-@uref{https://lists.gnu.org/archive/html/, the GNU mail archive}.
+@uref{https://lists.gnu.org/r/, the GNU mail archive}.
 Web-based Usenet search services, such as
 @uref{http://groups.google.com/groups/dir?q=gnu&, Google}, also
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index f1d9434bf72..e7d9cb15dee 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -86,7 +86,7 @@ Savannah Project Page}.
 There is a mailing list for @value{tramp}, available at
 @email{tramp-devel@@gnu.org}, and archived at
-@uref{https://lists.gnu.org/archive/html/tramp-devel/, the
+@uref{https://lists.gnu.org/r/tramp-devel/, the
 @value{tramp} Mail Archive}.
 @page
diff --git a/etc/ChangeLog.1 b/etc/ChangeLog.1
index 91ac79d8131..05b782f7994 100644
--- a/etc/ChangeLog.1
+++ b/etc/ChangeLog.1
@@ -195,7 +195,7 @@
        Fix minor Bazaar leftovers.
        Reported by Perry E. Metzger in:
-        https://lists.gnu.org/archive/html/emacs-devel/2014-11/msg00745.html
+        https://lists.gnu.org/r/emacs-devel/2014-11/msg00745.html
        * CONTRIBUTE: More git transition.
 2014-11-11  Eric S. Raymond  <esr@thyrsus.com>
@@ -1695,7 +1695,7 @@
        Redo spelling of Makefile variables to conform to POSIX.
        POSIX does not allow "-" in Makefile variable names.
        Reported by Bruno Haible in
-        <https://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00990.html>.
+        <https://lists.gnu.org/r/emacs-devel/2011-01/msg00990.html>.
        * refcards/Makefile (DIRED_REFCARDS_PDF): Rename from
        DIRED-REFCARDS_PDF.
        (MISC_REFCARDS_PDF): Rename from MISC-REFCARDS_PDF.
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index d6f550d29e5..19648cf17a8 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -1992,7 +1992,7 @@ This enables SVG generation from latex code blocks.
 *** New option: [[doc:org-habit-show-done-always-green][org-habit-show-done-always-green]]
-See [[https://lists.gnu.org/archive/html/emacs-orgmode/2013-05/msg00214.html][this message]] from Max Mikhanosha.
+See [[https://lists.gnu.org/r/emacs-orgmode/2013-05/msg00214.html][this message]] from Max Mikhanosha.
 *** New option: [[doc:org-babel-inline-result-wrap][org-babel-inline-result-wrap]]
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index ac76230f690..22ca531972d 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -540,7 +540,7 @@ to the variable 'locate-dominating-stop-dir-regexp'.  For example, if
 the problem relates to "/smb/.dir-locals.el", set that variable
 to a new value where you replace "net\\|afs" with "net\\|afs\\|smb".
 (The default value already matches common auto-mount prefixes.)
-See https://lists.gnu.org/archive/html/help-gnu-emacs/2015-02/msg00461.html .
+See https://lists.gnu.org/r/help-gnu-emacs/2015-02/msg00461.html .
 *** Attempting to visit remote files via ange-ftp fails.
@@ -689,7 +689,7 @@ On some systems, there exists a font that is actually named Monospace,
 which takes over the virtual font.  This is considered an operating
 system bug; see
-https://lists.gnu.org/archive/html/emacs-devel/2008-10/msg00696.html
+https://lists.gnu.org/r/emacs-devel/2008-10/msg00696.html
 If you encounter this problem, set the default font to a specific font
 in your .Xresources or initialization file.  For instance, you can put
@@ -1097,7 +1097,7 @@ during such resizing attempts (i3, IceWM).
 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
-https://lists.gnu.org/archive/html/emacs-devel/2016-07/msg00154.html.
+https://lists.gnu.org/r/emacs-devel/2016-07/msg00154.html.
 *** Metacity: Resizing Emacs or ALT-Tab causes X to be unresponsive.
@@ -2637,7 +2637,7 @@ This is a consequence of a change to src/dired.c on 2010-07-27.  The
 issue is that Cygwin 1.5.19 did not have d_ino in 'struct dirent'.
 See
-  https://lists.gnu.org/archive/html/emacs-devel/2010-07/msg01266.html
+  https://lists.gnu.org/r/emacs-devel/2010-07/msg01266.html
 *** Building the native MS-Windows port fails due to unresolved externals
@@ -2738,7 +2738,7 @@ Errors and warnings can look like this:
 This happens when paths using backslashes are passed to the compiler or
 linker (via -I and possibly other compiler flags); when these paths are
 included in source code, the backslashes are interpreted as escape sequences.
-See https://lists.gnu.org/archive/html/emacs-devel/2010-07/msg00995.html
+See https://lists.gnu.org/r/emacs-devel/2010-07/msg00995.html
 The fix is to use forward slashes in all paths passed to the compiler.
diff --git a/etc/TODO b/etc/TODO
index 07772d5f4f4..6d087c1ed97 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -95,17 +95,17 @@ make it.
 ** Move idlwave to elpa.gnu.org.
 Need to sync up the Emacs and external versions.
-See <https://lists.gnu.org/archive/html/emacs-devel/2014-07/msg00008.html>
+See <https://lists.gnu.org/r/emacs-devel/2014-07/msg00008.html>
 ** Move Org mode to elpa.gnu.org.
-See <https://lists.gnu.org/archive/html/emacs-devel/2014-08/msg00300.html>
+See <https://lists.gnu.org/r/emacs-devel/2014-08/msg00300.html>
-<https://lists.gnu.org/archive/html/emacs-devel/2014-11/msg00257.html>
+<https://lists.gnu.org/r/emacs-devel/2014-11/msg00257.html>
 ** Move verilog-mode to elpa.gnu.org.
-See <https://lists.gnu.org/archive/html/emacs-devel/2015-02/msg01180.html>
+See <https://lists.gnu.org/r/emacs-devel/2015-02/msg01180.html>
 ** Move vhdl-mode to elpa.gnu.org.
-See <https://lists.gnu.org/archive/html/emacs-devel/2015-02/msg01180.html>
+See <https://lists.gnu.org/r/emacs-devel/2015-02/msg01180.html>
 * Simple tasks. These don't require much Emacs knowledge, they are
 suitable for anyone from beginners to experts.
@@ -157,7 +157,7 @@ for users to customize.
 ** revert-buffer should eliminate overlays and the mark.
   For related problems consult the thread starting with
-   https://lists.gnu.org/archive/html/emacs-devel/2005-11/msg01346.html
+   https://lists.gnu.org/r/emacs-devel/2005-11/msg01346.html
 ** erase-buffer should perhaps disregard read-only properties of text.
@@ -185,7 +185,7 @@ for users to customize.
 ** Define recompute-arg and recompute-arg-if for fix_command to use.
  See rms message of 11 Dec 05 in
-  https://lists.gnu.org/archive/html/emacs-pretest-bug/2005-12/msg00165.html,
+  https://lists.gnu.org/r/emacs-pretest-bug/2005-12/msg00165.html,
  and the rest of that discussion.
 ** In Emacs Info, examples of using Customize should be clickable
@@ -202,10 +202,10 @@ for users to customize.
 ** make back_comment use syntax-ppss or equivalent.
 ** Consider improving src/sysdep.c's search for a fqdn.
-https://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00782.html
+https://lists.gnu.org/r/emacs-devel/2007-04/msg00782.html
 ** Find a proper fix for rcirc multiline nick adding.
-https://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00684.html
+https://lists.gnu.org/r/emacs-devel/2007-04/msg00684.html
 ** Check for any included packages that define obsolete bug-reporting commands.
 Change them to use report-emacs-bug.
@@ -228,12 +228,12 @@ like make-backup-file-name-function for non-numeric backup files.
 dired buffers and DTRT WRT 'auto-revert-mode'.
 ** Check uses of prin1 for error-handling.
-https://lists.gnu.org/archive/html/emacs-devel/2008-08/msg00456.html
+https://lists.gnu.org/r/emacs-devel/2008-08/msg00456.html
 * Important features:
 ** "Emacs as word processor"
-https://lists.gnu.org/archive/html/emacs-devel/2013-11/msg00515.html
+https://lists.gnu.org/r/emacs-devel/2013-11/msg00515.html
    rms writes:
    25 years ago I hoped we would extend Emacs to do WYSIWYG word
    processing.  That is why we added text properties and variable
@@ -311,15 +311,15 @@ never really made it work for this.
 Perspectives also need to interact with the tabs.
 ** FFI (foreign function interface)
-See eg https://lists.gnu.org/archive/html/emacs-devel/2013-10/msg00246.html
+See eg https://lists.gnu.org/r/emacs-devel/2013-10/msg00246.html
 One way of doing this is to start with fx's dynamic loading, and use it
 to implement things like auto-loaded buffer parsers and database
 access in cases which need more than Lisp.
 ** Replace unexec with a more portable form of dumping
-See eg https://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01034.html
+See eg https://lists.gnu.org/r/emacs-devel/2014-01/msg01034.html
-       https://lists.gnu.org/archive/html/emacs-devel/2014-06/msg00452.html
+       https://lists.gnu.org/r/emacs-devel/2014-06/msg00452.html
 One way is to provide portable undumping using mmap (per gerd design).
@@ -399,8 +399,8 @@ familiar with GNUstep and Objective C.
 ** A more modern printing interface.  One that pops up a dialog that lets
 you choose printer, page style, etc.
 Integration with the Gtk print dialog is apparently difficult.  See eg:
-https://lists.gnu.org/archive/html/emacs-devel/2009-03/msg00501.html
+https://lists.gnu.org/r/emacs-devel/2009-03/msg00501.html
-https://lists.gnu.org/archive/html/emacs-devel/2009-04/msg00034.html
+https://lists.gnu.org/r/emacs-devel/2009-04/msg00034.html
 ** Allow frames(terminals) created by emacsclient to inherit their environment
 from the emacsclient process.
@@ -499,7 +499,7 @@ from the emacsclient process.
 ** Get some major packages installed: W3 (development version needs
  significant work), PSGML, _possibly_ ECB.
-  https://lists.gnu.org/archive/html/emacs-devel/2007-05/msg01493.html
+  https://lists.gnu.org/r/emacs-devel/2007-05/msg01493.html
  Check the assignments file for other packages which might go in and
  have been missed.
@@ -645,17 +645,17 @@ from the emacsclient process.
 ** Possibly make 'list-holidays' eval items in the calendar-holidays variable.
   See thread
-   <https://lists.gnu.org/archive/html/emacs-devel/2006-02/msg01034.html>.
+   <https://lists.gnu.org/r/emacs-devel/2006-02/msg01034.html>.
   [rgm@gnu.org will look at this after 22.1]
 ** Possibly make cal-dst use the system timezone database directly.
   See thread
-   <https://lists.gnu.org/archive/html/emacs-pretest-bug/2006-11/msg00060.html>
+   <https://lists.gnu.org/r/emacs-pretest-bug/2006-11/msg00060.html>
 ** Possibly add a "close" button to the modeline.
   The idea is to add an "X" of some kind, that when clicked deletes
   the window associated with that modeline.
-   https://lists.gnu.org/archive/html/emacs-devel/2007-09/msg02416.html
+   https://lists.gnu.org/r/emacs-devel/2007-09/msg02416.html
 * Things to be done for specific packages or features
@@ -805,8 +805,8 @@ One could envision asymmetrical variants as well, however, this is
 inappropriate for the default setting.
 See the discussion on emacs-devel:
-https://lists.gnu.org/archive/html/emacs-devel/2015-12/msg01575.html
+https://lists.gnu.org/r/emacs-devel/2015-12/msg01575.html
-https://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00008.html
+https://lists.gnu.org/r/emacs-devel/2016-01/msg00008.html
 *** Internal development features
@@ -1492,7 +1492,7 @@ presence of multi-file documents.
   or just an extension of buff-menu.el.
 ** Replace linum.el with nlinum.el
-   https://lists.gnu.org/archive/html/emacs-devel/2013-08/msg00379.html
+   https://lists.gnu.org/r/emacs-devel/2013-08/msg00379.html
 ** Merge sendmail.el and messages.el.
   Probably not a complete merge, but at least arrange for messages.el to be
@@ -1507,7 +1507,7 @@ presence of multi-file documents.
 ** Rewrite make-docfile to be clean and maintainable.
   It might be better to replace it with Lisp, using the byte compiler.
-   https://lists.gnu.org/archive/html/emacs-devel/2012-06/msg00037.html
+   https://lists.gnu.org/r/emacs-devel/2012-06/msg00037.html
 ** Add an inferior-comint-minor-mode to capture the common set of operations
   offered by major modes that offer an associated inferior
@@ -1523,7 +1523,7 @@ presence of multi-file documents.
 * Wishlist items:
 ** Maybe replace etags.c with a Lisp implementation.
-https://lists.gnu.org/archive/html/emacs-devel/2012-06/msg00354.html
+https://lists.gnu.org/r/emacs-devel/2012-06/msg00354.html
 ** Maybe replace lib-src/rcs2log with a Lisp implementation.
 It wouldn't have to be a complete replacement, just enough
diff --git a/leim/ChangeLog.1 b/leim/ChangeLog.1
index 91acacc9bc6..485698113f2 100644
--- a/leim/ChangeLog.1
+++ b/leim/ChangeLog.1
@@ -454,7 +454,7 @@
        Redo spelling of Makefile variables to conform to POSIX.
        POSIX does not allow "-" in Makefile variable names.
        Reported by Bruno Haible in
-        <https://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00990.html>.
+        <https://lists.gnu.org/r/emacs-devel/2011-01/msg00990.html>.
        * Makefile.in (BUILT_EMACS): Rename from BUILT-EMACS.
        (TIT_GB): Rename from TIT-GB.
        (CHINESE_TIT): Rename from CHINESE-TIT.
diff --git a/lib-src/ChangeLog.1 b/lib-src/ChangeLog.1
index 5a370035d70..87a0d7b943f 100644
--- a/lib-src/ChangeLog.1
+++ b/lib-src/ChangeLog.1
@@ -65,7 +65,7 @@
        Better support for future plugins
        See the thread containing:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-02/msg00720.html
+        https://lists.gnu.org/r/emacs-devel/2015-02/msg00720.html
        * make-docfile.c (write_globals): Generate code that #defines
        Qxxx macros other than Qnil only if DEFINE_NONNIL_Q_SYMBOL_MACROS.
        Qnil is safe to define even in plugins, since it must be zero for
@@ -329,7 +329,7 @@
 2014-05-26  Paul Eggert  <eggert@cs.ucla.edu>
        Fix rcs2log problems with CVS.  Reported by Glenn Morris in
-        <https://lists.gnu.org/archive/html/emacs-devel/2014-05/msg00277.html>.
+        <https://lists.gnu.org/r/emacs-devel/2014-05/msg00277.html>.
        Plus, fix some security and filename quoting problems.
        * rcs2log (logdir): Prefer mktemp if available.
        (logdir, llogdir): Work even if TMPDIR begins with '-' or has spaces.
@@ -937,13 +937,13 @@
        * movemail.c: Add missing 'defined'.
        Suggested by Sven Joachim in
-        <https://lists.gnu.org/archive/html/emacs-devel/2012-07/msg00218.html>.
+        <https://lists.gnu.org/r/emacs-devel/2012-07/msg00218.html>.
 2012-07-11  Paul Eggert  <eggert@cs.ucla.edu>
        Port 'movemail' again to Solaris and similar hosts.
        See Susan Cragin's report in
-        <https://lists.gnu.org/archive/html/emacs-devel/2012-07/msg00199.html>.
+        <https://lists.gnu.org/r/emacs-devel/2012-07/msg00199.html>.
        * movemail.c (xmalloc): Also define if !DISABLE_DIRECT_ACCESS &&
        !MAIL_USE_MMDF && !MAIL_USE_SYSTEM_LOCK.  Move up, so it doesn't
        need a forward declaration.
@@ -1212,7 +1212,7 @@
        Assume less-ancient POSIX support.
        * update-game-score.c: Include <getopt.h> rather than rolling our
        own decls for optarg, optind, opterr.  See
-        <https://lists.gnu.org/archive/html/emacs-devel/2011-12/msg00720.html>.
+        <https://lists.gnu.org/r/emacs-devel/2011-12/msg00720.html>.
 2012-04-14  Juanma Barranquero  <lekktu@gmail.com>
@@ -1271,7 +1271,7 @@
        instead, treat both -c and -t as always requesting a new "tty" frame,
        and let server.el decide which kind is actually required.
        Reported by Uwe Siart <usenet@siart.de> in this thread:
-        https://lists.gnu.org/archive/html/emacs-devel/2011-11/msg00303.html
+        https://lists.gnu.org/r/emacs-devel/2011-11/msg00303.html
 2011-11-30  Chong Yidong  <cyd@gnu.org>
diff --git a/lisp/ChangeLog.11 b/lisp/ChangeLog.11
index 52f5189228e..94a3cbfb582 100644
--- a/lisp/ChangeLog.11
+++ b/lisp/ChangeLog.11
@@ -6395,7 +6395,7 @@
        * vc-svn.el (vc-svn-checkin): Use `nconc' instead of `list*',
        because the latter is a CL-ism.  This fixes the bug reported by
        Shawn Boyette <mdxi@collapsar.net> in
-        https://lists.gnu.org/archive/html/emacs-devel/2004-05/msg00442.html.
+        https://lists.gnu.org/r/emacs-devel/2004-05/msg00442.html.
 2004-06-04  Miles Bader  <miles@gnu.org>
diff --git a/lisp/ChangeLog.13 b/lisp/ChangeLog.13
index 8869cc46eb8..d14325b5ff1 100644
--- a/lisp/ChangeLog.13
+++ b/lisp/ChangeLog.13
@@ -4667,7 +4667,7 @@
 2008-01-02  Karl Fogel  <kfogel@red-bean.com>
        Change a return type, for greater extensibility.
-        See https://lists.gnu.org/archive/html/emacs-devel/2007-12/msg01077.html
+        See https://lists.gnu.org/r/emacs-devel/2007-12/msg01077.html
        and its thread for discussion leading to this change.
        * bookmark.el (bookmark-jump-noselect):
@@ -14464,7 +14464,7 @@
        * bookmark.el: Revert 2007-07-13T18:16:17Z!kfogel@red-bean.com,
        thus restoring bookmark bindings to three slots under C-x r.  See
-        https://lists.gnu.org/archive/html/emacs-devel/2007-07/msg00705.html.
+        https://lists.gnu.org/r/emacs-devel/2007-07/msg00705.html.
 2007-07-15  Jeff Miller  <jmiller@cablespeed.com>  (tiny change)
@@ -14511,7 +14511,7 @@
        * bookmark.el (bookmark-jump-other-window): New function.
        (bookmark-map): Bind it to "o".
-        https://lists.gnu.org/archive/html/emacs-devel/2007-07/msg00633.html
+        https://lists.gnu.org/r/emacs-devel/2007-07/msg00633.html
        and its thread contains discussion about this change.
        The original patch was slightly tweaked by Karl Fogel
        <kfogel@red-bean.com> before committing.
@@ -14525,7 +14525,7 @@
        * bookmark.el: Don't define bookmark keys under the "C-xr" map;
        instead, make "C-xp" a prefix for bookmark-map.  Patch by Drew
        Adams <drew.adams@oracle.com>, mildly tweaked by me.  See
-        https://lists.gnu.org/archive/html/emacs-devel/2007-07/msg00633.html.
+        https://lists.gnu.org/r/emacs-devel/2007-07/msg00633.html.
 2007-07-13  Carsten Dominik  <dominik@science.uva.nl>
diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15
index 3e6d664aa6b..11bc31f3b29 100644
--- a/lisp/ChangeLog.15
+++ b/lisp/ChangeLog.15
@@ -9833,7 +9833,7 @@
        * window.el (pop-to-buffer): Remove the conditional that
        compares new-window and old-window, so it will reselect
        the selected window unconditionally.
-        https://lists.gnu.org/archive/html/emacs-devel/2010-06/msg00078.html
+        https://lists.gnu.org/r/emacs-devel/2010-06/msg00078.html
 2010-06-07  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -9882,7 +9882,7 @@
        of kill-ring: don't call menu-bar-update-yank-menu, don't push
        interprogram-paste strings to kill-ring, and don't push the input
        argument `string' to kill-ring.
-        https://lists.gnu.org/archive/html/emacs-devel/2010-06/msg00072.html
+        https://lists.gnu.org/r/emacs-devel/2010-06/msg00072.html
 2010-06-04  Juanma Barranquero  <lekktu@gmail.com>
@@ -10445,7 +10445,7 @@
        * dired-x.el (dired-jump, dired-jump-other-window): Add arg
        FILE-NAME to read from the minibuffer when called interactively
        with prefix argument instead of using buffer-file-name.
-        https://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00534.html
+        https://lists.gnu.org/r/emacs-devel/2010-05/msg00534.html
        * dired.el: Update autoloads.
@@ -11998,7 +11998,7 @@
 2010-04-05  Juri Linkov  <juri@jurta.org>
        Scrolling commands which scroll a line instead of full screen.
-        https://lists.gnu.org/archive/html/emacs-devel/2010-03/msg01452.html
+        https://lists.gnu.org/r/emacs-devel/2010-03/msg01452.html
        * simple.el (scroll-up-line, scroll-down-line): New commands.
        Put property isearch-scroll=t on them.
@@ -12009,7 +12009,7 @@
 2010-04-05  Juri Linkov  <juri@jurta.org>
        Scrolling commands which do not signal errors at top/bottom.
-        https://lists.gnu.org/archive/html/emacs-devel/2010-03/msg01452.html
+        https://lists.gnu.org/r/emacs-devel/2010-03/msg01452.html
        * simple.el (scroll-up-command, scroll-down-command): New commands.
        Put property isearch-scroll=t on them.
@@ -12063,7 +12063,7 @@
        (electric-help-mode): Set it to original major-mode.  Doc fix.
        (with-electric-help): Use `electric-help-orig-major-mode' instead
        of (default-value 'major-mode).  Doc fix.
-        https://lists.gnu.org/archive/html/emacs-devel/2010-04/msg00069.html
+        https://lists.gnu.org/r/emacs-devel/2010-04/msg00069.html
 2010-04-02  Sam Steingold  <sds@gnu.org>
@@ -12089,13 +12089,13 @@
        * simple.el (next-line, previous-line): Re-throw a signal
        with `signal' instead of using `ding'.
-        https://lists.gnu.org/archive/html/emacs-devel/2010-03/msg01432.html
+        https://lists.gnu.org/r/emacs-devel/2010-03/msg01432.html
 2010-03-31  Juri Linkov  <juri@jurta.org>
        * simple.el (keyboard-escape-quit): Raise deselecting the active
        region higher than exiting the minibuffer.
-        https://lists.gnu.org/archive/html/emacs-devel/2010-03/msg00904.html
+        https://lists.gnu.org/r/emacs-devel/2010-03/msg00904.html
 2010-03-31  Juri Linkov  <juri@jurta.org>
@@ -12184,7 +12184,7 @@
 2010-03-30  Juri Linkov  <juri@jurta.org>
        Make occur handle multi-line matches cleanly with context.
-        https://lists.gnu.org/archive/html/emacs-devel/2010-03/msg01280.html
+        https://lists.gnu.org/r/emacs-devel/2010-03/msg01280.html
        * replace.el (occur-accumulate-lines): Add optional arg `pt'.
        (occur-engine): Add local variables `ret', `prev-after-lines',
@@ -12379,7 +12379,7 @@
 2010-03-23  Juri Linkov  <juri@jurta.org>
        Implement Occur multi-line matches.
-        https://lists.gnu.org/archive/html/emacs-devel/2010-03/msg01044.html
+        https://lists.gnu.org/r/emacs-devel/2010-03/msg01044.html
        * replace.el (occur): Doc fix.
        (occur-engine): Set `begpt' to the beginning of the first line.
@@ -12456,7 +12456,7 @@
 2010-03-21  Juri Linkov  <juri@jurta.org>
        Fix message of multi-line occur regexps and multi-buffer header lines.
-        https://lists.gnu.org/archive/html/emacs-devel/2010-03/msg00457.html
+        https://lists.gnu.org/r/emacs-devel/2010-03/msg00457.html
        * replace.el (occur-1): Don't display regexp if it is longer
        than window-width.  Use `query-replace-descr' to display regexp.
@@ -12750,7 +12750,7 @@
 2010-03-10  Kim F. Storm  <storm@cua.dk>
        Animated image API.
-        https://lists.gnu.org/archive/html/emacs-devel/2010-03/msg00211.html
+        https://lists.gnu.org/r/emacs-devel/2010-03/msg00211.html
        * image.el (image-animate-max-time): New defcustom.
        (image-animated-types): New defconst.
@@ -13908,7 +13908,7 @@
        positions by using `bookmark-bmenu-marks-width', instead of hardcoding.
        This fixes the `bookmark-bmenu-execute-deletions' bug reported here:
-        https://lists.gnu.org/archive/html/emacs-devel/2009-12/msg00819.html
+        https://lists.gnu.org/r/emacs-devel/2009-12/msg00819.html
        From: Sun Yijiang <sunyijiang {_AT_} gmail.com>
        To: emacs-devel {_AT_} gnu.org
        Subject: bookmark.el bug report
@@ -19816,7 +19816,7 @@
        * files.el (find-alternate-file): If the old buffer is modified
        and visiting a file, behave similarly to `kill-buffer' when
        killing it, thus reverting to the pre-1.878 behavior; see
-        https://lists.gnu.org/archive/html/emacs-devel/2009-09/msg00101.html
+        https://lists.gnu.org/r/emacs-devel/2009-09/msg00101.html
        for discussion.  Also, consult `buffer-file-name' as a variable
        not as a function, for consistency with the rest of the code.
diff --git a/lisp/ChangeLog.16 b/lisp/ChangeLog.16
index 33bd9a03323..dcf2fd071d0 100644
--- a/lisp/ChangeLog.16
+++ b/lisp/ChangeLog.16
@@ -1371,7 +1371,7 @@
        * frame.el (toggle-frame-maximized, toggle-frame-fullscreen):
        Use fullboth as an alias for fullscreen.  Suggested by Jan Djärv in
-        <https://lists.gnu.org/archive/html/emacs-devel/2013-01/msg00203.html>.
+        <https://lists.gnu.org/r/emacs-devel/2013-01/msg00203.html>.
 2013-01-30  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -2422,7 +2422,7 @@
        * epg.el: Support pinentry-curses.
        Suggested by Werner Koch in
-        <https://lists.gnu.org/archive/html/emacs-devel/2007-02/msg00755.html>.
+        <https://lists.gnu.org/r/emacs-devel/2007-02/msg00755.html>.
        (epg-agent-file, epg-agent-mtime): New variable.
        (epg--start): Record the modified time of gpg-agent socket file,
        to restore Emacs frame after pinentry-curses termination.
@@ -2448,7 +2448,7 @@
        (toggle-frame-maximized): Rewrite and bind to M-<f10>.
        (toggle-frame-fullscreen): New command bound to <f11> instead of
        `toggle-frame-maximized'.
-        https://lists.gnu.org/archive/html/emacs-devel/2012-12/msg00703.html
+        https://lists.gnu.org/r/emacs-devel/2012-12/msg00703.html
 2012-12-27  Michael Albinus  <michael.albinus@gmx.de>
@@ -2686,7 +2686,7 @@
        (isearch-insert-char-by-name): New command.
        * international/mule-cmds.el (read-char-by-name): Let-bind
        `enable-recursive-minibuffers' to t.
-        https://lists.gnu.org/archive/html/emacs-devel/2012-12/msg00234.html
+        https://lists.gnu.org/r/emacs-devel/2012-12/msg00234.html
 2012-12-15  Juri Linkov  <juri@jurta.org>
@@ -4831,7 +4831,7 @@
        * progmodes/compile.el (compilation-error-regexp-alist-alist):
        Adjust the msft regexp to the output of Studio 2010, and move msft
        before edg-1.  See the discussion on emacs-devel,
-        https://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00579.html,
+        https://lists.gnu.org/r/emacs-devel/2012-09/msg00579.html,
        for the details.
 2012-10-14  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -5453,7 +5453,7 @@
        * profiler.el (profiler-sampling-interval): Change default back to 1.
        See Stefan Monnier in
-        <https://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00863.html>.
+        <https://lists.gnu.org/r/emacs-devel/2012-09/msg00863.html>.
 2012-10-01  Fabián Ezequiel Gallina  <fgallina@cuca>
@@ -6641,7 +6641,7 @@
        search-whitespace-regexp if isearch-lax-whitespace or
        isearch-regexp-lax-whitespace is non-nil.
        (Info-mode): Don't set local variable search-whitespace-regexp.
-        https://lists.gnu.org/archive/html/emacs-devel/2012-08/msg00811.html
+        https://lists.gnu.org/r/emacs-devel/2012-08/msg00811.html
 2012-09-12  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -7037,7 +7037,7 @@
 2012-09-02  Juri Linkov  <juri@jurta.org>
        Toggle whitespace matching mode with M-s SPC.
-        https://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00008.html
+        https://lists.gnu.org/r/emacs-devel/2012-09/msg00008.html
        * isearch.el (search-whitespace-regexp): Doc fix.
        Remove cons cell customization.
@@ -8109,7 +8109,7 @@
        * whitespace.el (whitespace-display-mappings): Use Unicode
        codepoints, instead of emacs-mule codepoints.  See
-        https://lists.gnu.org/archive/html/help-gnu-emacs/2012-07/msg00366.html
+        https://lists.gnu.org/r/help-gnu-emacs/2012-07/msg00366.html
        for the details.
        * files.el (file-truename): Don't skip symlink-chasing part on
@@ -8513,7 +8513,7 @@
        * startup.el (command-line): Don't display an empty user name in
        the error message about non-existent home directory, when
        init-file-user was set to an empty string.  See
-        https://lists.gnu.org/archive/html/bug-gnu-emacs/2012-07/msg00835.html
+        https://lists.gnu.org/r/bug-gnu-emacs/2012-07/msg00835.html
        for the details and context.
 2012-07-22  Vincent Belaïche  <vincentb1@users.sourceforge.net>
@@ -9419,7 +9419,7 @@
        * calendar/calendar.el (calendar-exit): Don't try to delete or
        iconify last frame.  See:
-        https://lists.gnu.org/archive/html/emacs-devel/2012-06/msg00372.html
+        https://lists.gnu.org/r/emacs-devel/2012-06/msg00372.html
 2012-06-25  Jim Diamond  <Jim.Diamond@AcadiaU.ca>  (tiny change)
@@ -10430,7 +10430,7 @@
        * descr-text.el (describe-char): Mention how to insert the
        character, if the current input method doesn't support it.
        See the discussion in this thread for the details:
-        https://lists.gnu.org/archive/html/emacs-devel/2012-05/msg00533.html.
+        https://lists.gnu.org/r/emacs-devel/2012-05/msg00533.html.
 2012-06-08  Sam Steingold  <sds@gnu.org>
@@ -13909,7 +13909,7 @@
        Insert invisible LRM characters before each character in a keyboard
        layout cell, to prevent their reordering by bidi display engine.
        For details, see the discussion in
-        https://lists.gnu.org/archive/html/emacs-devel/2012-03/msg00085.html.
+        https://lists.gnu.org/r/emacs-devel/2012-03/msg00085.html.
 2012-03-08  Alan Mackenzie  <acm@muc.de>
@@ -13927,7 +13927,7 @@
        * international/quail.el (quail-help):
        Force bidi-paragraph-direction be left-to-right.  See discussion in
-        https://lists.gnu.org/archive/html/emacs-devel/2012-03/msg00062.html
+        https://lists.gnu.org/r/emacs-devel/2012-03/msg00062.html
        for the reason.
 2012-03-07  Michael Albinus  <michael.albinus@gmx.de>
@@ -15004,7 +15004,7 @@
        * descr-text.el (describe-char): Show the raw character, not only
        its display form at POS.  Suggested by Kenichi Handa <handa@m17n.org>.
-        See https://lists.gnu.org/archive/html/emacs-devel/2012-01/msg00760.html
+        See https://lists.gnu.org/r/emacs-devel/2012-01/msg00760.html
        for the reasons.
 2012-01-28  Phil Hagelberg  <phil@hagelb.org>
@@ -15362,7 +15362,7 @@
        * time.el (display-time-load-average)
        (display-time-default-load-average): Doc fixes.  See the thread
        starting at
-        https://lists.gnu.org/archive/html/help-gnu-emacs/2012-01/msg00059.html
+        https://lists.gnu.org/r/help-gnu-emacs/2012-01/msg00059.html
        for the details.
 2012-01-06  Glenn Morris  <rgm@gnu.org>
@@ -15769,7 +15769,7 @@
        (texinfo-insert-master-menu-list): Improve the error message
        displayed if there's no menu in the Top node.
        (Bug#2975)  See also this thread:
-        https://lists.gnu.org/archive/html/emacs-devel/2011-12/msg00156.html.
+        https://lists.gnu.org/r/emacs-devel/2011-12/msg00156.html.
 2011-12-09  Manuel Gómez  <mgrojo@gmail.com>  (tiny change)
@@ -24381,7 +24381,7 @@
        * help-fns.el (describe-variable): Complete all variables having
        documentation, including keywords.
-        https://lists.gnu.org/archive/html/emacs-devel/2011-04/msg00112.html
+        https://lists.gnu.org/r/emacs-devel/2011-04/msg00112.html
 2011-04-04  Juanma Barranquero  <lekktu@gmail.com>
diff --git a/lisp/ChangeLog.17 b/lisp/ChangeLog.17
index bb3375be9a6..b2d315c53f3 100644
--- a/lisp/ChangeLog.17
+++ b/lisp/ChangeLog.17
@@ -3598,7 +3598,7 @@
        * comint.el (comint-history-isearch-message): Use field-beginning
        instead of comint-line-beginning-position - that's more fixes for
-        https://lists.gnu.org/archive/html/emacs-devel/2014-12/msg00305.html
+        https://lists.gnu.org/r/emacs-devel/2014-12/msg00305.html
        (comint-history-isearch-message): Fix args of isearch-message-prefix.
 2014-12-29  Juri Linkov  <juri@linkov.net>
@@ -3698,7 +3698,7 @@
        * language/misc-lang.el (composition-function-table): Add Syriac
        characters and also ZWJ/ZWNJ.
-        See https://lists.gnu.org/archive/html/help-gnu-emacs/2014-12/msg00248.html
+        See https://lists.gnu.org/r/help-gnu-emacs/2014-12/msg00248.html
        for the details.
 2014-12-27  Fabián Ezequiel Gallina  <fgallina@gnu.org>
@@ -4489,14 +4489,14 @@
        comint-line-beginning-position.
        (comint-send-input): Go to the end of the field instead of the end
        of the line to accept whole multi-line input.
-        https://lists.gnu.org/archive/html/emacs-devel/2014-12/msg00305.html
+        https://lists.gnu.org/r/emacs-devel/2014-12/msg00305.html
 2014-12-05  Juri Linkov  <juri@linkov.net>
        * minibuffer.el (minibuffer-completion-help):
        Compare selected-window with minibuffer-window to check whether
        completions should be displayed near the minibuffer.  (Bug#17809)
-        https://lists.gnu.org/archive/html/emacs-devel/2014-12/msg00311.html
+        https://lists.gnu.org/r/emacs-devel/2014-12/msg00311.html
 2014-12-05  Michael Albinus  <michael.albinus@gmx.de>
@@ -4605,7 +4605,7 @@
        the remote repository were unreachable, because the VC hooks tried
        to run "svn status -u" on the file, where the "-u" tells svn to
        get update information from the remote repository.
-        https://lists.gnu.org/archive/html/emacs-devel/2014-12/msg00174.html
+        https://lists.gnu.org/r/emacs-devel/2014-12/msg00174.html
        * vc/vc-svn.el (vc-svn-state): Remove optional `localp'
        argument and always pass "-v" to "svn status", never "-u".
@@ -5306,7 +5306,7 @@
        (query-replace-read-from): Call custom-reevaluate-setting on
        query-replace-from-to-separator to reevaluate the separator
        depending on the return value of char-displayable-p.
-        https://lists.gnu.org/archive/html/emacs-devel/2014-11/msg00466.html
+        https://lists.gnu.org/r/emacs-devel/2014-11/msg00466.html
 2014-11-18  Juri Linkov  <juri@linkov.net>
@@ -5316,7 +5316,7 @@
        * simple.el (next-line-or-history-element)
        (previous-line-or-history-element): New commands.
-        https://lists.gnu.org/archive/html/emacs-devel/2014-11/msg00822.html
+        https://lists.gnu.org/r/emacs-devel/2014-11/msg00822.html
 2014-11-18  Leo Liu  <sdl.web@gmail.com>
@@ -5441,7 +5441,7 @@
        Improve time stamp handling, and be more consistent about it.
        This implements a suggestion made in:
-        https://lists.gnu.org/archive/html/emacs-devel/2014-10/msg00587.html
+        https://lists.gnu.org/r/emacs-devel/2014-10/msg00587.html
        Among other things, this means timer.el no longer needs to
        autoload the time-date module.
        * allout-widgets.el (allout-elapsed-time-seconds): Doc fix.
@@ -5682,7 +5682,7 @@
 2014-11-10  Sylvain Chouleur  <sylvain.chouleur@gmail.com>  (tiny change)
        Allow VTIMEZONE where daylight and standard time zones are equal.
-        See: https://lists.gnu.org/archive/html/emacs-devel/2014-11/msg00494.html
+        See: https://lists.gnu.org/r/emacs-devel/2014-11/msg00494.html
        * calendar/icalendar.el (icalendar--convert-tz-offset):
        Support timezone without daylight saving time.
@@ -5813,7 +5813,7 @@
        to the history variables.
        (query-replace-read-to): Add FROM-TO pairs to query-replace-defaults.
        (query-replace-regexp-eval): Let-bind query-replace-defaults to nil.
-        https://lists.gnu.org/archive/html/emacs-devel/2014-11/msg00253.html
+        https://lists.gnu.org/r/emacs-devel/2014-11/msg00253.html
        * isearch.el (isearch-text-char-description): Keep characters
        intact and put formatted strings with the `display' property.
@@ -7565,7 +7565,7 @@
        (lisp--form-quoted-p): New functions.
        (lisp-completion-at-point): Use them to see if we're completing a
        variable reference, a function name, or just any symbol.
-        https://lists.gnu.org/archive/html/emacs-devel/2014-02/msg00229.html
+        https://lists.gnu.org/r/emacs-devel/2014-02/msg00229.html
 2014-09-18  Ivan Kanis  <ivan@kanis.fr>
@@ -9937,7 +9937,7 @@
        `window-configuration-change-hook'.
        (desktop-auto-save-set-timer): Change REPEAT arg of
        `run-with-idle-timer' from t to nil.
-        https://lists.gnu.org/archive/html/emacs-devel/2014-06/msg00147.html
+        https://lists.gnu.org/r/emacs-devel/2014-06/msg00147.html
 2014-06-08  Santiago Payà i Miralta  <santiagopim@gmail.com>
@@ -10488,7 +10488,7 @@
        * emacs-lisp/package.el (package-generate-description-file):
        Output first-line comment to set buffer-local var `no-byte-compile'.
        Suggested by Dmitry Gutov:
-        <https://lists.gnu.org/archive/html/emacs-devel/2014-05/msg00401.html>.
+        <https://lists.gnu.org/r/emacs-devel/2014-05/msg00401.html>.
 2014-05-25  Thien-Thi Nguyen  <ttn@gnu.org>
@@ -12170,7 +12170,7 @@
        to `comment-start-skip' if not `comment-use-syntax'.  (Bug#16971)
        (comment-beginning): Use `narrow-to-region' instead of moving back
        one character.
-        (https://lists.gnu.org/archive/html/emacs-devel/2014-03/msg00488.html)
+        (https://lists.gnu.org/r/emacs-devel/2014-03/msg00488.html)
        (comment-start-skip): Update the docstring.
 2014-03-18  Richard Stallman  <rms@gnu.org>
@@ -12467,7 +12467,7 @@
        from `xterm-standard-colors' that look well on the default white
        background (and also on the black background) to avoid illegible
        color combinations like yellow-on-white and white-on-white.
-        https://lists.gnu.org/archive/html/emacs-devel/2014-02/msg00157.html
+        https://lists.gnu.org/r/emacs-devel/2014-02/msg00157.html
 2014-03-08  Juanma Barranquero  <lekktu@gmail.com>
@@ -13224,7 +13224,7 @@
 2014-02-12  Dmitry Gutov  <dgutov@yandex.ru>
        * progmodes/js.el (js-indent-line): Don't widen.
-        https://lists.gnu.org/archive/html/emacs-devel/2012-06/msg00276.html
+        https://lists.gnu.org/r/emacs-devel/2012-06/msg00276.html
 2014-02-12  Glenn Morris  <rgm@gnu.org>
@@ -13965,7 +13965,7 @@
        choices.
        (ruby-smie-rules): Instead of using a hardcoded list of alignable
        keywords, check against the value of `ruby-alignable-keywords'
-        (https://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01439.html).
+        (https://lists.gnu.org/r/emacs-devel/2014-01/msg01439.html).
 2014-01-17  Glenn Morris  <rgm@gnu.org>
@@ -15408,7 +15408,7 @@
        * simple.el (blink-matching--overlay): New variable.
        (blink-matching-open): Instead of moving point, highlight the
        matching paren with an overlay
-        (https://lists.gnu.org/archive/html/emacs-devel/2013-12/msg00333.html).
+        (https://lists.gnu.org/r/emacs-devel/2013-12/msg00333.html).
        * faces.el (paren-showing-faces, show-paren-match)
        (show-paren-mismatch): Move from paren.el.
@@ -16628,7 +16628,7 @@
        * textmodes/ispell.el (ispell-lookup-words): When `look' is not
        available and the word has no wildcards, append one to the grep pattern.
-        https://lists.gnu.org/archive/html/emacs-devel/2013-11/msg00258.html
+        https://lists.gnu.org/r/emacs-devel/2013-11/msg00258.html
        (ispell-complete-word): Call `ispell-lookup-words' with the value
        independent of `ispell-look-p'.
@@ -18282,7 +18282,7 @@
        * emacs-lisp/package.el (package-buffer-info, describe-package-1):
        Use :url instead of :homepage, as per
-        https://lists.gnu.org/archive/html/emacs-devel/2013-09/msg00622.html
+        https://lists.gnu.org/r/emacs-devel/2013-09/msg00622.html
        * newcomment.el (comment-beginning): When `comment-use-syntax' is
        non-nil, use `syntax-ppss' (Bug#15251).
@@ -19828,7 +19828,7 @@
        * xml.el (xml-parse-tag-1): Use looking-at (this reverts change in
        2013-08-11T00:07:48Z!lekktu@gmail.com, which breaks the test suite).
-        https://lists.gnu.org/archive/html/emacs-devel/2013-08/msg00263.html
+        https://lists.gnu.org/r/emacs-devel/2013-08/msg00263.html
 2013-08-12  Eli Zaretskii  <eliz@gnu.org>
@@ -21942,7 +21942,7 @@
 2013-06-25  Martin Rudalics  <rudalics@gmx.at>
        * window.el (window--state-get-1): Workaround for bug#14527.
-        https://lists.gnu.org/archive/html/emacs-devel/2013-06/msg00941.html
+        https://lists.gnu.org/r/emacs-devel/2013-06/msg00941.html
 2013-06-25  Lars Magne Ingebrigtsen  <larsi@gnus.org>
@@ -22055,7 +22055,7 @@
        * progmodes/ruby-mode.el (ruby-font-lock-keywords): Move `catch',
        add some more keyword-like methods.
-        https://lists.gnu.org/archive/html/emacs-devel/2013-06/msg00911.html
+        https://lists.gnu.org/r/emacs-devel/2013-06/msg00911.html
 2013-06-22  Juanma Barranquero  <lekktu@gmail.com>
@@ -22674,7 +22674,7 @@
 2013-06-18  Matthias Meulien  <orontee@gmail.com>
        * tabify.el (untabify, tabify): With prefix, apply to entire buffer.
-        <https://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00545.html>
+        <https://lists.gnu.org/r/emacs-devel/2013-03/msg00545.html>
 2013-06-18  Glenn Morris  <rgm@gnu.org>
@@ -22704,7 +22704,7 @@
        * emacs-lisp/package.el (package-load-descriptor):
        Remove `with-syntax-table' call, `read' doesn't need it.
-        https://lists.gnu.org/archive/html/emacs-devel/2013-06/msg00539.html
+        https://lists.gnu.org/r/emacs-devel/2013-06/msg00539.html
 2013-06-17  Juanma Barranquero  <lekktu@gmail.com>
@@ -25118,7 +25118,7 @@
        (desktop-auto-save, desktop-auto-save-set-timer): New functions.
        (after-init-hook): Call `desktop-auto-save-set-timer'.
        Suggested by Reuben Thomas <rrt@sc3d.org> in
-        <https://lists.gnu.org/archive/html/emacs-devel/2013-04/msg00327.html>.
+        <https://lists.gnu.org/r/emacs-devel/2013-04/msg00327.html>.
 2013-04-27  Leo Liu  <sdl.web@gmail.com>
@@ -25144,7 +25144,7 @@
        * ls-lisp.el (ls-lisp-insert-directory): If no files are
        displayed, move point to after the totals line.
-        See https://lists.gnu.org/archive/html/emacs-devel/2013-04/msg00677.html
+        See https://lists.gnu.org/r/emacs-devel/2013-04/msg00677.html
        for the details.
 2013-04-27  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -25757,7 +25757,7 @@
        Do not set x-display-name until X connection is established.
        This is needed to prevent from weird situation described at
-        <https://lists.gnu.org/archive/html/emacs-devel/2013-04/msg00212.html>.
+        <https://lists.gnu.org/r/emacs-devel/2013-04/msg00212.html>.
        * frame.el (make-frame): Set x-display-name after call to
        window system initialization function, not before.
        * term/x-win.el (x-initialize-window-system): Add optional
@@ -26079,7 +26079,7 @@
        (batch-skkdic-convert): Suppress most of the chatter.
        It's not needed so much now that machines are faster,
        and its non-ASCII component was confusing; see Dmitry Gutov in
-        <https://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00508.html>.
+        <https://lists.gnu.org/r/emacs-devel/2013-03/msg00508.html>.
 2013-03-20  Leo Liu  <sdl.web@gmail.com>
@@ -26223,7 +26223,7 @@
        * startup.el (command-line-normalize-file-name): Fix handling of
        backslashes in DOS and Windows file names.  Reported by Xue Fuqiao
        <xfq.free@gmail.com> in
-        https://lists.gnu.org/archive/html/help-gnu-emacs/2013-03/msg00245.html.
+        https://lists.gnu.org/r/help-gnu-emacs/2013-03/msg00245.html.
 2013-03-15  Michael Albinus  <michael.albinus@gmx.de>
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index b628444aad1..de3dc186170 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -132,13 +132,13 @@ PHONY_EXTRAS =
 # This could lead to problems in parallel builds if automatically
 # generated *.el files (eg loaddefs etc) were being changed at the same time.
 # One solution was to add autoloads as a prerequisite:
-# https://lists.gnu.org/archive/html/emacs-pretest-bug/2007-01/msg00469.html
+# https://lists.gnu.org/r/emacs-pretest-bug/2007-01/msg00469.html
-# https://lists.gnu.org/archive/html/bug-gnu-emacs/2007-12/msg00171.html
+# https://lists.gnu.org/r/bug-gnu-emacs/2007-12/msg00171.html
 # However, this meant that running these targets modified loaddefs.el,
 # every time (due to time-stamping).  Calling these rules from
 # bootstrap-after would modify loaddefs after src/emacs, resulting
 # in make install remaking src/emacs for no real reason:
-# https://lists.gnu.org/archive/html/emacs-devel/2008-02/msg00311.html
+# https://lists.gnu.org/r/emacs-devel/2008-02/msg00311.html
 # Nowadays these commands don't scan automatically generated files,
 # since they will never contain any useful information
 # (see finder-no-scan-regexp and custom-dependencies-no-scan-regexp).
diff --git a/lisp/calendar/cal-dst.el b/lisp/calendar/cal-dst.el
index 6a4054d73fa..301dc29c56a 100644
--- a/lisp/calendar/cal-dst.el
+++ b/lisp/calendar/cal-dst.el
@@ -248,7 +248,7 @@ The result has the proper form for `calendar-daylight-savings-starts'."
 ;; TODO it might be better to extract this information directly from
 ;; the system timezone database. But cross-platform...?
 ;; See thread
-;; https://lists.gnu.org/archive/html/emacs-pretest-bug/2006-11/msg00060.html
+;; https://lists.gnu.org/r/emacs-pretest-bug/2006-11/msg00060.html
 (defun calendar-dst-find-data (&optional time)
  "Find data on the first daylight saving time transitions after TIME.
 TIME defaults to `current-time'.  Return value is as described
diff --git a/lisp/calendar/cal-menu.el b/lisp/calendar/cal-menu.el
index 32769332df5..b2079797b6c 100644
--- a/lisp/calendar/cal-menu.el
+++ b/lisp/calendar/cal-menu.el
@@ -100,7 +100,7 @@
        ;; Show 11 years--5 before, 5 after year of middle month.
        ;; We used to use :suffix rather than :label and bumped into
        ;; an easymenu bug:
-        ;; https://lists.gnu.org/archive/html/emacs-devel/2007-11/msg01813.html
+        ;; https://lists.gnu.org/r/emacs-devel/2007-11/msg01813.html
        ;; The bug has since been fixed.
        (dotimes (i 11)
          (push (vector (format "hol-year-%d" i)
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index d8d2dd4aafa..e45f8b27622 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -425,7 +425,7 @@ Only used if `diary-header-line-flag' is non-nil."
 ;; display does not create the fancy buffer, nor does it set
 ;; diary-selective-display in the diary buffer. This means some
 ;; customizations will not take effect, eg:
-;; https://lists.gnu.org/archive/html/emacs-pretest-bug/2007-03/msg00466.html
+;; https://lists.gnu.org/r/emacs-pretest-bug/2007-03/msg00466.html
 ;; So the check for diary-selective-display was dropped. This means the
 ;; diary will be displayed if one customizes a diary variable while
 ;; just visiting the diary-file. This is i) unlikely, and ii) no great loss.
@@ -814,8 +814,8 @@ LIST-ONLY is non-nil, in which case it just returns the list."
                ;; diary-header-line-flag after diary has been displayed
                ;; take effect. Unconditionally calling (diary-mode)
                ;; clobbers file local variables.
-                ;; https://lists.gnu.org/archive/html/emacs-pretest-bug/2007-03/msg00363.html
+                ;; https://lists.gnu.org/r/emacs-pretest-bug/2007-03/msg00363.html
-                ;; https://lists.gnu.org/archive/html/emacs-pretest-bug/2007-04/msg00404.html
+                ;; https://lists.gnu.org/r/emacs-pretest-bug/2007-04/msg00404.html
                (if (eq major-mode 'diary-mode)
                    (setq header-line-format (and diary-header-line-flag
                                                  diary-header-line-format)))))
diff --git a/lisp/char-fold.el b/lisp/char-fold.el
index 18ce5bea4f6..b24363530f3 100644
--- a/lisp/char-fold.el
+++ b/lisp/char-fold.el
@@ -196,7 +196,7 @@ from which to start."
 ;;; If N suffixes match, we "branch" out into N+1 executions for the
 ;;; length of the longest match.  This means "fix" will match "ﬁx" but
 ;;; not "fⅸ", but it's necessary to keep the regexp size from scaling
-;;; exponentially.  See https://lists.gnu.org/archive/html/emacs-devel/2015-11/msg02562.html
+;;; exponentially.  See https://lists.gnu.org/r/emacs-devel/2015-11/msg02562.html
                       (let ((subs (substring string (1+ i) (+ i 1 max-length))))
                         ;; `i' is still going to inc by 1 below.
                         (setq i (+ i max-length))
diff --git a/lisp/comint.el b/lisp/comint.el
index 9bbb362d9ce..aa7dab28f32 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -678,7 +678,7 @@ Entry to this mode runs the hooks on `comint-mode-hook'."
  ;; comint-scroll-show-maximum-output is nil, and no-one can remember
  ;; what the original problem was.  If there are problems with point
  ;; not going to the end, consider re-enabling this.
-  ;; https://lists.gnu.org/archive/html/emacs-devel/2007-08/msg00827.html
+  ;; https://lists.gnu.org/r/emacs-devel/2007-08/msg00827.html
  ;;
  ;; This makes it really work to keep point at the bottom.
  ;; (make-local-variable 'scroll-conservatively)
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index a87783850a3..efdadffa077 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -2799,7 +2799,7 @@ If STATE is nil, the value is computed by `custom-variable-state'."
    ;; init-file-user rather than user-init-file.  This is in case
    ;; cus-edit is loaded by something in site-start.el, because
    ;; user-init-file is not set at that stage.
-    ;; https://lists.gnu.org/archive/html/emacs-devel/2007-10/msg00310.html
+    ;; https://lists.gnu.org/r/emacs-devel/2007-10/msg00310.html
    ,@(when (or custom-file init-file-user)
        '(("Save for Future Sessions" custom-variable-save
           (lambda (widget)
diff --git a/lisp/dnd.el b/lisp/dnd.el
index a0c91b13742..c5ee8975ac6 100644
--- a/lisp/dnd.el
+++ b/lisp/dnd.el
@@ -144,7 +144,7 @@ Return nil if URI is not a local file."
       str))
   uri t t))
-;; https://lists.gnu.org/archive/html/emacs-devel/2006-05/msg01060.html
+;; https://lists.gnu.org/r/emacs-devel/2006-05/msg01060.html
 (defun dnd-get-local-file-name (uri &optional must-exist)
  "Return file name converted from file:/// or file: syntax.
 URI is the uri for the file.  If MUST-EXIST is given and non-nil,
diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el
index c54828e7b43..6952ef4cf49 100644
--- a/lisp/emacs-lisp/lisp.el
+++ b/lisp/emacs-lisp/lisp.el
@@ -402,7 +402,7 @@ is called as a function to find the defun's beginning."
  "Return non-nil if the point is in an \"emptyish\" line.
 This means a line that consists entirely of comments and/or
 whitespace."
-;; See https://lists.gnu.org/archive/html/help-gnu-emacs/2016-08/msg00141.html
+;; See https://lists.gnu.org/r/help-gnu-emacs/2016-08/msg00141.html
  (save-excursion
    (forward-line 0)
    (< (line-end-position)
@@ -525,7 +525,7 @@ the one(s) already marked."
  (interactive "p")
  (setq arg (or arg 1))
  ;; There is no `mark-defun-back' function - see
-  ;; https://lists.gnu.org/archive/html/bug-gnu-emacs/2016-11/msg00079.html
+  ;; https://lists.gnu.org/r/bug-gnu-emacs/2016-11/msg00079.html
  ;; for explanation
  (when (eq last-command 'mark-defun-back)
    (setq arg (- arg)))
@@ -574,7 +574,7 @@ the one(s) already marked."
                  (goto-char beg)
                  (unless (= arg -1)    ; beginning-of-defun behaves
                                        ; strange with zero arg - see
-                                        ; https://lists.gnu.org/archive/html/bug-gnu-emacs/2017-02/msg00196.html
+                                        ; https://lists.gnu.org/r/bug-gnu-emacs/2017-02/msg00196.html
                    (beginning-of-defun (1- (- arg))))
                  (push-mark end nil t))))))
  (skip-chars-backward "[:space:]\n")
diff --git a/lisp/emacs-lisp/subr-x.el b/lisp/emacs-lisp/subr-x.el
index 8ed29d8659d..9ff742c4331 100644
--- a/lisp/emacs-lisp/subr-x.el
+++ b/lisp/emacs-lisp/subr-x.el
@@ -28,7 +28,7 @@
 ;; in subr.el.
 ;; Do not document these functions in the lispref.
-;; https://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01006.html
+;; https://lists.gnu.org/r/emacs-devel/2014-01/msg01006.html
 ;; NB If you want to use this library, it's almost always correct to use:
 ;; (eval-when-compile (require 'subr-x))
diff --git a/lisp/epg.el b/lisp/epg.el
index fee6ad75119..35e58116494 100644
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -627,7 +627,7 @@ callback data (if any)."
    ;; Record modified time of gpg-agent socket to restore the Emacs
    ;; frame on text terminal in `epg-wait-for-completion'.
    ;; See
-    ;; <https://lists.gnu.org/archive/html/emacs-devel/2007-02/msg00755.html>
+    ;; <https://lists.gnu.org/r/emacs-devel/2007-02/msg00755.html>
    ;; for more details.
    (when (and agent-info (string-match "\\(.*\\):[0-9]+:[0-9]+" agent-info))
      (setq agent-file (match-string 1 agent-info)
diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el
index c486d2c51d1..e5c799ea167 100644
--- a/lisp/eshell/em-unix.el
+++ b/lisp/eshell/em-unix.el
@@ -961,7 +961,7 @@ Show wall-clock time elapsed during execution of COMMAND.")
     ;; after setting
     (throw 'eshell-replace-command
            (eshell-parse-command (car time-args)
-;;; https://lists.gnu.org/archive/html/bug-gnu-emacs/2007-08/msg00205.html
+;;; https://lists.gnu.org/r/bug-gnu-emacs/2007-08/msg00205.html
                                  (eshell-stringify-list
                                   (eshell-flatten-list (cdr time-args))))))))
diff --git a/lisp/faces.el b/lisp/faces.el
index a5f1d1dd328..d8ec454e626 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -2361,7 +2361,7 @@ If you set `term-file-prefix' to nil, this function does nothing."
 (defface variable-pitch
  '((((type w32))
     ;; This is a workaround for an issue discussed in
-     ;; https://lists.gnu.org/archive/html/emacs-devel/2016-04/msg00746.html.
+     ;; https://lists.gnu.org/r/emacs-devel/2016-04/msg00746.html.
     ;; We need (a) the splash screen not to pick up bold-italics variant of
     ;; the font, and (b) still be able to request bold/italic/larger size
     ;; variants in the likes of EWW.
diff --git a/lisp/ffap.el b/lisp/ffap.el
index 810afd5739b..a776668d109 100644
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -786,7 +786,7 @@ This uses `ffap-file-exists-string', which may try adding suffixes from
    ("\\`~/" . ffap-lcd)                ; |~/misc/ffap.el.Z|
    ;; This used to have a blank, but ffap-string-at-point doesn't
    ;; handle blanks.
-    ;; https://lists.gnu.org/archive/html/emacs-devel/2008-01/msg01058.html
+    ;; https://lists.gnu.org/r/emacs-devel/2008-01/msg01058.html
    ("\\`[Rr][Ff][Cc][-#]?\\([0-9]+\\)" ; no $
     . ffap-rfc)                        ; "100% RFC2100 compliant"
    (dired-mode . ffap-dired)           ; maybe in a subdirectory
diff --git a/lisp/finder.el b/lisp/finder.el
index ab37ed7fc24..1cebad7b546 100644
--- a/lisp/finder.el
+++ b/lisp/finder.el
@@ -129,7 +129,7 @@ Keywords and package names both should be symbols.")
 ;; Skip autogenerated files, because they will never contain anything
 ;; useful, and because in parallel builds of Emacs they may get
 ;; modified while we are trying to read them.
-;; https://lists.gnu.org/archive/html/emacs-pretest-bug/2007-01/msg00469.html
+;; https://lists.gnu.org/r/emacs-pretest-bug/2007-01/msg00469.html
 ;; ldefs-boot is not auto-generated, but has nothing useful.
 (defvar finder-no-scan-regexp "\\(^\\.#\\|\\(loaddefs\\|ldefs-boot\\|\
 cus-load\\|finder-inf\\|esh-groups\\|subdirs\\|leim-list\\)\\.el$\\)"
diff --git a/lisp/frame.el b/lisp/frame.el
index b6c066462b0..2e925325a9e 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1075,7 +1075,7 @@ is given and non-nil, the unwanted frames are iconified instead."
                 (when mini (setq parms (delq mini parms)))
                 ;; Leave name in iff it was set explicitly.
                 ;; This should fix the behavior reported in
-                 ;; https://lists.gnu.org/archive/html/emacs-devel/2007-08/msg01632.html
+                 ;; https://lists.gnu.org/r/emacs-devel/2007-08/msg01632.html
                 (when (and name (not explicit-name))
                   (setq parms (delq name parms)))
                 parms))
diff --git a/lisp/gnus/ChangeLog.3 b/lisp/gnus/ChangeLog.3
index 43681f6eb7d..2d030b61b99 100644
--- a/lisp/gnus/ChangeLog.3
+++ b/lisp/gnus/ChangeLog.3
@@ -3819,7 +3819,7 @@
 2012-02-15  Paul Eggert  <eggert@cs.ucla.edu>
        * shr.el (shr-rescale-image): Undo previous change; see
-        <https://lists.gnu.org/archive/html/emacs-devel/2012-02/msg00540.html>.
+        <https://lists.gnu.org/r/emacs-devel/2012-02/msg00540.html>.
 2012-02-13  Lars Ingebrigtsen  <larsi@gnus.org>
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 690311e36a5..d9f3427b95b 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -4095,7 +4095,7 @@ Instead, just auto-save the buffer and then bury it."
  "Bury this mail BUFFER."
  ;; Note that this is not quite the same as (bury-buffer buffer),
  ;; since bury-buffer does extra stuff with a nil argument.
-  ;; Eg https://lists.gnu.org/archive/html/emacs-devel/2014-01/msg00539.html
+  ;; Eg https://lists.gnu.org/r/emacs-devel/2014-01/msg00539.html
  (with-current-buffer buffer (bury-buffer))
  (if message-return-action
      (apply (car message-return-action) (cdr message-return-action))))
@@ -6679,7 +6679,7 @@ is a function used to switch to and display the mail buffer."
        ;; C-h f compose-mail says that headers should be specified as
        ;; (string . value); however all the rest of message expects
        ;; headers to be symbols, not strings (eg message-header-format-alist).
-        ;; https://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00337.html
+        ;; https://lists.gnu.org/r/emacs-devel/2011-01/msg00337.html
        ;; We need to convert any string input, eg from rmail-start-mail.
        (dolist (h other-headers other-headers)
          (if (stringp (car h)) (setcar h (intern (capitalize (car h)))))))
diff --git a/lisp/info.el b/lisp/info.el
index e2f9953f7c7..0a4f672b9f2 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -1347,7 +1347,7 @@ is non-nil)."
                       ;; Shouldn't really happen, but sometimes does,
                       ;; eg on Debian systems with buggy packages;
                       ;; so may as well try it.
-                       ;; https://lists.gnu.org/archive/html/emacs-devel/2012-03/msg00005.html
+                       ;; https://lists.gnu.org/r/emacs-devel/2012-03/msg00005.html
                       (progn (setq file (expand-file-name "dir.gz" truename))
                              (file-attributes file)))))
                (setq dirs-done
diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index f2c7bcb1f77..1bbbb174d49 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -2513,7 +2513,7 @@ package to describe."
      (setq buffer-read-only nil)
      ;; Without this, a keyboard layout with R2L characters might be
      ;; displayed reversed, right to left.  See the thread starting at
-      ;; https://lists.gnu.org/archive/html/emacs-devel/2012-03/msg00062.html
+      ;; https://lists.gnu.org/r/emacs-devel/2012-03/msg00062.html
      ;; for a description of one such situation.
      (setq bidi-paragraph-direction 'left-to-right)
      (insert "Input method: " (quail-name)
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index dc25e8005ce..92f39659360 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -179,7 +179,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 "https://lists.gnu.org/archive/html/bug-gnu-emacs/"))
+                   (browse-url "https://lists.gnu.org/r/bug-gnu-emacs/"))
         'follow-link t)
        (insert " mailing list\nand the GNU bug tracker at ")
        (insert-text-button
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 1a24d87addd..994570edcb2 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -278,7 +278,7 @@ Otherwise, look for `movemail' in the directories in
          ;; rmail-insert-inbox-text before r1.439 fell back to using
          ;; (expand-file-name "movemail" exec-directory) and just
          ;; assuming it would work.
-          ;; https://lists.gnu.org/archive/html/bug-gnu-emacs/2008-02/msg00087.html
+          ;; https://lists.gnu.org/r/bug-gnu-emacs/2008-02/msg00087.html
          (let ((progname (expand-file-name
                           (concat "movemail"
                                   (if (memq system-type '(ms-dos windows-nt))
@@ -534,7 +534,7 @@ still the current message in the Rmail buffer.")
 ;; It's not clear what it should do now, since there is nothing that
 ;; records when a message is shown for the first time (unseen is not
 ;; necessarily the same thing).
-;; See https://lists.gnu.org/archive/html/emacs-devel/2009-03/msg00013.html
+;; See https://lists.gnu.org/r/emacs-devel/2009-03/msg00013.html
 (defcustom rmail-message-filter nil
  "If non-nil, a filter function for new messages in RMAIL.
 Called with region narrowed to the message, including headers,
diff --git a/lisp/mail/supercite.el b/lisp/mail/supercite.el
index 0cb8a1791ff..4a424ece0b1 100644
--- a/lisp/mail/supercite.el
+++ b/lisp/mail/supercite.el
@@ -713,7 +713,7 @@ the list should be unique."
 ;; regi functions
-;; https://lists.gnu.org/archive/html/emacs-devel/2009-02/msg00691.html
+;; https://lists.gnu.org/r/emacs-devel/2009-02/msg00691.html
 ;; When rmail replies to a message with full headers visible, the "From "
 ;; line can be included.
 (defun sc-mail-check-from ()
diff --git a/lisp/net/rlogin.el b/lisp/net/rlogin.el
index 297aa0230c8..2843833a27a 100644
--- a/lisp/net/rlogin.el
+++ b/lisp/net/rlogin.el
@@ -38,7 +38,7 @@
 ;; FIXME?
 ;; Maybe this file should be obsolete.
-;; https://lists.gnu.org/archive/html/emacs-devel/2013-02/msg00517.html
+;; https://lists.gnu.org/r/emacs-devel/2013-02/msg00517.html
 ;; It only adds rlogin-directory-tracking-mode.  Is that useful?
 (require 'comint)
diff --git a/lisp/obsolete/complete.el b/lisp/obsolete/complete.el
index 40123ccacaf..1f154a4d2e9 100644
--- a/lisp/obsolete/complete.el
+++ b/lisp/obsolete/complete.el
@@ -924,7 +924,7 @@ or properties are considered."
                        (or (boundp sym) (fboundp sym)
                            (symbol-plist sym))))))
         (PC-not-minibuffer t))
-    ;; https://lists.gnu.org/archive/html/emacs-devel/2007-03/msg01211.html
+    ;; https://lists.gnu.org/r/emacs-devel/2007-03/msg01211.html
    ;;
    ;; This deals with cases like running PC-l-c-s on "M-: (n-f".
    ;; The first call to PC-l-c-s expands this to "(ne-f", and moves
diff --git a/lisp/org/ChangeLog.1 b/lisp/org/ChangeLog.1
index ee5f01479a8..b7cfd1e4aa1 100644
--- a/lisp/org/ChangeLog.1
+++ b/lisp/org/ChangeLog.1
@@ -11560,7 +11560,7 @@
        break after the last footnote definition.  This is an an implicit
        assumption made by the org-lparse.el library.  With this change,
        footnote definitions can reliably be exported with ODT backend.
-        See https://lists.gnu.org/archive/html/emacs-orgmode/2012-02/msg01013.html.
+        See https://lists.gnu.org/r/emacs-orgmode/2012-02/msg01013.html.
 2012-04-01  Eric Schulte  <eric.schulte@gmx.com>
@@ -13952,7 +13952,7 @@
        * org.el (org-mode): Force left-to-right paragraphs in Org
        buffers.  For a related discussions, see
-        https://lists.gnu.org/archive/html/emacs-devel/2011-09/msg00349.html.
+        https://lists.gnu.org/r/emacs-devel/2011-09/msg00349.html.
 2012-01-03  Nicolas Goaziou  <n.goaziou@gmail.com>
@@ -14933,7 +14933,7 @@
        * org.el (org-mode): Force left-to-right paragraphs in Org
        buffers.  For a related discussions, see
-        https://lists.gnu.org/archive/html/emacs-devel/2011-09/msg00349.html.
+        https://lists.gnu.org/r/emacs-devel/2011-09/msg00349.html.
 2011-09-17  Juanma Barranquero  <lekktu@gmail.com>
diff --git a/lisp/org/ox-odt.el b/lisp/org/ox-odt.el
index f00fd99fc3e..7355eaab6de 100644
--- a/lisp/org/ox-odt.el
+++ b/lisp/org/ox-odt.el
@@ -3890,7 +3890,7 @@ contextual information."
 ;; themselves and the list can be arbitrarily deep.
 ;;
 ;; Inspired by following thread:
-;; https://lists.gnu.org/archive/html/emacs-orgmode/2011-03/msg01101.html
+;; https://lists.gnu.org/r/emacs-orgmode/2011-03/msg01101.html
 ;; Translate lists to tables
diff --git a/lisp/pixel-scroll.el b/lisp/pixel-scroll.el
index 2213a0239db..9bfe5c91f57 100644
--- a/lisp/pixel-scroll.el
+++ b/lisp/pixel-scroll.el
@@ -261,7 +261,7 @@ unseen line above the first line, respectively, is provided."
     ;; obtain height by (line-pixel-height).  This is based on
     ;; expected response from display engine.  See following
     ;; discussion.
-     ;; https://lists.gnu.org/archive/html/emacs-devel/2017-10/msg00621.html
+     ;; https://lists.gnu.org/r/emacs-devel/2017-10/msg00621.html
     ((equal (count-lines (window-start) (point)) 1)
      (line-pixel-height))
     ;; No char of line is shown and the line is not at the top,
diff --git a/lisp/proced.el b/lisp/proced.el
index aec54b59211..b4bdbb05f0d 100644
--- a/lisp/proced.el
+++ b/lisp/proced.el
@@ -1804,7 +1804,7 @@ supported but discouraged.  It will be removed in a future version of Emacs."
  (let (failures)
    ;; Why not always use `signal-process'?  See
-    ;; https://lists.gnu.org/archive/html/emacs-devel/2008-03/msg02955.html
+    ;; https://lists.gnu.org/r/emacs-devel/2008-03/msg02955.html
    (if (functionp proced-signal-function)
        ;; use built-in `signal-process'
        (let ((signal (if (stringp signal)
diff --git a/lisp/progmodes/cc-menus.el b/lisp/progmodes/cc-menus.el
index 9339dcd83cc..7dae8297fd3 100644
--- a/lisp/progmodes/cc-menus.el
+++ b/lisp/progmodes/cc-menus.el
@@ -117,7 +117,7 @@ A sample value might look like: `\\(_P\\|_PROTO\\)'.")
     ,(concat
       "^\\<"                                 ; line MUST start with word char
       ;; \n added to prevent overflow in regexp matcher.
-       ;; https://lists.gnu.org/archive/html/emacs-pretest-bug/2007-02/msg00021.html
+       ;; https://lists.gnu.org/r/emacs-pretest-bug/2007-02/msg00021.html
       "[^()\n]*"                             ; no parentheses before
       "[^" c-alnum "_:<>~]"                  ; match any non-identifier char
       "\\([" c-alpha "_][" c-alnum "_:<>~]*\\)" ; match function name
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 0794830fcb8..4cce47e5d8c 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -1740,7 +1740,7 @@ Returns the compilation buffer created."
        (setq thisdir default-directory))
      (set-buffer-modified-p nil))
    ;; Pop up the compilation buffer.
-    ;; https://lists.gnu.org/archive/html/emacs-devel/2007-11/msg01638.html
+    ;; https://lists.gnu.org/r/emacs-devel/2007-11/msg01638.html
    (setq outwin (display-buffer outbuf '(nil (allow-no-window . t))))
    (with-current-buffer outbuf
      (let ((process-environment
@@ -2855,7 +2855,7 @@ TRUE-DIRNAME is the `file-truename' of DIRNAME, if given."
                 ;; The gethash used to not use spec-directory, but
                 ;; this leads to errors when files in different
                 ;; directories have the same name:
-                 ;; https://lists.gnu.org/archive/html/emacs-devel/2007-08/msg00463.html
+                 ;; https://lists.gnu.org/r/emacs-devel/2007-08/msg00463.html
                 (or (gethash (cons filename spec-directory) compilation-locs)
                     (puthash (cons filename spec-directory)
                              (compilation--make-file-struct
diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el
index 103b6ce7c51..dc6bba44f32 100644
--- a/lisp/progmodes/octave.el
+++ b/lisp/progmodes/octave.el
@@ -1497,7 +1497,7 @@ current buffer file unless called with a prefix arg \\[universal-argument]."
        (string (buffer-substring-no-properties beg end))
        line)
    (with-current-buffer inferior-octave-buffer
-      ;; https://lists.gnu.org/archive/html/emacs-devel/2013-10/msg00095.html
+      ;; https://lists.gnu.org/r/emacs-devel/2013-10/msg00095.html
      (compilation-forget-errors)
      (setq inferior-octave-output-list nil)
      (while (not (string-equal string ""))
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el
index a6e3ae54559..e2bd89ec46c 100644
--- a/lisp/progmodes/verilog-mode.el
+++ b/lisp/progmodes/verilog-mode.el
@@ -284,7 +284,7 @@ STRING should be given if the last search was by `string-match' on STRING."
 ;; This function is lifted directly from emacs's subr.el
 ;; so that it can be used by xemacs.
 ;; The idea for this was borrowed from org-mode via this link:
-;; https://lists.gnu.org/archive/html/emacs-orgmode/2009-12/msg00032.html
+;; https://lists.gnu.org/r/emacs-orgmode/2009-12/msg00032.html
 (eval-and-compile
  (cond
   ((fboundp 'looking-back)
diff --git a/lisp/ruler-mode.el b/lisp/ruler-mode.el
index 3d27858d0fe..1464801849d 100644
--- a/lisp/ruler-mode.el
+++ b/lisp/ruler-mode.el
@@ -712,7 +712,7 @@ Optional argument PROPS specifies other text properties to apply."
           ;; FIXME: `make-string' returns a unibyte string if it's ASCII-only,
           ;; which prevents further `aset' from inserting non-ASCII chars,
           ;; hence the need for `string-to-multibyte'.
-           ;; https://lists.gnu.org/archive/html/emacs-devel/2017-05/msg00841.html
+           ;; https://lists.gnu.org/r/emacs-devel/2017-05/msg00841.html
           (string-to-multibyte
            ;; Make the part of header-line corresponding to the
            ;; line-number display be blank, not filled with
diff --git a/lisp/simple.el b/lisp/simple.el
index d629fb66599..e51c9ac043c 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -8817,7 +8817,7 @@ If it does not exist, create and it switch it to `messages-buffer-mode'."
 ;; rms says this should be done by specifying symbols that define
 ;; versions together with bad values.  This is therefore not as
 ;; flexible as it could be.  See the thread:
-;; https://lists.gnu.org/archive/html/emacs-devel/2007-08/msg00300.html
+;; https://lists.gnu.org/r/emacs-devel/2007-08/msg00300.html
 (defconst bad-packages-alist
  ;; Not sure exactly which semantic versions have problems.
  ;; Definitely 2.0pre3, probably all 2.0pre's before this.
diff --git a/lisp/startup.el b/lisp/startup.el
index 4b538d130e7..a39c8f0fe76 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -513,7 +513,7 @@ It is the default value of the variable `top-level'."
        (let ((default-directory dir))
          (load (expand-file-name "subdirs.el") t t t))
        ;; Do not scan standard directories that won't contain a leim-list.el.
-        ;; https://lists.gnu.org/archive/html/emacs-devel/2009-10/msg00502.html
+        ;; https://lists.gnu.org/r/emacs-devel/2009-10/msg00502.html
        ;; (Except the preloaded one in lisp/leim.)
        (or (string-prefix-p lispdir dir)
            (let ((default-directory dir))
@@ -1371,7 +1371,7 @@ the `--debug-init' option to view a complete error backtrace."
  ;; trying to load gnus could load the wrong file.
  ;; OK, it would not matter if .emacs.d were at the end of load-path.
  ;; but for the sake of simplicity, we discourage it full-stop.
-  ;; Ref eg https://lists.gnu.org/archive/html/emacs-devel/2012-03/msg00056.html
+  ;; Ref eg https://lists.gnu.org/r/emacs-devel/2012-03/msg00056.html
  ;;
  ;; A bad element could come from user-emacs-file, the command line,
  ;; or EMACSLOADPATH, so we basically always have to check.
diff --git a/lisp/subr.el b/lisp/subr.el
index a955b8131d6..6db3b614d6d 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -577,7 +577,7 @@ one is kept."
          (setq tail (cdr tail))))))
  list)
-;; See https://lists.gnu.org/archive/html/emacs-devel/2013-05/msg00204.html
+;; See https://lists.gnu.org/r/emacs-devel/2013-05/msg00204.html
 (defun delete-consecutive-dups (list &optional circular)
  "Destructively remove `equal' consecutive duplicates from LIST.
 First and last elements are considered consecutive if CIRCULAR is
@@ -2430,7 +2430,7 @@ in milliseconds; this was useful when Emacs was built without
 floating point support."
  (declare (advertised-calling-convention (seconds &optional nodisp) "22.1"))
  ;; This used to be implemented in C until the following discussion:
-  ;; https://lists.gnu.org/archive/html/emacs-devel/2006-07/msg00401.html
+  ;; https://lists.gnu.org/r/emacs-devel/2006-07/msg00401.html
  ;; Then it was moved here using an implementation based on an idle timer,
  ;; which was then replaced by the use of read-event.
  (if (numberp nodisp)
@@ -2469,7 +2469,7 @@ floating point support."
                  (read-event nil t seconds))))
      (or (null read)
          (progn
-            ;; https://lists.gnu.org/archive/html/emacs-devel/2006-10/msg00394.html
+            ;; https://lists.gnu.org/r/emacs-devel/2006-10/msg00394.html
            ;; We want `read' appear in the next command's this-command-event
            ;; but not in the current one.
            ;; By pushing (cons t read), we indicate that `read' has not
@@ -3102,7 +3102,7 @@ Do nothing if FACE is nil."
       (put-text-property start end 'face face)))
 ;; This removes `mouse-face' properties in *Help* buffer buttons:
-;; https://lists.gnu.org/archive/html/emacs-devel/2002-04/msg00648.html
+;; https://lists.gnu.org/r/emacs-devel/2002-04/msg00648.html
 (defun yank-handle-category-property (category start end)
  "Apply property category CATEGORY's properties between START and END."
  (when category
@@ -4217,7 +4217,7 @@ Used from `delayed-warnings-hook' (which see)."
    (setq delayed-warnings-list (nreverse collapsed))))
 ;; At present this is only used for Emacs internals.
-;; Ref https://lists.gnu.org/archive/html/emacs-devel/2012-02/msg00085.html
+;; Ref https://lists.gnu.org/r/emacs-devel/2012-02/msg00085.html
 (defvar delayed-warnings-hook '(collapse-delayed-warnings
                                display-delayed-warnings)
  "Normal hook run to process and display delayed warnings.
@@ -5227,7 +5227,7 @@ or \"gnus-article-toto-\".")
 ;; The following statement ought to be in print.c, but `provide' can't
 ;; be used there.
-;; https://lists.gnu.org/archive/html/emacs-devel/2009-08/msg00236.html
+;; https://lists.gnu.org/r/emacs-devel/2009-08/msg00236.html
 (when (hash-table-p (car (read-from-string
                          (prin1-to-string (make-hash-table)))))
  (provide 'hashtable-print-readable))
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index b8d1a436909..e895d09bb4f 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -594,7 +594,7 @@ the last file dropped is selected."
 (declare-function tool-bar-mode "tool-bar" (&optional arg))
 ;; Based on a function by David Reitter <dreitter@inf.ed.ac.uk> ;
-;; see https://lists.gnu.org/archive/html/emacs-devel/2005-09/msg00681.html .
+;; see https://lists.gnu.org/r/emacs-devel/2005-09/msg00681.html .
 (defun ns-toggle-toolbar (&optional frame)
  "Switches the tool bar on and off in frame FRAME.
 If FRAME is nil, the change applies to the selected frame."
@@ -878,7 +878,7 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
  ;; Mac OS X Lion introduces PressAndHold, which is unsupported by this port.
  ;; See this thread for more details:
-  ;; https://lists.gnu.org/archive/html/emacs-devel/2011-06/msg00505.html
+  ;; https://lists.gnu.org/r/emacs-devel/2011-06/msg00505.html
  (ns-set-resource nil "ApplePressAndHoldEnabled" "NO")
  (x-apply-session-resources)
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 62200bf2cbd..e7b1e08b038 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -1287,7 +1287,7 @@ This returns an error if any Emacs frames are X frames."
  ;; During initialization, we defer sending size hints to the window
  ;; manager, because that can induce a race condition:
-  ;; https://lists.gnu.org/archive/html/emacs-devel/2008-10/msg00033.html
+  ;; https://lists.gnu.org/r/emacs-devel/2008-10/msg00033.html
  ;; Send the size hints once initialization is done.
  (add-hook 'after-init-hook 'x-wm-set-size-hint)
diff --git a/lisp/textmodes/nroff-mode.el b/lisp/textmodes/nroff-mode.el
index eb7068f3d03..82cb2d4dc05 100644
--- a/lisp/textmodes/nroff-mode.el
+++ b/lisp/textmodes/nroff-mode.el
@@ -195,7 +195,7 @@ Puts a full-stop before comments on a line by themselves."
                              9) 8)))))) ; add 9 to ensure at least two blanks
      (goto-char pt))))
-;; https://lists.gnu.org/archive/html/emacs-devel/2007-10/msg01869.html
+;; https://lists.gnu.org/r/emacs-devel/2007-10/msg01869.html
 (defun nroff-insert-comment-function ()
  "Function for `comment-insert-comment-function' in `nroff-mode'."
  (indent-to (nroff-comment-indent))
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index 10ee10243ad..5c585ea46ca 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -1792,7 +1792,7 @@ Mark is left at original location."
 ;; Note this does not handle things like mismatched brackets inside
 ;; begin/end blocks.
 ;; Needs to handle escaped parens for tex-validate-*.
-;; https://lists.gnu.org/archive/html/bug-gnu-emacs/2007-09/msg00038.html
+;; https://lists.gnu.org/r/bug-gnu-emacs/2007-09/msg00038.html
 ;; Does not handle escaped parens when latex-handle-escaped-parens is nil.
 (defun latex-forward-sexp-1 ()
  "Like (forward-sexp 1) but aware of multi-char elements and escaped parens."
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index 9d56ed256a2..df9627abdf0 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -432,7 +432,7 @@ and the face `diff-added' for added lines.")
  "If non-nil, empty lines are valid in unified diffs.
 Some versions of diff replace all-blank context lines in unified format with
 empty lines.  This makes the format less robust, but is tolerated.
-See https://lists.gnu.org/archive/html/emacs-devel/2007-11/msg01990.html")
+See https://lists.gnu.org/r/emacs-devel/2007-11/msg01990.html")
 (defconst diff-hunk-header-re
  (concat "^\\(?:" diff-hunk-header-re-unified ".*\\|\\*\\{15\\}.*\n\\*\\*\\* .+ \\*\\*\\*\\*\\|[0-9]+\\(,[0-9]+\\)?[acd][0-9]+\\(,[0-9]+\\)?\\)$"))
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index 34fea232feb..b988463de1e 100644
--- a/lisp/vc/smerge-mode.el
+++ b/lisp/vc/smerge-mode.el
@@ -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 https://lists.gnu.org/archive/html/emacs-devel/2007-11/msg00401.html
+                              ;; See https://lists.gnu.org/r/emacs-devel/2007-11/msg00401.html
                              "-awd" "-ad")
                          file1 file2))
          ;; Process diff's output.
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 060072ea54d..6b6f0f8d12c 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -978,7 +978,7 @@ This prompts for a branch to merge from."
             ;; FIXME
             ;; 1) the net result is to call git twice per file.
             ;; 2) v-g-c-f is documented to take a directory.
-             ;; https://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01126.html
+             ;; https://lists.gnu.org/r/emacs-devel/2014-01/msg01126.html
             (vc-git-conflicted-files buffer-file-name)
             (save-excursion
               (goto-char (point-min))
diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el
index 84ab10b14fe..4634e76088f 100644
--- a/lisp/vc/vc-rcs.el
+++ b/lisp/vc/vc-rcs.el
@@ -851,7 +851,7 @@ and CVS."
 ;; You might think that this should be distributed with RCS, but
 ;; apparently not.  CVS sometimes provides a version of it.
-;; https://lists.gnu.org/archive/html/emacs-devel/2014-05/msg00288.html
+;; https://lists.gnu.org/r/emacs-devel/2014-05/msg00288.html
 (defvar vc-rcs-rcs2log-program
  (let (exe)
    (cond ((file-executable-p
diff --git a/lisp/view.el b/lisp/view.el
index 8e40cffce2e..6a4705acd6f 100644
--- a/lisp/view.el
+++ b/lisp/view.el
@@ -982,7 +982,7 @@ for highlighting the match that is found."
 ;; This is the dumb approach, looking at each line.  The original
 ;; version of this function looked like it might have been trying to
 ;; do something clever, but not succeeding:
-;; https://lists.gnu.org/archive/html/bug-gnu-emacs/2007-09/msg00073.html
+;; https://lists.gnu.org/r/bug-gnu-emacs/2007-09/msg00073.html
 (defun view-search-no-match-lines (times regexp)
  "Search for the TIMESth occurrence of a line with no match for REGEXP.
 If such a line is found, return non-nil and set the match-data to that line.
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index dca06ca3595..4fa36edb9c6 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -832,7 +832,7 @@ button end points."
 ;; This alias exists only so that one can choose in doc-strings (e.g.
 ;; Custom-mode) which key-binding of widget-keymap one wants to refer to.
-;; https://lists.gnu.org/archive/html/emacs-devel/2008-11/msg00480.html
+;; https://lists.gnu.org/r/emacs-devel/2008-11/msg00480.html
 (define-obsolete-function-alias 'advertised-widget-backward
  'widget-backward "23.2")
diff --git a/lisp/windmove.el b/lisp/windmove.el
index b573000fd7b..f8de303fffb 100644
--- a/lisp/windmove.el
+++ b/lisp/windmove.el
@@ -425,7 +425,7 @@ supplied, if ARG is greater or smaller than zero, respectively."
         top-left
         ;; Don't care whether window is horizontally scrolled -
         ;; `posn-at-point' handles that already.  See also:
-         ;; https://lists.gnu.org/archive/html/emacs-devel/2012-01/msg00638.html
+         ;; https://lists.gnu.org/r/emacs-devel/2012-01/msg00638.html
         (posn-col-row
          (posn-at-point (window-point window) window))))))))
diff --git a/msdos/autogen/config.in b/msdos/autogen/config.in
index 82af9550332..6e219e760ba 100644
--- a/msdos/autogen/config.in
+++ b/msdos/autogen/config.in
@@ -146,7 +146,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
   #if !defined _FORTIFY_SOURCE && defined __OPTIMIZE__ && __OPTIMIZE__
   # define _FORTIFY_SOURCE 2
   #endif
-  
 /* Define to 1 if futimesat mishandles a NULL file name. */
 #undef FUTIMESAT_NULL_BUG
@@ -1659,7 +1659,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Please see the Gnulib manual for how to use these macros.
   Suppress extern inline with HP-UX cc, as it appears to be broken; see
-   <http://lists.gnu.org/archive/html/bug-texinfo/2013-02/msg00030.html>.
+   <https://lists.gnu.org/r/bug-texinfo/2013-02/msg00030.html>.
   Suppress extern inline with Sun C in standards-conformance mode, as it
   mishandles inline functions that call each other.  E.g., for 'inline void f
@@ -1669,7 +1669,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
   Suppress the use of extern inline on problematic Apple configurations, as
   Libc at least through Libc-825.26 (2013-04-09) mishandles it; see, e.g.,
-   <http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html>.
+   <https://lists.gnu.org/r/bug-gnulib/2012-12/msg00023.html>.
   Perhaps Apple will fix this some day.  */
 #if (defined __APPLE__ \
     && ((! defined _DONT_USE_CTYPE_INLINE_ \
@@ -1827,4 +1827,3 @@ Local Variables:
 mode: c
 End:
 */
diff --git a/nt/ChangeLog.1 b/nt/ChangeLog.1
index 7502156b1ff..f2d44033d43 100644
--- a/nt/ChangeLog.1
+++ b/nt/ChangeLog.1
@@ -297,8 +297,8 @@
        to avoid gnulib replacement of 'struct timeval' and the resulting
        compilation of lib/gettimeofday.c with incompatible version of
        gettimeofday.  Related discussions on emacs-devel:
-        https://lists.gnu.org/archive/html/emacs-devel/2013-09/msg00286.html
+        https://lists.gnu.org/r/emacs-devel/2013-09/msg00286.html
-        https://lists.gnu.org/archive/html/emacs-devel/2013-09/msg00361.html
+        https://lists.gnu.org/r/emacs-devel/2013-09/msg00361.html
 2013-08-31  Glenn Morris  <rgm@gnu.org>
@@ -373,7 +373,7 @@
        * inc/sys/time.h (gettimeofday): Use '__restrict' instead of
        'restrict', which is a C99 extension.  See
-        https://lists.gnu.org/archive/html/emacs-devel/2013-05/msg00588.html
+        https://lists.gnu.org/r/emacs-devel/2013-05/msg00588.html
        and the following discussion for the problem this caused in the
        old nt/configure.bat build.
@@ -524,10 +524,10 @@
        Fix more incompatibilities between MinGW.org and MinGW64 headers
        reported by Óscar Fuentes in
-        https://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00733.html
+        https://lists.gnu.org/r/emacs-devel/2013-03/msg00733.html
-        https://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00699.html
+        https://lists.gnu.org/r/emacs-devel/2013-03/msg00699.html
        and in
-        https://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00707.html.
+        https://lists.gnu.org/r/emacs-devel/2013-03/msg00707.html.
        * inc/ms-w32.h (USE_NO_MINGW_SETJMP_TWO_ARGS) [_W64]: Define to 1.
        For MinGW64, include sys/types.h and time.h.
        (_WIN32_WINNT) [!_W64]: Don't define for MinGW64.
@@ -548,7 +548,7 @@
        Fix incompatibilities between MinGW.org and MinGW64 headers
        reported by Óscar Fuentes in
-        https://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00611.html.
+        https://lists.gnu.org/r/emacs-devel/2013-03/msg00611.html.
        * inc/ms-w32.h (struct timespec): Don't define if
        _TIMESPEC_DEFINED is already defined.
        (sigset_t) [!_POSIX]: Typedef for MinGW64.
@@ -724,7 +724,7 @@
 2012-11-21  Eli Zaretskii  <eliz@gnu.org>
        * nmake.defs: Use !if, not !ifdef.  For the details, see
-        https://lists.gnu.org/archive/html/help-emacs-windows/2012-11/msg00027.html
+        https://lists.gnu.org/r/help-emacs-windows/2012-11/msg00027.html
        * inc/stdint.h (INTPTR_MIN)
        (PTRDIFF_MIN) [!__GNUC__]: Define for MSVC.
@@ -1184,7 +1184,7 @@
        (dist): Depend on it.
        (install-shortcuts): Depend on install-addpm instead of copying
        addpm.exe as part of the recipe.  See
-        https://lists.gnu.org/archive/html/emacs-devel/2012-06/msg00171.html
+        https://lists.gnu.org/r/emacs-devel/2012-06/msg00171.html
        for the related problem and discussions.
 2012-06-11  Glenn Morris  <rgm@gnu.org>
diff --git a/oldXMenu/ChangeLog.1 b/oldXMenu/ChangeLog.1
index 2bc61ac4a85..3c6aae26945 100644
--- a/oldXMenu/ChangeLog.1
+++ b/oldXMenu/ChangeLog.1
@@ -67,7 +67,7 @@
        * XLookAssoc.c, XMenuInt.h: Include <config.h>.
        This avoids a build failure when configuring on Fedora 17
        --with-x-toolkit=no, reported by Dmitry Andropov in
-        <https://lists.gnu.org/archive/html/emacs-devel/2012-12/msg00078.html>.
+        <https://lists.gnu.org/r/emacs-devel/2012-12/msg00078.html>.
 2012-10-06  Ulrich Müller  <ulm@gentoo.org>
diff --git a/src/ChangeLog.11 b/src/ChangeLog.11
index b26e54cd53f..bf730d839c7 100644
--- a/src/ChangeLog.11
+++ b/src/ChangeLog.11
@@ -26,7 +26,7 @@
        current_column: Now returns EMACS_INT, fixing some iftc
        that was introduced in the 2002-06-02 change "temporarily"; see
-        <https://lists.gnu.org/archive/html/emacs-devel/2002-06/msg00039.html>.
+        <https://lists.gnu.org/r/emacs-devel/2002-06/msg00039.html>.
        * bytecode.c (Fbyte_code): Don't cast current_column () to int.
        * cmds.c (internal_self_insert): Likewise.
        * indent.c (Fcurrent_column): Likewise.
@@ -91,7 +91,7 @@
        * fileio.c (Fmake_symbolic_link): Treat ENOSYS specially, and
        generate a special message for it.  Suggested by Eli Zaretskii in
-        <https://lists.gnu.org/archive/html/emacs-devel/2011-02/msg00995.html>.
+        <https://lists.gnu.org/r/emacs-devel/2011-02/msg00995.html>.
        (Frename_file, Fmake_symbolic_link, Ffile_symlink_p):
        Simplify the code by assuming that the readlink and symlink calls
        exist, even if they always fail on this host.
@@ -154,7 +154,7 @@
        * dired.c (Ffile_attributes): Increase size of modes from 10 to 12
        as per recent filemodestring API change.  Reported by Jonas Öster in
-        <https://lists.gnu.org/archive/html/emacs-devel/2011-02/msg01069.html>.
+        <https://lists.gnu.org/r/emacs-devel/2011-02/msg01069.html>.
 2011-02-23  Ben Key  <bkey76@gmail.com>
@@ -7244,9 +7244,9 @@
        * xdisp.c (try_scrolling): Compute the limit for searching point
        in forward scroll from scroll_max, instead of an arbitrary limit
        of 10 screen lines.
-        See https://lists.gnu.org/archive/html/emacs-devel/2010-06/msg00766.html
+        See https://lists.gnu.org/r/emacs-devel/2010-06/msg00766.html
        and
-        https://lists.gnu.org/archive/html/emacs-devel/2010-06/msg00773.html
+        https://lists.gnu.org/r/emacs-devel/2010-06/msg00773.html
        for details.
 2010-06-16  Glenn Morris  <rgm@gnu.org>
@@ -7346,7 +7346,7 @@
        * window.c (Fselect_window): Move `record_buffer' up to the
        beginning of this function, so the buffer gets recorded
        even if the selected window does not change.
-        https://lists.gnu.org/archive/html/emacs-devel/2010-06/msg00137.html
+        https://lists.gnu.org/r/emacs-devel/2010-06/msg00137.html
 2010-06-07  Juanma Barranquero  <lekktu@gmail.com>
@@ -7688,7 +7688,7 @@
        * fileio.c (Fdelete_file): Change interactive spec to use
        `read-file-name' like in `find-file-read-args' where the default
        value is `default-directory' instead of `buffer-file-name'.
-        https://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00533.html
+        https://lists.gnu.org/r/emacs-devel/2010-05/msg00533.html
 2010-05-20  Kevin Ryde  <user42@zip.com.au>
@@ -7962,7 +7962,7 @@
        * xdisp.c (init_iterator): Don't turn on bidi reordering in
        unibyte buffers.  See
-        https://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00263.html.
+        https://lists.gnu.org/r/emacs-devel/2010-05/msg00263.html.
 2010-05-10  Glenn Morris  <rgm@gnu.org>
@@ -8910,9 +8910,9 @@
        * xdisp.c (display_line): Don't write beyond the last glyph row in
        the desired matrix.  Fixes a crash in "emacs -nw" (bug#5972), see
-        https://lists.gnu.org/archive/html/emacs-devel/2010-04/msg00075.html
+        https://lists.gnu.org/r/emacs-devel/2010-04/msg00075.html
        and
-        https://lists.gnu.org/archive/html/emacs-devel/2010-04/msg00213.html
+        https://lists.gnu.org/r/emacs-devel/2010-04/msg00213.html
 2010-04-18  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -11510,7 +11510,7 @@
        * frame.c (xrdb_get_resource): Return nil for empty string resources;
        some parts of Emacs code (like font selection) don't grok them.
-        See https://lists.gnu.org/archive/html/emacs-devel/2009-09/msg00528.html
+        See https://lists.gnu.org/r/emacs-devel/2009-09/msg00528.html
 2009-09-24  Andreas Schwab  <schwab@redhat.com>
diff --git a/src/ChangeLog.12 b/src/ChangeLog.12
index 2291e85e8cb..49ccd67e5b9 100644
--- a/src/ChangeLog.12
+++ b/src/ChangeLog.12
@@ -231,9 +231,9 @@
        Make it a stub in this case; otherwise the build might fail,
        and this code hasn't been tested on such hosts anyway.
        Problem reported by Nelson H. F. Beebe in
-        <https://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00021.html>
+        <https://lists.gnu.org/r/emacs-devel/2013-03/msg00021.html>
        and analyzed by Jérémie Courrèges-Anglas in
-        <https://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00062.html>.
+        <https://lists.gnu.org/r/emacs-devel/2013-03/msg00062.html>.
 2013-03-06  Dmitry Antipov  <dmantipov@yandex.ru>
@@ -332,7 +332,7 @@
        because the locking mechanism was never reliable in that case).
        This patch fixes this and other bugs discovered by a code
        inspection that was prompted by
-        <https://lists.gnu.org/archive/html/emacs-devel/2013-02/msg00531.html>.
+        <https://lists.gnu.org/r/emacs-devel/2013-02/msg00531.html>.
        Also, this patch switches to .#-FILE (not .#FILE) on MS-Windows,
        to avoid interoperability problems between the MS-Windows and
        non-MS-Windows implementations.  MS-Windows and non-MS-Windows
@@ -494,9 +494,9 @@
        Fix regression introduced by July 10 filelock.c patch.
        * filelock.c (fill_in_lock_file_name): Fix crash caused by the
        2012-07-10 patch to this file.  Reported by Eli Zaretskii in
-        <https://lists.gnu.org/archive/html/emacs-devel/2013-02/msg00533.html>
+        <https://lists.gnu.org/r/emacs-devel/2013-02/msg00533.html>
        and diagnosed by Andreas Schwab in
-        <https://lists.gnu.org/archive/html/emacs-devel/2013-02/msg00534.html>.
+        <https://lists.gnu.org/r/emacs-devel/2013-02/msg00534.html>.
 2013-02-22  Paul Eggert  <eggert@cs.ucla.edu>
@@ -678,7 +678,7 @@
        Improve AIX port some more (Bug#13650).
        With this, it should be as good as it was in 23.3, though it's
        still pretty bad: the dumped emacs does not run.  See Mark Fleishman in
-        https://lists.gnu.org/archive/html/help-gnu-emacs/2011-04/msg00287.html
+        https://lists.gnu.org/r/help-gnu-emacs/2011-04/msg00287.html
        * unexaix.c (start_of_text): Remove.
        (_data, _text): Declare as char[], not int, as AIX manual suggests.
        (bias, lnnoptr, text_scnptr, data_scnptr, load_scnptr)
@@ -1087,7 +1087,7 @@
 2013-01-28  Dmitry Antipov  <dmantipov@yandex.ru>
        Remove obsolete redisplay code.  See the discussion at
-        https://lists.gnu.org/archive/html/emacs-devel/2013-01/msg00576.html.
+        https://lists.gnu.org/r/emacs-devel/2013-01/msg00576.html.
        * dispnew.c (preemption_period, preemption_next_check): Remove.
        (Vredisplay_preemption_period): Likewise.
        (update_frame, update_single_window, update_window, update_frame_1):
@@ -1132,7 +1132,7 @@
        Drop async_visible and async_iconified fields of struct frame.
        This is possible because async input is gone; for details, see
-        https://lists.gnu.org/archive/html/emacs-devel/2012-12/msg00734.html.
+        https://lists.gnu.org/r/emacs-devel/2012-12/msg00734.html.
        * frame.h (struct frame): Remove async_visible and async_iconified
        members, convert garbaged to unsigned bitfield.  Adjust comments.
        (FRAME_SAMPLE_VISIBILITY): Remove.  Adjust all users.
@@ -1152,7 +1152,7 @@
 2013-01-24  Dmitry Antipov  <dmantipov@yandex.ru>
        * insdel.c (prepare_to_modify_buffer): Revert last change as suggested
-        in https://lists.gnu.org/archive/html/emacs-devel/2013-01/msg00555.html.
+        in https://lists.gnu.org/r/emacs-devel/2013-01/msg00555.html.
 2013-01-23  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -1255,7 +1255,7 @@
        * buffer.c (sort_overlays): Use SAFE_NALLOCA, to avoid segfault
        when there are lots of overlays.
-        See https://lists.gnu.org/archive/html/emacs-devel/2013-01/msg00421.html
+        See https://lists.gnu.org/r/emacs-devel/2013-01/msg00421.html
        for the details and a way to reproduce.
 2013-01-19  Paul Eggert  <eggert@cs.ucla.edu>
@@ -1276,7 +1276,7 @@
        Allow floating-point file offsets.
        Problem reported by Vitalie Spinu in
-        <https://lists.gnu.org/archive/html/emacs-devel/2013-01/msg00411.html>.
+        <https://lists.gnu.org/r/emacs-devel/2013-01/msg00411.html>.
        * fileio.c (emacs_lseek): Remove.
        (file_offset): New function.
        (Finsert_file_contents, Fwrite_region): Use it.
@@ -1314,7 +1314,7 @@
 2013-01-18  Dmitry Antipov  <dmantipov@yandex.ru>
        Fix crash when inserting data from non-regular files.
-        See https://lists.gnu.org/archive/html/emacs-devel/2013-01/msg00406.html
+        See https://lists.gnu.org/r/emacs-devel/2013-01/msg00406.html
        for the error description produced by valgrind.
        * fileio.c (read_non_regular): Rename to read_contents.
        Free Lisp_Save_Value object used to pass parameters.
@@ -1642,7 +1642,7 @@
        * w32.c (unsetenv): Set up the string passed to _putenv
        correctly.
-        See https://lists.gnu.org/archive/html/emacs-devel/2012-12/msg00863.html
+        See https://lists.gnu.org/r/emacs-devel/2012-12/msg00863.html
        for the bug this caused.
 2012-12-30  Paul Eggert  <eggert@cs.ucla.edu>
@@ -1757,7 +1757,7 @@
        * window.c (window_body_cols): Subtract display margins from the
        window body width on TTYs as well.  See
-        https://lists.gnu.org/archive/html/help-gnu-emacs/2012-12/msg00317.html
+        https://lists.gnu.org/r/help-gnu-emacs/2012-12/msg00317.html
        for the original report.
 2012-12-25  Dmitry Antipov  <dmantipov@yandex.ru>
@@ -1954,7 +1954,7 @@
        * sysdep.c (emacs_abort): Bump backtrace size to 40.
        Companion to the 2012-09-30 patch.  Suggested by Eli Zaretskii in
-        <https://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00796.html>.
+        <https://lists.gnu.org/r/emacs-devel/2012-09/msg00796.html>.
 2012-12-16  Romain Francoise  <romain@orebokech.com>
@@ -2787,7 +2787,7 @@
        * emacs.c (main): Set the G_SLICE environment variable for all
        Cygwin builds, not just GTK builds.  See
-        https://lists.gnu.org/archive/html/emacs-devel/2012-11/msg00368.html.
+        https://lists.gnu.org/r/emacs-devel/2012-11/msg00368.html.
 2012-11-21  Eli Zaretskii  <eliz@gnu.org>
@@ -2802,7 +2802,7 @@
        dostounix_filename.  Prevents crashes down the road, because
        dostounix_filename assumes it gets a unibyte string.
        Reported by Michel de Ruiter <michel@sentient.nl>, see
-        https://lists.gnu.org/archive/html/help-emacs-windows/2012-11/msg00017.html
+        https://lists.gnu.org/r/help-emacs-windows/2012-11/msg00017.html
 2012-11-20  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -2983,7 +2983,7 @@
        * eval.c (mark_backtrace) [BYTE_MARK_STACK]: Remove stray '*'.
        This follows up on the 2012-09-29 patch that removed indirection
        for the 'function' field.  Reported by Sergey Vinokurov in
-        <https://lists.gnu.org/archive/html/emacs-devel/2012-11/msg00263.html>.
+        <https://lists.gnu.org/r/emacs-devel/2012-11/msg00263.html>.
 2012-11-14  Eli Zaretskii  <eliz@gnu.org>
@@ -3192,7 +3192,7 @@
        * alloc.c (struct Lisp_Vectorlike_Free): Special type to represent
        vectorlike object on the free list.  This is introduced to avoid
        some (but not all) pointer casting and aliasing problems, see
-        https://lists.gnu.org/archive/html/emacs-devel/2012-11/msg00105.html.
+        https://lists.gnu.org/r/emacs-devel/2012-11/msg00105.html.
        * .gdbinit (pvectype, pvecsize): New commands to examine vectorlike
        objects.
        (xvectype, xvecsize): Use them to examine Lisp_Object values.
@@ -3368,7 +3368,7 @@
        * window.c (Fwindow_combination_limit): Revert to the only
        required argument and adjust docstring as suggested in
-        https://lists.gnu.org/archive/html/emacs-diffs/2012-11/msg01082.html
+        https://lists.gnu.org/r/emacs-diffs/2012-11/msg01082.html
        by Martin Rudalics <rudalics@gmx.at>.
 2012-11-06  Dmitry Antipov  <dmantipov@yandex.ru>
@@ -3568,7 +3568,7 @@
        * window.c (decode_next_window_args): Update window arg after
        calling decode_live_window and so fix crash reported at
-        https://lists.gnu.org/archive/html/emacs-devel/2012-11/msg00035.html
+        https://lists.gnu.org/r/emacs-devel/2012-11/msg00035.html
        by Juanma Barranquero <lekktu@gmail.com>.
        (Fwindow_body_width, Fwindow_body_height): Simplify a bit.
        * font.c (Ffont_at): Likewise.
@@ -3789,7 +3789,7 @@
 2012-10-19  Eli Zaretskii  <eliz@gnu.org>
        * puresize.h (BASE_PURESIZE): Bump the base value to 1700000.
-        See https://lists.gnu.org/archive/html/emacs-devel/2012-10/msg00593.html
+        See https://lists.gnu.org/r/emacs-devel/2012-10/msg00593.html
        for the reasons.
        * alloc.c (NSTATICS): Decrease to 0x800.
@@ -4603,7 +4603,7 @@
        * xdisp.c (syms_of_xdisp): Default message-log-max to 1000, not 100.
        Suggested by Juri Linkov in
-        <https://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00821.html>.
+        <https://lists.gnu.org/r/emacs-devel/2012-09/msg00821.html>.
        Prefer plain 'static' to 'static inline' (Bug#12541).
        With static functions, modern compilers inline pretty well by
@@ -4884,7 +4884,7 @@
        * syssignal.h (PROFILER_CPU_SUPPORT): Don't define if PROFILING.
        Suggested by Eli Zaretskii in
-        <https://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00811.html>.
+        <https://lists.gnu.org/r/emacs-devel/2012-09/msg00811.html>.
 2012-09-30  Eli Zaretskii  <eliz@gnu.org>
@@ -4929,7 +4929,7 @@
        * sysdep.c (handle_fatal_signal): Bump backtrace size to 40.
        Suggested by Eli Zaretskii in
-        <https://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00796.html>.
+        <https://lists.gnu.org/r/emacs-devel/2012-09/msg00796.html>.
 2012-09-29  Juanma Barranquero  <lekktu@gmail.com>
@@ -5079,7 +5079,7 @@
        * character.c (char_string, string_char): Remove calls to
        MAYBE_UNIFY_CHAR.  See the discussion starting at
-        https://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00433.html
+        https://lists.gnu.org/r/emacs-devel/2012-09/msg00433.html
        for the details.
 2012-09-25  Chong Yidong  <cyd@gnu.org>
@@ -5140,7 +5140,7 @@
        (interruptible_wait_for_termination):
        Move these decls from lisp.h to syswait.h, since they use pid_t.
        Needed on FreeBSD; see Herbert J. Skuhra in
-        <https://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00571.html>.
+        <https://lists.gnu.org/r/emacs-devel/2012-09/msg00571.html>.
        * callproc.c: Include syswait.h.
        gnutls.c, gtkutil.c: Use bool for boolean.
@@ -5205,7 +5205,7 @@
        Do not use SA_NODEFER.
        Problem reported by Dani Moncayo in
-        <https://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00557.html>.
+        <https://lists.gnu.org/r/emacs-devel/2012-09/msg00557.html>.
        * alloc.c (die):
        * sysdep.c (emacs_abort): Do not reset signal handler.
        * emacs.c (terminate_due_to_signal): Reset signal handler here.
@@ -5385,7 +5385,7 @@
        * .gdbinit: Just stop at fatal_error_backtrace.
        See Stefan Monnier's request in
-        <https://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00549.html>.
+        <https://lists.gnu.org/r/emacs-devel/2012-09/msg00549.html>.
        Remove no-longer-used query of system type.
 2012-09-22  Chong Yidong  <cyd@gnu.org>
@@ -5743,7 +5743,7 @@
        Better workaround for GNOME bug when --enable-gcc-warnings.
        * emacsgtkfixed.c (G_STATIC_ASSERT): Remove, undoing last change.
        Instead, disable -Wunused-local-typedefs.  See Dmitry Antipov in
-        <https://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00335.html>.
+        <https://lists.gnu.org/r/emacs-devel/2012-09/msg00335.html>.
        Simplify SIGIO usage (Bug#12408).
        The code that dealt with SIGIO was crufty and confusing, e.g., it
@@ -6860,7 +6860,7 @@
        It was meant to be temporary and it often doesn't work,
        because when IDX has side effects the behavior of IDX==IDX
        is undefined.  See Stefan Monnier in
-        <https://lists.gnu.org/archive/html/emacs-devel/2012-08/msg00762.html>.
+        <https://lists.gnu.org/r/emacs-devel/2012-08/msg00762.html>.
 2012-08-26  Barry O'Reilly  <gundaetiapo@gmail.com>
@@ -7314,7 +7314,7 @@
        (set_char_table_contents): Rename from char_table_set_contents.
        (set_sub_char_table_contents): Rename from sub_char_table_set_contents.
        All uses changed.  See the end of
-        <https://lists.gnu.org/archive/html/emacs-devel/2012-08/msg00549.html>.
+        <https://lists.gnu.org/r/emacs-devel/2012-08/msg00549.html>.
        * lisp.h (CSET): Remove (Bug#12215).
        (set_char_table_ascii, set_char_table_defalt, set_char_table_parent)
@@ -8170,7 +8170,7 @@
        Use "ASET (a, i, v)" rather than "AREF (a, i) = v".
        This how ASET and AREF are supposed to work, and makes
        it easier to think about future improvements.  See
-        <https://lists.gnu.org/archive/html/emacs-devel/2012-08/msg00026.html>.
+        <https://lists.gnu.org/r/emacs-devel/2012-08/msg00026.html>.
        * charset.h (set_charset_attr): New function.
        All lvalue-style uses of CHARSET_DECODER etc. changed to use it.
        * lisp.h (ASET): Rewrite so as not to use AREF in an lvalue style.
@@ -8794,7 +8794,7 @@
        Swap buffer text indirection counters in Fbuffer_swap_text.
        * buffer.c (Fbuffer_swap_text): Swap indirections too.
        This avoids crash reported by Christoph Scholtes at
-        https://lists.gnu.org/archive/html/bug-gnu-emacs/2012-07/msg00785.html.
+        https://lists.gnu.org/r/bug-gnu-emacs/2012-07/msg00785.html.
 2012-07-22  Jan Djärv  <jan.h.d@swipnet.se>
@@ -8830,7 +8830,7 @@
        * keyboard.c (keys_of_keyboard): Bind language-change to 'ignore'
        in special-event-map.  See the discussion at
-        https://lists.gnu.org/archive/html/emacs-devel/2012-06/msg00417.html
+        https://lists.gnu.org/r/emacs-devel/2012-06/msg00417.html
        for the reasons.
        * w32menu.c (add_menu_item): Cast to ULONG_PTR when assigning
@@ -8924,7 +8924,7 @@
        Tweak the value returned from Fgarbage_collect again.
        * alloc.c (Fgarbage_collect): New return value, as confirmed in
-        https://lists.gnu.org/archive/html/emacs-devel/2012-07/msg00418.html.
+        https://lists.gnu.org/r/emacs-devel/2012-07/msg00418.html.
        Adjust documentation.
        (total_vector_bytes): Rename to total_vector_slots, adjust
        accounting.
@@ -8962,7 +8962,7 @@
        * intervals.c (merge_interval_right, merge_interval_left):
        Do not zero out this interval if it is absorbed by its children,
        as this interval's total length doesn't change in that case.  See
-        <https://lists.gnu.org/archive/html/emacs-devel/2012-07/msg00403.html>.
+        <https://lists.gnu.org/r/emacs-devel/2012-07/msg00403.html>.
 2012-07-18  Paul Eggert  <eggert@cs.ucla.edu>
@@ -9009,7 +9009,7 @@
        Return more descriptive data from Fgarbage_collect.
        Suggested by Stefan Monnier in
-        https://lists.gnu.org/archive/html/emacs-devel/2012-07/msg00369.html.
+        https://lists.gnu.org/r/emacs-devel/2012-07/msg00369.html.
        * alloc.c (bounded_number): New function.
        (total_buffers, total_vectors): New variable.
        (total_string_size): Rename to total_string_bytes, adjust users.
@@ -9034,7 +9034,7 @@
        Restore old code in allocate_string_data to avoid Faset breakage.
        Reported by Julien Danjou <julien@danjou.info> in
-        https://lists.gnu.org/archive/html/emacs-devel/2012-07/msg00371.html.
+        https://lists.gnu.org/r/emacs-devel/2012-07/msg00371.html.
        * alloc.c (allocate_string_data): Restore old code with minor
        adjustments, fix comment to explain this subtle issue.
@@ -9392,7 +9392,7 @@
        Fix typos that broke OS X build.
        Reported by Randal L. Schwartz in
-        <https://lists.gnu.org/archive/html/emacs-devel/2012-07/msg00225.html>.
+        <https://lists.gnu.org/r/emacs-devel/2012-07/msg00225.html>.
        * nsterm.m (ns_timeout): Add missing local decl.
        (ns_get_color): snprintf -> sprintf, to fix typo.
@@ -10115,18 +10115,18 @@
        * fileio.c (time_error_value): Check the right error number.
        Problem reported by Troels Nielsen in
-        <https://lists.gnu.org/archive/html/emacs-devel/2012-07/msg00095.html>.
+        <https://lists.gnu.org/r/emacs-devel/2012-07/msg00095.html>.
 2012-07-04  Paul Eggert  <eggert@cs.ucla.edu>
        * window.c (set_window_hscroll): Revert the 100000 hscroll limit.
        This should be fixed in a better way; see Eli Zaretskii in
-        <https://lists.gnu.org/archive/html/emacs-devel/2012-07/msg00088.html>.
+        <https://lists.gnu.org/r/emacs-devel/2012-07/msg00088.html>.
        (HSCROLL_MAX): Remove; this is now internal to set_window_hscroll.
        * fileio.c (time_error_value): Rename from special_mtime.
        The old name's problems were noted by Eli Zaretskii in
-        <https://lists.gnu.org/archive/html/emacs-devel/2012-07/msg00087.html>.
+        <https://lists.gnu.org/r/emacs-devel/2012-07/msg00087.html>.
        * emacs.c (gdb_pvec_type): Change it back to enum pvec_type.
        This variable's comment says Emacs needs at least one GDB-visible
@@ -10995,7 +10995,7 @@
        * bytecode.c (METER_CODE) [BYTE_CODE_METER]: Don't assume
        !CHECK_LISP_OBJECT_TYPE && !USE_LSB_TAG.  Problem with
        CHECK_LISP_OBJECT_TYPE reported by Dmitry Antipov in
-        <https://lists.gnu.org/archive/html/emacs-devel/2012-06/msg00282.html>.
+        <https://lists.gnu.org/r/emacs-devel/2012-06/msg00282.html>.
        (METER_1, METER_2): Simplify.
 2012-06-18  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -11595,7 +11595,7 @@
        * bidi.c (bidi_mirror_char): Don't possibly truncate the integer
        before checking whether it's out of range.  Put the check inside
        eassert.  See
-        <https://lists.gnu.org/archive/html/emacs-devel/2012-05/msg00485.html>.
+        <https://lists.gnu.org/r/emacs-devel/2012-05/msg00485.html>.
 2012-05-27  Ken Brown  <kbrown@cornell.edu>
@@ -12700,7 +12700,7 @@
        Untag more efficiently if USE_LSB_TAG.
        This is based on a proposal by YAMAMOTO Mitsuharu in
-        <https://lists.gnu.org/archive/html/emacs-devel/2008-01/msg01876.html>.
+        <https://lists.gnu.org/r/emacs-devel/2008-01/msg01876.html>.
        For an admittedly artificial (nth 8000 longlist) benchmark on
        Fedora 15 x86-64, this yields a 25% CPU speedup.  Also, it shrinks
        Emacs's overall text size by 1%.
@@ -12726,7 +12726,7 @@
        stack for each reader_thread, instead of defaulting to 8MB
        determined by the linker.  This avoids failures in creating
        subprocesses on Windows 7, see the discussion in this thread:
-        https://lists.gnu.org/archive/html/emacs-devel/2012-03/msg00119.html.
+        https://lists.gnu.org/r/emacs-devel/2012-03/msg00119.html.
 2012-05-07  Jérémy Compostella  <jeremy.compostella@gmail.com>
@@ -13118,13 +13118,13 @@
        Remove one incorrect comment and fix another.
        Fix minor ralloc.c problems found by static checking.
-        See https://lists.gnu.org/archive/html/emacs-devel/2011-12/msg00720.html
+        See https://lists.gnu.org/r/emacs-devel/2011-12/msg00720.html
        * ralloc.c (ALIGNED, ROUND_TO_PAGE, HEAP_PTR_SIZE)
        (r_alloc_size_in_use, r_alloc_freeze, r_alloc_thaw): Remove; unused.
        (r_alloc_sbrk): Now static.
        Improve ralloc.c interface checking.
-        See https://lists.gnu.org/archive/html/emacs-devel/2011-12/msg00720.html
+        See https://lists.gnu.org/r/emacs-devel/2011-12/msg00720.html
        * buffer.c (ralloc_reset_variable, r_alloc, r_re_alloc)
        (r_alloc_free) [REL_ALLOC]: Move decls from here ...
        * lisp.h (r_alloc, r_alloc_free, r_re_alloc, r_alloc_reset_variable)
@@ -13539,7 +13539,7 @@
        Generalize fix for crash due to non-contiguous EMACS_INT (Bug#10780).
        Suggested by Stefan Monnier in
-        <https://lists.gnu.org/archive/html/emacs-devel/2012-02/msg00692.html>.
+        <https://lists.gnu.org/r/emacs-devel/2012-02/msg00692.html>.
        * alloc.c (widen_to_Lisp_Object): New static function.
        (mark_memory): Also mark Lisp_Objects by fetching pointer words
        and widening them to Lisp_Objects.  This would work even if
@@ -13619,7 +13619,7 @@
 2012-02-15  Paul Eggert  <eggert@cs.ucla.edu>
        * image.c (MAX_IMAGE_SIZE): Increase from 6.0 to 10.0; see
-        <https://lists.gnu.org/archive/html/emacs-devel/2012-02/msg00540.html>.
+        <https://lists.gnu.org/r/emacs-devel/2012-02/msg00540.html>.
 2012-02-15  Chong Yidong  <cyd@gnu.org>
@@ -14242,7 +14242,7 @@
        Remove GCPRO-related macros that exist only to avoid shadowing locals.
        * lisp.h (GCPRO1_VAR, GCPRO2_VAR, GCPRO3_VAR, GCPRO4_VAR, GCPRO5_VAR)
        (GCPRO6_VAR, UNGCPRO_VAR): Remove.  See
-        <https://lists.gnu.org/archive/html/emacs-diffs/2011-11/msg00265.html>.
+        <https://lists.gnu.org/r/emacs-diffs/2011-11/msg00265.html>.
        All uses changed to use GCPRO1 etc.
        (GCPRO1, GCPRO2, GCPRO3, GCPRO4, GCPRO5, GCPRO6, UNGCPRO):
        Revert to old implementation (i.e., before 2011-03-11).
@@ -14278,7 +14278,7 @@
 2011-11-26  Paul Eggert  <eggert@cs.ucla.edu>
        * fileio.c (Finsert_file_contents): Undo previous change; see
-        <https://lists.gnu.org/archive/html/emacs-diffs/2011-11/msg00265.html>.
+        <https://lists.gnu.org/r/emacs-diffs/2011-11/msg00265.html>.
 2011-11-26  Paul Eggert  <eggert@cs.ucla.edu>
@@ -14379,7 +14379,7 @@
        Standardize on VIRT_ADDR_VARIES behavior (Bug#10042).
        Otherwise, valgrind does not work on some platforms.
        Problem reported by Andreas Schwab in
-        <https://lists.gnu.org/archive/html/emacs-devel/2011-11/msg00081.html>.
+        <https://lists.gnu.org/r/emacs-devel/2011-11/msg00081.html>.
        * puresize.h (pure, PURE_P): Always behave as if VIRT_ADDR_VARIES
        is set, removing the need for VIRT_ADDRESS_VARIES.
        (PURE_P): Use a more-efficient implementation that needs just one
@@ -14545,7 +14545,7 @@
        Avoid some portability problems by eschewing 'extern inline' functions.
        The trivial performance wins aren't worth the portability hassles; see
-        <https://lists.gnu.org/archive/html/emacs-devel/2011-11/msg00084.html>
+        <https://lists.gnu.org/r/emacs-devel/2011-11/msg00084.html>
        et seq.
        * dispextern.h (window_box, window_box_height, window_text_bottom_y)
        (window_box_width, window_box_left, window_box_left_offset)
@@ -14625,7 +14625,7 @@
        (window_box_right, window_box_right_offset): Declare extern.
        Otherwise, these inline functions do not conform to C99 and
        are miscompiled by Microsoft compilers.  Reported by Eli Zaretskii in
-        <https://lists.gnu.org/archive/html/emacs-devel/2011-11/msg00084.html>.
+        <https://lists.gnu.org/r/emacs-devel/2011-11/msg00084.html>.
        * intervals.c (adjust_intervals_for_insertion)
        (adjust_intervals_for_deletion): Now extern, because otherwise the
        extern inline functions 'offset_intervals' couldn't refer to it.
@@ -14959,7 +14959,7 @@
        This doesn't change this function's behavior.
        (current-time-zone): Rewrite to use format_time_string.
        This fixes the bug reported by Michael Schierl in
-        <https://lists.gnu.org/archive/html/emacs-devel/2007-06/msg00334.html>.
+        <https://lists.gnu.org/r/emacs-devel/2007-06/msg00334.html>.
        Jason Rumney's 2007-06-07 change worked around this bug, but
        didn't fix it.
        * systime.h (tzname, timezone): Remove no-longer-used declarations.
@@ -15144,7 +15144,7 @@
        * charset.c (charset_table_init): New static var.
        (syms_of_charset): Use it instead of xmalloc.  This removes a
        dependency on glibc malloc internals.  See Eli Zaretskii's comment in
-        <https://lists.gnu.org/archive/html/emacs-devel/2011-09/msg00815.html>.
+        <https://lists.gnu.org/r/emacs-devel/2011-09/msg00815.html>.
        * lisp.h (XMALLOC_OVERRUN_CHECK_OVERHEAD, XMALLOC_OVERRUN_CHECK_SIZE):
        Move back to alloc.c.
        (XMALLOC_BASE_ALIGNMENT, COMMON_MULTIPLE, XMALLOC_HEADER_ALIGNMENT)
@@ -15763,7 +15763,7 @@
        (ccl_driver): Do not generate an out-of-range pointer.
        (Fccl_execute_on_string): Remove unnecessary check for
        integer overflow, noted by Stefan Monnier in
-        <https://lists.gnu.org/archive/html/emacs-devel/2011-08/msg00979.html>.
+        <https://lists.gnu.org/r/emacs-devel/2011-08/msg00979.html>.
        Remove a FIXME that didn't need fixing.
        Simplify the newly-introduced buffer reallocation code.
@@ -16990,7 +16990,7 @@
 2011-07-19  Paul Eggert  <eggert@cs.ucla.edu>
        Port to OpenBSD.
-        See https://lists.gnu.org/archive/html/emacs-devel/2011-07/msg00688.html
+        See https://lists.gnu.org/r/emacs-devel/2011-07/msg00688.html
        and the surrounding thread.
        * minibuf.c (read_minibuf_noninteractive): Rewrite to use getchar
        rather than fgets, and retry after EINTR.  Otherwise, 'emacs
@@ -19316,7 +19316,7 @@
 2011-05-31  Paul Eggert  <eggert@cs.ucla.edu>
        Use 'inline', not 'INLINE'.
-        <https://lists.gnu.org/archive/html/emacs-devel/2011-05/msg00914.html>
+        <https://lists.gnu.org/r/emacs-devel/2011-05/msg00914.html>
        * alloc.c, fontset.c (INLINE): Remove.
        * alloc.c, bidi.c, charset.c, coding.c, dispnew.c, fns.c, image.c:
        * intervals.c, keyboard.c, process.c, syntax.c, textprop.c, w32term.c:
@@ -19396,7 +19396,7 @@
        without this change, (md5 "truc") would evaluate to
        45723a2aff78ff4fff7fff1114760e62 rather than the expected
        45723a2af3788c4ff17f8d1114760e62.  Reported by Antoine Levitt in
-        https://lists.gnu.org/archive/html/emacs-devel/2011-05/msg00883.html.
+        https://lists.gnu.org/r/emacs-devel/2011-05/msg00883.html.
 2011-05-27  Paul Eggert  <eggert@cs.ucla.edu>
@@ -19620,7 +19620,7 @@
        * systime.h (Time): Define only if emacs is defined.
        This is to allow ../lib-src/profile.c to be compiled on FreeBSD,
        where the include path doesn't have X11/X.h by default.  See
-        <https://lists.gnu.org/archive/html/emacs-devel/2011-05/msg00561.html>.
+        <https://lists.gnu.org/r/emacs-devel/2011-05/msg00561.html>.
 2011-05-20  Kenichi Handa  <handa@m17n.org>
@@ -19885,7 +19885,7 @@
        * dbusbind.c: Do not use XPNTR on a value that may be an integer.
        Reported by Stefan Monnier in
-        <https://lists.gnu.org/archive/html/emacs-devel/2011-04/msg00919.html>.
+        <https://lists.gnu.org/r/emacs-devel/2011-04/msg00919.html>.
        (xd_remove_watch, Fdbus_init_bus, xd_read_queued_messages):
        Use SYMBOLP-guarded XSYMBOL, not XPNTR.
@@ -20276,7 +20276,7 @@
        * intervals.h (struct interval): Use EMACS_INT for members
        where EMACS_UINT might cause problems.  See
-        <https://lists.gnu.org/archive/html/emacs-devel/2011-04/msg00514.html>.
+        <https://lists.gnu.org/r/emacs-devel/2011-04/msg00514.html>.
        (CHECK_TOTAL_LENGTH): Remove cast to EMACS_INT; no longer needed.
        * intervals.c (interval_deletion_adjustment): Now returns EMACS_INT.
        All uses changed.
@@ -20741,7 +20741,7 @@
        * sysdep.c (emacs_read): Remove unnecessary check vs MAX_RW_COUNT.
        emacs_write: Accept and return EMACS_INT for sizes.
-        See https://lists.gnu.org/archive/html/emacs-devel/2011-04/msg00514.html
+        See https://lists.gnu.org/r/emacs-devel/2011-04/msg00514.html
        et seq.
        * gnutls.c, gnutls.h (emacs_gnutls_read, emacs_gnutls_write):
        Accept and return EMACS_INT.
@@ -20755,7 +20755,7 @@
        * process.c (send_process): Adjust to the new signatures of
        emacs_write and emacs_gnutls_write.  Do not attempt to store
        a byte offset into an 'int'; it might overflow.
-        See https://lists.gnu.org/archive/html/emacs-devel/2011-04/msg00483.html
+        See https://lists.gnu.org/r/emacs-devel/2011-04/msg00483.html
        * sound.c: Don't assume sizes fit in 'int'.
        (struct sound_device.period_size, alsa_period_size):
@@ -21225,7 +21225,7 @@
        * sysdep.c (emacs_read, emacs_write): Check for negative sizes
        since callers should never pass a negative size.
        Change the signature to match that of plain 'read' and 'write'; see
-        <https://lists.gnu.org/archive/html/emacs-devel/2011-04/msg00397.html>.
+        <https://lists.gnu.org/r/emacs-devel/2011-04/msg00397.html>.
        * lisp.h: Update prototypes of emacs_write and emacs_read.
 2011-04-11  Eli Zaretskii  <eliz@gnu.org>
@@ -22615,7 +22615,7 @@
        1152921504606846976) returns the obviously-bogus value (-948597
        62170) on my RHEL 5.5 x86-64 host.  With the patch, it correctly
        reports time overflow.  See
-        <https://lists.gnu.org/archive/html/emacs-devel/2011-03/msg00470.html>.
+        <https://lists.gnu.org/r/emacs-devel/2011-03/msg00470.html>.
        * deps.mk (editfns.o): Depend on ../lib/intprops.h.
        * editfns.c: Include limits.h and intprops.h.
        (TIME_T_MIN, TIME_T_MAX): New macros.
diff --git a/src/ChangeLog.13 b/src/ChangeLog.13
index 9f3fdee210a..cada2097245 100644
--- a/src/ChangeLog.13
+++ b/src/ChangeLog.13
@@ -67,7 +67,7 @@
        Assume !BROKEN_NON_BLOCKING_CONNECT
        From a suggestion by Eli Zaretskii in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-03/msg00824.html
+        https://lists.gnu.org/r/emacs-devel/2015-03/msg00824.html
        * process.c (NON_BLOCKING_CONNECT): Simplify by assuming that
        BROKEN_NON_BLOCKING_CONNECT is not defined.
        (SELECT_CAN_DO_WRITE_MASK): Remove, and assume it's now true.
@@ -77,12 +77,12 @@
        * lread.c (substitute_object_recurse): For sub-char-tables, start
        the recursive SUBSTITUTE loop from index of 2, to skip the
        non-Lisp members of the sub-char-table.  See the discussion at
-        https://lists.gnu.org/archive/html/emacs-devel/2015-03/msg00520.html
+        https://lists.gnu.org/r/emacs-devel/2015-03/msg00520.html
        for the details.
        Support non-blocking connect on MS-Windows.
        Based on ideas from Kim F. Storm <storm@cua.dk>, see
-        https://lists.gnu.org/archive/html/emacs-devel/2006-12/msg00873.html.
+        https://lists.gnu.org/r/emacs-devel/2006-12/msg00873.html.
        * w32proc.c (reader_thread): If the FILE_CONNECT flag is set, call
        '_sys_wait_connect'.  If it returns STATUS_CONNECT_FAILED, exit
@@ -1107,7 +1107,7 @@
        Isolate NIL_IS_ZERO-assuming code better
        Suggested by Stefan Monnier in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-01/msg00588.html
+        https://lists.gnu.org/r/emacs-devel/2015-01/msg00588.html
        * alloc.c (allocate_pseudovector):
        Use memclear, not memsetnil, to remove a 'verify'.
        * callint.c (Fcall_interactively):
@@ -1121,7 +1121,7 @@
        Undo port to hypothetical nonzero Qnil case
        This mostly undoes the previous change in this area.  See:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-01/msg00570.html
+        https://lists.gnu.org/r/emacs-devel/2015-01/msg00570.html
        * alloc.c (allocate_pseudovector):
        * callint.c (Fcall_interactively):
        * dispnew.c (realloc_glyph_pool):
@@ -1326,7 +1326,7 @@
        Don't say Fnext_read_file_uses_dialog_p is const
        It's const only if a windowing system is not used; don't say it's
        const otherwise.  See:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-01/msg00310.html
+        https://lists.gnu.org/r/emacs-devel/2015-01/msg00310.html
        * fileio.c (next_read_file_uses_dialog_p): Remove.
        Move guts back to ...
        (Fnext_read_file_uses_dialog_p): ... here.
@@ -1415,13 +1415,13 @@
        * fileio.c (next_read_file_uses_dialog_p): New workaround ...
        (Fnext_read_file_uses_dialog_p): ... called from here to avoid
        ATTRIBUTE_CONST dependency from #ifdefs.  For details, see
-        https://lists.gnu.org/archive/html/emacs-devel/2015-01/msg00289.html.
+        https://lists.gnu.org/r/emacs-devel/2015-01/msg00289.html.
 2015-01-12  Paul Eggert  <eggert@cs.ucla.edu>
        Port to 32-bit MingGW --with-wide-int
        Problem reported by Eli Zaretskii in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-01/msg00265.html
+        https://lists.gnu.org/r/emacs-devel/2015-01/msg00265.html
        * lisp.h (struct Lisp_Sub_Char_Table): Check that offset matches
        what we think it is, rather than checking only its alignment (and
        doing so incorrectly on MinGW).
@@ -1623,7 +1623,7 @@
        Port Qnil==0 XUNTAG to clang
        clang has undefined behavior if the program subtracts an integer
        from (char *) 0.  Problem reported by YAMAMOTO Mitsuharu in:
-        https://lists.gnu.org/archive/html/emacs-devel/2015-01/msg00132.html
+        https://lists.gnu.org/r/emacs-devel/2015-01/msg00132.html
        * lisp.h (lisp_h_XUNTAG) [USE_LSB_TAG]:
        (XUNTAG) [!USE_LSB_TAG]: Port to clang 3.5.0.
@@ -1842,7 +1842,7 @@
        Instead of using gnutls_global_set_mem_functions, check every call
        to a GnuTLS function that might return an indication of memory
        exhaustion.  Suggested by Dmitry Antipov in:
-        https://lists.gnu.org/archive/html/emacs-devel/2014-12/msg02056.html
+        https://lists.gnu.org/r/emacs-devel/2014-12/msg02056.html
        * gnutls.c (gnutls_global_set_mem_functions) [WINDOWSNT]: Remove.
        (init_gnutls_functions): Do not load gnutls_global_set_mem_functions.
        (fn_gnutls_global_set_mem_functions) [!WINDOWSNT]: Remove.
@@ -2369,7 +2369,7 @@
        Improve clarity of USE_LSB_TAG definition.
        Reported by Lee Duhem.  Suggested by Andreas Schwab in:
-        https://lists.gnu.org/archive/html/emacs-devel/2014-11/msg02222.html
+        https://lists.gnu.org/r/emacs-devel/2014-11/msg02222.html
        * lisp.h (USE_LSB_TAG): Define in terms of the (simpler)
        VAL_MAX / 2 rather than in terms of the (more complicated)
        EMACS_INT_MAX >> GCTYPEBITS, and adjust commentary to match.
@@ -3043,7 +3043,7 @@
        * xterm.c (x_draw_hollow_cursor): Fix display of hollow cursor on
        1-pixel R2L characters.
        Reported by Dmitry Antipov <dmantipov@yandex.ru>, see
-        https://lists.gnu.org/archive/html/emacs-devel/2014-10/msg00518.html.
+        https://lists.gnu.org/r/emacs-devel/2014-10/msg00518.html.
 2014-10-16  Eli Zaretskii  <eliz@gnu.org>
@@ -3284,7 +3284,7 @@
        <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63495>,
        and more generally should fix a portability problem in Emacs.
        Reported by Stefan Monnier in:
-        https://lists.gnu.org/archive/html/emacs-devel/2014-10/msg00261.html
+        https://lists.gnu.org/r/emacs-devel/2014-10/msg00261.html
 2014-10-08  Leo Liu  <sdl.web@gmail.com>
@@ -3475,7 +3475,7 @@
        (my_create_window): Move the calculation of the coordinates of the
        frame's top-left edge here.  Pass them to the input thread via the
        second parameter of the WM_EMACS_CREATEWINDOW message.
-        See https://lists.gnu.org/archive/html/emacs-devel/2014-09/msg00892.html
+        See https://lists.gnu.org/r/emacs-devel/2014-09/msg00892.html
        for the details.
 2014-09-30  Eli Zaretskii  <eliz@gnu.org>
@@ -3508,7 +3508,7 @@
        * alloc.c: Remove now-unnecessary check.
        Suggested by Dmitry Antipov in:
-        https://lists.gnu.org/archive/html/emacs-devel/2014-09/msg00891.html
+        https://lists.gnu.org/r/emacs-devel/2014-09/msg00891.html
        * xterm.c (x_term_init): Allocate temps on stack, not on heap.
@@ -3650,7 +3650,7 @@
        Fix local_cons etc. to not exhaust the stack when in a loop.
        Problem reported in:
-        https://lists.gnu.org/archive/html/emacs-devel/2014-09/msg00696.html
+        https://lists.gnu.org/r/emacs-devel/2014-09/msg00696.html
        * buffer.c (Fother_buffer, other_buffer_safely, init_buffer):
        * charset.c (load_charset_map_from_file, Ffind_charset_region)
        (Ffind_charset_string):
@@ -3800,7 +3800,7 @@
        Fix SAFE_ALLOCA to not exhaust the stack when in a loop.
        Reported by Dmitry Antipov in thread leading to:
-        https://lists.gnu.org/archive/html/emacs-devel/2014-09/msg00713.html
+        https://lists.gnu.org/r/emacs-devel/2014-09/msg00713.html
        This patch fixes only SAFE_ALLOCA, SAFE_NALLOCA, and SAFE_ALLOCA_LISP;
        the experimental local_* macros enabled by USE_LOCAL_ALLOCATORS
        remain unfixed.
@@ -4133,7 +4133,7 @@
        Simplify lisp.h by removing the __COUNTER__ business.
        Reported by Dmitry Antipov in:
-        https://lists.gnu.org/archive/html/emacs-devel/2014-09/msg00220.html
+        https://lists.gnu.org/r/emacs-devel/2014-09/msg00220.html
        * lisp.h (make_local_vector, make_local_string)
        (build_local_string): Simplify by not bothering with __COUNTER__.
        The __COUNTER__ business wasn't working properly, and was needed
@@ -4164,7 +4164,7 @@
        These can generate a constant with the correct value but the wrong
        width, which doesn't work as a printf argument.  All uses removed.
        Reported by Dmitry Antipov in:
-        https://lists.gnu.org/archive/html/emacs-devel/2014-09/msg00213.html
+        https://lists.gnu.org/r/emacs-devel/2014-09/msg00213.html
        (ENUMABLE): Remove; no longer needed.
        (ARRAY_MARK_FLAG_val, PSEUDOVECTOR_FLAG_val, VALMASK_val):
        Remove; no longer needed because of the above change.
@@ -4275,7 +4275,7 @@
        Use SAFE_ALLOCA etc. to avoid unbounded stack allocation (Bug#18410).
        This follows up on the recent thread in emacs-devel on alloca; see:
-        https://lists.gnu.org/archive/html/emacs-devel/2014-09/msg00042.html
+        https://lists.gnu.org/r/emacs-devel/2014-09/msg00042.html
        This patch also cleans up alloca-related glitches noted while
        examining the code looking for unbounded alloca.
        * alloc.c (listn):
@@ -4492,7 +4492,7 @@
        it's an unsigned data type).  This can happen in R2L hscrolled
        glyph rows, and caused us to draw the cursor glyph on the fringe.
        For the details, see
-        https://lists.gnu.org/archive/html/emacs-devel/2014-08/msg00543.html.
+        https://lists.gnu.org/r/emacs-devel/2014-08/msg00543.html.
 2014-08-31  Ken Brown  <kbrown@cornell.edu>
@@ -4654,7 +4654,7 @@
        immediately following the newline on the previous line.
        Avoids setting the ends_at_zv_p flag on screen lines that are not at or
        beyond ZV, which causes infloop in redisplay.  For the details, see
-        https://lists.gnu.org/archive/html/emacs-devel/2014-08/msg00368.html.
+        https://lists.gnu.org/r/emacs-devel/2014-08/msg00368.html.
        * dispnew.c (buffer_posn_from_coords): Fix mirroring of X
        coordinate for hscrolled R2L screen lines.  (Bug#18277)
@@ -4697,7 +4697,7 @@
        (init_sigsegv): Adjust accordingly.
        * keyboard.c (Vtop_level_message): Rename to
        Vinternal__top_level_message, as suggested by Stefan Monnier in
-        https://lists.gnu.org/archive/html/emacs-devel/2014-08/msg00493.html
+        https://lists.gnu.org/r/emacs-devel/2014-08/msg00493.html
        All related users changed.
 2014-08-26  Dmitry Antipov  <dmantipov@yandex.ru>
@@ -4854,7 +4854,7 @@
        (Fset_window_new_total, Fset_window_new_normal)
        (Fwindow_resize_apply): Fix doc-strings (see Bug#18112).
        See also:
-        https://lists.gnu.org/archive/html/bug-gnu-emacs/2014-08/msg00287.html
+        https://lists.gnu.org/r/bug-gnu-emacs/2014-08/msg00287.html
 2014-08-11  Eli Zaretskii  <eliz@gnu.org>
@@ -4943,7 +4943,7 @@
        * keyboard.c (safe_run_hooks): Follow the convenient style to bind
        inhibit-quit to t and pass 2 args to safe_run_hook_funcall.  See
-        <https://lists.gnu.org/archive/html/emacs-devel/2014-08/msg00077.html>.
+        <https://lists.gnu.org/r/emacs-devel/2014-08/msg00077.html>.
        (safe_run_hook_funcall): Adjust accordingly.
 2014-08-04  Martin Rudalics  <rudalics@gmx.at>
@@ -5027,7 +5027,7 @@
 2014-08-01  Eli Zaretskii  <eliz@gnu.org>
        Fix display of R2L lines when the last character fits only partially.
-        See https://lists.gnu.org/archive/html/emacs-devel/2014-07/msg00476.html
+        See https://lists.gnu.org/r/emacs-devel/2014-07/msg00476.html
        for the details.
        * xdisp.c (extend_face_to_end_of_line): If the last glyph of an
        R2L row is visible only partially, give the row a negative x
@@ -5090,7 +5090,7 @@
        * xrdb.c (x_load_resources) [USE_MOTIF]: Although not strictly
        necessary, put horizontal scroll bar resources as well.  See
-        <https://lists.gnu.org/archive/html/emacs-devel/2014-07/msg00430.html>.
+        <https://lists.gnu.org/r/emacs-devel/2014-07/msg00430.html>.
        * xterm.c (x_sync_with_move): Really wait 0.5s, not 0.0005s.
 2014-07-29  Dmitry Antipov  <dmantipov@yandex.ru>
@@ -5148,7 +5148,7 @@
        (adjust_frame_size): Always declare prototype.
        Fix Gnus-related issues reported by David Kastrup <dak@gnu.org> in
-        <https://lists.gnu.org/archive/html/emacs-devel/2014-07/msg00370.html>.
+        <https://lists.gnu.org/r/emacs-devel/2014-07/msg00370.html>.
        * atimer.c (timerfd_callback): Always read expiration data.
        Add comment.
        (turn_on_atimers) [HAVE_TIMERFD]: Disarm timerfd timer.
@@ -5597,7 +5597,7 @@
 2014-07-24  Dmitry Antipov  <dmantipov@yandex.ru>
        Fix error reported by Angelo Graziosi <angelo.graziosi@alice.it> in
-        <https://lists.gnu.org/archive/html/emacs-devel/2014-07/msg00274.html>
+        <https://lists.gnu.org/r/emacs-devel/2014-07/msg00274.html>
        and complete previous change.
        * frame.c (adjust_frame_height): New function.
        (Fset_frame_height, Fset_frame_size): Use it.
@@ -5607,7 +5607,7 @@
        * frame.c (Fset_frame_height): Take frame top margin into account.
        Incorrect behavior was reported by Martin Rudalics <rudalics@gmx.at> in
-        <https://lists.gnu.org/archive/html/emacs-devel/2014-07/msg00258.html>
+        <https://lists.gnu.org/r/emacs-devel/2014-07/msg00258.html>
 2014-07-22  Dmitry Antipov  <dmantipov@yandex.ru>
@@ -6223,7 +6223,7 @@
        * fns.c (validate_subarray): Add prototype.
        (Fcompare_substring): Use validate_subarray to check ranges.
        Adjust comment to mention that the semantics was changed.  Also see
-        https://lists.gnu.org/archive/html/emacs-devel/2014-06/msg00447.html.
+        https://lists.gnu.org/r/emacs-devel/2014-06/msg00447.html.
 2014-06-24  Paul Eggert  <eggert@cs.ucla.edu>
@@ -6320,7 +6320,7 @@
        Omit redundant extern decls.
        Most of this patch is from Dmitry Antipov, in:
-        https://lists.gnu.org/archive/html/emacs-devel/2014-06/msg00263.html
+        https://lists.gnu.org/r/emacs-devel/2014-06/msg00263.html
        * commands.h (update_mode_lines):
        * frame.h (Qbackground_color, Qforeground_color)
        (x_set_menu_bar_lines):
@@ -6372,7 +6372,7 @@
        * Makefile.in (ns-app): Fix typo that broke build on OS X.
        Reported by David Caldwell in:
-        https://lists.gnu.org/archive/html/emacs-devel/2014-06/msg00251.html
+        https://lists.gnu.org/r/emacs-devel/2014-06/msg00251.html
 2014-06-16  Dmitry Antipov  <dmantipov@yandex.ru>
@@ -6654,7 +6654,7 @@
        * emacs.c: Include "sysselect.h", to define its inline functions.
        Reported by Glenn Morris in:
-        https://lists.gnu.org/archive/html/emacs-devel/2014-06/msg00077.html
+        https://lists.gnu.org/r/emacs-devel/2014-06/msg00077.html
        Do not require libXt-devel when building with gtk.
        * gtkutil.h, menu.h: Include lwlib-widget.h, not lwlib-h, to avoid
@@ -7080,7 +7080,7 @@
        (Fgarbage_collect): Calculate the end address of the stack portion
        that needs to be examined by mark_stack, and pass that address to
        garbage_collect_1, which will pass it to mark_stack.
-        See https://lists.gnu.org/archive/html/emacs-devel/2014-05/msg00270.html
+        See https://lists.gnu.org/r/emacs-devel/2014-05/msg00270.html
        for more details about the underlying problems.  In particular,
        this avoids dumping Emacs with the large hash-table whose value is
        held in purify-flag for most of the time loadup.el runs.
@@ -7298,7 +7298,7 @@
        * term.c (tty_menu_display): Move the cursor to the active menu item.
        (tty_menu_activate): Return the cursor to the active menu item
        after displaying the menu and after displaying help-echo.
-        See https://lists.gnu.org/archive/html/emacs-devel/2014-04/msg00402.html
+        See https://lists.gnu.org/r/emacs-devel/2014-04/msg00402.html
        for the details of why this is needed by screen readers and
        Braille displays.
@@ -8628,7 +8628,7 @@
        * terminal.c (initial_free_frame_resources): New function.
        (init_initial_terminal): Install new hook to free face cache
        on initial frame and avoid memory leak.  For details, see
-        <https://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01974.html>.
+        <https://lists.gnu.org/r/emacs-devel/2014-01/msg01974.html>.
        * xfaces.c (free_frame_faces): Adjust comment.
 2014-01-26  Paul Eggert  <eggert@cs.ucla.edu>
@@ -8689,7 +8689,7 @@
        * xdisp.c (reseat_1, Fcurrent_bidi_paragraph_direction):
        Avoid undefined behavior by initializing display property bit of a
        string processed by the bidirectional iterator.  For details, see
-        <https://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01920.html>.
+        <https://lists.gnu.org/r/emacs-devel/2014-01/msg01920.html>.
 2014-01-23  Paul Eggert  <eggert@cs.ucla.edu>
@@ -8732,7 +8732,7 @@
        Avoid undefined behavior by initializing buffer redisplay bit.
        Reported by Dmitry Antipov in
-        <https://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01756.html>.
+        <https://lists.gnu.org/r/emacs-devel/2014-01/msg01756.html>.
        * buffer.c (Fget_buffer_create): Initialize redisplay bit.
        Revert some of the CANNOT_DUMP fix (Bug#16494).
@@ -8780,7 +8780,7 @@
        Fix MinGW64 porting problem with _setjmp.
        Reported by Eli Zaretskii in:
-        https://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01297.html
+        https://lists.gnu.org/r/emacs-devel/2014-01/msg01297.html
        * image.c (FAST_SETJMP, FAST_LONGJMP): New macros, replacing
        the old _setjmp and _longjmp.  All uses changed.
@@ -9756,7 +9756,7 @@
        * xterm.c (x_make_frame_visible): Restore hack which is needed when
        input polling is used.  This is still meaningful for Cygwin, see
-        https://lists.gnu.org/archive/html/emacs-devel/2013-12/msg00351.html.
+        https://lists.gnu.org/r/emacs-devel/2013-12/msg00351.html.
        * keyboard.c (poll_for_input_1, input_polling_used):
        Define unconditionally.
        * dispextern.h (FACE_SUITABLE_FOR_CHAR_P): Remove unused macro.
@@ -10573,7 +10573,7 @@
        Fix some dependency problems that cause unnecessary recompiles.
        Reported by RMS in
-        <https://lists.gnu.org/archive/html/emacs-devel/2013-11/msg00421.html>.
+        <https://lists.gnu.org/r/emacs-devel/2013-11/msg00421.html>.
        * Makefile.in (OLDXMENU_TARGET, OLDXMENU, OLDXMENU_DEPS)
        (really-lwlib, really-oldXMenu, stamp-oldxmenu)
        (../src/$(OLDXMENU), $(OLDXMENU)): Remove.
@@ -10584,7 +10584,7 @@
        Fix recently introduced bool vector overrun.
        This was due to an optimization that went awry.
        Reported by Glenn Morris in
-        <https://lists.gnu.org/archive/html/emacs-devel/2013-11/msg00622.html>.
+        <https://lists.gnu.org/r/emacs-devel/2013-11/msg00622.html>.
        * alloc.c (make_uninit_bool_vector): Don't allocate a dummy word
        for empty vectors, undoing the 2013-11-18 change.
        * data.c (bool_vector_binop_driver): Rely on this.
@@ -10635,7 +10635,7 @@
        Always allocate at least one bits_word per bool vector.
        See Daniel Colascione in:
-        https://lists.gnu.org/archive/html/emacs-devel/2013-11/msg00518.html
+        https://lists.gnu.org/r/emacs-devel/2013-11/msg00518.html
        * alloc.c (make_uninit_bool_vector): Always allocate at least one word.
        * data.c (bool_vector_binop_driver): Rely on this.  Tune.
        * lisp.h (struct Lisp_Bool_vector): Document this.
@@ -10672,7 +10672,7 @@
        * data.c: Work around bogus GCC diagnostic about shift count.
        Reported by Eli Zaretskii in
-        <https://lists.gnu.org/archive/html/emacs-devel/2013-11/msg00489.html>.
+        <https://lists.gnu.org/r/emacs-devel/2013-11/msg00489.html>.
        (pre_value): New function.
        (count_trailing_zero_bits): Use it.
@@ -11049,7 +11049,7 @@
        * buffer.c (init_buffer): Don't store default-directory of
        *scratch* in multibyte form.  The original problem which led to
        that is described in
-        https://lists.gnu.org/archive/html/emacs-pretest-bug/2004-11/msg00532.html,
+        https://lists.gnu.org/r/emacs-pretest-bug/2004-11/msg00532.html,
        but it was solved long ago.  (Bug#15260)
 2013-11-04  Paul Eggert  <eggert@cs.ucla.edu>
@@ -11293,7 +11293,7 @@
        the same font object.
        Perform font-specific cleanup when font object is swept by GC.  See
-        https://lists.gnu.org/archive/html/emacs-devel/2013-10/msg00740.html.
+        https://lists.gnu.org/r/emacs-devel/2013-10/msg00740.html.
        * alloc.c (cleanup_vector): New function.
        (sweep_vector): Call it for each reclaimed vector object.
        * font.h (struct font): Adjust comment.
@@ -11347,7 +11347,7 @@
        * keyboard.c (make_lispy_event): Remove GPM-specific code that
        handles mouse clicks.  Instead, let GPM use the same code as all
        the other mice use.  See the discussion starting at
-        https://lists.gnu.org/archive/html/emacs-devel/2013-10/msg00521.html
+        https://lists.gnu.org/r/emacs-devel/2013-10/msg00521.html
        for the details of the problem with the menu bar this fixes.
 2013-10-18  Dmitry Antipov  <dmantipov@yandex.ru>
@@ -11722,7 +11722,7 @@
        flavors of 'eassert', one for where 'assume' is far more likely
        to help or to hurt; but that can be done later.
        Reported by Dmitry Antipov in
-        <https://lists.gnu.org/archive/html/emacs-devel/2013-10/msg00276.html>.
+        <https://lists.gnu.org/r/emacs-devel/2013-10/msg00276.html>.
        Also, don't include <verify.h>; no longer needed.
 2013-10-09  Glenn Morris  <rgm@gnu.org>
@@ -11891,7 +11891,7 @@
        Do not allocate huge temporary memory areas and objects while encoding
        for file I/O, thus reducing an enormous memory usage for large buffers.
-        See https://lists.gnu.org/archive/html/emacs-devel/2013-10/msg00180.html.
+        See https://lists.gnu.org/r/emacs-devel/2013-10/msg00180.html.
        * coding.h (struct coding_system): New member raw_destination.
        * coding.c (setup_coding_system): Initialize it to zero.
        (encode_coding_object): If raw_destination is set, do not create
@@ -12132,14 +12132,14 @@
        * dispnew.c (clear_glyph_row, copy_row_except_pointers): Use enums
        instead of ints, as it's the usual style for offsetof constants.  See:
-        https://lists.gnu.org/archive/html/emacs-devel/2013-09/msg00478.html
+        https://lists.gnu.org/r/emacs-devel/2013-09/msg00478.html
        * data.c (POPCOUNT_STATIC_INLINE): New macro, as a hack for popcount.
        This is ugly, but it should fix the performance problem for older
        GCC versions in the short run.  I'll look into integrating the
        Gnulib module for popcount, as a better fix.
        See the thread starting in:
-        https://lists.gnu.org/archive/html/emacs-devel/2013-09/msg00474.html
+        https://lists.gnu.org/r/emacs-devel/2013-09/msg00474.html
        (popcount_size_t_generic) [NEED_GENERIC_POPCOUNT]:
        (popcount_size_t_msc) [USE_MSC_POPCOUNT]:
        (popcount_size_t_gcc) [USE_GCC_POPCOUNT]:
@@ -12331,7 +12331,7 @@
        which must have the same definition in all modules, because the
        defining code might be shared across modules, depending on the
        implementation.  Symptoms reported by Martin Rudalics in:
-        https://lists.gnu.org/archive/html/emacs-devel/2013-09/msg00414.html
+        https://lists.gnu.org/r/emacs-devel/2013-09/msg00414.html
        * regex.c, syntax.c (SYNTAX_ENTRY_VIA_PROPERTY): Remove.
        (SYNTAX, SYNTAX_ENTRY, SYNTAX_WITH_FLAGS): New macros,
        overriding the corresponding functions in syntax.h.
@@ -14498,7 +14498,7 @@
        * w32uniscribe.c (uniscribe_list, uniscribe_match)
        (uniscribe_list_family): Adjust to match font API change.
        MS-Windows breakage reported by Juanma Barranquero <lekktu@gmail.com>
-        at https://lists.gnu.org/archive/html/emacs-devel/2013-08/msg00006.html.
+        at https://lists.gnu.org/r/emacs-devel/2013-08/msg00006.html.
 2013-08-01  Dmitry Antipov  <dmantipov@yandex.ru>
@@ -14691,7 +14691,7 @@
        * eval.c (Fprogn): Do not check that BODY is a proper list.
        This undoes the previous change.  The check slows down the
        interpreter, and is not needed to prevent a crash.  See
-        <https://lists.gnu.org/archive/html/emacs-devel/2013-07/msg00693.html>.
+        <https://lists.gnu.org/r/emacs-devel/2013-07/msg00693.html>.
 2013-07-23  Glenn Morris  <rgm@gnu.org>
@@ -15206,7 +15206,7 @@
        * deps.mk (sysdep.o): Remove dependency on ../lib/ignore-value.h.
        Reported by Herbert J. Skuhra in
-        <https://lists.gnu.org/archive/html/emacs-devel/2013-07/msg00455.html>.
+        <https://lists.gnu.org/r/emacs-devel/2013-07/msg00455.html>.
        Don't lose top specpdl entry when memory is exhausted.
        * eval.c (grow_specpdl): Increment specpdl top by 1 and check for
@@ -15657,7 +15657,7 @@
        Try to fix FreeBSD bug re multithreaded memory allocation (Bug#14569).
        * emacs.c (main) [HAVE_PTHREAD && !SYSTEM_MALLOC && !DOUG_LEA_MALLOC]:
        Clear _malloc_thread_enabled_p at startup.  Reported by Ashish SHUKLA in
-        <https://lists.gnu.org/archive/html/emacs-devel/2013-07/msg00088.html>.
+        <https://lists.gnu.org/r/emacs-devel/2013-07/msg00088.html>.
 2013-07-02  Paul Eggert  <eggert@cs.ucla.edu>
@@ -16344,7 +16344,7 @@
        A few porting etc. fixes for the new file monitor code.
        See the thread containing
-        <https://lists.gnu.org/archive/html/emacs-devel/2013-06/msg00109.html>.
+        <https://lists.gnu.org/r/emacs-devel/2013-06/msg00109.html>.
        * gfilenotify.c (dir_monitor_callback, Fgfile_add_watch)
        (Fgfile_rm_watch): Don't assume EMACS_INT is the same width as a pointer.
        (dir_monitor_callback, Fgfile_rm_watch):
@@ -17194,7 +17194,7 @@
        more than one line when there's an overlay string with a display
        property at end of line.
        Reported by Karl Chen <Karl.Chen@quarl.org> in
-        https://lists.gnu.org/archive/html/emacs-devel/2013-04/msg00362.html.
+        https://lists.gnu.org/r/emacs-devel/2013-04/msg00362.html.
 2013-04-12  Stefan Monnier  <monnier@iro.umontreal.ca>
diff --git a/src/alloc.c b/src/alloc.c
index 88e24cfb736..27c5ee2fe42 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -5894,7 +5894,7 @@ mark_pinned_symbols (void)
   where mark_stack finds values that look like live Lisp objects on
   portions of stack that couldn't possibly contain such live objects.
   For more details of this, see the discussion at
-   https://lists.gnu.org/archive/html/emacs-devel/2014-05/msg00270.html.  */
+   https://lists.gnu.org/r/emacs-devel/2014-05/msg00270.html.  */
 static Lisp_Object
 garbage_collect_1 (void *end)
 {
diff --git a/src/atimer.c b/src/atimer.c
index 0a43797756c..f728f01fd98 100644
--- a/src/atimer.c
+++ b/src/atimer.c
@@ -419,7 +419,7 @@ timerfd_callback (int fd, void *arg)
  else if (nbytes < 0)
    /* For some not yet known reason, we may get weird event and no
       data on timer descriptor.  This can break Gnus at least, see:
-       https://lists.gnu.org/archive/html/emacs-devel/2014-07/msg00503.html.  */
+       https://lists.gnu.org/r/emacs-devel/2014-07/msg00503.html.  */
    eassert (errno == EAGAIN);
  else
    /* I don't know what else can happen with this descriptor.  */
diff --git a/src/callproc.c b/src/callproc.c
index 8f13e98fd11..6e16ca78790 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -634,7 +634,7 @@ call_process (ptrdiff_t nargs, Lisp_Object *args, int filefd,
 #ifdef DARWIN_OS
      /* Work around a macOS bug, where SIGCHLD is apparently
         delivered to a vforked child instead of to its parent.  See:
-         https://lists.gnu.org/archive/html/emacs-devel/2017-05/msg00342.html
+         https://lists.gnu.org/r/emacs-devel/2017-05/msg00342.html
      */
      signal (SIGCHLD, SIG_DFL);
 #endif
diff --git a/src/dispnew.c b/src/dispnew.c
index 065d06813b8..b0fc5c31fa1 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -1699,7 +1699,7 @@ required_matrix_height (struct window *w)
  if (FRAME_WINDOW_P (f))
    {
-      /* https://lists.gnu.org/archive/html/emacs-devel/2015-11/msg00194.html  */
+      /* https://lists.gnu.org/r/emacs-devel/2015-11/msg00194.html  */
      int ch_height = max (FRAME_SMALLEST_FONT_HEIGHT (f), 1);
      int window_pixel_height = window_box_height (w) + eabs (w->vscroll);
@@ -1726,7 +1726,7 @@ required_matrix_width (struct window *w)
  struct frame *f = XFRAME (w->frame);
  if (FRAME_WINDOW_P (f))
    {
-      /* https://lists.gnu.org/archive/html/emacs-devel/2015-11/msg00194.html  */
+      /* https://lists.gnu.org/r/emacs-devel/2015-11/msg00194.html  */
      int ch_width = max (FRAME_SMALLEST_CHAR_WIDTH (f), 1);
      /* Compute number of glyphs needed in a glyph row.  */
diff --git a/src/eval.c b/src/eval.c
index 40b47968be2..272c627dc66 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -616,7 +616,7 @@ The return value is BASE-VARIABLE.  */)
      emacs_abort ();
    }
-  /* https://lists.gnu.org/archive/html/emacs-devel/2008-04/msg00834.html
+  /* https://lists.gnu.org/r/emacs-devel/2008-04/msg00834.html
     If n_a is bound, but b_v is not, set the value of b_v to n_a,
     so that old-code that affects n_a before the aliasing is setup
     still works.  */
diff --git a/src/frame.c b/src/frame.c
index aacb27ec790..5bafbeddcce 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -2036,7 +2036,7 @@ delete_frame (Lisp_Object frame, Lisp_Object force)
 #if defined (USE_X_TOOLKIT) || defined (USE_GTK)
    /* FIXME: Deleting the terminal crashes emacs because of a GTK
       bug.
-       https://lists.gnu.org/archive/html/emacs-devel/2011-10/msg00363.html */
+       https://lists.gnu.org/r/emacs-devel/2011-10/msg00363.html */
    /* Since a similar behavior was observed on the Lucid and Motif
       builds (see Bug#5802, Bug#21509, Bug#23499, Bug#27816), we now
diff --git a/src/gnutls.c b/src/gnutls.c
index 85cebd0e1c6..4622011bc10 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -32,7 +32,7 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 /* Although AEAD support started in GnuTLS 3.4.0 and works in 3.5.14,
   it was broken through at least GnuTLS 3.4.10; see:
-   https://lists.gnu.org/archive/html/emacs-devel/2017-07/msg00992.html
+   https://lists.gnu.org/r/emacs-devel/2017-07/msg00992.html
   The relevant fix seems to have been made in GnuTLS 3.5.1; see:
   https://gitlab.com/gnutls/gnutls/commit/568935848dd6b82b9315d8b6c529d00e2605e03d
   So, require 3.5.1.  */
diff --git a/src/gtkutil.c b/src/gtkutil.c
index c7d8f92829a..2708e5f0f7c 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1374,7 +1374,7 @@ x_wm_set_size_hint (struct frame *f, long int flags, bool user_position)
  /* Don't set size hints during initialization; that apparently leads
     to a race condition.  See the thread at
-     https://lists.gnu.org/archive/html/emacs-devel/2008-10/msg00033.html  */
+     https://lists.gnu.org/r/emacs-devel/2008-10/msg00033.html  */
  if (NILP (Vafter_init_time)
      || !FRAME_GTK_OUTER_WIDGET (f)
      || FRAME_PARENT_FRAME (f))
diff --git a/src/lisp.h b/src/lisp.h
index e9aec4c5979..0daea640d85 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -488,7 +488,7 @@ enum Lisp_Fwd_Type
 /* If you want to define a new Lisp data type, here are some
   instructions.  See the thread at
-   https://lists.gnu.org/archive/html/emacs-devel/2012-10/msg00561.html
+   https://lists.gnu.org/r/emacs-devel/2012-10/msg00561.html
   for more info.
   First, there are already a couple of Lisp types that can be used if
diff --git a/src/sysdep.c b/src/sysdep.c
index f9cc2c81762..e223a67787d 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -508,7 +508,7 @@ child_setup_tty (int out)
  s.main.c_oflag |= OPOST;      /* Enable output postprocessing */
  s.main.c_oflag &= ~ONLCR;     /* Disable map of NL to CR-NL on output */
 #ifdef NLDLY
-  /* https://lists.gnu.org/archive/html/emacs-devel/2008-05/msg00406.html
+  /* https://lists.gnu.org/r/emacs-devel/2008-05/msg00406.html
     Some versions of GNU Hurd do not have FFDLY?  */
 #ifdef FFDLY
  s.main.c_oflag &= ~(NLDLY|CRDLY|TABDLY|BSDLY|VTDLY|FFDLY);
@@ -2102,7 +2102,7 @@ init_signals (bool dumping)
  thread_fatal_action.sa_flags = process_fatal_action.sa_flags;
  /* SIGINT may need special treatment on MS-Windows.  See
-     https://lists.gnu.org/archive/html/emacs-devel/2010-09/msg01062.html
+     https://lists.gnu.org/r/emacs-devel/2010-09/msg01062.html
     Please update the doc of kill-emacs, kill-emacs-hook, and
     NEWS if you change this.  */
diff --git a/src/term.c b/src/term.c
index 06695d1ec61..7d6998d6a4e 100644
--- a/src/term.c
+++ b/src/term.c
@@ -2057,7 +2057,7 @@ TERMINAL does not refer to a text terminal.  */)
 /* Declare here rather than in the function, as in the rest of Emacs,
   to work around an HPUX compiler bug (?). See
-   https://lists.gnu.org/archive/html/emacs-devel/2007-08/msg00410.html  */
+   https://lists.gnu.org/r/emacs-devel/2007-08/msg00410.html  */
 static int default_max_colors;
 static int default_no_color_video;
 static char *default_orig_pair;
diff --git a/src/w32term.c b/src/w32term.c
index 7a3b2cc631f..7c2d86b5f31 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -417,7 +417,7 @@ w32_draw_rectangle (HDC hdc, XGCValues *gc, int x, int y,
     is 1 pixel wider and higher than its arguments WIDTH and HEIGHT.
     This allows us to keep the code that calls this function similar
     to the corresponding code in xterm.c.  For the details, see
-     https://lists.gnu.org/archives/html/emacs-devel/2014-10/msg00546.html.  */
+     https://lists.gnu.org/r/emacs-devel/2014-10/msg00546.html.  */
  Rectangle (hdc, x, y, x + width + 1, y + height + 1);
  SelectObject (hdc, oldhb);
diff --git a/src/xfns.c b/src/xfns.c
index 83fc07dc6cb..bbe73aa7c28 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -6332,7 +6332,7 @@ x_create_tip_frame (struct x_display_info *dpyinfo, Lisp_Object parms)
    }
  /* FIXME - can this be done in a similar way to normal frames?
-     https://lists.gnu.org/archive/html/emacs-devel/2007-10/msg00641.html */
+     https://lists.gnu.org/r/emacs-devel/2007-10/msg00641.html */
  /* Set the `display-type' frame parameter before setting up faces. */
  {
diff --git a/src/xsettings.c b/src/xsettings.c
index e35c61651cb..fe90152f6f0 100644
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -675,8 +675,8 @@ apply_xft_settings (struct x_display_info *dpyinfo,
         of unrelated settings that override users' font customizations,
         among others.  Compare:
-         https://lists.gnu.org/archive/html/emacs-devel/2016-05/msg00557.html
+         https://lists.gnu.org/r/emacs-devel/2016-05/msg00557.html
-         https://lists.gnu.org/archive/html/bug-gnu-emacs/2016-12/msg00820.html
+         https://lists.gnu.org/r/bug-gnu-emacs/2016-12/msg00820.html
         As soon as the dynamic-settings code has been tested and
         verified, this Emacs 25.2 workaround should be removed.  */
diff --git a/src/xterm.c b/src/xterm.c
index 1deb7b46013..1b45cf1b0b7 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -3878,7 +3878,7 @@ static void
 x_shift_glyphs_for_insert (struct frame *f, int x, int y, int width, int height, int shift_by)
 {
 /* Never called on a GUI frame, see
-   https://lists.gnu.org/archive/html/emacs-devel/2015-05/msg00456.html
+   https://lists.gnu.org/r/emacs-devel/2015-05/msg00456.html
 */
  XCopyArea (FRAME_X_DISPLAY (f), FRAME_X_DRAWABLE (f), FRAME_X_DRAWABLE (f),
             f->output_data.x->normal_gc,
@@ -11523,7 +11523,7 @@ x_make_frame_visible (struct frame *f)
 #ifdef CYGWIN
    /* On Cygwin, which uses input polling, we need to force input to
       be read.  See
-       http://lists.gnu.org/archive/html/emacs-devel/2013-12/msg00351.html
+       https://lists.gnu.org/r/emacs-devel/2013-12/msg00351.html
       and https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24091#131.
       Fake an alarm signal to let the handler know that there's
       something to be read.
@@ -12555,7 +12555,7 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
  dpyinfo->xcb_connection = xcb_conn;
 #endif
-  /* https://lists.gnu.org/archive/html/emacs-devel/2015-11/msg00194.html  */
+  /* https://lists.gnu.org/r/emacs-devel/2015-11/msg00194.html  */
  dpyinfo->smallest_font_height = 1;
  dpyinfo->smallest_char_width = 1;
diff --git a/test/lisp/char-fold-tests.el b/test/lisp/char-fold-tests.el
index 83d6fa79b1e..4bab892798d 100644
--- a/test/lisp/char-fold-tests.el
+++ b/test/lisp/char-fold-tests.el
@@ -102,7 +102,7 @@
    (char-fold--test-match-exactly "a1" "xx44" "99")
    (char-fold--test-match-exactly "a12" "77" "xx442" "992")
    ;; Support for this case is disabled.  See function definition or:
-    ;; https://lists.gnu.org/archive/html/emacs-devel/2015-11/msg02562.html
+    ;; https://lists.gnu.org/r/emacs-devel/2015-11/msg02562.html
    ;; (char-fold--test-match-exactly "a12" "xxyy")
    ))
diff --git a/test/lisp/replace-tests.el b/test/lisp/replace-tests.el
index 06b6dd8a0a9..e9564e555ee 100644
--- a/test/lisp/replace-tests.el
+++ b/test/lisp/replace-tests.el
@@ -54,7 +54,7 @@ fx
      6:fx
 ")
    ;; * Test multi-line matches, this is the first test from
-    ;; https://lists.gnu.org/archive/html/emacs-devel/2005-06/msg01008.html
+    ;; https://lists.gnu.org/r/emacs-devel/2005-06/msg01008.html
    ;; where numbers are replaced with letters.
    ("a\na" 0 "\
 a
@@ -70,7 +70,7 @@ a
       :a
 ")
    ;; * Test multi-line matches, this is the second test from
-    ;; https://lists.gnu.org/archive/html/emacs-devel/2005-06/msg01008.html
+    ;; https://lists.gnu.org/r/emacs-devel/2005-06/msg01008.html
    ;; where numbers are replaced with letters.
    ("a\nb" 0 "\
 a
diff --git a/test/lisp/simple-tests.el b/test/lisp/simple-tests.el
index 5133e686a15..521365bbb94 100644
--- a/test/lisp/simple-tests.el
+++ b/test/lisp/simple-tests.el
@@ -280,7 +280,7 @@
     (undo-auto--boundaries 'test))))
 ;; Test for a regression introduced by undo-auto--boundaries changes.
-;; https://lists.gnu.org/archive/html/emacs-devel/2015-11/msg01652.html
+;; https://lists.gnu.org/r/emacs-devel/2015-11/msg01652.html
 (defun undo-test-kill-c-a-then-undo ()
  (with-temp-buffer
    (switch-to-buffer (current-buffer))
diff --git a/test/lisp/vc/vc-bzr-tests.el b/test/lisp/vc/vc-bzr-tests.el
index 85f401eb37b..24bfd4266e6 100644
--- a/test/lisp/vc/vc-bzr-tests.el
+++ b/test/lisp/vc/vc-bzr-tests.el
@@ -106,7 +106,7 @@
          (should (get-buffer "*vc-log*")))
      (delete-directory homedir t))))
-;; https://lists.gnu.org/archive/html/help-gnu-emacs/2012-04/msg00145.html
+;; https://lists.gnu.org/r/help-gnu-emacs/2012-04/msg00145.html
 (ert-deftest vc-bzr-test-faulty-bzr-autoloads ()
  "Test we can generate autoloads in a bzr directory when bzr is faulty."
  (skip-unless (executable-find vc-bzr-program))
diff --git a/test/manual/etags/c-src/emacs/src/lisp.h b/test/manual/etags/c-src/emacs/src/lisp.h
index 0c7da366519..c87fb63db85 100644
--- a/test/manual/etags/c-src/emacs/src/lisp.h
+++ b/test/manual/etags/c-src/emacs/src/lisp.h
@@ -510,7 +510,7 @@ enum Lisp_Fwd_Type
 /* If you want to define a new Lisp data type, here are some
   instructions.  See the thread at
-   https://lists.gnu.org/archive/html/emacs-devel/2012-10/msg00561.html
+   https://lists.gnu.org/r/emacs-devel/2012-10/msg00561.html
   for more info.
   First, there are already a couple of Lisp types that can be used if
diff --git a/test/src/fns-tests.el b/test/src/fns-tests.el
index d751acb7478..705d02fdff6 100644
--- a/test/src/fns-tests.el
+++ b/test/src/fns-tests.el
@@ -154,7 +154,7 @@
            (9 . "aaa") (9 . "zzz") (9 . "ppp") (9 . "fff")])))
 (ert-deftest fns-tests-collate-sort ()
-  ;; See https://lists.gnu.org/archive/html/emacs-devel/2015-10/msg02505.html.
+  ;; See https://lists.gnu.org/r/emacs-devel/2015-10/msg02505.html.
  :expected-result (if (eq system-type 'cygwin) :failed :passed)
  (skip-unless (fns-tests--collate-enabled-p))
author	Paul Eggert	2017-11-25 22:45:41 -0800
committer	Paul Eggert	2017-11-25 22:48:12 -0800
commit	a89f0b6f33f9eb8910a1fceda9028d76ef50b05d (patch)
tree	7055882872b7cad587e5d5e9ac706056f04ff777
parent	8be3aee2813f528b02bc913ca4d79e34e72b1754 (diff)
download	emacs-a89f0b6f33f9eb8910a1fceda9028d76ef50b05d.tar.gz emacs-a89f0b6f33f9eb8910a1fceda9028d76ef50b05d.zip