Fix gnus-search-query-expand-key

* lisp/gnus/gnus-search.el (gnus-search-query-expand-key): Use the
proper built-in functions, rather than trying to replicate string
completion ourself.

.clang-format

@@ -1,41 +0,0 @@
-Language: Cpp
-BasedOnStyle: GNU
-AlignEscapedNewlinesLeft: true
-AlignOperands: Align
-AlwaysBreakAfterReturnType: TopLevelDefinitions
-BreakBeforeBinaryOperators: All
-BreakBeforeBraces: GNU
-ColumnLimit: 70
-ContinuationIndentWidth: 2
-IndentPPDirectives: AfterHash
-PPIndentWidth: 1
-ForEachMacros:
-  - FOR_EACH_TAIL
-  - FOR_EACH_TAIL_SAFE
-  - FOR_EACH_LIVE_BUFFER
-  - ITREE_FOREACH
-  - FOR_EACH_ALIST_VALUE
-IncludeCategories:
-  - Regex: '^<config\.h>$'
-    Priority: -1
-  - Regex: '^<'
-    Priority: 1
-  - Regex: '^"lisp\.h"$'
-    Priority: 2
-  - Regex: '.*'
-    Priority: 3
-WhitespaceSensitiveMacros:
-  - STR
-  - CALL1I
-  - CALL2I
-  - STR_VALUE
-KeepEmptyLinesAtTheStartOfBlocks: false
-MaxEmptyLinesToKeep: 1
-PenaltyBreakBeforeFirstCallParameter: 2000
-SpaceAfterCStyleCast: true
-SpaceBeforeParens: Always
-UseTab: Always
-
-# Local Variables:
-# mode: yaml
-# End:

.dir-locals.el

@@ -1,42 +1,14 @@
-;;; Directory Local Variables         -*- no-byte-compile: t; -*-
-;;; For more information see (info "(emacs) Directory Variables")
-
 ((nil . ((tab-width . 8)
          (sentence-end-double-space . t)
-         (fill-column . 70)
-	 (emacs-lisp-docstring-fill-column . 65)
-         (vc-git-annotate-switches . "-w")
-         (bug-reference-url-format . "https://debbugs.gnu.org/%s")
-	 (diff-add-log-use-relative-names . t)
-         (vc-prepare-patches-separately . nil)))
+         (fill-column . 70)))
  (c-mode . ((c-file-style . "GNU")
-            (c-noise-macro-names . ("INLINE" "NO_INLINE" "ATTRIBUTE_NO_SANITIZE_UNDEFINED"
-                                    "UNINIT" "CALLBACK" "ALIGN_STACK" "ATTRIBUTE_MALLOC"
-                                    "ATTRIBUTE_DEALLOC_FREE"))
-            (electric-quote-comment . nil)
-            (electric-quote-string . nil)
-            (indent-tabs-mode . t)
-	    (mode . bug-reference-prog)))
- (objc-mode . ((c-file-style . "GNU")
-               (electric-quote-comment . nil)
-               (electric-quote-string . nil)
-	       (mode . bug-reference-prog)))
- (c-ts-mode . ((c-ts-mode-indent-style . gnu)
-               (indent-tabs-mode . t)
-               (mode . bug-reference-prog)))
+            (c-noise-macro-names . ("UNINIT"))))
+ (objc-mode . ((c-file-style . "GNU")))
  (log-edit-mode . ((log-edit-font-lock-gnu-style . t)
-                   (log-edit-setup-add-author . t)
-		   (vc-git-log-edit-summary-target-len . 50)))
+                   (log-edit-setup-add-author . t)))
  (change-log-mode . ((add-log-time-zone-rule . t)
 		     (fill-column . 74)
+		     (bug-reference-url-format . "http://debbugs.gnu.org/%s")
 		     (mode . bug-reference)))
  (diff-mode . ((mode . whitespace)))
- (emacs-lisp-mode . ((indent-tabs-mode . nil)
-                     (electric-quote-comment . nil)
-                     (electric-quote-string . nil)
-	             (mode . bug-reference-prog)))
- (lisp-data-mode . ((indent-tabs-mode . nil)))
- (texinfo-mode . ((electric-quote-comment . nil)
-                  (electric-quote-string . nil)
-	          (mode . bug-reference-prog)))
- (outline-mode . ((mode . bug-reference))))
+ (emacs-lisp-mode . ((indent-tabs-mode . nil))))

.gitattributes

@@ -1,6 +1,6 @@
 # Attributes of Emacs files in the Git repository.
 
-# Copyright 2015-2023 Free Software Foundation, Inc.
+# Copyright 2015-2017 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 # A few files use CRLF endings, even on non-Microsoft platforms.
 # Do not warn about trailing whitespace with these files.
@@ -24,12 +24,13 @@ admin/charsets/mapfiles/PTCP154 whitespace=cr-at-eol
 leim/MISC-DIC/cangjie-table.b5 whitespace=cr-at-eol
 leim/MISC-DIC/cangjie-table.cns whitespace=cr-at-eol
 leim/MISC-DIC/pinyin.map whitespace=cr-at-eol
-test/manual/etags/c-src/dostorture.c whitespace=cr-at-eol
-test/manual/etags/cp-src/c.C whitespace=cr-at-eol
-test/manual/etags/html-src/algrthms.html whitespace=cr-at-eol
+nt/nmake.defs whitespace=cr-at-eol
+test/etags/c-src/dostorture.c whitespace=cr-at-eol
+test/etags/cp-src/c.C whitespace=cr-at-eol
+test/etags/html-src/algrthms.html whitespace=cr-at-eol
 
-# The todo-mode file format includes trailing whitespace.
-*.tod[aorty] -whitespace=blank-at-eol
+# The upstream maintainer does not want to remove trailing whitespace.
+doc/misc/texinfo.tex -whitespace=blank-at-eol
 
 # Some files should not be treated as text when diffing or merging.
 *.cur binary
@@ -46,23 +47,23 @@ test/manual/etags/html-src/algrthms.html whitespace=cr-at-eol
 etc/e/eterm-color binary
 
 # Git's builtin diff hunk header styles.
-*.ad[abs] diff=ada
-*.[Cch] diff=cpp
+*.ada diff=ada
+*.[ch] diff=cpp
 *.cc diff=cpp
-*.[ch]pp diff=cpp
+*.cpp diff=cpp
 *.hh diff=cpp
 *.for diff=fortran
 *.html diff=html
 *.shtml diff=html
 *.xml diff=html
 *.java diff=java
-*.[HMm] diff=objc
-*.pas diff=pascal
+*.m diff=objc
 *.perl diff=perl
 *.pl diff=perl
 *.php diff=php
 *.py diff=python
 *.rb diff=ruby
+*.ruby diff=ruby
 *.tex diff=tex
 
 # Hooks for non-default diff hunk headers; see autogen.sh.
@@ -72,7 +73,7 @@ etc/e/eterm-color binary
 *.mk diff=make
 *[Mm]akefile diff=make
 Makefile.in diff=make
-*[-.]sh diff=shell
+*.sh diff=shell
 *.texi diff=texinfo
 #
 # Diff hunk header special-case file names.
@@ -85,8 +86,6 @@ admin/merge-pkg-config diff=shell
 admin/quick-install-emacs diff=shell
 admin/update-copyright diff=shell
 admin/update_autogen diff=shell
-build-aux/config.guess diff=shell
-build-aux/config.sub diff=shell
 build-aux/git-hooks/commit-msg diff=shell
 build-aux/git-hooks/pre-commit diff=shell
 build-aux/gitlog-to-emacslog diff=shell

.gitignore

@@ -1,6 +1,6 @@
 # Files that Git should ignore in the Emacs source directory.
 
-# Copyright 2009-2023 Free Software Foundation, Inc.
+# Copyright 2009-2017 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # Currently we assume only Git 1.7.1 (April 2010) or later, so this
@@ -23,10 +23,6 @@
 # in Git 1.8.2 (March 2013).
 
 
-# Personal customization.
-.dir-locals-2.el
-.no-advice-on-failure
-
 # Built by 'autogen.sh'.
 /aclocal.m4
 /configure
@@ -38,10 +34,11 @@ InfoPlist.strings
 Makefile
 makefile
 !etc/refcards/Makefile
+!modules/mod-test/Makefile
 !test/lisp/progmodes/flymake-resources/Makefile
+!test/manual/indent/Makefile
 !test/manual/etags/Makefile
 !test/manual/etags/make-src/Makefile
-!test/manual/indent/Makefile
 /*.cache
 /confdefs.h
 /config.status
@@ -50,11 +47,9 @@ makefile
 lib/gnulib.mk
 src/config.h
 src/epaths.h
-src/emacs-module.h
 
 # C-level sources built by 'make'.
 lib/alloca.h
-lib/assert.h
 lib/byteswap.h
 lib/dirent.h
 lib/errno.h
@@ -62,12 +57,9 @@ lib/execinfo.h
 lib/fcntl.h
 lib/getopt.h
 lib/getopt-cdefs.h
-lib/gmp.h
-lib/ieee754.h
 lib/inttypes.h
 lib/libgnu.a
 lib/limits.h
-lib/malloc/*.gl.h
 lib/signal.h
 lib/std*.h
 !lib/std*.in.h
@@ -79,7 +71,6 @@ lib/unistd.h
 src/buildobj.h
 src/globals.h
 src/lisp.mk
-src/verbose.mk
 
 # Lisp-level sources built by 'make'.
 *cus-load.el
@@ -91,7 +82,6 @@ lisp/cedet/semantic/wisent/javat-wy.el
 lisp/cedet/semantic/wisent/js-wy.el
 lisp/cedet/semantic/wisent/python-wy.el
 lisp/cedet/srecode/srt-wy.el
-lisp/cedet/semantic/grammar-wy.el
 lisp/eshell/esh-groups.el
 lisp/finder-inf.el
 lisp/leim/ja-dic/
@@ -121,6 +111,7 @@ lisp/mh-e/mh-autoloads.el
 lisp/subdirs.el
 
 # Dependencies.
+.deps/
 deps/
 
 # Logs and temporaries.
@@ -138,31 +129,24 @@ src/gl-stamp
 *.dll
 *.core
 *.elc
-*.eln
 *.o
 *.res
 *.so
-*.dylib
+[0-9]*.core
 core
 core.*[0-9]
 gmon.out
-native-lisp/
 oo/
 oo-spd/
 src/*.map
-vgcore.*[0-9]
 
 # Tests.
+test/indent/*.new
 test/manual/biditest.txt
 test/manual/etags/srclist
 test/manual/etags/regexfile
 test/manual/etags/ETAGS
 test/manual/etags/CTAGS
-test/manual/etags/CTAGS*.sorted
-test/manual/indent/*.new
-test/lisp/gnus/mml-sec-resources/random_seed
-test/lisp/play/fortune-resources/fortunes.dat
-test/**/*.xml
 
 # ctags, etags.
 TAGS
@@ -174,19 +158,12 @@ GSYMS
 GRTAGS
 GTAGS
 
-# auto-generated compilation database
-compile_commands.json
-
-# ccls, a LSP-compliant server for C
-/.ccls-cache
-
 # GNU idutils.
 ID
 
 # Executables.
 *.exe
 a.out
-lib-src/be-resources
 lib-src/blessmail
 lib-src/ctags
 lib-src/ebrowse
@@ -194,10 +171,8 @@ lib-src/emacsclient
 lib-src/etags
 lib-src/hexl
 lib-src/make-docfile
-lib-src/make-fingerprint
 lib-src/movemail
 lib-src/profile
-lib-src/seccomp-filter
 lib-src/test-distrib
 lib-src/update-game-score
 nextstep/Cocoa/Emacs.base/Contents/Info.plist
@@ -208,10 +183,7 @@ nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist
 src/bootstrap-emacs
 src/emacs
 src/emacs-[0-9]*
-src/Emacs
 src/temacs
-src/dmpstruct.h
-src/*.pdmp
 
 # Character-set info.
 admin/charsets/jisx2131-filter
@@ -220,12 +192,8 @@ etc/charsets/*.map
 lisp/international/charprop.el
 lisp/international/charscript.el
 lisp/international/cp51932.el
-lisp/international/emoji-zwj.el
-lisp/international/emoji-labels.el
 lisp/international/eucjp-ms.el
 lisp/international/uni-*.el
-lisp/international/idna-mapping.el
-lisp/language/pinyin.el
 
 # Documentation.
 *.aux
@@ -268,8 +236,6 @@ doc/*/*/*.ps
 doc/emacs/emacsver.texi
 doc/man/emacs.1
 doc/misc/cc-mode.ss
-doc/misc/modus-themes.texi
-doc/misc/org.texi
 etc/DOC
 etc/refcards/emacsver.tex
 gnustmp*
@@ -277,21 +243,19 @@ gnustmp*
 
 # Version control and locks.
 *.orig
-*.swp
+*.rej
 *~
 .#*
 \#*\#
 ChangeLog
 [0-9]*.patch
 [0-9]*.txt
+.dir-locals?.el
 /vc-dwim-log-*
 
 # Built by 'make install'.
 etc/emacs.tmpdesktop
 
-# Built by 'make-dist'.
-/MANIFEST
-
 # Distribution directories.
 /emacs-[1-9]*/
 
@@ -299,7 +263,6 @@ etc/emacs.tmpdesktop
 *.in-h
 _*
 !lib/_Noreturn.h
-!m4/_*.m4
 /bin/
 /BIN/
 /data/
@@ -315,26 +278,3 @@ nt/emacs.rc
 nt/emacsclient.rc
 src/gdb.ini
 /var/
-
-# Seccomp filter files.
-lib-src/seccomp-filter.bpf
-lib-src/seccomp-filter.pfc
-lib-src/seccomp-filter-exec.bpf
-lib-src/seccomp-filter-exec.pfc
-
-# gsettings schema
-/etc/*.gschema.valid
-
-# Ignore directory made by admin/make-manuals.
-/manual/
-
-# Ignore Finder files on MacOS.
-.DS_Store
-
-# Ignore a directory used by dap-mode.
-.vscode
-/test/gmp.h
-
-# GDB history
-.gdb_history
-_gdb_history

.gitlab-ci.yml

@@ -1,28 +0,0 @@
-# Copyright (C) 2021-2023 Free Software Foundation, Inc.
-#
-#  This file is part of GNU Emacs.
-#
-#  GNU Emacs is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 3 of the License, or
-#  (at your option) any later version.
-#
-#  GNU Emacs is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
-
-# GNU Emacs support for the GitLab protocol for CI.
-
-# The presence of this file does not imply any FSF/GNU endorsement of
-# any particular service that uses that protocol.  Also, it is intended for
-# evaluation purposes, thus possibly temporary.
-
-# Maintainer: Ted Zlatanov <tzz@lifelogs.com>
-# URL: https://emba.gnu.org/emacs/emacs
-
-# Just load from test/infra, to keep build automation files there.
-include: '/test/infra/gitlab-ci.yml'

.mailmap

@@ -1,197 +0,0 @@
-#
-# This list is used to fix a few misspelled names in various git
-# listings (e.g., "git log").  This can be used to fix incorrect
-# attribution, poor display, or names showing up more than once.
-# It also allows updating an old email addresses to a new one.
-#
-# See "man git-shortlog" for more information on the format.
-#
-# Keep file sorted using `M-x sort-lines'.
-#
-Aaron S. Hawley <aaron.s.hawley@gmail.com> <Aaron.Hawley@vtinfo.com>
-Aaron S. Hawley <aaron.s.hawley@gmail.com> <Aaron.S.Hawley@gmail.com>
-Aaron S. Hawley <aaron.s.hawley@gmail.com> <ashawley@burlingtontelecom.net>
-Alan Third <alan@idiocy.org>
-Alan Third <alan@idiocy.org> <alan@breton-build.holly.idiocy.org>
-Alan Third <alan@idiocy.org> Alan Third <address@hidden>
-Alan Third <alan@idiocy.org> bug-gnu-emacs@gnu.org <bug-gnu-emacs@gnu.org>
-Alex Harsanyi <AlexHarsanyi@gmail.com> <harsanyi@mac.com>
-Alexander Gramiak <agrambot@gmail.com>
-Amin Bandali <bandali@gnu.org> <mab@gnu.org>
-Andrea Corallo <akrl@sdf.org>
-Andrea Corallo <akrl@sdf.org> <akrl@sdf.com>
-Andrea Corallo <akrl@sdf.org> <andcor03@e112547.nice.arm.com>
-Andrea Corallo <akrl@sdf.org> <andrea_corallo@yahoo.it>
-Andrew G Cohen <cohen@andy.bu.edu>
-Andrew G Cohen <cohen@andy.bu.edu> <cohen@bu.edu>
-Arash Esbati <arash@gnu.org> <arash.esbati@gmail.com>
-Arash Esbati <arash@gnu.org> <esbati@gmx.de>
-Artur Malabarba <bruce.connor.am@gmail.com> <am12548@it055607.users.bris.ac.uk>
-Bastien Guerry <bzg@gnu.org>
-Bastien Guerry <bzg@gnu.org> <bastien1@free.fr>
-Bastien Guerry <bzg@gnu.org> <bzg@altern.org>
-Benjamin Schwerdtner <Benjamin.Schwerdtner@gmail.com>
-Bob Rogers <rogers@rgrjr.com> <rogers-emacs@rgrjr.homedns.org>
-Bruno Félix Rezende Ribeiro <oitofelix@gnu.org> <oitofelix@gmail.com>
-Carlos Pita <carlosjosepita@gmail.com>
-Chong Yidong <cyd@gnu.org> <cyd@stupidchicken.com>
-Christoph Scholtes <cschol2112@gmail.com>
-Christoph Scholtes <cschol2112@gmail.com> <cschol2112@googlemail.com>
-Christoph Scholtes <cschol2112@gmail.com> Christoph Scholtes <>
-Clément Pit-Claudel <clement.pitclaudel@live.com>
-Clément Pit-Claudel <clement.pitclaudel@live.com> <clement.pit@gmail.com>
-Courtney Bane <emacs-bugs-7626@cbane.org>
-Daiki Ueno <ueno@gnu.org> <ueno@unixuser.org>
-Daiki Ueno <ueno@gnu.org> Daiki Ueno <ueno@debian>
-Dan Nicolaescu <dann@ics.uci.edu> <dann@gnu.org>
-Dan Nicolaescu <dann@ics.uci.edu> <done@ece.arizona.edu>
-Daniel Colascione <dancol@dancol.org> <dan.colascione@gmail.com>
-David Abrahams <dave@boostpro.com>
-David M. Koppelman <koppel@ece.lsu.edu>
-Deniz Dogan <deniz@dogan.se> <deniz.a.m.dogan@gmail.com>
-Dick R. Chiang <dick.r.chiang@gmail.com>
-Dick R. Chiang <dick.r.chiang@gmail.com> dickmao <none>
-Earl Hyatt <ej32u@protonmail.com>
-Earl Hyatt <ej32u@protonmail.com> <okamsn@protonmail.com>
-Edward M. Reingold <reingold@emr.cs.iit.edu>
-Eli Zaretskii <eliz@gnu.org> <eliz@is.elta.co.il>
-Emilio C. Lopes <eclig@gmx.net>
-Enami Tsugutomo <tsugutomo.enami@jp.sony.com>
-Era Eriksson <era+emacs@iki.fi> <era+emacsbugs@iki.fi>
-Eric Ludlam <zappo@gnu.org>
-Eric Ludlam <zappo@gnu.org> <eric@siege-engine.com>
-Eric Ludlam <zappo@gnu.org> <ericludlam@gmail.com>
-Eric S. Raymond <esr@thyrsus.com> <esr@snark.thyrsus.com>
-Etienne Prud’homme <e.e.f.prudhomme@gmail.com>
-Fabián Ezequiel Gallina <fgallina@gnu.org> <fgallina@cuca>
-Fabián Ezequiel Gallina <fgallina@gnu.org> <galli.87@gmail.com>
-Francis Litterio <flitterio@gmail.com>
-Gabor Vida <vidagabor@gmail.com>
-Gerd Möllmann <gerd@gnu.org>
-Gerd Möllmann <gerd@gnu.org> <gerd.moellmann@gmail.com>
-Glenn Morris <rgm@gnu.org>
-Glenn Morris <rgm@gnu.org> <rgm@fencepost>
-Glenn Morris <rgm@gnu.org> <rgm@stanford.edu>
-Gnus developers <ding@gnus.org.noreply> <ding@gnus.org>
-Gregory Heytings <gregory@heytings.org> <ghe@sdf.org>
-Grégoire Jadi <daimrod@gmail.com>
-Ian Dunn <dunni@gnu.org>
-Jan Djärv <jan.h.d@swipnet.se>
-Jan Djärv <jan.h.d@swipnet.se> <jhd@f20.localdomain>
-Jason Rumney <jasonr@gnu.org> <jasonr@wanchan>
-Jeff Walsh <fejfighter@gmail.com> <jawalsh@localhost.localdomain>
-Jeff Walsh <fejfighter@gmail.com> <jeff.walsh@drtusers-MacBook-Pro.local>
-Jeff Walsh <fejfighter@gmail.com> <jewalsh@redhat.com>
-Jens Lechtenbörger <jens.lechtenboerger@fsfe.org>
-Jim Blandy <jimb@red-bean.com> <jimb@redhat.com>
-Jimmy Aguilar Mena <spacibba@aol.com>
-Joakim Verona <joakim@verona.se>
-Joakim Verona <joakim@verona.se> <root@exodia.verona.se>
-John Wiegley <johnw@newartisans.com> <jwiegley@gmail.com>
-Jose A. Ortega Ruiz <jao@gnu.org>
-João Távora <joaotavora@gmail.com>
-Julien Danjou <julien@danjou.info> <jd@dex.adm.naquadah.org>
-Julien Danjou <julien@danjou.info> Julien Danjou <jd@abydos>
-Juri Linkov <juri@linkov.net> <juri@jurta.org>
-Jérémy Compostella <jeremy.compostella@gmail.com>
-Jürgen Hötzel <juergen@archlinux.org>
-Karl Fogel <kfogel@red-bean.com> <karl.fogel@canonical.com>
-Katsumi Yamaoka <yamaoka@jpl.org> <katsumi@flagship2>
-Kaushal Modi <kaushal.modi@gmail.com>
-Kelvin White <kwhite@gnu.org>
-Kelvin White <kwhite@gnu.org> <kelvin.white77@gmail.com>
-Ken Raeburn <raeburn@raeburn.org> <raeburn@permabit.com>
-Kenichi Handa <handa@gnu.org>
-Kenichi Handa <handa@gnu.org> <handa@etlken>
-Kenichi Handa <handa@gnu.org> <handa@m17n.org>
-Kenjiro Nakayama <nakayamakenjiro@gmail.com>
-Kjartan Óli Ágústsson <kjartanoli@outlook.com>
-Károly Lőrentey <lorentey@elte.hu>
-Lars Ingebrigtsen <larsi@gnus.org>
-Lars Ingebrigtsen <larsi@gnus.org> <larsi@emkay.local>
-Lars Ingebrigtsen <larsi@gnus.org> <larsi@openbsd6.gnus.org>
-Lars Ingebrigtsen <larsi@gnus.org> <larsi@quimbies.gnus.org>
-Lars Ingebrigtsen <larsi@gnus.org> <larsi@stories.gnus.org>
-Laurence Warne <laurencewarne@gmail.com>
-Lin Sun <lin.sun@zoom.us>
-Ludovic Courtès <ludo@gnu.org>
-Luke Lee <luke.yx.lee@gmail.com>
-Martin Rudalics <rudalics@gmx.at>
-Martin Rudalics <rudalics@gmx.at> <“rudalics@gmx.at”>
-Masatake YAMATO <yamato@redhat.com> <jet@gyve.org>
-Matt Armstrong <matt@rfc20.org> <marmstrong@google.com>
-Matt Armstrong <matt@rfc20.org> <matt@mdeb>
-Mattias Engdegård <mattiase@acm.org>
-Maxim Nikulin <manikulin@gmail.com>
-Michael Albinus <michael.albinus@gmx.de> <albinus@detlef>
-Michalis V <mvar.40k@gmail.com>
-Miha Rihtaršič <miha@kamnitnik.top>
-Morgan J. Smith <Morgan.J.Smith@outlook.com>
-Nick Drozd <nicholasdrozd@gmail.com>
-Nicolas Petton <nicolas@petton.fr> <petton.nicolas@gmail.com>
-Nitish Chandra <nitishchandrachinta@gmail.com>
-Noam Postavsky <npostavs@gmail.com> <npostavs@users.sourceforge.net>
-Noam Postavsky <npostavs@gmail.com> <npostavs@users.sourceforget.net>
-Paul Eggert <eggert@cs.ucla.edu> <eggert@Penguin.CS.UCLA.EDU>
-Paul Eggert <eggert@cs.ucla.edu> <eggert@day>
-Paul Eggert <eggert@cs.ucla.edu> <eggert@twinsun.com>
-Paul Eggert <eggert@cs.ucla.edu> <eggert@union>
-Peter J. Weisberg <pj@irregularexpressions.net>
-Peter Oliver <p.d.oliver@mavit.org.uk> <bzr@mavit.org.uk>
-Peter Oliver <p.d.oliver@mavit.org.uk> <git@mavit.org.uk>
-Philip Kaludercic <philipk@posteo.net>
-Philip Kaludercic <philipk@posteo.net> <philip.kaludercic@fau.de>
-Philip Kaludercic <philipk@posteo.net> <philip@icterid>
-Philip Kaludercic <philipk@posteo.net> <philip@warpmail.net>
-Philipp Stephani <phst@google.com>
-Philipp Stephani <phst@google.com> Philipp Stephani <p.stephani2@gmail.com>
-Phillip Lord <phillip.lord@russet.org.uk> <phillip.lord@newcastle.ac.uk>
-Pierre Lorenzon <devel@pollock-nageoire.net>
-Pieter van Oostrum <pieter@vanoostrum.org> <pieter-l@vanoostrum.org>
-Pip Cet <pipcet@gmail.com>
-Po Lu <luangruo@yahoo.com>
-Po Lu <luangruo@yahoo.com> Po Lu via <emacs-devel@gnu.org>
-Przemysław Wojnowski <esperanto@cumego.com>
-Rasmus <rasmus@gmx.us>
-Richard M. Stallman <rms@gnu.org>
-Robert J. Chassell <bob@gnu.org> <bob@rattlesnake.com>
-Robert Weiner <rsw@gnu.org> <rswgnu@gmail.com>
-Roland Winkler <winkler@gnu.org> <Roland.Winkler@physik.uni-erlangen.de>
-Ronnie Schnell <ronnie@driver-aces.com>
-Ryan C. Thompson <rct@thompsonclan.org>
-Sam Steingold <sds@gnu.org> <sdsg@amazon.com>
-Simen Heggestøyl <simenheg@runbox.com>
-Simen Heggestøyl <simenheg@runbox.com> <simenheg@ifi.uio.no>
-Simen Heggestøyl <simenheg@runbox.com> <simenheg@gmail.com>
-Simon Josefsson <simon@josefsson.org> <jas@extundo.com>
-Stefan Kangas <stefankangas@gmail.com> <stefan@marxist.se>
-Stefan Monnier <monnier@iro.umontreal.ca> <monnier@IRO.UMontreal.CA>
-Stephen Berman <stephen.berman@gmx.net> <Stephen.Berman@gmx.net>
-Stephen Berman <stephen.berman@gmx.net> <Stephen.Berman@gmx.net>
-Stephen Berman <stephen.berman@gmx.net> <steve@rosalinde.fritz.box>
-Stephen Gildea <stepheng+emacs@gildea.com>
-Stephen Gildea <stepheng+emacs@gildea.com> <gildea@stop.mail-abuse.org>
-Stephen Gildea <stepheng+emacs@gildea.com> <stepheng+git-config-global@gildea.com>
-Stephen Gildea <stepheng+emacs@gildea.com> <stepheng+savannah@gildea.com>
-Tassilo Horn <tsdh@gnu.org> <tassilo@member.fsf.org>
-Ted Zlatanov <tzz@lifelogs.com>
-Thien-Thi Nguyen <ttn@gnu.org> <ttn@gnuvola.org>
-Thierry Volpiatto <thievol@posteo.net> <thierry.volpiatto@gmail.com>
-Tino Calancha <ccalancha@suse.com> <f92capac@gmail.com>
-Tino Calancha <ccalancha@suse.com> <tino.calancha@gmail.com>
-Tom Tromey <tom@tromey.com> <tromey@redhat.com>
-Ulf Jasper <ulf.jasper@web.de> Ulf Jasper <>
-Ulf Jasper <ulf.jasper@web.de> Ulf Jasper <ulf@uthinkpad>
-Ulrich Müller <ulm@gentoo.org>
-Vinicius Jose Latorre <viniciusjl@ig.com.br> <viniciusjl.gnu@gmail.com>
-Vladimir Nikishkin <lockywolf@gmail.com> <for.emacs-table.el-environment-patch_2022-05-09@lockywolf.net>
-Werner Lemberg <wl@gnu.org>
-Wolfgang Scherer <wolfgang.scherer@gmx.de> <Wolfgang.Scherer@gmx.de>
-Xi Lu <lx@shellcodes.org>
-Xue Fuqiao <xfq.free@gmail.com> <xfq@gnu.org>
-Yilkal Argaw <yilkalargawworkneh@gmail.com>
-Yuuki Harano <masm+github@masm11.me> <masm@masm11.ddo.jp>
-Óscar Fuentes <ofv@wanadoo.es>
-İ. Göktuğ Kayaalp <self@gkayaalp.com>
-Łukasz Stelmach <stlman@poczta.fm> <l.stelmach@samsung.com>
-Łukasz Stelmach <stlman@poczta.fm> <lukasz.stelmach@iem.pw.edu.pl>

BUGS

@@ -7,7 +7,7 @@ Bugs section of the Emacs manual for advice on
 You can read the Bugs section of the manual from inside Emacs.
 Start Emacs, and press
   C-h r       (to view the Emacs manual)
-  m Bugs RET  (to go to the section on Bugs)
+  m Bugs RET  (to go to the section on Bugs) 
 Or you can use the standalone Info program:
   info emacs
   m Bugs RET
@@ -15,7 +15,7 @@ Or you can use the standalone Info program:
 Emacs distribution.)
 
 Printed copies of the Emacs manual can be purchased from the Free
-Software Foundation's online store at <https://shop.fsf.org/>.
+Software Foundation's online store at <http://shop.fsf.org/>.
 
 If necessary, you can read the manual without an info program:
 

CONTRIBUTE

@@ -1,24 +1,18 @@
-Copyright (C) 2006-2023 Free Software Foundation, Inc.
-See the end of the file for license conditions.
-
 * How developers contribute to GNU Emacs
 
 Here is how software developers can contribute to Emacs.  (Non-developers: see
-https://www.gnu.org/software/emacs/manual/html_node/emacs/Contributing.html
+http://www.gnu.org/software/emacs/manual/html_node/emacs/Contributing.html
 or run the shell command 'info "(emacs)Contributing"'.)
 
 ** The Emacs repository
 
 Emacs development uses Git on Savannah for its main repository.
-To configure Git for Emacs development, you can run the following:
+Briefly, the following shell commands build and run Emacs from scratch:
 
 	git config --global user.name 'Your Name'
 	git config --global user.email 'your.name@example.com'
 	git config --global transfer.fsckObjects true
-
-The following shell commands then build and run Emacs from scratch:
-
-	git clone https://git.savannah.gnu.org/git/emacs.git
+	git clone git://git.sv.gnu.org/emacs.git
 	cd emacs
 	./autogen.sh
 	./configure
@@ -26,147 +20,26 @@ The following shell commands then build and run Emacs from scratch:
 	src/emacs
 
 For more details, see
-https://www.emacswiki.org/emacs/GitQuickStartForEmacsDevs and
-https://www.emacswiki.org/emacs/GitForEmacsDevs or see the file
+http://www.emacswiki.org/emacs/GitQuickStartForEmacsDevs and
+http://www.emacswiki.org/emacs/GitForEmacsDevs or see the file
 admin/notes/git-workflow.
 
 ** Getting involved with development
 
-Discussion about Emacs development takes place on emacs-devel@gnu.org.
-You can subscribe to the emacs-devel@gnu.org mailing list.
-If you want to get only the important mails (for things like
-feature freezes), choose to receive only the 'emacs-announce' topic
-(although so far this feature has not been well or consistently used).
-See https://lists.gnu.org/mailman/listinfo/emacs-devel for mailing list
+You can subscribe to the emacs-devel@gnu.org mailing list, paying
+attention to postings with subject lines containing "emacs-announce",
+as these discuss important events like feature freezes.  See
+http://lists.gnu.org/mailman/listinfo/emacs-devel for mailing list
 instructions and archives.  You can develop and commit changes in your
 own copy of the repository, and discuss proposed changes on the
 mailing list.  Frequent contributors to Emacs can request write access
 there.
 
-Bug reports and fixes, feature requests and patches/implementations
-should be sent to bug-gnu-emacs@gnu.org, the bug/feature list.  This
-is coupled to the https://debbugs.gnu.org tracker.  It is best to use
-the command 'M-x report-emacs-bug RET' to report issues to the tracker
-(described below).  Be prepared to receive comments and requests for
-changes in your patches, following your submission.
+** Committing changes by others
 
-The Savannah info page https://savannah.gnu.org/mail/?group=emacs
-describes how to subscribe to the mailing lists, or see the list
-archives.
-
-To email a patch you can use a shell command like 'git format-patch -1'
-to create a file, and then attach the file to your email.  This nicely
-packages the patch's commit message and changes, and makes sure the
-format and whitespace are not munged in transit by the various mail
-agents.  To send just one such patch without additional remarks, it is
-also possible to use a command like
-
-  git send-email --to=bug-gnu-emacs@gnu.org 0001-DESCRIPTION.patch
-
-However, we prefer the 'git format-patch' method with attachment, as
-doing so delivers patches in the correct and easily-recognizable format
-more reliably, and makes the job of applying the patches easier and less
-error-prone.  It also allows sending patches whose author is someone
-other than the email sender.
-
-Once the cumulative amount of your submissions exceeds a dozen or so
-lines of non-trivial changes, we will need you to assign to the FSF
-the copyright for your contributions.  (To see how many lines were
-non-trivially changed, count only added and modified lines in the
-patched code.  Consider an added or changed line non-trivial if it
-includes at least one identifier, string, or substantial comment.)
-In most cases, to start the assignment process you should download
-https://git.savannah.gnu.org/cgit/gnulib.git/plain/doc/Copyright/request-assign.future
-and return the completed information to the address at the top.
-(There are other assignment options, but they are much less commonly used.)
-If you have questions about the assignment process, you can ask the
-address listed on the form, and/or emacs-devel@gnu.org.
-
-** Issue tracker (a.k.a. "bug tracker")
-
-The Emacs issue tracker at https://debbugs.gnu.org lets you view bug
-reports and search the database for bugs matching several criteria.
-Messages posted to the bug-gnu-emacs@gnu.org mailing list, mentioned
-above, are recorded by the tracker with the corresponding
-bugs/issues.  If a message to the bug tracker contains a patch, please
-include the string "[PATCH]" in the subject of the message in order to
-let the bug tracker tag the bug properly.
-
-GNU ELPA has a 'debbugs' package that allows accessing the tracker
-database from Emacs.
-
-Bugs needs regular attention.  A large backlog of bugs is
-disheartening to the developers, and a culture of ignoring bugs is
-harmful to users, who expect software that works.  Bugs have to be
-regularly looked at and acted upon.  Not all bugs are critical, but at
-the least, each bug needs to be regularly re-reviewed to make sure it
-is still reproducible.
-
-The process of going through old or new bugs and acting on them is
-called bug triage.  This process is described in the file
-admin/notes/bug-triage.
-
-** Documenting your changes
-
-Any change that matters to end-users should have an entry in etc/NEWS.
-Try to start each NEWS entry with a sentence that summarizes the entry
-and takes just one line -- this will allow reading NEWS in Outline
-mode after hiding the body of each entry.
-
-Doc-strings should be updated together with the code.
-
-New defcustom's should always have a ':version' tag stating the first
-Emacs version in which they will appear.  Likewise with defcustom's
-whose value is changed -- update their ':version' tag.
-
-Think about whether your change requires updating the manuals.  If you
-know it does not, mark the NEWS entry with "---".  If you know
-that *all* the necessary documentation updates have been made as part
-of your changes or those by others, mark the entry with "+++".
-Otherwise, do not mark it.
-
-If your change requires updating the manuals to document new
-functions/commands/variables/faces, then use the proper Texinfo
-command to index them; for instance, use @vindex for variables and
-@findex for functions/commands.  For the full list of predefined indices, see
-https://www.gnu.org/software/texinfo/manual/texinfo/html_node/Predefined-Indices.html
-or run the shell command 'info "(texinfo)Predefined Indices"'.
-
-We prefer American English both in doc strings and in the manuals.
-That includes both spelling (e.g., "behavior", not "behaviour") and
-the convention of leaving 2 spaces between sentences.
-
-For more specific tips on Emacs's doc style, see
-https://www.gnu.org/software/emacs/manual/html_node/elisp/Documentation-Tips.html
-Use 'checkdoc' to check for documentation errors before submitting a patch.
-
-** Testing your changes
-
-Please test your changes before committing them or sending them to the
-list.  If possible, add a new test along with any bug fix or new
-functionality you commit (of course, some changes cannot be easily
-tested).
-
-Emacs uses ERT, Emacs Lisp Regression Testing, for testing.  See
-https://www.gnu.org/software/emacs/manual/html_node/ert/
-or run 'info "(ert)"' for more information on writing and running
-tests.
-
-If your test lasts longer than some few seconds, mark it in its
-'ert-deftest' definition with ":tags '(:expensive-test)".
-
-To run tests on the entire Emacs tree, run "make check" from the
-top-level directory.  Most tests are in the directory "test/".  From
-the "test/" directory, run "make <filename>" to run the tests for
-<filename>.el(c).  See "test/README" for more information.
-
-If you're making changes that involve the Emacs build system, please
-test 'out-of-tree' builds as well, i.e.:
-
-    mkdir emacs-build
-    cd emacs-build
-    ../path-to-emacs-sources/configure
-    make
+If committing changes written by someone else, commit in their name,
+not yours.  You can use 'git commit --author="AUTHOR"' to specify a
+change's author.
 
 ** Commit messages
 
@@ -188,27 +61,20 @@ ChangeLog file, where they can be corrected.  It saves time to get
 them right the first time, so here are guidelines for formatting them:
 
 - Start with a single unindented summary line explaining the change;
-  do not end this line with a period.  If possible, try to keep the
-  summary line to 50 characters or fewer; this is for compatibility
-  with certain Git commands that print that line in width-constrained
-  contexts.
+  do not end this line with a period.  If that line starts with a
+  semicolon and a space "; ", the commit message will be ignored when
+  generating the ChangeLog file.  Use this for minor commits that do
+  not need separate ChangeLog entries, such as changes in etc/NEWS.
 
-  If the summary line starts with a semicolon and a space "; ", the
-  commit message will be ignored when generating the ChangeLog file.
-  Use this for minor commits that do not need separate ChangeLog
-  entries, such as changes in etc/NEWS.
+- After the summary line, there should be an empty line, then
+  unindented ChangeLog entries.
 
-- After the summary line, there should be an empty line.
-
-- Unindented ChangeLog entries normally come next.  However, if the
-  commit couldn't be properly summarized in the brief summary line,
-  you can put a paragraph (after the empty line and before the
-  individual ChangeLog entries) that further describes the commit.
-
-- Lines in ChangeLog entries should preferably be not longer than 63
-  characters, and must not exceed 78 characters, unless they consist
-  of a single word of at most 140 characters; this 78/140 limit is
-  enforced by a commit hook.
+- Limit lines in commit messages to 78 characters, unless they consist
+  of a single word of at most 140 characters; this is enforced by a
+  commit hook.  It's nicer to limit the summary line to 50 characters;
+  this isn't enforced.  If the change can't be summarized so briefly,
+  add a paragraph after the empty line and before the individual file
+  descriptions.
 
 - If only a single file is changed, the summary line can be the normal
   file first line (starting with the asterisk).  Then there is no
@@ -229,9 +95,6 @@ them right the first time, so here are guidelines for formatting them:
   bug number NNNNN in the debbugs database.  This string is often
   parenthesized, as in "(Bug#19003)".
 
-- When citing URLs, prefer https: to http: when either will do.  In
-  particular, gnu.org and fsf.org URLs should start with "https:".
-
 - Commit messages should contain only printable UTF-8 characters.
 
 - Commit messages should not contain the "Signed-off-by:" lines that
@@ -246,7 +109,7 @@ them right the first time, so here are guidelines for formatting them:
   between the summary line and the file entries.
 
 - Emacs generally follows the GNU coding standards for ChangeLogs: see
-  https://www.gnu.org/prep/standards/html_node/Change-Logs.html
+  http://www.gnu.org/prep/standards/html_node/Change-Logs.html
   or run 'info "(standards)Change Logs"'.  One exception is that
   commits still sometimes quote `like-this' (as the standards used to
   recommend) rather than 'like-this' or ‘like this’ (as they do now),
@@ -256,10 +119,8 @@ them right the first time, so here are guidelines for formatting them:
   to ChangeLog entries: they must be in English, and be complete
   sentences starting with a capital and ending with a period (except
   the summary line should not end in a period).  See
-  https://www.gnu.org/prep/standards/html_node/Comments.html
-  or run 'info "(standards)Comments"'.  American English is preferred
-  in Emacs; that includes spelling and leaving 2 blanks between
-  sentences.
+  http://www.gnu.org/prep/standards/html_node/Comments.html
+  or run 'info "(standards)Comments"'.
 
   They are preserved indefinitely, and have a reasonable chance of
   being read in the future, so it's better that they have good
@@ -270,24 +131,22 @@ them right the first time, so here are guidelines for formatting them:
 
 - Preferred form for several entries with the same content:
 
-	* lisp/menu-bar.el (clipboard-yank, clipboard-kill-ring-save)
-	(clipboard-kill-region):
-	* lisp/eshell/esh-io.el (eshell-virtual-targets)
-	(eshell-clipboard-append):
-	Replace option gui-select-enable-clipboard with
-	select-enable-clipboard; renamed October 2014.  (Bug#25145)
+	* lisp/help.el (view-lossage):
+	* lisp/kmacro.el (kmacro-edit-lossage):
+	* lisp/edmacro.el (edit-kbd-macro): Fix docstring, lossage is now 300.
 
   (Rather than anything involving "ditto" and suchlike.)
 
 - There is no standard or recommended way to identify revisions in
   ChangeLog entries.  Using Git SHA1 values limits the usability of
   the references to Git, and will become much less useful if Emacs
-  switches to a different VCS.  So we recommend against doing only that.
+  switches to a different VCS.  So we recommend against that.
 
   One way to identify revisions is by quoting their summary line.
-  Prefixing the summary with the commit date can give useful context
-  (use 'git show -s "--pretty=format:%cd \"%s\"" --date=short HASH' to
-  produce that).  Often, "my previous commit" will suffice.
+  Another is with an action stamp - an RFC3339 date followed by !
+  followed by the committer's email - for example,
+  "2014-01-16T05:43:35Z!esr@thyrsus.com".  Often, "my previous commit"
+  will suffice.
 
 - There is no need to mention files such as NEWS and MAINTAINERS, or
   to indicate regeneration of files such as 'lib/gnulib.mk', in the
@@ -296,68 +155,24 @@ them right the first time, so here are guidelines for formatting them:
 
 ** Generating ChangeLog entries
 
-- If you use Emacs VC, you can use 'C-c C-w' to generate formatted
-  blank ChangeLog entries from the diff being committed, then use
-  'M-q' to combine and fill them.  See 'info "(emacs) Log Buffer"'.
-
-- Alternatively, you can use Emacs functions for ChangeLog files; see
-  https://www.gnu.org/software/emacs/manual/html_node/emacs/Change-Log-Commands.html
+- You can use Emacs functions to write ChangeLog entries; see
+  http://www.gnu.org/software/emacs/manual/html_node/emacs/Change-Log-Commands.html
   or run 'info "(emacs)Change Log Commands"'.
 
-  To format ChangeLog entries with Emacs VC, create a top-level
-  ChangeLog file manually, and update it with 'C-x 4 a' as usual.  Do
-  not register the ChangeLog file under git; instead, use 'C-c C-a' to
-  insert its contents into your *vc-log* buffer.  Or if
-  'log-edit-hook' includes 'log-edit-insert-changelog' (which it does
-  by default), they will be filled in for you automatically.
+- If you use Emacs VC, one way to format ChangeLog entries is to create
+  a top-level ChangeLog file manually, and update it with 'C-x 4 a' as
+  usual.  Do not register the ChangeLog file under git; instead, use
+  'C-c C-a' to insert its contents into your *vc-log* buffer.
+  Or if 'log-edit-hook' includes 'log-edit-insert-changelog' (which it
+  does by default), they will be filled in for you automatically.
 
-- Instead of Emacs VC, you can use the vc-dwim command to maintain commit
+- Alternatively, you can use the vc-dwim command to maintain commit
   messages.  When you create a source directory, run the shell command
   'git-changelog-symlink-init' to create a symbolic link from
   ChangeLog to .git/c/ChangeLog.  Edit this ChangeLog via its symlink
   with Emacs commands like 'C-x 4 a', and commit the change using the
   shell command 'vc-dwim --commit'.  Type 'vc-dwim --help' for more.
 
-** Committing your changes.
-
-When you commit changes, Git invokes several scripts that test the
-commit for validity, and may abort the commit if some of the tests
-fail.  These scripts live in the '.git/hooks/' subdirectory of the
-top-level directory of the repository, and they perform the following
-tests:
-
-- commit log message must not be empty;
-- the first line of the commit log message doesn't start with
-  whitespace characters;
-- the second line of the commit log message must be empty;
-- commit log message should include only valid printable ASCII and
-  UTF-8 characters;
-- commit log message lines must be shorter than 79 characters, unless
-  a line consists of a single long word, in which case that word can
-  be up to 140 characters long;
-- there shouldn't be any "Signed-off-by:" tags in the commit log
-  message, and "git commit" should not be invoked with the '-s' option
-  (which automatically adds "Signed-off-by:");
-- if the commit adds new files, the file names must not begin with
-  '-' and must consist of ASCII letters, digits, and characters of the
-  set [-+./_];
-- the changes don't include unresolved merge conflict markers;
-- the changes don't introduce whitespace errors: trailing whitespace,
-  lines that include nothing but whitespace characters, and indented
-  lines where a SPC character is immediately followed by a TAB in the
-  line's initial indentation
-
-** Committing changes by others
-
-If committing changes written by someone else, commit in their name,
-not yours.  You can use 'git commit --author="AUTHOR"' to specify a
-change's author.  When using Emacs VC to commit, the author can be
-specified in the log-edit buffer by adding an "Author: AUTHOR" header
-line (set 'log-edit-setup-add-author' non-nil to have this header line
-added automatically).  Note that the validity checks described in the
-previous section are still applied, so you will have to correct any
-problems they uncover in the changes submitted by others.
-
 ** Branches
 
 Future development normally takes place on the master branch.
@@ -370,25 +185,15 @@ the current release branch.  Periodically, the current release branch
 is merged into the master, using the gitmerge function described in
 admin/notes/git-workflow.
 
-If you are fixing a bug that exists in the current release, you should
-generally commit it to the release branch; it will be merged to the
-master branch later by the gitmerge function.  However, when the
-release branch is for Emacs version NN.2 and later, or when it is for
-Emacs version NN.1 that is in the very last stages of its pretest,
-that branch is considered to be in a feature freeze: only bug fixes
-that are "safe" or are fixing major problems should go to the release
-branch, the rest should be committed to the master branch.  This is so
-to avoid destabilizing the next Emacs release.  If you are unsure
-whether your bug fix is "safe" enough for the release branch, ask on
-the emacs-devel mailing list.
+If you are fixing a bug that exists in the current release, be sure to
+commit it to the release branch; it will be merged to the master
+branch later by the gitmerge function.
 
-Documentation fixes (in doc strings, in manuals, in NEWS, and in
-comments) should always go to the release branch, if the documentation
-to be fixed exists and is relevant to the release-branch codebase.
-Doc fixes are always considered "safe" -- even when a release branch
-is in feature freeze, it can still receive doc fixes.  However, this
-rule is limited to fixing real problems in the documentation; cleanups
-and stylistic changes are excluded.
+Documentation fixes (in doc strings, in manuals, and in comments)
+should always go to the release branch, if the documentation to be
+fixed exists and is relevant to the release-branch codebase.  Doc
+fixes are always considered "safe" -- even when a release branch is in
+feature freeze, it can still receive doc fixes.
 
 When you know that the change will be difficult to merge to the
 master (e.g., because the code on master has changed a lot), you can
@@ -400,31 +205,92 @@ the commit to master, by starting the commit message with "Backport:".
 The gitmerge function excludes these commits from the merge to the master.
 
 Some changes should not be merged to master at all, for whatever
-reason.  These should be marked by including something like "Do not
+reasons.  These should be marked by including something like "Do not
 merge to master" or anything that matches gitmerge-skip-regexp (see
 admin/gitmerge.el) in the commit message.
 
-** Some packages in Emacs are maintained externally
+** Other process information
 
-Sometimes a package that ships as part of GNU Emacs is maintained as a
-separate project, with its own upstream repository, its own maintainer
-group, its own development conventions, etc.  The upstream project's
-code is periodically merged into Emacs (exactly when and how such
-merges happen depends on the package).
+** Emacs Mailing lists.
 
-So when you are making a contribution -- such as fixing a bug or
-proposing an enhancement -- to one of these externally maintained
-packages, you sometimes need to deal with that package at its upstream
-source.
+Discussion about Emacs development takes place on emacs-devel@gnu.org.
 
-In the section "Externally maintained packages" in "admin/MAINTAINERS"
-we maintain a list of such packages.
+Bug reports and fixes, feature requests and implementations should be
+sent to bug-gnu-emacs@gnu.org, the bug/feature list.  This is coupled
+to the http://debbugs.gnu.org tracker.
 
-** GNU ELPA
+The Savannah info page http://savannah.gnu.org/mail/?group=emacs
+describes how to subscribe to the mailing lists, or see the list
+archives.
 
-This repository does not contain the Emacs Lisp package archive
-(elpa.gnu.org).  See admin/notes/elpa for how to access the GNU ELPA
-repository.
+To email a patch you can use a shell command like 'git format-patch -1'
+to create a file, and then attach the file to your email.  This nicely
+packages the patch's commit message and changes.  To send just one
+such patch without additional remarks, you can use a command like
+'git send-email --to=bug-gnu-emacs@gnu.org 0001-DESCRIPTION.patch'.
+
+** Issue tracker (a.k.a. "bug tracker")
+
+The Emacs issue tracker at http://debbugs.gnu.org lets you view bug
+reports and search the database for bugs matching several criteria.
+Messages posted to the bug-gnu-emacs@gnu.org mailing list, mentioned
+above, are recorded by the tracker with the corresponding bugs/issues.
+
+GNU ELPA has a 'debbugs' package that allows accessing the tracker
+database from Emacs.
+
+Bugs needs regular attention.  A large backlog of bugs is
+disheartening to the developers, and a culture of ignoring bugs is
+harmful to users, who expect software that works.  Bugs have to be
+regularly looked at and acted upon.  Not all bugs are critical, but at
+the least, each bug needs to be regularly re-reviewed to make sure it
+is still reproducible.
+
+The process of going through old or new bugs and acting on them is
+called bug triage.  This process is described in the file
+admin/notes/bug-triage.
+
+** Documenting your changes
+
+Any change that matters to end-users should have an entry in etc/NEWS.
+
+Doc-strings should be updated together with the code.
+
+Think about whether your change requires updating the manuals.  If you
+know it does not, mark the NEWS entry with "---".  If you know
+that *all* the necessary documentation updates have been made, mark
+the entry with "+++".  Otherwise do not mark it.
+
+If your change requires updating the manuals to document new
+functions/commands/variables/faces, then use the proper Texinfo
+command to index them; for instance, use @vindex for variables and
+@findex for functions/commands.  For the full list of predefine indices, see
+http://www.gnu.org/software/texinfo/manual/texinfo/html_node/Predefined-Indices.html
+or run the shell command 'info "(texinfo)Predefined Indices"'.
+
+For more specific tips on Emacs's doc style, see
+http://www.gnu.org/software/emacs/manual/html_node/elisp/Documentation-Tips.html
+Use 'checkdoc' to check for documentation errors before submitting a patch.
+
+** Testing your changes
+
+Please test your changes before committing them or sending them to the
+list.  If possible, add a new test along with any bug fix or new
+functionality you commit (of course, some changes cannot be easily
+tested).
+
+Emacs uses ERT, Emacs Lisp Regression Testing, for testing.  See
+http://www.gnu.org/software/emacs/manual/html_node/ert/
+or run 'info "(ert)"' for for more information on writing and running
+tests.
+
+If your test lasts longer than some few seconds, mark it in its
+'ert-deftest' definition with ":tags '(:expensive-test)".
+
+To run tests on the entire Emacs tree, run "make check" from the
+top-level directory.  Most tests are in the directory "test/".  From
+the "test/" directory, run "make <filename>" to run the tests for
+<filename>.el(c).  See "test/README" for more information.
 
 ** Understanding Emacs internals
 
@@ -432,8 +298,8 @@ The best way to understand Emacs internals is to read the code.  Some
 source files, such as xdisp.c, have extensive comments describing the
 design and implementation.  The following resources may also help:
 
-https://www.gnu.org/software/emacs/manual/html_node/elisp/Tips.html
-https://www.gnu.org/software/emacs/manual/html_node/elisp/GNU-Emacs-Internals.html
+http://www.gnu.org/software/emacs/manual/html_node/elisp/Tips.html
+http://www.gnu.org/software/emacs/manual/html_node/elisp/GNU-Emacs-Internals.html
 
 or run 'info "(elisp)Tips"' or 'info "(elisp)GNU Emacs Internals"'.
 
@@ -449,8 +315,8 @@ files intended for use only with Emacs version 24.5 and later.
 
 *** Useful files in the admin/ directory
 
-See all the files in 'admin/notes/*'.  In particular, see
-'admin/notes/newfile' and 'admin/notes/repo'.
+See all the files in admin/notes/* .  In particular, see
+admin/notes/newfile, see admin/notes/repo.
 
 The file admin/MAINTAINERS records the areas of interest of frequent
 Emacs contributors.  If you are making changes in one of the files
@@ -492,7 +358,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 Local variables:
 mode: outline

COPYING

@@ -1,7 +1,7 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
+<http://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

ChangeLog.1

@@ -12,7 +12,7 @@
 	"/usr/include/glib-2.0/glib/gmem.h: ... warning: unknown attribute
 	'__alloc_size__' ignored".  Use -Werror when checking for -nopie;
 	otherwise clang warns about -nopie instead of failing, and then
-	later it warns every time the build uses -nopie.
+	later it warns everytime the build uses -nopie.
 
 2015-04-03  Ulrich Müller  <ulm@gentoo.org>
 
@@ -33,7 +33,7 @@
 
 	Fix 'commit-msg' to cite 'CONTRIBUTE'
 	As suggested in:
-	https://lists.gnu.org/r/emacs-devel/2015-03/msg00947.html
+	http://lists.gnu.org/archive/html/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/r/emacs-devel/2015-01/msg00525.html
+	http://lists.gnu.org/archive/html/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/r/emacs-devel/2015-01/msg00898.html
+	http://lists.gnu.org/archive/html/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/r/emacs-devel/2015-01/msg00361.html
+	http://lists.gnu.org/archive/html/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/r/emacs-devel/2014-12/msg01093.html
+	http://lists.gnu.org/archive/html/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/r/emacs-devel/2014-12/msg00704.html
+	http://lists.gnu.org/archive/html/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/r/emacs-devel/2014-11/msg01665.html
+	http://lists.gnu.org/archive/html/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/r/emacs-devel/2014-11/msg01187.html
+	http://lists.gnu.org/archive/html/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/r/emacs-devel/2014-06/msg00263.html
+	http://lists.gnu.org/archive/html/emacs-devel/2014-06/msg00263.html
 	* configure.ac (WERROR_CFLAGS): Add -Wredundant-decls.
 
 	Merge from gnulib, incorporating:
@@ -930,7 +930,7 @@
 	(mostlyclean_dirs, clean_dirs, distclean_dirs, maintainer_clean_dirs):
 	New variables.
 	(mostlyclean, clean, distclean, bootstrap-clean, maintainer-clean)
-	(extraclean): Define using each subdirectory as a prerequisite.
+	(extraclean): Define using each subdirectory as a prequisite.
 	* lib/Makefile.am (bootstrap-clean): New.
 
 2014-06-15  Paul Eggert  <eggert@cs.ucla.edu>
@@ -969,7 +969,7 @@
 
 	Rely on AC_CANONICAL_HOST to detect whether we're using mingw.
 	See the thread containing:
-	https://lists.gnu.org/r/emacs-devel/2014-06/msg00206.html
+	http://lists.gnu.org/archive/html/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.
@@ -1045,7 +1045,7 @@
 2014-05-29  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* configure.ac (pthread_sigmask): Look in LIB_PTHREAD too (Bug#17561).
-	Fixes configuration glitch found in <https://bugs.gnu.org/17561#59>.
+	Fixes configuration glitch found in <http://bugs.gnu.org/17561#59>.
 
 2014-05-29  Eli Zaretskii  <eliz@gnu.org>
 
@@ -1517,7 +1517,7 @@
 
 	* configure.ac (LIBXML2_CFLAGS): Fix xcrun-related quoting problem.
 	Reported by YAMAMOTO Mitsuharu in:
-	https://lists.gnu.org/r/emacs-devel/2013-12/msg00995.html
+	http://lists.gnu.org/archive/html/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/r/emacs-devel/2013-12/msg00969.html
+	http://lists.gnu.org/archive/html/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/r/emacs-devel/2013-12/msg00323.html>.
+	<http://lists.gnu.org/archive/html/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.
@@ -1657,7 +1657,7 @@
 
 2013-12-08  Paul Eggert  <eggert@cs.ucla.edu>
 
-	* configure.ac: Simplify suppression of GTK deprecation warning.
+	* configure.ac: Simplify supression of GTK deprecation warning.
 	Move -DGDK_DISABLE_DEPRECATION_WARNINGS out of the command line
 	and into config.h, to shorten the command line when doing 'make'.
 	Don't AC_SUBST GTK_CFLAGS, as this is not needed.
@@ -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/r/bug-gnulib/2013-12/msg00000.html>.
+	<http://lists.gnu.org/archive/html/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/r/emacs-devel/2013-09/msg00343.html
+	http://lists.gnu.org/archive/html/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/r/emacs-devel/2013-09/msg00210.html,
+	http://lists.gnu.org/archive/html/emacs-devel/2013-09/msg00210.html,
 	and in particular
-	https://lists.gnu.org/r/emacs-devel/2013-09/msg00252.html
+	http://lists.gnu.org/archive/html/emacs-devel/2013-09/msg00252.html
 	and its followups, for the details.
 
 2013-09-17  Dmitry Antipov  <dmantipov@yandex.ru>
@@ -2326,7 +2326,7 @@
 2013-07-03  Christoph Egger  <christoph@debian.org>  (tiny change)
 
 	* configure.ac (emacs_broken_SIGIO): Set on gnu-kfreebsd to avoid hang.
-	https://bugs.debian.org/712974
+	http://bugs.debian.org/712974
 
 2013-07-02  Paul Eggert  <eggert@cs.ucla.edu>
 
@@ -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/r/emacs-devel/2013-03/msg00999.html>.
+	<http://lists.gnu.org/archive/html/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/r/emacs-devel/2013-01/msg00183.html>.
+	<http://lists.gnu.org/archive/html/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/r/emacs-devel/2012-09/msg00671.html>.
+	<http://lists.gnu.org/archive/html/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/r/emacs-devel/2012-09/msg00456.html>.
+	<http://lists.gnu.org/archive/html/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/r/emacs-devel/2012-09/msg00430.html>.
+	<http://lists.gnu.org/archive/html/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/r/emacs-devel/2012-09/msg00438.html>.
+	<http://lists.gnu.org/archive/html/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/r/emacs-devel/2012-09/msg00040.html>.
+	<http://lists.gnu.org/archive/html/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/r/bug-grep/2012-09/msg00000.html>.
+	<http://lists.gnu.org/archive/html/bug-grep/2012-09/msg00000.html>.
 
 2012-09-01  Daniel Colascione  <dan.colascione@gmail.com>
 
@@ -3528,7 +3528,7 @@
 	Port to Solaris 8.
 	Without this change, 'configure' fails because the recently-added
 	wait3 prototype in config.h messes up later 'configure' tests.
-	Fix this problem by dropping wait3 and WRETCODE, as they're
+	Fix this problem by droping wait3 and WRETCODE, as they're
 	no longer needed on hosts that are current porting targets.
 	* configure.ac (wait3, WRETCODE): Remove, fixing a FIXME.
 	All uses changed to waitpid and WEXITSTATUS.
@@ -3812,7 +3812,7 @@
 
 	Improve static checking when configured --with-ns.
 	See Samuel Bronson's remarks in
-	<https://lists.gnu.org/r/emacs-devel/2012-07/msg00146.html>.
+	<http://lists.gnu.org/archive/html/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/r/emacs-devel/2011-12/msg00089.html>.
+	<http://lists.gnu.org/archive/html/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.
@@ -4302,7 +4302,7 @@
 	(install-arch-indep): Don't install-etc for self-contained ns builds.
 
 	* configure.in (GCC_TEST_OPTIONS, NON_GCC_TEST_OPTIONS) <darwin>:
-	No longer unconditionally add /sw directories.  (Bug#2280)
+	No longer unconditonally add /sw directories.  (Bug#2280)
 
 	* Makefile.in (install-arch-dep): Depend on install-arch-indep.
 	(install-arch-indep): Depend on install-leim.
@@ -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/r/emacs-devel/2012-01/msg00787.html>.
+	<http://lists.gnu.org/archive/html/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/r/emacs-devel/2011-12/msg00065.html>.
+	<http://lists.gnu.org/archive/html/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/r/bug-gnulib/2011-09/msg00397.html>.
+	<http://lists.gnu.org/archive/html/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/r/emacs-devel/2011-07/msg00529.html>.
+	<http://lists.gnu.org/archive/html/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/r/emacs-devel/2011-02/msg00403.html>.
+	<http://lists.gnu.org/archive/html/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/r/bug-gnulib/2011-02/msg00068.html>.
+	<http://lists.gnu.org/archive/html/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/r/bug-gnulib/2011-01/msg00554.html>.
+	<http://lists.gnu.org/archive/html/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/r/bug-gnulib/2011-01/msg00493.html>.
+	<http://lists.gnu.org/archive/html/bug-gnulib/2011-01/msg00493.html>.
 	* m4/mktime.m4 (AC_FUNC_MKTIME): Likewise.
 	* lib/mktime.c (TYPE_MAXIMUM): Redo slightly to match the others.
 
@@ -5685,13 +5685,13 @@
 	(__mktime_internal): Use it systematically for all isdst comparisons.
 	This completes the fix for libc BZ #6723, and removes the need for
 	normalizing tm_isdst.
-	See <https://sourceware.org/bugzilla/show_bug.cgi?id=6723>
+	See <http://sourceware.org/bugzilla/show_bug.cgi?id=6723>
 	(not_equal_tm) [DEBUG]: Use isdst_differ here, too.
 
 	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/r/bug-gnulib/2011-01/msg00472.html>.
+	<http://lists.gnu.org/archive/html/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/r/bug-gnulib/2011-01/msg00488.html>.
+	<http://lists.gnu.org/archive/html/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/r/emacs-devel/2011-01/msg00746.html>.
+	<http://lists.gnu.org/archive/html/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/r/emacs-devel/2011-01/msg00734.html>.
+	<http://lists.gnu.org/archive/html/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/r/emacs-devel/2011-01/msg00698.html>.
+	<http://lists.gnu.org/archive/html/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/r/emacs-devel/2011-01/msg00673.html>
+	<http://lists.gnu.org/archive/html/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/r/bug-gnulib/2011-01/msg00199.html>.
+	<http://lists.gnu.org/archive/html/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,
@@ -14700,7 +14700,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1993-1999, 2001-2023 Free Software Foundation, Inc.
+  Copyright (C) 1993-1999, 2001-2017 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -14715,4 +14715,4 @@
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.

GNUmakefile

@@ -1,6 +1,6 @@
 # Build Emacs from a fresh tarball or version-control checkout.
 
-# Copyright (C) 2011-2023 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 #
 # written by Paul Eggert
 
@@ -27,44 +27,10 @@
 # newly-built Makefile.  If the source tree is already configured,
 # this file defers to the existing Makefile.
 
-# If you want non-default build options, or if you want to build in an
-# out-of-source tree, you should run 'configure' before running 'make'.
-# But run 'autogen.sh' first, if the source was checked out directly
-# from the repository.
-
-# Display help.
-
-ifeq (help,$(filter help,$(MAKECMDGOALS)))
-help:
-	$(info $ NOTE:  This is a brief summary of some common make targets.)
-	$(info $ For more detailed information, please read the files INSTALL,)
-	$(info $ INSTALL.REPO, Makefile or visit this URL:)
-	$(info $ https://www.gnu.org/prep/standards/html_node/Standard-Targets.html)
-	$(info $ )
-	$(info $ make all              -- compile and build Emacs)
-	$(info $ make install          -- install Emacs)
-	$(info $ make TAGS             -- update tags tables)
-	$(info $ make clean            -- delete built files but preserve configuration)
-	$(info $ make mostlyclean      -- like 'make clean', but leave those files that)
-	$(info $                          usually do not need to be recompiled)
-	$(info $ make distclean        -- delete all build and configuration files,)
-	$(info $                          leave only files included in source distribution)
-	$(info $ make maintainer-clean -- delete almost everything that can be regenerated)
-	$(info $ make extraclean       -- like maintainer-clean, and also delete)
-	$(info $                          backup and autosave files)
-	$(info $ make bootstrap        -- delete all compiled files to force a new bootstrap)
-	$(info $                          from a clean slate, then build in the normal way)
-	$(info $ make uninstall        -- remove files installed by 'make install')
-	$(info $ make check            -- run the Emacs test suite)
-	$(info $ make docs             -- generate Emacs documentation in info format)
-	$(info $ make html             -- generate documentation in html format)
-	$(info $ make ps               -- generate documentation in ps format)
-	$(info $ make pdf              -- generate documentation in pdf format )
-	@:
-
-.PHONY: help
-
-else
+# If you are using a non-GNU 'make', or if you want non-default build
+# options, or if you want to build in an out-of-source tree, please
+# run "configure" by hand.  But run autogen.sh first, if the source
+# was checked out directly from the repository.
 
 # If a Makefile already exists, just use it.
 
@@ -79,7 +45,7 @@ else
 ifeq ($(filter-out %clean,$(or $(MAKECMDGOALS),default)),)
 
 $(MAKECMDGOALS):
-	$(warning No Makefile; skipping $@.)
+	@echo >&2 'No Makefile; skipping $@.'
 
 else
 
@@ -96,29 +62,26 @@ default $(ORDINARY_GOALS): Makefile
 # Execute in sequence, so that multiple user goals don't conflict.
 .NOTPARALLEL:
 
+# 'all' if a .git subdirectory is present, empty otherwise.
+ALL_IF_GIT = $(subst .git,all,$(wildcard .git))
+
 configure:
-	$(warning There seems to be no "configure" file in this directory.)
-	$(warning Running ./autogen.sh ...)
-	./autogen.sh
+	@echo >&2 'There seems to be no "configure" file in this directory.'
+	@echo >&2 Running ./autogen.sh $(ALL_IF_GIT) ...
+	./autogen.sh $(ALL_IF_GIT)
 	@echo >&2 '"configure" file built.'
 
 Makefile: configure
-	$(warning There seems to be no Makefile in this directory.)
-ifeq ($(configure),default)
-	$(warning Running ./configure ...)
+	@echo >&2 'There seems to be no Makefile in this directory.'
+	@echo >&2 'Running ./configure ...'
 	./configure
-else
-	$(warning Running ./configure $(configure)...)
-	./configure $(configure)
-endif
 	@echo >&2 'Makefile built.'
 
 # 'make bootstrap' in a fresh checkout needn't run 'configure' twice.
 bootstrap: Makefile
-	$(MAKE) -f Makefile bootstrap-all
+	$(MAKE) -f Makefile all
 
 .PHONY: bootstrap default $(ORDINARY_GOALS)
 
 endif
 endif
-endif

INSTALL

@@ -1,16 +1,14 @@
 GNU Emacs Installation Guide
-Copyright (C) 1992, 1994, 1996-1997, 2000-2023 Free Software Foundation,
+Copyright (C) 1992, 1994, 1996-1997, 2000-2017 Free Software Foundation,
 Inc.
 See the end of the file for license conditions.
 
 
-This file contains general information on building GNU Emacs.  For
-more information specific to the MS-Windows, GNUstep/macOS, and MS-DOS
-ports, also read the files nt/INSTALL, nextstep/INSTALL, and
-msdos/INSTALL.
-
-For information about building from a Git checkout (rather than an
-Emacs release), read the INSTALL.REPO file first.
+This file contains general information on building GNU Emacs.
+For more information specific to the MS-Windows, GNUstep/macOS, and
+MS-DOS ports, also read the files nt/INSTALL, nextstep/INSTALL, and
+msdos/INSTALL.  For information about building from a repository checkout
+(rather than a release), also read the file INSTALL.REPO.
 
 
 BASIC INSTALLATION
@@ -26,7 +24,7 @@ find some things, or what options to use.
 'src/config.h' file containing system-dependent definitions.
 Running the 'make' utility then builds the package for your system.
 
-Building Emacs requires GNU make, <https://www.gnu.org/software/make/>.
+Building Emacs requires GNU make, <http://www.gnu.org/software/make/>.
 On most systems that Emacs supports, this is the default 'make' program.
 
 Here's the procedure to build Emacs using 'configure' on systems which
@@ -36,12 +34,11 @@ some of the steps manually.  The more detailed description in the other
 sections of this guide will help you do that, so please refer to those
 sections if you need to.
 
-  1.  Obtain and unpack the Emacs release, with commands like this:
-
-		 wget https://ftp.gnu.org/gnu/emacs/emacs-VERSION.tar.xz
-		 tar -xf emacs-VERSION.tar.xz
-
-      where VERSION is the Emacs version number.
+  1. Unpacking the Emacs 25 release requires about 200 MB of free
+  disk space.  Building Emacs uses about another 200 MB of space.
+  The final installed Emacs uses about 150 MB of disk space.
+  This includes the space-saving that comes from automatically
+  compressing the Lisp source files on installation.
 
   2a. 'cd' to the directory where you unpacked Emacs and invoke the
       'configure' script:
@@ -84,17 +81,13 @@ sections if you need to.
 
 		 src/emacs -Q
 
-     To test Emacs further (intended mostly to help developers):
-
-		 make check
-
   6. Assuming that the program 'src/emacs' starts and displays its
      opening screen, you can install the program and its auxiliary
      files into their installation directories:
 
 		 make install
 
-  You are now ready to use Emacs.  If you wish to conserve space,
+  You are now ready to use Emacs.  If you wish to conserve disk space,
   you may remove the program binaries and object files from the
   directory where you built Emacs:
 
@@ -111,34 +104,24 @@ sections if you need to.
   (provided you have the 'gzip' program) those installed Lisp source (.el)
   files that have corresponding .elc versions, as well as the Info files.
 
-  You can read a brief summary about common make targets:
-
-                make help
-
 
 ADDITIONAL DISTRIBUTION FILES
 
 * Complex Text Layout support libraries
 
-On GNU and Unix systems, Emacs needs optional libraries to correctly
-display such complex scripts as Indic and Khmer, and also for scripts
-that require Arabic shaping support (Arabic and Farsi).  If the
-HarfBuzz library is installed, Emacs will build with it and use it for
-this purpose.  HarfBuzz is the preferred shaping engine, both on Posix
-hosts and on MS-Windows, so we recommend installing it before building
-Emacs.  The alternative for GNU/Linux and Posix systems is to use the
-"m17n-db", "libm17n-flt", and "libotf" libraries.  (On some systems,
-particularly GNU/Linux, these libraries may be already present or
-available as additional packages.)  Note that if there is a separate
-'dev' or 'devel' package, for use at compilation time rather than run
-time, you will need that as well as the corresponding run time
-package; typically the dev package will contain header files and a
-library archive.  On MS-Windows, if HarfBuzz is not available, Emacs
-will use the Uniscribe shaping engine that is part of the OS.
+On GNU and Unix systems, Emacs needs the optional libraries "m17n-db",
+"libm17n-flt", "libotf" to correctly display such complex scripts as
+Indic and Khmer, and also for scripts that require Arabic shaping
+support (Arabic and Farsi).  On some systems, particularly GNU/Linux,
+these libraries may be already present or available as additional
+packages.  Note that if there is a separate 'dev' or 'devel' package,
+for use at compilation time rather than run time, you will need that
+as well as the corresponding run time package; typically the dev
+package will contain header files and a library archive.  Otherwise,
+you can download the libraries from <http://www.nongnu.org/m17n/>.
 
 Note that Emacs cannot support complex scripts on a TTY, unless the
-terminal includes such a support.  However, most modern terminal
-emulators, such as xterm, do support such scripts.
+terminal includes such a support.
 
 * intlfonts-VERSION.tar.gz
 
@@ -156,9 +139,7 @@ lisp/ps-mule.el defines the *.bdf font files required for printing
 each character set.
 
 The intlfonts distribution contains its own installation instructions,
-in the intlfonts/README file.  See also the Emacs Frequently Asked
-Questions info pages "(efaq) How to add fonts" for installation
-instructions.
+in the intlfonts/README file.
 
 * Image support libraries
 
@@ -181,15 +162,14 @@ can be found (in the unlikely event that your distribution does not
 provide them).  By default, libraries marked with an X are required if
 X11 is being used.
 
-    libXaw3d          https://directory.fsf.org/project/Xaw3d
-  X libxpm for XPM:   https://www.x.org/releases/current/src/lib/
+    libXaw3d          http://directory.fsf.org/project/xaw3d/
+  X libxpm for XPM:   http://www.x.org/releases/current/src/lib/
   X libpng for PNG:   http://www.libpng.org/
-    libz (for PNG):   https://www.zlib.net/
-  X libjpeg for JPEG: https://www.ijg.org/
-  X libtiff for TIFF: http://www.simplesystems.org/libtiff/
-  X libgif for GIF:   https://giflib.sourceforge.net/
-    librsvg2 for SVG: https://wiki.gnome.org/Projects/LibRsvg
-    libwebp for WebP: https://developers.google.com/speed/webp/
+    libz (for PNG):   http://www.zlib.net/
+  X libjpeg for JPEG: http://www.ijg.org/
+  X libtiff for TIFF: http://www.remotesensing.org/libtiff/
+  X libgif for GIF:   http://sourceforge.net/projects/giflib/
+    librsvg2 for SVG: http://wiki.gnome.org/action/show/Projects/LibRsvg
 
 If you supply the appropriate --without-LIB option, 'configure' will
 omit the corresponding library from Emacs, even if that makes for a
@@ -207,7 +187,7 @@ them.
 On the GNU system, Emacs supports both X fonts and local fonts
 (i.e. fonts managed by the fontconfig library).  If you need more
 fonts than your distribution normally provides, you must install them
-yourself.  See <https://www.gnu.org/software/freefont/> for a large
+yourself.  See <URL:http://www.gnu.org/software/freefont/> for a large
 number of free Unicode fonts.
 
 * GNU/Linux development packages
@@ -218,48 +198,13 @@ need to compile it.  For example, to compile Emacs with support for X
 and graphics libraries, you may need to install the X development
 package(s), and development versions of the jpeg, png, etc. packages.
 
-The names of the packages that you need vary according to the
+The names of the packages that you need varies according to the
 GNU/Linux distribution that you use, and the options that you want to
 configure Emacs with.  On Debian-based systems, you can install all the
 packages needed to build the installed version of Emacs with a command
-like 'apt-get build-dep emacs' (on older systems, replace 'emacs' with
-e.g. 'emacs25').  On Red Hat-based systems, the corresponding command is
-'dnf builddep emacs' (on older systems, use 'yum-builddep' instead).
+like 'apt-get build-dep emacs24'.  On Red Hat systems, the
+corresponding command is 'yum-builddep emacs'.
 
-On FreeBSD, the command is 'pkg install -y `pkg rquery %dn emacs-devel`'.
-
-* Alternative window systems
-
-If you want to use Emacs on one of the alternative window systems
-available on GNU/Linux and some Unix systems, such as Wayland or
-Broadway, you can build the PGTK ("Pure GTK") port of Emacs, which
-utilizes the GTK+ toolkit to support those window systems.  To this
-end, invoke the configure script with the '--with-pgtk' option, like
-this:
-
-	./configure --with-pgtk
-
-This build is only supported with GTK+ version 3, and it is an error
-to specify any other X-specific configuration option when PGTK is
-enabled.
-
-If you use exclusively X, do not use the PGTK port.  There are a
-number of respects in which the regular --with-x-toolkit=gtk build
-works better.  The PGTK port should not be considered a simple upgrade
-from --with-x-toolkit=gtk.
-
-With the PGTK build, you will be able to switch between running Emacs
-on X, Wayland and Broadway using the 'GDK_BACKEND' environment
-variable.  GTK+ should automatically detect and use the correct value
-for your system, but you can also specify it manually.  For example,
-to force GTK+ to run under Broadway, start Emacs like this:
-
-	GDK_BACKEND=broadway emacs ...
-
-(where '...' denotes any further options you may want to pass to Emacs).
-
-The GNUstep build also supports the Wayland window system.  If that is
-what you want, see nextstep/INSTALL.
 
 DETAILED BUILDING AND INSTALLATION:
 
@@ -267,7 +212,7 @@ DETAILED BUILDING AND INSTALLATION:
 see nextstep/INSTALL.  For non-ancient versions of MS Windows, see
 the file nt/INSTALL.  For MS-DOS and MS Windows 3.X, see msdos/INSTALL.)
 
-1) See BASIC INSTALLATION above for getting and configuring Emacs.
+1) See the basic installation summary above for the disk space requirements.
 
 2) In the unlikely event that 'configure' does not detect your system
 type correctly, consult './etc/MACHINES' to see what --host, --build
@@ -316,10 +261,10 @@ Emacs with the options '--without-dbus --without-gconf --without-gsettings'.
 
 To read email via a network protocol like IMAP or POP, you can
 configure Emacs with the option '--with-mailutils', so that it always
-uses the GNU Mailutils 'movemail' program to retrieve mail; this is
-the default if GNU Mailutils is installed.  Otherwise the Emacs build
-procedure builds and installs an auxiliary 'movemail' program, a
-limited and insecure substitute; when this happens, there are several
+uses the GNU Mailutils 'movemail' program to retrieve mail.  Otherwise
+the Emacs build procedure builds and installs an auxiliary 'movemail'
+program, a limited and insecure substitute that Emacs can use when
+Mailutils is not installed; when this happens, there are several
 configure options such as --without-pop that provide fine-grained
 control over Emacs 'movemail' construction.
 
@@ -327,11 +272,10 @@ The Emacs mail reader RMAIL is configured to be able to read mail from
 a POP3 server by default.  Versions of the POP protocol older than
 POP3 are not supported.  While POP3 support is typically enabled,
 whether Emacs actually uses POP3 is controlled by individual users;
-see the Rmail chapter of the Emacs manual.  Unless --with-mailutils is
-in effect, it is a good idea to configure without POP3 support so that
+see the Rmail chapter of the Emacs manual.  Unless you configure
+--with-mailutils, it is a good idea to configure --without-pop so that
 users are less likely to inadvertently read email via insecure
-channels.  On native MS-Windows, --with-pop is the default; on other
-platforms, --without-pop is the default.
+channels.
 
 For image support you may have to download, build, and install the
 appropriate image support libraries for image types other than XBM and
@@ -348,25 +292,15 @@ or more of these options:
   --without-gif          for GIF image support
   --without-png          for PNG image support
   --without-rsvg         for SVG image support
-  --without-webp         for WebP image support
-
-Although ImageMagick support is disabled by default due to security
-and stability concerns, you can enable it with --with-imagemagick.
+  --without-imagemagick  for Imagemagick support
 
 Use --without-toolkit-scroll-bars to disable Motif or Xaw3d scroll bars.
 
 Use --without-xim to inhibit the default use of X Input Methods.
 In this case, the X resource useXIM can be used to turn on use of XIM.
 
-Use --without-xinput2 to disable the use of version 2 of the X Input
-Extension.  This disables support for touchscreens, pinch gestures,
-and scroll wheels that report scroll deltas at pixel-level precision.
-
-Use --disable-largefile to omit support for files larger than 2GB, and
---disable-year2038 to omit support for timestamps past the year 2038,
-on systems which allow omitting such support.  This may help when
-linking Emacs to a library with an ABI that requires a particular
-width for off_t or for time_t.
+Use --disable-largefile to omit support for files larger than 2GB on
+systems which support that.
 
 Use --without-sound to disable sound support.
 
@@ -380,13 +314,7 @@ build a small executable with very basic X support, use --without-all
 use --without-all --without-x.  If you want to build with just a few
 features enabled, you can combine --without-all with --with-FEATURE.
 For example, you can use --without-all --without-x --with-dbus to
-build with D-Bus support and nothing more.
-
-Use --with-gnutls=ifavailable to use GnuTLS if available but go ahead
-and build without it if not available.  This overrides Emacs's default
-behavior of refusing to build if GnuTLS is absent.  When X11 support
-is enabled, the libraries for gif, jpeg, png, tiff, and xpm are in the
-same strongly-recommended category as GnuTLS, and have similar options.
+build with DBus support and nothing more.
 
 Use --with-wide-int to implement Emacs values with the type 'long long',
 even on hosts where a narrower type would do.  With this option, on a
@@ -394,9 +322,8 @@ typical 32-bit host, Emacs integers have 62 bits instead of 30.
 
 Use --with-cairo to compile Emacs with Cairo drawing.
 
-Use --with-modules to build Emacs with support for dynamic modules.
-This needs a C compiler that supports '__attribute__ ((cleanup (...)))',
-as in GCC 3.4 and later.
+Use --with-modules to build Emacs with support for loading dynamic
+modules.
 
 Use --enable-gcc-warnings to enable compile-time checks that warn
 about possibly-questionable C code.  This is intended for developers
@@ -412,13 +339,17 @@ Use --disable-silent-rules to cause 'make' to give more details about
 the commands it executes.  This can be helpful when debugging a build
 that goes awry.  'make V=1' also enables the extra chatter.
 
-Use --enable-link-time-optimization to enable link-time optimization.
-With GCC, you need GCC 4.5.0 and later, and 'configure' arranges for
-linking to be parallelized if possible.  With Clang, you need GNU
-binutils with the gold linker and plugin support, along with the LLVM
-gold plugin <https://llvm.org/docs/GoldPlugin.html>.  Link time
-optimization is not the default as it tends to cause crashes and to
-make Emacs slower.
+Use --enable-link-time-optimization to enable link-time optimizer.  If
+you're using GNU compiler, this feature is supported since version 4.5.0.
+If 'configure' can determine number of online CPUS on your system, final
+link-time optimization and code generation is executed in parallel using
+one job per each available online CPU.
+
+This option is also supported for clang.  You should have GNU binutils
+with 'gold' linker and plugin support, and clang with LLVMgold.so plugin.
+Read http://llvm.org/docs/GoldPlugin.html for details.  Also note that
+this feature is still experimental, so prepare to build binutils and
+clang from the corresponding source code repositories.
 
 The '--prefix=PREFIXDIR' option specifies where the installation process
 should put emacs and its data files.  This defaults to '/usr/local'.
@@ -618,7 +549,7 @@ information on this.
 Emacs info files.
 
 8) If your system uses lock files to interlock access to mailer inbox files,
-and if --with-mailutils is not in effect, then you might need to
+and if you did not configure --with-mailutils, then you might need to
 make the Emacs-specific 'movemail' program setuid or setgid in order
 to enable it to write the lock files.  We believe this is safe.
 
@@ -751,4 +682,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.

INSTALL.REPO

@@ -1,22 +1,9 @@
 	     Building and Installing Emacs from the Repository
 
-The Emacs repository is hosted on Savannah.  The following Git command
-will clone the repository to the 'emacs' subdirectory of the current
-directory on your local machine:
-
-    git clone https://git.savannah.gnu.org/git/emacs.git
-
-To build the repository code, simply run 'make' in the 'emacs'
-directory.  This should work if your files are freshly checked out
-from the repository, and if you have the proper tools installed; the
-default configuration options will be used.  Other configuration
-options can be specified by setting a 'configure' variable, for
-example:
-
-  $ make configure="--prefix=/opt/emacs CFLAGS='-O0 -g3'"
-
-If the above doesn't work, or if you have special build requirements,
-the following information may be helpful.
+Simply run 'make'.  This should work if your files are freshly checked
+out from the repository, and if you have the proper tools installed.
+If it doesn't work, or if you have special build requirements, the
+following information may be helpful.
 
 Building Emacs from the source-code repository requires some tools
 that are not needed when building from a release.  You will need:
@@ -32,7 +19,7 @@ To use the autotools, run the following shell command to generate the
 'configure' script and some related files, and to set up your git
 configuration:
 
-  $ ./autogen.sh
+  $ ./autogen.sh all
 
 You can then configure your build as follows:
 
@@ -45,8 +32,8 @@ can invoke './configure -C'.  After configuring, build Emacs as follows:
 
   $ make
 
-You can also type 'make check' to test and 'make install' to install
-Emacs.
+If you want to install Emacs, type 'make install' instead of 'make' in
+the last command.
 
 Occasionally the file 'lisp/loaddefs.el' (and similar automatically
 generated files, such as 'esh-groups.el', and '*-loaddefs.el' in some
@@ -63,30 +50,8 @@ To update loaddefs.el (and similar files), do:
   $ make autoloads
 
 If either of the above partial procedures fails, try 'make bootstrap'.
-If CPU time is not an issue, 'make bootstrap' is a more thorough way
-to rebuild, avoiding spurious problems.  'make bootstrap' rebuilds
-Emacs with the same configuration options as the previous build; it
-can also be used to rebuild Emacs with other configuration options by
-setting a 'configure' variable, for example:
-
-  $ make bootstrap configure="CFLAGS='-O0 -g3'"
-
-To rebuild Emacs with the default configuration options, you can use:
-
-  $ make bootstrap configure=default
-
-Occasionally, there are changes that 'make bootstrap' won't be able to
-handle.  The most thorough cleaning can be achieved by 'git clean -fdx'
-which will leave you with only files from the git repository.  Here
-are some faster methods for a couple of particular error cases:
-
-    /usr/bin/m4:aclocal.m4:9: cannot open `m4/count-leading-zeros.m4': No such file or directory
-
-This can be fixed with 'rm aclocal.m4'.
-
-    make: *** No rule to make target 'lib/Makefile.am', needed by 'lib/Makefile.in'
-
-This can be fixed with 'rm lib/Makefile Makefile'.
+If CPU time is not an issue, 'make bootstrap' is the most thorough way
+to rebuild, and avoid any spurious problems.
 
 Because the repository version of Emacs is a work in progress, it will
 sometimes fail to build.  Please wait a day or so (and check the
@@ -98,7 +63,7 @@ never platform-specific.
 
 
 
-Copyright (C) 2002-2023 Free Software Foundation, Inc.
+Copyright (C) 2002-2017 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -113,4 +78,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.

Makefile.in

@@ -1,6 +1,6 @@
 ### @configure_input@
 
-# Copyright (C) 1992-2023 Free Software Foundation, Inc.
+# Copyright (C) 1992-2017 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ### Commentary:
 
@@ -48,32 +48,22 @@
 #
 # make extraclean
 #      Still more severe - delete backup and autosave files, too.
+#      Also generated files that do not normally change and can be slow
+#      to rebuild (eg leim/ja-dic).
 #
 # make bootstrap
 #      Removes all the compiled files to force a new bootstrap from a
-#      clean slate, and then build in the normal way.  If the FAST Make
-#      variable is set, then the autom4te.cache directory and the
-#      config.cache file are not removed.  This lets you say
-#
-#      ./configure -C
-#      make FAST=true bootstrap
-#
-#      and use the cached results from the configure run, which is much
-#      faster though it does not work in general.
+#      clean slate, and then build in the normal way.
 #
 # make docs
 #      Make Emacs documentation files from their sources; requires makeinfo.
 #
-# make check (or check-expensive or check-all)
-#      Run the Emacs test suite.
-#      check-expensive includes additional tests that can be slow.
-#      check-all runs all tests, including ones that can be slow, or
-#        fail unpredictably
+# make check  or  make check-expensive
+#      Run Emacs test suite.  check-expensive runs also tests which
+#      take more time to perform.
 
 SHELL = @SHELL@
 
-DUMPING=@DUMPING@
-
 # This only matters when inheriting a CDPATH not starting with the
 # current directory.
 CDPATH=
@@ -101,29 +91,25 @@ configuration=@configuration@
 ### The nt/ subdirectory gets built only for MinGW
 NTDIR=@NTDIR@
 
-top_builddir = @top_builddir@
--include ${top_builddir}/src/verbose.mk
+# 'make' verbosity.
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 
-FIND_DELETE = @FIND_DELETE@
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 =
 
-HAVE_NATIVE_COMP = @HAVE_NATIVE_COMP@
-
-USE_STARTUP_NOTIFICATION = @USE_STARTUP_NOTIFICATION@
-
-HAVE_BE_APP = @HAVE_BE_APP@
-
-HAVE_PGTK = @HAVE_PGTK@
-HAVE_GSETTINGS = @HAVE_GSETTINGS@
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
 
 # ==================== Where To Install Things ====================
 
 # Location to install Emacs.app under GNUstep / macOS.
 # Later values may use these.
-ns_appdir=@ns_appdir@
 ns_appbindir=@ns_appbindir@
-ns_applibexecdir=@ns_applibexecdir@
 ns_appresdir=@ns_appresdir@
-ns_applibdir=@ns_applibdir@
 # Either yes or no depending on whether this is a relocatable Emacs.app.
 ns_self_contained=@ns_self_contained@
 
@@ -163,9 +149,6 @@ libexecdir=@libexecdir@
 # Currently only used for the systemd service file.
 libdir=@libdir@
 
-# Where to install emacs-module.h.
-includedir=@includedir@
-
 # Where to install Emacs's man pages.
 # Note they contain cross-references that expect them to be in section 1.
 mandir=@mandir@
@@ -176,6 +159,9 @@ infodir=@infodir@
 # Info files not in the doc/misc directory (we get those via make echo-info).
 INFO_NONMISC=emacs.info eintr.info elisp.info
 
+# If no makeinfo was found and configured --without-makeinfo, "no"; else "yes".
+HAVE_MAKEINFO=@HAVE_MAKEINFO@
+
 # Directory for local state files for all programs.
 localstatedir=@localstatedir@
 
@@ -203,8 +189,8 @@ x_default_search_path=@x_default_search_path@
 # Where the etc/emacs.desktop file is to be installed.
 desktopdir=$(datarootdir)/applications
 
-# Where the etc/emacs.metainfo.xml file is to be installed.
-metainfodir=$(datarootdir)/metainfo
+# Where the etc/emacs.appdata.xml file is to be installed.
+appdatadir=$(datarootdir)/appdata
 
 # Where the etc/emacs.service file is to be installed.
 # The system value (typically /usr/lib/systemd/user) can be
@@ -223,18 +209,11 @@ icondir=$(datarootdir)/icons
 # The source directory for the icon files.
 iconsrcdir=$(srcdir)/etc/images/icons
 
-# Where to install the gsettings schema file.
-gsettingsschemadir = $(datadir)/glib-2.0/schemas
-
 # ==================== Emacs-specific directories ====================
 
 # These variables hold the values Emacs will actually use.  They are
 # based on the values of the standard Make variables above.
 
-# Where lisp files are installed in a distributed with Emacs (relative
-# path to the installation directory).
-lispdirrel=@lispdirrel@
-
 # Where to install the lisp files distributed with Emacs.
 # This includes the Emacs version, so that the lisp files for different
 # versions of Emacs will install themselves in separate directories.
@@ -301,16 +280,10 @@ use_gamedir=$(gameuser)$(gamegroup)
 # not use an absolute path.  So we must take care to always run
 # INSTALL-type commands from the directory containing the Makefile.
 # This explains (I think) the cd thisdir seen in several install rules.
-SYSTEM_TYPE = @SYSTEM_TYPE@
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_INFO = @INSTALL_INFO@
-ifeq ($(SYSTEM_TYPE),cygwin)
-  INSTALL_ELN = $(INSTALL)
-else
-  INSTALL_ELN = $(INSTALL_DATA)
-endif
 # By default, we uphold the dignity of our programs.
 INSTALL_STRIP =
 MKDIR_P = @MKDIR_P@
@@ -320,21 +293,15 @@ LN_S_FILEONLY = @LN_S_FILEONLY@
 # We use gzip to compress installed .el and some .txt files.
 GZIP_PROG = @GZIP_PROG@
 
-GLIB_COMPILE_SCHEMAS = glib-compile-schemas
-
 # ============================= Targets ==============================
 
 # Program name transformation.
 TRANSFORM = @program_transform_name@
 
-# Prevent any settings in the user environment causing problems.
-unexport EMACSDATA EMACSDOC EMACSLOADPATH EMACSPATH
-
 # What emacs should be called when installed.
 EMACS_NAME = `echo emacs | sed '$(TRANSFORM)'`
 EMACS = ${EMACS_NAME}${EXEEXT}
 EMACSFULL = `echo emacs-${version} | sed '$(TRANSFORM)'`${EXEEXT}
-EMACS_PDMP = `./src/emacs${EXEEXT} --fingerprint`.pdmp
 
 # Subdirectories to make recursively.
 SUBDIR = $(NTDIR) lib lib-src src lisp
@@ -346,8 +313,7 @@ SUBDIR_MAKEFILES = $(patsubst ${srcdir}/%,%,${SUBDIR_MAKEFILES_IN:.in=})
 # Non-makefile files created by config.status.
 CONFIG_STATUS_FILES_IN = \
  ${srcdir}/nt/emacs.rc.in ${srcdir}/nt/emacsclient.rc.in \
- ${srcdir}/doc/man/emacs.1.in ${srcdir}/src/emacs-module.h.in \
- ${srcdir}/src/module-env-*.h
+ ${srcdir}/doc/man/emacs.1.in
 
 # Subdirectories to install, and where they'll go.  lib-src's and nt's
 # makefiles know how to install them, so we don't do that here.
@@ -356,88 +322,9 @@ CONFIG_STATUS_FILES_IN = \
 COPYDIR = ${srcdir}/etc ${srcdir}/lisp
 COPYDESTS = "$(DESTDIR)${etcdir}" "$(DESTDIR)${lispdir}"
 
-ifeq (${ns_self_contained},no)
-BIN_DESTDIR='$(DESTDIR)${bindir}/'
-ELN_DESTDIR = $(DESTDIR)${libdir}/emacs/${version}/
-else
-BIN_DESTDIR='${ns_appbindir}/'
-ELN_DESTDIR = ${ns_applibdir}/
-endif
+all: ${SUBDIR} info
 
-gsettings_SCHEMAS = etc/org.gnu.emacs.defaults.gschema.xml
-
-all:
-	$(MAKE) actual-all || $(MAKE) advice-on-failure make-target=all exit-status=$$?
-	$(MAKE) sanity-check make-target=all
-
-# This target is used by the 'bootstrap' target in GNUmakefile, instead of 'all'.
-bootstrap-all:
-	$(MAKE) actual-all || $(MAKE) advice-on-failure make-target=bootstrap exit-status=$$?
-	$(MAKE) sanity-check make-target=bootstrap
-
-.PHONY: bootstrap-all actual-all advice-on-failure sanity-check
-
-actual-all: ${SUBDIR} info $(gsettings_SCHEMAS:.xml=.valid) src-depending-on-lisp
-
-# ADVICE-ON-FAILURE-BEGIN:all
-# You could try to:
-# - run "make bootstrap", which might fix the problem
-# - run "make V=1", which displays the full commands invoked by make,
-#   to further investigate the problem
-# ADVICE-ON-FAILURE-END:all
-
-# ADVICE-ON-FAILURE-BEGIN:bootstrap
-# You could try to:
-# - run "make extraclean" and run "make" again (or, equivalently, run
-#   "make bootstrap configure=default"), to rebuild Emacs with the
-#   default configuration options, which might fix the problem
-# - run "git clean -fdx" and run "make bootstrap" again, which might
-#   fix the problem if "make bootstrap configure=default" did not
-#   !BEWARE! "git clean -fdx" deletes all files that are not under
-#   !BEWARE! version control, which means that all changes to such
-#   !BEWARE! files will be lost and cannot be restored later
-# - run "make V=1", which displays the full commands invoked by make,
-#   to further investigate the problem
-# - report the problem and ask for help by sending an email to
-#   bug-gnu-emacs@gnu.org, mentioning at least the build error
-#   message, the platform, and the repository revision displayed by
-#   "git rev-parse HEAD"
-# ADVICE-ON-FAILURE-END:bootstrap
-
-advice-on-failure:
-	@[ -f .no-advice-on-failure ] && exit ${exit-status}; true
-	@echo >&2 '***'
-	@echo >&2 '*** '"\"make ${make-target}\" failed with exit status ${exit-status}."
-	@echo >&2 '***'
-	@cat Makefile | \
-	  sed -n '/^# ADVICE-ON-FAILURE-BEGIN:${make-target}/,$${p;/^# ADVICE-ON-FAILURE-END:${make-target}/q;};' | \
-	  sed 's/^# /*** /' | grep -v '^\*\*\* ADVICE-ON-FAILURE-' >&2
-	@echo >&2 '***'
-	@exit ${exit-status}
-
-sanity-check:
-	@[ -f .no-advice-on-failure ] && exit 0; true
-	@v=`src/emacs${EXEEXT} --batch --eval \
-	  '(progn (defun f (n) (if (= 0 n) 1 (* n (f (- n 1))))) (princ (f 10)))' \
-	  2> /dev/null`; \
-	[ "X$$v" = "X3628800" ] && exit 0; \
-	echo >&2 '***'; \
-	echo >&2 '*** '"\"make ${make-target}\" succeeded, but Emacs is not functional."; \
-	echo >&2 '***'; \
-	cat Makefile | \
-	  sed -n '/^# ADVICE-ON-FAILURE-BEGIN:${make-target}/,$${p;/^# ADVICE-ON-FAILURE-END:${make-target}/q;};' | \
-	  sed 's/^# /*** /' | grep -v '^\*\*\* ADVICE-ON-FAILURE-' >&2; \
-	echo >&2 '***'; \
-	exit 1
-
-.PHONY: all ${SUBDIR} blessmail epaths-force epaths-force-w32 epaths-force-ns-self-contained etc-emacsver
-
-# Changes in lisp may require us to reconsider the build in src.  For
-# example, if loaddefs.{el,elc} were built in lisp, we need a new
-# .pdmp containing the new autoloads.
-.PHONY: src-depending-on-lisp
-src-depending-on-lisp: lisp
-	${MAKE} -C src BIN_DESTDIR='$(BIN_DESTDIR)' ELN_DESTDIR='$(ELN_DESTDIR)'
+.PHONY: all ${SUBDIR} blessmail epaths-force epaths-force-w32 etc-emacsver
 
 # If configure were to just generate emacsver.tex from emacsver.tex.in
 # in the normal way, the timestamp of emacsver.tex would always be
@@ -469,7 +356,6 @@ epaths-force:
 	@(gamedir='${gamedir}'; \
 	  sed < ${srcdir}/src/epaths.in > epaths.h.$$$$		\
 	  -e 's;\(#.*PATH_LOADSEARCH\).*$$;\1 "${standardlisppath}";' \
-	  -e 's;\(#.*PATH_REL_LOADSEARCH\).*$$;\1 "${lispdirrel}";' 	\
 	  -e 's;\(#.*PATH_SITELOADSEARCH\).*$$;\1 "${locallisppath}";' \
 	  -e 's;\(#.*PATH_DUMPLOADSEARCH\).*$$;\1 "${buildlisppath}";' \
 	  -e '/^#define PATH_[^ ]*SEARCH /s/\([":]\):*/\1/g'		\
@@ -500,27 +386,11 @@ epaths-force-w32:
 	  w32locallisppath=$${w32locallisppath//$${w32prefix}/"%emacs_dir%"} ; \
 	  sed < ${srcdir}/nt/epaths.nt > epaths.h.$$$$		\
 	  -e 's;\(#.*PATH_SITELOADSEARCH\).*$$;\1 "'"$${w32locallisppath//;/\\;}"'";' \
-	  -e 's;\(#.*PATH_REL_LOADSEARCH\).*$$;\1 "${lispdirrel}";' \
 	  -e '/^.*#/s/@VER@/${version}/g' 			\
 	  -e '/^.*#/s/@CFG@/${configuration}/g' 		\
 	  -e "/^.*#/s|@SRC@|$${w32srcdir}|g") &&		\
 	${srcdir}/build-aux/move-if-change epaths.h.$$$$ src/epaths.h
 
-# A NextStep style app bundle is relocatable, so instead of
-# hard-coding paths try to generate them at run-time.
-#
-# The paths are mostly the same, and the bundle paths are different
-# between macOS and GNUstep, so just replace any references to the app
-# bundle root itself with the relative path.
-epaths-force-ns-self-contained: epaths-force
-	@(sed < src/epaths.h > epaths.h.$$$$		\
-	  -e 's;${ns_appdir}/;;') &&			\
-	${srcdir}/build-aux/move-if-change epaths.h.$$$$ src/epaths.h
-
-ifneq ($(NTDIR),)
-$(NTDIR): lib
-endif
-
 lib-src src: $(NTDIR) lib
 
 src: lib-src
@@ -532,17 +402,18 @@ lisp: src
 lib lib-src lisp nt: Makefile
 	$(MAKE) -C $@ all
 
-trampolines: src lisp
-ifeq ($(HAVE_NATIVE_COMP),yes)
-	$(MAKE) -C lisp trampolines
-endif
-
+# Ideally, VCSWITNESS should be a file that is modified whenever the
+# repository registers a commit from either a local checkin or a
+# repository pull. In git there is no single file that guarantees
+# this, but the local log for the current head should be close enough.
+#
 # Pass an unexpanded $srcdir to src's Makefile, which then
 # expands it using its own value of srcdir (which points to the
 # source directory of src/).
+dirstate = .git/logs/HEAD
+VCSWITNESS = $(if $(wildcard $(srcdir)/$(dirstate)),$$(srcdir)/../$(dirstate))
 src: Makefile
-	$(MAKE) -C $@ BIN_DESTDIR='$(BIN_DESTDIR)' \
-		 ELN_DESTDIR='$(ELN_DESTDIR)' all
+	$(MAKE) -C $@ VCSWITNESS='$(VCSWITNESS)' all
 
 blessmail: Makefile src
 	$(MAKE) -C lib-src maybe-blessmail
@@ -577,19 +448,19 @@ config.status: ${srcdir}/configure
 	fi
 
 $(srcdir)/configure: $(srcdir)/configure.ac $(srcdir)/m4/*.m4
-	cd $(srcdir) && ./autogen.sh autoconf
+	cd $(srcdir) && ./autogen.sh
 
 # ==================== Installation ====================
 
 .PHONY: install install-arch-dep install-arch-indep install-etcdoc install-info
-.PHONY: install-man install-etc install-strip install-$(NTDIR) install-eln
+.PHONY: install-man install-etc install-strip install-$(NTDIR)
 .PHONY: uninstall uninstall-$(NTDIR)
 
 ## If we let lib-src do its own installation, that means we
 ## don't have to duplicate the list of utilities to install in
 ## this Makefile as well.
 
-install: actual-all install-arch-indep install-etcdoc install-arch-dep install-$(NTDIR) blessmail install-eln install-gsettings-schemas
+install: all install-arch-indep install-etcdoc install-arch-dep install-$(NTDIR) blessmail
 	@true
 
 ## Ensure that $subdir contains a subdirs.el file.
@@ -615,15 +486,6 @@ install-arch-dep: src install-arch-indep install-etcdoc install-$(NTDIR)
 	$(MAKE) -C lib-src install
 ifeq (${ns_self_contained},no)
 	${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} "$(DESTDIR)${bindir}/$(EMACSFULL)"
-ifeq (${HAVE_BE_APP},yes)
-	${INSTALL_PROGRAM} $(INSTALL_STRIP) src/Emacs "$(DESTDIR)${prefix}/apps/Emacs"
-endif
-ifeq (${DUMPING},pdumper)
-ifeq (${HAVE_BE_APP},yes)
-	${INSTALL_DATA} src/Emacs.pdmp "$(DESTDIR)${libexecdir}/emacs/${version}/${configuration}"/Emacs.pdmp
-endif
-	${INSTALL_DATA} src/emacs.pdmp "$(DESTDIR)${libexecdir}/emacs/${version}/${configuration}"/emacs-${EMACS_PDMP}
-endif
 	-chmod 755 "$(DESTDIR)${bindir}/$(EMACSFULL)"
 ifndef NO_BIN_LINK
 	rm -f "$(DESTDIR)${bindir}/$(EMACS)"
@@ -649,14 +511,12 @@ install-nt:
 ## For them, it is empty.
 INSTALL_ARCH_INDEP_EXTRA = @INSTALL_ARCH_INDEP_EXTRA@
 
-## https://lists.gnu.org/r/emacs-devel/2007-10/msg01672.html
+## http://lists.gnu.org/archive/html/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 -u) 2> /dev/null`; do \
+	  `id -un 2> /dev/null`; do \
 	  [ -n "$${installuser}" ] && break ; \
-	done; \
-	installgroup=`(id -g) 2>/dev/null` && [ -n "$$installgroup" ] && \
-	  installuser=$$installuser:$$installgroup
+	done
 
 ### Install the files that are machine-independent.
 ### Most of them come straight from the distribution; the exception is
@@ -690,14 +550,12 @@ 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/r/emacs-devel/2012-05/msg00278.html
+## http://lists.gnu.org/archive/html/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/r/autoconf-patches/2004-11/msg00005.html
+## http://lists.gnu.org/archive/html/autoconf-patches/2004-11/msg00005.html
 install-arch-indep: lisp install-info install-man ${INSTALL_ARCH_INDEP_EXTRA}
-	umask 022 && $(MKDIR_P) "$(DESTDIR)$(includedir)"
-	$(INSTALL_DATA) src/emacs-module.h "$(DESTDIR)$(includedir)/emacs-module.h"
 	-set ${COPYDESTS} ; \
 	unset CDPATH; \
 	$(set_installuser); \
@@ -705,8 +563,8 @@ install-arch-indep: lisp install-info install-man ${INSTALL_ARCH_INDEP_EXTRA}
 	  [ -d $${dir} ] || exit 1 ; \
 	  dest="$$1" ; shift ; \
 	  if [ -d "$${dest}" ]; then \
-	    exp_dest=`cd "$${dest}" && pwd -P`; \
-	    [ "$$exp_dest" = "`cd $${dir} && pwd -P`" ] && continue ; \
+	    exp_dest=`cd "$${dest}" && /bin/pwd`; \
+	    [ "$$exp_dest" = "`cd $${dir} && /bin/pwd`" ] && continue ; \
 	  else true; \
 	  fi; \
 	  rm -rf "$${dest}" ; \
@@ -762,33 +620,39 @@ install-arch-indep: lisp install-info install-man ${INSTALL_ARCH_INDEP_EXTRA}
 install-etcdoc: src install-arch-indep
 	-unset CDPATH; \
 	umask 022; ${MKDIR_P} "$(DESTDIR)${etcdocdir}" ; \
-	exp_etcdocdir=`cd "$(DESTDIR)${etcdocdir}"; pwd -P`; \
-	if [ "`cd ./etc; pwd -P`" != "$$exp_etcdocdir" ]; \
+	exp_etcdocdir=`cd "$(DESTDIR)${etcdocdir}"; /bin/pwd`; \
+	if [ "`cd ./etc; /bin/pwd`" != "$$exp_etcdocdir" ]; \
 	then \
 	   docfile="DOC"; \
 	   printf 'Copying %s to %s ...\n' "etc/$$docfile" \
 	     "$(DESTDIR)${etcdocdir}"; \
 	   ${INSTALL_DATA} etc/$${docfile} "$(DESTDIR)${etcdocdir}/$${docfile}"; \
+	   $(set_installuser); \
+	     chown $${installuser} "$(DESTDIR)${etcdocdir}/$${docfile}" || true ; \
 	else true; fi
 
 ## FIXME:
 ## If info/dir is missing, but we have install-info, we should let
 ## that handle it.  If info/dir is present and we do not have install-info,
 ## we should check for missing entries and add them by hand.
+##
+## FIXME:
+## If HAVE_MAKEINFO = no and there are no info files, do not install info/dir.
 install-info: info
 	umask 022; ${MKDIR_P} "$(DESTDIR)${infodir}"
 	-unset CDPATH; \
-	thisdir=`pwd -P`; \
-	exp_infodir=`cd "$(DESTDIR)${infodir}" && pwd -P`; \
-	if [ "`cd ${srcdir}/info && pwd -P`" = "$$exp_infodir" ]; then \
+	thisdir=`/bin/pwd`; \
+	exp_infodir=`cd "$(DESTDIR)${infodir}" && /bin/pwd`; \
+	if [ "`cd ${srcdir}/info && /bin/pwd`" = "$$exp_infodir" ]; then \
 	  true; \
 	else \
 	   [ -f "$(DESTDIR)${infodir}/dir" ] || \
 	      [ ! -f ${srcdir}/info/dir ] || \
 	      ${INSTALL_DATA} ${srcdir}/info/dir "$(DESTDIR)${infodir}/dir"; \
-	   info_misc=`MAKEFLAGS= $(MAKE) --no-print-directory -s -C doc/misc echo-info`; \
+	   info_misc=`$(MAKE) --no-print-directory -s -C doc/misc echo-info`; \
 	   cd ${srcdir}/info ; \
 	   for elt in ${INFO_NONMISC} $${info_misc}; do \
+	      test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \
 	      for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
 	       (cd "$${thisdir}"; \
 	        ${INSTALL_DATA} ${srcdir}/info/$$f "$(DESTDIR)${infodir}/$$f"); \
@@ -809,7 +673,7 @@ install-info: info
 ## but not sure if portable.
 install-man:
 	umask 022; ${MKDIR_P} "$(DESTDIR)${man1dir}"
-	thisdir=`pwd -P`; \
+	thisdir=`/bin/pwd`; \
 	cd ${mansrcdir}; \
 	for page in *.1; do \
 	  test "$$page" = ChangeLog.1 && continue; \
@@ -827,44 +691,19 @@ install-man:
 ## Note: emacs22 does not have all the resolutions.
 EMACS_ICON=emacs
 
-ifeq (${USE_STARTUP_NOTIFICATION},no)
-USE_STARTUP_NOTIFICATION_SED_CMD=-e "/^StartupNotify=true$$/d"
-endif
 install-etc:
 	umask 022; ${MKDIR_P} "$(DESTDIR)${desktopdir}"
 	tmp=etc/emacs.tmpdesktop; rm -f $${tmp}; \
 	sed -e "/^Exec=emacs/ s/emacs/${EMACS_NAME}/" \
 	  -e "/^Icon=emacs/ s/emacs/${EMACS_NAME}/" \
-	  $(USE_STARTUP_NOTIFICATION_SED_CMD) \
 	  ${srcdir}/etc/emacs.desktop > $${tmp}; \
 	${INSTALL_DATA} $${tmp} "$(DESTDIR)${desktopdir}/${EMACS_NAME}.desktop"; \
 	rm -f $${tmp}
-	tmp=etc/emacsclient.tmpdesktop; rm -f $${tmp}; \
-	client_name=`echo emacsclient | sed '$(TRANSFORM)'`${EXEEXT}; \
-	sed -e "/^Exec=/ s|emacsclient|${bindir}/$${client_name}|" \
-	  -e "/^Icon=emacs/ s/emacs/${EMACS_NAME}/" \
-	  $(USE_STARTUP_NOTIFICATION_SED_CMD) \
-	  ${srcdir}/etc/emacsclient.desktop > $${tmp}; \
-	${INSTALL_DATA} $${tmp} "$(DESTDIR)${desktopdir}/$${client_name}.desktop"; \
-	rm -f $${tmp}
-	tmp=etc/emacs-mail.tmpdesktop; rm -f $${tmp}; \
-	sed -e "/^Exec=emacs/ s/emacs/${EMACS_NAME}/" \
-	  -e "/^Icon=emacs/ s/emacs/${EMACS_NAME}/" \
-	  ${srcdir}/etc/emacs-mail.desktop > $${tmp}; \
-	${INSTALL_DATA} $${tmp} "$(DESTDIR)${desktopdir}/${EMACS_NAME}-mail.desktop"; \
-	rm -f $${tmp}
-	tmp=etc/emacsclient-mail.tmpdesktop; rm -f $${tmp}; \
-	client_name=`echo emacsclient | sed '$(TRANSFORM)'`${EXEEXT}; \
-	sed -e "/^Exec=/ s|emacsclient|${bindir}/$${client_name}|" \
-	  -e "/^Icon=emacs/ s/emacs/${EMACS_NAME}/" \
-	  ${srcdir}/etc/emacsclient-mail.desktop > $${tmp}; \
-	${INSTALL_DATA} $${tmp} "$(DESTDIR)${desktopdir}/$${client_name}-mail.desktop"; \
-	rm -f $${tmp}
-	umask 022; ${MKDIR_P} "$(DESTDIR)${metainfodir}"
-	tmp=etc/emacs.tmpmetainfo; rm -f $${tmp}; \
+	umask 022; ${MKDIR_P} "$(DESTDIR)${appdatadir}"
+	tmp=etc/emacs.tmpappdata; rm -f $${tmp}; \
 	sed -e "s/emacs\.desktop/${EMACS_NAME}.desktop/" \
-	  ${srcdir}/etc/emacs.metainfo.xml > $${tmp}; \
-	${INSTALL_DATA} $${tmp} "$(DESTDIR)${metainfodir}/${EMACS_NAME}.metainfo.xml"; \
+	  ${srcdir}/etc/emacs.appdata.xml > $${tmp}; \
+	${INSTALL_DATA} $${tmp} "$(DESTDIR)${appdatadir}/${EMACS_NAME}.appdata.xml"; \
 	rm -f $${tmp}
 	umask 022; $(MKDIR_P) "$(DESTDIR)$(systemdunitdir)"
 	tmp=etc/emacs.tmpservice; rm -f $${tmp}; \
@@ -876,7 +715,7 @@ install-etc:
 	  ${srcdir}/etc/emacs.service > $${tmp}; \
 	$(INSTALL_DATA) $${tmp} "$(DESTDIR)$(systemdunitdir)/${EMACS_NAME}.service"; \
 	rm -f $${tmp}
-	thisdir=`pwd -P`; \
+	thisdir=`/bin/pwd`; \
 	cd ${iconsrcdir} || exit 1; umask 022 ; \
 	for dir in */*/apps */*/mimetypes; do \
 	  [ -d $${dir} ] || continue ; \
@@ -891,14 +730,6 @@ install-etc:
 	  done ; \
 	done
 
-### Install native compiled Lisp files.
-install-eln: lisp
-ifeq ($(HAVE_NATIVE_COMP),yes)
-	umask 022 ; \
-	find native-lisp -type d -exec $(MKDIR_P) "$(ELN_DESTDIR){}" \; ; \
-	find native-lisp -type f -exec ${INSTALL_ELN} "{}" "$(ELN_DESTDIR){}" \;
-endif
-
 ### Build Emacs and install it, stripping binaries while installing them.
 install-strip:
 	$(MAKE) INSTALL_STRIP=-s install
@@ -907,14 +738,13 @@ install-strip:
 ### create (but not the noninstalled files such as 'make all' would create).
 ###
 ### Don't delete the lisp and etc directories if they're in the source tree.
-uninstall: uninstall-$(NTDIR) uninstall-doc uninstall-gsettings-schemas
-	rm -f "$(DESTDIR)$(includedir)/emacs-module.h"
+uninstall: uninstall-$(NTDIR) uninstall-doc
 	$(MAKE) -C lib-src uninstall
 	-unset CDPATH; \
-	for dir in "$(DESTDIR)${lispdir}" "$(DESTDIR)${etcdir}" "$(ELN_DESTDIR)" ; do 	\
+	for dir in "$(DESTDIR)${lispdir}" "$(DESTDIR)${etcdir}" ; do 	\
 	  if [ -d "$${dir}" ]; then			\
-	    case `cd "$${dir}" ; pwd -P` in		\
-	      "`cd ${srcdir} ; pwd -P`"* ) ;;		\
+	    case `cd "$${dir}" ; /bin/pwd` in		\
+	      "`cd ${srcdir} ; /bin/pwd`"* ) ;;		\
 	      * ) rm -rf "$${dir}" ;;			\
 	    esac ;					\
 	    case "$${dir}" in				\
@@ -925,8 +755,8 @@ uninstall: uninstall-$(NTDIR) uninstall-doc uninstall-gsettings-schemas
 	  fi ;						\
 	done
 	-rm -rf "$(DESTDIR)${libexecdir}/emacs/${version}"
-	thisdir=`pwd -P`; \
-	(info_misc=`MAKEFLAGS= $(MAKE) --no-print-directory -s -C doc/misc echo-info`; \
+	thisdir=`/bin/pwd`; \
+	(info_misc=`$(MAKE) --no-print-directory -s -C doc/misc echo-info`; \
 	 if cd "$(DESTDIR)${infodir}"; then \
 	   for elt in ${INFO_NONMISC} $${info_misc}; do \
 	     (cd "$${thisdir}"; \
@@ -946,12 +776,10 @@ uninstall: uninstall-$(NTDIR) uninstall-doc uninstall-gsettings-schemas
 	(if cd "$(DESTDIR)${icondir}"; then \
 	   rm -f hicolor/*x*/apps/"${EMACS_NAME}.png" \
 	     "hicolor/scalable/apps/${EMACS_NAME}.svg" \
-	     "hicolor/scalable/apps/${EMACS_NAME}.ico" \
-	     "hicolor/scalable/mimetypes/${EMACS_NAME}-document.svg" \
-	     "hicolor/scalable/mimetypes/${EMACS_NAME}-document23.svg"; \
+	     hicolor/scalable/mimetypes/`echo emacs-document | sed '$(TRANSFORM)'`.svg; \
 	fi)
 	-rm -f "$(DESTDIR)${desktopdir}/${EMACS_NAME}.desktop"
-	-rm -f "$(DESTDIR)${metainfodir}/${EMACS_NAME}.metainfo.xml"
+	-rm -f "$(DESTDIR)${appdatadir}/${EMACS_NAME}.appdata.xml"
 	-rm -f "$(DESTDIR)$(systemdunitdir)/${EMACS_NAME}.service"
   ifneq (,$(use_gamedir))
 	for file in snake-scores tetris-scores; do \
@@ -985,11 +813,12 @@ endef
 ###      target for GCC does not delete 'libgcc.a', because recompiling it
 ###      is rarely necessary and takes a lot of time.
 mostlyclean_dirs = src oldXMenu lwlib lib lib-src nt doc/emacs doc/misc \
-  doc/lispref doc/lispintro test
+  doc/lispref doc/lispintro
 
 $(foreach dir,$(mostlyclean_dirs),$(eval $(call submake_template,$(dir),mostlyclean)))
 
 mostlyclean: $(mostlyclean_dirs:=_mostlyclean)
+	[ ! -d test ] || $(MAKE) -C test $@
 
 ### 'clean'
 ###      Delete all files from the current directory that are normally
@@ -999,19 +828,20 @@ mostlyclean: $(mostlyclean_dirs:=_mostlyclean)
 ###      with them.
 ###
 ###      Delete '.dvi' files here if they are not part of the distribution.
-clean_dirs = $(mostlyclean_dirs) nextstep admin/charsets admin/unidata
+clean_dirs = $(mostlyclean_dirs) nextstep
 
 $(foreach dir,$(clean_dirs),$(eval $(call submake_template,$(dir),clean)))
 
-clean: $(clean_dirs:=_clean) clean-gsettings-schemas
-	-rm -f ./*.tmp etc/*.tmp*
+clean: $(clean_dirs:=_clean)
+	$(MAKE) -C admin/charsets $@
+	[ ! -d test ] || $(MAKE) -C test $@
+	-rm -f *.tmp etc/*.tmp*
 	-rm -rf info-dir.*
-	-rm -rf native-lisp
 
 ### 'bootclean'
 ###      Delete all files that need to be remade for a clean bootstrap.
 top_bootclean=\
-	rm -f config.log ${srcdir}/doc/man/emacs.1
+	rm -f config.cache config.log ${srcdir}/doc/man/emacs.1
 
 ### 'distclean'
 ###      Delete all files from the current directory that are created by
@@ -1021,18 +851,21 @@ top_bootclean=\
 ###      distribution.
 top_distclean=\
 	${top_bootclean}; \
-	rm -f config.cache config.status config.log~ \
-	  Makefile makefile lib/gnulib.mk ${SUBDIR_MAKEFILES}
+	rm -f config.status config.log~ \
+	  Makefile lib/gnulib.mk ${SUBDIR_MAKEFILES}
 
-distclean_dirs = $(clean_dirs) leim lisp admin/grammars
+distclean_dirs = $(clean_dirs) leim lisp
 
 $(foreach dir,$(distclean_dirs),$(eval $(call submake_template,$(dir),distclean)))
 
-distclean: $(distclean_dirs:=_distclean) clean-gsettings-schemas
+maybeclean_dirs = test admin/grammars admin/unidata admin/charsets
+
+distclean: $(distclean_dirs:=_distclean)
+	for dir in $(filter-out test,$(maybeclean_dirs)); do \
+	  $(MAKE) -C $$dir $@ || exit; \
+	done
+	[ ! -d test ] || $(MAKE) -C test $@
 	${top_distclean}
-ifeq ($(HAVE_NATIVE_COMP),yes)
-	rm -rf native-lisp
-endif
 
 ### 'bootstrap-clean'
 ###      Delete everything that can be reconstructed by 'make' and that
@@ -1040,13 +873,13 @@ endif
 $(foreach dir,$(distclean_dirs),$(eval $(call submake_template,$(dir),bootstrap-clean)))
 
 bootstrap-clean: $(distclean_dirs:=_bootstrap-clean)
+	for dir in $(filter-out test,$(maybeclean_dirs)); do \
+	  $(MAKE) -C $$dir $@ || exit; \
+	done
+	[ ! -d test ] || $(MAKE) -C test $@
 	[ ! -f config.log ] || mv -f config.log config.log~
 	rm -rf ${srcdir}/info
 	rm -f ${srcdir}/etc/refcards/emacsver.tex
-	rm -rf native-lisp/ lisp/leim/ja-dic/
-ifndef FAST
-	rm -fr autom4te.cache config.cache
-endif
 	${top_bootclean}
 
 ### 'maintainer-clean'
@@ -1062,47 +895,52 @@ endif
 ###      begin to build the program.
 top_maintainer_clean=\
 	${top_distclean}; \
-	rm -fr ${srcdir}/autom4te.cache
+	rm -fr autom4te.cache
 
-$(foreach dir,$(distclean_dirs),$(eval $(call submake_template,$(dir),maintainer-clean)))
+maintainer_clean_dirs = src leim lisp
 
-maintainer-clean: $(distclean_dirs:=_maintainer-clean)
-	rm -rf ${srcdir}/info
-	rm -f ${srcdir}/etc/refcards/emacsver.tex
+$(foreach dir,$(maintainer_clean_dirs),$(eval $(call submake_template,$(dir),maintainer-clean)))
+
+maintainer-clean: bootstrap-clean $(maintainer_clean_dirs:=_maintainer-clean)
+	for dir in $(filter-out test,$(maybeclean_dirs)); do \
+	  $(MAKE) -C $$dir $@ || exit; \
+	done
+	[ ! -d test ] || $(MAKE) -C test $@
 	${top_maintainer_clean}
 
 ### This doesn't actually appear in the coding standards, but Karl
 ### says GCC supports it, and that's where the configuration part of
 ### the coding standards seem to come from.  It's like distclean, but
 ### it deletes backup and autosave files too.
-extraclean: maintainer-clean
-	-rm -f config-tmp-* ${srcdir}/aclocal.m4 ${srcdir}/configure \
-	  ${srcdir}/src/config.in
-	-[ "${srcdir}" = "." ] || \
-	  find ${srcdir} '(' -name '*~' -o -name '#*' ')' ${FIND_DELETE}
-	-find . '(' -name '*~' -o -name '#*' ')' ${FIND_DELETE}
+### Note that we abuse this in some subdirectories (eg leim),
+### to delete some generated files that are slow to rebuild.
+extraclean_dirs = ${NTDIR} lib-src src leim \
+  admin/charsets admin/grammars admin/unidata
+
+$(foreach dir,$(extraclean_dirs),$(eval $(call submake_template,$(dir),extraclean)))
+
+extraclean: $(extraclean_dirs:=_extraclean)
+	${top_maintainer_clean}
+	-rm -f config-tmp-*
+	-rm -f *~ \#*
 
 # The src subdir knows how to do the right thing
 # even when the build directory and source dir are different.
 .PHONY: TAGS tags
-# FIXME: We used to include `src` in the dependencies, not sure why.
-# I removed it because it causes `make tags` to build Emacs.
-TAGS tags: lib lib-src # src
+TAGS tags: lib lib-src src
 	$(MAKE) -C src tags
-	$(MAKE) -C doc/emacs tags
-	$(MAKE) -C doc/lispintro tags
-	$(MAKE) -C doc/lispref tags
-	$(MAKE) -C doc/misc tags
 
-CHECK_TARGETS = check check-maybe check-expensive check-all
-.PHONY: $(CHECK_TARGETS)
-$(CHECK_TARGETS): all
+.PHONY: have-tests
+have-tests:
+	@if test ! -d test; then \
+	  echo "You do not seem to have the test/ directory."; \
+	  echo "Maybe you are using a release tarfile, rather than a repository checkout."; \
+	 exit 1; \
+	fi
+
+check check-maybe check-expensive: have-tests all
 	$(MAKE) -C test $@
 
-test/%:
-	$(MAKE) -C test $*
-
-
 dist:
 	cd ${srcdir}; ./make-dist
 
@@ -1117,34 +955,24 @@ $(DOCS):
 	$(MAKE) -C doc/$(subst -, ,$@)
 
 .PHONY: $(DOCS) docs pdf ps
-.PHONY: info dvi dist html info-dir check-info
+.PHONY: info dvi dist check check-maybe check-expensive html info-real info-dir check-info
 
 ## TODO add etc/refcards.
 docs: $(DOCS)
 dvi: $(DVIS)
 html: $(HTMLS)
-info: $(INFOS) info-dir
+info-real: $(INFOS)
 pdf: $(PDFS)
 ps: $(PSS)
 
-# This dependency is due to those doc/misc/ manuals that use .org sources.
-# Depending on src is sufficient, but ends up being slow, since the
-# uncompiled lisp/org/*.el files are used to build the .texi files
-# (which can be slow even with the elc files).
-misc-info: lisp
-# Using src rather than lisp because one is less likely to get unnecessary
-# rebuilds of stuff that is not strictly necessary for generating manuals.
-misc-dvi misc-html misc-pdf misc-ps: src
-
 info-dir: ${srcdir}/info/dir
 
-texi_misc = $(shell MAKEFLAGS= ${MAKE} --no-print-directory -s -C doc/misc echo-sources)
-
+## Hopefully doc/misc/*.texi is not too long for some systems?
 srcdir_doc_info_dir_inputs = \
   ${srcdir}/doc/emacs/emacs.texi \
   ${srcdir}/doc/lispintro/emacs-lisp-intro.texi \
   ${srcdir}/doc/lispref/elisp.texi \
-  $(addprefix ${srcdir}/doc/misc/,${texi_misc})
+  $(sort $(wildcard ${srcdir}/doc/misc/*.texi))
 info_dir_inputs = \
   ../build-aux/dir_top \
   $(subst ${srcdir}/doc/,,${srcdir_doc_info_dir_inputs})
@@ -1157,13 +985,14 @@ info_dir_deps = \
 ## installation location by the install-info rule, but we also
 ## need one in the source directory for people running uninstalled.
 ## FIXME it would be faster to use the install-info program if we have it,
-## but then we would need to depend on ${INFOS}, which would
+## but then we would need to depend on info-real, which would
 ## slow down parallelization.
 ${srcdir}/info/dir: ${info_dir_deps}
-	$(AM_V_GEN)${MKDIR_P} ${srcdir}/info
-	$(AM_V_at)(cd ${srcdir}/doc && \
+	$(AM_V_at)${MKDIR_P} ${srcdir}/info
+	$(AM_V_GEN)(cd ${srcdir}/doc && \
 	 AWK='${AWK}' ../build-aux/make-info-dir ${info_dir_inputs} \
-	) >$@.tmp && mv $@.tmp $@
+	) >$@.tmp
+	mv $@.tmp $@
 
 INSTALL_DVI = install-emacs-dvi install-lispref-dvi \
 	install-lispintro-dvi install-misc-dvi
@@ -1212,6 +1041,23 @@ uninstall-html: $(UNINSTALL_HTML)
 uninstall-pdf: $(UNINSTALL_PDF)
 uninstall-ps: $(UNINSTALL_PS)
 
+
+# Note that man/Makefile knows how to put the info files in $(srcdir),
+# so we can do ok running make in the build dir.
+# This used to have a clause that exited with an error if MAKEINFO = no.
+# But it is inappropriate to do so without checking if makeinfo is
+# actually needed - it is not if the info files are up-to-date.  (Bug#3982)
+# Only the doc/*/Makefiles can decide that, so we let those rules run
+# and give a standard error if makeinfo is needed but missing.
+# While it would be nice to give a more detailed error message, that
+# would require changing every rule in doc/ that builds an info file,
+# and it's not worth it.  This case is only relevant if you download a
+# release, then change the .texi files.
+info:
+  ifneq ($(HAVE_MAKEINFO),no)
+	$(MAKE) info-real info-dir
+  endif
+
 ## build-aux/make-info-dir expects only certain dircategories.
 check-info: info
 	cd info ; \
@@ -1240,30 +1086,17 @@ check-info: info
 ### This first cleans the lisp subdirectory, removing all compiled
 ### Lisp files.  Then re-run make to build all the files anew.
 
-.PHONY: bootstrap actual-bootstrap
+.PHONY: bootstrap
 
-bootstrap:
-	$(MAKE) actual-bootstrap || $(MAKE) advice-on-failure make-target=bootstrap exit-status=$$?
-	$(MAKE) sanity-check make-target=bootstrap
-
-# Without a 'configure' variable, bootstrapping does the following:
+# Bootstrapping does the following:
 #  * Remove files to start from a bootstrap-clean slate.
 #  * Run autogen.sh.
 #  * Rebuild Makefile, to update the build procedure itself.
 #  * Do the actual build.
-# With a 'configure' variable, bootstrapping does the following:
-#  * Remove files to start from an extraclean slate.
-#  * Do the actual build, during which the 'configure' variable is
-#    used (see the Makefile goal in GNUmakefile).
-actual-bootstrap:
-ifndef configure
-	$(MAKE) bootstrap-clean
-	cd $(srcdir) && ./autogen.sh autoconf
+bootstrap: bootstrap-clean
+	cd $(srcdir) && ./autogen.sh
 	$(MAKE) MAKEFILE_NAME=force-Makefile force-Makefile
-else
-	$(MAKE) extraclean
-endif
-	$(MAKE) actual-all
+	$(MAKE) all
 
 .PHONY: ChangeLog change-history change-history-commit change-history-nocommit
 .PHONY: preferred-branch-is-current unchanged-history-files
@@ -1283,11 +1116,11 @@ ChangeLog:
 	  ./$(emacslog) -o $(CHANGELOG) -n $(CHANGELOG_HISTORY_INDEX_MAX)
 
 # Check that we are in a good state for changing history.
-PREFERRED_BRANCH = emacs-28
+PREFERRED_BRANCH = master
 preferred-branch-is-current:
 	git branch | grep -q '^\* $(PREFERRED_BRANCH)$$'
 unchanged-history-files:
-	x=`git diff-files --name-only $(CHANGELOG_N) $(emacslog)` && \
+	x=$$(git diff-files --name-only $(CHANGELOG_N) $(emacslog)) && \
 	  test -z "$$x"
 
 # Regular expression that matches the newest commit covered by a ChangeLog.
@@ -1323,42 +1156,3 @@ check-declare:
 	  exit 1; \
 	fi
 	$(MAKE) -C lisp $@
-	$(MAKE) -C test $@
-
-.PHONY: gitmerge
-
-GITMERGE_EMACS = ./src/emacs${EXEEXT}
-GITMERGE_NMIN = 10
-
-gitmerge:
-	${GITMERGE_EMACS} -batch --no-site-file --no-site-lisp \
-	  -l ${srcdir}/admin/gitmerge.el \
-	  --eval '(setq gitmerge-minimum-missing ${GITMERGE_NMIN})' -f gitmerge
-
-install-gsettings-schemas:
-ifeq ($(HAVE_PGTK)$(HAVE_GSETTINGS),yesyes)
-	$(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"
-	$(INSTALL_DATA) $(srcdir)/$(gsettings_SCHEMAS) "$(DESTDIR)$(gsettingsschemadir)"
-	if [ -z "$(DESTDIR)" ]; then $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); fi
-endif
-
-uninstall-gsettings-schemas:
-ifeq ($(HAVE_PGTK)$(HAVE_GSETTINGS),yesyes)
-	for x in $(gsettings_SCHEMAS); do \
-	  xx=`echo $$x | sed -e 's|.*/||'`; \
-	  rm -f "$(DESTDIR)$(gsettingsschemadir)/$${xx}"; \
-	done
-	if [ -z "$(DESTDIR)" ]; then $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); fi
-endif
-
-clean-gsettings-schemas:
-ifeq ($(HAVE_PGTK)$(HAVE_GSETTINGS),yesyes)
-	rm -f $(gsettings_SCHEMAS:.xml=.valid)
-endif
-
-$(gsettings_SCHEMAS:.xml=.valid): $(srcdir)/$(gsettings_SCHEMAS)
-ifeq ($(HAVE_PGTK)$(HAVE_GSETTINGS),yesyes)
-	$(GLIB_COMPILE_SCHEMAS) --strict --dry-run --schema-file=$(srcdir)/$(gsettings_SCHEMAS)
-	$(MKDIR_P) $(@D)
-	touch $@
-endif

README

@@ -1,8 +1,8 @@
-Copyright (C) 2001-2023 Free Software Foundation, Inc.
+Copyright (C) 2001-2017 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
-This directory tree holds version 30.0.50 of GNU Emacs, the extensible,
+This directory tree holds version 26.0.50 of GNU Emacs, the extensible,
 customizable, self-documenting real-time display editor.
 
 The file INSTALL in this directory says how to build and install GNU
@@ -28,8 +28,8 @@ See the "Bugs" section of the Emacs manual for more information on how
 to report bugs.  (The file 'BUGS' in this directory explains how you
 can find and read that section using the Info files that come with
 Emacs.)  For a list of mailing lists related to Emacs, see
-<https://savannah.gnu.org/mail/?group=emacs>.  For the complete
-list of GNU mailing lists, see <https://lists.gnu.org/>.
+<http://savannah.gnu.org/mail/?group=emacs>.  For the complete
+list of GNU mailing lists, see <http://lists.gnu.org/>.
 
 The 'etc' subdirectory contains several other files, named in capital
 letters, which you might consider looking at when installing GNU
@@ -45,8 +45,7 @@ The file 'configure.ac' is the input used by the autoconf program to
 construct the 'configure' script.
 
 The shell script 'autogen.sh' generates 'configure' and other files by
-running Autoconf (which in turn uses GNU m4), and configures files in
-the .git subdirectory if you are using Git.  If you want to use it,
+running Autoconf, which in turn uses GNU m4.  If you want to use it,
 you will need to install recent versions of these build tools.  This
 should be needed only if you edit files like 'configure.ac' that
 specify Emacs's autobuild procedure.
@@ -72,8 +71,6 @@ There are several subdirectories:
 'lib'       holds source code for libraries used by Emacs and its utilities
 'lib-src'   holds the source code for some utility programs for use by or
             with Emacs, like movemail and etags.
-'lwlib'     holds the sources of the Lucid Widget Library used on X.
-'oldXMenu'  source files from X11R2 XMenu library, used in non-toolkit builds.
 'etc'       holds miscellaneous architecture-independent data files Emacs
             uses, like the tutorial text and tool bar images.
             The contents of the 'lisp', 'leim', 'info', and 'doc'
@@ -91,10 +88,6 @@ There are several subdirectories:
             Nextstep port of Emacs, for GNUstep and macOS Cocoa.
 'nt'        holds code and documentation for building Emacs on MS-Windows.
 'test'      holds tests for various aspects of Emacs's functionality.
-'modules'   holds the modhelp.py helper script.
-'admin'     holds files used by Emacs developers, and Unicode data files.
-'build-aux' holds auxiliary files used during the build.
-'m4'        holds Autoconf macros used for generating the configure script.
 
    Building Emacs on non-Posix platforms requires tools that aren't part
 of the standard distribution of the OS.  The platform-specific README
@@ -122,4 +115,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.

admin/CPP-DEFINES

@@ -19,12 +19,12 @@ __DJGPP_MINOR__ Minor version number of the DJGPP library; used only in msdos.c
 DOS_NT		Compiling for either the MS-DOS or native MS-Windows port.
 WINDOWSNT	Compiling the native MS-Windows (W32) port.
 __MINGW32__	Compiling the W32 port with the MinGW or MinGW-w64 ports of GCC.
+_MSC_VER	Compiling the W32 port with the Microsoft C compiler.
 MINGW_W64	Compiling the W32 port with the MinGW-w64 port of GCC.
 DARWIN_OS	Compiling on macOS or pure Darwin (and using s/darwin.h).
 SOLARIS2
 USG
 USG5_4
-HAIKU		Compiling on Haiku.
 
 ** Distinguishing GUIs **
 
@@ -33,38 +33,16 @@ HAVE_NS		Use the NeXT/OpenStep/Cocoa UI under macOS or GNUstep.
 NS_IMPL_GNUSTEP	Compile support for GNUstep implementation of NS GUI API.
 NS_IMPL_COCOA	Compile support for Cocoa (Apple) implementation of NS GUI API.
 HAVE_X11	Compile support for the X11 GUI.
-HAVE_PGTK	Compile support for using GTK itself without directly using X Windows APIs.
-HAVE_HAIKU	Compile support for the Haiku window system.
 HAVE_X_WINDOWS	Compile support for X Window system
   (It looks like, nowadays, if HAVE_X11 is set, HAVE_X_WINDOWS must
    be, and vice versa.  At least, this is true for configure, and
    msdos; not sure about nt.)
-
-** X Windows features **
-HAVE_X11R6	Whether or not the system has X11R6.  (Always defined.)
-HAVE_X11R6_XIM	Whether or not the system supports XIM features introduced in R6.
-HAVE_X11XTR6	Whether or not the Xt is from X11R6 or newer.
-
+HAVE_X11R6
+HAVE_X11R6_XIM
+HAVE_X11XTR6
 USE_LUCID	Use the Lucid toolkit for menus&scrollbars.  Requires HAVE_X11.
 USE_MOTIF	Use the Motif toolkit for menus&scrollbars.  Requires HAVE_X11.
-USE_GTK		Use the Gtk   toolkit for menus&scrollbars.  Requires HAVE_X11 or HAVE_PGTK.
-HAVE_GTK3	Use GTK version 3 or later. Requires HAVE_X11.
-
-HAVE_XCB_SHAPE	Whether or not XCB supports the Nonrectangular Window Shape extension.
-HAVE_XCOMPOSITE	Whether or not the XCOMPOSITE extension library is present.
-HAVE_XDBE	Whether or not to use the Xdbe extension for double buffering.
-HAVE_XFIXES	Whether or not the Xfixes extension library is present.
-HAVE_XINERAMA	Whether or not the Xinerama extension library is present.
-HAVE_XINPUT2	Whether or not to use version 2 of the X Input Extension for input.
-HAVE_XINPUT2_1	Whether or not version 2.1 of the X Input Extension is supported.
-HAVE_XINPUT2_2	Whether or not version 2.2 of the X Input Extension is supported.
-HAVE_XINPUT2_3	Whether or not version 2.3 of the X Input Extension is supported.
-HAVE_XINPUT2_4	Whether or not version 2.4 of the X Input Extension is supported.
-HAVE_XKB	Whether or not the XKB extension library is present.
-HAVE_XRANDR	Whether or not the RandR extension library is present.
-HAVE_XSHAPE	Whether or not the Nonrectangular Window Shape extension library is present.
-HAVE_XSYNC	Whether or not the X Synchronization Extension library is present.
-USE_XCB		Whether or not the XCB library is used to optimize some X requests.
+USE_GTK		Use the Gtk   toolkit for menus&scrollbars.  Requires HAVE_X11.
 
 ** Frame types **
 
@@ -104,6 +82,7 @@ anymore, so they can be removed.
 
 AMPERSAND_FULL_NAME
 BROKEN_DATAGRAM_SOCKETS
+BROKEN_FIONREAD
 BROKEN_GET_CURRENT_DIR_NAME
 BROKEN_PTY_READ_AFTER_EAGAIN
 DEFAULT_SOUND_DEVICE
@@ -116,12 +95,18 @@ EMACS_CONFIG_OPTIONS
 EMACS_INT
 EMACS_UINT
 GC_MARK_SECONDARY_STACK
+GC_MARK_STACK
 GC_SETJMP_WORKS
 GNU_MALLOC
+HAVE_AIX_SMT_EXP
+HAVE_ALARM
 HAVE_ALLOCA
 HAVE_ALLOCA_H
 HAVE_ALSA
+HAVE_ATTRIBUTE_ALIGNED
 HAVE_BDFFONT
+HAVE_BOXES
+HAVE_C99_STRTOLD
 HAVE_CFMAKERAW
 HAVE_CFSETSPEED
 HAVE_CLOCK_GETTIME
@@ -135,14 +120,19 @@ HAVE_DBUS_VALIDATE_INTERFACE
 HAVE_DBUS_VALIDATE_MEMBER
 HAVE_DBUS_VALIDATE_PATH
 HAVE_DBUS_WATCH_GET_UNIX_FD
+HAVE_DECL_GETENV
 HAVE_DECL_LOCALTIME_R
 HAVE_DECL_STRMODE
 HAVE_DECL_STRTOIMAX
 HAVE_DECL_STRTOLL
 HAVE_DECL_STRTOULL
 HAVE_DECL_STRTOUMAX
+HAVE_DECL_SYS_SIGLIST
 HAVE_DECL_TZNAME
+HAVE_DECL___SYS_SIGLIST
 HAVE_DIALOGS
+HAVE_DIFFTIME
+HAVE_DUP2
 HAVE_ENDGRENT
 HAVE_ENDPWENT
 HAVE_ENVIRON_DECL
@@ -156,9 +146,11 @@ HAVE_FUTIMES
 HAVE_FUTIMESAT
 HAVE_GAI_STRERROR
 HAVE_GCONF
+HAVE_GETDELIM
 HAVE_GETGRENT
 HAVE_GETHOSTNAME
 HAVE_GETIFADDRS
+HAVE_GETLINE
 HAVE_GETLOADAVG
 HAVE_GETOPT_H
 HAVE_GETOPT_LONG_ONLY
@@ -177,10 +169,21 @@ HAVE_GPM
 HAVE_GRANTPT
 HAVE_GSETTINGS
 HAVE_GTK3
+HAVE_GTK_ADJUSTMENT_GET_PAGE_SIZE
+HAVE_GTK_DIALOG_GET_ACTION_AREA
 HAVE_GTK_FILE_SELECTION_NEW
+HAVE_GTK_MAIN
+HAVE_GTK_MULTIDISPLAY
+HAVE_GTK_ORIENTABLE_SET_ORIENTATION
+HAVE_GTK_WIDGET_GET_MAPPED
+HAVE_GTK_WIDGET_GET_SENSITIVE
+HAVE_GTK_WIDGET_GET_WINDOW
+HAVE_GTK_WIDGET_SET_HAS_WINDOW
 HAVE_GTK_WINDOW_SET_HAS_RESIZE_GRIP
+HAVE_G_TYPE_INIT
 HAVE_IFADDRS_H
 HAVE_IMAGEMAGICK
+HAVE_INET_SOCKETS
 HAVE_INTTYPES_H
 HAVE_JPEG
 HAVE_KERBEROSIV_KRB_H
@@ -196,10 +199,14 @@ HAVE_LIBLOCKFILE
 HAVE_LIBMAIL
 HAVE_LIBOTF
 HAVE_LIBPERFSTAT
+HAVE_LIBPNG_PNG_H
 HAVE_LIBSELINUX
 HAVE_LIBXML2
+HAVE_LIBXMU
 HAVE_LOCALTIME_R
 HAVE_LOCAL_SOCKETS
+HAVE_LONG_FILE_NAMES
+HAVE_LONG_LONG_INT
 HAVE_LRAND48
 HAVE_LSTAT
 HAVE_LUTIMES
@@ -210,18 +217,24 @@ HAVE_MAGICKEXPORTIMAGEPIXELS
 HAVE_MAGICKMERGEIMAGELAYERS
 HAVE_MAILLOCK_H
 HAVE_MALLOC_MALLOC_H
+HAVE_MATHERR
 HAVE_MBSTATE_T
+HAVE_MEMCMP
+HAVE_MEMMOVE
 HAVE_MEMORY_H
 HAVE_MEMSET
+HAVE_MENUS
 HAVE_MKSTEMP
 HAVE_MMAP
 HAVE_MULTILINGUAL_MENU
+HAVE_NANOTIME
 HAVE_NET_IF_DL_H
 HAVE_NET_IF_H
 HAVE_NLIST_H
 HAVE_OTF_GET_VARIATION_GLYPHS
 HAVE_PERSONALITY_ADDR_NO_RANDOMIZE
 HAVE_PNG
+HAVE_PNG_H
 HAVE_POSIX_MEMALIGN
 HAVE_PROCFS
 HAVE_PSELECT
@@ -258,12 +271,15 @@ HAVE_SOUNDCARD_H
 HAVE_STDINT_H
 HAVE_STDIO_EXT_H
 HAVE_STDLIB_H
+HAVE_STLIB_H_1
 HAVE_STRINGS_H
 HAVE_STRING_H
+HAVE_STRNCASECMP
 HAVE_STRSIGNAL
 HAVE_STRTOIMAX
 HAVE_STRTOLL
 HAVE_STRTOULL
+HAVE_STRTOUMAX
 HAVE_STRUCT_ERA_ENTRY
 HAVE_STRUCT_IFREQ_IFR_ADDR
 HAVE_STRUCT_IFREQ_IFR_ADDR_SA_LEN
@@ -279,7 +295,9 @@ HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC
 HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC
 HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC
 HAVE_STRUCT_STAT_ST_BIRTHTIM_TV_NSEC
+HAVE_STRUCT_TIMEZONE
 HAVE_STRUCT_TM_TM_ZONE
+HAVE_STRUCT_UTIMBUF
 HAVE_ST_DM_MODE
 HAVE_SYMLINK
 HAVE_SYNC
@@ -293,25 +311,30 @@ HAVE_SYS_SOCKET_H
 HAVE_SYS_SOUNDCARD_H
 HAVE_SYS_STAT_H
 HAVE_SYS_SYSTEMINFO_H
+HAVE_SYS_TIMEB_H
 HAVE_SYS_TIME_H
 HAVE_SYS_TYPES_H
 HAVE_SYS_UN_H
 HAVE_SYS_UTSNAME_H
 HAVE_SYS_VLIMIT_H
 HAVE_SYS_WAIT_H
+HAVE_TCATTR
 HAVE_TERM_H
 HAVE_TIFF
+HAVE_TIMEVAL
 HAVE_TM_GMTOFF
 HAVE_TM_ZONE
 HAVE_TOUCHLOCK
 HAVE_TZNAME
+HAVE_TZSET
+HAVE_UNSIGNED_LONG_LONG_INT
 HAVE_UTIL_H
 HAVE_UTIMENSAT
+HAVE_UTIMES
+HAVE_UTIME_H
 HAVE_UTMP_H
 HAVE_VFORK
 HAVE_VFORK_H
-HAVE_WEBP
-HAVE_SQLITE3
 HAVE_WCHAR_H
 HAVE_WCHAR_T
 HAVE_WINDOW_SYSTEM
@@ -328,10 +351,14 @@ HAVE_XRMSETDATABASE
 HAVE_XSCREENNUMBEROFSCREEN
 HAVE_XSCREENRESOURCESTRING
 HAVE_X_I18N
+HAVE_X_MENU
 HAVE_X_SM
 HAVE_X_WINDOWS
+HAVE__BOOL
+HAVE__FTIME
 HAVE___BUILTIN_UNWIND_INIT
 HAVE___EXECUTABLE_START
+HAVE___FPENDING
 INTERNAL_TERMINAL
 IS_ANY_SEP
 IS_DIRECTORY_SEP
@@ -341,6 +368,7 @@ MAIL_USE_POP
 MAIL_USE_SYSTEM_LOCK
 MAXPATHLEN
 NLIST_STRUCT
+NO_EDITRES
 NSIG
 NSIG_MINIMUM
 NULL_DEVICE
@@ -359,6 +387,7 @@ SYSTEM_MALLOC
 TAB3
 TABDLY
 TERM
+TIME_WITH_SYS_TIME
 TIOCSIGSEND
 TM_IN_SYS_TIME
 UNIX98_PTYS

admin/ChangeLog.1

@@ -181,7 +181,7 @@
 
 	* grammars/c.by (opt-brackets-after-symbol): New.
 	(multi-stage-dereference): Use it.  Add rules for explicit
-	matching the last dereference.  We cannot just use
+	matching the last dereference.  We cannot just juse
 	'namespace-symbol' as a single rule, since this would match too
 	greedy and mess with parsing default values of variables.
 
@@ -1258,7 +1258,7 @@
 2012-06-13  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* make-emacs: Rename --union-type to --check-lisp-type.
-	Define CHECK_LISP_OBJECT_TYPE instead of USE_LISP_UNION_TYPE.
+	Define CHECK_LISP_OBJECT_TYPE insted of USE_LISP_UNION_TYPE.
 	* CPP-DEFINES (DEBUG_LISP_OBJECT_TYPE): Rename from
 	USE_LISP_UNION_TYPE.
 
@@ -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/r/emacs-devel/2011-01/msg00673.html>.
+	<http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00673.html>.
 
 2011-01-17  Paul Eggert  <eggert@cs.ucla.edu>
 
@@ -1629,10 +1629,10 @@
 2010-09-05  Juanma Barranquero  <lekktu@gmail.com>
 
 	* unidata/BidiMirroring.txt: Update from
-	https://www.unicode.org/Public/6.0.0/ucd/BidiMirroring-6.0.0d2.txt
+	http://www.unicode.org/Public/6.0.0/ucd/BidiMirroring-6.0.0d2.txt
 
 	* unidata/UnicodeData.txt: Update from
-	https://www.unicode.org/Public/6.0.0/ucd/UnicodeData-6.0.0d7.txt
+	http://www.unicode.org/Public/6.0.0/ucd/UnicodeData-6.0.0d7.txt
 
 2010-08-09  Andreas Schwab  <schwab@linux-m68k.org>
 
@@ -1668,7 +1668,7 @@
 	* unidata/bidimirror.awk: New file.
 
 	* unidata/BidiMirroring.txt: New file from
-	https://www.unicode.org/Public/6.0.0/ucd/BidiMirroring-6.0.0d1.txt.
+	http://www.unicode.org/Public/6.0.0/ucd/BidiMirroring-6.0.0d1.txt.
 
 	* unidata/Makefile.in (../../src/bidimirror.h): New target.
 	(all): Depend on ../../src/biditype.h and ../../src/bidimirror.h.
@@ -1685,7 +1685,7 @@
 2010-06-09  Juanma Barranquero  <lekktu@gmail.com>
 
 	* unidata/UnicodeData.txt: Update from
-	https://www.unicode.org/Public/6.0.0/ucd/UnicodeData-6.0.0d5.txt
+	http://www.unicode.org/Public/6.0.0/ucd/UnicodeData-6.0.0d5.txt
 
 2010-05-27  Glenn Morris  <rgm@gnu.org>
 
@@ -2031,7 +2031,7 @@
 	* unidata/unidata-gen.el: New file.
 
 	* unidata/UnicodeData.txt: New file.  Copied from
-	https://www.unicode.org on 2006-05-23.
+	http://www.unicode.org on 2006-05-23.
 
 	* unidata/.cvsignore: New file.
 
@@ -2577,7 +2577,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2001-2023 Free Software Foundation, Inc.
+  Copyright (C) 2001-2017 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -2592,4 +2592,4 @@
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.

admin/MAINTAINERS

@@ -37,7 +37,7 @@ Kenichi Handa
 	Mule
 
 Stefan Monnier
-	src/regex-emacs.c
+	src/regex.c
 	src/syntax.c
 	src/keymap.c
 	font-lock/jit-lock/syntax
@@ -58,8 +58,10 @@ Artur Malabarba
 
 Michael Albinus
         Tramp
+            lisp/net/tramp*.el
             lisp/url/url-tramp.el
-            test/lisp/url/url-tramp-tests.el
+            doc/misc/tramp*.texi
+            test/lisp/net/tramp-tests.el
 
         D-Bus
 	    src/dbusbind.c
@@ -123,43 +125,6 @@ Ulf Jasper
 	    lisp/calendar/icalendar.el
 	    test/lisp/calendar/icalendar-tests.el
 
-Amin Bandali
-	ERC
-	    lisp/erc/*
-	    doc/misc/erc.texi
-
-Andrea Corallo
-	Lisp native compiler
-	    src/comp.c
-	    lisp/emacs-lisp/comp.el
-	    lisp/emacs-lisp/comp-cstr.el
-	    test/src/comp-*.el
-
-Stefan Kangas
-        admin/automerge
-	admin/update_autogen
-
-Po Lu
-	The Haiku port:
-	    src/haikuterm.c
-	    src/haikufns.c
-	    src/haikuimage.c
-	    src/haikuselect.c
-	    src/haiku_io.c
-	    src/haiku.c
-	    src/haiku_select.cc
-	    src/haiku_support.cc
-	    src/haiku_font_support.cc
-	    src/haiku_draw_support.cc
-	    src/haikugui.h
-	    src/haikuterm.h
-	    src/haikuselect.h
-	    src/haiku_support.h
-	    lisp/term/haiku-win.el
-	    doc/emacs/haiku.texi
-
-	Haiku battery support in lisp/battery.el
-
 ==============================================================================
 2. Areas that someone is willing to maintain, although he would not
 necessarily mind if someone else was the official maintainer.
@@ -242,25 +207,13 @@ Paul Eggert
 	src/* (except for *.m, *w32*, bitmaps, files others want to maintain)
 
 Michael Albinus
-        .gitlab-ci.yml
 	src/inotify.c
         lisp/autorevert.el
 	lisp/eshell/em-tramp.el
-        lisp/files.el (file-name-non-special)
-	lisp/net/ange-ftp.el
 	lisp/notifications.el
-	lisp/shadowfile.el
-	test/infra/*
         test/lisp/autorevert-tests.el
-        test/lisp/files-tests.el (file-name-non-special)
-	test/lisp/shadowfile-tests.el
 	test/src/inotify-test.el
 
-	Secret Service API in
-	    lisp/auth-source.el
-	    doc/misc/auth.texi
-	    test/lisp/auth-source-tests.el
-
 Nicolas Petton
 	lisp/emacs-lisp/subr-x.el
 	lisp/arc-mode.el
@@ -276,60 +229,6 @@ Vibhav Pant
        lisp/net/browse-url.el
        lisp/erc/*
 
-Amin Bandali
-	Eshell
-	    lisp/eshell/*
-	    doc/misc/eshell.texi
-
-Po Lu
-	The X port
-	      src/xterm.c
-	      src/xfns.c
-	X11 and GTK xwidget support in src/xwidget.c
-	Precision pixel scrolling in lisp/pixel-scroll.el
-
-==============================================================================
-3. Externally maintained packages.
-==============================================================================
-
-Tramp
-	Maintainer: Michael Albinus
-	Repository: https://git.savannah.gnu.org/git/tramp.git
-	Mailing List: tramp-devel@gnu.org
-	Bug Reports: M-x tramp-bug
-	Notes: For backward compatibility requirements, see
-	  lisp/net/trampver.el.
-
-        lisp/net/tramp*.el
-        doc/misc/tramp*.texi
-        test/lisp/net/tramp*-tests.el
-
-Modus themes
-        Maintainer: Protesilaos Stavrou
-        Repository:  https://git.sr.ht/~protesilaos
-        Mailing list: https://lists.sr.ht/~protesilaos/modus-themes
-        Bug Reports: M-x modus-themes-report-bug
-
-        doc/misc/modus-themes.org
-        etc/themes/modus*.el
-
-Org Mode
-	Home Page: https://orgmode.org/
-	Maintainer: Org Mode developers
-	Repository: https://git.savannah.gnu.org/git/emacs/org-mode.git
-	Mailing list: emacs-orgmode@gnu.org
-	Bug Reports: M-x org-submit-bug-report
-	Notes: Org Mode is maintained as a separate project that is
-          periodically merged into Emacs.  To view or participate in
-          Org Mode development, please go to https://orgmode.org/ and
-          follow the instructions there.
-
-	lisp/org/*.el
-	etc/org/*
-	etc/refcards/orgcard.tex
-	doc/misc/org.org
-	doc/misc/org-setup.org
-
 
 ;;; Local Variables:
 ;;;   coding: utf-8

admin/README

@@ -1,4 +1,4 @@
-Copyright (C) 2001-2023 Free Software Foundation, Inc.
+Copyright (C) 2001-2017 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
@@ -61,19 +61,8 @@ Brief description of sub-directories:
 
 charsets		scripts for generating charset map files
 			in ../etc/charsets
-coccinelle		patches to make coccinelle work with
-			the latest Emacs version.  Since they
-			apply a few minor changes in Emacs internals
-			in multiple places, they are trivial for
-			copyright purposes.
-grammars		wisent and bovine grammars, used to produce
-			files in lisp/cedet/.
-notes			miscellaneous notes related to administrative
-			tasks.
-nt			support files for administrative tasks related
-			to building MS-Windows distributions.
 unidata			scripts for generating character property files
-			in ../lisp/international/.
+			in ../lisp/international
 
 
 This file is part of GNU Emacs.
@@ -89,7 +78,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 Local variables:
 mode: outline

admin/admin.el

@@ -1,6 +1,6 @@
-;;; admin.el --- utilities for Emacs administration  -*- lexical-binding: t; -*-
+;;; admin.el --- utilities for Emacs administration
 
-;; Copyright (C) 2001-2023 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2017 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -88,9 +88,6 @@ Optional argument DATE is the release date, default today."
     (kill-buffer)
     (message "No need to update `%s'" file)))
 
-(defvar admin-git-command (executable-find "git")
-  "The `git' program to use.")
-
 (defun set-version (root version)
   "Set Emacs version to VERSION in relevant files under ROOT.
 Root must be the root of an Emacs source tree."
@@ -99,8 +96,6 @@ Root must be the root of an Emacs source tree."
 		(read-string "Version number: " emacs-version)))
   (unless (file-exists-p (expand-file-name "src/emacs.c" root))
     (user-error "%s doesn't seem to be the root of an Emacs source tree" root))
-  (unless admin-git-command
-    (user-error "Could not find git; please install git and move NEWS manually"))
   (message "Setting version numbers...")
   ;; There's also a "version 3" (standing for GPLv3) at the end of
   ;; `README', but since `set-version-in-file' only replaces the first
@@ -119,11 +114,14 @@ Root must be the root of an Emacs source tree."
   ;; configure.ac with sed, rather than duplicating the information.
   (set-version-in-file root "msdos/sed2v2.inp" version
 		       (rx (and bol "/^#undef " (1+ not-newline)
-				"define PACKAGE_VERSION" (1+ space) "\""
+				"define VERSION" (1+ space) "\""
 				(submatch (1+ (in "0-9."))))))
   ;; Major version only.
   (when (string-match "\\([0-9]\\{2,\\}\\)" version)
     (let ((newmajor (match-string 1 version)))
+      (set-version-in-file root "src/msdos.c" newmajor
+                           (rx (and "Vwindow_system_version" (1+ not-newline)
+                                    ?\( (submatch (1+ (in "0-9"))) ?\))))
       (set-version-in-file root "etc/refcards/ru-refcard.tex" newmajor
                            "\\\\newcommand{\\\\versionemacs}\\[0\\]\
 {\\([0-9]\\{2,\\}\\)}.+%.+version of Emacs")))
@@ -140,32 +138,19 @@ Root must be the root of an Emacs source tree."
                               (if (eq 2 (length newversion)) 0 1))))
          (majorbump (and oldversion (not (equal oldmajor newmajor))))
          (minorbump (and oldversion (not majorbump)
-                         (or (not (equal (cadr oldversion) (cadr newversion)))
-                             ;; Eg 26.2 -> 26.2.50.
-                             (and (> (length newversion)
-                                     (length oldversion))))))
+                         (not (equal (cadr oldversion) (cadr newversion)))))
          (newsfile (expand-file-name "etc/NEWS" root))
          (oldnewsfile (expand-file-name (format "etc/NEWS.%s" oldmajor) root)))
     (unless (> (length newversion) 2)   ; pretest or release candidate?
       (with-temp-buffer
         (insert-file-contents newsfile)
-        (when (re-search-forward "^\\* [^\n]*\n+" nil t)
-          (display-warning 'admin
-                           "NEWS file contains empty sections - remove them?"))
-        (goto-char (point-min))
-        (if (re-search-forward "^\\(\\+\\+\\+? *$\\|---? *$\\|Temporary note:\\)" nil t)
+        (if (re-search-forward "^\\(+++ *\\|--- *\\)$" nil t)
             (display-warning 'admin
                              "NEWS file still contains temporary markup.
 Documentation changes might not have been completed!"))))
     (when (and majorbump
                (not (file-exists-p oldnewsfile)))
-      (call-process admin-git-command nil nil nil
-                    "mv" newsfile oldnewsfile)
-      (when (y-or-n-p "Commit move of NEWS file?")
-        (call-process admin-git-command nil nil nil
-                      "commit" "-m" (format "; Move etc/%s to etc/%s"
-                                            (file-name-nondirectory newsfile)
-                                            (file-name-nondirectory oldnewsfile))))
+      (rename-file newsfile oldnewsfile)
       (find-file oldnewsfile)           ; to prompt you to commit it
       (copy-file oldnewsfile newsfile)
       (with-temp-buffer
@@ -173,17 +158,11 @@ Documentation changes might not have been completed!"))))
         (re-search-forward "is about changes in Emacs version \\([0-9]+\\)")
         (replace-match (number-to-string newmajor) nil nil nil 1)
         (re-search-forward "^See files \\(NEWS\\)")
-        (unless (save-match-data
-                  (when (looking-at "\\(\\..*\\), \\(\\.\\.\\.\\|…\\)")
-                    (replace-match
-                     (format ".%s, NEWS.%s" oldmajor (1- oldmajor))
-                     nil nil nil 1)
-                    t))
-          (replace-match (format "NEWS.%s, NEWS" oldmajor) nil nil nil 1)
-          (let ((start (line-beginning-position)))
-            (search-forward "in older Emacs versions")
-            (or (equal start (line-beginning-position))
-                (fill-region start (line-beginning-position 2)))))
+        (replace-match (format "NEWS.%s, NEWS" oldmajor) nil nil nil 1)
+        (let ((start (line-beginning-position)))
+          (search-forward "in older Emacs versions")
+          (or (equal start (line-beginning-position))
+              (fill-region start (line-beginning-position 2))))
         (re-search-forward "^$")
         (forward-line -1)
         (let ((start (point)))
@@ -262,7 +241,7 @@ ROOT should be the root of an Emacs source tree."
     (search-forward "INFO_COMMON = ")
     (let ((start (point)))
       (end-of-line)
-      (while (and (looking-back "\\\\" (- (point) 2))
+      (while (and (looking-back "\\\\")
 		  (zerop (forward-line 1)))
 	(end-of-line))
       (append (split-string (replace-regexp-in-string
@@ -276,12 +255,8 @@ ROOT should be the root of an Emacs source tree."
 ROOT should be the root of an Emacs source tree.
 Interactively with a prefix argument, prompt for TYPE.
 Optional argument TYPE is type of output (nil means all)."
-  (interactive (let ((root
-                      (if noninteractive
-                          (or (pop command-line-args-left)
-                              default-directory)
-                        (read-directory-name "Emacs root directory: "
-                                             source-directory nil t))))
+  (interactive (let ((root (read-directory-name "Emacs root directory: "
+						source-directory nil t)))
 		 (list root
 		       (if current-prefix-arg
 			   (completing-read
@@ -345,16 +320,14 @@ Optional argument TYPE is type of output (nil means all)."
 
 (defconst manual-doctype-string
   "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\"
-\"https://www.w3.org/TR/html4/loose.dtd\">\n\n")
+\"http://www.w3.org/TR/html4/loose.dtd\">\n\n")
 
 (defconst manual-meta-string
-  "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\">\n")
-
-(defconst manual-links-string
-  "<link rev=\"made\" href=\"mailto:bug-gnu-emacs@gnu.org\">
+  "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\">
+<link rev=\"made\" href=\"mailto:bug-gnu-emacs@gnu.org\">
 <link rel=\"icon\" type=\"image/png\" href=\"/graphics/gnu-head-mini.png\">
 <meta name=\"ICBM\" content=\"42.256233,-71.006581\">
-<meta name=\"DC.title\" content=\"gnu.org\">\n")
+<meta name=\"DC.title\" content=\"gnu.org\">\n\n")
 
 (defconst manual-style-string "<style type=\"text/css\">
 @import url('/software/emacs/manual.css');\n</style>\n")
@@ -369,22 +342,13 @@ Optional argument TYPE is type of output (nil means all)."
     (manual-html-mono texi (expand-file-name (concat name ".html")
 					     html-mono-dir))))
 
-(defvar manual-makeinfo (or (getenv "MAKEINFO") "makeinfo")
-  "The `makeinfo' program to use.")
-
-(defvar manual-texi2pdf (or (getenv "TEXI2PDF") "texi2pdf")
-  "The `texi2pdf' program to use.")
-
-(defvar manual-texi2dvi (or (getenv "TEXI2DVI") "texi2dvi")
-  "The `texi2dvi' program to use.")
-
 (defun manual-html-mono (texi-file dest)
   "Run Makeinfo on TEXI-FILE, emitting mono HTML output to DEST.
 This function also edits the HTML files so that they validate as
 HTML 4.01 Transitional, and pulls in the gnu.org stylesheet using
 the @import directive."
   (make-directory (or (file-name-directory dest) ".") t)
-  (call-process manual-makeinfo nil nil nil
+  (call-process "makeinfo" nil nil nil
 		"-D" "WWW_GNU_ORG"
 		"-I" (expand-file-name "../emacs"
 				       (file-name-directory texi-file))
@@ -412,7 +376,7 @@ the @import directive."
   (unless (file-exists-p texi-file)
     (user-error "Manual file %s not found" texi-file))
   (make-directory dir t)
-  (call-process manual-makeinfo nil nil nil
+  (call-process "makeinfo" nil nil nil
 		"-D" "WWW_GNU_ORG"
 		"-I" (expand-file-name "../emacs"
 				       (file-name-directory texi-file))
@@ -451,7 +415,7 @@ the @import directive."
   "Run texi2pdf on TEXI-FILE, emitting PDF output to DEST."
   (make-directory (or (file-name-directory dest) ".") t)
   (let ((default-directory (file-name-directory texi-file)))
-    (call-process manual-texi2pdf nil nil nil
+    (call-process "texi2pdf" nil nil nil
 		  "-I" "../emacs" "-I" "../misc"
 		  texi-file "-o" dest)))
 
@@ -461,7 +425,7 @@ the @import directive."
   (let ((dvi-dest (concat (file-name-sans-extension dest) ".dvi"))
 	(default-directory (file-name-directory texi-file)))
     ;; FIXME: Use `texi2dvi --ps'?  --xfq
-    (call-process manual-texi2dvi nil nil nil
+    (call-process "texi2dvi" nil nil nil
 		  "-I" "../emacs" "-I" "../misc"
 		  texi-file "-o" dvi-dest)
     (call-process "dvips" nil nil nil dvi-dest "-o" dest)
@@ -485,13 +449,6 @@ the @import directive."
       (delete-region opoint (point))
       (search-forward "<meta http-equiv=\"Content-Style")
       (setq opoint (match-beginning 0)))
-    (search-forward "<title>")
-    (delete-region opoint (match-beginning 0))
-    (search-forward "</title>\n")
-    (when (search-forward "<link href=" nil t)
-      (goto-char (match-beginning 0)))
-    (insert manual-links-string)
-    (setq opoint (point))
     (search-forward "</head>")
     (goto-char (match-beginning 0))
     (delete-region opoint (point))
@@ -562,7 +519,7 @@ Leave point after the table."
 	(forward-line 1)
 	(while (not done)
 	  (cond ((re-search-forward "<tr><td.*&bull; \\(<a.*</a>\\)\
-:?</td><td>&nbsp;&nbsp;</td><td[^>]*>\\(.*\\)" (line-end-position) t)
+:</td><td>&nbsp;&nbsp;</td><td[^>]*>\\(.*\\)" (line-end-position) t)
 		 (replace-match (format "<tr><td%s>\\1</td>\n<td>\\2"
 					(if table-workaround
 					    " bgcolor=\"white\"" "")))
@@ -608,87 +565,80 @@ style=\"text-align:left\">")
 		 (forward-line 1)
 		 (setq done t)))))
     (let (done open-td tag desc)
-      ;; Texinfo 6.8 and later doesn't produce <ul class="menu"> lists
-      ;; for the TOC menu, and the "description" part of each menu
-      ;; item is not there anymore.  So for HTML manuals produced by
-      ;; those newer versions of Texinfo we punt and leave the menu in
-      ;; its original form.
-      (when (or (search-forward "<ul class=\"menu\">" nil t)
-	        ;; FIXME?  The following search seems dangerously lax.
-	        (search-forward "<ul>" nil t))
-        ;; Convert the list that Makeinfo made into a table.
-        (replace-match "<table style=\"float:left\" width=\"100%\">")
-        (forward-line 1)
-        (while (not done)
-	  (cond
-	   ((or (looking-at "<li>\\(<a.+</a>\\):[ \t]+\\(.*\\)$")
-	        (looking-at "<li>\\(<a.+</a>\\)$"))
-	    (setq tag (match-string 1))
-	    (setq desc (match-string 2))
-	    (replace-match "" t t)
-	    (when open-td
-	      (save-excursion
-	        (forward-char -1)
-	        (skip-chars-backward " ")
-	        (delete-region (point) (line-end-position))
-	        (insert "</td>\n  </tr>")))
-	    (insert "  <tr>\n    ")
-	    (if table-workaround
-	        ;; This works around a Firefox bug in the mono file.
-	        (insert "<td bgcolor=\"white\">")
-	      (insert "<td>"))
-	    (insert tag "</td>\n    <td>" (or desc ""))
-	    (setq open-td t))
-	   ((eq (char-after) ?\n)
-	    (delete-char 1)
-	    ;; Negate the following `forward-line'.
-	    (forward-line -1))
-	   ((looking-at "<!-- ")
-	    (search-forward "-->"))
-	   ((looking-at "<p>[- ]*The Detailed Node Listing[- \n]*")
-	    (replace-match "  </td></tr></table>\n
+      ;; Convert the list that Makeinfo made into a table.
+      (or (search-forward "<ul class=\"menu\">" nil t)
+	  ;; FIXME?  The following search seems dangerously lax.
+	  (search-forward "<ul>"))
+      (replace-match "<table style=\"float:left\" width=\"100%\">")
+      (forward-line 1)
+      (while (not done)
+	(cond
+	 ((or (looking-at "<li>\\(<a.+</a>\\):[ \t]+\\(.*\\)$")
+	      (looking-at "<li>\\(<a.+</a>\\)$"))
+	  (setq tag (match-string 1))
+	  (setq desc (match-string 2))
+	  (replace-match "" t t)
+	  (when open-td
+	    (save-excursion
+	      (forward-char -1)
+	      (skip-chars-backward " ")
+	      (delete-region (point) (line-end-position))
+	      (insert "</td>\n  </tr>")))
+	  (insert "  <tr>\n    ")
+	  (if table-workaround
+	      ;; This works around a Firefox bug in the mono file.
+	      (insert "<td bgcolor=\"white\">")
+	    (insert "<td>"))
+	  (insert tag "</td>\n    <td>" (or desc ""))
+	  (setq open-td t))
+	 ((eq (char-after) ?\n)
+	  (delete-char 1)
+	  ;; Negate the following `forward-line'.
+	  (forward-line -1))
+	 ((looking-at "<!-- ")
+	  (search-forward "-->"))
+	 ((looking-at "<p>[- ]*The Detailed Node Listing[- \n]*")
+	  (replace-match "  </td></tr></table>\n
 <h3>Detailed Node Listing</h3>\n\n" t t)
-	    (search-forward "<p>")
-	    ;; FIXME Fragile!
-	    ;; The Emacs and Elisp manual have some text at the
-	    ;; start of the detailed menu that is not part of the menu.
-	    ;; Other manuals do not.
-	    (if (looking-at "Here are some other nodes")
-	        (search-forward "<p>"))
-	    (goto-char (match-beginning 0))
-	    (skip-chars-backward "\n ")
-	    (setq open-td nil)
-	    (insert "</p>\n\n<table  style=\"float:left\" width=\"100%\">"))
-	   ((looking-at "</li></ul>")
-	    (replace-match "" t t))
-	   ((looking-at "<p>")
-	    (replace-match "" t t)
-	    (when open-td
-	      (insert "  </td></tr>")
-	      (setq open-td nil))
-	    (insert "  <tr>
+	  (search-forward "<p>")
+	  ;; FIXME Fragile!
+	  ;; The Emacs and Elisp manual have some text at the
+	  ;; start of the detailed menu that is not part of the menu.
+	  ;; Other manuals do not.
+	  (if (looking-at "Here are some other nodes")
+	      (search-forward "<p>"))
+	  (goto-char (match-beginning 0))
+	  (skip-chars-backward "\n ")
+	  (setq open-td nil)
+	  (insert "</p>\n\n<table  style=\"float:left\" width=\"100%\">"))
+	 ((looking-at "</li></ul>")
+	  (replace-match "" t t))
+	 ((looking-at "<p>")
+	  (replace-match "" t t)
+	  (when open-td
+	    (insert "  </td></tr>")
+	    (setq open-td nil))
+	  (insert "  <tr>
     <th colspan=\"2\" align=\"left\" style=\"text-align:left\">")
-	    (if (re-search-forward "</p>[ \t\n]*<ul class=\"menu\">" nil t)
-	        (replace-match "  </th></tr>")))
-	   ((looking-at "[ \t]*</ul>[ \t]*$")
-	    (replace-match
-	     (if open-td
-	         "  </td></tr>\n</table>"
-	       "</table>") t t)
-	    (setq done t))
-	   (t
-	    (if (eobp)
-	        (error "Parse error in %s"
-		       (file-name-nondirectory buffer-file-name)))
-	    (unless open-td
-	      (setq done t))))
-	  (forward-line 1))))))
+	  (if (re-search-forward "</p>[ \t\n]*<ul class=\"menu\">" nil t)
+	      (replace-match "  </th></tr>")))
+	 ((looking-at "[ \t]*</ul>[ \t]*$")
+	  (replace-match
+	   (if open-td
+	       "  </td></tr>\n</table>"
+	     "</table>") t t)
+	  (setq done t))
+	 (t
+	  (if (eobp)
+	      (error "Parse error in %s"
+		     (file-name-nondirectory buffer-file-name)))
+	  (unless open-td
+	    (setq done t))))
+	(forward-line 1)))))
 
 
 (defconst make-manuals-dist-output-variables
-  '(("@\\(top_\\)?srcdir@" . ".")	; top_srcdir is wrong, but not used
-    ("@\\(abs_\\)?top_builddir@" . ".") ; wrong but unused
-    ("^\\(EMACS *=\\).*" . "\\1 emacs")
+  `(("@\\(top_\\)?srcdir@" . ".")	; top_srcdir is wrong, but not used
     ("^\\(\\(?:texinfo\\|buildinfo\\|emacs\\)dir *=\\).*" . "\\1 .")
     ("^\\(clean:.*\\)" . "\\1 infoclean")
     ("@MAKEINFO@" . "makeinfo")
@@ -705,8 +655,7 @@ style=\"text-align:left\">")
     ("@GZIP_PROG@" . "gzip")
     ("@INSTALL@" . "install -c")
     ("@INSTALL_DATA@" . "${INSTALL} -m 644")
-    ("@configure_input@" . "")
-    ("@AM_DEFAULT_VERBOSITY@" . "0"))
+    ("@configure_input@" . ""))
   "Alist of (REGEXP . REPLACEMENT) pairs for `make-manuals-dist'.")
 
 (defun make-manuals-dist--1 (root type)
@@ -725,19 +674,15 @@ style=\"text-align:left\">")
     (if (file-directory-p stem)
 	(delete-directory stem t))
     (make-directory stem)
-    (setq stem (file-name-as-directory stem))
     (copy-file "../doc/misc/texinfo.tex" stem)
-    (unless (equal type "emacs")
-      (copy-file "../doc/emacs/emacsver.texi" stem)
-      (copy-file "../doc/emacs/docstyle.texi" stem))
+    (or (equal type "emacs") (copy-file "../doc/emacs/emacsver.texi" stem))
     (dolist (file (directory-files (format "../doc/%s" type) t))
       (if (or (string-match-p "\\(\\.texi\\'\\|/README\\'\\)" file)
 	      (and (equal type "lispintro")
 		   (string-match-p "\\.\\(eps\\|pdf\\)\\'" file)))
 	  (copy-file file stem)))
     (with-temp-buffer
-      (let ((outvars make-manuals-dist-output-variables)
-            (case-fold-search nil))
+      (let ((outvars make-manuals-dist-output-variables))
 	(push `("@version@" . ,version) outvars)
 	(insert-file-contents (format "../doc/%s/Makefile.in" type))
 	(dolist (cons outvars)
@@ -749,7 +694,7 @@ style=\"text-align:left\">")
 	  (setq ats t)
 	  (message "Unexpanded: %s" (match-string 0)))
 	(if ats (error "Unexpanded configure variables in Makefile?")))
-      (write-region nil nil (expand-file-name (format "%sMakefile" stem))
+      (write-region nil nil (expand-file-name (format "%s/Makefile" stem))
 		    nil 'silent))
     (call-process "tar" nil nil nil "-cf" tarfile stem)
     (delete-directory stem t)
@@ -761,12 +706,8 @@ style=\"text-align:left\">")
 ROOT should be the root of an Emacs source tree.
 Interactively with a prefix argument, prompt for TYPE.
 Optional argument TYPE is type of output (nil means all)."
-  (interactive (let ((root
-                      (if noninteractive
-                          (or (pop command-line-args-left)
-                              default-directory)
-                        (read-directory-name "Emacs root directory: "
-                                             source-directory nil t))))
+  (interactive (let ((root (read-directory-name "Emacs root directory: "
+						source-directory nil t)))
 		 (list root
 		       (if current-prefix-arg
 			   (completing-read
@@ -778,207 +719,6 @@ Optional argument TYPE is type of output (nil means all)."
     (if (member type (list nil m))
 	(make-manuals-dist--1 root m))))
 
-(defvar admin--org-export-headers-format "\
-#+title: GNU Emacs %s NEWS -- history of user-visible changes
-#+author:
-#+options: author:nil creator:nil toc:2 num:3 *:nil \\n:t ^:nil tex:nil
-#+language: en
-#+HTML_LINK_HOME: /software/emacs
-#+HTML_LINK_UP: /software/emacs
-#+html_head_extra: <link rel=\"stylesheet\" type=\"text/css\" href=\"/mini.css\" media=\"handheld\" />
-#+html_head_extra: <link rel=\"stylesheet\" type=\"text/css\" href=\"/layout.min.css\" media=\"screen\" />
-#+html_head_extra: <link rel=\"stylesheet\" type=\"text/css\" href=\"/print.min.css\" media=\"print\" />
-
-#+BEGIN_EXPORT html
-<div style=\"float:right;margin-left:1em;padding:3px;border:0px solid;text-align:center\">
-<a href=\"/graphics/gnu-head.jpg\">
-<img src=\"/graphics/gnu-head-sm.jpg\" alt=\" [image of the head
-of a GNU] \" width=\"129\" height=\"122\"/>
-</a>
-</div>
-#+END_EXPORT\n\n")
-
-(defvar admin--org-html-postamble "
-<p>
-Return to the <a href=\"/software/emacs/emacs.html\">GNU Emacs home page</a>.
-</p>
-
-<div id=\"footer\">
-<div class=\"unprintable\">
-
-<p>
-Please send FSF &amp; GNU inquiries to
-<a href=\"mailto:gnu@gnu.org\">&lt;gnu@gnu.org&gt;</a>.
-There are also <a href=\"/contact/\">other ways to contact</a>
-the FSF.
-Broken links and other corrections or suggestions can be sent to
-<a href=\"mailto:bug-gnu-emacs@gnu.org\">&lt;bug-gnu-emacs@gnu.org&gt;</a>.
-</p>
-</div>
-
-<p>
-    Copyright &copy; %s Free Software Foundation, Inc.
-</p>
-
-<p>This page is licensed under
-a <a href=\"https://creativecommons.org/licenses/by-sa/4.0\">CC-BY-SA</a>
-license.</p>
-
-<!--#include virtual=\"/server/bottom-notes.html\" -->
-
-<p class=\"unprintable\">
-Updated:
-<!-- timestamp start -->
-$Date: %s $
-<!-- timestamp end -->
-</p>
-</div>
-</div>")
-
-(defun admin--require-external-package (pkg)
-  (package-initialize)
-  (require pkg nil t)
-  (unless (featurep pkg)
-    (when (yes-or-no-p (format "Package \"%s\" is missing.  Install now?" pkg))
-      (package-install pkg)
-      (require pkg nil t))))
-
-(declare-function org-html-export-as-html "ox-html.el")
-(defvar org-html-postamble)
-(defvar org-html-mathjax-template)
-(defvar htmlize-output-type)
-
-(defun make-news-html-file (root version)
-  "Convert the NEWS file into an HTML file."
-  (interactive (let ((root
-                      (if noninteractive
-                          (or (pop command-line-args-left)
-                              default-directory)
-                        (read-directory-name "Emacs root directory: "
-                                             source-directory nil t))))
-                 (list root
-                       (read-string "Major version number: "
-                                    (number-to-string emacs-major-version)))))
-  (unless (file-exists-p (expand-file-name "src/emacs.c" root))
-    (user-error "%s doesn't seem to be the root of an Emacs source tree" root))
-  (admin--require-external-package 'htmlize)
-  (let* ((newsfile (expand-file-name "etc/NEWS" root))
-         (orgfile (expand-file-name (format "etc/NEWS.%s.org" version) root))
-         (html (format "%s.html" (file-name-base orgfile)))
-         (copyright-years (format-time-string "%Y")))
-    (delete-file orgfile)
-    (copy-file newsfile orgfile t)
-    (find-file orgfile)
-
-    ;; Find the copyright range.
-    (goto-char (point-min))
-    (re-search-forward "^Copyright (C) \\([0-9-]+\\) Free Software Foundation, Inc.")
-    (setq copyright-years (match-string 1))
-
-    ;; Delete some unnecessary stuff.
-    (replace-regexp-in-region "^---$" "" (point-min) (point-max))
-    (replace-regexp-in-region "^\\+\\+\\+$" "" (point-min) (point-max))
-    (dolist (str '("\n"
-                   "GNU Emacs NEWS -- history of user-visible changes."
-                   "Temporary note:"
-                   "+++ indicates that all relevant manuals in doc/ have been updated."
-                   "--- means no change in the manuals is needed."
-                   "When you add a new item, use the appropriate mark if you are sure it"
-                   "applies, and please also update docstrings as needed."
-                   "You can narrow news to a specific version by calling 'view-emacs-news'"
-                   "with a prefix argument or by typing 'C-u C-h C-n'."))
-      (replace-string-in-region str "" (point-min) (point-max)))
-
-    ;; Escape some characters.
-    (replace-regexp-in-region (rx "$") "@@html:&dollar;@@" (point-min) (point-max))
-
-    ;; Use Org-mode markers for 'symbols', 'C-x k', etc.
-    (replace-regexp-in-region
-     (rx (or (: (group (in " \t\n("))
-                "'"
-                (group (+ (or (not (in "'\n"))
-                              (: "'" (not (in " .,\t\n)"))))))
-                "'"
-                (group (in ",.;:!? \t\n)")))
-             ;; Buffer names, e.g. "*scratch*".
-             (: "\""
-                (group-n 2 "*" (+ (not (in "*\""))) "*")
-                "\"")))
-     "\\1~\\2~\\3" (point-min) (point-max))
-
-    ;; Format code blocks.
-    (while (re-search-forward "^    " nil t)
-      (let ((elisp-block (looking-at "(")))
-        (backward-paragraph)
-        (insert (if elisp-block
-                    "\n#+BEGIN_SRC emacs-lisp"
-                  "\n#+BEGIN_EXAMPLE"))
-        (forward-paragraph)
-        (insert (if elisp-block
-                    "#+END_SRC\n"
-                  "#+END_EXAMPLE\n"))))
-
-    ;; Delete buffer local variables.
-    (goto-char (point-max))
-    (when (re-search-backward "Local variables:")
-      (forward-line -1)
-      (delete-region (point) (point-max)))
-
-    ;; Insert Org-mode export headers.
-    (goto-char (point-min))
-    (insert (format admin--org-export-headers-format version))
-    (org-mode)
-    (save-buffer)
-
-    ;; Make everything one level lower.
-    (goto-char (point-min))
-    (while (re-search-forward (rx bol (group (+ "*")) " ") nil t)
-      (replace-match "*\\1" nil nil nil 1))
-
-    ;; Insert anchors for different versions.
-    (goto-char (point-min))
-    (let (last-major last-minor)
-      (while (re-search-forward (rx bol "** " (+ (not "\n")) "in Emacs "
-                                    (group digit digit) "." (group digit)
-                                    eol)
-                                nil t)
-        (unless (and (equal (match-string 1) last-major)
-                     (equal (match-string 2) last-minor))
-          (setq last-major (match-string 1))
-          (setq last-minor (match-string 2))
-          (forward-line -1)
-          (insert (format
-                   (concat
-                    "#+HTML: <p>&nbsp;</p>\n"
-                    "* Changes in Emacs %s.%s\n"
-                    ;; Add anchor to allow linking to
-                    ;; e.g. "NEWS.28.html#28.1".
-                    ":PROPERTIES:\n"
-                    ":CUSTOM_ID: %s.%s\n"
-                    ":END:\n")
-                   last-major last-minor
-                   last-major last-minor)))))
-
-    (save-buffer)
-
-    ;; Make the HTML export.
-    (let* ((org-html-postamble
-            (format admin--org-html-postamble
-                    copyright-years
-                    ;; e.g. "2022/09/13 09:13:13"
-                    (format-time-string "%Y/%m/%d %H:%m:%S")))
-           (org-html-mathjax-template "")
-           (htmlize-output-type 'css))
-      (org-html-export-as-html))
-
-    ;; Write HTML to file.
-    (let ((html (expand-file-name html (expand-file-name "etc" root))))
-      (write-file html)
-      (unless noninteractive
-        (find-file html)
-        (html-mode))
-      (message "Successfully exported HTML to %s" html))))
-
 
 ;; Stuff to check new `defcustom's got :version tags.
 ;; Adapted from check-declare.el.
@@ -1145,64 +885,6 @@ changes (in a non-trivial way).  This function does not check for that."
 			      'help-echo "Mouse-2: visit this definition"
 			      :type 'cusver-xref)))))))
 
-
-;; Reminder message for open release-blocking bugs.  This requires the
-;; GNU ELPA package `debbugs'.
-
-(defun reminder-for-release-blocking-bugs (version)
-  "Submit a reminder message for release-blocking bugs of Emacs VERSION."
-  (interactive
-   (list (progn
-           (require 'debbugs-gnu)
-           (defvar debbugs-gnu-emacs-blocking-reports)
-           (defvar debbugs-gnu-emacs-current-release)
-           (completing-read
-	    "Emacs release: "
-	    (mapcar #'identity debbugs-gnu-emacs-blocking-reports)
-	    nil t debbugs-gnu-emacs-current-release))))
-
-  (require 'debbugs-gnu)
-  (declare-function debbugs-get-status "debbugs" (&rest bug-numbers))
-  (declare-function debbugs-get-attribute "debbugs" (bug-or-message attribute))
-  (require 'reporter)
-  (declare-function mail-position-on-field "sendmail" (field &optional soft))
-  (declare-function mail-text "sendmail" ())
-
-  (when-let ((id (alist-get version debbugs-gnu-emacs-blocking-reports
-                            nil nil #'string-equal))
-             (status-id (debbugs-get-status id))
-             (blockedby-ids (debbugs-get-attribute (car status-id) 'blockedby))
-             (blockedby-status
-              (apply #'debbugs-get-status (sort blockedby-ids #'<))))
-
-    (reporter-submit-bug-report
-     "<emacs-devel@gnu.org>" ; to-address
-     nil nil nil
-     (lambda () ; posthook
-       (goto-char (point-min))
-       (mail-position-on-field "subject")
-       (insert (format "Reminder: release-blocking bugs for Emacs %s (%s)"
-                       version (format-time-string "%F" nil "UTC0")))
-       (mail-text)
-       (delete-region (point) (point-max))
-       (insert "
-The following bugs are regarded as release-blocking for Emacs " version ".
-People are encouraged to work on them with priority.\n\n")
-       (dolist (i blockedby-status)
-         (unless (equal (debbugs-get-attribute i 'pending) "done")
-           (insert (format "bug#%d %s\n"
-                           (debbugs-get-attribute i 'id)
-                           (debbugs-get-attribute i 'subject)))))
-       (insert "
-If you use the debbugs package from GNU ELPA, you can apply the
-following form to see all bugs which block a given release:
-
-  (debbugs-gnu-emacs-release-blocking-reports \"" version "\")\n")))))
-
 (provide 'admin)
 
 ;;; admin.el ends here
-
-;; Local Variables:
-;; coding: utf-8
-;; End:

admin/alloc-colors.c

@@ -1,6 +1,6 @@
 /* Allocate X colors.  Used for testing with dense colormaps.
 
-Copyright (C) 2001-2023 Free Software Foundation, Inc.
+Copyright (C) 2001-2017 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
 #include <X11/Xlib.h>
@@ -23,7 +23,6 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 #include <stdlib.h>
 #include <stdarg.h>
 #include <unistd.h>
-#include <string.h>
 
 void
 fatal (const char *fmt, ...)

admin/automerge

@@ -1,248 +0,0 @@
-#!/bin/bash
-### automerge - automatically merge the Emacs release branch to master
-
-## Copyright (C) 2018-2023 Free Software Foundation, Inc.
-
-## Author: Glenn Morris <rgm@gnu.org>
-## Maintainer: Stefan Kangas <stefankangas@gmail.com>
-
-## This file is part of GNU Emacs.
-
-## GNU Emacs is free software: you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation, either version 3 of the License, or
-## (at your option) any later version.
-
-## GNU Emacs is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-
-## You should have received a copy of the GNU General Public License
-## along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
-
-### Commentary:
-
-## Automatically merge the Emacs release branch to master.
-## If the merge succeeds, optionally build and test the results,
-## and then push it.
-## Intended usage:
-## Have a dedicated git directory just for this.
-## Have a cron job that calls this script with -r -p.
-##
-## Modifying a running shell script can have unpredictable results,
-## so the paranoid will first make a copy of this script, and then run
-## it with the -d option in the repository directory, in case a pull
-## updates this script while it is working.
-
-source "${0%/*}/emacs-shell-lib"
-
-usage ()
-{
-    cat 1>&2 <<EOF
-Usage: ${PN} [-b] [-d] [-e emacs] [-n nmin] [-p] [-r] [-t] [-- mflags]
-Merge the Emacs release branch to master.
-Passes any non-option args to make (eg -- -j2).
-Options:
--d: no initial cd to parent of script directory
--e: Emacs executable to use for the initial merge (default $emacs)
--n: minimum number of commits to try merging (default $nmin)
--b: try to build after merging
--t: try to check after building
--p: if merge, build, check all succeed, push when finished (caution!)
--r: start by doing a hard reset (caution!) and pull
-EOF
-    exit 1
-}
-
-
-## Defaults.
-
-emacs=emacs
-nmin=10
-build=
-test=
-push=
-quiet=
-reset=
-nocd=
-
-while getopts ":hbde:n:pqrt" option ; do
-    case $option in
-        (h) usage ;;
-
-        (b) build=1 ;;
-
-        (d) nocd=1 ;;
-
-        (e) emacs=$OPTARG ;;
-
-        (n) nmin=$OPTARG ;;
-
-        (p) push=1 ;;
-
-        (q) quiet=1 ;;
-
-        (r) reset=1 ;;
-
-        (t) test=1 ;;
-
-        (\?) die "Bad option -$OPTARG" ;;
-
-        (:) die "Option -$OPTARG requires an argument" ;;
-
-        (*) die "getopts error" ;;
-    esac
-done
-shift $(( --OPTIND ))
-OPTIND=1
-
-
-[ "$nocd" ] || {
-    # $PD should be the admin directory
-    cd $PD || die "Could not change directory to $PD"
-    cd ../
-}
-
-[ -d admin ] || die "Could not locate admin directory"
-
-[ -e .git ] || die "No .git"
-
-
-## Does not work 100% because a lot of Emacs batch output comes on
-## stderr (?).
-[ "$quiet" ] && exec 1> /dev/null
-
-
-[ "$push" ] && test=1
-[ "$test" ] && build=1
-
-
-tempfile="$(emacs_mktemp)"
-
-
-[ -e Makefile ] && [ "$build" ] && {
-    echo "Cleaning..."
-    make maintainer-clean >& /dev/null
-}
-
-
-[ "$reset" ] && {
-    echo "Resetting..."
-    git reset -q --hard origin/master || die "reset error"
-
-    echo "Pulling..."
-    git pull -q --ff-only || die "pull error"
-}
-
-
-rev=$(git rev-parse HEAD)
-
-[ "$(git rev-parse @{u})" = "$rev" ] || die "Local state does not match origin"
-
-
-merge ()
-{
-    echo "Merging..."
-
-    if $emacs --batch -Q -l ./admin/gitmerge.el \
-              --eval "(setq gitmerge-minimum-missing $nmin)" -f gitmerge \
-              >| "$tempfile" 2>&1; then
-        echo "merged ok"
-        return 0
-
-    else
-        grep -E "Nothing to merge|Number of missing commits" "$tempfile" && \
-            exit 0
-
-        cat "$tempfile" 1>&2
-
-        die "merge error"
-    fi
-}
-
-
-merge
-
-
-## FIXME it would be better to trap this in gitmerge.
-## NEWS should never be modified, only eg NEWS.26.
-git diff --stat --cached origin/master | grep -q "etc/NEWS " && \
-    die "etc/NEWS has been modified"
-
-
-[ "$build" ] || exit 0
-
-
-echo "Running autoreconf..."
-
-autoreconf -i -I m4 2>| "$tempfile"
-
-retval=$?
-
-## Annoyingly, autoreconf puts the "installing `./foo' messages on stderr.
-if [ "$quiet" ]; then
-    grep -v 'installing `\.' "$tempfile" 1>&2
-else
-    cat "$tempfile" 1>&2
-fi
-
-[ $retval -ne 0 ] && die "autoreconf error"
-
-
-echo "Running ./configure..."
-
-## Minimize required packages.
-./configure --without-x || die "configure error"
-
-
-echo "Building..."
-
-make "$@" || die "make error"
-
-echo "Build finished ok"
-
-
-[ "$test" ] || exit 0
-
-
-echo "Testing..."
-
-## We just want a fast pass/fail, we don't want to debug.
-make "$@" check TEST_LOAD_EL=no || die "check error"
-
-echo "Tests finished ok"
-
-
-[ "$push" ] || exit 0
-
-
-## In case someone else pushed while we were working.
-echo "Checking for remote changes..."
-git fetch || die "fetch error"
-
-[ "$(git rev-parse @{u})" = "$rev" ] || {
-
-    echo "Upstream has changed"
-
-    ## Rebasing would be incorrect, since it would rewrite the
-    ## (already published) release branch commits.
-    ## Ref eg https://lists.gnu.org/r/emacs-devel/2014-12/msg01435.html
-    ## Instead, we throw away what we just did, and do the merge again.
-    echo "Resetting..."
-    git reset --hard "$rev"
-
-    echo "Pulling..."
-    git pull --ff-only || die "pull error"
-
-    merge
-
-    ## If the merge finished ok again, we don't bother doing a second
-    ## build and test.
-}
-
-echo "Pushing..."
-git push || die "push error"
-
-
-exit 0

admin/build-configs

@@ -1,7 +1,7 @@
 #! /usr/bin/perl
 # Build Emacs in several different configurations.
 
-# Copyright (C) 2001-2023 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -16,7 +16,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 
 require 5;
@@ -97,3 +97,4 @@
 # Local Variables:
 # mode: cperl
 # End:
+

admin/bzrmerge.el

@@ -0,0 +1,359 @@
+;;; bzrmerge.el --- help merge one Emacs bzr branch to another
+
+;; Copyright (C) 2010-2017 Free Software Foundation, Inc.
+
+;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
+;; Keywords: maint
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Some usage notes are in admin/notes/bzr.
+
+;;; Code:
+
+(eval-when-compile (require 'cl-lib))
+
+(defvar bzrmerge-skip-regexp
+  "back[- ]?port\\|merge\\|sync\\|re-?generate\\|bump version\\|from trunk\\|\
+Auto-commit"
+  "Regexp matching logs of revisions that might be skipped.
+`bzrmerge-missing' will ask you if it should skip any matches.")
+
+(defconst bzrmerge-buffer "*bzrmerge*"
+  "Working buffer for bzrmerge.")
+
+(defconst bzrmerge-warning-buffer "*bzrmerge warnings*"
+  "Buffer where bzrmerge will display any warnings.")
+
+(defun bzrmerge-merges ()
+  "Return the list of already merged (not yet committed) revisions.
+The list returned is sorted by oldest-first."
+  (with-current-buffer (get-buffer-create bzrmerge-buffer)
+    (erase-buffer)
+    ;; We generally want to make sure we start with a clean tree, but we also
+    ;; want to allow restarts (i.e. with some part of FROM already merged but
+    ;; not yet committed).  Unversioned (unknown) files in the tree
+    ;; are also ok.
+    (call-process "bzr" nil t nil "status" "-v")
+    (goto-char (point-min))
+    (when (re-search-forward "^conflicts:\n" nil t)
+      (user-error "You still have unresolved conflicts"))
+    (let ((merges ())
+          found)
+      (if (not (re-search-forward "^pending merges:\n" nil t))
+          (when (save-excursion
+                  (goto-char (point-min))
+                  (while (and
+                          (re-search-forward "^\\([a-z ]*\\):\n" nil t)
+                          (not
+                           (setq found
+                                 (not (equal "unknown" (match-string 1)))))))
+                  found)
+            (user-error "You still have uncommitted changes"))
+        ;; This is really stupid, but it seems there's no easy way to figure
+        ;; out which revisions have been merged already.  The only info I can
+        ;; find is the "pending merges" from "bzr status -v", which is not
+        ;; very machine-friendly.
+        (while (not (eobp))
+          (skip-chars-forward " ")
+          (push (buffer-substring (point) (line-end-position)) merges)
+          (forward-line 1)))
+      merges)))
+
+(defun bzrmerge-check-match (merge)
+  ;; Make sure the MERGES match the revisions on the FROM branch.
+  ;; Stupidly the best form of MERGES I can find is the one from
+  ;; "bzr status -v" which is very machine non-friendly, so I have
+  ;; to do some fuzzy matching.
+  (let ((author
+         (or
+          (save-excursion
+            (if (re-search-forward "^author: *\\([^<]*[^ ]\\) +<.*"
+                                   nil t)
+                (match-string 1)))
+          (save-excursion
+            (if (re-search-forward
+                 "^committer: *\\([^<]*[^< ]\\) +<" nil t)
+                (match-string 1)))))
+        (timestamp
+         (save-excursion
+           (if (re-search-forward
+                "^timestamp:[^0-9]*\\([-0-9]+\\)" nil t)
+               (match-string 1))))
+        (line1
+         (save-excursion
+           (if (re-search-forward "^message:[ \n]*" nil t)
+               (buffer-substring (point) (line-end-position))))))
+    ;; The `merge' may have a truncated line1 with "...", so get
+    ;; rid of any "..." and then look for a prefix match.
+    (when (string-match "\\.+\\'" merge)
+      (setq merge (substring merge 0 (match-beginning 0))))
+    (or (string-prefix-p
+         merge (concat author " " timestamp " " line1))
+        (string-prefix-p
+         merge (concat author " " timestamp " [merge] " line1)))))
+
+(defun bzrmerge-missing (from merges)
+  "Return the list of revisions that need to be merged.
+MERGES is the revisions already merged but not yet committed.
+Asks about skipping revisions with logs matching `bzrmerge-skip-regexp'.
+The result is of the form (TOMERGE . TOSKIP) where TOMERGE and TOSKIP
+are both lists of revnos, in oldest-first order."
+  (with-current-buffer (get-buffer-create bzrmerge-buffer)
+    (erase-buffer)
+    (call-process "bzr" nil t nil "missing" "--theirs-only"
+                  (expand-file-name from))
+    (let ((revnos ()) (skipped ()))
+      (pop-to-buffer (current-buffer))
+      (goto-char (point-max))
+      (while (re-search-backward "^------------------------------------------------------------\nrevno: \\([0-9.]+\\).*" nil t)
+        (save-excursion
+          (if merges
+              (while (not (bzrmerge-check-match (pop merges)))
+                (unless merges
+                  (error "Unmatched tip of merged revisions")))
+            (let ((case-fold-search t)
+                  (revno (match-string 1))
+                  (skip nil))
+              (if (string-match "\\." revno)
+                  (error "Unexpected dotted revno!")
+                (setq revno (string-to-number revno)))
+              (re-search-forward "^message:\n")
+              (while (and (not skip)
+                          (re-search-forward bzrmerge-skip-regexp nil t))
+                (let ((str (buffer-substring (line-beginning-position)
+                                             (line-end-position))))
+                  (when (string-match "\\` *" str)
+                    (setq str (substring str (match-end 0))))
+                  (when (string-match "[.!;, ]+\\'" str)
+                    (setq str (substring str 0 (match-beginning 0))))
+                  (let ((help-form (substitute-command-keys "\
+Type `y' to skip this revision,
+`N' to include it and go on to the next revision,
+`n' to not skip, but continue to search this log entry for skip regexps,
+`q' to quit merging.")))
+                    (pcase (save-excursion
+                            (read-char-choice
+                             (format "%s: Skip (y/n/N/q/%s)? " str
+                                     (key-description (vector help-char)))
+                             '(?y ?n ?N ?q)))
+                      (`?y (setq skip t))
+                      (`?q (keyboard-quit))
+                      ;; A single log entry can match skip-regexp multiple
+                      ;; times.  If you are sure you don't want to skip it,
+                      ;; you don't want to be asked multiple times.
+                      (`?N (setq skip 'no))))))
+              (if (eq skip t)
+                  (push revno skipped)
+                (push revno revnos)))))
+        (delete-region (point) (point-max)))
+      (and (or revnos skipped)
+           (cons (nreverse revnos) (nreverse skipped))))))
+
+(defun bzrmerge-resolve (file)
+  (unless (file-exists-p file) (error "Bzrmerge-resolve: Can't find %s" file))
+  (with-demoted-errors
+    (let ((exists (find-buffer-visiting file)))
+      (with-current-buffer (let ((enable-local-variables :safe)
+                                 (enable-local-eval nil))
+                             (find-file-noselect file))
+        (if (buffer-modified-p)
+            (user-error "Unsaved changes in %s" (current-buffer)))
+        (save-excursion
+          (cond
+           ((derived-mode-p 'change-log-mode)
+            ;; Fix up dates before resolving the conflicts.
+            (goto-char (point-min))
+            (let ((diff-auto-refine-mode nil))
+              (while (re-search-forward smerge-begin-re nil t)
+                (smerge-match-conflict)
+                (smerge-ensure-match 3)
+                (let ((start1 (match-beginning 1))
+                      (end1 (match-end 1))
+                      (start3 (match-beginning 3))
+                      (end3 (copy-marker (match-end 3) t)))
+                  (goto-char start3)
+                  (while (re-search-forward change-log-start-entry-re end3 t)
+                    (let* ((str (match-string 0))
+                           (newstr (save-match-data
+                                     (concat (add-log-iso8601-time-string)
+                                             (when (string-match " *\\'" str)
+                                               (match-string 0 str))))))
+                      (replace-match newstr t t)))
+                  ;; change-log-resolve-conflict prefers to put match-1's
+                  ;; elements first (for equal dates), whereas we want to put
+                  ;; match-3's first.
+                  (let ((match3 (buffer-substring start3 end3))
+                        (match1 (buffer-substring start1 end1)))
+                    (delete-region start3 end3)
+                    (goto-char start3)
+                    (insert match1)
+                    (delete-region start1 end1)
+                    (goto-char start1)
+                    (insert match3)))))
+            ;; (pop-to-buffer (current-buffer)) (debug 'before-resolve)
+            ))
+          ;; Try to resolve the conflicts.
+          (cond
+           ((member file '("configure" "lisp/ldefs-boot.el"
+                           "lisp/emacs-lisp/cl-loaddefs.el"))
+            ;; We are in the file's buffer, so names are relative.
+            (call-process "bzr" nil t nil "revert"
+                          (file-name-nondirectory file))
+            (revert-buffer nil 'noconfirm))
+           (t
+            (goto-char (point-max))
+            (while (re-search-backward smerge-begin-re nil t)
+              (save-excursion
+                (ignore-errors
+                  (smerge-match-conflict)
+                  (smerge-resolve))))
+            ;; (when (derived-mode-p 'change-log-mode)
+            ;;   (pop-to-buffer (current-buffer)) (debug 'after-resolve))
+            (save-buffer)))
+          (goto-char (point-min))
+          (prog1 (re-search-forward smerge-begin-re nil t)
+            (unless exists (kill-buffer))))))))
+
+(defun bzrmerge-add-metadata (from endrevno)
+  "Add the metadata for a merge of FROM upto ENDREVNO.
+Does not make other difference."
+  (if (with-temp-buffer
+        (call-process "bzr" nil t nil "status")
+        (goto-char (point-min))
+        (re-search-forward "^conflicts:\n" nil t))
+      (error "Don't know how to add metadata in the presence of conflicts")
+    (call-process "bzr" nil t nil "shelve" "--all"
+                  "-m" "Bzrmerge shelved merge during skipping")
+    (call-process "bzr" nil t nil "revert")
+    (call-process "bzr" nil t nil
+                  "merge" "-r" (format "%s" endrevno) from)
+    (call-process "bzr" nil t nil "revert" ".")
+    (call-process "bzr" nil t nil "unshelve")))
+
+(defvar bzrmerge-already-done nil)
+
+(defun bzrmerge-apply (missing from)
+  (setq from (expand-file-name from))
+  (with-current-buffer (get-buffer-create bzrmerge-buffer)
+    (erase-buffer)
+    (when (equal (cdr bzrmerge-already-done) (list from missing))
+      (setq missing (car bzrmerge-already-done)))
+    (setq bzrmerge-already-done nil)
+    (let ((merge (car missing))
+          (skip (cdr missing))
+          (unsafe nil)
+          beg end)
+      (when (or merge skip)
+        (cond
+         ((and skip (or (null merge) (< (car skip) (car merge))))
+          ;; Do a "skip" (i.e. merge the meta-data only).
+          (setq beg (1- (car skip)))
+          (while (and skip (or (null merge) (< (car skip) (car merge))))
+            (cl-assert (> (car skip) (or end beg)))
+            (setq end (pop skip)))
+          (message "Skipping %s..%s" beg end)
+          (bzrmerge-add-metadata from end))
+
+         (t
+          ;; Do a "normal" merge.
+          (cl-assert (or (null skip) (< (car merge) (car skip))))
+          (setq beg (1- (car merge)))
+          (while (and merge (or (null skip) (< (car merge) (car skip))))
+            (cl-assert (> (car merge) (or end beg)))
+            (setq end (pop merge)))
+          (message "Merging %s..%s" beg end)
+          (if (with-temp-buffer
+                (call-process "bzr" nil t nil "status")
+                (zerop (buffer-size)))
+              (call-process "bzr" nil t nil
+                            "merge" "-r" (format "%s" end) from)
+            ;; Stupidly, "bzr merge --force -r A..B" dos not maintain the
+            ;; metadata properly except when the checkout is clean.
+            (call-process "bzr" nil t nil "merge"
+                          "--force" "-r" (format "%s..%s" beg end) from)
+            ;; The merge did not update the metadata, so force the next time
+            ;; around to update it (as a "skip").
+            (setq unsafe t)
+            (push end skip))
+          (pop-to-buffer (current-buffer))
+          (sit-for 1)
+          ;; (debug 'after-merge)
+          ;; Check the conflicts.
+          ;; FIXME if using the helpful bzr changelog_merge plugin,
+          ;; there are normally no conflicts in ChangeLogs.
+          ;; But we still want the dates fixing, like bzrmerge-resolve does.
+          (let ((conflicted nil)
+                (files ()))
+            (goto-char (point-min))
+            (when (re-search-forward "bzr: ERROR:" nil t)
+              (error "Internal Bazaar error!!"))
+            (while (re-search-forward "^Text conflict in " nil t)
+              (push (buffer-substring (point) (line-end-position)) files))
+            (if (re-search-forward "^\\([0-9]+\\) conflicts encountered" nil t)
+                (if (/= (length files) (string-to-number (match-string 1)))
+                    (setq conflicted t))
+              (if files (setq conflicted t)))
+            (dolist (file files)
+              (if (bzrmerge-resolve file)
+                  (setq conflicted t)))
+            (when conflicted
+              (setq bzrmerge-already-done
+                    (list (cons merge skip) from missing))
+              (if unsafe
+                  ;; FIXME: Obviously, we'd rather make it right rather
+                  ;; than output such a warning.  But I don't know how to add
+                  ;; the metadata to bzr's since the technique used in
+                  ;; bzrmerge-add-metadata does not work when there
+                  ;; are conflicts.
+                  (display-warning 'bzrmerge "Resolve conflicts manually.
+BEWARE!  Important metadata is kept in this Emacs session!
+Do not commit without re-running `M-x bzrmerge' first!"
+                                   :warning bzrmerge-warning-buffer))
+              (user-error "Resolve conflicts manually")))))
+        (cons merge skip)))))
+
+(defun bzrmerge (from)
+  "Merge from branch FROM into `default-directory'."
+  (interactive
+   (list
+    (let ((def
+           (with-temp-buffer
+             (call-process "bzr" nil t nil "info")
+             (goto-char (point-min))
+             (when (re-search-forward "submit branch: *" nil t)
+               (buffer-substring (point) (line-end-position))))))
+      (read-file-name "From branch: " nil nil nil def))))
+  ;; Eg we ran bzrmerge once, it stopped with conflicts, we fixed them
+  ;; and are running it again.
+  (if (get-buffer bzrmerge-warning-buffer)
+      (kill-buffer bzrmerge-warning-buffer))
+  (message "Merging from %s..." from)
+  (require 'vc-bzr)
+  (let ((default-directory (or (vc-bzr-root default-directory)
+                               (error "Not in a Bzr tree"))))
+    ;; First, check the status.
+    (let* ((merges (bzrmerge-merges))
+           ;; OK, we have the status, now check the missing data.
+           (missing (bzrmerge-missing from merges)))
+      (if (not missing)
+          (message "Merging from %s...nothing to merge" from)
+        (while missing
+          (setq missing (bzrmerge-apply missing from)))
+        (message "Merging from %s...done" from)))))
+
+(provide 'bzrmerge)
+;;; bzrmerge.el ends here

admin/charsets/Makefile.in

@@ -1,6 +1,6 @@
 ### @configure_input@
 
-# Copyright (C) 2015-2023 Free Software Foundation, Inc.
+# Copyright (C) 2015-2017 Free Software Foundation, Inc.
 
 # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 #   National Institute of Advanced Industrial Science and Technology (AIST)
@@ -19,7 +19,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ### Commentary:
 
@@ -31,7 +31,6 @@ AWK = @AWK@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
 
 charsetdir = ${top_srcdir}/etc/charsets
 lispintdir = ${top_srcdir}/lisp/international
@@ -39,7 +38,16 @@ mapfiledir = ${srcdir}/mapfiles
 
 GLIBC_CHARMAPS = ${srcdir}/glibc
 
--include ${top_builddir}/src/verbose.mk
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 =
+
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
 
 # Note: We can not prepend "ISO-" to these map files because of file
 # name limits on DOS.
@@ -88,7 +96,7 @@ MULE =	MULE-ethiopic.map MULE-ipa.map MULE-is13194.map \
 	MULE-sisheng.map MULE-tibetan.map \
 	MULE-lviscii.map MULE-uviscii.map
 
-SED_SCRIPT = $(srcdir)/jisx2131-filter
+SED_SCRIPT = jisx2131-filter
 
 TRANS_TABLE = cp51932.el eucjp-ms.el
 TRANS_TABLE := $(addprefix ${lispintdir}/,${TRANS_TABLE})
@@ -133,7 +141,7 @@ ${charsetdir}/VSCII-2.map: ${GLIBC_CHARMAPS}/TCVN5712-1.gz ${mapconv} ${compact}
 
 ${charsetdir}/ALTERNATIVNYJ.map: ${charsetdir}/IBM866.map
 	${AM_V_GEN}(echo "# Modified from $(notdir $<) according to the chart at" && \
-	  echo "# https://web.archive.org/web/20100131045151/http://www.cyrillic.com/ref/cyrillic/koi-8alt.html" && \
+	  echo "# http://www.cyrillic.com/ref/cyrillic/koi-8alt.html," && \
 	  echo "# with guesses for the Unicodes of the glyphs." && \
 	  sed -e '1 d' \
 	     -e '/0xF2/ s/ .*/ 0x2019/' \
@@ -181,7 +189,7 @@ ${charsetdir}/GB180304.map: ${charsetdir}/GB180302.map ${gb180304}
 	${AM_V_GEN}$(AWK) -f ${gb180304} < $< > $@
 
 ${charsetdir}/JISX0201.map: ${GLIBC_CHARMAPS}/JIS_X0201.gz ${mapconv} ${compact}
-	${AM_V_GEN}(${run_mapconv} $< '/^<.*[ 	]\/x[0-9]/' GLIBC-1 ${compact} && \
+	${AM_V_GEN}(${mapconv} $< '/^<.*[ 	]\/x[0-9]/' GLIBC-1 ${compact} && \
 	  echo "# Generated by hand" && \
 	  echo "0xA1-0xDF 0xFF61" ) > $@
 
@@ -192,13 +200,12 @@ ${charsetdir}/JISX0208.map: ${GLIBC_CHARMAPS}/EUC-JP.gz ${mapconv}
 ${charsetdir}/JISX0212.map: ${GLIBC_CHARMAPS}/EUC-JP.gz ${mapconv} ${compact}
 	${AM_V_GEN}${run_mapconv} $< '/^<.*[ 	]\/x8f/ s,/x8f,,' GLIBC-2-7 ${compact} > $@
 
-$(SED_SCRIPT): ${mapfiledir}/JISX213A.map
+jisx2131-filter: ${mapfiledir}/JISX213A.map
 	${AM_V_at}sed -n -e '/^#/d' -e 's,.*0x\([0-9A-Z]*\)$$,/0x0*\1$$/d,p' < $< > $@
 
-${charsetdir}/JISX2131.map: ${GLIBC_CHARMAPS}/EUC-JISX0213.gz ${mapconv} \
-  $(SED_SCRIPT)
+${charsetdir}/JISX2131.map: ${GLIBC_CHARMAPS}/EUC-JISX0213.gz ${mapconv} jisx2131-filter
 	${AM_V_GEN}${run_mapconv} $< '/^<.*[ 	]\/x[a-f]/' GLIBC-2-7 \
-	  | sed -f $(SED_SCRIPT) \
+	  | sed -f jisx2131-filter \
 	  | sed -e 's/0x2015/0x2014/' -e 's/0x2299/0x29BF/' > $@
 
 ${charsetdir}/JISX2132.map: ${GLIBC_CHARMAPS}/EUC-JISX0213.gz ${mapconv}
@@ -218,8 +225,8 @@ ${lispintdir}/eucjp-ms.el: ${GLIBC_CHARMAPS}/EUC-JP-MS.gz ${eucjp_ms}
 
 # As Uni2JIS doesn't contain mappings of characters added to Unicode
 # recently, we add them manually here (including one correction for
-# U+005C vs U+FF3C).  These changes are based on bogytech's blog at:
-# https://bogytech.blogspot.com/search/label/emacs
+# U+005C vs U+FF3C).  These changes are based on bogytech's blog at
+# http://bogytech.blogspot.jp/search/label/emacs.
 ${charsetdir}/JISC6226.map: ${mapfiledir}/Uni2JIS ${mapconv} ${kuten}
 	${AM_V_GEN}(${run_mapconv} $< '/^[^#].*0-/' YASUOKA ${kuten} \
 	  | sed -e '/0x2140/s/005C/FF3C/' && \
@@ -297,18 +304,18 @@ ${charsetdir}/%.map: ${GLIBC_CHARMAPS}/%.gz ${mapconv} ${compact}
 	${AM_V_GEN}${run_mapconv} $< '/^<.*[ 	]\/x/' GLIBC-1 ${compact} > $@
 
 
-.PHONY: clean bootstrap-clean distclean maintainer-clean gen-clean
+.PHONY: clean bootstrap-clean distclean maintainer-clean extraclean
 
 clean:
+	rm -f ${SED_SCRIPT}
 
-## IMO this should also run gen-clean.
 bootstrap-clean: clean
 
 distclean: clean
 	rm -f Makefile
 
-gen-clean:
-	rm -f ${CHARSETS} ${SED_SCRIPT} ${TRANS_TABLE} ${srcdir}/charsets.stamp
-
-maintainer-clean: gen-clean distclean
+maintainer-clean: distclean
 
+## Do not remove these files, even in a bootstrap.  They rarely change.
+extraclean:
+	rm -f ${CHARSETS} ${TRANS_TABLE} ${srcdir}/charsets.stamp

admin/charsets/big5.awk

@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 BEGIN {
   tohex["A"] = 10;
@@ -68,3 +68,5 @@ function decode_big5(big5) {
   code = decode_big5(big5);
   printf "0x%04X %s\n", code, $2;
 }
+
+

admin/charsets/compact.awk

@@ -16,7 +16,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 # Commentary:
 # Make a charset map compact by changing this kind of line sequence:

admin/charsets/cp51932.awk

@@ -16,7 +16,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 # Commentary:
 
@@ -31,7 +31,7 @@
 # already been mapped to 1 or 3.
 
 BEGIN {
-  print ";;; cp51932.el -- translation table for CP51932  -*- lexical-binding:t -*-";
+  print ";;; cp51932.el -- translation table for CP51932";
   print ";;; Automatically generated from CP932-2BYTE.map";
   print "(let ((map";
   printf "       '(;JISEXT<->UNICODE";
@@ -43,14 +43,13 @@ BEGIN {
 
 END {
   print ")))";
-  print "  (setq map (mapcar (lambda (x)";
-  print "		      (cons (decode-char 'japanese-jisx0208 (car x))";
-  print "			    (cdr x)))";
-  print "		    map))";
+  print "  (mapc #'(lambda (x)";
+  print "	    (setcar x (decode-char 'japanese-jisx0208 (car x))))";
+  print "	map)";
   print "  (define-translation-table 'cp51932-decode map)";
-  print "  (mapc (lambda (x)";
-  print "	  (let ((tmp (car x)))";
-  print "	    (setcar x (cdr x)) (setcdr x tmp)))";
+  print "  (mapc #'(lambda (x)";
+  print "	    (let ((tmp (car x)))";
+  print "	      (setcar x (cdr x)) (setcdr x tmp)))";
   print "	map)";
   print "  (define-translation-table 'cp51932-encode map))";
   print "";

admin/charsets/cp932.awk

@@ -16,13 +16,14 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 # Commentary:
 
 # Add a sort key 0, 1, 2, or 3 at the tail of each line as a comment
 # to realize the round trip mapping to Unicode works as described in
-# https://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP932.TXT
+# this page:
+#	http://support.microsoft.com/default.aspx?scid=kb;EN-US;170559
 # Each sort key means as below:
 #   0: JISX0208 characters.
 #   1: NEC special characters.
@@ -112,3 +113,4 @@ END {
 	printf "0x%02X%02X 0x%04X # 4\n", i, j, code++;
     }
 }
+

admin/charsets/eucjp-ms.awk

@@ -16,12 +16,12 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 # Commentary:
 
 # eucJP-ms is one of eucJP-open encoding defined at this page:
-#  https://web.archive.org/web/20120207064433/http://home.m05.itscom.net/numa/cde/ucs-conv/appendix.html
+#  http://home.m05.itscom.net/numa/cde/ucs-conv/appendix.html
 # This program reads the mapping file EUC-JP-MS (of glibc) and
 # generates the Elisp file eucjp-ms.el that defines two translation
 # tables 'eucjp-ms-decode' and 'eucjp-ms-encode'.
@@ -38,7 +38,7 @@ BEGIN {
   JISX0208_FROM2 = "/xf5/xa1";
   JISX0212_FROM = "/x8f/xf3/xf3";
 
-  print ";;; eucjp-ms.el --- translation table for eucJP-ms  -*- lexical-binding:t -*-";
+  print ";;; eucjp-ms.el -- translation table for eucJP-ms";
   print ";;; Automatically generated from /usr/share/i18n/charmaps/EUC-JP-MS.gz";
   print "(let ((map";
   print "       '(;JISEXT<->UNICODE";
@@ -93,17 +93,15 @@ function write_entry (unicode) {
 
 END {
   print ")))";
-  print "  (setq map";
-  print "    (mapcar";
-  print "	(lambda (x)";
+  print "  (mapc #'(lambda (x)";
   print "	    (let ((code (logand (car x) #x7F7F)))";
   print "	      (if (integerp (cdr x))";
-  print "		  (cons (decode-char 'japanese-jisx0208 code) (cdr x))";
-  print "		(cons (decode-char 'japanese-jisx0212 code)"
-  print "		      (cadr x)))))";
-  print "	map))";
+  print "		  (setcar x (decode-char 'japanese-jisx0208 code))";
+  print "		(setcar x (decode-char 'japanese-jisx0212 code))";
+  print "		(setcdr x (cadr x)))))";
+  print "	map)";
   print "  (define-translation-table 'eucjp-ms-decode map)";
-  print "  (mapc (lambda (x)";
+  print "  (mapc #'(lambda (x)";
   print "	    (let ((tmp (car x)))";
   print "	      (setcar x (cdr x)) (setcdr x tmp)))";
   print "	map)";

admin/charsets/gb180302.awk

@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 BEGIN {
   tohex["A"] = 10;

admin/charsets/gb180304.awk

@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 BEGIN {
   tohex["A"] = 10;

admin/charsets/mapconv

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2015-2023 Free Software Foundation, Inc.
+# Copyright (C) 2015-2017 Free Software Foundation, Inc.
 
 # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 #   National Institute of Advanced Industrial Science and Technology (AIST)
@@ -19,7 +19,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 # Commentary:
 
@@ -38,8 +38,7 @@
 ## So that eg [A-F] as used by KANJI-DATABASE branch below works as expected.
 ## Otherwise with LANG=en_US.utf8, CNS-6.map was generated with a
 ## bogus entry.  By experiment, LC_COLLATE=C was not enough.
-LC_ALL=C
-export LC_ALL
+export LC_ALL=C
 
 BASE=`expr "$1" : '.*/\(.*\)' '|' "$1"` # basename
 FILE="admin/charsets/mapfiles/$BASE"
@@ -52,18 +51,17 @@ case "$3" in
 	SOURCE="";;
     CZYBORRA)
 	BASE="$BASE.gz";
-	SOURCE="https://czyborra.com/charsets/${BASE}";;
+	SOURCE="http://czyborra.com/charsets/${BASE}";;
     IANA)
-	SOURCE="https://www.iana.org/assignments/charset-reg/${BASE}";;
+	SOURCE="http://www.iana.org/assignments/charset-reg/${BASE}";;
     UNICODE)
-	SOURCE="https://www.unicode.org/Public/MAPPINGS/VENDORS/ADOBE/${BASE}";;
+	SOURCE="http://www.unicode.org/Public/MAPPINGS/VENDORS/ADOBE/${BASE}";;
     UNICODE2)
-	SOURCE="https://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/${BASE}";;
+	SOURCE="http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/${BASE}";;
     YASUOKA)
 	BASE="$BASE.Z";
 	SOURCE="http://kanji.zinbun.kyoto-u.ac.jp/~yasuoka/ftp/CJKtable/${BASE}";;
     KANJI-DATABASE)
-	# FIXME: This URL no longer works.
 	SOURCE="http://kanji-database.cvs.sourceforge.net/viewvc/*checkout*/kanji-database/kanji-database/data/cns2ucsdkw.txt?revision=1.4";;
     *)
 	printf 'Unknown file type: %s\n' "$3"

admin/charsets/mapfiles/CP720.map

@@ -1,4 +1,4 @@
-# Created manually from <https://en.wikipedia.org/wiki/Code_page_720>.
+# Created manually from <http://en.wikipedia.org/wiki/Code_page_720>.
 # The text in that page is available under the terms of the GNU Free
 # Documentation License.
 0x00-0x7F 0x0000

admin/charsets/mapfiles/CP858.map

@@ -1,4 +1,4 @@
-# Created manually from <https://en.wikipedia.org/wiki/Code_page_858>.
+# Created manually from <http://en.wikipedia.org/wiki/Code_page_858>.
 # The text in that page is available under the terms of the GNU Free
 # Documentation License.
 0x00-0x7F 0x0000

admin/charsets/mapfiles/README

@@ -1,4 +1,4 @@
-Copyright (C) 2009-2023 Free Software Foundation, Inc.
+Copyright (C) 2009-2017 Free Software Foundation, Inc.
 Copyright (C) 2009, 2010, 2011
   National Institute of Advanced Industrial Science and Technology (AIST)
   Registration Number H13PRO009
@@ -15,12 +15,12 @@ files based on freely available information.
 * CP932.TXT
 
 Available at:
-    <https://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP932.TXT>
+    <http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP932.TXT>
 
 * PTCP154
 
 Available at:
-    <https://www.iana.org/assignments/charset-reg/PTCP154>
+    <http://www.iana.org/assignments/charset-reg/PTCP154>
 
 * Uni2JIS
 
@@ -42,16 +42,16 @@ Available at:
 * stdenc.txt and symbol.txt
 
 Available at:
-    <https://www.unicode.org/Public/MAPPINGS/VENDORS/ADOBE/stdenc.txt>
-    <https://www.unicode.org/Public/MAPPINGS/VENDORS/ADOBE/symbol.txt>
+    <http://www.unicode.org/Public/MAPPINGS/VENDORS/ADOBE/stdenc.txt>
+    <http://www.unicode.org/Public/MAPPINGS/VENDORS/ADOBE/symbol.txt>
 
 (2) Newly created files
 
 * CP720.map and CP858.map
 
 Created manually by looking at these pages:
-    <https://en.wikipedia.org/wiki/Code_page_720>.
-    <https://en.wikipedia.org/wiki/Code_page_859>.
+    <http://en.wikipedia.org/wiki/Code_page_720>.
+    <http://en.wikipedia.org/wiki/Code_page_859>.
 The text in that page is under the terms of the GNU Free Documentation
 License.
 
@@ -63,8 +63,8 @@ to "JIS X 0213:2004".
 
 * MULE-*.map
 
-Created by using ../mule-charsets.el in Emacs as this:
-    % emacs -batch -l ../mule-charsets.el
+Created by using ../mule-charsets.el in Emacs 22 as this:
+    % emacs-22 -batch -l ../mule-charsets.el
 
 
 This file is part of GNU Emacs.
@@ -80,4 +80,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.

admin/charsets/mapfiles/stdenc.txt

@@ -54,7 +54,7 @@
 #    
 #    [v0.1, 5 May 1995] First release.
 #
-#  Use the Unicode reporting form <https://www.unicode.org/reporting.html>
+#  Use the Unicode reporting form <http://www.unicode.org/reporting.html>
 #    for any questions or comments or to report errors in the data.
 #
 0020	20	# SPACE	# space

admin/charsets/mapfiles/symbol.txt

@@ -57,7 +57,7 @@
 #
 #    [v0.1, 5 May 1995] First release.
 #
-#  Use the Unicode reporting form <https://www.unicode.org/reporting.html>
+#  Use the Unicode reporting form <http://www.unicode.org/reporting.html>
 #    for any questions or comments or to report errors in the data.
 #
 0020	20	# SPACE	# space

admin/charsets/mule-charsets.el

@@ -1,4 +1,4 @@
-;;; mule-charsets.el --- Generate Mule-original charset maps.  -*- lexical-binding: t -*-
+;; mule-charsets.el -- Generate Mule-original charset maps.
 ;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
@@ -16,7 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 
 ;; For the record: the old, pre-v23 code was this:
@@ -55,15 +55,16 @@
     ("MULE-lviscii.map" . vietnamese-viscii-lower)
     ("MULE-uviscii.map" . vietnamese-viscii-upper)))
 
-(defconst mule-charsets-header
+(defconst header
   (format
    "# Generated by running admin/charsets/mule-charsets.el in Emacs %d.%d.\n"
    emacs-major-version emacs-minor-version))
 
 (dolist (elt charset-alist)
   (with-temp-buffer
-    (insert mule-charsets-header)
+    (insert header)
     (map-charset-chars 'func (cdr elt) (cdr elt))
     (sort-lines nil (point-min) (point-max))
     (let ((coding-system-for-write 'unix))
       (write-file (car elt)))))
+

admin/check-doc-strings

@@ -59,7 +59,7 @@ sub Check_texi_function {
     $arglist_parm{$parm} = 1;
   }
 
-  foreach my $parm ($docstring =~ /\@var\{([^{}]+)\}/g) {
+  foreach my $parm ($docstring =~ /\@var{([^{}]+)}/g) {
     $docstring_parm{$parm} = 1;
   }
 
@@ -111,9 +111,7 @@ sub Check_function {
   #  $arglist_parm{$parm} = 1;
   #}
   foreach my $parm (@parms) {
-    next if $parm eq '&optional'
-      || $parm eq '&rest'
-      || $parm eq 'Lisp-Object';
+    next if $parm eq '&optional' || $parm eq '&rest';
     $arglist_parm{$parm} = 1;
   }
   my $doc_tmp = $docstring;
@@ -152,22 +150,6 @@ sub Check_function {
     next if $parm eq 'primary';
     next if $parm eq 'secondary';
     next if $parm eq 'clipboard';
-    next if $parm eq 'bbdb';
-    next if $parm eq 'dos';
-    next if $parm eq 'erc';
-    next if $parm eq 'exif';
-    next if $parm eq 'ldap';
-    next if $parm eq 'ime';
-    next if $parm eq 'rfc';
-    next if $parm eq 'ms-dos';
-    next if $parm eq 'url';
-    next if $parm eq 'w32';
-    next if $parm eq 'todo'; # org-mode
-    next if $parm eq 'done'; # org-mode
-    next if $parm eq 'waiting'; #org-mode
-    next if $parm eq 'ordered'; #org-mode
-    next if $parm eq 'deadline'; #org-mode
-    next if $parm eq 'scheduled'; #org-mode
     next if length $parm < 3;
     if (! exists $arglist_parm{$parm}) {
       print "bogus parm: $function: $parm\n";
@@ -246,43 +228,20 @@ open (FIND, "find src -name '*.c' -print |") or die;
 while (my $file = <FIND>) {
   my @matches =
     ((FileContents $file) =~
-     /\b
-      DEFUN\s*\(\s*
-      ## $function
-      \"((?:[^\\\"]|\\.)+)\"\s*,
-      \s*\S+\s*, \s*\S+\s*,
-      ## $minargs
-      \s*(\S+)\s*,
-      ## $maxargs
-      \s*(\S+)\s*,
-      ## $interactive
-      \s*((?:0|\"(?:(?:[^\\\"]|\\.)*)\"))\s*,
-      ## $docstring
-      \s*doc:\s*\/\*\s*(.*?)\s*\*\/
-      # attributes -- skip
-      (?:\s*attributes:\s*
-          (?:noreturn|const)
-          \s*)?
-      \s*\)
-      ### $parms
-      \s*\(
-      ([^()]*)
-      \)
-     /sgox);
+     /\bDEFUN\s*\(\s*\"((?:[^\\\"]|\\.)+)\"\s*,\s*\S+\s*,\s*(\S+)\s*,\s*(\S+)\s*,\s*((?:0|\"(?:(?:[^\\\"]|\\.)*)\"))\s*,\s*\/\*(.*?)\*\/\s*\(([^()]*)\)\)/sgo);
   while (@matches) {
     my ($function, $minargs, $maxargs, $interactive, $docstring, $parms) = splice (@matches, 0, 6);
     $docstring =~ s/^\n+//s;
     $docstring =~ s/\n+$//s;
     $parms =~ s/,/ /g;
-    my @parms = $parms eq 'void' ? () : split (' ', $parms);
+    my @parms = split (' ',$parms);
     for (@parms) { tr/_/-/; s/-$//; }
     if ($parms !~ /Lisp_Object/) {
       if ($minargs < @parms) {
-        if ($maxargs =~ /^\d+$/) {
-          die "$function: $maxargs"
-            unless $maxargs eq @parms;
-          splice (@parms, $minargs, 0, '&optional');
-        }
+	if ($maxargs =~ /^\d+$/) {
+	  die unless $maxargs eq @parms;
+	  splice (@parms, $minargs, 0, '&optional');
+	}
       }
     }
     my $funtype = ($interactive =~ /\"/ ? 'Command' : 'Function');
@@ -290,7 +249,13 @@ while (my $file = <FIND>) {
   }
 }
 
-my @pkgs = ();
+my @pkgs;
+if (-d "../xemacs-packages") {
+  @pkgs = qw (libs/edebug libs/xemacs-base comm/eudc oa/edit-utils);
+} else {
+  @pkgs = ();
+}
+for (@pkgs) { s@^@../xemacs-packages/@; }
 open (FIND, "find lisp @pkgs -name '*.el' -print |") or die;
 while (my $file = <FIND>) {
   my $contents = FileContents $file;

admin/check-man-pages

@@ -1,56 +0,0 @@
-#!/bin/bash
-### check-man-pages - check man pages for errors
-
-## Copyright (C) 2022-2023 Free Software Foundation, Inc.
-
-## Author: Stefan Kangas <stefankangas@gmail.com>
-
-## This file is part of GNU Emacs.
-
-## GNU Emacs is free software: you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation, either version 3 of the License, or
-## (at your option) any later version.
-
-## GNU Emacs is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-
-## You should have received a copy of the GNU General Public License
-## along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
-
-### Commentary:
-
-## Check Emacs man pages for errors using `man'.
-
-### Code:
-
-source "${0%/*}/emacs-shell-lib"
-
-exit_status=0
-
-cd "$PD"/../doc/man
-for page in *.1; do
-    # ctags.1 just includes the man page etags.1, which AFAICT will
-    # default to the one installed on the system (!), instead of the
-    # one in the repository.  So checking it is pointless, and we will
-    # in any case already check etags.1 separately.
-    if [ "$page" == "ctags.1" ]; then
-        continue
-    fi
-    log=$(emacs_mktemp)
-    LC_ALL=C.UTF-8 MANROFFSEQ='' MANWIDTH=80 \
-        man --warnings=all,mac -E UTF-8 -l -Tutf8 -Z "$page" >/dev/null 2> "$log"
-    log_size=$(stat --format=%s "$log")
-    if [ "$log_size" -ne 0 ]; then
-        echo "doc/man/$page:"
-        # Point to the correct file for *compilation* buffers.
-        cat "$log" \
-            | sed 's/troff: man1\/\([^ ]\+\)\.1/troff: doc\/man\/\1.1/' \
-            | sed "s/<standard input>/doc\/man\/$page/"
-        exit_status=1
-    fi
-done
-
-exit $exit_status

admin/coccinelle/window.cocci

@@ -106,6 +106,9 @@ Lisp_Object O;
 - W->column_number_displayed
 + WVAR (W, column_number_displayed)
 |
+- W->redisplay_end_trigger
++ WVAR (W, redisplay_end_trigger)
+|
 - W->combination_limit
 + WVAR (W, combination_limit)
 |
@@ -222,6 +225,9 @@ Lisp_Object O;
 - XWINDOW (O)->column_number_displayed
 + WVAR (XWINDOW (O), column_number_displayed)
 |
+- XWINDOW (O)->redisplay_end_trigger
++ WVAR (XWINDOW (O), redisplay_end_trigger)
+|
 - XWINDOW (O)->combination_limit
 + WVAR (XWINDOW (O), combination_limit)
 |

admin/cus-test.el

@@ -1,8 +1,9 @@
-;;; cus-test.el --- tests for custom types and load problems  -*- lexical-binding: t; -*-
+;;; cus-test.el --- tests for custom types and load problems
 
-;; Copyright (C) 1998, 2000, 2002-2023 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2000, 2002-2017 Free Software Foundation, Inc.
 
-;; Author: Markus Rost <rost@math.uni-bielefeld.de>
+;; Author: Markus Rost <markus.rost@mathematik.uni-regensburg.de>
+;; Maintainer: Markus Rost <rost@math.ohio-state.edu>
 ;; Created: 13 Sep 1998
 ;; Keywords: maint
 
@@ -19,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -37,13 +38,6 @@
 ;;
 ;;   src/emacs -batch -l admin/cus-test.el -f cus-test-noloads
 ;;
-;; or as a part of the test suite with
-;;
-;;   make -C test test-custom-opts
-;;   make -C test test-custom-deps
-;;   make -C test test-custom-libs
-;;   make -C test test-custom-noloads
-;;
 ;; in the emacs source directory.
 ;;
 ;; For interactive use: Load this file.  Then
@@ -119,7 +113,6 @@ Names should be as they appear in loaddefs.el.")
 ;; This avoids a hang of `cus-test-apropos' in 21.2.
 ;; (add-to-list 'cus-test-skip-list 'sh-alias-alist)
 
-(defvar viper-mode)
 (or noninteractive
     ;; Never Viperize.
     (setq viper-mode nil))
@@ -131,7 +124,7 @@ Names should be as they appear in loaddefs.el.")
 ;; Don't create a file `abbrev-file-name'.
 (setq save-abbrevs nil)
 
-;; Avoid compile logs from advised functions.
+;; Avoid compile logs from adviced functions.
 (eval-after-load "bytecomp"
   '(setq ad-default-compilation-action 'never))
 
@@ -145,8 +138,7 @@ Names should be as they appear in loaddefs.el.")
 (require 'cus-load)
 
 (defvar cus-test-errors nil
-  "List of problematic variables found by `cus-test-apropos'.
-Each element is (VARIABLE . PROBLEM); see `cus-test--format-problem'.")
+  "List of problematic variables found by `cus-test-apropos'.")
 
 (defvar cus-test-tested-variables nil
   "List of options tested by last call of `cus-test-apropos'.")
@@ -157,7 +149,7 @@ Each element is (VARIABLE . PROBLEM); see `cus-test--format-problem'.")
   "Set by `cus-test-apropos' to a list of options with :get property.")
 
 (defvar cus-test-vars-with-changed-state nil
-  "Set by `cus-test-apropos' to a list of options with state \\='changed.")
+  "Set by `cus-test-apropos' to a list of options with state 'changed.")
 
 (defvar cus-test-deps-errors nil
   "List of require/load problems found by `cus-test-deps'.")
@@ -182,15 +174,6 @@ Set by `cus-test-noloads'.")
 ;; (defvar cus-test-vars-cus-loaded nil
 ;;   "A list of options loaded by `custom-load-symbol'.")
 
-(defun cus-test--format-error (err)
-  "Format an element of `cus-test-errors'."
-  (pcase err
-    (`(,var :type-error ,value ,type)
-     (format "variable: %s\n   value: %S\n    type: %S" var value type))
-    (`(,var :other-error ,e)
-     (format "variable: %s\n   error: %S" var e))
-    (_ (format "%S" err))))
-
 (defun cus-test-apropos (regexp)
   "Check the options matching REGEXP.
 The detected problematic options are stored in `cus-test-errors'."
@@ -210,10 +193,11 @@ The detected problematic options are stored in `cus-test-errors'."
 	 (let* ((type (custom-variable-type symbol))
 		(conv (widget-convert type))
 		(get (or (get symbol 'custom-get) 'default-value))
-		values)
+		values
+		mismatch)
 	   (when (default-boundp symbol)
 	     (push (funcall get symbol) values)
-	     (push (eval (car (get symbol 'standard-value)) t) values))
+	     (push (eval (car (get symbol 'standard-value))) values))
 	   (if (boundp symbol)
 	       (push (symbol-value symbol) values))
 	   ;; That does not work.
@@ -224,9 +208,7 @@ The detected problematic options are stored in `cus-test-errors'."
 		   ;; TODO for booleans, check for values that can be
 		   ;; evaluated and are not t or nil.  Usually a bug.
 		   (unless (widget-apply conv :match value)
-                     (let ((err (list symbol :type-error value type)))
-                       (unless (member err cus-test-errors)
-                         (push err cus-test-errors)))))
+		     (setq mismatch 'mismatch)))
 		 values)
 
 	   ;; Store symbols with a custom-get property.
@@ -241,13 +223,14 @@ The detected problematic options are stored in `cus-test-errors'."
 		      (get symbol 'standard-value))))
 	     (and (consp c-value)
 		  (boundp symbol)
-		  (not (equal (eval (car c-value) t) (symbol-value symbol)))
-		  (add-to-list 'cus-test-vars-with-changed-state symbol))))
+		  (not (equal (eval (car c-value)) (symbol-value symbol)))
+		  (add-to-list 'cus-test-vars-with-changed-state symbol)))
+
+	   (if mismatch
+	       (push symbol cus-test-errors)))
 
        (error
-        (let ((err (list symbol :other-error alpha)))
-          (unless (member err cus-test-errors)
-	    (push err cus-test-errors)))
+	(push symbol cus-test-errors)
 	(message "Error for %s: %s" symbol alpha))))
    (cus-test-get-options regexp))
   (message "%s options tested"
@@ -257,7 +240,7 @@ The detected problematic options are stored in `cus-test-errors'."
 (defun cus-test-cus-load-groups (&optional cus-load)
   "Return a list of current custom groups.
 If CUS-LOAD is non-nil, include groups from cus-load.el."
-  (append (mapcar #'cdr custom-current-group-alist)
+  (append (mapcar 'cdr custom-current-group-alist)
 	  (if cus-load
 	      (with-temp-buffer
 		(insert-file-contents (locate-library "cus-load.el"))
@@ -282,7 +265,7 @@ currently defined groups."
 	(if group
 	    (memq symbol groups)
 	  (or
-           ;; (custom-variable-p symbol)
+	   ;; (user-variable-p symbol)
 	   (get symbol 'standard-value)
 	   ;; (get symbol 'saved-value)
 	   (get symbol 'custom-type)))
@@ -302,13 +285,13 @@ currently defined groups."
 	(insert "No errors found by cus-test.")
       (insert "The following variables seem to have problems:\n\n")
       (dolist (e cus-test-errors)
-	(insert (cus-test--format-error e) "\n")))))
+	(insert (symbol-name e) "\n")))))
 
 (defun cus-test-load-custom-loads ()
   "Call `custom-load-symbol' on all atoms."
   (interactive)
   (if noninteractive (let (noninteractive) (require 'dunnet)))
-  (mapatoms #'custom-load-symbol)
+  (mapatoms 'custom-load-symbol)
   (run-hooks 'cus-test-after-load-libs-hook))
 
 (defmacro cus-test-load-1 (&rest body)
@@ -337,8 +320,7 @@ If it is \"all\", load all Lisp files."
       (lambda (file)
 	(condition-case alpha
 	    (unless (member file cus-test-libs-noloads)
-	      (load (file-name-sans-extension (expand-file-name file lispdir))
-                    nil t)
+	      (load (file-name-sans-extension (expand-file-name file lispdir)))
 	      (push file cus-test-libs-loaded))
 	  (error
 	   (push (cons file alpha) cus-test-libs-errors)
@@ -365,10 +347,8 @@ Optional argument ALL non-nil means list all (non-obsolete) Lisp files."
     (prog1
 	;; Hack to remove leading "./".
 	(mapcar (lambda (e) (substring e 2))
-		(apply #'process-lines find-program
-		       "." "-name" "obsolete" "-prune" "-o"
-                       "-name" "ldefs-boot.el" "-prune" "-o"
-                       "-name" "*loaddefs.el" "-prune" "-o"
+		(apply 'process-lines find-program
+		       "-name" "obsolete" "-prune" "-o"
 		       "-name" "[^.]*.el" ; ignore .dir-locals.el
 		       (if all
 			   '("-print")
@@ -391,9 +371,7 @@ This function is suitable for batch mode.  E.g., invoke
 
 in the Emacs source directory.
 Normally only tests options belonging to files in loaddefs.el.
-If optional argument ALL is non-nil, test all files with defcustoms.
-
-Returns a list of variables with suspicious types."
+If optional argument ALL is non-nil, test all files with defcustoms."
   (interactive)
   (and noninteractive
        command-line-args-left
@@ -405,12 +383,9 @@ Returns a list of variables with suspicious types."
   (message "Running %s" 'cus-test-apropos)
   (cus-test-apropos "")
   (if (not cus-test-errors)
-      (progn
-        (message "No problems found")
-        nil)
+      (message "No problems found")
     (message "The following options might have problems:")
-    (cus-test-message (mapcar #'cus-test--format-error cus-test-errors))
-    cus-test-errors))
+    (cus-test-message cus-test-errors)))
 
 (defun cus-test-deps ()
   "Run a verbose version of `custom-load-symbol' on all atoms.
@@ -563,7 +538,7 @@ in the Emacs source directory."
 	(message "No options not loaded by custom-load-symbol found")
       (message "The following options were not loaded by custom-load-symbol:")
       (cus-test-message
-       (sort cus-test-vars-not-cus-loaded #'string<)))
+       (sort cus-test-vars-not-cus-loaded 'string<)))
 
     (dolist (o groups-loaded)
       (setq groups-not-loaded (delete o groups-not-loaded)))
@@ -571,7 +546,7 @@ in the Emacs source directory."
     (if (not groups-not-loaded)
 	(message "No groups not in cus-load.el found")
       (message "The following groups are not in cus-load.el:")
-      (cus-test-message (sort groups-not-loaded #'string<)))))
+      (cus-test-message (sort groups-not-loaded 'string<)))))
 
 (provide 'cus-test)
 

admin/diff-tar-files

@@ -1,6 +1,6 @@
-#!/bin/bash
+#! /bin/sh
 
-# Copyright (C) 2001-2023 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -15,9 +15,8 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-source "${0%/*}/emacs-shell-lib"
 
 if [ $# != 2 ]; then
     cat <<EOF
@@ -32,10 +31,11 @@ fi
 old_tar=$1
 new_tar=$2
 
-old_tmp="$(emacs_mktemp ${PN}-old)"
-new_tmp="$(emacs_mktemp ${PN}-new)"
+old_tmp=/tmp/old.$$
+new_tmp=/tmp/new.$$
+trap "rm -f $old_tmp $new_tmp; exit 1" 1 2 15
 
-tar tf "$old_tar" | sed -e 's,^[^/]*,,' | sort > $old_tmp
-tar tf "$new_tar" | sed -e 's,^[^/]*,,' | sort > $new_tmp
+tar tzf $old_tar | sed -e 's,^[^/]*,,' | sort > $old_tmp
+tar tzf $new_tar | sed -e 's,^[^/]*,,' | sort > $new_tmp
 diff -u $old_tmp $new_tmp
 rm -f $new_tmp $old_tmp

admin/emacs-shell-lib

@@ -1,87 +0,0 @@
-#!/bin/bash
-### emacs-shell-lib - shared code for Emacs shell scripts
-
-## Copyright (C) 2022-2023 Free Software Foundation, Inc.
-
-## Author: Stefan Kangas <stefankangas@gmail.com>
-
-## This file is part of GNU Emacs.
-
-## GNU Emacs is free software: you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation, either version 3 of the License, or
-## (at your option) any later version.
-
-## GNU Emacs is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-
-## You should have received a copy of the GNU General Public License
-## along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
-
-### Code:
-
-# Set an explicit umask.
-umask 077
-
-# Treat unset variables as an error.
-set -o nounset
-
-# Exit immediately on error.
-set -o errexit
-
-# Avoid non-standard command output from non-C locales.
-unset LANG LC_ALL LC_MESSAGES
-
-PN=${0##*/}                     # basename of script
-PD=${0%/*}                      # script directory
-
-[ "$PD" = "$0" ] && PD=.        # if PATH includes PWD
-
-die ()                 # write error to stderr and exit
-{
-    [ $# -gt 0 ] && echo "$PN: $@" >&2
-    exit 1
-}
-
-emacs_tempfiles=()
-
-emacs_tempfiles_cleanup ()
-{
-    for file in ${emacs_tempfiles[@]}; do
-        rm -f "${file}" 2> /dev/null
-    done
-}
-
-trap '
-  ret=$?
-  emacs_tempfiles_cleanup
-  exit $ret
-' EXIT
-
-emacs_mktemp ()
-{
-    local readonly file="${1-}"
-    local tempfile
-    local prefix
-
-    if [ -z "$file" ]; then
-        prefix="$PN"
-    else
-        prefix="$1"
-    fi
-
-    if [ -x "$(command -v mktemp)" ]; then
-        tempfile=$(mktemp "${TMPDIR-/tmp}/${prefix}.XXXXXXXXXX")
-    else
-        tempfile="${TMPDIR-/tmp}/${prefix}.$RANDOM$$"
-        (umask 077 && touch "$tempfile")
-    fi
-
-    [ -z "${tempfile}" ] && die "Creating temporary file failed"
-
-    emacs_tempfiles+=("${tempfile}")
-
-    echo "$tempfile"
-}

admin/emake

@@ -1,152 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2022-2023 Free Software Foundation, Inc.
-
-# This file is part of GNU Emacs.
-
-# GNU Emacs is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# GNU Emacs is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
-
-# This script is meant to be used as ./admin/emake, and will compile
-# the Emacs tree with virtually all of the informational messages
-# removed, and with errors/warnings highlighted in red.  It'll give a
-# quick overview to confirm that nothing has broken, for instance
-# after doing a "git pull".  It's not meant to be used during actual
-# development, because it removes so much information that commands
-# like `next-error' won't be able to jump to the source code where
-# errors are.
-
-cores=1
-
-# Determine the number of cores.
-if [ -f /proc/cpuinfo ]; then
-    cores=$(($(grep -E "^physical id|^cpu cores" /proc/cpuinfo |\
-	awk '{ print $4; }' |\
-	sed '$!N;s/\n/ /' |\
-	uniq |\
-	sed 's/^[0-9]*/+/')))
-fi
-
-NOCOLOR=0
-NOCHECK=0
-FASTOPT="FAST=true"
-QUIETER=0
-while :
-do
-    [[ "X$1" == "X--no-color" ]] && { NOCOLOR=1; shift; continue; }
-    [[ "X$1" == "X--no-check" ]] && { NOCHECK=1; shift; continue; }
-    [[ "X$1" == "X--no-fast" ]] && { FASTOPT=""; shift; continue; }
-    [[ "X$1" == "X--quieter" ]] && { QUIETER=1; shift; continue; }
-    break
-done
-
-make $FASTOPT -j$cores "$@" 2>&1 | \
-sed -u 's# \.\./\.\./# #
-s# \.\./# #
-s#^Configuring local git # Configuring local git #
-s#^Installing git hooks...# Installing git hooks...#
-s#^Running # Running #
-s#^Configured for # Configured for #
-s#^./temacs.*#  \\& #
-s#^make.*Error#  \\& #
-s#^Dumping under the name.*#  \\& #
-:a;/\\$/N;s/\\\n//;ta
-' | \
-grep -E --line-buffered -v "^make|\
-^Loading|\
-SCRAPE|\
-INFO.*Scraping.*[.] ?\$|\
-INFO.*Scraping.*done\$|\
-GEN.*etc/DOC|\
-GEN.*autoloads|\
-^Waiting for git|\
-^Finding pointers|\
-^Using load-path|\
-^Adding name|\
-^Dump mode|\
-^Dumping finger|\
-^Byte counts|\
-^Reloc counts|\
-^Pure-hashed|\
-^cp -f temacs|\
-^rm -f bootstrap|\
-^Dump complete|\
-^rm -f emacs|\
-mkdir -p etc|\
-mkdir -p info|\
-mkdir -p lisp|\
-^LC_ALL.*pdump|\
-^cp -f emacs.p|\
-GEN.*loaddefs|\
-^Reloading stale|\
-^Source file.*newer than|\
-^Directories for loaddefs|\
-^./autogen.sh|\
-^[Cc]hecking |\
-^.Read INSTALL.REPO for more|\
-^Your system has the required tools.|\
-^Building aclocal.m4|\
-^ Running 'autoreconf|\
-^You can now run './configure'|\
-^./configure|\
-^configure: creating|\
-^\"configure\" file built.|\
-^There seems to be no|\
-^config.status:|\
-ELN_DESTDIR|\
---bin-dest |\
-^ *$|\
-^Makefile built|\
-The GNU allocators don't work|\
-^git config |\
-^'\.git/|\
-^\^\(\(|\
-^ANCIENT=yes make|\
-^touch -t|\
-^'build-aux/git-hooks|\
-^GNUmakefile:[0-9]*: There seems to be no |\
-^GNUmakefile:[0-9]*: Running |\
-^GNUmakefile:[0-9]*: No Makefile|\
-^rm -f |\
-^rm -rf|\
-^find \. |\
-^rm -fr deps|\
-^if test -f \./\.gdbinit|\
-^true|\
-^for file in |\
-^rmdir|\
-^\[ \"\.\" = \"\.\" \]\
-" | \
-while read
-do
-  C=""
-  (($NOCOLOR == 0)) && [[ "X${REPLY:0:1}" != "X " ]] && C="\033[1;31m"
-  (($NOCOLOR == 0)) && [[ "X${REPLY:0:3}" == "X   " ]] && C="\033[1;31m"
-  if (($QUIETER == 0))
-  then
-      [[ "X$C" == "X" ]] && printf "%s\n" "$REPLY" || printf "$C%s\033[0m\n" "$REPLY"
-  else
-      [[ "X$C" == "X" ]] && printf "%-80s\r" "$REPLY" || printf "$C%-80s\033[0m\n" "$REPLY"
-  fi
-done
-
-# If make failed, exit now with its error code.
-((${PIPESTATUS[0]} != 0)) && exit ${PIPESTATUS[0]}
-
-(($NOCHECK == 1)) && exit 0
-
-# Run a "make check" on all test files belonging to files that have
-# changed since last time.
-make -j$cores check-maybe 2>&1 | \
-    sed -n '/contained unexpected results/,$p' | \
-    grep -E --line-buffered -v "^make"

admin/find-gc.el

@@ -1,6 +1,6 @@
-;;; find-gc.el --- detect functions that call the garbage collector  -*- lexical-binding: t; -*-
+;;; find-gc.el --- detect functions that call the garbage collector
 
-;; Copyright (C) 1992, 2001-2023 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 2001-2017 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -42,14 +42,14 @@ Each entry has the form (FUNCTION . FUNCTIONS-THAT-CALL-IT).")
 Each entry has the form (FUNCTION . FUNCTIONS-IT-CALLS).")
 
 
-;; Functions on this list are safe, even if they appear to be able
-;; to call the target.
+;;; Functions on this list are safe, even if they appear to be able
+;;; to call the target.
 
 (defvar find-gc-noreturn-list '(Fsignal Fthrow wrong_type_argument))
 
-;; This was originally generated directory-files, but there were
-;; too many files there that were not actually compiled.  The
-;; list below was created for a HP-UX 7.0 system.
+;;; This was originally generated directory-files, but there were
+;;; too many files there that were not actually compiled.  The
+;;; list below was created for a HP-UX 7.0 system.
 
 (defvar find-gc-source-files
   '("dispnew.c" "scroll.c" "xdisp.c" "window.c"
@@ -57,7 +57,7 @@ Each entry has the form (FUNCTION . FUNCTIONS-IT-CALLS).")
     "keymap.c" "sysdep.c" "buffer.c" "filelock.c"
     "insdel.c" "marker.c" "minibuf.c" "fileio.c"
     "dired.c" "cmds.c" "casefiddle.c"
-    "indent.c" "search.c" "regex-emacs.c" "undo.c"
+    "indent.c" "search.c" "regex.c" "undo.c"
     "alloc.c" "data.c" "doc.c" "editfns.c"
     "callint.c" "eval.c" "fns.c" "print.c" "lread.c"
     "syntax.c" "unexcoff.c"
@@ -73,14 +73,14 @@ Also store it in `find-gc-unsafe-list'."
   (find-unsafe-funcs 'Fgarbage_collect)
   (setq find-gc-unsafe-list
 	(sort find-gc-unsafe-list
-              (lambda (x y)
-                (string-lessp (car x) (car y))))))
+	      (function (lambda (x y)
+			  (string-lessp (car x) (car y)))))))
 
-;; This does a depth-first search to find all functions that can
-;; ultimately call the function "target".  The result is an a-list
-;; in find-gc-unsafe-list; the cars are the unsafe functions, and the cdrs
-;; are (one of) the unsafe functions that these functions directly
-;; call.
+;;; This does a depth-first search to find all functions that can
+;;; ultimately call the function "target".  The result is an a-list
+;;; in find-gc-unsafe-list; the cars are the unsafe functions, and the cdrs
+;;; are (one of) the unsafe functions that these functions directly
+;;; call.
 
 (defun find-unsafe-funcs (target)
   (setq find-gc-unsafe-list (list (list target)))
@@ -100,7 +100,7 @@ Also store it in `find-gc-unsafe-list'."
 
 
 
-(defun trace-call-tree (&optional _ignored)
+(defun trace-call-tree (&optional ignored)
   (message "Setting up directories...")
   (setq find-gc-subrs-called nil)
   (let ((case-fold-search nil)
@@ -134,8 +134,7 @@ Also store it in `find-gc-unsafe-list'."
 			(setcdr entry (cons name (cdr entry)))))))))))))
 
 (defun trace-use-tree ()
-  (setq find-gc-subrs-callers
-        (mapcar #'list (mapcar #'car find-gc-subrs-called)))
+  (setq find-gc-subrs-callers (mapcar 'list (mapcar 'car find-gc-subrs-called)))
   (let ((ptr find-gc-subrs-called)
 	p2 found)
     (while ptr

admin/gitmerge.el

@@ -1,14 +1,12 @@
-;;; gitmerge.el --- help merge one Emacs branch into another  -*- lexical-binding: t; -*-
+;;; gitmerge.el --- help merge one Emacs branch into another
 
-;; Copyright (C) 2010-2023 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2017 Free Software Foundation, Inc.
 
 ;; Authors: David Engster <deng@randomsample.de>
 ;;          Stefan Monnier <monnier@iro.umontreal.ca>
 
 ;; Keywords: maint
 
-;; This file is part of GNU Emacs.
-
 ;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or
@@ -20,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -37,10 +35,10 @@
 ;;   up-to-date).
 ;; - Mark commits you'd like to skip, meaning to only merge their
 ;;   metadata (merge strategy 'ours').
-;; - Hit 'm' to start merging.  Skipped commits will be merged separately.
+;; - Hit 'm' to start merging. Skipped commits will be merged separately.
 ;; - If conflicts cannot be resolved automatically, you'll have to do
-;;   it manually.  In that case, resolve the conflicts and restart
-;;   gitmerge, which will automatically resume.  It will add resolved
+;;   it manually. In that case, resolve the conflicts and restart
+;;   gitmerge, which will automatically resume. It will add resolved
 ;;   files, commit the pending merge and continue merging the rest.
 ;; - Inspect master branch, and if everything looks OK, push.
 
@@ -52,23 +50,13 @@
 (defvar gitmerge-skip-regexp
   ;; We used to include "sync" in there, but in my experience it only
   ;; caused false positives.  --Stef
-  (let ((skip "back[- ]?port\\|cherry picked from commit\\|\
-\\(do\\( no\\|n['’]\\)t\\|no need to\\) merge\\|not to be merged\\|\
-bump Emacs version\\|Auto-commit"))
-    (if noninteractive skip
-      ;; "Regenerate" is quite prone to false positives.
-      ;; We only want to skip merging things like AUTHORS and ldefs-boot.
-      ;; These should be covered by "bump version" and "auto-commit".
-      ;; It doesn't do much harm if we merge one of those files by mistake.
-      ;; So it's better to err on the side of false negatives.
-      (concat skip "\\|re-?generate\\|from trunk")))
+  "back[- ]?port\\|cherry picked from commit\\|\\(do\\( no\\|n['’]\\)t\\|no need to\\) merge\\|\
+re-?generate\\|bump version\\|from trunk\\|Auto-commit"
   "Regexp matching logs of revisions that might be skipped.
 `gitmerge-missing' will ask you if it should skip any matches.")
 
-(defvar gitmerge-minimum-missing 10
-  "Minimum number of missing commits to consider merging in batch mode.")
-
-(defvar gitmerge-status-file (locate-user-emacs-file "gitmerge-status")
+(defvar gitmerge-status-file (expand-file-name "gitmerge-status"
+					       user-emacs-directory)
   "File where missing commits will be saved between sessions.")
 
 (defvar gitmerge-ignore-branches-regexp
@@ -79,9 +67,8 @@ bump Emacs version\\|Auto-commit"))
   '((t (:strike-through t)))
   "Face for skipped commits.")
 
-(defvar gitmerge-default-branch nil
-  "Default for branch that should be merged.
-If nil, the function `gitmerge-default-branch' guesses.")
+(defconst gitmerge-default-branch "origin/emacs-25"
+  "Default for branch that should be merged.")
 
 (defconst gitmerge-buffer "*gitmerge*"
   "Working buffer for gitmerge.")
@@ -97,14 +84,11 @@ If nil, the function `gitmerge-default-branch' guesses.")
 
 (defvar gitmerge-mode-map
   (let ((map (make-keymap)))
-    (define-key map [(l)] #'gitmerge-show-log)
-    (define-key map [(d)] #'gitmerge-show-diff)
-    (define-key map [(f)] #'gitmerge-show-files)
-    (define-key map [(s)] #'gitmerge-toggle-skip)
-    (define-key map [(m)] #'gitmerge-start-merge)
-    ;; For convenience:
-    (define-key map [(n)] #'next-line)
-    (define-key map [(p)] #'previous-line)
+    (define-key map [(l)] 'gitmerge-show-log)
+    (define-key map [(d)] 'gitmerge-show-diff)
+    (define-key map [(f)] 'gitmerge-show-files)
+    (define-key map [(s)] 'gitmerge-toggle-skip)
+    (define-key map [(m)] 'gitmerge-start-merge)
     map)
   "Keymap for gitmerge major mode.")
 
@@ -119,26 +103,10 @@ If nil, the function `gitmerge-default-branch' guesses.")
 (defvar gitmerge--commits nil)
 (defvar gitmerge--from nil)
 
-(defun gitmerge-emacs-version (&optional branch)
-  "Return the major version of Emacs, optionally in BRANCH."
-  (with-temp-buffer
-    (if (not branch)
-        (insert-file-contents "configure.ac")
-      (let ((coding-system-for-read vc-git-log-output-coding-system))
-	(call-process "git" nil t nil "show" (format "%s:configure.ac" branch)))
-      (goto-char (point-min)))
-    (re-search-forward "^AC_INIT([^,]+, \\[?\\([0-9]+\\)\\.")
-    (string-to-number (match-string 1))))
-
-(defun gitmerge-default-branch ()
-  "Default for branch that should be merged; e.g. \"origin/emacs-28\"."
-  (or gitmerge-default-branch
-      (format "origin/emacs-%s" (1- (gitmerge-emacs-version)))))
-
 (defun gitmerge-get-sha1 ()
   "Get SHA1 from commit at point."
   (save-excursion
-    (goto-char (line-beginning-position))
+    (goto-char (point-at-bol))
     (when (looking-at "^[A-Z ]\\s-*\\([a-f0-9]+\\)")
       (match-string 1))))
 
@@ -151,8 +119,7 @@ If nil, the function `gitmerge-default-branch' guesses.")
 	(pop-to-buffer (get-buffer-create gitmerge-output-buffer))
 	(fundamental-mode)
 	(erase-buffer)
-	(let ((coding-system-for-read vc-git-log-output-coding-system))
-	  (call-process "git" nil t nil "log" "-1" commit))
+	(call-process "git" nil t nil "log" "-1" commit)
 	(goto-char (point-min))
 	(gitmerge-highlight-skip-regexp)))))
 
@@ -164,8 +131,7 @@ If nil, the function `gitmerge-default-branch' guesses.")
       (when commit
 	(pop-to-buffer (get-buffer-create gitmerge-output-buffer))
 	(erase-buffer)
-	(let ((coding-system-for-read vc-git-log-output-coding-system))
-	  (call-process "git" nil t nil "diff-tree" "-p" commit))
+	(call-process "git" nil t nil "diff-tree" "-p" commit)
 	(goto-char (point-min))
 	(diff-mode)))))
 
@@ -178,9 +144,7 @@ If nil, the function `gitmerge-default-branch' guesses.")
 	(pop-to-buffer (get-buffer-create gitmerge-output-buffer))
 	(erase-buffer)
 	(fundamental-mode)
-	(let ((coding-system-for-read vc-git-log-output-coding-system))
-	  (call-process "git" nil t nil "diff" "--name-only"
-			(concat commit "^!")))
+	(call-process "git" nil t nil "diff" "--name-only" (concat commit "^!"))
 	(goto-char (point-min))))))
 
 (defun gitmerge-toggle-skip ()
@@ -190,7 +154,7 @@ If nil, the function `gitmerge-default-branch' guesses.")
 	skip)
     (when commit
       (save-excursion
-        (goto-char (line-beginning-position))
+	(goto-char (point-at-bol))
 	(when (looking-at "^\\([A-Z ]\\)\\s-*\\([a-f0-9]+\\)")
 	  (setq skip (string= (match-string 1) " "))
 	  (goto-char (match-beginning 2))
@@ -198,7 +162,7 @@ If nil, the function `gitmerge-default-branch' guesses.")
 	  (dolist (ct gitmerge--commits)
 	    (when (string-match commit (car ct))
 	      (setcdr ct (when skip "M"))))
-          (goto-char (line-beginning-position))
+	  (goto-char (point-at-bol))
 	  (setq buffer-read-only nil)
 	  (delete-char 1)
 	  (insert (if skip "M" " "))
@@ -218,15 +182,12 @@ Will detect a default set of skipped revision by looking at
 cherry mark and search for `gitmerge-skip-regexp'.  The result is
 a list with entries of the form (SHA1 . SKIP), where SKIP denotes
 if and why this commit should be skipped."
-  (message "Finding missing commits...")
   (let (commits)
     ;; Go through the log and remember all commits that match
     ;; `gitmerge-skip-regexp' or are marked by --cherry-mark.
     (with-temp-buffer
-      (let ((coding-system-for-read vc-git-log-output-coding-system))
-	(call-process "git" nil t nil "log" "--cherry-mark" "--left-only"
-		      "--no-decorate"
-		      (concat from "..." (car (vc-git-branches)))))
+      (call-process "git" nil t nil "log" "--cherry-mark" "--left-only"
+		    (concat from "..." (car (vc-git-branches))))
       (goto-char (point-max))
       (while (re-search-backward "^commit \\(.+\\) \\([0-9a-f]+\\).*" nil t)
 	(let ((cherrymark (match-string 1))
@@ -242,17 +203,15 @@ if and why this commit should be skipped."
 		(when (re-search-forward gitmerge-skip-regexp nil t)
 		  (setcdr (car commits) "R"))))))
 	(delete-region (point) (point-max))))
-    (message "Finding missing commits...done")
     (nreverse commits)))
 
 (defun gitmerge-setup-log-buffer (commits from)
   "Create the buffer for choosing commits."
   (with-current-buffer (get-buffer-create gitmerge-buffer)
     (erase-buffer)
-    (let ((coding-system-for-read vc-git-log-output-coding-system))
-      (call-process "git" nil t nil "log" "--left-only"
-		    "--pretty=format:%h %<(20,trunc) %an: %<(100,trunc) %s"
-		    (concat from "..." (car (vc-git-branches)))))
+    (call-process "git" nil t nil "log" "--left-only"
+		  "--pretty=format:%h %<(20,trunc) %an: %<(100,trunc) %s"
+		  (concat from "..." (car (vc-git-branches))))
     (goto-char (point-min))
     (while (looking-at "^\\([a-f0-9]+\\)")
       (let ((skipreason (gitmerge-skip-commit-p (match-string 1) commits)))
@@ -286,14 +245,11 @@ should not be skipped."
 	(setq found (cdr skip))))
     found))
 
-(defvar change-log-start-entry-re) ; in add-log, which defines change-log-mode
-(declare-function add-log-iso8601-time-string "add-log" ())
-
 (defun gitmerge-resolve (file)
   "Try to resolve conflicts in FILE with smerge.
 Returns non-nil if conflicts remain."
   (unless (file-exists-p file) (error "Gitmerge-resolve: Can't find %s" file))
-  (with-demoted-errors "Error: %S"
+  (with-demoted-errors
     (let ((exists (find-buffer-visiting file)))
       (with-current-buffer (let ((enable-local-variables :safe)
                                  (enable-local-eval nil))
@@ -305,7 +261,7 @@ Returns non-nil if conflicts remain."
            ((derived-mode-p 'change-log-mode)
             ;; Fix up dates before resolving the conflicts.
             (goto-char (point-min))
-            (let ((diff-refine nil))
+            (let ((diff-auto-refine-mode nil))
               (while (re-search-forward smerge-begin-re nil t)
                 (smerge-match-conflict)
                 (smerge-ensure-match 3)
@@ -335,54 +291,23 @@ Returns non-nil if conflicts remain."
             ;; (pop-to-buffer (current-buffer)) (debug 'before-resolve)
             ))
           ;; Try to resolve the conflicts.
-          (let ((coding-system-for-read vc-git-log-output-coding-system)
-		temp)
-            (cond
-             ;; FIXME when merging release branch to master, we still
-             ;; need to detect and handle the case where NEWS was modified
-             ;; without a conflict.  We should abort if NEWS gets changed.
-             ((and (equal file "etc/NEWS")
-                   (ignore-errors
-                     (setq temp
-                           (format "NEWS.%s"
-                                   (gitmerge-emacs-version gitmerge--from))))
-                   (file-exists-p temp)
-                   (or noninteractive
-                       (y-or-n-p "Try to fix NEWS conflict? ")))
-              (let ((relfile (file-name-nondirectory file))
-                    (patchfile (concat temp "-gitmerge.patch")))
-                (call-process "git" nil `(:file ,patchfile) nil "diff"
-                              (format ":1:%s" file)
-                              (format ":3:%s" file))
-                (if (eq 0 (call-process "patch" patchfile nil nil temp))
-                    (progn
-                      ;; We intentionally use a non-temporary name for this
-                      ;; file, and only delete it if applied successfully.
-                      (delete-file patchfile)
-                      (call-process "git" nil t nil "add" "--" temp)
-                      (call-process "git" nil t nil "reset" "--" relfile)
-                      (call-process "git" nil t nil "checkout" "--" relfile)
-                      (revert-buffer nil 'noconfirm))
-                  ;; The conflict markers remain so we return non-nil.
-                  (message "Failed to fix NEWS conflict"))))
-             ;; Generated files.
-             ((member file '("lisp/ldefs-boot.el" "etc/AUTHORS"))
-              ;; We are in the file's buffer, so names are relative.
-              (call-process "git" nil t nil "reset" "--"
-                            (file-name-nondirectory file))
-              (call-process "git" nil t nil "checkout" "--"
-                            (file-name-nondirectory file))
-              (revert-buffer nil 'noconfirm))
-             (t
-              (goto-char (point-max))
-              (while (re-search-backward smerge-begin-re nil t)
-                (save-excursion
-                  (ignore-errors
-                    (smerge-match-conflict)
-                    (smerge-resolve))))
-              ;; (when (derived-mode-p 'change-log-mode)
-              ;;   (pop-to-buffer (current-buffer)) (debug 'after-resolve))
-              (save-buffer))))
+          (cond
+           ((member file '("configure" "lisp/ldefs-boot.el"
+                           "lisp/emacs-lisp/cl-loaddefs.el"))
+            ;; We are in the file's buffer, so names are relative.
+            (call-process "git" nil t nil "checkout" "--"
+                          (file-name-nondirectory file))
+            (revert-buffer nil 'noconfirm))
+           (t
+            (goto-char (point-max))
+            (while (re-search-backward smerge-begin-re nil t)
+              (save-excursion
+                (ignore-errors
+                  (smerge-match-conflict)
+                  (smerge-resolve))))
+            ;; (when (derived-mode-p 'change-log-mode)
+            ;;   (pop-to-buffer (current-buffer)) (debug 'after-resolve))
+            (save-buffer)))
           (goto-char (point-min))
           (prog1 (re-search-forward smerge-begin-re nil t)
             (unless exists (kill-buffer))))))))
@@ -402,10 +327,9 @@ is nil, only the single commit BEG is merged."
 			(if end "s were " " was ")
 			"skipped:\n\n")
 	      ""))
-    (let ((coding-system-for-read vc-git-log-output-coding-system))
-      (apply #'call-process "git" nil t nil "log" "--oneline"
-	     (if end (list (concat beg "~.." end))
-	       `("-1" ,beg))))
+    (apply 'call-process "git" nil t nil "log" "--oneline"
+	   (if end (list (concat beg "~.." end))
+	     `("-1" ,beg)))
     (insert "\n")
     ;; Truncate to 72 chars so that the resulting ChangeLog line fits in 80.
     (goto-char (point-min))
@@ -419,9 +343,8 @@ MISSING must be a list of SHA1 strings."
   (with-current-buffer (get-buffer-create gitmerge-output-buffer)
     (erase-buffer)
     (let* ((skip (cdar missing))
-	   (coding-system-for-read vc-git-log-output-coding-system)
 	   (beg (car (pop missing)))
-	   end commitmessage commitmessage1 commitmessage-file status)
+	   end commitmessage)
       ;; Determine last revision with same boolean skip status.
       (while (and missing
 		  (eq (null (cdar missing))
@@ -435,32 +358,12 @@ MISSING must be a list of SHA1 strings."
 	       (if end (concat ".." (substring end 0 6)) ""))
       (unless end
 	(setq end beg))
-      (when (eq system-type 'windows-nt)
-        ;; Command lines on MS-Windows cannot include newlines.
-	;; Since "git merge" doesn't accept a -F FILE option, we
-	;; commit the merge with a shortened single-line log message,
-	;; and then invoke "git commit --amend" with the full log
-	;; message from a temporary file.
-	(setq commitmessage1
-	      ;; Make sure the commit message is at most a single line.
-	      (car (split-string commitmessage "[\f\n\r\v]+")))
-	(setq commitmessage-file (make-nearby-temp-file "gitmerge-msg"))
-	(let ((coding-system-for-write vc-git-commits-coding-system))
-	  (write-region commitmessage nil commitmessage-file nil 'silent)))
-      (unless (setq status
-		    (zerop
-		     (apply #'call-process "git" nil t nil "merge" "--no-ff"
-			    (append (when skip '("-s" "ours"))
-				    (if commitmessage-file
-					`("-m" ,commitmessage1 ,end)
-				      `("-m" ,commitmessage ,end))))))
+      (unless (zerop
+	       (apply 'call-process "git" nil t nil "merge" "--no-ff"
+		      (append (when skip '("-s" "ours"))
+			      `("-m" ,commitmessage ,end))))
 	(gitmerge-write-missing missing from)
-	(gitmerge-resolve-unmerged))
-      (when (and commitmessage-file (file-exists-p commitmessage-file))
-	(if status
-	    (call-process "git" nil t nil
-			  "commit" "--amend" "-F" commitmessage-file))
-	(delete-file commitmessage-file)))
+	(gitmerge-resolve-unmerged)))
     missing))
 
 (defun gitmerge-resolve-unmerged ()
@@ -468,13 +371,12 @@ MISSING must be a list of SHA1 strings."
 Throw an user-error if we cannot resolve automatically."
   (with-current-buffer (get-buffer-create gitmerge-output-buffer)
     (erase-buffer)
-    (let ((coding-system-for-read vc-git-log-output-coding-system)
-	  files conflicted)
+    (let (files conflicted)
       ;; List unmerged files
       (if (not (zerop
 		(call-process "git" nil t nil
 			      "diff" "--name-only" "--diff-filter=U")))
-          (error "Error listing unmerged files.  Resolve manually.")
+	  (error "Error listing unmerged files. Resolve manually.")
 	(goto-char (point-min))
 	(while (not (eobp))
 	  (push (buffer-substring (point) (line-end-position)) files)
@@ -485,56 +387,37 @@ Throw an user-error if we cannot resolve automatically."
 	      (setq conflicted t)
 	    ;; Mark as resolved
 	    (call-process "git" nil t nil "add" file)))
-	(if (not conflicted)
-	    (and files (not (gitmerge-commit))
-		 (error "Error committing resolution - fix it manually"))
+	(when conflicted
 	  (with-current-buffer (get-buffer-create gitmerge-warning-buffer)
 	    (erase-buffer)
 	    (insert "For the following files, conflicts could\n"
 		    "not be resolved automatically:\n\n")
-	    (let ((conflicts
-		   (with-temp-buffer
-		     (call-process "git" nil t nil
-				   "diff" "--name-only" "--diff-filter=U")
-		     (buffer-string))))
-	      (insert conflicts)
-	      (if noninteractive (message "Conflicts in:\n%s" conflicts)))
+	    (call-process "git" nil t nil
+			  "diff" "--name-only" "--diff-filter=U")
 	    (insert "\nResolve the conflicts manually, then run gitmerge again."
 		    "\nNote:\n  - You don't have to add resolved files or "
 		    "commit the merge yourself (but you can)."
 		    "\n  - You can safely close this Emacs session and do this "
 		    "in a new one."
 		    "\n  - When running gitmerge again, remember that you must "
-		    "do that from within the Emacs repo.\n")
+		    "that from within the Emacs repo.\n")
 	    (pop-to-buffer (current-buffer)))
 	  (user-error "Resolve the conflicts manually"))))))
 
 (defun gitmerge-repo-clean ()
   "Return non-nil if repository is clean."
   (with-temp-buffer
-    (let ((coding-system-for-read vc-git-log-output-coding-system))
       (call-process "git" nil t nil
 		    "diff" "--staged" "--name-only")
       (call-process "git" nil t nil
 		    "diff" "--name-only")
-      (zerop (buffer-size)))))
-
-(defun gitmerge-commit ()
-  "Commit, and return non-nil if it succeeds."
-  (with-current-buffer (get-buffer-create gitmerge-output-buffer)
-    (let ((coding-system-for-read vc-git-log-output-coding-system))
-      (erase-buffer)
-      (eq 0 (call-process "git" nil t nil "commit" "--no-edit")))))
+      (zerop (buffer-size))))
 
 (defun gitmerge-maybe-resume ()
   "Check if we have to resume a merge.
 If so, add no longer conflicted files and commit."
-  (let ((mergehead
-         (file-exists-p
-          (expand-file-name
-           "MERGE_HEAD"
-           (car (process-lines
-                 "git" "rev-parse" "--no-flags" "--git-dir")))))
+  (let ((mergehead (file-exists-p
+		    (expand-file-name ".git/MERGE_HEAD" default-directory)))
 	(statusexist (file-exists-p gitmerge-status-file)))
     (when (and mergehead (not statusexist))
       (user-error "Unfinished merge, but no record of a previous gitmerge run"))
@@ -542,7 +425,7 @@ If so, add no longer conflicted files and commit."
 	       (not (gitmerge-repo-clean)))
       (user-error "Repository is not clean"))
     (when statusexist
-      (if (or noninteractive (not (y-or-n-p "Resume merge? ")))
+      (if (not (y-or-n-p "Resume merge? "))
 	  (progn
 	    (delete-file gitmerge-status-file)
 	    ;; No resume.
@@ -551,8 +434,11 @@ If so, add no longer conflicted files and commit."
 	(gitmerge-resolve-unmerged)
 	;; Commit the merge.
 	(when mergehead
-	  (or (gitmerge-commit)
-	      (error "Git error during merge - fix it manually")))
+	  (with-current-buffer (get-buffer-create gitmerge-output-buffer)
+	    (erase-buffer)
+	    (unless (zerop (call-process "git" nil t nil
+					 "commit" "--no-edit"))
+	      (error "Git error during merge - fix it manually"))))
 	;; Successfully resumed.
 	t))))
 
@@ -608,12 +494,8 @@ Branch FROM will be prepended to the list."
        (list
 	(if (gitmerge-maybe-resume)
 	    'resume
-	  (if noninteractive
-	      (or (pop command-line-args-left)
-		  (gitmerge-default-branch))
-	    (completing-read "Merge branch: "
-			     (gitmerge-get-all-branches)
-			     nil t (gitmerge-default-branch))))))))
+	  (completing-read "Merge branch: " (gitmerge-get-all-branches)
+			   nil t gitmerge-default-branch))))))
   (let ((default-directory (vc-git-root default-directory)))
     (if (eq from 'resume)
 	(progn
@@ -625,30 +507,17 @@ Branch FROM will be prepended to the list."
       (setq gitmerge--from from)
       (when (null gitmerge--commits)
 	(user-error "Nothing to merge"))
-      (and noninteractive
-	   gitmerge-minimum-missing
-	   (< (length gitmerge--commits) gitmerge-minimum-missing)
-	   (user-error "Number of missing commits (%s) is less than %s"
-		       (length gitmerge--commits)
-		       gitmerge-minimum-missing))
       (with-current-buffer
 	  (gitmerge-setup-log-buffer gitmerge--commits gitmerge--from)
 	(goto-char (point-min))
-        (insert (substitute-command-keys
-                 (concat
-                  (propertize "Commands: " 'font-lock-face 'bold)
-                  "\\<gitmerge-mode-map>"
-                  "(\\[gitmerge-toggle-skip]) Toggle skip, "
-                  "(\\[gitmerge-show-log]) Show log, "
-                  "(\\[gitmerge-show-diff]) Show diff, "
-                  "(\\[gitmerge-show-files]) Show files, "
-                  "(\\[gitmerge-start-merge]) Start merge\n"
-                  (propertize "Flags:    " 'font-lock-face 'bold)
-                  "(C) Detected backport (cherry-mark), (R) Matches skip "
-                  "regexp, (M) Manually picked\n\n")))
+	(insert (propertize "Commands: " 'font-lock-face 'bold)
+		"(s) Toggle skip, (l) Show log, (d) Show diff, "
+		"(f) Show files, (m) Start merge\n"
+		(propertize "Flags:    " 'font-lock-face 'bold)
+		"(C) Detected backport (cherry-mark), (R) Log matches "
+		"regexp, (M) Manually picked\n\n")
 	(gitmerge-mode)
-	(pop-to-buffer (current-buffer))
-	(if noninteractive (gitmerge-start-merge))))))
+	(pop-to-buffer (current-buffer))))))
 
 (defun gitmerge-start-merge ()
   (interactive)

admin/grammars/Makefile.in

@@ -1,6 +1,6 @@
 ### @configure_input@
 
-## Copyright (C) 2013-2023 Free Software Foundation, Inc.
+## Copyright (C) 2013-2017 Free Software Foundation, Inc.
 
 ## This file is part of GNU Emacs.
 
@@ -15,7 +15,7 @@
 ## GNU General Public License for more details.
 
 ## You should have received a copy of the GNU General Public License
-## along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+## along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ### Commentary:
 
@@ -28,14 +28,24 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
 
--include ${top_builddir}/src/verbose.mk
+# 'make' verbosity.
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 =
+
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
 
 # Prevent any settings in the user environment causing problems.
-unexport EMACSDATA EMACSDOC EMACSLOADPATH EMACSPATH
+unexport EMACSDATA EMACSDOC EMACSPATH
 
 EMACS = ${top_builddir}/src/emacs
-emacs = "${EMACS}" -batch --no-site-file --no-site-lisp \
-  --eval '(setq load-prefer-newer t)'
+emacs = EMACSLOADPATH= "${EMACS}" -batch --no-site-file --no-site-lisp
 
 make_bovine = ${emacs} -l semantic/bovine/grammar -f bovine-batch-make-parser
 make_wisent = ${emacs} -l semantic/wisent/grammar -f wisent-batch-make-parser
@@ -44,19 +54,19 @@ cedetdir = ${top_srcdir}/lisp/cedet
 bovinedir = ${cedetdir}/semantic/bovine
 wisentdir = ${cedetdir}/semantic/wisent
 
-grammar_bovine = ${bovinedir}/grammar.el
-grammar_wisent = ${wisentdir}/grammar.el
-
 BOVINE = \
 	${bovinedir}/c-by.el \
 	${bovinedir}/make-by.el \
 	${bovinedir}/scm-by.el
 
-WISENT = 				   \
-	${cedetdir}/semantic/grammar-wy.el \
-	${wisentdir}/javat-wy.el 	   \
-	${wisentdir}/js-wy.el 		   \
-	${wisentdir}/python-wy.el 	   \
+## FIXME Should include this one too:
+##	${cedetdir}/semantic/grammar-wy.el
+## but semantic/grammar.el (which is what we use to generate grammar-wy.el)
+## requires it!
+WISENT = \
+	${wisentdir}/javat-wy.el \
+	${wisentdir}/js-wy.el \
+	${wisentdir}/python-wy.el \
 	${cedetdir}/srecode/srt-wy.el
 
 ALL = ${BOVINE} ${WISENT}
@@ -70,45 +80,46 @@ bovine: ${BOVINE}
 wisent: ${WISENT}
 
 ## c-by.el, make-by.el.
-${bovinedir}/%-by.el: ${srcdir}/%.by ${grammar_bovine}
+${bovinedir}/%-by.el: ${srcdir}/%.by
 	$(AM_V_GEN)[ ! -f "$@" ] || chmod +w "$@"
 	$(AM_V_at)${make_bovine} -o "$@" $<
 
-${bovinedir}/scm-by.el: ${srcdir}/scheme.by ${grammar_bovine}
+${bovinedir}/scm-by.el: ${srcdir}/scheme.by
 	$(AM_V_GEN)[ ! -f "$@" ] || chmod +w "$@"
 	$(AM_V_at)${make_bovine} -o "$@" $<
 
 ## grammar-wy.el
-${cedetdir}/semantic/%-wy.el: ${srcdir}/%.wy ${grammar_wisent}
+${cedetdir}/semantic/%-wy.el: ${srcdir}/%.wy
 	$(AM_V_GEN)[ ! -f "$@" ] || chmod +w "$@"
 	$(AM_V_at)${make_wisent} -o "$@" $<
 
 ## js-wy.el, python-wy.el
-${wisentdir}/%-wy.el: ${srcdir}/%.wy ${grammar_wisent}
+${wisentdir}/%-wy.el: ${srcdir}/%.wy
 	$(AM_V_GEN)[ ! -f "$@" ] || chmod +w "$@"
 	$(AM_V_at)${make_wisent} -o "$@" $<
 
-${wisentdir}/javat-wy.el: ${srcdir}/java-tags.wy ${grammar_wisent}
+${wisentdir}/javat-wy.el: ${srcdir}/java-tags.wy
 	$(AM_V_GEN)[ ! -f "$@" ] || chmod +w "$@"
 	$(AM_V_at)${make_wisent} -o "$@" $<
 
-${cedetdir}/srecode/srt-wy.el: ${srcdir}/srecode-template.wy ${grammar_wisent}
+${cedetdir}/srecode/srt-wy.el: ${srcdir}/srecode-template.wy
 	$(AM_V_GEN)[ ! -f "$@" ] || chmod +w "$@"
 	$(AM_V_at)${make_wisent} -o "$@" $<
 
-.PHONY: distclean bootstrap-clean maintainer-clean gen-clean
+
+.PHONY: distclean bootstrap-clean maintainer-clean extraclean
 
 distclean:
 	rm -f Makefile
 
-## IMO this should run gen-clean.
+## Perhaps this should do what extraclean (qv) does.
 bootstrap-clean:
 
-gen-clean:
+maintainer-clean: distclean
+
+## We do not normally delete the generated files, even in bootstrap.
+## Creating them does not take long, so we could easily change this.
+extraclean:
 	rm -f ${ALL}
 
-maintainer-clean: gen-clean distclean
-
-
-
 # Makefile.in ends here

admin/grammars/c.by

@@ -1,5 +1,5 @@
 ;;; c.by -- LL grammar for C/C++ language specification
-;; Copyright (C) 1999-2023 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2017 Free Software Foundation, Inc.
 ;;
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;;         David Ponce <david@dponce.com>
@@ -18,7 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;; TODO:  From Nate Schley
 ;; >  * Can't parse signature element: "const char* const rmc_ClrTxt"
@@ -187,7 +187,7 @@
 
 ;; Types
 %token VOID "void"
-%put VOID summary "Built in type: void"
+%put VOID summary "Built in typeless type: void"
 %token CHAR "char"
 %put CHAR summary "Integral Character Type: (0 to 256)"
 %token WCHAR "wchar_t"
@@ -415,7 +415,7 @@ typesimple
   : struct-or-class opt-class opt-name opt-template-specifier
     opt-class-parents semantic-list
     (TYPE-TAG (car $3) (car $1)
-          (dlet ((semantic-c-classname (cons (car ,$3) (car ,$1))))
+          (let ((semantic-c-classname (cons (car ,$3) (car ,$1))))
             (EXPANDFULL $6 classsubparts))
           $5
           :template-specifier $4
@@ -917,8 +917,8 @@ variablearg-opt-name
     ( ,$1 )
   | semantic-list arg-list
     ( (car ( EXPAND $1 function-pointer )) $2)
- ;; Klaus Berndl: This allows variableargs without an arg-name being
- ;; parsed correctly even if there several pointers (*)
+ ;; Klaus Berndl: This allows variableargs without a arg-name being
+ ;; parsed correct even if there several pointers (*)
   | opt-stars
     ( "" ,$1 nil nil nil )
   ;

admin/grammars/grammar.wy

@@ -1,8 +1,9 @@
 ;;; semantic-grammar.wy -- LALR grammar of Semantic input grammars
 ;;
-;; Copyright (C) 2002-2023 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2017 Free Software Foundation, Inc.
 ;;
 ;; Author: David Ponce <david@dponce.com>
+;; Maintainer: David Ponce <david@dponce.com>
 ;; Created: 26 Aug 2002
 ;; Keywords: syntax
 ;; X-RCS: $Id: semantic-grammar.wy,v 1.16 2005/09/30 20:20:27 zappo Exp $
@@ -20,7 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 %package semantic-grammar-wy
 %provide semantic/grammar-wy
@@ -52,7 +53,6 @@
 %keyword LEFT            "%left"
 %keyword NONASSOC        "%nonassoc"
 %keyword PACKAGE         "%package"
-%keyword EXPECTEDCONFLICTS "%expectedconflicts"
 %keyword PROVIDE         "%provide"
 %keyword PREC            "%prec"
 %keyword PUT             "%put"
@@ -128,7 +128,7 @@ epilogue:
 ;;
 declaration:
     decl
-    (eval $1 t)
+    (eval $1)
   ;
 
 decl:
@@ -136,7 +136,6 @@ decl:
   | no_default_prec_decl
   | languagemode_decl
   | package_decl
-  | expectedconflicts_decl
   | provide_decl
   | precedence_decl
   | put_decl
@@ -169,11 +168,6 @@ package_decl:
     `(PACKAGE-TAG ',$2 nil)
   ;
 
-expectedconflicts_decl:
-    EXPECTEDCONFLICTS symbols
-    `(TAG ',(car $2) 'expectedconflicts :rest ',(cdr $2))
-  ;
-
 provide_decl:
     PROVIDE SYMBOL
     `(TAG ',$2 'provide)
@@ -206,7 +200,7 @@ put_decl:
 
 put_name_list:
     BRACE_BLOCK
-    (mapcar #'semantic-tag-name (EXPANDFULL $1 put_names))
+    (mapcar 'semantic-tag-name (EXPANDFULL $1 put_names))
   ;
 
 put_names:
@@ -226,7 +220,7 @@ put_name:
 
 put_value_list:
     BRACE_BLOCK
-    (mapcar #'semantic-tag-code-detail (EXPANDFULL $1 put_values))
+    (mapcar 'semantic-tag-code-detail (EXPANDFULL $1 put_values))
   ;
 
 put_values:
@@ -300,7 +294,7 @@ plist:
 
 use_name_list:
     BRACE_BLOCK
-    (mapcar #'semantic-tag-name (EXPANDFULL $1 use_names))
+    (mapcar 'semantic-tag-name (EXPANDFULL $1 use_names))
   ;
 
 use_names:
@@ -356,7 +350,7 @@ nonterminal:
 
 rules:
     lifo_rules
-    (apply #'nconc (nreverse $1))
+    (apply 'nconc (nreverse $1))
   ;
 
 lifo_rules:

admin/grammars/java-tags.wy

@@ -1,8 +1,9 @@
 ;;; java-tags.wy -- Semantic LALR grammar for Java
 
-;; Copyright (C) 2002-2023 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2017 Free Software Foundation, Inc.
 ;;
 ;; Author: David Ponce <david@dponce.com>
+;; Maintainer: David Ponce <david@dponce.com>
 ;; Created: 26 Aug 2002
 ;; Keywords: syntax
 
@@ -19,7 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 %package wisent-java-tags-wy
 %provide semantic/wisent/javat-wy

admin/grammars/js.wy

@@ -1,6 +1,6 @@
 ;;; javascript-jv.wy -- LALR grammar for Javascript
 
-;; Copyright (C) 2005-2023 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2017 Free Software Foundation, Inc.
 ;; Copyright (C) 1998-2011 Ecma International.
 
 ;; Author: Joakim Verona
@@ -18,14 +18,14 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
 ;; The grammar itself is transcribed from the ECMAScript Language
 ;; Specification published at
 ;;
-;; https://www.ecma-international.org/publications/standards/Ecma-262.htm
+;; http://www.ecma-international.org/publications/standards/Ecma-262.htm
 ;;
 ;; and redistributed under the following license:
 
@@ -236,9 +236,9 @@
 %token <number>      NUMBER
 
 
-%token <false> FALSE
-%token <true> TRUE
-%token <query> QUERY
+%token FALSE
+%token TRUE
+%token QUERY
 
 
 %token NULL_TOKEN
@@ -296,11 +296,19 @@ FormalParameterList: OPEN_PARENTHESIS
 		     ()
 		   ;
 
+StatementList : Statement
+              | StatementList Statement
+              ;
+
 Block : BRACE_BLOCK
      ;; If you want to parse the body of the function
      ;; ( EXPANDFULL $1 BlockExpand )
       ;
 
+BlockExpand: START_BLOCK StatementList END_BLOCK
+	   | START_BLOCK END_BLOCK
+	   ;
+
 VariableStatement : VAR VariableDeclarationList SEMICOLON
 		    (VARIABLE-TAG $2 nil nil)
                   ;

admin/grammars/make.by

@@ -1,6 +1,6 @@
 ;;; make.by -- BY notation for Makefiles.
 
-;; Copyright (C) 1999-2023 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2017 Free Software Foundation, Inc.
 ;;
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;;         David Ponce <david@dponce.com>
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 %package semantic-make-by
 %provide semantic/bovine/make-by
@@ -54,20 +54,15 @@
 
 %%
 
-;; Escape the ,@ below because the reader doesn't correctly detect
-;; old-style backquotes for this case.  The backslashes can be removed
-;; once old-style backquotes are completely gone (probably in
-;; Emacs 28).
-
 Makefile : bol newline (nil)
 	 | bol variable
-	   ( \,@$2 )
+	   ( ,@$2 )
 	 | bol rule
-	   ( \,@$2 )
+	   ( ,@$2 )
 	 | bol conditional
-	   ( \,@$2 )
+	   ( ,@$2 )
 	 | bol include
-	   ( \,@$2 )
+	   ( ,@$2 )
 	 | whitespace ( nil )
 	 | newline ( nil )
 	 ;
@@ -130,16 +125,16 @@ colons: COLON COLON ()
       ;
 
 element-list: elements newline
-	      ( \,@$1 )
+	      ( ,@$1 )
 	    ;
 
 elements: element some-whitespace elements
-	  ( \,@$1 ,@$3 )
+	  ( ,@$1 ,@$3 )
 	| element
-	  ( \,@$1 )
+	  ( ,@$1 )
 	| ;;EMPTY
 	;
-
+  
 element: sub-element element
 	 ( (concat (car ,$1) (car ,$2)) )
        | ;;EMPTY

admin/grammars/python.wy

@@ -1,10 +1,11 @@
 ;;; python.wy -- LALR grammar for Python
 
-;; Copyright (C) 2002-2023 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2017 Free Software Foundation, Inc.
 ;; Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
 ;; 2009, 2010 Python Software Foundation; All Rights Reserved
 
 ;; Author: Richard Kim <ryk@dspwiz.com>
+;; Maintainer: Richard Kim <ryk@dspwiz.com>
 ;; Created: June 2002
 ;; Keywords: syntax
 ;;
@@ -21,7 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
@@ -88,17 +89,14 @@
 
 %package wisent-python-wy
 %provide semantic/wisent/python-wy
-%expectedconflicts 5
 
 %{
-(require 'semantic/tag)
 (declare-function wisent-python-reconstitute-function-tag
 		  "semantic/wisent/python" (tag suite))
 (declare-function wisent-python-reconstitute-class-tag "semantic/wisent/python"
 		  (tag))
 (declare-function semantic-parse-region "semantic"
 		  (start end &optional nonterminal depth returnonerror))
-(defvar wisent-python-EXPANDING-block)
 }
 
 %languagemode python-mode
@@ -186,7 +184,6 @@
 %token <punctuation> ASSIGN 	"="
 %token <punctuation> BACKQUOTE	"`"
 %token <punctuation> AT         "@"
-%token <punctuation> FOLLOWS    "->"
 
 
 ;; -----------------
@@ -811,17 +808,12 @@ decorators
 
 ;; funcdef: [decorators] 'def' NAME parameters ':' suite
 funcdef
-  : DEF NAME function_parameter_list return_type_hint COLON suite
+  : DEF NAME function_parameter_list COLON suite
     (wisent-python-reconstitute-function-tag
-     (FUNCTION-TAG $2 nil $3) $6)
-  | decorators DEF NAME function_parameter_list return_type_hint COLON suite
+     (FUNCTION-TAG $2 nil $3) $5)
+  | decorators DEF NAME function_parameter_list COLON suite
     (wisent-python-reconstitute-function-tag
-     (FUNCTION-TAG $3 nil $4 :decorators $1) $7)
-  ;
-
-return_type_hint
-  : ;;EMPTY
-  | FOLLOWS type
+     (FUNCTION-TAG $3 nil $4 :decorators $1) $6)
   ;
 
 function_parameter_list
@@ -873,7 +865,7 @@ paren_class_list_opt
 paren_class_list
   : PAREN_BLOCK
     (let ((wisent-python-EXPANDING-block t))
-      (mapcar #'semantic-tag-name (EXPANDFULL $1 paren_classes)))
+      (mapcar 'semantic-tag-name (EXPANDFULL $1 paren_classes)))
   ;
 
 ;; parameters: '(' [varargslist] ')'
@@ -895,7 +887,7 @@ paren_classes
 ;; parser can parse general expressions, I don't see much benefit in
 ;; generating a string of expression as base class "name".
 paren_class
-  : type
+  : dotted_name
   ;
 
 ;;;****************************************************************************
@@ -1148,7 +1140,7 @@ fpdef_opt_test
 
 ;; fpdef: NAME | '(' fplist ')'
 fpdef
-  : NAME type_hint
+  : NAME
     (VARIABLE-TAG $1 nil nil)
  ;; Below breaks the parser.  Don't know why, but my guess is that
  ;; LPAREN/RPAREN clashes with the ones in function_parameters.
@@ -1156,25 +1148,15 @@ fpdef
  ;;    (identity $2)
   ;
 
-;; These rules are now useless because the above rule doesn't refer to them.
-;; ;; fplist: fpdef (',' fpdef)* [',']
-;; fplist
-;;   : fpdef_list comma_opt
-;;   ;
-
-;; ;; fpdef (',' fpdef)*
-;; fpdef_list
-;;   : fpdef
-;;   | fpdef_list COMMA fpdef
-;;   ;
-
-type_hint
-  : ;;EMPTY
-  | COLON type
+;; fplist: fpdef (',' fpdef)* [',']
+fplist
+  : fpdef_list comma_opt
   ;
 
-type
-  : test
+;; fpdef (',' fpdef)*
+fpdef_list
+  : fpdef
+  | fpdef_list COMMA fpdef
   ;
 
 ;; ['=' test]

admin/grammars/scheme.by

@@ -1,6 +1,6 @@
 ;;; scheme.by -- Scheme BNF language specification
 
-;; Copyright (C) 2001-2023 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2017 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -15,16 +15,11 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 %package semantic-scm-by
 %provide semantic/bovine/scm-by
 
-%{
-(declare-function semantic-parse-region "semantic"
-		  (start end &optional nonterminal depth returnonerror))
-}
-
 %languagemode  scheme-mode
 %start         scheme
 
@@ -72,8 +67,6 @@ scheme-in-list: DEFINE symbol expression
 		(INCLUDE-TAG (file-name-nondirectory (read $2)) (read $2) )
 	      | symbol sequence
 		(CODE-TAG $1 nil)
-	      | ;; No match, error
-		(TAG "Bad Tag in Sexp" 'error)
 	      ;
 
 name-args: semantic-list
@@ -105,3 +98,4 @@ expression : symbol
 	   ;
 
 ;;; scheme.by ends here
+

admin/grammars/srecode-template.wy

@@ -1,8 +1,8 @@
 ;;; srecode-template.wy --- Semantic Recoder Template parser
 
-;; Copyright (C) 2005-2023 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2017 Free Software Foundation, Inc.
 
-;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Author: Eric Ludlam <zappo@gnu.org>
 ;; Keywords: syntax
 ;; X-RCS: $Id: srecode-template.wy,v 1.10 2009-01-09 23:01:54 zappo Exp $
 
@@ -19,7 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
@@ -126,7 +126,7 @@ variable
   : SET symbol insertable-string-list newline
     (VARIABLE-TAG $2 nil $3)
   | SET symbol number newline
-    ;; This so a common error with priority works.
+    ;; This so a common error w/ priority works.
     ;; Note that "number" still has a string value in the lexer.
     (VARIABLE-TAG $2 nil (list $3))
   | SHOW symbol newline

admin/last-chance.el

@@ -1,6 +1,6 @@
 ;;; last-chance.el --- dangling deterrence     -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2016-2023 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2017 Free Software Foundation, Inc.
 
 ;; Author: Thien-Thi Nguyen <ttn@gnu.org>
 ;; Maintainer: emacs-devel@gnu.org
@@ -20,18 +20,18 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
 ;; Late 2016.  In a recent build, the date in a ChangeLog file
-;; is not fontified.  Turns out the face `change-log-date-face'
+;; is not fontified.  Turns out the face ‘change-log-date-face’
 ;; was declared obsolete since 22.1 and removed 2016-06-23.
 ;; (compile "git show c430f7e23fc2c22f251ace4254e37dea1452dfc3")
 ;;
-;; This library provides a command `last-chance', which is a small
+;; This library provides a command ‘last-chance’, which is a small
 ;; combination of "git grep" and some regexp filtering.  For example,
-;; if point is on the symbol `change-log-date-face' in the form:
+;; if point is on the symbol ‘change-log-date-face’ in the form:
 ;;
 ;;  (define-obsolete-face-alias 'change-log-date-face ...)
 ;;
@@ -39,9 +39,9 @@
 ;;
 ;;  M-x last-chance RET
 ;;
-;; will show you any references to `change-log-date-face' in the
+;; will show you any references to ‘change-log-date-face’ in the
 ;; *.el files in a new buffer (in Grep mode).  Hopefully you see
-;; only the obsolete declaration and can proceed with its removal.
+;; only the obsolete declaration and can proceed w/ its removal.
 ;; If not, please DTRT and refrain from the removal until those
 ;; references are properly transitioned.
 ;;
@@ -59,17 +59,17 @@ This should include -n, -H, -F.")
 (defvar last-chance-uninteresting-regexps
   '("ChangeLog[.0-9]*:"
     "NEWS[-.0-9]*:"
-    ;; Add more `flush-lines' args here.
+    ;; Add more ‘flush-lines’ args here.
     )
   "List of regexps that match uninteresting \"git grep\" hits.")
 
 (defvar-local last-chance-symbol nil
-  "Symbol set by `last-chance' for `last-chance-cleanup' to DTRT.")
+  "Symbol set by ‘last-chance’ for ‘last-chance-cleanup’ to DTRT.")
 
 (defun last-chance-cleanup (buffer status)
   "Filter lines in BUFFER; append STATUS and count of removed lines.
-If BUFFER does not seem to be one created by `last-chance', do nothing.
-This function is intended to be added to `compilation-finish-functions'."
+If BUFFER does not seem to be one created by ‘last-chance’, do nothing.
+This function is intended to be added to ‘compilation-finish-functions’."
   (let ((name (buffer-local-value 'last-chance-symbol buffer))
         bef aft)
     (when name
@@ -90,10 +90,10 @@ This function is intended to be added to `compilation-finish-functions'."
 
 (defun last-chance (symbol)
   "Grep the repo for SYMBOL, filtering the hits.
-This uses `last-chance-grep-command' to do the grep and the
-regexps in `last-chance-uninteresting-regexps' to filter the hits.
-Grepping is recursive starting under the dir that `vc-root-dir'
-finds (or the default directory if `vc-root-dir' finds nothing).
+This uses ‘last-chance-grep-command’ to do the grep and the
+regexps in ‘last-chance-uninteresting-regexps’ to filter the hits.
+Grepping is recursive starting under the dir that ‘vc-root-dir’
+finds (or the default directory if ‘vc-root-dir’ finds nothing).
 Output goes to the *grep* buffer.
 
 Interactively, Emacs queries for a symbol,
@@ -105,14 +105,18 @@ defaulting to the one at point."
                               "Symbol: " obarray
                               nil nil
                               one nil one)))))
-  (with-current-buffer
-      (let ((default-directory (or (vc-root-dir)
-                                   default-directory)))
-        (grep (format "%s %s"
-                      last-chance-grep-command
-                      symbol)))
-    (add-hook 'compilation-finish-functions #'last-chance-cleanup nil t)
-    (setq-local last-chance-symbol symbol)))
+  (let ((default-directory (or (vc-root-dir)
+                               default-directory)))
+    (grep (format "%s %s"
+                  last-chance-grep-command
+                  symbol)))
+  (setf (buffer-local-value 'last-chance-symbol
+                            (process-buffer
+                             (car compilation-in-progress)))
+        symbol))
+
+(add-to-list 'compilation-finish-functions
+             'last-chance-cleanup)
 
 (provide 'last-chance)
 

admin/make-emacs

@@ -2,7 +2,7 @@
 # Build Emacs with various options for profiling, debugging,
 # with and without warnings enabled etc.
 
-# Copyright (C) 2001-2023 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -17,7 +17,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 
 require 5;
@@ -109,7 +109,7 @@
     shift @ARGV;
   }
 
-system ("$make clean") if $all;
+system ("$make clean versionclean") if $all;
 
 if ($wall)
   {

admin/make-manuals

@@ -1,208 +0,0 @@
-#!/bin/bash
-### make-manuals - create the Emacs manuals to upload to the gnu.org website
-
-## Copyright 2018-2023 Free Software Foundation, Inc.
-
-## Author: Glenn Morris <rgm@gnu.org>
-## Maintainer: emacs-devel@gnu.org
-
-## This file is part of GNU Emacs.
-
-## GNU Emacs is free software: you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation, either version 3 of the License, or
-## (at your option) any later version.
-
-## GNU Emacs is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-
-## You should have received a copy of the GNU General Public License
-## along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
-
-### Commentary:
-
-## This is a helper script to create the Emacs manuals as used on the
-## gnu.org website.  After this, use upload-manuals to upload them.
-##
-## Usage:
-## Call from the top-level directory of an Emacs source tree.
-## This should normally be a release.
-## The info files should exist.
-
-### Code:
-
-source "${0%/*}/emacs-shell-lib"
-
-usage ()
-{
-    cat 1>&2 <<EOF
-Usage: ${PN} [-c] [-e emacs]
-Create the Emacs manuals for the gnu.org website.
-Call this script from the top-level of the Emacs source tree that
-contains the manuals you want to use (normally a release).
-The admin/ directory is required.
-Options:
--c: do not delete any pre-existing $outdir/ directory
--e: Emacs executable to use (default $emacs)
-EOF
-    exit 1
-}
-
-
-## Defaults.
-continue=
-emacs=emacs
-
-## Parameters.
-outdir=manual
-gzip="gzip --best --no-name"
-tar="tar --numeric-owner --owner=0 --group=0 --mode=go+u,go-w"
-## Requires GNU tar >= 1.28 so that the tarballs are more reproducible.
-## (Personally I think this is way OOT.  I'm not even sure if anyone
-## uses these tarfiles, let alone cares whether they are reproducible.)
-tar --help | grep -- '--sort.*name' >& /dev/null && tar="$tar --sort=name"
-
-while getopts ":hce:" option ; do
-    case $option in
-        (h) usage ;;
-
-        (c) continue=t ;;
-
-        (e) emacs=$OPTARG ;;
-
-        (\?) die "Bad option -$OPTARG" ;;
-
-        (:) die "Option -$OPTARG requires an argument" ;;
-
-        (*) die "getopts error" ;;
-    esac
-done
-shift $(( --OPTIND ))
-OPTIND=1
-
-[ $# -eq 0 ] || usage
-
-
-[ -e admin/admin.el ] || die "admin/admin.el not found"
-
-
-tempfile="$(emacs_mktemp)"
-
-
-[ "$continue" ] || rm -rf $outdir
-
-if [ -e $outdir ]; then
-    ## Speed up repeat invocation.
-    echo "Re-using existing $outdir/ directory"
-
-else
-
-    ## This creates the manuals in a manual/ directory.
-    ## Note makeinfo >= 5 is much slower than makeinfo 4.
-    echo "Making manuals (slow)..."
-    $emacs --batch -Q -l admin/admin.el -f make-manuals \
-              >| $tempfile 2>&1 || {
-        cat $tempfile 1>&2
-
-        die "error running make-manuals"
-    }
-fi
-
-find $outdir -name '*~' -exec rm {} +
-
-
-echo "Adding compressed html files..."
-for f in emacs elisp; do
-    $tar -C $outdir/html_node -cf - $f | $gzip \
-       > $outdir/$f.html_node.tar.gz || die "error for $f"
-done
-
-
-echo "Making manual tarfiles..."
-$emacs --batch -Q -l admin/admin.el -f make-manuals-dist \
-          >| $tempfile || {
-
-    cat $tempfile 1>&2
-
-    die "error running make-manuals-dist"
-}
-
-o=$outdir/texi
-mkdir -p $o
-
-for f in $outdir/*.tar; do
-    of=${f##*/}
-    of=${of#emacs-}
-    of=${of%%-[0-9]*}.texi.tar
-    of=${of/lispintro/eintr}
-    of=${of/lispref/elisp}
-    of=${of/manual/emacs}
-    of=$o/$of
-    mv $f $of
-    $gzip $of || die "error compressing $f"
-done
-
-
-echo "Making refcards..."
-make -C etc/refcards dist >| $tempfile 2>&1 || {
-    cat $tempfile 1>&2
-    die "failed make dist"
-}
-
-## This may hang if eg german.sty is missing.
-make -k -C etc/refcards pdf >| $tempfile 2>&1 || {
-    cat $tempfile 1>&2
-    echo "Warning: ignored failure(s) from make pdf"
-}
-
-## Newer Texlive only provide mex (used by pl refcards) for pdf, AFAICS.
-make -k -C etc/refcards ps >| $tempfile 2>&1 || {
-    cat $tempfile 1>&2
-    echo "Warning: ignored failure(s) from make ps"
-}
-
-## Note that in the website, refcards/ is not a subdirectory of manual/.
-refdir=$outdir/refcards
-
-mkdir -p $refdir
-
-mv etc/refcards/emacs-refcards.tar $refdir
-$gzip $refdir/emacs-refcards.tar
-
-for fmt in pdf ps; do
-
-    o=$refdir/$fmt
-
-    mkdir -p $o
-
-    [ $fmt = pdf ] && {
-        cp etc/refcards/*.$fmt $o
-        rm $o/gnus-logo.pdf
-        continue
-    }
-
-    for f in  etc/refcards/*.$fmt; do
-        $gzip < $f > $o/${f##*/}.gz
-    done
-done
-
-make -C etc/refcards extraclean > /dev/null
-
-
-echo "Adding compressed info files..."
-
-o=$outdir/info
-mkdir -p $o
-
-for f in eintr.info elisp.info emacs.info; do
-
-    $gzip < info/$f > $o/$f.gz || die "error for $f"
-done
-
-
-echo "Finished OK, you might want to run upload-manuals now"
-
-
-exit 0

admin/make-tarball.txt

@@ -5,7 +5,7 @@ Instructions to create pretest or release tarballs. -*- coding: utf-8 -*-
 
 Steps to take before starting on the first pretest in any release sequence:
 
-0.  The release branch (e.g. emacs-28) should already have been made
+0.  The release branch (e.g. emacs-25) should already have been made
     and you should use it for all that follows.  Diffs from this
     branch should be going to the emacs-diffs mailing list.
 
@@ -14,18 +14,17 @@ Steps to take before starting on the first pretest in any release sequence:
 
 2.  Consider increasing the value of the variable
     'customize-changed-options-previous-release' in cus-edit.el to
-    refer to a newer version of Emacs.  (This is now done when cutting
-    the release branch, see admin/release-branch.txt, but it can't
-    hurt to double check its value.)  Commit cus-edit.el if changed.
+    refer to a newer version of Emacs.  (This is probably needed only
+    when preparing the first pretest for a major Emacs release.)
+    Commit cus-edit.el if changed.
 
-3.  Remove any old pretests from https://alpha.gnu.org/gnu/emacs/pretest.
+3.  Remove any old pretests from ftp://alpha.gnu.org/gnu/emacs/pretest.
     You can use 'gnupload --delete' (see below for more gnupload details).
-    (We currently don't bother with this.)
 
 General steps (for each step, check for possible errors):
 
-1.    git pull     # fetch from the repository
-      git status   # check for locally modified files
+1.   git pull     # fetch from the repository
+     git status   # check for locally modified files
 
     Ensure that you have a clean, unmodified state.
     If you switched in-place from another branch to the release branch,
@@ -34,116 +33,41 @@ General steps (for each step, check for possible errors):
     or some form of "git clean -x".  It's probably simpler and safer to
     make a new working directory exclusively for the release branch.
 
-    If the working directory has subdirectories created when making
-    previous releases or pretests, remove those subdirectories, as the
-    command which updates the ChangeLog file might attempt to recurse
-    there and scan any ChangeLog.* files there.
-
-    Make sure the tree is built, or at least configured.  That's
-    because some of the commands below run Make, so they need
-    Makefiles to be present.
-
-    For Emacs 28 and later, as long as --with-native-compilation is
-    not the default, the tree needs to be configured with
-    native-compilation enabled, to ensure all the pertinent *.elc
-    files will end up in the tarball.  Otherwise, the *.eln files
-    might not build correctly on the user's system.
-
-      ./autogen.sh
-      ./configure --with-native-compilation && make
-
-    For a release (as opposed to pretest), visit etc/NEWS and use the
-    "M-x emacs-news-delete-temporary-markers" command to delete any
-    left-over "---" and "+++" markers from etc/NEWS, as well as the
-    "Temporary note" section at the beginning of that file, and commit
-    etc/NEWS if it was modified.  For a bug fix release (e.g. 28.2),
-    delete any empty headlines too.
-
-2.  Regenerate the versioned ChangeLog.N and etc/AUTHORS files.
-
-    The "M-x authors" command below will first update the current
-    versioned ChangeLog.N file.  For this to work correctly, make sure
-    the top-level Makefile says
-
-      PREFERRED_BRANCH = emacs-NN
-
-    where NN is the version on the release branch from which you are
-    producing the tarball.  If NN is incorrect (which it usually is
-    when starting a pretest of a new major release), update
-    Makefile.in and re-run 'configure' to update Makefile.
-
-    For the first pretest of a new major release, consider starting a
-    new top-level ChangeLog.N file if the last versioned ChangeLog.N
-    file is too large.  A good point to start a new ChangeLog.N file
-    is when the last one gets larger than 1.5 MiB.  If so, start a new
-    one by bumping N, and also update the line in top-level
-    Makefile.in which says
-
-      CHANGELOG_HISTORY_INDEX_MAX = N
-
-    by incrementing the value of N by 1; then regenerate Makefile.
-    After bumping N, you need to actually create and commit
-    ChangeLog.N with the updated N, otherwise "M-x authors" below will
-    fail.  The easiest way of creating the new ChangeLog.N is to
-    rename the file ChangeLog (without the .N suffix) left over from
-    the last major release (it is usually unversioned) and commit it.
-
-    Now:
-
+2.  Regenerate the etc/AUTHORS file:
       M-: (require 'authors) RET
       M-x authors RET
 
-    If this says "Problem updating ChangeLog", find the reason for the
-    failure of the command it runs, viz.:
+    (This first updates the current versioned ChangeLog.N)
 
-       make -C ROOT change-history-nocommit
-
-    (where ROOT is the top-level directory where you run this).  It
-    could be because there are uncommitted changes in ChangeLog.N, for
-    example.  One possible way forward is to invoke "C-u M-x authors",
-    which will skip updating the versioned ChangeLog.N file.
-
-    After "M-x authors" finishes, if there is an "*Authors Errors*"
-    buffer, address the issues.  If there was a ChangeLog typo, fix
-    the relevant entry.  If a file was deleted or renamed, consider
-    adding an appropriate entry to variables authors-ignored-files,
-    authors-valid-file-names, or authors-renamed-files-alist in
-    authors.el.  If some authors are "ignored", consider adding
-    entries to the author-aliases variable.
+    If there is an "*Authors Errors*" buffer, address the issues.
+    If there was a ChangeLog typo, fix the relevant entry.
+    If a file was deleted or renamed, consider adding an appropriate
+    entry to authors-ignored-files, authors-valid-file-names, or
+    authors-renamed-files-alist.
 
     If necessary, repeat 'C-u M-x authors' after making those changes.
     Save the "*Authors*" buffer as etc/AUTHORS.
-    Check the diff looks reasonable.  Maybe add more entries to
+    Check the diff looks reasonable.  Maybe add entries to
     authors-ambiguous-files or authors-aliases, and repeat.
     Commit any fixes to authors.el.
 
 3.  Set the version number (M-x load-file RET admin/admin.el RET, then
     M-x set-version RET).  For a pretest, start at version .90.  After
-    .99, use .990 (so that it sorts).  Commit the resulting changes
-    as one, with nothing else included, and using a log message
-    of the format "Bump Emacs version to ...", so that the commit can
-    be skipped when merging branches (see admin/gitmerge.el).
+    .99, use .990 (so that it sorts).
 
     The final pretest should be a release candidate.
     Before a release candidate is made, the tasks listed in
     admin/release-process must be completed.
 
-    Set the version number to that of the actual release (commit in
-    one, as described above).  Pick a date about a week from now when
-    you intend to make the release.  Use M-x add-release-logs from
-    admin/admin.el to add entries to etc/HISTORY and the ChangeLog
+    Set the version number to that of the actual release.  Pick a date
+    about a week from now when you intend to make the release.  Use M-x
+    add-release-logs to add entries to etc/HISTORY and the ChangeLog
     file.  It's best not to commit these files until the release is
     actually made.  Merge the entries from (unversioned) ChangeLog
     into the top of the current versioned ChangeLog.N and commit that
     along with etc/HISTORY.  Then you can tag that commit as the
     release.
 
-    Alternatively, you can commit and tag with the RC tag right away,
-    and delay the final tagging until you actually decide to make a
-    release and announce it.  The "git tag" command can tag a specific
-    commit if you give it the SHA1 of that commit, even if additional
-    commits have been pushed in the meantime.
-
     Name the tar file as emacs-XX.Y-rc1.tar.  If all goes well in the
     following week, you can simply rename the file and use it for the
     actual release.  If you need another release candidate, remember
@@ -157,85 +81,36 @@ General steps (for each step, check for possible errors):
     Never replace an existing tarfile!  If you need to fix something,
     always upload it with a different name.
 
-4.    autoreconf -i -I m4 --force
-      make bootstrap
+4.   autoreconf -i -I m4 --force
+     make bootstrap
 
-    The below script checks for any mistakes in the source text of
-    manual pages.  Fix any errors and re-run the script to verify.
+     make -C etc/refcards
+     make -C etc/refcards clean
 
-      ./admin/check-man-pages
+5.  Copy lisp/loaddefs.el to lisp/ldefs-boot.el.
 
-    Then do this:
-
-      make -C etc/refcards
-      make -C etc/refcards clean
-
-    If some of the etc/refcards, especially the non-English ones, fail
-    to build, you probably need to install some TeX/LaTeX packages, in
-    particular for foreign language support.  For more information,
-    search for the string "refcard" in the file admin/release-process.
-
-    (ru-refcard causes numerous "Underfull hbox" and "Overfull hbox"
-    messages from TeX, but those seem to be harmless, as the result
-    looks just fine.)
-
-5.  Copy lisp/loaddefs.el to lisp/ldefs-boot.el.  After copying, edit
-    ldefs-boot.el to add
-
-    ;; no-byte-compile: t
-
-    to its file-local variables section, otherwise make-dist will
-    complain.
-
-    Commit ChangeLog.N, etc/AUTHORS, lisp/ldefs-boot.el, and the files
-    changed by M-x set-version.  Note that the set-version changes
-    should be committed separately, as described in step 3 above, to
-    avoid them being merged to master.  The lisp/ldefs-boot.el file
-    should not be merged to master either, so it could be added to the
-    same commit or committed separately.
-
-    The easiest way of doing that is "C-x v d ROOT-DIR RET", then go
-    to the first modified file, press 'M' to mark all modified files,
-    and finally 'v' to commit them.  Make sure the commit log message
-    mentions all the changes in all modified files, as by default 'v'
-    doesn't necessarily do so.
+    Commit ChangeLog.N, etc/AUTHORS, lisp/ldefs-boot.el, and the
+    files changed by M-x set-version.
 
     If someone else made a commit between step 1 and now,
     you need to repeat from step 4 onwards.  (You can commit the files
     from step 2 and 3 earlier to reduce the chance of this.)
 
-6.   ./make-dist --snapshot --no-compress
+6.  ./make-dist --snapshot --no-compress
 
     Check the contents of the new tar with admin/diff-tar-files
     against the previous release (if this is the first pretest) or the
     previous pretest.  If you did not make the previous pretest
-    yourself, find it at <https://alpha.gnu.org/gnu/emacs/pretest>.
-    Releases are of course at <https://ftp.gnu.org/pub/gnu/emacs/>.
-
-     ./admin/diff-tar-files emacs-OLD.tar emacs-NEW.tar
-
-    Alternatively, if you want to use the compressed tarballs (which
-    diff-tar-files doesn't understand):
-
-     tar tJf emacs-OLD.tar.xz | sed -e 's,^[^/]*,,' | sort > old_tmp
-     tar tJf emacs-NEW.tar.xz | sed -e 's,^[^/]*,,' | sort > new_tmp
-     diff -u old_tmp new_tmp
+    yourself, find it at <ftp://alpha.gnu.org/gnu/emacs/pretest>.
+    Releases are of course at <ftp://ftp.gnu.org/pub/gnu/emacs/>.
 
     If this is the first pretest of a major release, just comparing
     with the previous release may overlook many new files.  You can try
-    something like 'find . | sort' in a clean repository, and
-    compare the results against the new tar contents.  Another
-    alternative is using something like:
-
-     tar cf - emacs-NEW | tar t -C /tmp | grep -Ev "\.(o|d)$" | sort
-
-    Where emacs-NEW is the directory containing your clean repository.
-    The output of this command might be easier to compare to the
-    tarball than the one you get from find.
-
-7.   tar xf emacs-NEW.tar; cd emacs-NEW
-     ./configure --prefix=/tmp/emacs && make check && make install
+    something like 'find . | sort' in a clean repository, and compare the
+    results against the new tar contents.
 
+7.   tar -xf emacs-NEW.tar; cd emacs-NEW
+     ./configure --prefix=/tmp/emacs && make && make install
     Use 'script' or M-x compile to save the compilation log in
     compile-NEW.log and compare it against an old one.  The easiest way
     to do that is to visit the old log in Emacs, change the version
@@ -243,44 +118,21 @@ General steps (for each step, check for possible errors):
     M-x ediff.  Especially check that Info files aren't built, and that
     no autotools (autoconf etc) run.
 
-8.  You can now tag the release/pretest and push it together with the
-    last commit:
-
-     cd EMACS_ROOT_DIR && git tag -a TAG -m "Emacs TAG"
-     git push
-     git push --tags
-
-    Here TAG is emacs-XX.Y.ZZ for a pretest, emacs-XX.Y for a release.
-    For a release, if you are producing a release candidate first, use
-    emacs-XX.Y-rcN (N = 1, 2, ...) when you tar the RC, and add the
-    actual release tag later, when the official release tarball is
-    uploaded to ftp.gnu.org.  When adding a tag later, it is safer to
-    use the SHA1 of the last commit which went into the release
-    tarball, in case there were some intervening commits since then:
-
-     git tag -a TAG -m "Emacs TAG" SHA1
-     git push --tags
-
-    In the past, we were not always consistent with the annotation
-    (i.e. -m "Emacs TAG").  The preferred format is like this for a
-    pretest, release candidate and final release:
-
-     git tag -a emacs-28.0.90  -m "Emacs 28.0.90 pretest"
-     git tag -a emacs-28.1-rc1 -m "Emacs 28.1 RC1"
-     git tag -a emacs-28.1     -m "Emacs 28.1 release"
+8.  cd EMACS_ROOT_DIR && git tag -a TAG && git push origin tag TAG
+    TAG is emacs-XX.Y.ZZ for a pretest, emacs-XX.Y for a release.
 
 9. Decide what compression schemes to offer.
     For a release, at least gz and xz:
-      gzip --best --no-name -c emacs-NEW.tar > emacs-NEW.tar.gz
+      gzip --best -c emacs-NEW.tar > emacs-NEW.tar.gz
       xz -c emacs-NEW.tar > emacs-NEW.tar.xz
     For pretests, just xz is probably fine (saves bandwidth).
 
     Now you should upload the files to the GNU ftp server.  In order to
     do that, you must be registered as an Emacs maintainer and have your
     GPG key acknowledged by the ftp people.  For instructions, see
-    https://www.gnu.org/prep/maintain/html_node/Automated-Upload-Registration.html
+    http://www.gnu.org/prep/maintain/html_node/Automated-Upload-Registration.html
     The simplest method to upload is to use the gnulib
-    <https://www.gnu.org/s/gnulib/> script "build-aux/gnupload":
+    <http://www.gnu.org/s/gnulib/> script "build-aux/gnupload":
 
     For a pretest:
      gnupload [--user your@gpg.key.email] --to alpha.gnu.org:emacs/pretest \
@@ -291,9 +143,7 @@ General steps (for each step, check for possible errors):
        FILE.gz FILE.xz ...
 
     You only need the --user part if you have multiple GPG keys and do
-    not want to use the default.  Instead of "your@gpg.key.email" you
-    could also use the fingerprint of the key, a 40-digit hex number.
-    (Alternatively, define default-key in your ~/.gnupg/gpg.conf file.)
+    not want to use the default.
     Obviously, if you do not have a fast uplink, be prepared for the
     upload to take a while.
 
@@ -311,14 +161,13 @@ General steps (for each step, check for possible errors):
     FILE.sig, FILE.directive.asc.
     For a release, place the files in the /incoming/ftp directory.
     For a pretest, place the files in /incoming/alpha instead, so that
-    they appear on https://alpha.gnu.org/.
+    they appear on ftp://alpha.gnu.org/.
 
 10. After five minutes, verify that the files are visible at
-    https://alpha.gnu.org/gnu/emacs/pretest/ for a pretest, or
-    https://ftp.gnu.org/gnu/emacs/ for a release.
+    ftp://alpha.gnu.org/gnu/emacs/pretest/ for a pretest, or
+    ftp://ftp.gnu.org/gnu/emacs/ for a release.
 
-    Download them and check the signatures and SHA1/SHA256 checksums.
-    Check they build (./configure --with-native-compilation).
+    Download them and check the signatures.  Check they build.
 
 11. Send an announcement to: emacs-devel, and bcc: info-gnu-emacs@gnu.org.
     For a pretest, also bcc: platform-testers@gnu.org.
@@ -328,127 +177,43 @@ General steps (for each step, check for possible errors):
     See the info-gnu-emacs mailing list archives for the form
     of past announcements.  The first pretest announcement, and the
     release announcement, should have more detail.
-    Use the emacs-devel topic 'emacs-announce'.  The best way to do
-    this is to add a header "Keywords: emacs-announce" to your mail.
-    (You can also put it in the Subject, but this is not as good
-    because replies that invariably are not announcements also get
-    sent out as if they were.)
 
-    To create the included SHA1 and SHA256 checksums, run:
+12. After a release, update the Emacs pages as below.
 
-      sha1sum emacs-NEW.tar.xz
-      sha256sum emacs-NEW.tar.xz
-
-    You can optionally sign the announcement email, preferably using
-    the same PGP key that you used for signing the tarball.
-    (Use e.g. `M-x mml-secure-message-sign' in `message-mode' to sign
-    an email.)
-
-12. After a release, update the Emacs pages as described below.
-
-13. After a release, bump the Emacs version on the release branch.
-    There is no need to bump the version after a pretest; the version
-    is bumped before the next pretest or release instead.
-
-    If the released version was XX.Y, use 'set-version' from
-    admin/admin.el to bump the version on the release branch to
-    XX.Y.50.  Commit the changes.
 
 UPDATING THE EMACS WEB PAGES AFTER A RELEASE
 
-As soon as possible after a release, the Emacs web pages at
-https://www.gnu.org/software/emacs/ should be updated.
-(See admin/notes/www for general information.)
+As soon as possible after a release, the Emacs web pages should be updated.
+Anyone with write access to the Emacs code repository can do this.
+For instructions, see <http://savannah.gnu.org/cvs/?group=emacs>.
+Changes go live more or less as soon as they are committed.
 
 The pages to update are:
 
 emacs.html (for a new major release, a more thorough update is needed)
 history.html
 add the new NEWS file as news/NEWS.xx.y
-Copy new etc/MACHINES to MACHINES and CONTRIBUTE to CONTRIBUTE
 
 For every new release, a banner is displayed on top of the emacs.html
 page.  Uncomment and the release banner in emacs.html.  Keep it on the
-page for about a month, then comment it again.  The new release banner
-looks like this:
+page for about a month, then comment it again.
 
-    <div class="release-banner">
-	<div class="container">
-	    <h2><em>Emacs 28.1 is out</em>, download it <a href="download.html">here</a>!</h2>
-	</div>
-    </div>
+Use M-x make-manuals from admin/admin.el to regenerate the html
+manuals in manual/.  If there are new manuals, add appropriate index
+pages in manual/ and add them to manual/index.html.  In the
+manual/html_node directory, delete any old manual pages that are no
+longer present.
 
-Also, make sure the copyright years at the bottom of emacs.html are
-up-to-date.
+Tar up the generated html_node/emacs/ and elisp/ directories and update
+the files manual/elisp.html_node.tar.gz and emacs.html_node.tar.gz.
 
-The file download.html may need to be updated, for example if the
-MS-Windows binaries will be signed by a different person/key than
-those mentioned there.
+Use M-x make-manuals-dist from from admin/admin.el to update the
+manual/texi/ tarfiles.
 
-Next, regenerate the various manuals in HTML, PDF, and PS formats:
+Add compressed copies of the main info pages from the tarfile to manual/info/.
 
-  Invoke ./admin/make-manuals from the top-level directory of the
-  Emacs source tree that contains the manuals for which you want to
-  produce HTML docs.  This creates the 'manual' directory and
-  populates it with the necessary files.
+Update the refcards/pdf/ and ps/ directories, and also
+refcards/emacs-refcards.tar.gz (use make -C etc/refcards pdf ps dist).
 
-  If you have Texinfo installed locally, make-manuals might fail if it
-  cannot find epsf.tex.  In that case define in the environment
-
-    TEXINPUTS=:/path/to/texinfo-tree/doc
-
-  where /path/to/texinfo-tree is the absolute file name of the
-  top-level directory where you have the Texinfo source tree.  Then
-  re-run make-manuals.
-
-  make-manuals can also fail if the HTML manuals produced by Texinfo
-  violate some of the assumptions admin/admin.el makes about the
-  format of the produced HTML.  Debug these problems and resolve them,
-  then re-run make-manuals.  (Each time you run make-manuals, it
-  empties the manuals/ directory and regenerates the files there, but
-  if the files in manuals/ can be used without regeneration, i.e. if
-  the problem you solved doesn't affect the produced HTML, you can
-  invoke make-manuals with the -c switch, which will make the process
-  much faster.)
-
-Now change to the 'manual' directory and invoke upload-manuals:
-
-    ../admin/upload-manuals /path/to/webpages/cvs/checkout
-
-  where /path/to/webpages/cvs/checkout is the place where you have the
-  CVS checkout of the Emacs Web pages, with subdirectories 'manual'
-  and 'refcards'.  This moves the produced manuals to directories in
-  the Web pages CVS checkout tree, and also invokes CVS commands to
-  commit changed files, add new files, and remove stale files that are
-  no longer part of the manuals.
-
-  If upload-manuals fails, resolve the problems and re-invoke it.
-  This requires running make-manuals again, since upload-manuals
-  destructively modifies the 'manual' directory where you invoke it.
-  Also, upload-manuals invokes "cvs commit -f", so if you run it
-  several times, some files will be committed more than once even
-  though they were not changed in-between.  Suck it up.
-
-  All the added and removed files need to be committed, so next fire
-  up Emacs, type "C-x v d" to invoke vc-dir on the Web pages checkout,
-  and use "C-x v v" and other VC commands to commit all the files that
-  upload-manuals didn't automatically commit.  (You can also do that
-  with manual CVS commands, of course, but this is not recommended.)
-
-  Next, make sure that manual/index.html file is consistent with the
-  info/dir file in the branch for which you are producing the manuals,
-  in that it mentions all the manuals.  It could be outdated if
-  manuals were added or removed since the last release.
-
-  For each new manual, a file manual/MANUAL.html (where MANUAL is the
-  name of the manual) should be created from the template in
-  manual/eww.html, after editing the title and the Copyright years,
-  and the links in it changed to point to the appropriate files in the
-  manual/html_node/ and manual/html_mono/ subdirectories.
-
-  In addition, the file refcards/index.html should be audited to make
-  sure it includes the up-to-date list of refcards actually produced
-  and put under that subdirectory.
-
-Browsing <https://web.cvs.savannah.gnu.org/viewvc/?root=emacs> is one
+Browsing <http://web.cvs.savannah.gnu.org/viewvc/?root=emacs> is one
 way to check for any files that still need updating.

admin/merge-gnulib

@@ -4,7 +4,7 @@
 #
 #	admin/merge-gnulib
 
-# Copyright 2012-2023 Free Software Foundation, Inc.
+# Copyright 2012-2017 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -19,45 +19,37 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 # written by Paul Eggert
 
-GNULIB_URL=https://git.savannah.gnu.org/git/gnulib.git
+GNULIB_URL=git://git.savannah.gnu.org/gnulib.git
 
 GNULIB_MODULES='
-  alignasof alloca-opt binary-io byteswap c-ctype c-strcase
-  canonicalize-lgpl
-  careadlinkat close-stream copy-file-range
+  alloca-opt binary-io byteswap c-ctype c-strcase
+  careadlinkat close-stream
   count-leading-zeros count-one-bits count-trailing-zeros
-  crypto/md5 crypto/md5-buffer
-  crypto/sha1-buffer crypto/sha256-buffer crypto/sha512-buffer
-  d-type diffseq double-slash-root dtoastr dtotimespec dup2
-  environ execinfo faccessat
-  fchmodat fcntl fcntl-h fdopendir file-has-acl
-  filemode filename filevercmp flexmember fpieee
-  free-posix fstatat fsusage fsync futimens
-  getloadavg getopt-gnu getrandom gettime gettimeofday gitlog-to-changelog
-  ieee754-h ignore-value intprops largefile libgmp lstat
-  manywarnings memmem-simple mempcpy memrchr memset_explicit
-  minmax mkostemp mktime
-  nanosleep nproc nstrftime
-  pathmax pipe2 pselect pthread_sigmask
-  qcopy-acl readlink readlinkat regex
-  sig2str sigdescr_np socklen stat-time std-gnu11 stdbool stddef stdio
-  stpcpy strnlen strtoimax symlink sys_stat sys_time
-  tempname time-h time_r time_rz timegm timer-time timespec-add timespec-sub
-  update-copyright unlocked-io utimensat
+  crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512
+  dtoastr dtotimespec dup2 environ execinfo faccessat
+  fcntl fcntl-h fdatasync fdopendir
+  filemode filevercmp flexmember fstatat fsync
+  getloadavg getopt-gnu gettime gettimeofday gitlog-to-changelog
+  ignore-value intprops largefile lstat
+  manywarnings memrchr mkostemp mktime
+  pipe2 pselect pthread_sigmask putenv qcopy-acl readlink readlinkat
+  sig2str socklen stat-time std-gnu11 stdalign stddef stdio
+  stpcpy strftime strtoimax strtoumax symlink sys_stat
+  sys_time time time_r time_rz timegm timer-time timespec-add timespec-sub
+  update-copyright utimens
   vla warnings
 '
 
 AVOIDED_MODULES='
-  btowc chmod close crypto/af_alg dup fchdir fstat langinfo lock
-  mbrtowc mbsinit memchr mkdir msvc-inval msvc-nothrow nl_langinfo
-  openat-die opendir pthread-h raise
-  save-cwd select setenv sigprocmask stat stdarg
-  threadlib tzset unsetenv utime utime-h
-  wchar wcrtomb wctype-h
+  close dup fchdir fstat
+  malloc-posix msvc-inval msvc-nothrow
+  open openat-die opendir raise
+  save-cwd select setenv sigprocmask stdarg stdbool
+  threadlib unsetenv
 '
 
 GNULIB_TOOL_FLAGS='
@@ -103,12 +95,6 @@ test -x "$gnulib_srcdir"/gnulib-tool || {
   exit 1
 }
 
-# gnulib-tool has problems with a bare checkout (Bug#32452#65).
-test -f configure || ./autogen.sh || exit
-
-# Old caches can confuse autoconf when some Gnulib-related changes take effect.
-rm -fr autom4te.cache || exit
-
 avoided_flags=
 for module in $AVOIDED_MODULES; do
   avoided_flags="$avoided_flags --avoid=$module"
@@ -116,12 +102,9 @@ done
 
 "$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS \
 	$avoided_flags $GNULIB_MODULES &&
-rm -- "$src"lib/gl_openssl.h \
-      "$src"lib/stdio-read.c "$src"lib/stdio-write.c \
-      "$src"m4/fcntl-o.m4 \
+rm -- "$src"lib/gl_openssl.h "$src"m4/fcntl-o.m4 \
       "$src"m4/gl-openssl.m4 \
       "$src"m4/gnulib-cache.m4 "$src"m4/gnulib-tool.m4 \
-      "$src"m4/manywarnings-c++.m4 \
       "$src"m4/warn-on-use.m4 "$src"m4/wint_t.m4 &&
 cp -- "$gnulib_srcdir"/build-aux/texinfo.tex "$src"doc/misc &&
 cp -- "$gnulib_srcdir"/build-aux/config.guess \
@@ -129,8 +112,5 @@ cp -- "$gnulib_srcdir"/build-aux/config.guess \
       "$gnulib_srcdir"/build-aux/install-sh \
       "$gnulib_srcdir"/build-aux/move-if-change \
    "$src"build-aux &&
-cp -- "$gnulib_srcdir"/lib/af_alg.h \
-      "$gnulib_srcdir"/lib/save-cwd.h \
-   "$src"lib &&
 { test -z "$src" || cd "$src"; } &&
 ./autogen.sh

admin/merge-pkg-config

@@ -4,7 +4,7 @@
 #
 #	admin/merge-pkg-config
 
-# Copyright 2014-2023 Free Software Foundation, Inc.
+# Copyright 2014-2017 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -19,7 +19,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 # written by Paul Eggert
 
@@ -60,4 +60,4 @@ test -d m4 || {
 
 printf >&2 '%s\n' "$0: copying $dir/pkg.m4 to m4/pkg.m4"
 
-cp "$dir"/pkg.m4 m4
+cp $dir/pkg.m4 m4

admin/notes/bug-triage

@@ -11,11 +11,7 @@ interface via org-mode.
 The goal of this triage is to prune down the list of old bugs, closing
 the ones that are not reproducible on the current release.
 
-  0. To start, check the most relevant bugs blocking a release by
-     calling debbugs-gnu-emacs-release-blocking-reports.  If you want
-     to check this for another Emacs version but the next-to-be-released-one,
-     use the "C-u" prefix.
-  1. After that, enter debbugs mode (either debbugs-gnu, debbugs-org, or via the
+  1. To start, enter debbugs mode (either debbugs-gnu, debbugs-org, or via the
      web browser), and accept the default list option of bugs that have severity
      serious, important, or normal.
   2. For each bug, we want to primarily make sure it is still
@@ -24,7 +20,7 @@ the ones that are not reproducible on the current release.
      suggested checklist to follow for handling these bugs, along with
      example replies.  Closing, tagging, etc., are done
      with debbugs control messages, which in debbugs-gnu is initiated
-     with a "C" or "E".
+     with a "C".
      [ ] Read the mail thread for the bug.  Find out if anyone has
          been able to reproduce this on the current release.  If
          someone has been able to, then your work is finished for this
@@ -73,7 +69,7 @@ the ones that are not reproducible on the current release.
          know if you are able to?  If I don't hear back in a few
          weeks, I'll just close this bug as unreproducible."
      [ ] Check that the priority is reasonable.  Most bugs should be
-         marked as normal, but crashes and security issues can be
+         marked as normal, but crashers and security issues can be
          marked as serious.
   3. Your changes will take some time to take effect.  After a period of minutes
      to hours, you will get a mail telling you the control message has been
@@ -85,13 +81,13 @@ the ones that are not reproducible on the current release.
 * New bug triage process
 
 The goal of the new bug triage process is similar to the backlog triage process,
-except that the focus is on prioritizing the bug, and making sure it has
+except that the focus is on prioritizing the bug, and making sure it is has
 necessary information for others to act on.
 
 For each new bug, ask the following questions:
 
   1. Is the bug report written in a way to be easy to reproduce (starts from
-     "emacs -Q", etc.)?  If not, ask the reporter to try and reproduce it on an
+     emacs -Q, etc.)?  If not, ask the reporter to try and reproduce it on an
      emacs without customization.
   2. Is the bug report written against the latest emacs?  If not, try to
      reproduce on the latest version, and if it can't be reproduced, ask the

admin/notes/bugtracker

@@ -1,6 +1,6 @@
 NOTES ON THE EMACS BUG TRACKER   -*- outline -*-
 
-The Emacs Bug Tracker can be found at https://debbugs.gnu.org/
+The Emacs Bug Tracker can be found at http://debbugs.gnu.org/
 
 * Quick-start guide
 
@@ -8,13 +8,9 @@ This is 95% of all you will ever need to know.
 
 ** How do I report a bug?
 Use M-x report-emacs-bug, or send mail to bug-gnu-emacs@gnu.org.
-If you want to Cc someone, use an "X-Debbugs-Cc" header (or
+If you want to Cc someone, use an "X-Debbugs-CC" header (or
 pseudo-header, see below) instead.
 
-** How do I read a bug?
-Visit https://debbugs.gnu.org/123 in your web browser or try this in
-Emacs: M-x gnus-read-ephemeral-emacs-bug-group.
-
 ** How do I comment on a bug?
 Reply to a mail on the bug-gnu-emacs list in the normal way.
 Or send a mail to 123@debbugs.gnu.org.
@@ -33,18 +29,18 @@ By mailing commands to control@debbugs.gnu.org.  Place commands at the
 start of the message body, one per line.
 
 severity 123 serious|important|normal|minor|wishlist
-tags 123 moreinfo|unreproducible|wontfix|patch|notabug
+tags 123 moreinfo|unreproducible|wontfix|patch
 
 * More detailed information
 
-For a list of all bugs, see https://debbugs.gnu.org/db/pa/lemacs.html
+For a list of all bugs, see http://debbugs.gnu.org/db/pa/lemacs.html
 This is a static page, updated once a day.  There is also a dynamic
 list, generated on request. This accepts various options, eg to see
 the most recent bugs:
 
-https://debbugs.gnu.org/cgi/pkgreport.cgi?newest=100
+http://debbugs.gnu.org/cgi/pkgreport.cgi?newest=100
 
-Or follow the links on the front page https://debbugs.gnu.org .
+Or follow the links on the front page http://debbugs.gnu.org .
 
 ** How do I report a bug in Emacs now?
 The same way as you always did.  Send mail to bug-gnu-emacs@gnu.org,
@@ -57,7 +53,7 @@ i) Your report will be assigned a number and generate an automatic reply.
 ii) Optionally, you can set some database parameters when you first
 report a bug (see "Setting bug parameters" below).
 
-iii) If you want to Cc someone, use X-Debbugs-Cc: (note this only
+iii) If you want to CC: someone, use X-Debbugs-CC: (note this only
 applies to _new_ reports, not followups).
 
 Once your report is filed and assigned a number, it is sent out to the
@@ -68,23 +64,23 @@ quiet@debbugs.gnu.org.
 ** How do I reply to an existing bug report?
 Reply to 123@debbugs.gnu.org, replacing 123 with the number
 of the bug you are interested in.  NB this only sends mail to the
-bug-list, it does NOT send a Cc to the original bug submitter.
-So you need to explicitly Cc him/her (and anyone else you like).
+bug-list, it does NOT send a CC to the original bug submitter.
+So you need to explicitly CC him/her (and anyone else you like).
 (This works the same way as all the Emacs mailing lists.  We generally
 don't assume anyone who posts to a list is subscribed to it, so we
 cc everyone on replies.)
 
 (Many people think the submitter SHOULD be automatically subscribed
 to subsequent discussion, but this does not seem to be implemented.
-See https://bugs.debian.org/37078
-See also https://debbugs.gnu.org/5439 )
+See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=37078
+See also http://debbugs.gnu.org/5439 )
 
 Do NOT send a separate copy to the bug list address, since this may
 generate a new report.  The only time to send mail to the bug list
 address is to create a new report.
 
 Gnus users can add the following to message-dont-reply-to-names;
-similarly with Rmail and mail-dont-reply-to-names:
+similarly with Rmail and rmail-dont-reply-to-names:
 
 "\\(emacs-pretest-bug\\|bug-gnu-emacs\\|bug-\\(e\\|gnu\\)macs\\)@gnu\\.org\\|\
 \\(submit\\|control\\|owner\\)@debbugs\\.gnu\\.org"
@@ -99,23 +95,20 @@ normal bug reporting.)
 
 ** When reporting a new bug, to send a Cc to another address
 (e.g. bug-cc-mode@gnu.org), do NOT just use a Cc: header.
-Instead, use "X-Debbugs-Cc:".  This ensures the Cc address(es) will get a
+Instead, use "X-Debbugs-CC:".  This ensures the Cc address will get a
 mail with the bug report number in.  If you do not do this, each reply
 in the subsequent discussion might end up creating a new bug.
 This is annoying.  (So annoying that a form of message-id tracking has
 been implemented to hopefully stop this happening, but it is still
-better to use X-Debbugs-Cc.)
-
-If you want to send copies to more than one address, add them
-comma-separated in only one X-Debbugs-Cc line.
+better to use X-Debbugs-CC.)
 
 Like any X-Debbugs- header, this one can also be specified in the
 pseudo-header (see below), if your mail client does not let you add
 "X-" headers.
 
-If a new report contains X-Debbugs-Cc in the input, this is
+If a new report contains X-Debbugs-CC in the input, this is
 converted to a real Cc header in the output.  (See Bug#1780,5384)
-It is also merged into the Resent-Cc header (see below).
+It is also merged into the Resent-CC header (see below).
 
 ** How does Debbugs send out mails?
 
@@ -124,15 +117,15 @@ header is unchanged.  In new reports only (at present), the To:
 address is altered as follows.  Any "bug-gnu-emacs",
 "emacs-pretest-bug", or "submit@debbugs" address is replaced by
 123@debbugs in the mail that gets sent out.  (This also applies to any
-Cc: header, though you should be using X-Debbugs-Cc instead in new
+Cc: header, though you should be using X-Debbugs-CC instead in new
 reports).  The original header is stored as X-Debbugs-Original-To, if
-it was changed.  Any X-Debbugs-Cc is merged into the Cc.
+it was changed.  Any X-Debbugs-CC is merged into the Cc.
 
 Mails arriving at the bug list have the following Resent-* headers:
 
 Resent-From: person who submitted the bug
 Resent-To:   owner@debbugs.gnu.org
-Resent-Cc:   maintainer email address, plus any X-Debbugs-Cc: entries
+Resent-CC:   maintainer email address, plus any X-Debbugs-CC: entries
 
 The "maintainer email address" is "bug-gnu-emacs@gnu.org" in most cases.
 
@@ -155,7 +148,7 @@ Package: emacs
 Version: 23.0.60
 Severity: minor
 
-Remember to fix FOO, as discussed on emacs-devel at https://... .
+Remember to fix FOO, as discussed on emacs-devel at http://... .
 
 ** Not interested in tracker control messages (tags being set, etc)?
 Discard mails matching:
@@ -185,7 +178,7 @@ Basically, reply only to the numbered bug address (and any individual
 people's addresses). Do not send mail direct to bug-gnu-emacs or
 emacs-pretest-bug unless you are reporting a new bug.
 
-** To close bug#123 (for example), send mail
+** To close bug #123 (for example), send mail
 
 To: 123-done@debbugs.gnu.org
 
@@ -243,33 +236,25 @@ The control server ignores anything after the last line above.  So you
 can place control commands at the beginning of a reply to a bug
 report, and Bcc: the control server (note the commands have no effect
 if you just send them to the bug-report number).  Bcc: is better than Cc:
-in case people use Reply-To-All in response.
-
-For the full documentation of control commands, see
-https://debbugs.gnu.org/server-control.html
+in case people use Reply-to-All in response.
 
 Some useful control commands:
 
-*** To close a bug and indicate in what Emacs version it was fixed
-close 123 VERSION
-
-where VERSION is XX.YY numerical version number, like 42.1.
-
 *** To reopen a closed bug:
 reopen 123
 
 *** Bugs can be tagged in various ways (eg wontfix, patch, etc).
 The available tags are:
-patch wontfix moreinfo unreproducible fixed notabug help security confirmed easy
-See https://debbugs.gnu.org/Developer#tags
+patch wontfix moreinfo unreproducible fixed notabug
+See http://debbugs.gnu.org/Developer#tags
 The list of tags can be prefixed with +, - or =, meaning to add (the
 default), remove, or reset the tags. E.g.:
 
 tags 123 + wontfix
 
-*** URL shortcuts
+** URL shortcuts
 
-https://debbugs.gnu.org/...
+http://debbugs.gnu.org/...
 
 123             # given bug number
 123;mbox=yes    # mbox version of given bug
@@ -278,9 +263,9 @@ from:submitter@email.address
 severity:severity      # all bugs of given severity
 tag:tag                # all bugs with given tag
 
-*** Usertags
+** Usertags
 
-See <https://wiki.debian.org/bugs.debian.org/usertags>
+See <http://wiki.debian.org/bugs.debian.org/usertags>
 
 "Usertags" are very similar to tags: a set of labels that can be added
 to a bug.  There are two differences between normal tags and user tags:
@@ -290,9 +275,10 @@ limited, predefined set of normal tags are available (see above).
 
 2) A usertag is associated with a specific user.  This is normally
 an email address (with an "@" sign and least 4 characters after the "@"),
-but on debbugs.gnu.org, it can also be a package name.  For personal tags,
+but on debbugs.gnu.org, the definition is less strict - anything with
+5 or more alphanumeric characters will work.  For personal tags,
 using an email address is still recommended.  Please only use the
-"emacs" user for "official" tags.
+"emacs" user, or other short users, for "official" tags.
 
 You set usertags in the same way as tags, by talking to the control server.
 One difference is that you can also specify the associated user.
@@ -306,7 +292,7 @@ a) In a control message:
 user emacs      # or email@example.com
 usertags 1234 any-tag-you-like
 
-This will add a usertag "any-tag-you-like" to bug#1234.  The tag will
+This will add a usertag "any-tag-you-like" to bug 1234.  The tag will
 be associated with the user "emacs".  If you omit the first line,
 the tag will be associated with your email address.
 
@@ -328,11 +314,11 @@ search box.  The only piece you really need to add is the "users"
 portion, the rest has the same syntax as normal.
 
 **** To browse bugs by usertag:
-https://debbugs.gnu.org/cgi/pkgindex.cgi?indexon=users
+http://debbugs.gnu.org/cgi/pkgindex.cgi?indexon=users
 
 **** To find all bugs usertagged by a given email address:
 
-https://debbugs.gnu.org/cgi/pkgreport.cgi?users=emacs
+http://debbugs.gnu.org/cgi/pkgreport.cgi?users=emacs
 
 (Supposedly, the "users" field can be a comma-separated list of more
 than one email address, but it does not seem to work for me.)
@@ -342,7 +328,7 @@ than one email address, but it does not seem to work for me.)
 This works just like a normal tags search, but with the addition of a
 "users" field.  Eg:
 
-https://debbugs.gnu.org/cgi/pkgreport.cgi?users=emacs;tag=calendar
+http://debbugs.gnu.org/cgi/pkgreport.cgi?users=emacs;tag=calendar
 
 *** To merge bugs:
 Eg when bad replies create a bunch of new bugs for the same report.
@@ -384,14 +370,14 @@ will be assigned proper numbers).
 NB you cannot clone a merged bug.  You'd think that trying to do so
 would just give you an unmerged copy of the specified bug number, but no:
 
-https://bugs.debian.org/474742
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=474742
 
 You must unmerge, clone, then re-merge.
 
 *** To set severity:
 severity 123 critical|grave|serious|important|normal|minor|wishlist
 
-See https://debbugs.gnu.org/Developer#severities for the meanings.
+See http://debbugs.gnu.org/Developer#severities for the meanings.
 
 *** To set the owner of a bug:
 owner 123 A Hacker <none@example.com>
@@ -421,21 +407,21 @@ reassign 1234 emacs
 Note that reassigning clears the list of found versions, even if the
 new packages includes the original one.
 
-*** To remove spam from the tracker, move it to the 'spam' pseudo-package:
+** To remove spam from the tracker, move it to the 'spam' pseudo-package:
 reassign 123 spam
 
 (Should not be necessary any more, now that the input is moderated.)
 
-*** To change the title of a bug:
+** To change the title of a bug:
 retitle 123 Some New Title
 
-*** To change the submitter address:
+** To change the submitter address:
 submitter 123 none@example.com
 
 Note that it does not seem to work to specify "Submitter:" in the
 pseudo-header when first reporting a bug.
 
-*** How does archiving work?
+** How does archiving work?
 You can still send mail to a bug after it is closed.  After 28 days with
 no activity, the bug is archived, at which point no more changes can
 be made.  If you try to send mail to the bug after that (or merge with
@@ -449,10 +435,10 @@ The bug will be re-archived after the next 28 day period of no activity.
 
 It's a function of the number of displayed bugs.  You can speed things
 up by only looking at the newest 100 bugs:
-https://debbugs.gnu.org/cgi-bin/pkgreport.cgi?newest=100;package=emacs
+http://debbugs.gnu.org/cgi-bin/pkgreport.cgi?newest=100;package=emacs
 
 Or use the static index:
-https://debbugs.gnu.org/db/ix/full.html
+http://debbugs.gnu.org/db/ix/full.html
 
 ** What are those "mbox folder" links on the bug report pages?
 
@@ -498,7 +484,7 @@ the bug web-pages.
 
 *** Debian stuff
 
-https://lists.gnu.org/r/emacs-devel/2009-11/msg00440.html
+http://lists.gnu.org/archive/html/emacs-devel/2009-11/msg00440.html
 
 ** Gnus-specific voodoo
 
@@ -507,7 +493,7 @@ https://lists.gnu.org/r/emacs-devel/2009-11/msg00440.html
 *** If the above is not available:
 (add-hook 'gnus-article-mode-hook
           (lambda ()
-             (setq bug-reference-url-format "https://debbugs.gnu.org/%s")
+             (setq bug-reference-url-format "http://debbugs.gnu.org/%s")
               (bug-reference-mode 1)))
 
 and you can click on the bug number in the subject header.
@@ -521,8 +507,8 @@ reference, you don't need to read these as a user of the system.
 Getting mail from the Emacs bug list into the tracker requires the
 assistance of sysadmin at gnu.org.  The test tracker set-up was, I
 think, [gnu.org #359140]:
-https://lists.gnu.org/r/savannah-hackers/2008-03/msg00074.html
-https://lists.gnu.org/r/savannah-hackers/2008-04/msg00034.html
+http://lists.gnu.org/archive/html/savannah-hackers/2008-03/msg00074.html
+http://lists.gnu.org/archive/html/savannah-hackers/2008-04/msg00034.html
 
 ** The debbugs.gnu.org setup was handled in [gnu.org #510605].
 There are two pieces (replace AT with @ in the following):
@@ -562,11 +548,11 @@ It does basic spam processing on the moderator requests and
 automatically rejects the obviously bogus ones.  Someone still has to
 accept the good ones though.  The advantage of this would not be having
 to run and tune our own spam filter.  See
-https://savannah.nongnu.org/projects/listhelper
+http://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/r/emacs-devel/2009-11/msg01211.html
+http://lists.gnu.org/archive/html/emacs-devel/2009-11/msg01211.html
 
 ** Mailing list recipient/sender filters.
 The following mailman filters are useful to stop messages being

admin/notes/copyright

@@ -1,4 +1,4 @@
-Copyright (C) 2007-2023 Free Software Foundation, Inc.
+Copyright (C) 2007-2017 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
@@ -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/r/emacs-devel/2007-02/msg00618.html).
+another (http://lists.gnu.org/archive/html/emacs-devel/2007-02/msg00618.html).
 
 
 When installing a file with an "unusual" license (after checking first
@@ -159,7 +159,10 @@ etc/future-bug
 
 etc/letter.pbm,letter.xpm
   - trivial, no notice needed.
-<https://lists.gnu.org/r/emacs-devel/2007-02/msg00324.html>
+<http://lists.gnu.org/archive/html/emacs-devel/2007-02/msg00324.html>
+
+etc/FTP, ORDERS
+  - trivial (at time of writing), no license needed
 
 etc/HELLO
   standard notices. Just a note that although the file itself is not
@@ -193,14 +196,14 @@ lib-src/etags.c
   After some investigation in Feb 2007, then to the best of our
   knowledge we believe that the original 1984 Emacs version was based
   on the version in BSD4.2. See for example this 1985 post from Ken Arnold:
-  <https://groups.google.com/group/mod.sources/browse_thread/thread/ffe5c55845a640a9>
+  <http://groups.google.com/group/mod.sources/browse_thread/thread/ffe5c55845a640a9>
     I have received enough requests for the current source to ctags
     to post it. Here is the latest version (what will go out with
     4.3, modulo any bugs fixed during the beta period). It is the
     4.2 ctags with recognition of yacc and lex tags added.
 
   See also a 1984 version of ctags (no copyright) posted to net.sources:
-  <https://groups.google.com/group/net.sources/msg/a21b6c21be12a98d>
+  <http://groups.google.com/group/net.sources/msg/a21b6c21be12a98d>
   Version of etags.c in emacs-16.56 duplicates comment typos.
 
   Accordingly, in Feb 2007 we added a 1984 copyright for the
@@ -211,7 +214,7 @@ lib-src/etags.c
   from a legal point of view.
 
 lisp/cedet/semantic/imenu.el
-  - See https://lists.gnu.org/r/emacs-devel/2010-03/msg00410.html
+  - See http://lists.gnu.org/archive/html/emacs-devel/2010-03/msg00410.html
    in which Eric Ludlam established that the remaining contributions
    from authors other than himself were negligible.
 
@@ -220,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/r/emacs-devel/2007-01/msg00960.html>
+  <http://lists.gnu.org/archive/html/emacs-devel/2007-01/msg00960.html>
   rms: Legal advice is that we are ok and need not worry about this.
 
 
@@ -304,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/r/emacs-devel/2007-04/msg00583.html
-https://lists.gnu.org/r/emacs-devel/2007-04/msg00618.html
+http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00583.html
+http://lists.gnu.org/archive/html/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
@@ -350,7 +353,9 @@ added or not, rms says (2007-02-25, "oldXmenu issues"):
 insque.c had no copyright notice until 2005. The version of insque.c
 added to Emacs 1992-01-27 is essentially the same as insremque.c added
 to glic three days later by Roland McGrath, with an FSF copyright and
-GPL, but no ChangeLog entry.
+GPL, but no ChangeLog entry:
+<http://sources.redhat.com/cgi-bin/cvsweb.cgi/~checkout~/libc/misc/insremque.c?\
+rev=1.1&cvsroot=glibc>
 To the best of his recollection, McGrath (who has a copyright
 assignment) was the author of this file (email from roland at frob.com
 to rms, 2007-02-23, "Where did insque.c come from?"). The FSF
@@ -392,7 +397,7 @@ lisp/term/README
   Accordingly, FSF copyright was added.
 
 src/unexhp9k800.c
-  https://lists.gnu.org/r/emacs-devel/2007-02/msg00138.html
+  http://lists.gnu.org/archive/html/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
@@ -401,10 +406,10 @@ src/unexhp9k800.c
 
 lisp/progmodes/python.el
 Dave Love alerted us to a potential legal problem:
-https://lists.gnu.org/r/emacs-pretest-bug/2007-04/msg00459.html
+http://lists.gnu.org/archive/html/emacs-pretest-bug/2007-04/msg00459.html
 
 On consultation with a lawyer, we found there was no problem:
-https://lists.gnu.org/r/emacs-devel/2007-05/msg00466.html
+http://lists.gnu.org/archive/html/emacs-devel/2007-05/msg00466.html
 
 
 ** Issues that are "fixed" for the release of Emacs 22, but we may
@@ -506,7 +511,7 @@ etc/TUTORIAL* (translations)
   rms: "We can leave the TUTORIAL translations alone until their
   maintainers update them."
   Can adapt short license text from end of GPL translations at:
-  https://www.gnu.org/licenses/translations.html
+  http://www.gnu.org/licenses/translations.html
   Only a few sentences around the license notice need changing from
   previous version.
 Done: TUTORIAL.eo
@@ -522,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/r/emacs-devel/2007-07/msg01431.html)
+(see http://lists.gnu.org/archive/html/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
@@ -589,4 +594,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.

admin/notes/documentation

@@ -5,7 +5,7 @@ Some documentation tips culled from emacs-devel postings.
 
 ** Manual indices
 
-https://lists.gnu.org/r/emacs-devel/2008-10/msg00400.html
+http://lists.gnu.org/archive/html/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/r/emacs-devel/2008-10/msg00414.html
+http://lists.gnu.org/archive/html/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/r/emacs-devel/2008-10/msg00414.html
+http://lists.gnu.org/archive/html/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/r/emacs-devel/2008-11/msg00893.html
+http://lists.gnu.org/archive/html/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/r/emacs-devel/2008-11/msg01054.html
+http://lists.gnu.org/archive/html/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/r/emacs-devel/2012-02/msg00649.html
+http://lists.gnu.org/archive/html/emacs-devel/2012-02/msg00649.html

admin/notes/elpa

@@ -3,33 +3,19 @@ NOTES ON THE EMACS PACKAGE ARCHIVE
 The GNU Emacs package archive, at elpa.gnu.org, is managed using a Git
 repository named "elpa", hosted on Savannah.  To check it out:
 
-  git clone https://git.savannah.gnu.org/git/emacs/elpa
+  git clone git://git.sv.gnu.org/emacs/elpa
   cd elpa
-  make setup
+  git remote set-url --push origin git+ssh://git.sv.gnu.org/srv/git/emacs/elpa
+  [create task branch for edits, etc.]
 
-That leaves the elpa/packages directory empty; you must check out the
-ones you want.
+Changes to this branch propagate to elpa.gnu.org via a "deployment" script run
+daily.  This script (which is kept in elpa/admin/update-archive.sh) generates
+the content visible at http://elpa.gnu.org/packages.
 
-If you wish to check out all the packages into the packages directory,
-you can run the command:
-
-   make worktrees
-
-You can check out a specific package <pkgname> into the packages
-directory with:
-
-   make packages/<pkgname>
-
-
-Changes to this repository propagate to elpa.gnu.org via a
-"deployment" script run daily.  This script generates the content
-visible at https://elpa.gnu.org/packages.
-
-A new package is released as soon as the "version number" of that
-package is changed.  So you can use 'elpa' to work on a package
-without fear of releasing those changes prematurely.  And once the
-code is ready, just bump the version number to make a new release of
-the package.
+A new package is released as soon as the "version number" of that package is
+changed.  So you can use 'elpa' to work on a package without fear of releasing
+those changes prematurely.  And once the code is ready, just bump the
+version number to make a new release of the package.
 
 It is easy to use the elpa branch to deploy a "local" copy of the
 package archive.  For details, see the README file in the elpa branch.

admin/notes/emba

@@ -1,140 +0,0 @@
--*- mode: outline; coding: utf-8 -*-
-
-Copyright (C) 2019-2023 Free Software Foundation, Inc.
-See the end of the file for license conditions.
-
-NOTES FOR EMACS CONTINUOUS BUILD ON EMBA
-
-A continuous build for Emacs can be found at
-<https://emba.gnu.org/emacs/emacs>, a Gitlab instance.  It watches the
-Emacs git repository and starts a pipeline (jobset) if there are new
-changes.  This happens for all Emacs branches which belong to the
-defined workflow (see below).
-
-* Mail notifications
-
-In addition to the web interface, emba can send notifications by email
-when a job fails.  It sends notifications about test status to
-<emacs-buildstatus@gnu.org>.
-
-If you want to receive these notifications, please subscribe at
-<https://lists.gnu.org/mailman/listinfo/emacs-buildstatus>.
-
-Alternatively, these notifications can be read via gmane at
-<nntp+news.gmane.org:gmane.emacs.buildstatus>.
-
-The messages contain a URL to the log file of the failed job, like
-<https://emba.gnu.org/emacs/emacs/-/jobs/739/raw>.
-
-* Emacs jobset
-
-The Emacs jobset is defined in the Emacs source tree, file
-'.gitlab-ci.yml'.  All related files are located in directory
-'test/infra'.  They could be adapted for every Emacs branch, see
-<https://emba.gnu.org/help/ci/yaml/README.md>.
-
-Only branches whose name starts with 'master', 'emacs', 'feature', or
-'fix' are considered.  This is declared in the workflow rules of file
-'test/infra/gitlab-ci.yml'.
-
-A jobset on Gitlab is called a pipeline.  Emacs pipelines run through
-the stages 'build-images', 'platform-images' and 'native-comp-images'
-(create an Emacs instance by 'make bootstrap' with different
-configuration parameters) as well as 'normal', 'platforms' and
-'native-comp' (run respective test jobs based on the produced images).
-
-The jobs for stage 'normal' are contained in the file
-'test/infra/test-jobs.yml'.  This file is generated by calling 'make
--C test generate-test-jobs' in the Emacs source tree, and the
-resulting file should be pushed to the Emacs git repository afterwards.
-
-Every job runs in a Debian docker container.  It uses the local clone
-of the Emacs git repository to perform a bootstrap and test of Emacs.
-This could happen for several jobs with changed configuration, compile,
-and test parameters.
-
-The 'build-image-*' jobs of the different '*-images' stages run only
-if there are severe changes in the Emacs sources, like in Makefiles
-etc.  Otherwise they are skipped, and the corresponding 'test-*' jobs
-run just 'make -C test ...' in the respective Docker image from a
-previous build run.
-
-Jobs in the 'build-images' and 'normal' stages are triggered by
-changes of respective files in the Emacs git repository.  All other
-jobs run scheduled in a pipeline every 8 hours.
-
-The log files for every test job are kept on the server for a week.
-They can be downloaded from the server, visiting the URL
-<https://emba.gnu.org/emacs/emacs/-/pipelines>, and selecting the job
-in question.
-
-Every pipeline generates a JUnit test report for the respective test
-jobs, which can be inspected on the pipeline web page.  This test
-report counts completed ERT tests, aborted tests are not counted.
-
-* Emba configuration
-
-The emba configuration files are hosted on
-<https://gitlab.com/emacs-ci/emba-ansible>.
-
-* Identifying emba
-
-Lisp packages, Makefiles, scripts, and other software could determine
-whether they run on emba by checking for the environment variable
-EMACS_EMBA_CI.
-
-* Running Emba tests locally
-
-As usual in GitLab, the tests run in containers, which could be
-applied also locally.  Unfortunately, the Emba container registry,
-emba.gnu.org:5050, is not accessible publicly.  Instead, the container
-images must be build locally.  Change the current directory to a
-recent Emacs branch, and apply the command
-
-  docker build --target emacs-inotify --tag emacs-inotify \
-    -f test/infra/Dockerfile.emba .
-
-This creates the Debian-based image emacs-inotify, based on the
-instructions in the file Dockerfile.emba.  This image is good for the
-majority of tests.  However, there are also other image build
-instructions like emacs-filenotify-gio, emacs-eglot, emacs-gnustep and
-emacs-native-comp-speed{0,1,2}.  Use the appropriate one.
-
-The image contains a directory "/checkout", which is a copy of your
-local Emacs git repository.  Emacs has been built in this directory
-via "make bootstrap".  In order to use the image, start a container
-like
-
-  docker run --interactive --env EMACS_EMBA_CI=1 --name emacs-inotify \
-    emacs-inotify /bin/sh -i
-
-In this container, change the current directory to "/checkout".  Now
-you can apply all commands known for Emacs, like
-
-  cd /checkout
-  make -C test files-tests.log
-
-While this container runs, you can also access its filesystem from
-your local Emacs via Tramp.  For example, in order to see the result
-of the above test run, open the log file in your local Emacs with
-
-  C-x C-f /docker:emacs-inotify:/checkout/test/lisp/files-tests.log
-
-Note: On local Red Hat-based systems, use "podman" instead of "docker"
-in the shell commands and Tramp file names.
-
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.

admin/notes/font-backend

@@ -0,0 +1,69 @@
+Copyright (C) 2002-2017 Free Software Foundation, Inc.
+See the end of the file for license conditions.
+
+
+New font handling mechanism with font backend method
+----------------------------------------------------
+
+The new files are:
+	font.h -- header providing font-backend related structures
+		(most important ones are "struct font" and "struct
+		font_driver"), macros, and etc.
+	font.c -- main font handling code.
+	xfont.c -- font-driver on X for X core fonts.
+	ftfont.c -- generic font-driver for FreeType fonts providing
+		device-independent methods of struct font_driver.
+	xftfont.c -- font-driver on X using Xft for FreeType fonts
+		utilizing methods provided by ftfont.c.
+	ftxfont.c -- font-driver on X directly using FreeType fonts
+		utilizing methods provided by ftfont.c.
+	w32font.c -- font driver on w32 using Windows native fonts,
+		corresponding to xfont.c
+	w32uniscribe.c -- font driver on w32, using the uniscribe API
+	        to provide complex script support for opentype fonts on
+		Windows 2000 and later, or earlier versions of Windows
+		with uniscribe installed as an add-on.
+
+So we already have codes for X and w32.  For Mac it seems that we need
+these files:
+	atmfont.c -- font-driver on mac using ATM fonts, corresponding
+		to xfont.c
+As BDF fonts are currently used on w32, we may also implement these:
+	bdffont.c -- generic font-driver for BDF fonts, corresponding to
+		ftfont.c
+	bdfw32font.c -- font-driver on w32 using BDF fonts,
+		corresponding to ftxfont.c
+But, as FreeType already supports BDF fonts, if FreeType and
+Fontconfig are also available on w32, what we need may be:
+	ftw32font.c -- font-driver on w32 directly using FreeType fonts
+		utilizing methods provided by ftfont.c.
+
+It may be interesting if Emacs supports a frame buffer directly and
+has these font driver.
+	ftfbfont.c -- font-driver on FB for FreeType fonts.
+	bdffbfont.c -- font-driver on FB for BDF fonts.
+
+Note: The fontset related codes are not yet matured to work well with
+the font backend method.  So, for instance, even if you start Emacs
+as something like this:
+  % emacs -fn tahoma
+Non-ASCII Latin characters will not be displayed by the font "tahoma".
+In such a case, please try this:
+
+(set-fontset-font "fontset-default" 'latin '("tahoma" . "unicode-bmp"))
+
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.

admin/notes/git-workflow

@@ -1,3 +1,7 @@
+(This is a draft.  The method here won't actually work yet, because
+neither git-new-workdir nor merge-changelog are in the Emacs
+distribution yet.)
+
 Setting up and using git for normal, simple bugfixing
 =====================================================
 
@@ -8,22 +12,22 @@ 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/r/emacs-devel/2016-01/threads.html#01802]
+[https://lists.gnu.org/archive/html/emacs-devel/2016-01/threads.html#01802]
 for more details about why that last line is there.)
 
 Initial setup
 =============
 
 Then we want to clone the repository.  We normally want to have both
-the current master and (if there is one) the active release branch
-(eg emacs-29).
+the current master and the emacs-25 branch.
 
 mkdir ~/emacs
 cd ~/emacs
 git clone <membername>@git.sv.gnu.org:/srv/git/emacs.git master
-cd master
-git config push.default current
-git worktree add ../emacs-29 emacs-29
+(cd master; git config push.default current)
+./master/admin/git-new-workdir master emacs-25
+cd emacs-25
+git checkout emacs-25
 
 You now have both branches conveniently accessible, and you can do
 "git pull" in them once in a while to keep updated.
@@ -53,11 +57,11 @@ you commit your change locally and then send a patch file as a bug report
 as described in ../../CONTRIBUTE.
 
 
-Backporting to release branch
-=============================
+Backporting to emacs-25
+=======================
 
 If you have applied a fix to the master, but then decide that it should
-be applied to the release branch, too, then
+be applied to the emacs-25 branch, too, then
 
 cd ~/emacs/master
 git log
@@ -67,7 +71,7 @@ which will look like
 
 commit 958b768a6534ae6e77a8547a56fc31b46b63710b
 
-cd ~/emacs/emacs-29
+cd ~/emacs/emacs-25
 git cherry-pick -xe 958b768a6534ae6e77a8547a56fc31b46b63710b
 
 and add "Backport:" to the commit string.  Then
@@ -75,28 +79,17 @@ and add "Backport:" to the commit string.  Then
 git push
 
 
-Reverting on release branch
-===========================
-
-If a commit is made to the release branch, and then it is later
-decided that this change should only be on the master branch, the
-simplest way to handle this is to revert the commit on the release
-branch, and include in the associated log entry "do not merge to master".
-(Otherwise, the reversion may get merged to master, and inadvertently
-clobber the change on master if it has been manually made there.)
-
-
-Merging release branch to the master
-====================================
+Merging emacs-25 to the master
+==============================
 
 It is recommended to use the file gitmerge.el in the admin directory
-for merging the release branch into 'master'.  It will take care of many
+for merging 'emacs-25' into 'master'.  It will take care of many
 things which would otherwise have to be done manually, like ignoring
 commits that should not land in master, fixing up ChangeLogs and
 automatically dealing with certain types of conflicts.  If you really
 want to, you can do the merge manually, but then you're on your own.
 If you still choose to do that, make absolutely sure that you *always*
-use the 'merge' command to transport commits from the release branch to
+use the 'merge' command to transport commits from 'emacs-25' to
 'master'.  *Never* use 'cherry-pick'!  If you don't know why, then you
 shouldn't manually do the merge in the first place; just use
 gitmerge.el instead.
@@ -109,11 +102,11 @@ up-to-date by doing a pull.  Then start Emacs with
   emacs -l admin/gitmerge.el -f gitmerge
 
 You'll be asked for the branch to merge, which will default to
-(eg) 'origin/emacs-29', which you should accept.  Merging a local tracking
+'origin/emacs-25', which you should accept.  Merging a local tracking
 branch is discouraged, since it might not be up-to-date, or worse,
 contain commits from you which are not yet pushed upstream.
 
-You will now see the list of commits from the release branch that are not yet
+You will now see the list of commits from 'emacs-25' which are not yet
 merged to 'master'.  You might also see commits that are already
 marked for "skipping", which means that they will be merged with a
 different merge strategy ('ours'), which will effectively ignore the

admin/notes/hydra

@@ -1,15 +1,18 @@
 -*- mode: outline; coding: utf-8 -*-
 
-Copyright (C) 2013-2023 Free Software Foundation, Inc.
+Copyright (C) 2013-2017 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 NOTES FOR EMACS CONTINUOUS BUILD ON HYDRA
 
 A continuous build for Emacs can be found at
-https://hydra.nixos.org/jobset/gnu/emacs-trunk
+http://hydra.nixos.org/jobset/gnu/emacs-trunk
+http://hydra.nixos.org/jobset/gnu/emacs-24
 
 * It builds Emacs on various platforms.
 Sometimes jobs fail due to hydra problems rather than Emacs problems.
+Eg it seems like the cygwin build will never work again.
+http://lists.gnu.org/archive/html/hydra-users/2013-08/msg00000.html
 
 * Mail notifications
 In addition to the web interface, Hydra can send notifications by
@@ -18,9 +21,7 @@ SUCCEEDED to FAILED.  It sends notifications about build status in
 Emacs trunk to emacs-buildstatus@gnu.org.
 
 If you want to receive these notifications, please subscribe at
-https://lists.gnu.org/mailman/listinfo/emacs-buildstatus
-
-(This feature seems to have been broken for ages.)
+http://lists.gnu.org/mailman/listinfo/emacs-buildstatus
 
 * The Emacs jobset consists of the following jobs:
 
@@ -30,29 +31,23 @@ by running make-dist to create a tarball.  If this job fails, all the
 others will too (because they use the tarball as input).
 
 ** The 'build' job
-which starts from the tarball and does a normal build.
+which starts from the tarball and does a normal build
 
 ** The 'coverage' job
-does a gcov build and then runs 'make check-expensive'.  Fails if any
-test fails.
+does a gcov build and then runs 'make check'.  Fails if any test fails.
 
 * Nix expressions
 The recipe for GNU Emacs are available via Git:
-https://git.savannah.gnu.org/cgit/hydra-recipes.git/tree/emacs
+http://git.savannah.gnu.org/cgit/hydra-recipes.git/tree/emacs
 
 To modify the build job, email the patch to hydra-users@gnu.org.  The
 build recipes are written in the Nix language.
 
-* Identifying hydra
-Lisp packages, Makefiles, scripts, and other software could determine
-whether they run on hydra by checking for the environment variable
-EMACS_HYDRA_CI.
-
 * Other Information
 For a list of other GNU packages that have a continuous build on
-Hydra, see https://hydra.nixos.org/project/gnu
+Hydra, see http://hydra.nixos.org/project/gnu
 
-See https://www.gnu.org/software/devel.html#Hydra for more information.
+See http://www.gnu.org/software/devel.html#Hydra for more information.
 
 
 This file is part of GNU Emacs.
@@ -68,4 +63,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.

admin/notes/multi-tty

@@ -1,6 +1,6 @@
 -*- coding: utf-8; mode: text; -*-
 
-Copyright (C) 2007-2023 Free Software Foundation, Inc.
+Copyright (C) 2007-2017 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 From README.multi-tty in the multi-tty branch.
@@ -171,11 +171,7 @@ preload-emacs "$name" wait
 name="$1"
 waitp="$2"
 screendir="/var/run/screen/S-$USER"
-if [ "${XDG_RUNTIME_DIR+set}" ]; then
-  serverdir="$XDG_RUNTIME_DIR/emacs"
-else
-  serverdir="${TMPDIR-/tmp}/emacs$UID"
-fi
+serverdir="/tmp/emacs$UID"
 emacs=/usr/bin/emacs-multi-tty # Or wherever you installed your multi-tty Emacs
 
 if [ -z "$name" ]; then
@@ -309,7 +305,7 @@ THINGS TO DO
    multidisplay (and don't mind core dumps), you can edit src/config.h
    and define HAVE_GTK_MULTIDISPLAY there by hand.
 
-	https://gitlab.gnome.org/GNOME/gtk/issues/221
+	http://bugzilla.gnome.org/show_bug.cgi?id=85715
 
    Update: Han reports that GTK+ version 2.8.9 almost gets display
    disconnects right.  GTK will probably be fully fixed by the time
@@ -474,7 +470,7 @@ THINGS TO DO
    definition.
 
    Exceptions found so far: x-select-text and
-   x-selection-value.
+   x-cut-buffer-or-selection-value.
 
 ** Have a look at fatal_error_hook.
 
@@ -1300,4 +1296,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.

admin/notes/nextstep

@@ -65,6 +65,9 @@ functions are:
 Currently ctrl-g is not detected in as many circumstances as other emacsen.
 It is not certain whether this is due to the means of event loop integration,
 or errors of omission in the NS code.  This is an area for improvement.
+Also, see the article here and its containing thread:
+
+http://article.gmane.org/gmane.emacs.devel/92021/match=handling%5fsignal
 
 
 

admin/notes/repo

@@ -1,5 +1,12 @@
 NOTES ON COMMITTING TO EMACS'S REPOSITORY    -*- outline -*-
 
+** elpa
+
+This branch does not contain a copy of Emacs, but of the Emacs Lisp
+package archive (elpa.gnu.org).  See admin/notes/elpa for further
+explanation, and the README file in the branch for usage
+instructions.
+
 * Install changes only on one branch, let them get merged elsewhere if needed.
 
 In particular, install bug-fixes only on the release branch (if there
@@ -11,7 +18,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/r/emacs-devel/2010-03/msg01124.html
+http://lists.gnu.org/archive/html/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,25 +47,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/r/emacs-devel/2010-04/msg00086.html
-
-* feature and scratch branches
-
-Besides the master branch, which is where development takes place, and
-the "emacs-NN" release branches, we also have branches whose names
-start with "scratch/" and "feature/".  The "feature/" prefix is used
-for feature branches that are intended to live for some time, while
-"scratch/" is for one-off throw-away-after-use branches.
-
-We do not intend to "git merge" from scratch branches, so force-pushes
-are tolerated, as well as commits with poor style, incomplete commit
-messages, etc.
-
-We do expect to "git merge" from feature branches so: no force push,
-and no commits that don't have a proper commit message.
-
-Automatic tests are run for feature/* branches on EMBA.
-See: https://emba.gnu.org/emacs/emacs/-/pipelines
+http://lists.gnu.org/archive/html/emacs-devel/2010-04/msg00086.html
 
 * Installing changes from gnulib
 
@@ -128,14 +117,6 @@ again.
 This is a semi-automated way to find the revision that introduced a bug.
 Browse 'git help bisect' for technical instructions.
 
-It is recommended to start a bisection with the admin/git-bisect-start
-script.  Using that script ensures that commits in branches that are
-the result of merging external trees into the Emacs repository, as
-well as certain commits on which Emacs fails to build, are skipped
-during the bisection process.  That script can also be executed
-automatically when 'git bisect start' is called, with the help of a
-wrapper script that is included in its commentary section.
-
 * Maintaining ChangeLog history
 
 Older ChangeLog entries are kept in history files named ChangeLog.1,
@@ -150,11 +131,6 @@ This ChangeLog file is not put into the repository.
 'make change-history' copies all newer ChangeLog entries into the
 start of the newest ChangeLog history file.  These ChangeLog entries
 are thereafter considered to be old, so later uses of 'make ChangeLog'
-and/or 'make change-history' will no longer copy the entries.
-
-To alter ChangeLog history, run 'make change-history' and commit the
-changes made by that command.  Then edit the ChangeLog history files
-manually and commit those changes in a second, distinct commit.
-Altering ChangeLog history like this can make things harder for those
-who handle merging branches and Emacs releases, so reserve it for
-correcting more serious mistakes.
+and/or 'make change-history' will no longer copy the entries.  To
+alter ChangeLog history, run 'make change-history', then edit
+the ChangeLog history files manually and commit your changes.

admin/notes/spelling

@@ -1,11 +0,0 @@
-Re "behavior" vs "behaviour", etc.
-
-- GNU Emacs originated in the US.
-
-- If there is a choice between US vs UK spelling for a word
-  for new text (code, docs), choose the US variant.
-
-- It's probably (IMHO --ttn, 2017-10-13) not a high priority to
-  change existing text; use your best judgment (ask if unsure).
-
-- https://lists.gnu.org/r/emacs-devel/2005-06/msg00489.html

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/r/emacs-devel/2012-04/msg00042.html
+http://lists.gnu.org/archive/html/emacs-devel/2012-04/msg00042.html
 
 In the unlikely event that you need them, the removed tags were:
 

admin/notes/tree-sitter/build-module/batch.sh

@@ -1,29 +0,0 @@
-#!/bin/bash
-
-languages=(
-    'bash'
-    'c'
-    'cmake'
-    'cpp'
-    'css'
-    'c-sharp'
-    'dockerfile'
-    'elixir'
-    'go'
-    'go-mod'
-    'heex'
-    'html'
-    'javascript'
-    'json'
-    'python'
-    'rust'
-    'toml'
-    'tsx'
-    'typescript'
-    'yaml'
-)
-
-for language in "${languages[@]}"
-do
-    ./build.sh $language
-done

admin/notes/tree-sitter/build-module/build.sh

@@ -1,92 +0,0 @@
-#!/bin/bash
-
-lang=$1
-topdir="$PWD"
-
-case $(uname) in
-    "Darwin")
-        soext="dylib"
-        ;;
-    *"MINGW"*)
-        soext="dll"
-        ;;
-    *)
-        soext="so"
-        ;;
-esac
-
-echo "Building ${lang}"
-
-### Retrieve sources
-
-org="tree-sitter"
-repo="tree-sitter-${lang}"
-sourcedir="tree-sitter-${lang}/src"
-grammardir="tree-sitter-${lang}"
-
-case "${lang}" in
-    "dockerfile")
-        org="camdencheek"
-        ;;
-    "cmake")
-        org="uyha"
-        ;;
-    "elixir")
-        org="elixir-lang"
-        ;;
-    "go-mod")
-        # The parser is called "gomod".
-        lang="gomod"
-        org="camdencheek"
-        ;;
-    "heex")
-        org="phoenixframework"
-        ;;
-    "typescript")
-        sourcedir="tree-sitter-typescript/typescript/src"
-        grammardir="tree-sitter-typescript/typescript"
-        ;;
-    "tsx")
-        repo="tree-sitter-typescript"
-        sourcedir="tree-sitter-typescript/tsx/src"
-        grammardir="tree-sitter-typescript/tsx"
-        ;;
-    "yaml")
-        org="ikatyang"
-        ;;
-esac
-
-git clone "https://github.com/${org}/${repo}.git" \
-    --depth 1 --quiet
-cp "${grammardir}"/grammar.js "${sourcedir}"
-# We have to go into the source directory to compile, because some
-# C files refer to files like "../../common/scanner.h".
-cd "${sourcedir}"
-
-### Build
-
-cc -fPIC -c -I. parser.c
-# Compile scanner.c.
-if test -f scanner.c
-then
-    cc -fPIC -c -I. scanner.c
-fi
-# Compile scanner.cc.
-if test -f scanner.cc
-then
-    c++ -fPIC -I. -c scanner.cc
-fi
-# Link.
-if test -f scanner.cc
-then
-    c++ -fPIC -shared *.o -o "libtree-sitter-${lang}.${soext}"
-else
-    cc -fPIC -shared *.o -o "libtree-sitter-${lang}.${soext}"
-fi
-
-### Copy out
-
-mkdir -p "${topdir}/dist"
-cp "libtree-sitter-${lang}.${soext}" "${topdir}/dist"
-cd "${topdir}"
-rm -rf "${repo}"

admin/notes/tree-sitter/starter-guide

@@ -1,458 +0,0 @@
-STARTER GUIDE ON WRITING MAJOR MODE WITH TREE-SITTER -*- org -*-
-
-This document guides you on adding tree-sitter support to a major
-mode.
-
-TOC:
-
-- Building Emacs with tree-sitter
-- Install language definitions
-- Setup
-- Naming convention
-- Font-lock
-- Indent
-- Imenu
-- Navigation
-- Which-func
-- More features?
-- Common tasks (code snippets)
-- Manual
-- Appendix 1
-
-* Building Emacs with tree-sitter
-
-You can either install tree-sitter by your package manager, or from
-source:
-
-    git clone https://github.com/tree-sitter/tree-sitter.git
-    cd tree-sitter
-    make
-    make install
-
-Then pull the tree-sitter branch (or the master branch, if it has
-merged) and rebuild Emacs.
-
-* Install language definitions
-
-Tree-sitter by itself doesn’t know how to parse any particular
-language. We need to install language definitions (or “grammars”) for
-a language to be able to parse it. There are a couple of ways to get
-them.
-
-You can use this script that I put together here:
-
-    https://github.com/casouri/tree-sitter-module
-
-This script automatically pulls and builds language definitions for C,
-C++, Rust, JSON, Go, HTML, JavaScript, CSS, Python, Typescript,
-C#, etc. Better yet, I pre-built these language definitions for
-GNU/Linux and macOS, they can be downloaded here:
-
-    https://github.com/casouri/tree-sitter-module/releases/tag/v2.1
-
-To build them yourself, run
-
-    git clone git@github.com:casouri/tree-sitter-module.git
-    cd tree-sitter-module
-    ./batch.sh
-
-and language definitions will be in the /dist directory. You can
-either copy them to standard dynamic library locations of your system,
-eg, /usr/local/lib, or leave them in /dist and later tell Emacs where
-to find language definitions by setting ‘treesit-extra-load-path’.
-
-Language definition sources can be found on GitHub under
-tree-sitter/xxx, like tree-sitter/tree-sitter-python. The tree-sitter
-organization has all the "official" language definitions:
-
-   https://github.com/tree-sitter
-
-Alternatively, you can use treesit-install-language-grammar command
-and follow its instructions. If everything goes right, it should
-automatically download and compile the language grammar for you.
-
-* Setting up for adding major mode features
-
-Start Emacs and load tree-sitter with
-
-    (require 'treesit)
-
-Now check if Emacs is built with tree-sitter library
-
-    (treesit-available-p)
-
-Make sure Emacs can find the language grammar you want to use
-
-    (treesit-language-available-p 'lang)
-
-* Tree-sitter major modes
-
-Tree-sitter modes should be separate major modes, so other modes
-inheriting from the original mode don't break if tree-sitter is
-enabled.  For example js2-mode inherits js-mode, we can't enable
-tree-sitter in js-mode, lest js-mode would not setup things that
-js2-mode expects to inherit from. So it's best to use separate major
-modes.
-
-If the tree-sitter variant and the "native" variant could share some
-setup, you can create a "base mode", which only contains the common
-setup.  For example, python.el defines python-base-mode (shared),
-python-mode (native), and python-ts-mode (tree-sitter).
-
-In the tree-sitter mode, check if we can use tree-sitter with
-treesit-ready-p, it will error out if tree-sitter is not ready.
-
-In Emacs 30 we'll introduce some mechanism to more gracefully inherit
-modes and fallback to other modes.
-
-* Naming convention
-
-Use tree-sitter for text (documentation, comment), use treesit for
-symbol (variable, function).
-
-* Font-lock
-
-Tree-sitter works like this: You provide a query made of patterns and
-capture names, tree-sitter finds the nodes that match these patterns,
-tag the corresponding capture names onto the nodes and return them to
-you. The query function returns a list of (capture-name . node). For
-font-lock, we use face names as capture names. And the captured node
-will be fontified in their capture name.
-
-The capture name could also be a function, in which case (NODE
-OVERRIDE START END) is passed to the function for fontification. START
-and END are the start and end of the region to be fontified.  The
-function should only fontify within that region.  The function should
-also allow more optional arguments with (&rest _), for future
-extensibility.  For OVERRIDE check out the docstring of
-treesit-font-lock-rules.
-
-** Query syntax
-
-There are two types of nodes, named, like (identifier),
-(function_definition), and anonymous, like "return", "def", "(",
-"}". Parent-child relationship is expressed as
-
-   (parent (child) (child) (child (grand_child)))
-
-Eg, an argument list (1, "3", 1) could be:
-
-   (argument_list "(" (number) (string) (number) ")")
-
-Children could have field names in its parent:
-
-   (function_definition name: (identifier) type: (identifier))
-
-Match any of the list:
-
-    ["true" "false" "none"]
-
-Capture names can come after any node in the pattern:
-
-    (parent (child) @child) @parent
-
-The query above captures both parent and child.
-
-   ["return" "continue" "break"] @keyword
-
-The query above captures all the keywords with capture name
-"keyword".
-
-These are the common syntax, see all of them in the manual
-("Parsing Program Source" section).
-
-** Query references
-
-But how do one come up with the queries? Take python for an example,
-open any python source file, type M-x treesit-explore-mode RET.  Now
-you should see the parse-tree in a separate window, automatically
-updated as you select text or edit the buffer.  Besides this, you can
-consult the grammar of the language definition. For example, Python’s
-grammar file is at
-
-    https://github.com/tree-sitter/tree-sitter-python/blob/master/grammar.js
-
-Neovim also has a bunch of queries to reference:
-
-    https://github.com/nvim-treesitter/nvim-treesitter/tree/master/queries
-
-The manual explains how to read grammar files in the bottom of section
-"Tree-sitter Language Definitions".
-
-** Debugging queries
-
-If your query has problems, use ‘treesit-query-validate’ to debug the
-query. It will pop a buffer containing the query (in text format) and
-mark the offending part in red.
-
-** Code
-
-To enable tree-sitter font-lock, set ‘treesit-font-lock-settings’ and
-‘treesit-font-lock-feature-list’ buffer-locally and call
-‘treesit-major-mode-setup’. For example, see
-‘python--treesit-settings’ in python.el. Below is a snippet of it.
-
-Just like the current font-lock, if the to-be-fontified region already
-has a face (ie, an earlier match fontified part/all of the region),
-the new face is discarded rather than applied. If you want later
-matches always override earlier matches, use the :override keyword.
-
-Each rule should have a :feature, like function-name,
-string-interpolation, builtin, etc. Users can then enable/disable each
-feature individually. See Appendix 1 at the bottom for a set of common
-features names.
-
-#+begin_src elisp
-(defvar python--treesit-settings
-  (treesit-font-lock-rules
-   :feature 'comment
-   :language 'python
-   '((comment) @font-lock-comment-face)
-
-   :feature 'string
-   :language 'python
-   '((string) @font-lock-string-face
-     (string) @contextual) ; Contextual special treatment.
-
-   :feature 'function-name
-   :language 'python
-   '((function_definition
-      name: (identifier) @font-lock-function-name-face))
-
-   :feature 'class-name
-   :language 'python
-   '((class_definition
-      name: (identifier) @font-lock-type-face))
-
-   ...))
-#+end_src
-
-Then in ‘python-mode’, enable tree-sitter font-lock:
-
-#+begin_src elisp
-(treesit-parser-create 'python)
-(setq-local treesit-font-lock-settings python--treesit-settings)
-(setq-local treesit-font-lock-feature-list
-            '((comment string function-name)
-              (class-name keyword builtin)
-              (string-interpolation decorator)))
-...
-(treesit-major-mode-setup)
-#+end_src
-
-Concretely, something like this:
-
-#+begin_src elisp
-(define-derived-mode python-mode prog-mode "Python"
-  ...
-  (cond
-   ;; Tree-sitter.
-   ((treesit-ready-p 'python)
-    (treesit-parser-create 'python)
-    (setq-local treesit-font-lock-settings python--treesit-settings)
-    (setq-local treesit-font-lock-feature-list
-                '((comment string function-name)
-                  (class-name keyword builtin)
-                  (string-interpolation decorator)))
-    (treesit-major-mode-setup))
-   (t
-    ;; No tree-sitter, do nothing or fallback to another mode.
-    ...)))
-#+end_src
-
-* Indent
-
-Indent works like this: We have a bunch of rules that look like
-
-   (MATCHER ANCHOR OFFSET)
-
-When the indentation process starts, point is at the BOL of a line, we
-want to know which column to indent this line to. Let NODE be the node
-at point, we pass this node to the MATCHER of each rule, one of them
-will match the node (eg, "this node is a closing bracket!"). Then we
-pass the node to the ANCHOR, which returns a point, eg, the BOL of the
-previous line. We find the column number of that point (eg, 4), add
-OFFSET to it (eg, 0), and that is the column we want to indent the
-current line to (4 + 0 = 4).
-
-Matchers and anchors are functions that takes (NODE PARENT BOL &rest
-_). Matches return nil/non-nil for no match/match, and anchors return
-the anchor point. Below are some convenient builtin matchers and anchors.
-
-For MATCHER we have
-
-    (parent-is TYPE) => matches if PARENT’s type matches TYPE as regexp
-    (node-is TYPE) => matches NODE’s type
-    (query QUERY) => matches if querying PARENT with QUERY
-                     captures NODE.
-
-    (match NODE-TYPE PARENT-TYPE NODE-FIELD
-           NODE-INDEX-MIN NODE-INDEX-MAX)
-
-    => checks everything. If an argument is nil, don’t match that. Eg,
-    (match nil TYPE) is the same as (parent-is TYPE)
-
-For ANCHOR we have
-
-    first-sibling => start of the first sibling
-    parent => start of parent
-    parent-bol => BOL of the line parent is on.
-    standalone-parent => Like parent-bol but handles more edge cases
-    prev-sibling => start of previous sibling
-    no-indent => current position (don’t indent)
-    prev-line => start of previous line
-
-There is also a manual section for indent: "Parser-based Indentation".
-
-When writing indent rules, you can use ‘treesit-check-indent’ to
-check if your indentation is correct. To debug what went wrong, set
-‘treesit--indent-verbose’ to non-nil. Then when you indent, Emacs
-tells you which rule is applied in the echo area.
-
-#+begin_src elisp
-(defvar typescript-mode-indent-rules
-  (let ((offset typescript-indent-offset))
-    `((typescript
-       ;; This rule matches if node at point is "}", ANCHOR is the
-       ;; parent node’s BOL, and offset is 0.
-       ((node-is "}") parent-bol 0)
-       ((node-is ")") parent-bol 0)
-       ((node-is "]") parent-bol 0)
-       ((node-is ">") parent-bol 0)
-       ((node-is "\\.") parent-bol ,offset)
-       ((parent-is "ternary_expression") parent-bol ,offset)
-       ((parent-is "named_imports") parent-bol ,offset)
-       ((parent-is "statement_block") parent-bol ,offset)
-       ((parent-is "type_arguments") parent-bol ,offset)
-       ((parent-is "variable_declarator") parent-bol ,offset)
-       ((parent-is "arguments") parent-bol ,offset)
-       ((parent-is "array") parent-bol ,offset)
-       ((parent-is "formal_parameters") parent-bol ,offset)
-       ((parent-is "template_substitution") parent-bol ,offset)
-       ((parent-is "object_pattern") parent-bol ,offset)
-       ((parent-is "object") parent-bol ,offset)
-       ((parent-is "object_type") parent-bol ,offset)
-       ((parent-is "enum_body") parent-bol ,offset)
-       ((parent-is "arrow_function") parent-bol ,offset)
-       ((parent-is "parenthesized_expression") parent-bol ,offset)
-       ...))))
-#+end_src
-
-To setup indentation for your major mode, set
-‘treesit-simple-indent-rules’ to your rules, and call
-‘treesit-major-mode-setup’:
-
-#+begin_src elisp
-(setq-local treesit-simple-indent-rules typescript-mode-indent-rules)
-(treesit-major-mode-setup)
-#+end_src
-
-* Imenu
-
-Set ‘treesit-simple-imenu-settings’ and call
-‘treesit-major-mode-setup’.
-
-* Navigation
-
-Set ‘treesit-defun-type-regexp’ and call
-‘treesit-major-mode-setup’. You can additionally set
-‘treesit-defun-name-function’.
-
-* Which-func
-
-If you have an imenu implementation, set ‘which-func-functions’ to
-nil, and which-func will automatically use imenu’s data.
-
-If you want an independent implementation for which-func, you can
-find the current function by ‘treesit-defun-at-point’.
-
-* More features?
-
-Obviously this list is just a starting point, if there are features in
-the major mode that would benefit from a parse tree, adding tree-sitter
-support for that would be great. But in the minimal case, just adding
-font-lock is awesome.
-
-* Common tasks
-
-How to...
-
-** Get the buffer text corresponding to a node?
-
-(treesit-node-text node)
-
-BTW ‘treesit-node-string’ does different things.
-
-** Scan the whole tree for stuff?
-
-(treesit-search-subtree)
-(treesit-search-forward)
-(treesit-induce-sparse-tree)
-
-** Move to next node that...?
-
-(treesit-search-forward-goto)
-
-** Get the root node?
-
-(treesit-buffer-root-node)
-
-** Get the node at point?
-
-(treesit-node-at (point))
-
-* Manual
-
-I suggest you read the manual section for tree-sitter in Info. The
-section is Parsing Program Source. Typing
-
-    C-h i d m elisp RET g Parsing Program Source RET
-
-will bring you to that section. You don’t need to read through every
-sentence, just read the text paragraphs and glance over function
-names.
-
-* Appendix 1
-
-Below is a set of common features used by built-in major mode.
-
-Basic tokens:
-
-delimiter               ,.;      (delimit things)
-operator                == != || (produces a value)
-bracket                 []{}()
-misc-punctuation        (other punctuation that you want to highlight)
-
-constant                true, false, null
-number
-keyword
-comment                 (includes doc-comments)
-string                  (includes chars and docstrings)
-string-interpolation    f"text {variable}"
-escape-sequence         "\n\t\\"
-function                every function identifier
-variable                every variable identifier
-type                    every type identifier
-property                a.b  <--- highlight b
-key                     { a: b, c: d } <--- highlight a, c
-error                   highlight parse error
-
-Abstract features:
-
-assignment: the LHS of an assignment (thing being assigned to), eg:
-
-a = b    <--- highlight a
-a.b = c  <--- highlight b
-a[1] = d <--- highlight a
-
-definition: the thing being defined, eg:
-
-int a(int b) { <--- highlight a
- return 0
-}
-
-int a;  <-- highlight a
-
-struct a { <--- highlight a
- int b;   <--- highlight b
-}

admin/notes/tree-sitter/treesit_record_change

@@ -1,50 +0,0 @@
-NOTES ON TREESIT_RECORD_CHANGE
-
-It is vital that Emacs informs tree-sitter of every change made to the
-buffer, lest tree-sitter's parse tree would be corrupted/out of sync.
-
-All buffer changes in Emacs are made through functions in insdel.c
-(and casefiddle.c), I augmented functions in those files with calls to
-treesit_record_change.  Below is a manifest of all the relevant
-functions in insdel.c as of Emacs 29:
-
-Function                          Calls
-----------------------------------------------------------------------
-copy_text                         (*1)
-insert                            insert_1_both
-insert_and_inherit                insert_1_both
-insert_char                       insert
-insert_string                     insert
-insert_before_markers             insert_1_both
-insert_before_markers_and_inherit insert_1_both
-insert_1_both                     treesit_record_change
-insert_from_string                insert_from_string_1
-insert_from_string_before_markers insert_from_string_1
-insert_from_string_1              treesit_record_change
-insert_from_gap_1                 treesit_record_change
-insert_from_gap                   insert_from_gap_1
-insert_from_buffer                treesit_record_change
-insert_from_buffer_1              (used by insert_from_buffer) (*2)
-replace_range                     treesit_record_change
-replace_range_2                   (caller needs to call treesit_r_c)
-del_range                         del_range_1
-del_range_1                       del_range_2
-del_range_byte                    del_range_2
-del_range_both                    del_range_2
-del_range_2                       treesit_record_change
-
-(*1) This functions is used only to copy from string to string when
-used outside of insdel.c, and when used inside insdel.c, the caller
-calls treesit_record_change.
-
-(*2) This function is a static function, and insert_from_buffer is its
-only caller.  So it should be fine to call treesit_record_change in
-insert_from_buffer but not insert_from_buffer_1.  I also left a
-reminder comment.
-
-
-As for casefiddle.c, do_casify_unibyte_region and
-do_casify_multibyte_region modifies buffer, but they are static
-functions and are called by casify_region, which calls
-treesit_record_change.  Other higher-level functions calls
-casify_region to do the work.

admin/notes/unicode

@@ -1,6 +1,6 @@
                                             -*-mode: text; coding: utf-8;-*-
 
-Copyright (C) 2002-2023 Free Software Foundation, Inc.
+Copyright (C) 2002-2017 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 Importing a new Unicode Standard version into Emacs
@@ -11,38 +11,14 @@ Emacs uses the following files from the Unicode Character Database
 
   . UnicodeData.txt
   . Blocks.txt
-  . BidiBrackets.txt
   . BidiMirroring.txt
+  . BidiBrackets.txt
   . IVD_Sequences.txt
   . NormalizationTest.txt
-  . PropertyValueAliases.txt
-  . ScriptExtensions.txt
-  . Scripts.txt
-  . SpecialCasing.txt
-  . confusables.txt
-  . emoji-data.txt
-  . emoji-zwj-sequences.txt
-  . emoji-sequences.txt
   . BidiCharacterTest.txt
 
-Emacs also uses the file emoji-test.txt which should be imported from
-the Unicode's Public/emoji/ directory, and IdnaMappingTable.txt from
-the Public/idna/ directory.
-
-First, the first 14 files, emoji-test.txt and IdnaMappingTable.txt
-need to be copied into admin/unidata/, and the file
-https://www.unicode.org/copyright.html should be copied over
-copyright.html in admin/unidata (some of them might need trailing
-whitespace removed before they can be committed to the Emacs
-repository).
-
-Next, review the assignment of default values of the Bidi Class
-property to blocks in the file extracted/DerivedBidiClass.txt from the
-UCD (search for "unassigned" in that file).  Any changes should be
-reflected in the unidata-gen.el file, where it sets up the default
-values around line 210.
-
-Then Emacs should be rebuilt for them to take effect.  Rebuilding
+First, the first 6 files need to be copied into admin/unidata/, and
+then Emacs should be rebuilt for them to take effect.  Rebuilding
 Emacs updates several derived files elsewhere in the Emacs source
 tree, mainly in lisp/international/.
 
@@ -51,10 +27,7 @@ files, pay attention to any warning or error messages.  In particular,
 admin/unidata/unidata-gen.el will complain if UnicodeData.txt defines
 new bidirectional attributes of characters, because unidata-gen.el,
 bidi.c and dispextern.h need to be updated in that case; failure to do
-so will cause aborts in redisplay.  unidata-gen.el will also complain
-if the format of the Unicode Copyright notice in copyright.html
-changed in significant ways; in that case, update the regular
-expression in unidata-gen-file used to extract the copyright string.
+so will cause aborts in redisplay.
 
 Next, review the changes in UnicodeData.txt vs the previous version
 used by Emacs.  Any changes, be it introduction of new scripts or
@@ -66,23 +39,15 @@ and see if any changes in admin/unidata/blocks.awk are required.
 
 The setting of char-width-table around line 1200 of characters.el
 should be checked against the latest version of the Unicode file
-EastAsianWidth.txt, and any discrepancies fixed: double-width
-characters are those marked with W or F in that file.  Zero-width
-characters are not taken from EastAsianWidth.txt, they are those whose
-Unicode General Category property is one of Mn, Me, or Cf, and also
-Hangul jungseong and jongseong characters (a.k.a. "Jamo medial vowels"
-and "Jamo final consonants").
+EastAsianWidth.txt, and any discrepancies fixed.
 
 Any new scripts added by UnicodeData.txt will also need updates to
 script-representative-chars defined in fontset.el, and also the list
 of OTF script tags in otf-script-alist, whose source is on this page:
 
-  https://docs.microsoft.com/en-us/typography/opentype/spec/scripttags
+  https://www.microsoft.com/typography/otspec/scripttags.htm
 
 Other databases in fontset.el might also need to be updated as needed.
-One notable place to check is the function setup-default-fontset,
-where new scripts will generally need some addition, most probably to
-the list of "simple" scripts (search for "Simple").
 
 The function 'ucs-names', defined in lisp/international/mule-cmds.el,
 might need to be updated because it knows about used and unused ranges
@@ -99,51 +64,7 @@ regarding failing lines.
 
 The file BidiCharacterTest.txt should be copied to the test suite, and
 if its format has changed, the file biditest.el there should be
-modified to follow suit.  If there's trailing whitespace in
-BidiCharacterTest.txt, it should be removed before committing the new
-version.
-
-src/macuvs.h is a generated file, but if it has changed as a result
-of the updates, please commit it as well (see
-admin/unidata/Makefile.in for an explanation).
-
-Visit "emoji-data.txt" with the rebuilt Emacs, and check that an
-appropriate font is being used for the emoji (by default Emacs uses
-"Noto Color Emoji").  Running the following command in that buffer
-will give you an idea of which codepoints are not supported by
-whichever font Emacs is using.
-
-(defun check-emoji-coverage (font-name-regexp)
-"Display a buffer containing emoji codepoints for which FONT-NAME is not used.
-This must be run from a buffer in the format of emoji-data.txt.
-FONT-NAME-REGEXP is checked using `string-match'."
-(interactive "MFont Name: ")
-(save-excursion
-(goto-char (point-min))
-(let (res char name ifont)
-  (while (re-search-forward "; Emoji_Presentation [^(]+(\\(.\\)[).]" nil t)
-    (setq char (aref (match-string 1) 0))
-    (setq ifont (car (internal-char-font nil char)))
-    (when ifont
-      (setq name (font-xlfd-name ifont)))
-    (if (or (not ifont) (not (string-match font-name-regexp name)))
-        (setq res (concat (string char) res))))
-  (when res
-    (with-output-to-temp-buffer "*Check-Emoji-Coverage*"
-      (princ (format "Font not matching '%s' was used for the following characters:\n%s"
-                     font-name-regexp (reverse res))))))))
-
-Visit "emoji-zwj-sequences.txt" and "emoji-sequences.txt" with the
-rebuilt Emacs, and check that the sample sequences are composed
-properly.  Also check the Unicode style chart file available at
-https://unicode.org/emoji/charts/emoji-style.txt for any issues
-involving VS-15 and VS-16, if so you may need to update the value
-generated for auto-composition-emoji-eligible-codepoints by
-admin/unidata/emoji-zwj.awk.  Note that your emoji font might not have
-glyphs for the newest codepoints yet.
-
-Finally, etc/NEWS should be updated to announce the support for the
-new Unicode version.
+modified to follow suit.
 
 Problems, fixmes and other unicode-related issues
 -------------------------------------------------------------
@@ -163,7 +84,7 @@ regard to completeness.
 	code (keymap.c and print.c).
 
  * Rationalize character syntax and its relationship to the Unicode
-   database.  (Applies mainly to symbol and punctuation syntax.)
+   database.  (Applies mainly to symbol an punctuation syntax.)
 
  * Fontset handling and customization needs work.  We want to relate
    fonts to scripts, probably based on the Unicode blocks.  The
@@ -308,15 +229,36 @@ nontrivial changes to the build process.
 
 	admin/charsets/mapfiles/cns2ucsdkw.txt
 
- * iso-2022-jp
+ * iso-2022-7bit
 
-     This contains just one CJK charset, but Emacs currently has no
-     easy way to specify set-charset-priority on a per-file basis, so
-     converting this file to UTF-8 might change the file's appearance
-     when viewed by an Emacs that is operating in some other language
-     environment.
+     This file switches between CJK charsets, which is not encoded in UTF-8.
+
+	etc/HELLO
+
+     Each of these files contains just one CJK charset, but Emacs
+     currently has no easy way to specify set-charset-priority on a
+     per-file basis, so converting any of these files to UTF-8 might
+     change the file's appearance when viewed by an Emacs that is
+     operating in some other language environment.
 
 	etc/tutorials/TUTORIAL.ja
+	lisp/international/ja-dic-cnv.el
+	lisp/international/ja-dic-utl.el
+	lisp/international/kinsoku.el
+	lisp/international/kkc.el
+	lisp/international/titdic-cnv.el
+	lisp/language/japan-util.el
+	lisp/language/japanese.el
+	lisp/leim/quail/cyril-jis.el
+	lisp/leim/quail/hanja-jis.el
+	lisp/leim/quail/japanese.el
+	lisp/leim/quail/py-punct.el
+	lisp/leim/quail/pypunct-b5.el
+
+     This file contains just Chinese characters, and has same problem.
+     Also, it contains characters that cannot be encoded in UTF-8.
+
+	lisp/international/titdic-cnv.el
 
  * utf-8-emacs
 
@@ -329,7 +271,6 @@ nontrivial changes to the build process.
 	lisp/language/tibetan.el
 	lisp/leim/quail/ethiopic.el
 	lisp/leim/quail/tibetan.el
-	lisp/international/titdic-cnv.el
 
  * binary files
 
@@ -364,4 +305,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.

admin/notes/versioning

@@ -1,6 +1,6 @@
 GNU EMACS VERSIONING                                   -*- org -*-
 
-Ref: https://lists.gnu.org/r/emacs-devel/2014-09/msg00872.html
+Ref: http://lists.gnu.org/archive/html/emacs-devel/2014-09/msg00872.html
 
 Emacs version numbers have the form
 
@@ -27,3 +27,4 @@ unexpected last-minute problem occurs.
 The development version for a new major release has "minor" = 0.
 The development version for a new minor release has "minor" = that of
 the previous release.
+

admin/notes/www

@@ -1,33 +1,10 @@
 -*- outline -*-
 
-Copyright (C) 2013-2023 Free Software Foundation, Inc.
+Copyright (C) 2013-2017 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 NOTES FOR EMACS WWW PAGES
 
-* Access
-
-Anyone with write access to the Emacs code repository has the same
-access to the web pages.  See <https://savannah.gnu.org/cvs/?group=emacs>
-for instructions.  After you commit a change to the CVS repository,
-it normally appears automatically on www.gnu.org within a few minutes.
-The basic procedure is:
-
-Initial checkout:
-cvs -z3 -d:ext:<membername>@cvs.savannah.gnu.org:/web/emacs co emacs
-
-Update from repository:
-cvs up -dP
-
-You can use Emacs's VC mode to commit files without having to worry
-about knowing CVS syntax.  You may find M-x cvs-examine a useful,
-more specialized, alternative to M-x vc-dir.
-
-* Manual pages
-
-The scripts admin/make-manuals, admin/upload-manuals can be used to do
-a complete update of the on-line manual pages (e.g. after a release).
-
 * Renaming pages, redirects
 
 Sometimes you want to move a page to a new location.
@@ -87,21 +64,6 @@ work; see manual/.htaccess in the repository.  You only have to add a
 single redirect for every given external manual, you can redirect
 html_node to hmtl_node and html_mono to html_mono.
 
-* Why CVS?
-
-Savannah supports other VCS, and no-one is especially attached to CVS.
-Rather, CVS is the only supported mechanism for getting the changes
-onto www.gnu.org.  See eg
-https://lists.gnu.org/r/bug-gnulib/2012-12/msg00072.html
-
-* CVS alternatives
-
-To use something other than CVS, convert the web-pages CVS repository
-to the other VCS, then set up a two-way sync between them.
-It needs to be two-way in case eg GNU webmasters make a change to the CVS.
-Ref e.g.
-https://github.com/mikjo/bigitr
-https://lists.gnu.org/r/savannah-hackers-public/2013-04/msg00022.html
 
 
 This file is part of GNU Emacs.
@@ -117,4 +79,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.

admin/notes/years

@@ -3,38 +3,7 @@ HOW TO MAINTAIN COPYRIGHT YEARS FOR GNU EMACS
 Maintaining copyright years is now very simple: every time a new year
 rolls around, add that year to every FSF (and AIST) copyright notice.
 Do this by running the 'admin/update-copyright' script on a fresh repo
-checkout, redirecting its output to a file, so that you could later
-examine the files that don't have copyright notices.  Inspect the
-results for plausibility, then commit them.
-
-A few known problems with the build-aux/update-copyright script:
-
-  . it doesn't update config.bat, msdos/depfiles.bat,
-    nt/configure.bat, etc/tutorials/TUTORIAL.cn,
-    etc/tutorials/TUTORIAL.el_GR, and etc/tutorials/TUTORIAL.he
-    because the "Copyright" statement begins in these files
-    after a prefix that is more than 5 characters long
-  . it doesn't update etc/tutorials/TUTORIAL.nl and
-    etc/tutorials/TUTORIAL.ro for some reason
-  . it doesn't update the second Copyright notice, the one that gets
-    output into PDF and PS, in etc/refcards/ru-refcard.tex
-  . it doesn't update etc/refcards/gnus-refcard.tex and
-    doc/misc/org.org because their Copyright statements have a
-    non-standard format
-  . several README and XPM files under etc/images/, and also
-    etc/refcards/README, msdos/README, and nt/icons/README aren't
-    updated either
-
-These files need to be updated by hand.
-
-Next, run "M-x set-copyright" from admin.el, which updates several
-copyright notices in the Emacs sources.
-
-You should also run the etags test suite in test/manual/etags/.  It
-will most probably fail because the contents of the test files changes
-due to copyright years update, so you need to move each ETAGS and
-CTAGS file produced by the test runs into the corresponding
-ETAGS.good* and CTAGS.good files, and then commit the new test files.
+checkout.  Inspect the results for plausibility, then commit them.
 
 There's no need to worry about whether an individual file has changed
 in a given year - it's sufficient that Emacs as a whole has changed.
@@ -68,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/r/emacs-pretest-bug/2006-12/msg00119.html>
+<http://lists.gnu.org/archive/html/emacs-pretest-bug/2006-12/msg00119.html>

admin/nt/README-UNDUMP.W32

@@ -1,4 +1,4 @@
-Copyright (C) 2001-2023 Free Software Foundation, Inc.
+Copyright (C) 2001-2017 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 			   Emacs for Windows
@@ -7,7 +7,7 @@ This README file describes how to dump a bare precompiled version of
 GNU Emacs for Windows.  This barebin distribution supplements the
 standard distribution of Emacs, which you can download from:
 
-	https://ftp.gnu.org/gnu/emacs/
+	ftp://ftp.gnu.org/gnu/emacs/
 
 If you do not have the "bin" or "src" distribution, then you will need
 to download one of those before you can use this barebin version.
@@ -55,4 +55,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.

admin/nt/README-ftp-server

@@ -0,0 +1,277 @@
+Copyright (C) 2001-2017 Free Software Foundation, Inc.
+See the end of the file for license conditions.
+
+		      Precompiled Distributions of
+			   Emacs for Windows
+
+			    Version 24.3
+
+                           March 18, 2013
+
+  This directory contains precompiled distributions for GNU Emacs on
+  Windows (versions before Windows 95 and NT4 are not supported).
+  This port is a part of the standard GNU Emacs distribution from the
+  Free Software Foundation; the precompiled distributions are provided
+  here for convenience since the majority of Windows users are not
+  accustomed to compiling programs themselves.  Corresponding source
+  can be found in the parent directory in emacs-24.3.tar.gz.
+
+* IMPORTANT LEGAL REMINDER
+
+  If you want to redistribute any of the precompiled distributions of
+  Emacs, be careful to check the implications of the GPL.  For instance,
+  if you put the emacs-24.3-bin-i386.zip file from this directory on
+  an Internet site, you must arrange to distribute the source files of
+  the SAME version (i.e. ../emacs-24.3.tar.gz).
+
+  Making a link to our copy of the source is NOT sufficient, since we
+  might upgrade to a new version while you are still distributing the
+  old binaries.
+
+
+* Files in this directory
+
+  + emacs-24.3-bin-i386.zip
+    Windows binaries of Emacs-24.3, with all lisp code and documentation
+    included.
+
+    Download this file if you want a single installation package, and
+    are not interested in the C source code for Emacs. After
+    unpacking, you can optionally run the file bin/addpm.exe to have
+    Emacs add icons to the Start Menu.
+
+    If you need the C source code at a later date, it will be safe to
+    unpack the source distribution on top of this installation.
+
+  + libXpm-3.5.8-w32-src.zip
+    Source code required to compile libXpm-3.5.8 on Windows. Contains
+    a basic Makefile for compiling with mingw32 and a .def file for
+    generating a DLL with the appropriate exports in addition to the
+    source code to provide the subset of functionality Emacs uses from
+    libXpm. This corresponds to the libXpm.dll in emacs-24.3-bin-i386.zip.
+
+* Prerequisites for running Emacs on Windows 9X
+
+  Using Emacs in GUI mode on Windows 95/98/Me requires the UNICOWS.DLL
+  dynamic library, which provides MSLU, the Microsoft Unicode Layer
+  for Windows 9X.  You can freely download it from the Microsoft site.
+
+* Image support
+
+  Emacs 24.3 contains support for images, however for most image
+  formats supporting libraries are required.  This distribution has
+  been tested with the libraries that are distributed with GTK for
+  Windows (http://www.gtk.org/download/win32.php), and the libraries
+  found at http://gnuwin32.sourceforge.net/. The following image
+  formats are supported:
+
+      PBM/PGM/PPM: Supported natively by Emacs. This format is used for
+      the black and white versions of the toolbar icons.
+
+      XPM: a Windows port of the XPM library corresponding to the x.org
+      release of X11R7.3 is included with the binary distribution, but
+      can be replaced by other versions with the name xpm4.dll,
+      libxpm-nox4.dll or libxpm.dll.
+
+      PNG: requires the PNG reference library 1.4 or later, which will
+      be named libpng14.dll or libpng14-14.dll.  LibPNG requires zlib,
+      which should come from the same source as you got libpng.
+      Starting with Emacs 23.3, the precompiled Emacs binaries are
+      built with libpng 1.4.x and later, and are incompatible with
+      earlier versions of libpng DLLs.  So if you have libpng 1.2.x,
+      the PNG support will not work, and you will have to download
+      newer versions.
+
+      JPEG: requires the Independent JPEG Group's libjpeg 6b or later,
+      which will be called jpeg62.dll, libjpeg.dll, jpeg-62.dll or jpeg.dll.
+
+      TIFF: requires libTIFF 3.0 or later, which will be called libtiff3.dll
+      or libtiff.dll.
+
+      GIF: requires libungif or giflib 4.1 or later, which will be
+      called giflib4.dll, libungif4.dll or libungif.dll.
+
+      SVG: not compiled into the binary release, but available if you
+      compile Emacs yourself if you have development packages for all the
+      dependencies. Requires many libraries from GTK and Gnome
+      as well as the base librsvg library. Known to crash Emacs on many
+      sample images.
+
+* XML support
+
+  In order to support XML via libxml2 at runtime, a libxml2-enabled
+  Emacs must be able to find the relevant DLLs during startup; failure
+  to do so is not an error, but libxml2 features won't be available to
+  the running session.
+
+  You can get pre-built binaries (including any required DLL and the
+  header files) at http://sourceforge.net/projects/ezwinports/files/.
+
+* Distributions in .tar.gz and .zip format
+
+  Emacs is distributed primarily as source code in a large gzipped tar
+  file (*.tar.gz).  Because Emacs is quite large and therefore
+  difficult to download over unreliable connections, the Windows
+  binaries are provided in two combinations. The complete lisp source
+  plus executables (bin), and executables only (barebin) for unpacking
+  over the top of the source distribution.  Formerly, we used the same
+  .tar.gz format but since there are no longer legal problems with
+  .zip files, and the latest versions of Windows support these
+  natively, the Windows binaries of Emacs are now distributed as .zip
+  files.
+
+* Distributions for non-x86 platforms
+
+  Distributions for non-x86 platforms are no longer supplied. Older
+  platforms supported by Windows NT no longer seem to be in demand,
+  and Emacs is yet to be ported to 64 bit Windows platforms. If you
+  are willing to help port Emacs 24 to 64 bit versions of Windows,
+  your contribution will be welcome on the emacs-devel mailing list.
+
+* Unpacking distributions
+
+  Ports of GNU gzip and GNU tar for handling the source distribution file
+  format can be found in several places that distribute ports of GNU
+  programs, for example:
+
+    Cygwin:   http://www.cygwin.com/
+    GnuWin32: http://gnuwin32.sourceforge.net/
+
+  Many other popular file compression utilities for Windows are also
+  able to handle gzipped tar files. 7zip is one free Windows graphical
+  program that is able to handle many archive formats.
+
+  Open a command prompt (MSDOS) window.  Decide on a directory in which
+  to place Emacs.  Move the distribution to that directory, and then
+  unpack it as follows.
+
+  If you have the gzipped tar version, use gunzip to uncompress the tar
+  file on the fly, and pipe the output through tar with the "xvf" flags
+  to extract the files from the tar file:
+
+    % gunzip -c some.tar.gz | tar xvf -
+
+  You may see messages from tar about not being able to change the
+  modification time on directories, and from gunzip complaining about a
+  broken pipe.  These messages are harmless and you can ignore them.  On
+  Windows NT, unpacking tarballs this way leaves them in compressed
+  form, taking up less space on disk.  Unfortunately, on Windows 95 and
+  98, a large temporary file is created, so it is better to use the
+  djtarnt.exe program, which performs the equivalent operation in one
+  step:
+
+    % djtarnt -x some.tar.gz
+
+  You may be prompted to rename or overwrite directories when using
+  djtarnt: simply type return to continue (this is harmless).
+
+  Zip files can be unpacked using unzip.exe from info-zip.org
+  if you do not already have other tools to do this.
+
+    % unzip some.zip
+
+  The precompiled binaries can be unpacked using unzip.exe from info-zip.org
+  if you do not already have other tools to do this.
+
+    % unzip some.zip
+
+  Once you have unpacked a precompiled distribution of Emacs, it should
+  have the following subdirectories:
+
+	bin	etc	info	lisp	site-lisp
+
+
+* Unpacking with other tools
+
+  If you do use other utility programs to unpack the distribution, check
+  the following to be sure the distribution was not corrupted:
+
+  + Be sure to disable the CR/LF translation or the executables will
+    be unusable.  Older versions of WinZip would enable this
+    translation by default when unpacking .tar files.  If you are
+    using WinZip, disable it.  (I don't have WinZip myself, and I do
+    not know the specific commands necessary to disable it.)
+
+  + Check that filenames were not truncated to 8.3.  For example, there
+    should be a file lisp/abbrevlist.el; if this has been truncated to
+    abbrevli.el, your distribution has been corrupted while unpacking
+    and Emacs will not start.
+
+  + Check that filenames were not changed by your web-browser.  Some
+    proprietary web-browsers save .tar.gz files as .tar.tar. You might
+    like to consider switching to a Free modern browser if your browser
+    has this bug.
+
+  + I've also had reports that some older "gnuwin32" port of tar
+    corrupts the executables.  Use the latest version from the gnuwin32
+    site or another port of tar instead.
+
+  If you believe you have unpacked the distributions correctly and are
+  still encountering problems, see the section on Further Information
+  below.
+
+
+* Compiling from source
+
+  If you would like to compile Emacs from source, download the source
+  distribution, unpack it in the same manner as a precompiled
+  distribution, and look in the file nt/INSTALL for detailed
+  directions.  It is recommended to use GCC 2.95 or later with MinGW
+  support to compile the source.  The port of GCC included in Cygwin
+  is supported, but check the nt/INSTALL file if you have trouble
+  since some builds of GNU make aren't supported.
+
+
+* Further information
+
+  The Emacs on MS Windows FAQ is distributed with Emacs (info
+  manual "efaq-w32"), and at
+
+	http://www.gnu.org/software/emacs/manual/efaq-w32.html
+
+  In addition to the FAQ, there is a mailing list for discussing issues
+  related to the Windows port of Emacs.  For information about the
+  list, see this Web page:
+
+	http://lists.gnu.org/mailman/listinfo/help-emacs-windows
+
+  To ask questions on the mailing list, send email to
+  help-emacs-windows@gnu.org.  (You don't need to subscribe for that.)
+  To subscribe to the list or unsubscribe from it, fill the form you
+  find at http://mail.gnu.org/mailman/listinfo/help-emacs-windows as
+  explained there.
+
+  Another valuable source of information and help which should not be
+  overlooked is the various Usenet news groups dedicated to Emacs.
+  These are particularly good for help with general issues which aren't
+  specific to the Windows port of Emacs.  The main news groups to use
+  for seeking help are:
+
+	gnu.emacs.help
+	comp.emacs
+
+  There are also fairly regular postings and announcements of new or
+  updated Emacs packages on this group:
+
+	gnu.emacs.sources
+
+  Enjoy!
+
+  Most of this README was contributed by former maintainers Andrew Innes
+  (andrewi@gnu.org) and Jason Rumney (jasonr@gnu.org).
+
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs.  If not, see http://www.gnu.org/licenses/.

admin/nt/dist-build/README-scripts

@@ -1,144 +0,0 @@
-Distribution Build Scripts for Windows
-======================================
-
-The scripts are used to build the binary distribution zip files for windows.
-
-Environment
------------
-
-A full installation of msys2 is required along for the build. The
-various dependencies of Emacs need to be installed also. These change
-over time, but are listed in build-deps-zips.py.
-
-
-
-File System Organization
-------------------------
-
-
-They are relatively strict about the file system organization. In
-general, they should work across several more than just the version of
-Emacs they come with, as the dependencies of Emacs change relatively slowly.
-
-The file system needs to be organized like so:
-
-~/emacs-build/git
-
-Contains checkouts and worktrees of the Emacs git repository,
-organized according to branches.
-
-~/emacs-build/git/master
-
-A checkout out of the master branch of the Emacs git repository.
-
-~/emacs-build/git/emacs-$major-version
-
-A worktree of the git repository containing the current release
-branch. This has to be created by hand.
-
-~/emacs-build/git/emacs-$release-version
-
-A branch of the git repository containing the last release. The
-build-zips.sh file will create this for you.
-
-~/emacs-build/deps
-
-A location for the dependencies. This needs to contain two zip files
-with the dependencies. build-dep-zips.py will create these files for you.
-
-~/emacs-build/deps/libXpm
-
-Contain libXpm-noX4.dll. This file is used to load images for the
-splash screen, menu items and so on. Emacs runs without it, but looks
-horrible. The files came original from msys2, and contains no
-dependencies. It has to be placed manually (but probably never
-need updating).
-
-~/emacs-build/build/$version
-
-We build Emacs out-of-source here. This directory is created by
-build-zips.sh. This directory can be freely deleted after zips have
-been created
-
-~/emacs-build/install/$version
-
-We install Emacs here. This directory is created by build-zips.sh.
-This directory can and *should* be deleted after zips have been
-created.
-
-~/emacs-upload
-
-Zips are created and moved here from where they can be, well,
-uploaded.
-
-
-
-Build Process
--------------
-
-
-### For each major version
-
-The dependencies files need to be created. This can be around the time
-of the pre-tests, then used for all releases of that version, to
-ensure the maximum stability.
-
-To do this:
-
-Update msys to the latest version with `pacman -Syu`.
-
-Then run build-dep-zips.py, in the ~/emacs-build/deps directory. Two
-zips will be created, containing the dependencies, as well as the
-source for these.
-
-For emacs release or pre-test version:
-
-Run `build-zips.sh -g` in the release branch. This will create a worktree
-with the tag of the last version.
-
-Then run `build-zips.sh` in this worktree. Eventually, four new zip
-files will be created in ~/emacs-upload from where they can be signed
-and uploaded with `gnupload`.
-
-
-### For snapshots from Master
-
-Snapshots are generally created from master when there is a release
-branch on which a release has already been created. At this point,
-only pre-tests or full releases need to happen from the release
-branch.
-
-To do this:
-
-Update msys to the latest version with `pacman -Syu`.
-
-Then run build-dep-zips.py, in ~/emacs-build/deps directory. Two zips
-will be created, containing the dependencies, as well as the source
-for these. These deps files contain the date of creation in their
-name. The deps file can be reused as desired, or a new version
-created. Where multiple deps files exist, the most recent will be
-used.
-
-Now, run `build-zips.sh -s` to build a snapshot release.
-
-
-### For snapshots from a Release Branch
-
-Snapshots can be built from a release branch; this is really only
-useful before a pre-test has happened.
-
-The process is the same as for building from the master branch, except
-that the release branch should already exist as a worktree, and the
-version number must be added to the command line with `build-zips.sh
--V 27 -s`.  The final zips will be named after the branch rather than
-the version (e.g emacs-27-2019-12-26.zip) rather than the Emacs
-version (e.g emacs-27.0.50.zip).
-
-
-### For snapshots from another branch
-
-Snapshots can be build from any other branch.  There is rarely a need
-to do this, except where some significant, wide-ranging feature is
-being added on a feature branch.  In this case, the branch can be
-given using `build-zips.sh -b pdumper -s` for example. Any "/"
-characters in the branch title are replaced.

admin/nt/dist-build/README-windows-binaries

@@ -1,94 +0,0 @@
-Copyright (C) 2001-2023 Free Software Foundation, Inc.
-See the end of the file for license conditions.
-
-		      Precompiled Distributions of
-			   Emacs for Windows
-
-                           Jan 14, 2021
-
-  This directory contains precompiled distributions for GNU Emacs on
-  Windows
-
-IMPORTANT LEGAL REMINDER
-========================
-
-If you want to redistribute any of the precompiled distributions of
-Emacs, be careful to check the implications of the GPL.  For instance,
-if you put the compiled file from this directory on an Internet site,
-you must arrange to distribute the source files of the SAME version.
-
-Making a link to our copy of the source is NOT sufficient, since we
-might upgrade to a new version while you are still distributing the
-old binaries.
-
-
-Windows Binaries
-================
-
-Currently, we provide three different binary packages for Emacs, which
-are:
-
-emacs-$VERSION-installer.exe
-
-Contains Emacs with dependencies as an installer
-package.  Mostly, this is the best one to install.
-
-emacs-$VERSION.zip
-
-Contains Emacs with dependencies.  This contains the same files as the
-installer but as a zip file which some users may prefer.
-
-emacs-$VERSION-no-deps.zip
-
-Contains Emacs without any dependencies. This may be useful if you
-wish to install where the dependencies are already available, or if
-you want the small possible Emacs.
-
-In addition, we provide the following files which will not be useful
-for most end-users.
-
-emacs-$VERSION-deps.zip
-
-The dependencies. Unzipping this file on top of
-emacs-$VERSION-no-deps.zip should result in the same install as
-emacs-$VERSION.zip.
-
-emacs-$VERSION-deps-mingw-w64-src.zip
-
-The source for the dependencies.  Source for Emacs itself is available
-in the main distribution tarball.  These dependencies were produced
-from an updated msys2 at the point of the first pre-test.  It is not
-intended that these will be updated after that point.
-
-Source for Emacs itself is found in the directory above.
-
-Snapshots
-=========
-
-We also distribute "snapshots" of Emacs built at points throughout the
-development cycle, for those interested in following this cycle.  They
-are not recommended for normal users; however, they are useful for
-people who want to report bugs against the current master.
-
-The files follow the same naming convention, but also include a date
-(and sometimes information about their branch).  The Emacs source at
-the time of these builds is also distributed.
-
-
-LICENSE
-======
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see https://www.gnu.org/licenses/.

admin/nt/dist-build/build-dep-zips.py

@@ -1,276 +0,0 @@
-#!/usr/bin/python3
-
-## Copyright (C) 2017-2023 Free Software Foundation, Inc.
-
-## This file is part of GNU Emacs.
-
-## GNU Emacs is free software: you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation, either version 3 of the License, or
-## (at your option) any later version.
-
-## GNU Emacs is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-
-## You should have received a copy of the GNU General Public License
-## along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
-import argparse
-import os
-import shutil
-import re
-import functools
-import operator
-
-from subprocess import check_output
-
-## Constants
-EMACS_MAJOR_VERSION="28"
-
-# This list derives from the features we want Emacs to compile with.
-PKG_REQ='''mingw-w64-x86_64-giflib
-mingw-w64-x86_64-gnutls
-mingw-w64-x86_64-harfbuzz
-mingw-w64-x86_64-jansson
-mingw-w64-x86_64-lcms2
-mingw-w64-x86_64-libjpeg-turbo
-mingw-w64-x86_64-libpng
-mingw-w64-x86_64-librsvg
-mingw-w64-x86_64-libtiff
-mingw-w64-x86_64-libxml2
-mingw-w64-x86_64-xpm-nox'''.split()
-
-DLL_REQ='''libgif
-libgnutls
-libharfbuzz
-libjansson
-liblcms2
-libturbojpeg
-libpng
-librsvg
-libtiff
-libxml
-libXpm'''.split()
-
-
-## Options
-DRY_RUN=False
-
-
-def check_output_maybe(*args,**kwargs):
-    if(DRY_RUN):
-        print("Calling: {}{}".format(args,kwargs))
-    else:
-        return check_output(*args,**kwargs)
-
-## DLL Capture
-def gather_deps():
-
-    os.mkdir("x86_64")
-    os.chdir("x86_64")
-
-    for dep in full_dll_dependency():
-        check_output_maybe(["cp /mingw64/bin/{}*.dll .".format(dep)],
-                           shell=True)
-
-    print("Zipping")
-    check_output_maybe("zip -9r ../emacs-{}-{}deps.zip *"
-                       .format(EMACS_MAJOR_VERSION, DATE),
-                       shell=True)
-    os.chdir("../")
-
-## Return all Emacs dependencies
-def full_dll_dependency():
-    deps = [dll_dependency(dep) for dep in DLL_REQ]
-    return set(sum(deps, []) + DLL_REQ)
-
-## Dependencies for a given DLL
-def dll_dependency(dll):
-    output = check_output(["/mingw64/bin/ntldd", "--recursive",
-                           "/mingw64/bin/{}*.dll".format(dll)]).decode("utf-8")
-    ## munge output
-    return ntldd_munge(output)
-
-def ntldd_munge(out):
-    deps = out.splitlines()
-    rtn = []
-    for dep in deps:
-        ## Output looks something like this
-
-        ## KERNEL32.dll => C:\Windows\SYSTEM32\KERNEL32.dll (0x0000000002a30000)
-        ## libwinpthread-1.dll => C:\msys64\mingw64\bin\libwinpthread-1.dll (0x0000000000090000)
-
-        ## if it's the former, we want it, if its the later we don't
-        splt = dep.split()
-        if len(splt) > 2 and "msys64" in splt[2]:
-            print("Adding dep", splt[0])
-            rtn.append(splt[0].split(".")[0])
-
-    return rtn
-
-#### Source Capture
-
-## Packages to fiddle with
-## Source for gcc-libs is part of gcc
-SKIP_SRC_PKGS=["mingw-w64-gcc-libs"]
-SKIP_DEP_PKGS=frozenset(["mingw-w64-x86_64-glib2"])
-MUNGE_SRC_PKGS={"mingw-w64-libwinpthread-git":"mingw-w64-winpthreads-git"}
-MUNGE_DEP_PKGS={
-    "mingw-w64-x86_64-libwinpthread":"mingw-w64-x86_64-libwinpthread-git",
-    "mingw-w64-x86_64-libtre": "mingw-w64-x86_64-libtre-git",
-}
-
-## Currently no packages seem to require this!
-ARCH_PKGS=[]
-SRC_REPO="https://repo.msys2.org/mingw/sources"
-
-
-def immediate_deps(pkgs):
-    package_info = check_output(["pacman", "-Si"] + pkgs).decode("utf-8").splitlines()
-
-    ## Extract the packages listed for "Depends On:" lines.
-    dependencies = [line.split(":")[1].split() for line in package_info
-                    if line.startswith("Depends On")]
-    ## Flatten dependency lists from multiple packages into one list.
-    dependencies = functools.reduce(operator.iconcat, dependencies, [])
-
-    ## Remove > signs TODO can we get any other punctuation here?
-    dependencies = [d.split(">")[0] for d in dependencies if d]
-    dependencies = [d for d in dependencies if not d == "None"]
-
-    dependencies = [MUNGE_DEP_PKGS.get(d, d) for d in dependencies]
-    return dependencies
-
-
-## Extract all the msys2 packages that are dependencies of our direct dependencies
-def extract_deps():
-
-    print( "Extracting deps" )
-
-    # Get a list of all dependencies needed for packages mentioned above.
-    pkgs = set(PKG_REQ)
-    newdeps = pkgs
-    print("adding...")
-    while True:
-        subdeps = frozenset(immediate_deps(list(newdeps)))
-        newdeps = subdeps - SKIP_DEP_PKGS - pkgs
-        if not newdeps:
-            break
-        print('\n'.join(newdeps))
-        pkgs |= newdeps
-
-    return list(pkgs)
-
-
-def download_source(tarball):
-    print("Acquiring {}...".format(tarball))
-
-    if not os.path.exists("../emacs-src-cache/{}".format(tarball)):
-        print("Downloading {}...".format(tarball))
-        check_output_maybe(
-            "wget -a ../download.log -O ../emacs-src-cache/{} {}/{}"
-            .format(tarball, SRC_REPO, tarball),
-            shell=True
-        )
-        print("Downloading {}... done".format(tarball))
-
-    print("Copying {} from local".format(tarball))
-    shutil.copyfile("../emacs-src-cache/{}".format(tarball),
-                    "{}".format(tarball))
-
-
-## Fetch all the source code
-def gather_source(deps):
-
-    if not os.path.exists("emacs-src-cache"):
-        os.mkdir("emacs-src-cache")
-
-    os.mkdir("emacs-src")
-    os.chdir("emacs-src")
-
-    for pkg in deps:
-        pkg_name_and_version= \
-            check_output(["pacman","-Q", pkg]).decode("utf-8").strip()
-
-        ## Produces output like:
-        ## mingw-w64-x86_64-zlib 2.43.2
-        pkg_name_components = pkg_name_and_version.split()
-        pkg_name=pkg_name_components[0]
-        pkg_version=pkg_name_components[1]
-
-        ## source pkgs don't have an architecture in them
-        pkg_name = re.sub(r"x86_64-","",pkg_name)
-
-        if(pkg_name in SKIP_SRC_PKGS):
-            continue
-
-        ## Switch names if necessary
-        pkg_name = MUNGE_SRC_PKGS.get(pkg_name,pkg_name)
-
-        tarball = "{}-{}.src.tar.gz".format(pkg_name,pkg_version)
-
-        download_source(tarball)
-
-    print("Zipping")
-    check_output_maybe("zip -9 ../emacs-{}-{}deps-mingw-w64-src.zip *"
-                       .format(EMACS_MAJOR_VERSION,DATE),
-                       shell=True)
-
-    os.chdir("..")
-
-
-def clean():
-    print("Cleaning")
-    os.path.isdir("emacs-src") and shutil.rmtree("emacs-src")
-    os.path.isdir("x86_64") and shutil.rmtree("x86_64")
-    os.path.isfile("download.log") and os.remove("download.log")
-
-
-if(os.environ["MSYSTEM"] != "MSYS"):
-    print("Run this script in an MSYS-shell!")
-    exit(1)
-
-
-parser = argparse.ArgumentParser()
-parser.add_argument("-s", help="snapshot build",
-                    action="store_true")
-
-parser.add_argument("-r", help="source code only",
-                    action="store_true")
-
-parser.add_argument("-c", help="clean only",
-                    action="store_true")
-
-parser.add_argument("-d", help="dry run",
-                    action="store_true")
-
-parser.add_argument("-l", help="list dependencies only",
-                    action="store_true")
-
-args = parser.parse_args()
-do_all=not (args.c or args.r)
-
-
-
-DRY_RUN=args.d
-
-if( args.l ):
-    print("List of dependencies")
-    print( deps )
-    exit(0)
-
-if args.s:
-    DATE="{}-".format(check_output(["date", "+%Y-%m-%d"]).decode("utf-8").strip())
-else:
-    DATE=""
-
-if( do_all):
-    gather_deps()
-
-if( do_all or args.r ):
-    deps=extract_deps()
-    gather_source(deps)
-
-if( args.c ):
-    clean()

admin/nt/dist-build/build-zips.sh

@@ -1,210 +0,0 @@
-#!/bin/bash
-
-## Copyright (C) 2017-2023 Free Software Foundation, Inc.
-
-## This file is part of GNU Emacs.
-
-## GNU Emacs is free software: you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation, either version 3 of the License, or
-## (at your option) any later version.
-
-## GNU Emacs is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-
-## You should have received a copy of the GNU General Public License
-## along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
-
-
-function git_up {
-    echo [build] Making git worktree for Emacs $VERSION
-    cd $REPO_DIR/emacs-$MAJOR_VERSION
-    git pull
-    git worktree add ../$BRANCH $BRANCH
-
-    cd ../$BRANCH
-    ./autogen.sh
-}
-
-function build_zip {
-    echo [build] Building Emacs-$VERSION
-
-    ## Clean the install location because we use it twice
-    rm -rf $HOME/emacs-build/install/emacs-$VERSION
-    mkdir --parents $HOME/emacs-build/build/emacs-$VERSION
-    cd $HOME/emacs-build/build/emacs-$VERSION
-
-    ## Do we need this or is it the default?
-    export PKG_CONFIG_PATH=/mingw64/lib/pkgconfig
-
-
-    ## Running configure forces a rebuild of the C core which takes
-    ## time that is not always needed, so do not do it unless we have
-    ## to.
-    if [ ! -f Makefile ] || (($CONFIG))
-    then
-        echo [build] Configuring Emacs
-        $REPO_DIR/$BRANCH/configure \
-            --without-dbus \
-            --without-compress-install \
-            $CACHE \
-            CFLAGS="$CFLAGS"
-    fi
-
-    make -j 4 $INSTALL_TARGET \
-         prefix=$HOME/emacs-build/install/emacs-$VERSION
-    cd $HOME/emacs-build/install/emacs-$VERSION
-    zip -r -9 emacs-$OF_VERSION-no-deps.zip *
-    mv emacs-$OF_VERSION-no-deps.zip $HOME/emacs-upload
-
-    if [ -z $SNAPSHOT ];
-    then
-        DEPS_FILE=$HOME/emacs-build/deps/emacs-$MAJOR_VERSION-deps.zip
-    else
-        ## Pick the most recent snapshot whatever that is
-        DEPS_FILE=`ls $HOME/emacs-build/deps/emacs-$MAJOR_VERSION-*-deps.zip | tail -n 1`
-    fi
-
-    echo [build] Using $DEPS_FILE
-    unzip -d bin $DEPS_FILE
-
-    zip -r -9 emacs-$OF_VERSION.zip *
-    mv emacs-$OF_VERSION.zip ~/emacs-upload
-}
-
-function build_installer {
-    cd $HOME/emacs-build/install/
-    echo [build] Calling makensis in `pwd`
-    cp $REPO_DIR/$BRANCH/admin/nt/dist-build/emacs.nsi .
-
-    makensis -v4 \
-             -DEMACS_VERSION=$ACTUAL_VERSION \
-             -DVERSION_BRANCH=$VERSION \
-             -DOUT_VERSION=$OF_VERSION emacs.nsi
-    rm emacs.nsi
-    mv emacs-$OF_VERSION-installer.exe ~/emacs-upload
-}
-
-set -o errexit
-
-SNAPSHOT=
-CACHE=
-
-BUILD=1
-BUILD_64=1
-GIT_UP=0
-CONFIG=1
-CFLAGS="-O2 -static"
-INSTALL_TARGET="install-strip"
-
-## The location of the git repo
-REPO_DIR=$HOME/emacs-build/git/
-
-
-while getopts "gb:hnsiV:" opt; do
-  case $opt in
-    g)
-        BUILD_32=0
-        BUILD_64=0
-        GIT_UP=1
-        ;;
-    n)
-        CONFIG=0
-        ;;
-    i)
-        BUILD=0
-        ;;
-    b)
-        REQUIRED_BRANCH=$OPTARG
-        echo "Setting Required branch $REQUIRED_BRANCH"
-        ;;
-    V)
-        VERSION=$OPTARG
-        ;;
-    s)
-        SNAPSHOT="-snapshot"
-        CFLAGS="-O2 -static -g3"
-        INSTALL_TARGET="install"
-        ;;
-    h)
-        echo "build-zips.sh"
-        echo "  -b args -- build args branch"
-        echo "  -g git update and worktree only"
-        echo "  -i build installer only"
-        echo "  -n do not configure"
-        echo "  -s snapshot build"
-        exit 0
-        ;;
-    \?)
-        echo "Invalid option: -$OPTARG" >&2
-        ;;
-  esac
-done
-
-
-## ACTUAL_VERSION is the version declared by emacs
-if [ -z $ACTUAL_VERSION ];
-then
-    ACTUAL_VERSION=`
-  sed -n 's/^AC_INIT(\[*GNU Emacs]*,[	 ]*\[*\([^]	 ,)]*\).*/\1/p' < ../../../configure.ac
-`
-fi
-
-if [ -z $ACTUAL_VERSION ];
-then
-    echo [build] Cannot determine Emacs version
-    exit 1
-fi
-
-## VERSION is the version that we want to call Emacs
-VERSION=$ACTUAL_VERSION
-
-
-MAJOR_VERSION="$(echo $VERSION | cut -d'.' -f1)"
-
-
-## VERSION includes the word snapshot if necessary
-VERSION=$VERSION$SNAPSHOT
-
-## OF version includes the date if we have a snapshot
-OF_VERSION=$VERSION
-
-if [ -z $SNAPSHOT ];
-then
-    BRANCH=emacs-$VERSION
-else
-    BRANCH=master
-    CACHE=-C
-    OF_VERSION="$VERSION-`date +%Y-%m-%d`"
-fi
-
-echo Checking for required branch
-if [ -z $REQUIRED_BRANCH ];
-then
-    :
-else
-    BRANCH=$REQUIRED_BRANCH
-    echo [build] Building from Branch $BRANCH
-    VERSION=$VERSION-${BRANCH/\//_}
-    OF_VERSION="$VERSION-`date +%Y-%m-%d`"
-    ## Use snapshot dependencies
-    SNAPSHOT=1
-    CFLAGS="-O2 -static -g3"
-    INSTALL_TARGET="install"
-fi
-
-if (($GIT_UP))
-then
-    git_up
-fi
-
-if (($BUILD_64))
-then
-    if (($BUILD))
-    then
-        build_zip
-    fi
-    build_installer
-fi

admin/nt/dist-build/emacs.nsi

@@ -1,77 +0,0 @@
-!include MUI2.nsh
-!include LogicLib.nsh
-!include x64.nsh
-
-Outfile "emacs-${OUT_VERSION}-installer.exe"
-
-
-SetCompressor /solid lzma
-
-Var StartMenuFolder
-
-
-!define MUI_WELCOMEPAGE_TITLE "Emacs"
-!define MUI_WELCOMEPAGE_TITLE_3LINES
-!define MUI_WELCOMEPAGE_TEXT "Welcome to Emacs -- the editor of a lifetime."
-
-!define MUI_WELCOMEFINISHPAGE_BITMAP "emacs-${VERSION_BRANCH}\share\emacs\${EMACS_VERSION}\etc\images\splash.bmp"
-!define MUI_ICON "emacs-${VERSION_BRANCH}\share\emacs\${EMACS_VERSION}\etc\images\icons\hicolor\scalable\apps\emacs.ico"
-!define MUI_UNICON "emacs-${VERSION_BRANCH}\share\emacs\${EMACS_VERSION}\etc\images\icons\hicolor\scalable\apps\emacs.ico"
-
-!insertmacro MUI_PAGE_WELCOME
-
-
-!define MUI_LICENSEPAGE_TEXT_TOP "The GNU General Public License"
-!insertmacro MUI_PAGE_LICENSE "emacs-${VERSION_BRANCH}\share\emacs\${EMACS_VERSION}\lisp\COPYING"
-
-!insertmacro MUI_PAGE_DIRECTORY
-!insertmacro MUI_PAGE_INSTFILES
-
-!insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder
-
-!insertmacro MUI_UNPAGE_CONFIRM
-!insertmacro MUI_UNPAGE_INSTFILES
-
-!insertmacro MUI_LANGUAGE "English"
-Name Emacs-${EMACS_VERSION}
-
-function .onInit
-    StrCpy $INSTDIR "$PROGRAMFILES64\Emacs"
-functionend
-
-
-Section
-
-  SetOutPath $INSTDIR
-
-  File /r emacs-${VERSION_BRANCH}
-
-  # define uninstaller name
-  WriteUninstaller $INSTDIR\Uninstall.exe
-
-  !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-  ;Create shortcuts
-  CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
-  CreateShortcut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
-
-  !insertmacro MUI_STARTMENU_WRITE_END
-  CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Emacs.lnk" "$INSTDIR\emacs-${VERSION_BRANCH}\bin\runemacs.exe"
-SectionEnd
-
-
-# create a section to define what the uninstaller does.
-# the section will always be named "Uninstall"
-Section "Uninstall"
-
-  # Always delete uninstaller first
-  Delete "$INSTDIR\Uninstall.exe"
-
-  # now delete installed directory
-  RMDir /r "$INSTDIR"
-  RMDir "$INSTDIR"
-
-  !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder
-
-  Delete "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk"
-  RMDir "$SMPROGRAMS\$StartMenuFolder"
-SectionEnd

admin/quick-install-emacs

@@ -1,7 +1,7 @@
 #!/bin/sh
 ### quick-install-emacs --- do a halfway-decent job of installing emacs quickly
 
-## Copyright (C) 2001-2023 Free Software Foundation, Inc.
+## Copyright (C) 2001-2017 Free Software Foundation, Inc.
 
 ## Author: Miles Bader <miles@gnu.org>
 
@@ -18,7 +18,7 @@
 ## GNU General Public License for more details.
 
 ## You should have received a copy of the GNU General Public License
-## along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+## along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 
 ### Commentary:
@@ -172,10 +172,7 @@ test x"$prefix" = x && { prefix="`get_config_var prefix`" || exit 4 ; }
 test x"$ARCH" = x && { ARCH="`get_config_var host`" || exit 4 ; }
 
 VERSION=`
-  sed -n 's/^AC_INIT([	 ]*\[*emacs]*[	 ]*,[	 ]*\[*\([^]	 ),]*\).*/\1/p' <$SRC/configure.ac
-` || exit 4
-test -n "$VERSION" || VERSION=`
-  sed -n 's/^AC_INIT([	 ]*\[*GNU Emacs]*[	 ]*,[	 ]*\[*\([^]	 ),]*\).*/\1/p' <$SRC/configure.ac
+  sed -n 's/^AC_INIT(emacs,[	 ]*\([^	 )]*\).*/\1/p' <$SRC/configure.ac
 ` || exit 4
 test -n "$VERSION" || { printf '%s\n' >&2 "$me: no version in configure.ac"; exit 4; }
 

admin/release-branch.txt

@@ -1,76 +0,0 @@
-Instructions for cutting the Emacs release branch
-
-1.  In the clone of the Emacs Git repository, switch to the 'master'
-    branch, "git pull", and build it (using 'make bootstrap') to make
-    sure it's not broken.  Run 'make check-expensive' and ensure all
-    tests pass.  (Alternatively, verify that the automated build
-    servers are showing success for the latest revision.)
-
-2.  Create the release branch and switch to it.  Assuming that it is
-    for releasing Emacs versions XY.1, XY.2, etc., the command is:
-
-     git checkout -b emacs-XY
-
-3.  Switch the release branch to the suitable version.  The convention
-    is that release branches start with version XY.0.60, whereas the
-    master branch from which the release branch was cut was at the
-    version XY.0.50.  To change the version, do the following inside
-    Emacs:
-
-     M-x load-file RET admin/admin.el RET
-     M-x set-version RET XY.0.60 RET
-
-    Change the value of 'customize-changed-options-previous-release'
-    in cus-edit.el to reference the last release from the emacs-XY-1
-    branch (last release for the previous major version).
-
-    The above modifies several files in the tree; commit the changes
-    with the appropriate log message, something like "Bump Emacs
-    version to XY.0.60", and with header saying "Cut the emacs-XY
-    release branch".  Then push the changes:
-
-     git push --set-upstream origin emacs-XY
-
-    The "push" command should show the new branch just created.
-
-4.  Switch back to the master branch.
-
-     git checkout master
-     git pull
-
-    Set the version on the master branch to the next major release:
-
-     M-x set-version RET XY+1.0.50 RET
-
-    This creates a new file etc/NEWS.XY.  "git add" it.
-
-    Change the value of 'customize-changed-options-previous-release'
-    in cus-edit.el to reference emacs-XY.1, the next version to be
-    released from the newly-committed release branch.
-
-    Update the emacs-module sources for the new version XY+1.  This
-    entails:
-
-     . adding a new file src/module-env-XY+1.h, with contents just the
-       comment taken from the beginning of src/module-env-XY.h
-     . removing the comment from the beginning of src/module-env-XY.h
-     . adding two lines to configure.ac:
-
-       AC_SUBST_FILE([module_env_snippet_XY+1])
-       module_env_snippet_XY+1="$srcdir/src/module-env-XY+1.h"
-
-     . adding a new 'struct emacs_env_XY+1' to src/emacs-module.h.in,
-       with the contents identical to'struct emacs_env_XY', with one
-       line added:
-
-         @module_env_snippet_XY+1@
-
-     (FIXME: "M-x set-version" should do this emacs-module stuff
-     automatically when the version is NN.0.60, or when there's no
-     src/module-env-NN.h file.)
-
-    "git add" the new src/module-env-XY+1.h file.
-
-    Then rebuild Emacs.  Then commit the new/changed files and push.
-
-5.  Announce the new release branch on emacs-devel.

admin/release-process

@@ -41,35 +41,23 @@ released in the next release cycle.  From time to time, the master
 branches merges bugfix commits from the "emacs-NN" branch.
 See admin/gitmerge.el.
 
-* RELEASE-BLOCKING BUGS
+* RELEASE-CRITICAL BUGS
 
 Emacs uses the "blocking" feature of Debbugs for bugs that need to be
 addressed in the next release.
 
-Currently, bug#43018 is the tracking bug for release of 27.2 and
-bug#39202 is the tracking bug for release 28.1.  Say bug#123 needs
-to be fixed for Emacs 27.2.  Send a message to control@debbugs.gnu.org
+Currently, bug#21966 is the tracking bug for release of 25.2 and
+bug#24655 is the tracking bug for release 26.1.  Say bug#123 needs
+to be fixed for Emacs 26.1.  Send a message to control@debbugs.gnu.org
 that says:
 
-  block 43018 by 123
+   block 24655 by 123
 
 Change "block" to "unblock" to remove a bug from the list.  Closed
 bugs are not listed as blockers, so you do not need to explicitly
 unblock one that has been closed.  You may need to force an update of
 the tracking bug with ctrl-f5/shift-reload to see the latest version.
 
-If you use the debbugs package from GNU ELPA, you can apply the
-following command to see all bugs which block a given release:
-
-  (debbugs-gnu-emacs-release-blocking-reports "27.2")
-
-The following command from admin/admin.el sends a reminder message
-about release-blocking bugs to the <emacs-devel@gnu.org> mailing list:
-
-  (reminder-for-release-blocking-bugs "27.2")
-
-It is recommended to send this reminder message once a month.  Once the
-pretest has started, a reminder message once a week is appropriate.
 
 * TO BE DONE SHORTLY BEFORE RELEASE
 
@@ -111,10 +99,6 @@ significant changes and new features in the upcoming release, then
 describe the "benefits" from losing those features.  Be funny, use
 humor.  The text written for the previous releases can serve as an example.
 
-The Emacs FAQ (doc/misc/efaq.texi) also has a "What's new" section;
-for major releases a new section should be added listing the
-significant changes.
-
 Check cross-references between the manuals (e.g. from emacs to elisp)
 are correct.  You can use something like the following in the info
 directory in the Emacs build tree:
@@ -131,12 +115,12 @@ Redirect /software/emacs/manual/html_mono/automake.html /software/automake/manua
 Redirect /software/emacs/manual/html_node/automake/ /software/automake/manual/html_node/
 
 Another tool you can use to check links is gnu.org's linc.py:
-https://www.gnu.org/server/source/
+http://www.gnu.org/server/source/
 
 You run this with something like:
 
 cd /path/to/cvs/emacs-www
-linc.py -o /path/to/output-dir --url https://www.gnu.org/software/emacs/ .
+linc.py -o /path/to/output-dir --url http://www.gnu.org/software/emacs/ .
 
 Be warned that it is really, really slow (as in, can take ~ a full day
 to check the manual/ directory).  It is probably best to run it on a
@@ -178,10 +162,9 @@ emacs.pdf' (e.g., enable "smallbook").
 What paper size are the English versions supposed to be on?
 On Debian testing, the packages texlive-lang-czechslovak and
 texlive-lang-polish will let you generate the cs-* and sk-* pdfs.
-(You may need texlive-lang-cyrillic, texlive-lang-german,
-and texlive-fonts-extra for others.)  Gnus refcards need
-texlive-latex-extra and/or texlive-latex-recommended.  On Fedora-like
-systems, texlive-lh may help.
+(You may need texlive-lang-cyrillic, texlive-lang-german for others.)
+The Makefile rules did not work for me, I had to use something like:
+csplain -output-format=pdf cs-refcard
 
 ** Ask maintainers of refcard translations to update them.
 
@@ -196,30 +179,26 @@ pt-br	Rodrigo Real
 ru	Alex Ott
 sk	Miroslav Vaško
 
-** Update some files from their upstream.
-
-Some files in Emacs are copies of data files maintained elsewhere.
-Make sure that they are reasonably up-to-date.
-
-- etc/publicsuffix.txt
-https://publicsuffix.org/list/public_suffix_list.dat
-
-- leim/SKK-DIC/SKK-JISYO.L
-https://raw.githubusercontent.com/skk-dev/dict/master/SKK-JISYO.L
-
 * BUGS
 
 ** Check for modes which bind M-s that conflicts with a new global binding M-s
 and change key bindings where necessary.  The current list of modes:
 
-1. Minibuffer binds 'M-s' to 'next-matching-history-element'
+1. Gnus binds 'M-s' to 'gnus-summary-search-article-forward'.
+
+2. Minibuffer binds 'M-s' to 'next-matching-history-element'
    (not useful any more since C-s can now search in the history).
 
-2. PCL-CVS binds 'M-s' to 'cvs-status', and log-edit-mode binds it to
+3. 'center-line' in Text mode was already moved to the text formatting
+   keymap as 'M-o M-s' (thus this binding is not necessary any more
+   in 'nroff-mode-map' too and can be removed now from the nroff mode
+   because it can now use the global key binding 'M-o M-s' 'center-line').
+
+4. PCL-CVS binds 'M-s' to 'cvs-status', and log-edit-mode binds it to
    'log-edit-comment-search-forward'.  Perhaps search commands
    on the global key binding 'M-s' are useless in these modes.
 
-3. Rmail binds '\es' to 'rmail-search'/'rmail-summary-search'.
+5. Rmail binds '\es' to 'rmail-search'/'rmail-summary-search'.
 
 
 * DOCUMENTATION