Remove purespace and ancillary code

Now that purespace is not used any more, remove it, along with the functions
used to allocate into it.  Use equivalent functions allocating into the
normal heap.
Remove calls to PURE_P since they always return false.

* src/puresize.h: Delete file.

* src/alloc.c: Don't include `puresize.h` any more.
(pure, purebeg, pure_size, pure_bytes_used_before_overflow)
(pure_bytes_used_lisp, pure_bytes_used_non_lisp, symbol_block_pinned)
(pinned_objects): Delete vars.
(PUREBEG): Delete macro.
(pointer_align): Move after definition of USE_ALIGNED_ALLOC and only
define it if USE_ALIGNED_ALLOC is not used.
(cons_listn): Remove `cons` arg, hardcode `Fcons` instead.
(pure_listn, pure_alloc, check_pure_size, make_pure_string)
(make_pure_c_string, pure_cons): Delete functions.
(init_symbol): Don't set `pinned` any more.
(mark_pinned_objects, mark_pinned_symbols): Delete functions.
(garbage_collect): Don't call them any more.
(init_alloc_once_for_pdumper): Don't initialize purebeg and pure_size.

* src/print.c (print_object) <PVEC_HASH_TABLE>: Don't print `purecopy`.

* src/pdumper.c (dump_symbol, dump_hash_table): Update sig hash.
(dump_symbol): Don't dump `pinned`.
(dump_hash_table): Don't dump `purecopy`.

* src/lread.c (readevalloop, read_internal_start): Adjust call to
`make_hash_table`.
(read0, intern_c_string_1, define_symbol, Fintern): Don't purify
symbol names.
(string): Avoid `pure_cons` and `build_pure_c_string`.

* src/lisp.h (struct Lisp_Symbol): Remove `pinned` field.
(struct Lisp_Hash_Table): Remove `purecopy` field.
(check_pure_size, pure_listn, pure_list, make_pure_string)
(make_pure_c_string, pure_cons): Remove prototypes.
(build_pure_c_string): Delete function.

* src/keymap.c: Don't include `puresize.h` any more.
(Fmake_sparse_keymap): Don't purecopy the menu name.
(Fset_keymap_parent, store_in_keymap): Don't `CHECK_IMPURE` any more.
(syms_of_keymap): Avoid `pure_cons` and `build_pure_c_string`.

* src/intervals.c: Don't include `puresize.h` any more.
(create_root_interval): Don't `CHECK_IMPURE` any more.

* src/fns.c: Don't include `puresize.h` any more.
(Ffillarray, Fclear_string): Don't `CHECK_IMPURE` any more.
(make_hash_table): Remove `purecopy` arg.
(Fmake_hash_table): Remove `:purecopy` keyword argument.

* src/eval.c (Finternal__define_uninitialized_variable): Don't purecopy
the doc any more.
(Fdefconst_1): Don't purecopy the initvalue any more.
(Fautoload): Get rid of hack needed when we used hash-consing.
(syms_of_eval): Avoid `build_pure_c_string`.

* src/emacs.c: Don't include `puresize.h` any more.
(Fdump_emacs): Don't `check_pure_size`.

* src/doc.c (Fsnarf_documentation): Don't purecopy the build files.

* src/deps.mk: Remove puresize.h.

* src/data.c: Don't include `puresize.h` any more.
(pure_write_error): Delete function.
(Fsetcar, Fsetcdr): Don't `CHECK_IMPURE` any more.
(Fdefalias): Don't purecopy the definition any more.
(Faset): Don't `CHECK_IMPURE` any more.
(syms_of_data): Avoid `pure_cons` and `build_pure_c_string`.

* src/conf_post.h (SYSTEM_PURESIZE_EXTRA): Delete macro.

* src/comp.c: Don't include `puresize.h` any more.
(helper_link_table): Remove `pure_write_error`.
(define_CHECK_IMPURE): Delete function.
(maybe_defer_native_compilation, syms_of_comp):
Avoid `build_pure_c_string`.

* src/category.c (hash_get_category_set): Update call to `make_hash_table`.
(Fdefine_category): Don't purecopy the docstring any more.

* src/bytecode.c: Don't include `puresize.h` any more.
(Bsetcar, Bsetcdr): Don't `CHECK_IMPURE` any more.

* doc/lispref/internals.texi (Pure Storage): Delete section.
(Garbage Collection): Remove note about purespace overflow.

* src/xfaces.c (syms_of_xfaces):
* src/emacs-module.c (syms_of_module):
* src/frame.c (make_frame, make_initial_frame):
* src/fileio.c (syms_of_fileio):
* src/image.c (xpm_make_color_table_h):
* src/process.c (ADD_SUBFEATURE, syms_of_process):
* src/profiler.c (make_log):
* src/json.c (define_error):
* src/xterm.c (syms_of_xterm):
* src/xfns.c (syms_of_xfns):
* src/xdisp.c (syms_of_xdisp):
* src/w32fns.c (syms_of_w32fns):
* src/syntax.c (syms_of_syntax):
* src/sqlite.c (syms_of_sqlite):
* src/search.c (syms_of_search):
* src/keyboard.c (syms_of_keyboard):
* src/fontset.c (syms_of_fontset):
* src/dbusbind.c (syms_of_dbusbind):
* src/coding.c (syms_of_coding):
* src/callint.c (syms_of_callint):
* src/buffer.c (init_buffer_once, syms_of_buffer):
Avoid `build_pure_c_string`, `Fpurecopy`, `pure_cons`, and `pure_list`,
and adjust calls to `make_hash_table`.

.clang-format

@@ -1,20 +1,12 @@
 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
+ForEachMacros: [FOR_EACH_TAIL, FOR_EACH_TAIL_SAFE]
 IncludeCategories:
   - Regex: '^<config\.h>$'
     Priority: -1
@@ -24,17 +16,11 @@ IncludeCategories:
     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

.dir-locals.el

@@ -1,18 +1,13 @@
-;;; Directory Local Variables         -*- no-byte-compile: t; -*-
+;;; Directory Local Variables
 ;;; 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)))
+         (bug-reference-url-format . "https://debbugs.gnu.org/%s")))
  (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"))
+            (c-noise-macro-names . ("INLINE" "ATTRIBUTE_NO_SANITIZE_UNDEFINED" "UNINIT" "CALLBACK" "ALIGN_STACK"))
             (electric-quote-comment . nil)
             (electric-quote-string . nil)
             (indent-tabs-mode . t)
@@ -21,12 +16,8 @@
                (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)))
  (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)
 		     (mode . bug-reference)))
@@ -35,7 +26,6 @@
                      (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)))

.gitattributes

@@ -1,6 +1,6 @@
 # Attributes of Emacs files in the Git repository.
 
-# Copyright 2015-2023 Free Software Foundation, Inc.
+# Copyright 2015-2022 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 

.gitignore

@@ -1,6 +1,6 @@
 # Files that Git should ignore in the Emacs source directory.
 
-# Copyright 2009-2023 Free Software Foundation, Inc.
+# Copyright 2009-2022 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -25,7 +25,6 @@
 
 # Personal customization.
 .dir-locals-2.el
-.no-advice-on-failure
 
 # Built by 'autogen.sh'.
 /aclocal.m4
@@ -54,7 +53,6 @@ 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
@@ -158,7 +156,6 @@ 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
@@ -326,15 +323,4 @@ lib-src/seccomp-filter-exec.pfc
 /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
+manual/

.gitlab-ci.yml

@@ -1,4 +1,4 @@
-# Copyright (C) 2021-2023 Free Software Foundation, Inc.
+# Copyright (C) 2021-2022 Free Software Foundation, Inc.
 #
 #  This file is part of GNU Emacs.
 #

.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>

CONTRIBUTE

@@ -1,6 +1,3 @@
-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
@@ -18,7 +15,7 @@ To configure Git for Emacs development, you can run the following:
 
 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
@@ -110,7 +107,7 @@ admin/notes/bug-triage.
 
 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
+and takes just one line -- this will allow to read NEWS in Outline
 mode after hiding the body of each entry.
 
 Doc-strings should be updated together with the code.
@@ -123,7 +120,7 @@ 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.
+Otherwise do not mark it.
 
 If your change requires updating the manuals to document new
 functions/commands/variables/faces, then use the proper Texinfo
@@ -205,10 +202,9 @@ them right the first time, so here are guidelines for formatting them:
   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.
 
 - 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
@@ -321,7 +317,7 @@ them right the first time, so here are guidelines for formatting them:
 ** 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
+commit for validity, and may abort the commit of 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:
@@ -351,10 +347,7 @@ tests:
 
 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
+change's author.  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.
 
@@ -400,7 +393,7 @@ 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.
 
@@ -449,8 +442,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

ChangeLog.1

@@ -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>
@@ -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.
@@ -5685,7 +5685,7 @@
 	(__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
@@ -14700,7 +14700,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1993-1999, 2001-2023 Free Software Foundation, Inc.
+  Copyright (C) 1993-1999, 2001-2022 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 

ChangeLog.2

@@ -111,7 +111,7 @@
 
 2017-03-21  Noam Postavsky  <npostavs@gmail.com>
 
-	Narrow scope of modification hook re-enabling in org-src fontification
+	Narrow scope of modification hook renabling in org-src fontification
 
 	Modification hooks should be enabled while modifying text in the
 	org-src temp buffer, but in 2017-01-29 "Call modification hooks in
@@ -4040,7 +4040,7 @@
 
 	* lisp/progmodes/xref.el (xref--query-replace-1):
 	Say 'All results processed' at the end if the user hadn't
-	canceled the process (bug#23284).
+	cancelled the process (bug#23284).
 
 2016-05-07  Eli Zaretskii  <eliz@gnu.org>
 
@@ -9317,7 +9317,7 @@
 	optional.
 
 	* src/buffer.c (Fbarf_if_buffer_read_only): Rename argument POS
-	to POSITION to keep consistent with doc-string.
+	to POSITION to keep consisteny with doc-string.
 
 2016-02-01  Paul Eggert  <eggert@cs.ucla.edu>
 
@@ -11843,7 +11843,7 @@
 
 2016-01-05  Alan Mackenzie  <acm@muc.de>
 
-	Make C++ buffers writable when writing their initial text properties.
+	Make C++ buffers writeable when writing their initial text properties.
 
 	This is a correction to yesterday's CC Mode patch.
 
@@ -12542,7 +12542,7 @@
 
 	* lisp/erc/erc-backend.el (erc-server-setup-periodical-ping): Checks
 	for existing timers in the alist before adding new ones.  If a
-	timer already exists, it is canceled and
+	timer already exists, it is cancelled and
 	overwritten. (bug#19292).
 
 2015-12-27  Jens Lechtenboerger  <jens.lechtenboerger@fsfe.org>
@@ -22108,7 +22108,7 @@
 	* src/gfilenotify.c (dir_monitor_callback): Cancel the monitor if
 	the file or directory to be watched is deleted.
 	(Fgfile_add_watch): Make watch_object a triple.
-	(Fgfile_rm_watch): Check, whether watch is canceled already.
+	(Fgfile_rm_watch): Check, whether watch is cancelled already.
 	(Fgfile_valid_p): New defun.
 	(syms_of_gfilenotify): Declare Sgfile_valid_p.
 
@@ -23054,8 +23054,8 @@
 
 	Fix tests in file-notify-tests.el
 	* test/automated/file-notify-tests.el: Remove Tramp declarations.
-	(file-notify-test00-availability): Print remote command without
-	Tramp internal functions.
+	(file-notify-test00-availability): Print remote command w/o Tramp
+	internal functions.
 	(file-notify-test02-events, file-notify-test02-events-remote):
 	Adapt docstring.
 	(file-notify-test03-autorevert): Use `format-message' when
@@ -26343,7 +26343,7 @@
 	(verilog-type-font-keywords): Cycle delay operators like ##1 and
 	##[0:$] are now highlighted in their entirety similarly to the #
 	delay-control operator.  Likewise, the followed-by operators #-#
-	and #=# are no longer partially highlighted.
+	and #=# are no longer partially highlighed.
 	(verilog-backward-syntactic-ws-quick)
 	(verilog-skip-backward-comments): Minor performance improvements
 	to buffer traversal functions for reduced latency.
@@ -28676,7 +28676,7 @@
 	* lisp/faces.el (set-face-attribute): Don't be fooled too easily
 	by a hyphen in a font's name.
 
-	Fix value of posn-at-point in R2L lines
+	Fix value of posn-at-pont in R2L lines
 	* src/keyboard.c (Fposn_at_x_y, Fposn_at_point): Allow X pixel
 	coordinate of -1, for a newline in a right-to-left line that
 	overflowed into the left fringe.
@@ -34464,7 +34464,7 @@
 
 	* lisp/emacs-lisp/package.el: Make archive and status pseudo-keywords
 	(package--has-keyword-p): Understand "arc:xxxx" and "status:xxxx"
-	as special keywords which match against package archive and status
+	as special keywords which match agains package archive and status
 	respectively.
 	* etc/NEWS: Document it.
 
@@ -35787,7 +35787,7 @@ See ChangeLog.1 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2015-2023 Free Software Foundation, Inc.
+  Copyright (C) 2015-2022 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 

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-2022 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
@@ -115,7 +115,7 @@ endif
 
 # '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)
 

INSTALL

@@ -1,5 +1,5 @@
 GNU Emacs Installation Guide
-Copyright (C) 1992, 1994, 1996-1997, 2000-2023 Free Software Foundation,
+Copyright (C) 1992, 1994, 1996-1997, 2000-2022 Free Software Foundation,
 Inc.
 See the end of the file for license conditions.
 
@@ -187,7 +187,7 @@ X11 is being used.
     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/
+  X libgif for GIF:   http://giflib.sourceforge.net/
     librsvg2 for SVG: https://wiki.gnome.org/Projects/LibRsvg
     libwebp for WebP: https://developers.google.com/speed/webp/
 

INSTALL.REPO

@@ -4,7 +4,7 @@ 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
+    git clone git://git.sv.gnu.org/emacs.git
 
 To build the repository code, simply run 'make' in the 'emacs'
 directory.  This should work if your files are freshly checked out
@@ -98,7 +98,7 @@ never platform-specific.
 
 
 
-Copyright (C) 2002-2023 Free Software Foundation, Inc.
+Copyright (C) 2002-2022 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 

Makefile.in

@@ -1,6 +1,6 @@
 ### @configure_input@
 
-# Copyright (C) 1992-2023 Free Software Foundation, Inc.
+# Copyright (C) 1992-2022 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -51,15 +51,7 @@
 #
 # 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.
@@ -366,79 +358,10 @@ endif
 
 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
+all: ${SUBDIR} info $(gsettings_SCHEMAS:.xml=.valid)
 
 .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)'
-
 # If configure were to just generate emacsver.tex from emacsver.tex.in
 # in the normal way, the timestamp of emacsver.tex would always be
 # newer than that of the pdf files, which are prebuilt in release tarfiles.
@@ -532,16 +455,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)' \
+	$(MAKE) -C $@ VCSWITNESS='$(VCSWITNESS)' BIN_DESTDIR='$(BIN_DESTDIR)' \
 		 ELN_DESTDIR='$(ELN_DESTDIR)' all
 
 blessmail: Makefile src
@@ -589,7 +514,7 @@ $(srcdir)/configure: $(srcdir)/configure.ac $(srcdir)/m4/*.m4
 ## 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 install-eln install-gsettings-schemas
 	@true
 
 ## Ensure that $subdir contains a subdirs.el file.
@@ -705,8 +630,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,8 +687,8 @@ 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" \
@@ -778,9 +703,9 @@ install-etcdoc: src install-arch-indep
 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" ] || \
@@ -809,7 +734,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; \
@@ -841,7 +766,7 @@ install-etc:
 	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}|" \
+	sed -e "/^Exec=emacsclient/ s|emacsclient|${bindir}/$${client_name}|" \
 	  -e "/^Icon=emacs/ s/emacs/${EMACS_NAME}/" \
 	  $(USE_STARTUP_NOTIFICATION_SED_CMD) \
 	  ${srcdir}/etc/emacsclient.desktop > $${tmp}; \
@@ -855,7 +780,7 @@ install-etc:
 	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}|" \
+	sed -e "/^Exec=emacsclient/ 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"; \
@@ -876,7 +801,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 ; \
@@ -911,10 +836,10 @@ uninstall: uninstall-$(NTDIR) uninstall-doc uninstall-gsettings-schemas
 	rm -f "$(DESTDIR)$(includedir)/emacs-module.h"
 	$(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,7 +850,7 @@ uninstall: uninstall-$(NTDIR) uninstall-doc uninstall-gsettings-schemas
 	  fi ;						\
 	done
 	-rm -rf "$(DESTDIR)${libexecdir}/emacs/${version}"
-	thisdir=`pwd -P`; \
+	thisdir=`/bin/pwd`; \
 	(info_misc=`MAKEFLAGS= $(MAKE) --no-print-directory -s -C doc/misc echo-info`; \
 	 if cd "$(DESTDIR)${infodir}"; then \
 	   for elt in ${INFO_NONMISC} $${info_misc}; do \
@@ -1011,7 +936,7 @@ clean: $(clean_dirs:=_clean) clean-gsettings-schemas
 ### '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,7 +946,7 @@ top_bootclean=\
 ###      distribution.
 top_distclean=\
 	${top_bootclean}; \
-	rm -f config.cache config.status config.log~ \
+	rm -f config.status config.log~ \
 	  Makefile makefile lib/gnulib.mk ${SUBDIR_MAKEFILES}
 
 distclean_dirs = $(clean_dirs) leim lisp admin/grammars
@@ -1030,9 +955,6 @@ $(foreach dir,$(distclean_dirs),$(eval $(call submake_template,$(dir),distclean)
 
 distclean: $(distclean_dirs:=_distclean) clean-gsettings-schemas
 	${top_distclean}
-ifeq ($(HAVE_NATIVE_COMP),yes)
-	rm -rf native-lisp
-endif
 
 ### 'bootstrap-clean'
 ###      Delete everything that can be reconstructed by 'make' and that
@@ -1044,9 +966,6 @@ bootstrap-clean: $(distclean_dirs:=_bootstrap-clean)
 	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'
@@ -1240,11 +1159,7 @@ 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
-
-bootstrap:
-	$(MAKE) actual-bootstrap || $(MAKE) advice-on-failure make-target=bootstrap exit-status=$$?
-	$(MAKE) sanity-check make-target=bootstrap
+.PHONY: bootstrap
 
 # Without a 'configure' variable, bootstrapping does the following:
 #  * Remove files to start from a bootstrap-clean slate.
@@ -1255,7 +1170,7 @@ bootstrap:
 #  * 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:
+bootstrap:
 ifndef configure
 	$(MAKE) bootstrap-clean
 	cd $(srcdir) && ./autogen.sh autoconf
@@ -1263,7 +1178,7 @@ ifndef configure
 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
@@ -1287,7 +1202,7 @@ PREFERRED_BRANCH = emacs-28
 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.

README

@@ -1,8 +1,8 @@
-Copyright (C) 2001-2023 Free Software Foundation, Inc.
+Copyright (C) 2001-2022 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 29.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

admin/ChangeLog.1

@@ -2577,7 +2577,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2001-2023 Free Software Foundation, Inc.
+  Copyright (C) 2001-2022 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 

admin/MAINTAINERS

@@ -137,7 +137,6 @@ Andrea Corallo
 
 Stefan Kangas
         admin/automerge
-	admin/update_autogen
 
 Po Lu
 	The Haiku port:
@@ -294,7 +293,7 @@ Po Lu
 
 Tramp
 	Maintainer: Michael Albinus
-	Repository: https://git.savannah.gnu.org/git/tramp.git
+	Repository: git://git.savannah.gnu.org/tramp.git
 	Mailing List: tramp-devel@gnu.org
 	Bug Reports: M-x tramp-bug
 	Notes: For backward compatibility requirements, see
@@ -316,7 +315,7 @@ Modus themes
 Org Mode
 	Home Page: https://orgmode.org/
 	Maintainer: Org Mode developers
-	Repository: https://git.savannah.gnu.org/git/emacs/org-mode.git
+	Repository: git://git.sv.gnu.org/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

admin/README

@@ -1,4 +1,4 @@
-Copyright (C) 2001-2023 Free Software Foundation, Inc.
+Copyright (C) 2001-2022 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 

admin/admin.el

@@ -1,6 +1,6 @@
 ;;; admin.el --- utilities for Emacs administration  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2001-2023 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2022 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -124,6 +124,9 @@ Root must be the root of an Emacs source tree."
   ;; 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")))
@@ -485,11 +488,10 @@ 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)))
+    (delete-region opoint (point))
+    (search-forward "<link href=")
+    (goto-char (match-beginning 0))
     (insert manual-links-string)
     (setq opoint (point))
     (search-forward "</head>")
@@ -615,7 +617,7 @@ style=\"text-align:left\">")
       ;; its original form.
       (when (or (search-forward "<ul class=\"menu\">" nil t)
 	        ;; FIXME?  The following search seems dangerously lax.
-	        (search-forward "<ul>" nil t))
+	        (search-forward "<ul>"))
         ;; Convert the list that Makeinfo made into a table.
         (replace-match "<table style=\"float:left\" width=\"100%\">")
         (forward-line 1)
@@ -778,207 +780,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.

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-2022 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 

admin/authors.el

@@ -1,6 +1,6 @@
 ;;; authors.el --- utility for maintaining Emacs's AUTHORS file  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2000-2023 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2022 Free Software Foundation, Inc.
 
 ;; Author: Gerd Moellmann <gerd@gnu.org>
 ;; Maintainer: emacs-devel@gnu.org
@@ -163,7 +163,6 @@ files.")
     ("Michael R. Cook" "Michael Cook")
     ("Michael Sperber" "Mike Sperber" "Michael Sperber \\[Mr. Preprocessor\\]")
     ("Michalis V" "^mvar")
-    ("Miha Rihtaršič" "Miha Rihtarsic")
     ("Mikio Nakajima" "Nakajima Mikio")
     ("Nelson Jose dos Santos Ferreira" "Nelson Ferreira")
     ("Noorul Islam" "Noorul Islam K M")
@@ -182,7 +181,7 @@ files.")
     ("Philip Kaludercic" "Philip K\\." "Philip K")
     ("Philipp Stephani" "Philipp .*phst@google")
     ("Piotr Zieliński" "Piotr Zielinski")
-    ("Po Lu" "Po Lu Via" "Your Name")   ; looks like a mistake
+    ("Po Lu" "Po Lu Via")               ; looks like a mistake
     ("Przemysław Wojnowski" "Przemyslaw Wojnowski")
     ("R. Bernstein" "rb@dustyfeet.com")
     ("Rainer Schöpf" "Rainer Schoepf")
@@ -990,7 +989,7 @@ in the repository.")
 ;; to how a file was mentioned in the respective ChangeLog.  It is
 ;; advisable to run a Grep command such as
 ;;
-;;   grep -F -R BASENAME . --include='ChangeLog*'
+;;   fgrep -R BASENAME . --include='ChangeLog*'
 ;;
 ;; where BASENAME is the old basename of the renamed file.  This will
 ;; show all the different reference forms of the file in the various
@@ -1883,7 +1882,7 @@ list of their contributions.\n")
 		(insert "\n "))
 	    (insert " " file))
 	  (insert "\n")))))
-    (insert "\nLocal" " Variables:\nmode: emacs-authors\ncoding: "
+    (insert "\nLocal" " Variables:\nmode: etc-authors\ncoding: "
 	    (symbol-name authors-coding-system) "\nEnd:\n")
     (message "Generating buffer %s... done" buffer-name)
     (unless noninteractive

admin/automerge

@@ -1,10 +1,10 @@
 #!/bin/bash
 ### automerge - automatically merge the Emacs release branch to master
 
-## Copyright (C) 2018-2023 Free Software Foundation, Inc.
+## Copyright (C) 2018-2022 Free Software Foundation, Inc.
 
 ## Author: Glenn Morris <rgm@gnu.org>
-## Maintainer: Stefan Kangas <stefankangas@gmail.com>
+## Maintainer: Stefan Kangas <stefan@marxist.se>
 
 ## This file is part of GNU Emacs.
 
@@ -35,7 +35,16 @@
 ## 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"
+die ()                 # write error to stderr and exit
+{
+    [ $# -gt 0 ] && echo "$PN: $*" >&2
+    exit 1
+}
+
+PN=${0##*/}                     # basename of script
+PD=${0%/*}
+
+[ "$PD" = "$0" ] && PD=.        # if PATH includes PWD
 
 usage ()
 {
@@ -118,7 +127,13 @@ OPTIND=1
 [ "$test" ] && build=1
 
 
-tempfile="$(emacs_mktemp)"
+if [ -x "$(command -v mktemp)" ]; then
+    tempfile=$(mktemp "/tmp/$PN.XXXXXXXXXX")
+else
+    tempfile=/tmp/$PN.$$
+fi
+
+trap 'rm -f $tempfile 2> /dev/null' EXIT
 
 
 [ -e Makefile ] && [ "$build" ] && {
@@ -246,3 +261,5 @@ git push || die "push error"
 
 
 exit 0
+
+### automerge ends here

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-2022 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 

admin/charsets/Makefile.in

@@ -1,6 +1,6 @@
 ### @configure_input@
 
-# Copyright (C) 2015-2023 Free Software Foundation, Inc.
+# Copyright (C) 2015-2022 Free Software Foundation, Inc.
 
 # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 #   National Institute of Advanced Industrial Science and Technology (AIST)
@@ -181,7 +181,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" ) > $@
 

admin/charsets/mapconv

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2015-2023 Free Software Foundation, Inc.
+# Copyright (C) 2015-2022 Free Software Foundation, Inc.
 
 # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 #   National Institute of Advanced Industrial Science and Technology (AIST)
@@ -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"

admin/charsets/mapfiles/README

@@ -1,4 +1,4 @@
-Copyright (C) 2009-2023 Free Software Foundation, Inc.
+Copyright (C) 2009-2022 Free Software Foundation, Inc.
 Copyright (C) 2009, 2010, 2011
   National Institute of Advanced Industrial Science and Technology (AIST)
   Registration Number H13PRO009

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/check-doc-strings

@@ -290,7 +290,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,6 +1,6 @@
 ;;; cus-test.el --- tests for custom types and load problems  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 1998, 2000, 2002-2023 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2000, 2002-2022 Free Software Foundation, Inc.
 
 ;; Author: Markus Rost <rost@math.uni-bielefeld.de>
 ;; Created: 13 Sep 1998
@@ -131,7 +131,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 +145,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'.")
@@ -182,15 +181,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,7 +200,8 @@ 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))
@@ -224,9 +215,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.
@@ -242,12 +231,13 @@ The detected problematic options are stored in `cus-test-errors'."
 	     (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))))
+		  (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"
@@ -282,7 +272,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,7 +292,7 @@ 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."
@@ -409,7 +399,7 @@ Returns a list of variables with suspicious types."
         (message "No problems found")
         nil)
     (message "The following options might have problems:")
-    (cus-test-message (mapcar #'cus-test--format-error cus-test-errors))
+    (cus-test-message cus-test-errors)
     cus-test-errors))
 
 (defun cus-test-deps ()

admin/diff-tar-files

@@ -1,6 +1,6 @@
-#!/bin/bash
+#! /bin/sh
 
-# Copyright (C) 2001-2023 Free Software Foundation, Inc.
+# Copyright (C) 2001-2022 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -17,7 +17,6 @@
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
-source "${0%/*}/emacs-shell-lib"
 
 if [ $# != 2 ]; then
     cat <<EOF
@@ -32,8 +31,9 @@ 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

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,22 +1,5 @@
 #!/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
@@ -37,20 +20,7 @@ if [ -f /proc/cpuinfo ]; then
 	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 | \
+make -j$cores "$@" 2>&1 | \
 sed -u 's# \.\./\.\./# #
 s# \.\./# #
 s#^Configuring local git # Configuring local git #
@@ -59,8 +29,6 @@ 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|\
@@ -68,13 +36,13 @@ 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|\
+^Dumping under the name|\
 ^Byte counts|\
 ^Reloc counts|\
 ^Pure-hashed|\
@@ -113,38 +81,16 @@ The GNU allocators don't work|\
 ^\^\(\(|\
 ^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|\
-^\[ \"\.\" = \"\.\" \]\
+^'build-aux/git-hooks\
 " | \
 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
+  [[ "X${REPLY:0:1}" != "X " ]] && C="\033[1;31m"
+  [[ "X${REPLY:0:3}" == "X   " ]] && C="\033[1;31m"
+  [[ "X$C" == "X" ]] && printf "%s\n" "$REPLY" || printf "$C%s\033[0m\n" "$REPLY"
 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 | \

admin/find-gc.el

@@ -1,6 +1,6 @@
 ;;; find-gc.el --- detect functions that call the garbage collector  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 1992, 2001-2023 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 2001-2022 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 
@@ -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)

admin/gitmerge.el

@@ -1,6 +1,6 @@
 ;;; gitmerge.el --- help merge one Emacs branch into another  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2010-2023 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2022 Free Software Foundation, Inc.
 
 ;; Authors: David Engster <deng@randomsample.de>
 ;;          Stefan Monnier <monnier@iro.umontreal.ca>
@@ -97,14 +97,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.")
 
@@ -127,7 +124,7 @@ If nil, the function `gitmerge-default-branch' guesses.")
       (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]+\\)\\.")
+    (re-search-forward "^AC_INIT([^,]+, \\([0-9]+\\)\\.")
     (string-to-number (match-string 1))))
 
 (defun gitmerge-default-branch ()
@@ -138,7 +135,7 @@ If nil, the function `gitmerge-default-branch' guesses.")
 (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))))
 
@@ -190,7 +187,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 +195,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" " "))
@@ -293,7 +290,7 @@ should not be skipped."
   "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))
@@ -634,18 +631,12 @@ Branch FROM will be prepended to the list."
       (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) Matches skip "
+		"regexp, (M) Manually picked\n\n")
 	(gitmerge-mode)
 	(pop-to-buffer (current-buffer))
 	(if noninteractive (gitmerge-start-merge))))))

admin/grammars/Makefile.in

@@ -1,6 +1,6 @@
 ### @configure_input@
 
-## Copyright (C) 2013-2023 Free Software Foundation, Inc.
+## Copyright (C) 2013-2022 Free Software Foundation, Inc.
 
 ## This file is part of GNU Emacs.
 
@@ -35,7 +35,7 @@ unexport EMACSDATA EMACSDOC EMACSLOADPATH EMACSPATH
 
 EMACS = ${top_builddir}/src/emacs
 emacs = "${EMACS}" -batch --no-site-file --no-site-lisp \
-  --eval '(setq load-prefer-newer t)'
+  --eval '(setq max-specpdl-size 5000)' --eval '(setq load-prefer-newer t)'
 
 make_bovine = ${emacs} -l semantic/bovine/grammar -f bovine-batch-make-parser
 make_wisent = ${emacs} -l semantic/wisent/grammar -f wisent-batch-make-parser

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-2022 Free Software Foundation, Inc.
 ;;
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;;         David Ponce <david@dponce.com>

admin/grammars/grammar.wy

@@ -1,6 +1,6 @@
 ;;; semantic-grammar.wy -- LALR grammar of Semantic input grammars
 ;;
-;; Copyright (C) 2002-2023 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2022 Free Software Foundation, Inc.
 ;;
 ;; Author: David Ponce <david@dponce.com>
 ;; Created: 26 Aug 2002

admin/grammars/java-tags.wy

@@ -1,6 +1,6 @@
 ;;; java-tags.wy -- Semantic LALR grammar for Java
 
-;; Copyright (C) 2002-2023 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2022 Free Software Foundation, Inc.
 ;;
 ;; Author: David Ponce <david@dponce.com>
 ;; Created: 26 Aug 2002

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-2022 Free Software Foundation, Inc.
 ;; Copyright (C) 1998-2011 Ecma International.
 
 ;; Author: Joakim Verona

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-2022 Free Software Foundation, Inc.
 ;;
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;;         David Ponce <david@dponce.com>

admin/grammars/python.wy

@@ -1,6 +1,6 @@
 ;;; python.wy -- LALR grammar for Python
 
-;; Copyright (C) 2002-2023 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2022 Free Software Foundation, Inc.
 ;; Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
 ;; 2009, 2010 Python Software Foundation; All Rights Reserved
 

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-2022 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 

admin/grammars/srecode-template.wy

@@ -1,6 +1,6 @@
 ;;; srecode-template.wy --- Semantic Recoder Template parser
 
-;; Copyright (C) 2005-2023 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2022 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: syntax
@@ -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-2022 Free Software Foundation, Inc.
 
 ;; Author: Thien-Thi Nguyen <ttn@gnu.org>
 ;; Maintainer: emacs-devel@gnu.org
@@ -41,7 +41,7 @@
 ;;
 ;; 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.
 ;;

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-2022 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 

admin/make-manuals

@@ -1,7 +1,7 @@
 #!/bin/bash
 ### make-manuals - create the Emacs manuals to upload to the gnu.org website
 
-## Copyright 2018-2023 Free Software Foundation, Inc.
+## Copyright 2018-2022 Free Software Foundation, Inc.
 
 ## Author: Glenn Morris <rgm@gnu.org>
 ## Maintainer: emacs-devel@gnu.org
@@ -33,7 +33,13 @@
 
 ### Code:
 
-source "${0%/*}/emacs-shell-lib"
+die ()                          # write error to stderr and exit
+{
+    [ $# -gt 0 ] && echo "$PN: $@" >&2
+    exit 1
+}
+
+PN=${0##*/}                     # basename of script
 
 usage ()
 {
@@ -88,7 +94,8 @@ OPTIND=1
 [ -e admin/admin.el ] || die "admin/admin.el not found"
 
 
-tempfile="$(emacs_mktemp)"
+tempfile=/tmp/$PN.$$
+trap "rm -f $tempfile 2> /dev/null" EXIT
 
 
 [ "$continue" ] || rm -rf $outdir

admin/make-tarball.txt

@@ -15,8 +15,8 @@ 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.
+    the release branch, see admin/release-branch.txt.)
+    Commit cus-edit.el if changed.
 
 3.  Remove any old pretests from https://alpha.gnu.org/gnu/emacs/pretest.
     You can use 'gnupload --delete' (see below for more gnupload details).
@@ -24,8 +24,8 @@ Steps to take before starting on the first pretest in any release sequence:
 
 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,
@@ -49,15 +49,10 @@ General steps (for each step, check for possible errors):
     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.
+    For a release (as opposed to pretest), 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.
 
 2.  Regenerate the versioned ChangeLog.N and etc/AUTHORS files.
 
@@ -68,25 +63,16 @@ General steps (for each step, check for possible errors):
       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.
+    producing the tarball.  If NN is incorrect, 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
+    If the versioned ChangeLog.N file is too large, 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:
 
@@ -108,12 +94,11 @@ General steps (for each step, check for possible errors):
     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.
+    authors.el.
 
     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.
 
@@ -130,13 +115,12 @@ General steps (for each step, check for possible errors):
 
     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
-    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.
+    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
@@ -160,13 +144,6 @@ General steps (for each step, check for possible errors):
 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.
-
-      ./admin/check-man-pages
-
-    Then do this:
-
       make -C etc/refcards
       make -C etc/refcards clean
 
@@ -179,20 +156,11 @@ General steps (for each step, check for possible errors):
     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.
+5.  Copy lisp/loaddefs.el to lisp/ldefs-boot.el.
 
     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.
+    should be committed separately, as described in step 3 above.
 
     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,
@@ -212,10 +180,9 @@ General steps (for each step, check for possible errors):
     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
+     ./admin/diff-tar-files emacs-OLD.tar.gz emacs-NEW.tar.gz
 
-    Alternatively, if you want to use the compressed tarballs (which
-    diff-tar-files doesn't understand):
+    Alternatively:
 
      tar tJf emacs-OLD.tar.xz | sed -e 's,^[^/]*,,' | sort > old_tmp
      tar tJf emacs-NEW.tar.xz | sed -e 's,^[^/]*,,' | sort > new_tmp
@@ -233,7 +200,7 @@ General steps (for each step, check for possible errors):
     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
+7.   tar -xf emacs-NEW.tar; cd emacs-NEW
      ./configure --prefix=/tmp/emacs && make check && make install
 
     Use 'script' or M-x compile to save the compilation log in
@@ -317,8 +284,7 @@ General steps (for each step, check for possible errors):
     https://alpha.gnu.org/gnu/emacs/pretest/ for a pretest, or
     https://ftp.gnu.org/gnu/emacs/ for a release.
 
-    Download them and check the signatures 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.
@@ -336,20 +302,12 @@ General steps (for each step, check for possible errors):
 
     To create the included SHA1 and SHA256 checksums, run:
 
-      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.)
+     sha1sum emacs-NEW.tar.xz
+     sha256sum emacs-NEW.tar.xz
 
 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.
-
+13. Bump the Emacs version on the release branch.
     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.
@@ -357,8 +315,8 @@ General steps (for each step, check for possible errors):
 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.)
+https://www.gnu.org/software/emacs/ should be updated.  (See
+admin/notes/www for general information.)
 
 The pages to update are:
 
@@ -374,7 +332,7 @@ looks like this:
 
     <div class="release-banner">
 	<div class="container">
-	    <h2><em>Emacs 28.1 is out</em>, download it <a href="download.html">here</a>!</h2>
+	    <h2><em>Emacs 27.1 is out</em>, download it <a href="download.html">here</a>!</h2>
 	</div>
     </div>
 
@@ -413,7 +371,7 @@ Next, regenerate the various manuals in HTML, PDF, and PS formats:
 
 Now change to the 'manual' directory and invoke upload-manuals:
 
-    ../admin/upload-manuals /path/to/webpages/cvs/checkout
+    ../admin/updload-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'

admin/merge-gnulib

@@ -4,7 +4,7 @@
 #
 #	admin/merge-gnulib
 
-# Copyright 2012-2023 Free Software Foundation, Inc.
+# Copyright 2012-2022 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -23,39 +23,38 @@
 
 # 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
+  alloca-opt binary-io byteswap c-ctype c-strcase
   canonicalize-lgpl
   careadlinkat close-stream copy-file-range
   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
+  environ execinfo explicit_bzero 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
+  manywarnings memmem-simple mempcpy memrchr 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
+  sig2str sigdescr_np socklen stat-time std-gnu11 stdalign stddef stdio
   stpcpy strnlen strtoimax symlink sys_stat sys_time
-  tempname time-h time_r time_rz timegm timer-time timespec-add timespec-sub
+  tempname time time_r time_rz timegm timer-time timespec-add timespec-sub
   update-copyright unlocked-io utimensat
   vla warnings
 '
 
 AVOIDED_MODULES='
-  btowc chmod close crypto/af_alg dup fchdir fstat langinfo lock
+  btowc 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
+  save-cwd select setenv sigprocmask stat stdarg stdbool
   threadlib tzset unsetenv utime utime-h
   wchar wcrtomb wctype-h
 '

admin/merge-pkg-config

@@ -4,7 +4,7 @@
 #
 #	admin/merge-pkg-config
 
-# Copyright 2014-2023 Free Software Foundation, Inc.
+# Copyright 2014-2022 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 

admin/notes/bug-triage

@@ -73,7 +73,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

admin/notes/copyright

@@ -1,4 +1,4 @@
-Copyright (C) 2007-2023 Free Software Foundation, Inc.
+Copyright (C) 2007-2022 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 

admin/notes/elpa

@@ -3,7 +3,7 @@ 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
 

admin/notes/emba

@@ -1,6 +1,6 @@
 -*- mode: outline; coding: utf-8 -*-
 
-Copyright (C) 2019-2023 Free Software Foundation, Inc.
+Copyright (C) 2019-2022 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 NOTES FOR EMACS CONTINUOUS BUILD ON EMBA
@@ -83,46 +83,6 @@ 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.
 

admin/notes/git-workflow

@@ -16,14 +16,14 @@ 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).
+(eg emacs-28).
 
 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
+git worktree add ../emacs-28 emacs-28
 
 You now have both branches conveniently accessible, and you can do
 "git pull" in them once in a while to keep updated.
@@ -67,7 +67,7 @@ which will look like
 
 commit 958b768a6534ae6e77a8547a56fc31b46b63710b
 
-cd ~/emacs/emacs-29
+cd ~/emacs/emacs-28
 git cherry-pick -xe 958b768a6534ae6e77a8547a56fc31b46b63710b
 
 and add "Backport:" to the commit string.  Then
@@ -109,7 +109,7 @@ 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
+(eg) 'origin/emacs-28', 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.
 

admin/notes/hydra

@@ -1,6 +1,6 @@
 -*- mode: outline; coding: utf-8 -*-
 
-Copyright (C) 2013-2023 Free Software Foundation, Inc.
+Copyright (C) 2013-2022 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 NOTES FOR EMACS CONTINUOUS BUILD ON HYDRA

admin/notes/multi-tty

@@ -1,6 +1,6 @@
 -*- coding: utf-8; mode: text; -*-
 
-Copyright (C) 2007-2023 Free Software Foundation, Inc.
+Copyright (C) 2007-2022 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 From README.multi-tty in the multi-tty branch.
@@ -474,7 +474,7 @@ THINGS TO DO
    definition.
 
    Exceptions found so far: x-select-text and
-   x-selection-value.
+   x-selection-value (old name: x-cut-buffer-or-selection-value).
 
 ** Have a look at fatal_error_hook.
 

admin/notes/repo

@@ -42,24 +42,6 @@ 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
-
 * Installing changes from gnulib
 
 Some of the files in Emacs are copied from gnulib.  To synchronize
@@ -128,14 +110,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 +124,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

@@ -6,6 +6,6 @@ Re "behavior" vs "behaviour", etc.
   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).
+  change existing text; use your best judgement (ask if unsure).
 
 - https://lists.gnu.org/r/emacs-devel/2005-06/msg00489.html

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-2022 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 Importing a new Unicode Standard version into Emacs
@@ -103,10 +103,6 @@ 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

admin/notes/www

@@ -1,6 +1,6 @@
 -*- outline -*-
 
-Copyright (C) 2013-2023 Free Software Foundation, Inc.
+Copyright (C) 2013-2022 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 NOTES FOR EMACS WWW PAGES
@@ -26,7 +26,7 @@ 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).
+a complete update of the on-line manual pages (eg after a release).
 
 * Renaming pages, redirects
 
@@ -99,7 +99,7 @@ https://lists.gnu.org/r/bug-gnulib/2012-12/msg00072.html
 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.
+Ref eg
 https://github.com/mikjo/bigitr
 https://lists.gnu.org/r/savannah-hackers-public/2013-04/msg00022.html
 

admin/notes/years

@@ -10,10 +10,9 @@ 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
+    nt/configure.bat, etc/tutorials/TUTORIAL.cn, 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

admin/nt/README-UNDUMP.W32

@@ -1,4 +1,4 @@
-Copyright (C) 2001-2023 Free Software Foundation, Inc.
+Copyright (C) 2001-2022 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 			   Emacs for Windows

admin/nt/dist-build/README-scripts

@@ -131,7 +131,7 @@ 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
+the version (e.g emacs-27-2019-12-26.zip) rather than than the Emacs
 version (e.g emacs-27.0.50.zip).
 
 

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

@@ -1,4 +1,4 @@
-Copyright (C) 2001-2023 Free Software Foundation, Inc.
+Copyright (C) 2001-2022 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 		      Precompiled Distributions of

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

@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 
-## Copyright (C) 2017-2023 Free Software Foundation, Inc.
+## Copyright (C) 2017-2022 Free Software Foundation, Inc.
 
 ## This file is part of GNU Emacs.
 

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

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-## Copyright (C) 2017-2023 Free Software Foundation, Inc.
+## Copyright (C) 2017-2022 Free Software Foundation, Inc.
 
 ## This file is part of GNU Emacs.
 
@@ -148,7 +148,7 @@ done
 if [ -z $ACTUAL_VERSION ];
 then
     ACTUAL_VERSION=`
-  sed -n 's/^AC_INIT(\[*GNU Emacs]*,[	 ]*\[*\([^]	 ,)]*\).*/\1/p' < ../../../configure.ac
+  sed -n 's/^AC_INIT(GNU Emacs,[	 ]*\([^	 ,)]*\).*/\1/p' < ../../../configure.ac
 `
 fi
 

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-2022 Free Software Foundation, Inc.
 
 ## Author: Miles Bader <miles@gnu.org>
 
@@ -172,10 +172,10 @@ 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
+  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([	 ]*GNU Emacs[	 ]*,[	 ]*\([^	 ),]*\).*/\1/p' <$SRC/configure.ac
 ` || exit 4
 test -n "$VERSION" || { printf '%s\n' >&2 "$me: no version in configure.ac"; exit 4; }
 

admin/unidata/BidiBrackets.txt

@@ -1,6 +1,6 @@
-# BidiBrackets-15.0.0.txt
-# Date: 2022-05-03, 18:42:00 GMT [AG, LI, KW]
-# © 2022 Unicode®, Inc.
+# BidiBrackets-14.0.0.txt
+# Date: 2021-06-30, 23:59:00 GMT [AG, LI, KW]
+# © 2021 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use, see https://www.unicode.org/terms_of_use.html
 #

admin/unidata/BidiMirroring.txt

@@ -1,6 +1,6 @@
-# BidiMirroring-15.0.0.txt
-# Date: 2022-05-03, 18:47:00 GMT [KW, RP]
-# © 2022 Unicode®, Inc.
+# BidiMirroring-14.0.0.txt
+# Date: 2021-08-08, 22:55:00 GMT [KW, RP]
+# © 2021 Unicode®, Inc.
 # For terms of use, see https://www.unicode.org/terms_of_use.html
 #
 # Unicode Character Database
@@ -15,7 +15,7 @@
 # value, for which there is another Unicode character that typically has a glyph
 # that is the mirror image of the original character's glyph.
 #
-# The repertoire covered by the file is Unicode 15.0.0.
+# The repertoire covered by the file is Unicode 14.0.0.
 #
 # The file contains a list of lines with mappings from one code point
 # to another one for character-based mirroring.

admin/unidata/Blocks.txt

@@ -1,10 +1,10 @@
-# Blocks-15.0.0.txt
-# Date: 2022-01-28, 20:58:00 GMT [KW]
-# © 2022 Unicode®, Inc.
-# For terms of use, see https://www.unicode.org/terms_of_use.html
+# Blocks-14.0.0.txt
+# Date: 2021-01-22, 23:29:00 GMT [KW]
+# © 2021 Unicode®, Inc.
+# For terms of use, see http://www.unicode.org/terms_of_use.html
 #
 # Unicode Character Database
-# For documentation, see https://www.unicode.org/reports/tr44/
+# For documentation, see http://www.unicode.org/reports/tr44/
 #
 # Format:
 # Start Code..End Code; Block Name
@@ -15,7 +15,7 @@
 #         and underbars are ignored.
 #         For example, "Latin Extended-A" and "latin extended a" are equivalent.
 #         For more information on the comparison of property values,
-#            see UAX #44: https://www.unicode.org/reports/tr44/
+#            see UAX #44: http://www.unicode.org/reports/tr44/
 #
 #  All block ranges start with a value where (cp MOD 16) = 0,
 #  and end with a value where (cp MOD 16) = 15. In other words,
@@ -241,7 +241,6 @@ FFF0..FFFF; Specials
 10D00..10D3F; Hanifi Rohingya
 10E60..10E7F; Rumi Numeral Symbols
 10E80..10EBF; Yezidi
-10EC0..10EFF; Arabic Extended-C
 10F00..10F2F; Old Sogdian
 10F30..10F6F; Sogdian
 10F70..10FAF; Old Uyghur
@@ -273,13 +272,11 @@ FFF0..FFFF; Specials
 11A50..11AAF; Soyombo
 11AB0..11ABF; Unified Canadian Aboriginal Syllabics Extended-A
 11AC0..11AFF; Pau Cin Hau
-11B00..11B5F; Devanagari Extended-A
 11C00..11C6F; Bhaiksuki
 11C70..11CBF; Marchen
 11D00..11D5F; Masaram Gondi
 11D60..11DAF; Gunjala Gondi
 11EE0..11EFF; Makasar
-11F00..11F5F; Kawi
 11FB0..11FBF; Lisu Supplement
 11FC0..11FFF; Tamil Supplement
 12000..123FF; Cuneiform
@@ -287,7 +284,7 @@ FFF0..FFFF; Specials
 12480..1254F; Early Dynastic Cuneiform
 12F90..12FFF; Cypro-Minoan
 13000..1342F; Egyptian Hieroglyphs
-13430..1345F; Egyptian Hieroglyph Format Controls
+13430..1343F; Egyptian Hieroglyph Format Controls
 14400..1467F; Anatolian Hieroglyphs
 16800..16A3F; Bamum Supplement
 16A40..16A6F; Mro
@@ -312,7 +309,6 @@ FFF0..FFFF; Specials
 1D000..1D0FF; Byzantine Musical Symbols
 1D100..1D1FF; Musical Symbols
 1D200..1D24F; Ancient Greek Musical Notation
-1D2C0..1D2DF; Kaktovik Numerals
 1D2E0..1D2FF; Mayan Numerals
 1D300..1D35F; Tai Xuan Jing Symbols
 1D360..1D37F; Counting Rod Numerals
@@ -320,11 +316,9 @@ FFF0..FFFF; Specials
 1D800..1DAAF; Sutton SignWriting
 1DF00..1DFFF; Latin Extended-G
 1E000..1E02F; Glagolitic Supplement
-1E030..1E08F; Cyrillic Extended-D
 1E100..1E14F; Nyiakeng Puachue Hmong
 1E290..1E2BF; Toto
 1E2C0..1E2FF; Wancho
-1E4D0..1E4FF; Nag Mundari
 1E7E0..1E7FF; Ethiopic Extended-B
 1E800..1E8DF; Mende Kikakui
 1E900..1E95F; Adlam
@@ -354,7 +348,6 @@ FFF0..FFFF; Specials
 2CEB0..2EBEF; CJK Unified Ideographs Extension F
 2F800..2FA1F; CJK Compatibility Ideographs Supplement
 30000..3134F; CJK Unified Ideographs Extension G
-31350..323AF; CJK Unified Ideographs Extension H
 E0000..E007F; Tags
 E0100..E01EF; Variation Selectors Supplement
 F0000..FFFFF; Supplementary Private Use Area-A

admin/unidata/IVD_Sequences.txt

@@ -2,9 +2,6 @@
 #
 # History:
 #
-# 2022-09-13 Registration of additional sequences in the Adobe-Japan1
-#            collection.
-#
 # 2020-11-06 Registration of additional sequences in the MSARG
 #            collection.
 #
@@ -35,7 +32,7 @@
 # For more details on the IVD, see UTS #37:
 # https://www.unicode.org/reports/tr37/
 #
-# Copyright 2006-2022 Unicode, Inc.
+# Copyright 2006-2020 Unicode, Inc.
 # For terms of use, see: https://www.unicode.org/copyright.html#8
 #
 3402 E0100; Adobe-Japan1; CID+13698
@@ -39340,5 +39337,4 @@ FA29 E0100; Adobe-Japan1; CID+8687
 2EB71 E0101; Moji_Joho; MJ059252
 2EB79 E0100; Moji_Joho; MJ059255
 2EB79 E0101; Moji_Joho; MJ059256
-31350 E0100; Adobe-Japan1; CID+19130
 # EOF

admin/unidata/IdnaMappingTable.txt

@@ -1,13 +1,13 @@
 # IdnaMappingTable.txt
-# Date: 2022-05-02, 19:29:26 GMT
-# © 2022 Unicode®, Inc.
+# Date: 2021-07-10, 00:49:51 GMT
+# © 2021 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
-# For terms of use, see https://www.unicode.org/terms_of_use.html
+# For terms of use, see http://www.unicode.org/terms_of_use.html
 #
 # Unicode IDNA Compatible Preprocessing for UTS #46
-# Version: 15.0.0
+# Version: 14.0.0
 #
-# For documentation and usage, see https://www.unicode.org/reports/tr46
+# For documentation and usage, see http://www.unicode.org/reports/tr46
 #
 0000..002C    ; disallowed_STD3_valid                  # 1.1  <control-0000>..COMMA
 002D..002E    ; valid                                  # 1.1  HYPHEN-MINUS..FULL STOP
@@ -1278,8 +1278,7 @@
 0CE6..0CEF    ; valid                                  # 1.1  KANNADA DIGIT ZERO..KANNADA DIGIT NINE
 0CF0          ; disallowed                             # NA   <reserved-0CF0>
 0CF1..0CF2    ; valid                                  # 5.0  KANNADA SIGN JIHVAMULIYA..KANNADA SIGN UPADHMANIYA
-0CF3          ; valid                                  # 15.0 KANNADA SIGN COMBINING ANUSVARA ABOVE RIGHT
-0CF4..0CFF    ; disallowed                             # NA   <reserved-0CF4>..<reserved-0CFF>
+0CF3..0CFF    ; disallowed                             # NA   <reserved-0CF3>..<reserved-0CFF>
 0D00          ; valid                                  # 10.0 MALAYALAM SIGN COMBINING ANUSVARA ABOVE
 0D01          ; valid                                  # 7.0  MALAYALAM SIGN CANDRABINDU
 0D02..0D03    ; valid                                  # 1.1  MALAYALAM SIGN ANUSVARA..MALAYALAM SIGN VISARGA
@@ -1387,8 +1386,7 @@
 0EC6          ; valid                                  # 1.1  LAO KO LA
 0EC7          ; disallowed                             # NA   <reserved-0EC7>
 0EC8..0ECD    ; valid                                  # 1.1  LAO TONE MAI EK..LAO NIGGAHITA
-0ECE          ; valid                                  # 15.0 LAO YAMAKKAN
-0ECF          ; disallowed                             # NA   <reserved-0ECF>
+0ECE..0ECF    ; disallowed                             # NA   <reserved-0ECE>..<reserved-0ECF>
 0ED0..0ED9    ; valid                                  # 1.1  LAO DIGIT ZERO..LAO DIGIT NINE
 0EDA..0EDB    ; disallowed                             # NA   <reserved-0EDA>..<reserved-0EDB>
 0EDC          ; mapped                 ; 0EAB 0E99     # 1.1  LAO HO NO
@@ -6208,8 +6206,7 @@ FFFE..FFFF    ; disallowed                             # 1.1  <noncharacter-FFFE
 10EAD         ; valid                  ;      ; NV8    # 13.0 YEZIDI HYPHENATION MARK
 10EAE..10EAF  ; disallowed                             # NA   <reserved-10EAE>..<reserved-10EAF>
 10EB0..10EB1  ; valid                                  # 13.0 YEZIDI LETTER LAM WITH DOT ABOVE..YEZIDI LETTER YOT WITH CIRCUMFLEX ABOVE
-10EB2..10EFC  ; disallowed                             # NA   <reserved-10EB2>..<reserved-10EFC>
-10EFD..10EFF  ; valid                                  # 15.0 ARABIC SMALL LOW WORD SAKTA..ARABIC SMALL LOW WORD MADDA
+10EB2..10EFF  ; disallowed                             # NA   <reserved-10EB2>..<reserved-10EFF>
 10F00..10F1C  ; valid                                  # 11.0 OLD SOGDIAN LETTER ALEPH..OLD SOGDIAN LETTER FINAL TAW WITH VERTICAL TAIL
 10F1D..10F26  ; valid                  ;      ; NV8    # 11.0 OLD SOGDIAN NUMBER ONE..OLD SOGDIAN FRACTION ONE HALF
 10F27         ; valid                                  # 11.0 OLD SOGDIAN LIGATURE AYIN-DALETH
@@ -6274,8 +6271,7 @@ FFFE..FFFF    ; disallowed                             # 1.1  <noncharacter-FFFE
 11213..11237  ; valid                                  # 7.0  KHOJKI LETTER NYA..KHOJKI SIGN SHADDA
 11238..1123D  ; valid                  ;      ; NV8    # 7.0  KHOJKI DANDA..KHOJKI ABBREVIATION SIGN
 1123E         ; valid                                  # 9.0  KHOJKI SIGN SUKUN
-1123F..11241  ; valid                                  # 15.0 KHOJKI LETTER QA..KHOJKI VOWEL SIGN VOCALIC R
-11242..1127F  ; disallowed                             # NA   <reserved-11242>..<reserved-1127F>
+1123F..1127F  ; disallowed                             # NA   <reserved-1123F>..<reserved-1127F>
 11280..11286  ; valid                                  # 8.0  MULTANI LETTER A..MULTANI LETTER GA
 11287         ; disallowed                             # NA   <reserved-11287>
 11288         ; valid                                  # 8.0  MULTANI LETTER GHA
@@ -6447,9 +6443,7 @@ FFFE..FFFF    ; disallowed                             # 1.1  <noncharacter-FFFE
 11AA3..11AAF  ; disallowed                             # NA   <reserved-11AA3>..<reserved-11AAF>
 11AB0..11ABF  ; valid                                  # 14.0 CANADIAN SYLLABICS NATTILIK HI..CANADIAN SYLLABICS SPA
 11AC0..11AF8  ; valid                                  # 7.0  PAU CIN HAU LETTER PA..PAU CIN HAU GLOTTAL STOP FINAL
-11AF9..11AFF  ; disallowed                             # NA   <reserved-11AF9>..<reserved-11AFF>
-11B00..11B09  ; valid                  ;      ; NV8    # 15.0 DEVANAGARI HEAD MARK..DEVANAGARI SIGN MINDU
-11B0A..11BFF  ; disallowed                             # NA   <reserved-11B0A>..<reserved-11BFF>
+11AF9..11BFF  ; disallowed                             # NA   <reserved-11AF9>..<reserved-11BFF>
 11C00..11C08  ; valid                                  # 9.0  BHAIKSUKI LETTER A..BHAIKSUKI LETTER VOCALIC L
 11C09         ; disallowed                             # NA   <reserved-11C09>
 11C0A..11C36  ; valid                                  # 9.0  BHAIKSUKI LETTER E..BHAIKSUKI VOWEL SIGN VOCALIC L
@@ -6495,15 +6489,7 @@ FFFE..FFFF    ; disallowed                             # 1.1  <noncharacter-FFFE
 11DAA..11EDF  ; disallowed                             # NA   <reserved-11DAA>..<reserved-11EDF>
 11EE0..11EF6  ; valid                                  # 11.0 MAKASAR LETTER KA..MAKASAR VOWEL SIGN O
 11EF7..11EF8  ; valid                  ;      ; NV8    # 11.0 MAKASAR PASSIMBANG..MAKASAR END OF SECTION
-11EF9..11EFF  ; disallowed                             # NA   <reserved-11EF9>..<reserved-11EFF>
-11F00..11F10  ; valid                                  # 15.0 KAWI SIGN CANDRABINDU..KAWI LETTER O
-11F11         ; disallowed                             # NA   <reserved-11F11>
-11F12..11F3A  ; valid                                  # 15.0 KAWI LETTER KA..KAWI VOWEL SIGN VOCALIC R
-11F3B..11F3D  ; disallowed                             # NA   <reserved-11F3B>..<reserved-11F3D>
-11F3E..11F42  ; valid                                  # 15.0 KAWI VOWEL SIGN E..KAWI CONJOINER
-11F43..11F4F  ; valid                  ;      ; NV8    # 15.0 KAWI DANDA..KAWI PUNCTUATION CLOSING SPIRAL
-11F50..11F59  ; valid                                  # 15.0 KAWI DIGIT ZERO..KAWI DIGIT NINE
-11F5A..11FAF  ; disallowed                             # NA   <reserved-11F5A>..<reserved-11FAF>
+11EF9..11FAF  ; disallowed                             # NA   <reserved-11EF9>..<reserved-11FAF>
 11FB0         ; valid                                  # 13.0 LISU LETTER YHA
 11FB1..11FBF  ; disallowed                             # NA   <reserved-11FB1>..<reserved-11FBF>
 11FC0..11FF1  ; valid                  ;      ; NV8    # 12.0 TAMIL FRACTION ONE THREE-HUNDRED-AND-TWENTIETH..TAMIL SIGN VAKAIYARAA
@@ -6525,11 +6511,9 @@ FFFE..FFFF    ; disallowed                             # 1.1  <noncharacter-FFFE
 12FF1..12FF2  ; valid                  ;      ; NV8    # 14.0 CYPRO-MINOAN SIGN CM301..CYPRO-MINOAN SIGN CM302
 12FF3..12FFF  ; disallowed                             # NA   <reserved-12FF3>..<reserved-12FFF>
 13000..1342E  ; valid                                  # 5.2  EGYPTIAN HIEROGLYPH A001..EGYPTIAN HIEROGLYPH AA032
-1342F         ; valid                                  # 15.0 EGYPTIAN HIEROGLYPH V011D
+1342F         ; disallowed                             # NA   <reserved-1342F>
 13430..13438  ; disallowed                             # 12.0 EGYPTIAN HIEROGLYPH VERTICAL JOINER..EGYPTIAN HIEROGLYPH END SEGMENT
-13439..1343F  ; disallowed                             # 15.0 EGYPTIAN HIEROGLYPH INSERT AT MIDDLE..EGYPTIAN HIEROGLYPH END WALLED ENCLOSURE
-13440..13455  ; valid                                  # 15.0 EGYPTIAN HIEROGLYPH MIRROR HORIZONTALLY..EGYPTIAN HIEROGLYPH MODIFIER DAMAGED
-13456..143FF  ; disallowed                             # NA   <reserved-13456>..<reserved-143FF>
+13439..143FF  ; disallowed                             # NA   <reserved-13439>..<reserved-143FF>
 14400..14646  ; valid                                  # 8.0  ANATOLIAN HIEROGLYPH A001..ANATOLIAN HIEROGLYPH A530
 14647..167FF  ; disallowed                             # NA   <reserved-14647>..<reserved-167FF>
 16800..16A38  ; valid                                  # 6.0  BAMUM LETTER PHASE-A NGKUE MFON..BAMUM LETTER PHASE-F VUEQ
@@ -6631,13 +6615,9 @@ FFFE..FFFF    ; disallowed                             # 1.1  <noncharacter-FFFE
 1B000..1B001  ; valid                                  # 6.0  KATAKANA LETTER ARCHAIC E..HIRAGANA LETTER ARCHAIC YE
 1B002..1B11E  ; valid                                  # 10.0 HENTAIGANA LETTER A-1..HENTAIGANA LETTER N-MU-MO-2
 1B11F..1B122  ; valid                                  # 14.0 HIRAGANA LETTER ARCHAIC WU..KATAKANA LETTER ARCHAIC WU
-1B123..1B131  ; disallowed                             # NA   <reserved-1B123>..<reserved-1B131>
-1B132         ; valid                                  # 15.0 HIRAGANA LETTER SMALL KO
-1B133..1B14F  ; disallowed                             # NA   <reserved-1B133>..<reserved-1B14F>
+1B123..1B14F  ; disallowed                             # NA   <reserved-1B123>..<reserved-1B14F>
 1B150..1B152  ; valid                                  # 12.0 HIRAGANA LETTER SMALL WI..HIRAGANA LETTER SMALL WO
-1B153..1B154  ; disallowed                             # NA   <reserved-1B153>..<reserved-1B154>
-1B155         ; valid                                  # 15.0 KATAKANA LETTER SMALL KO
-1B156..1B163  ; disallowed                             # NA   <reserved-1B156>..<reserved-1B163>
+1B153..1B163  ; disallowed                             # NA   <reserved-1B153>..<reserved-1B163>
 1B164..1B167  ; valid                                  # 12.0 KATAKANA LETTER SMALL WI..KATAKANA LETTER SMALL N
 1B168..1B16F  ; disallowed                             # NA   <reserved-1B168>..<reserved-1B16F>
 1B170..1B2FB  ; valid                                  # 10.0 NUSHU CHARACTER-1B170..NUSHU CHARACTER-1B2FB
@@ -6688,9 +6668,7 @@ FFFE..FFFF    ; disallowed                             # 1.1  <noncharacter-FFFE
 1D1E9..1D1EA  ; valid                  ;      ; NV8    # 14.0 MUSICAL SYMBOL SORI..MUSICAL SYMBOL KORON
 1D1EB..1D1FF  ; disallowed                             # NA   <reserved-1D1EB>..<reserved-1D1FF>
 1D200..1D245  ; valid                  ;      ; NV8    # 4.1  GREEK VOCAL NOTATION SYMBOL-1..GREEK MUSICAL LEIMMA
-1D246..1D2BF  ; disallowed                             # NA   <reserved-1D246>..<reserved-1D2BF>
-1D2C0..1D2D3  ; valid                  ;      ; NV8    # 15.0 KAKTOVIK NUMERAL ZERO..KAKTOVIK NUMERAL NINETEEN
-1D2D4..1D2DF  ; disallowed                             # NA   <reserved-1D2D4>..<reserved-1D2DF>
+1D246..1D2DF  ; disallowed                             # NA   <reserved-1D246>..<reserved-1D2DF>
 1D2E0..1D2F3  ; valid                  ;      ; NV8    # 11.0 MAYAN NUMERAL ZERO..MAYAN NUMERAL NINETEEN
 1D2F4..1D2FF  ; disallowed                             # NA   <reserved-1D2F4>..<reserved-1D2FF>
 1D300..1D356  ; valid                  ;      ; NV8    # 4.0  MONOGRAM FOR EARTH..TETRAGRAM FOR FOSTERING
@@ -7723,9 +7701,7 @@ FFFE..FFFF    ; disallowed                             # 1.1  <noncharacter-FFFE
 1DAA1..1DAAF  ; valid                                  # 8.0  SIGNWRITING ROTATION MODIFIER-2..SIGNWRITING ROTATION MODIFIER-16
 1DAB0..1DEFF  ; disallowed                             # NA   <reserved-1DAB0>..<reserved-1DEFF>
 1DF00..1DF1E  ; valid                                  # 14.0 LATIN SMALL LETTER FENG DIGRAPH WITH TRILL..LATIN SMALL LETTER S WITH CURL
-1DF1F..1DF24  ; disallowed                             # NA   <reserved-1DF1F>..<reserved-1DF24>
-1DF25..1DF2A  ; valid                                  # 15.0 LATIN SMALL LETTER D WITH MID-HEIGHT LEFT HOOK..LATIN SMALL LETTER T WITH MID-HEIGHT LEFT HOOK
-1DF2B..1DFFF  ; disallowed                             # NA   <reserved-1DF2B>..<reserved-1DFFF>
+1DF1F..1DFFF  ; disallowed                             # NA   <reserved-1DF1F>..<reserved-1DFFF>
 1E000..1E006  ; valid                                  # 9.0  COMBINING GLAGOLITIC LETTER AZU..COMBINING GLAGOLITIC LETTER ZHIVETE
 1E007         ; disallowed                             # NA   <reserved-1E007>
 1E008..1E018  ; valid                                  # 9.0  COMBINING GLAGOLITIC LETTER ZEMLJA..COMBINING GLAGOLITIC LETTER HERU
@@ -7735,72 +7711,7 @@ FFFE..FFFF    ; disallowed                             # 1.1  <noncharacter-FFFE
 1E023..1E024  ; valid                                  # 9.0  COMBINING GLAGOLITIC LETTER YU..COMBINING GLAGOLITIC LETTER SMALL YUS
 1E025         ; disallowed                             # NA   <reserved-1E025>
 1E026..1E02A  ; valid                                  # 9.0  COMBINING GLAGOLITIC LETTER YO..COMBINING GLAGOLITIC LETTER FITA
-1E02B..1E02F  ; disallowed                             # NA   <reserved-1E02B>..<reserved-1E02F>
-1E030         ; mapped                 ; 0430          # 15.0 MODIFIER LETTER CYRILLIC SMALL A
-1E031         ; mapped                 ; 0431          # 15.0 MODIFIER LETTER CYRILLIC SMALL BE
-1E032         ; mapped                 ; 0432          # 15.0 MODIFIER LETTER CYRILLIC SMALL VE
-1E033         ; mapped                 ; 0433          # 15.0 MODIFIER LETTER CYRILLIC SMALL GHE
-1E034         ; mapped                 ; 0434          # 15.0 MODIFIER LETTER CYRILLIC SMALL DE
-1E035         ; mapped                 ; 0435          # 15.0 MODIFIER LETTER CYRILLIC SMALL IE
-1E036         ; mapped                 ; 0436          # 15.0 MODIFIER LETTER CYRILLIC SMALL ZHE
-1E037         ; mapped                 ; 0437          # 15.0 MODIFIER LETTER CYRILLIC SMALL ZE
-1E038         ; mapped                 ; 0438          # 15.0 MODIFIER LETTER CYRILLIC SMALL I
-1E039         ; mapped                 ; 043A          # 15.0 MODIFIER LETTER CYRILLIC SMALL KA
-1E03A         ; mapped                 ; 043B          # 15.0 MODIFIER LETTER CYRILLIC SMALL EL
-1E03B         ; mapped                 ; 043C          # 15.0 MODIFIER LETTER CYRILLIC SMALL EM
-1E03C         ; mapped                 ; 043E          # 15.0 MODIFIER LETTER CYRILLIC SMALL O
-1E03D         ; mapped                 ; 043F          # 15.0 MODIFIER LETTER CYRILLIC SMALL PE
-1E03E         ; mapped                 ; 0440          # 15.0 MODIFIER LETTER CYRILLIC SMALL ER
-1E03F         ; mapped                 ; 0441          # 15.0 MODIFIER LETTER CYRILLIC SMALL ES
-1E040         ; mapped                 ; 0442          # 15.0 MODIFIER LETTER CYRILLIC SMALL TE
-1E041         ; mapped                 ; 0443          # 15.0 MODIFIER LETTER CYRILLIC SMALL U
-1E042         ; mapped                 ; 0444          # 15.0 MODIFIER LETTER CYRILLIC SMALL EF
-1E043         ; mapped                 ; 0445          # 15.0 MODIFIER LETTER CYRILLIC SMALL HA
-1E044         ; mapped                 ; 0446          # 15.0 MODIFIER LETTER CYRILLIC SMALL TSE
-1E045         ; mapped                 ; 0447          # 15.0 MODIFIER LETTER CYRILLIC SMALL CHE
-1E046         ; mapped                 ; 0448          # 15.0 MODIFIER LETTER CYRILLIC SMALL SHA
-1E047         ; mapped                 ; 044B          # 15.0 MODIFIER LETTER CYRILLIC SMALL YERU
-1E048         ; mapped                 ; 044D          # 15.0 MODIFIER LETTER CYRILLIC SMALL E
-1E049         ; mapped                 ; 044E          # 15.0 MODIFIER LETTER CYRILLIC SMALL YU
-1E04A         ; mapped                 ; A689          # 15.0 MODIFIER LETTER CYRILLIC SMALL DZZE
-1E04B         ; mapped                 ; 04D9          # 15.0 MODIFIER LETTER CYRILLIC SMALL SCHWA
-1E04C         ; mapped                 ; 0456          # 15.0 MODIFIER LETTER CYRILLIC SMALL BYELORUSSIAN-UKRAINIAN I
-1E04D         ; mapped                 ; 0458          # 15.0 MODIFIER LETTER CYRILLIC SMALL JE
-1E04E         ; mapped                 ; 04E9          # 15.0 MODIFIER LETTER CYRILLIC SMALL BARRED O
-1E04F         ; mapped                 ; 04AF          # 15.0 MODIFIER LETTER CYRILLIC SMALL STRAIGHT U
-1E050         ; mapped                 ; 04CF          # 15.0 MODIFIER LETTER CYRILLIC SMALL PALOCHKA
-1E051         ; mapped                 ; 0430          # 15.0 CYRILLIC SUBSCRIPT SMALL LETTER A
-1E052         ; mapped                 ; 0431          # 15.0 CYRILLIC SUBSCRIPT SMALL LETTER BE
-1E053         ; mapped                 ; 0432          # 15.0 CYRILLIC SUBSCRIPT SMALL LETTER VE
-1E054         ; mapped                 ; 0433          # 15.0 CYRILLIC SUBSCRIPT SMALL LETTER GHE
-1E055         ; mapped                 ; 0434          # 15.0 CYRILLIC SUBSCRIPT SMALL LETTER DE
-1E056         ; mapped                 ; 0435          # 15.0 CYRILLIC SUBSCRIPT SMALL LETTER IE
-1E057         ; mapped                 ; 0436          # 15.0 CYRILLIC SUBSCRIPT SMALL LETTER ZHE
-1E058         ; mapped                 ; 0437          # 15.0 CYRILLIC SUBSCRIPT SMALL LETTER ZE
-1E059         ; mapped                 ; 0438          # 15.0 CYRILLIC SUBSCRIPT SMALL LETTER I
-1E05A         ; mapped                 ; 043A          # 15.0 CYRILLIC SUBSCRIPT SMALL LETTER KA
-1E05B         ; mapped                 ; 043B          # 15.0 CYRILLIC SUBSCRIPT SMALL LETTER EL
-1E05C         ; mapped                 ; 043E          # 15.0 CYRILLIC SUBSCRIPT SMALL LETTER O
-1E05D         ; mapped                 ; 043F          # 15.0 CYRILLIC SUBSCRIPT SMALL LETTER PE
-1E05E         ; mapped                 ; 0441          # 15.0 CYRILLIC SUBSCRIPT SMALL LETTER ES
-1E05F         ; mapped                 ; 0443          # 15.0 CYRILLIC SUBSCRIPT SMALL LETTER U
-1E060         ; mapped                 ; 0444          # 15.0 CYRILLIC SUBSCRIPT SMALL LETTER EF
-1E061         ; mapped                 ; 0445          # 15.0 CYRILLIC SUBSCRIPT SMALL LETTER HA
-1E062         ; mapped                 ; 0446          # 15.0 CYRILLIC SUBSCRIPT SMALL LETTER TSE
-1E063         ; mapped                 ; 0447          # 15.0 CYRILLIC SUBSCRIPT SMALL LETTER CHE
-1E064         ; mapped                 ; 0448          # 15.0 CYRILLIC SUBSCRIPT SMALL LETTER SHA
-1E065         ; mapped                 ; 044A          # 15.0 CYRILLIC SUBSCRIPT SMALL LETTER HARD SIGN
-1E066         ; mapped                 ; 044B          # 15.0 CYRILLIC SUBSCRIPT SMALL LETTER YERU
-1E067         ; mapped                 ; 0491          # 15.0 CYRILLIC SUBSCRIPT SMALL LETTER GHE WITH UPTURN
-1E068         ; mapped                 ; 0456          # 15.0 CYRILLIC SUBSCRIPT SMALL LETTER BYELORUSSIAN-UKRAINIAN I
-1E069         ; mapped                 ; 0455          # 15.0 CYRILLIC SUBSCRIPT SMALL LETTER DZE
-1E06A         ; mapped                 ; 045F          # 15.0 CYRILLIC SUBSCRIPT SMALL LETTER DZHE
-1E06B         ; mapped                 ; 04AB          # 15.0 MODIFIER LETTER CYRILLIC SMALL ES WITH DESCENDER
-1E06C         ; mapped                 ; A651          # 15.0 MODIFIER LETTER CYRILLIC SMALL YERU WITH BACK YER
-1E06D         ; mapped                 ; 04B1          # 15.0 MODIFIER LETTER CYRILLIC SMALL STRAIGHT U WITH STROKE
-1E06E..1E08E  ; disallowed                             # NA   <reserved-1E06E>..<reserved-1E08E>
-1E08F         ; valid                                  # 15.0 COMBINING CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
-1E090..1E0FF  ; disallowed                             # NA   <reserved-1E090>..<reserved-1E0FF>
+1E02B..1E0FF  ; disallowed                             # NA   <reserved-1E02B>..<reserved-1E0FF>
 1E100..1E12C  ; valid                                  # 12.0 NYIAKENG PUACHUE HMONG LETTER MA..NYIAKENG PUACHUE HMONG LETTER W
 1E12D..1E12F  ; disallowed                             # NA   <reserved-1E12D>..<reserved-1E12F>
 1E130..1E13D  ; valid                                  # 12.0 NYIAKENG PUACHUE HMONG TONE-B..NYIAKENG PUACHUE HMONG SYLLABLE LENGTHENER
@@ -7815,9 +7726,7 @@ FFFE..FFFF    ; disallowed                             # 1.1  <noncharacter-FFFE
 1E2C0..1E2F9  ; valid                                  # 12.0 WANCHO LETTER AA..WANCHO DIGIT NINE
 1E2FA..1E2FE  ; disallowed                             # NA   <reserved-1E2FA>..<reserved-1E2FE>
 1E2FF         ; valid                  ;      ; NV8    # 12.0 WANCHO NGUN SIGN
-1E300..1E4CF  ; disallowed                             # NA   <reserved-1E300>..<reserved-1E4CF>
-1E4D0..1E4F9  ; valid                                  # 15.0 NAG MUNDARI LETTER O..NAG MUNDARI DIGIT NINE
-1E4FA..1E7DF  ; disallowed                             # NA   <reserved-1E4FA>..<reserved-1E7DF>
+1E300..1E7DF  ; disallowed                             # NA   <reserved-1E300>..<reserved-1E7DF>
 1E7E0..1E7E6  ; valid                                  # 14.0 ETHIOPIC SYLLABLE HHYA..ETHIOPIC SYLLABLE HHYO
 1E7E7         ; disallowed                             # NA   <reserved-1E7E7>
 1E7E8..1E7EB  ; valid                                  # 14.0 ETHIOPIC SYLLABLE GURAGE HHWA..ETHIOPIC SYLLABLE HHWE
@@ -8304,8 +8213,7 @@ FFFE..FFFF    ; disallowed                             # 1.1  <noncharacter-FFFE
 1F6D3..1F6D4  ; valid                  ;      ; NV8    # 10.0 STUPA..PAGODA
 1F6D5         ; valid                  ;      ; NV8    # 12.0 HINDU TEMPLE
 1F6D6..1F6D7  ; valid                  ;      ; NV8    # 13.0 HUT..ELEVATOR
-1F6D8..1F6DB  ; disallowed                             # NA   <reserved-1F6D8>..<reserved-1F6DB>
-1F6DC         ; valid                  ;      ; NV8    # 15.0 WIRELESS
+1F6D8..1F6DC  ; disallowed                             # NA   <reserved-1F6D8>..<reserved-1F6DC>
 1F6DD..1F6DF  ; valid                  ;      ; NV8    # 14.0 PLAYGROUND SLIDE..RING BUOY
 1F6E0..1F6EC  ; valid                  ;      ; NV8    # 7.0  HAMMER AND WRENCH..AIRPLANE ARRIVING
 1F6ED..1F6EF  ; disallowed                             # NA   <reserved-1F6ED>..<reserved-1F6EF>
@@ -8317,13 +8225,10 @@ FFFE..FFFF    ; disallowed                             # 1.1  <noncharacter-FFFE
 1F6FB..1F6FC  ; valid                  ;      ; NV8    # 13.0 PICKUP TRUCK..ROLLER SKATE
 1F6FD..1F6FF  ; disallowed                             # NA   <reserved-1F6FD>..<reserved-1F6FF>
 1F700..1F773  ; valid                  ;      ; NV8    # 6.0  ALCHEMICAL SYMBOL FOR QUINTESSENCE..ALCHEMICAL SYMBOL FOR HALF OUNCE
-1F774..1F776  ; valid                  ;      ; NV8    # 15.0 LOT OF FORTUNE..LUNAR ECLIPSE
-1F777..1F77A  ; disallowed                             # NA   <reserved-1F777>..<reserved-1F77A>
-1F77B..1F77F  ; valid                  ;      ; NV8    # 15.0 HAUMEA..ORCUS
+1F774..1F77F  ; disallowed                             # NA   <reserved-1F774>..<reserved-1F77F>
 1F780..1F7D4  ; valid                  ;      ; NV8    # 7.0  BLACK LEFT-POINTING ISOSCELES RIGHT TRIANGLE..HEAVY TWELVE POINTED PINWHEEL STAR
 1F7D5..1F7D8  ; valid                  ;      ; NV8    # 11.0 CIRCLED TRIANGLE..NEGATIVE CIRCLED SQUARE
-1F7D9         ; valid                  ;      ; NV8    # 15.0 NINE POINTED WHITE STAR
-1F7DA..1F7DF  ; disallowed                             # NA   <reserved-1F7DA>..<reserved-1F7DF>
+1F7D9..1F7DF  ; disallowed                             # NA   <reserved-1F7D9>..<reserved-1F7DF>
 1F7E0..1F7EB  ; valid                  ;      ; NV8    # 12.0 LARGE ORANGE CIRCLE..LARGE BROWN SQUARE
 1F7EC..1F7EF  ; disallowed                             # NA   <reserved-1F7EC>..<reserved-1F7EF>
 1F7F0         ; valid                  ;      ; NV8    # 14.0 HEAVY EQUALS SIGN
@@ -8390,37 +8295,30 @@ FFFE..FFFF    ; disallowed                             # 1.1  <noncharacter-FFFE
 1FA6E..1FA6F  ; disallowed                             # NA   <reserved-1FA6E>..<reserved-1FA6F>
 1FA70..1FA73  ; valid                  ;      ; NV8    # 12.0 BALLET SHOES..SHORTS
 1FA74         ; valid                  ;      ; NV8    # 13.0 THONG SANDAL
-1FA75..1FA77  ; valid                  ;      ; NV8    # 15.0 LIGHT BLUE HEART..PINK HEART
+1FA75..1FA77  ; disallowed                             # NA   <reserved-1FA75>..<reserved-1FA77>
 1FA78..1FA7A  ; valid                  ;      ; NV8    # 12.0 DROP OF BLOOD..STETHOSCOPE
 1FA7B..1FA7C  ; valid                  ;      ; NV8    # 14.0 X-RAY..CRUTCH
 1FA7D..1FA7F  ; disallowed                             # NA   <reserved-1FA7D>..<reserved-1FA7F>
 1FA80..1FA82  ; valid                  ;      ; NV8    # 12.0 YO-YO..PARACHUTE
 1FA83..1FA86  ; valid                  ;      ; NV8    # 13.0 BOOMERANG..NESTING DOLLS
-1FA87..1FA88  ; valid                  ;      ; NV8    # 15.0 MARACAS..FLUTE
-1FA89..1FA8F  ; disallowed                             # NA   <reserved-1FA89>..<reserved-1FA8F>
+1FA87..1FA8F  ; disallowed                             # NA   <reserved-1FA87>..<reserved-1FA8F>
 1FA90..1FA95  ; valid                  ;      ; NV8    # 12.0 RINGED PLANET..BANJO
 1FA96..1FAA8  ; valid                  ;      ; NV8    # 13.0 MILITARY HELMET..ROCK
 1FAA9..1FAAC  ; valid                  ;      ; NV8    # 14.0 MIRROR BALL..HAMSA
-1FAAD..1FAAF  ; valid                  ;      ; NV8    # 15.0 FOLDING HAND FAN..KHANDA
+1FAAD..1FAAF  ; disallowed                             # NA   <reserved-1FAAD>..<reserved-1FAAF>
 1FAB0..1FAB6  ; valid                  ;      ; NV8    # 13.0 FLY..FEATHER
 1FAB7..1FABA  ; valid                  ;      ; NV8    # 14.0 LOTUS..NEST WITH EGGS
-1FABB..1FABD  ; valid                  ;      ; NV8    # 15.0 HYACINTH..WING
-1FABE         ; disallowed                             # NA   <reserved-1FABE>
-1FABF         ; valid                  ;      ; NV8    # 15.0 GOOSE
+1FABB..1FABF  ; disallowed                             # NA   <reserved-1FABB>..<reserved-1FABF>
 1FAC0..1FAC2  ; valid                  ;      ; NV8    # 13.0 ANATOMICAL HEART..PEOPLE HUGGING
 1FAC3..1FAC5  ; valid                  ;      ; NV8    # 14.0 PREGNANT MAN..PERSON WITH CROWN
-1FAC6..1FACD  ; disallowed                             # NA   <reserved-1FAC6>..<reserved-1FACD>
-1FACE..1FACF  ; valid                  ;      ; NV8    # 15.0 MOOSE..DONKEY
+1FAC6..1FACF  ; disallowed                             # NA   <reserved-1FAC6>..<reserved-1FACF>
 1FAD0..1FAD6  ; valid                  ;      ; NV8    # 13.0 BLUEBERRIES..TEAPOT
 1FAD7..1FAD9  ; valid                  ;      ; NV8    # 14.0 POURING LIQUID..JAR
-1FADA..1FADB  ; valid                  ;      ; NV8    # 15.0 GINGER ROOT..PEA POD
-1FADC..1FADF  ; disallowed                             # NA   <reserved-1FADC>..<reserved-1FADF>
+1FADA..1FADF  ; disallowed                             # NA   <reserved-1FADA>..<reserved-1FADF>
 1FAE0..1FAE7  ; valid                  ;      ; NV8    # 14.0 MELTING FACE..BUBBLES
-1FAE8         ; valid                  ;      ; NV8    # 15.0 SHAKING FACE
-1FAE9..1FAEF  ; disallowed                             # NA   <reserved-1FAE9>..<reserved-1FAEF>
+1FAE8..1FAEF  ; disallowed                             # NA   <reserved-1FAE8>..<reserved-1FAEF>
 1FAF0..1FAF6  ; valid                  ;      ; NV8    # 14.0 HAND WITH INDEX FINGER AND THUMB CROSSED..HEART HANDS
-1FAF7..1FAF8  ; valid                  ;      ; NV8    # 15.0 LEFTWARDS PUSHING HAND..RIGHTWARDS PUSHING HAND
-1FAF9..1FAFF  ; disallowed                             # NA   <reserved-1FAF9>..<reserved-1FAFF>
+1FAF7..1FAFF  ; disallowed                             # NA   <reserved-1FAF7>..<reserved-1FAFF>
 1FB00..1FB92  ; valid                  ;      ; NV8    # 13.0 BLOCK SEXTANT-1..UPPER HALF INVERSE MEDIUM SHADE AND LOWER HALF BLOCK
 1FB93         ; disallowed                             # NA   <reserved-1FB93>
 1FB94..1FBCA  ; valid                  ;      ; NV8    # 13.0 LEFT HALF INVERSE MEDIUM SHADE AND RIGHT HALF BLOCK..WHITE UP-POINTING CHEVRON
@@ -8443,8 +8341,7 @@ FFFE..FFFF    ; disallowed                             # 1.1  <noncharacter-FFFE
 2A6E0..2A6FF  ; disallowed                             # NA   <reserved-2A6E0>..<reserved-2A6FF>
 2A700..2B734  ; valid                                  # 5.2  CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B734
 2B735..2B738  ; valid                                  # 14.0 CJK UNIFIED IDEOGRAPH-2B735..CJK UNIFIED IDEOGRAPH-2B738
-2B739         ; valid                                  # 15.0 CJK UNIFIED IDEOGRAPH-2B739
-2B73A..2B73F  ; disallowed                             # NA   <reserved-2B73A>..<reserved-2B73F>
+2B739..2B73F  ; disallowed                             # NA   <reserved-2B739>..<reserved-2B73F>
 2B740..2B81D  ; valid                                  # 6.0  CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D
 2B81E..2B81F  ; disallowed                             # NA   <reserved-2B81E>..<reserved-2B81F>
 2B820..2CEA1  ; valid                                  # 8.0  CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEA1
@@ -8986,9 +8883,7 @@ FFFE..FFFF    ; disallowed                             # 1.1  <noncharacter-FFFE
 2FA1E..2FFFD  ; disallowed                             # NA   <reserved-2FA1E>..<reserved-2FFFD>
 2FFFE..2FFFF  ; disallowed                             # 2.0  <noncharacter-2FFFE>..<noncharacter-2FFFF>
 30000..3134A  ; valid                                  # 13.0 CJK UNIFIED IDEOGRAPH-30000..CJK UNIFIED IDEOGRAPH-3134A
-3134B..3134F  ; disallowed                             # NA   <reserved-3134B>..<reserved-3134F>
-31350..323AF  ; valid                                  # 15.0 CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-323AF
-323B0..3FFFD  ; disallowed                             # NA   <reserved-323B0>..<reserved-3FFFD>
+3134B..3FFFD  ; disallowed                             # NA   <reserved-3134B>..<reserved-3FFFD>
 3FFFE..3FFFF  ; disallowed                             # 2.0  <noncharacter-3FFFE>..<noncharacter-3FFFF>
 40000..4FFFD  ; disallowed                             # NA   <reserved-40000>..<reserved-4FFFD>
 4FFFE..4FFFF  ; disallowed                             # 2.0  <noncharacter-4FFFE>..<noncharacter-4FFFF>

admin/unidata/Makefile.in

@@ -1,6 +1,6 @@
 ### @configure_input@
 
-# Copyright (C) 2012-2023 Free Software Foundation, Inc.
+# Copyright (C) 2012-2022 Free Software Foundation, Inc.
 
 # Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011
 #   National Institute of Advanced Industrial Science and Technology (AIST)
@@ -138,8 +138,7 @@ gen-clean:
 	rm -f ${unidir}/charscript.el*
 	rm -f ${unidir}/emoji-zwj.el*
 	rm -f ${unifiles} ${unidir}/charprop.el
-	rm -f ${unidir}/emoji-labels.el ${unidir}/idna-mapping.el \
-		${unidir}/uni-confusable.el ${unidir}/uni-scripts.el
+	rm -f ${unidir}/emoji-labels.el*
 ## ref: https://lists.gnu.org/r/emacs-devel/2013-11/msg01029.html
 
 maintainer-clean: gen-clean distclean

admin/unidata/NormalizationTest.txt

@@ -1,11 +1,11 @@
-# NormalizationTest-15.0.0.txt
-# Date: 2022-04-02, 01:29:09 GMT
-# © 2022 Unicode®, Inc.
+# NormalizationTest-14.0.0.txt
+# Date: 2021-05-28, 21:49:12 GMT
+# © 2021 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
-# For terms of use, see https://www.unicode.org/terms_of_use.html
+# For terms of use, see http://www.unicode.org/terms_of_use.html
 #
 # Unicode Character Database
-#   For documentation, see https://www.unicode.org/reports/tr44/
+#   For documentation, see http://www.unicode.org/reports/tr44/
 #
 # Normalization Test Suite
 # Format:
@@ -16208,68 +16208,6 @@ FFEE;FFEE;FFEE;25CB;25CB; # (￮; ￮; ￮; ○; ○; ) HALFWIDTH WHITE CIRCLE
 1D7FD;1D7FD;1D7FD;0037;0037; # (𝟽; 𝟽; 𝟽; 7; 7; ) MATHEMATICAL MONOSPACE DIGIT SEVEN
 1D7FE;1D7FE;1D7FE;0038;0038; # (𝟾; 𝟾; 𝟾; 8; 8; ) MATHEMATICAL MONOSPACE DIGIT EIGHT
 1D7FF;1D7FF;1D7FF;0039;0039; # (𝟿; 𝟿; 𝟿; 9; 9; ) MATHEMATICAL MONOSPACE DIGIT NINE
-1E030;1E030;1E030;0430;0430; # (𞀰; 𞀰; 𞀰; а; а; ) MODIFIER LETTER CYRILLIC SMALL A
-1E031;1E031;1E031;0431;0431; # (𞀱; 𞀱; 𞀱; б; б; ) MODIFIER LETTER CYRILLIC SMALL BE
-1E032;1E032;1E032;0432;0432; # (𞀲; 𞀲; 𞀲; в; в; ) MODIFIER LETTER CYRILLIC SMALL VE
-1E033;1E033;1E033;0433;0433; # (𞀳; 𞀳; 𞀳; г; г; ) MODIFIER LETTER CYRILLIC SMALL GHE
-1E034;1E034;1E034;0434;0434; # (𞀴; 𞀴; 𞀴; д; д; ) MODIFIER LETTER CYRILLIC SMALL DE
-1E035;1E035;1E035;0435;0435; # (𞀵; 𞀵; 𞀵; е; е; ) MODIFIER LETTER CYRILLIC SMALL IE
-1E036;1E036;1E036;0436;0436; # (𞀶; 𞀶; 𞀶; ж; ж; ) MODIFIER LETTER CYRILLIC SMALL ZHE
-1E037;1E037;1E037;0437;0437; # (𞀷; 𞀷; 𞀷; з; з; ) MODIFIER LETTER CYRILLIC SMALL ZE
-1E038;1E038;1E038;0438;0438; # (𞀸; 𞀸; 𞀸; и; и; ) MODIFIER LETTER CYRILLIC SMALL I
-1E039;1E039;1E039;043A;043A; # (𞀹; 𞀹; 𞀹; к; к; ) MODIFIER LETTER CYRILLIC SMALL KA
-1E03A;1E03A;1E03A;043B;043B; # (𞀺; 𞀺; 𞀺; л; л; ) MODIFIER LETTER CYRILLIC SMALL EL
-1E03B;1E03B;1E03B;043C;043C; # (𞀻; 𞀻; 𞀻; м; м; ) MODIFIER LETTER CYRILLIC SMALL EM
-1E03C;1E03C;1E03C;043E;043E; # (𞀼; 𞀼; 𞀼; о; о; ) MODIFIER LETTER CYRILLIC SMALL O
-1E03D;1E03D;1E03D;043F;043F; # (𞀽; 𞀽; 𞀽; п; п; ) MODIFIER LETTER CYRILLIC SMALL PE
-1E03E;1E03E;1E03E;0440;0440; # (𞀾; 𞀾; 𞀾; р; р; ) MODIFIER LETTER CYRILLIC SMALL ER
-1E03F;1E03F;1E03F;0441;0441; # (𞀿; 𞀿; 𞀿; с; с; ) MODIFIER LETTER CYRILLIC SMALL ES
-1E040;1E040;1E040;0442;0442; # (𞁀; 𞁀; 𞁀; т; т; ) MODIFIER LETTER CYRILLIC SMALL TE
-1E041;1E041;1E041;0443;0443; # (𞁁; 𞁁; 𞁁; у; у; ) MODIFIER LETTER CYRILLIC SMALL U
-1E042;1E042;1E042;0444;0444; # (𞁂; 𞁂; 𞁂; ф; ф; ) MODIFIER LETTER CYRILLIC SMALL EF
-1E043;1E043;1E043;0445;0445; # (𞁃; 𞁃; 𞁃; х; х; ) MODIFIER LETTER CYRILLIC SMALL HA
-1E044;1E044;1E044;0446;0446; # (𞁄; 𞁄; 𞁄; ц; ц; ) MODIFIER LETTER CYRILLIC SMALL TSE
-1E045;1E045;1E045;0447;0447; # (𞁅; 𞁅; 𞁅; ч; ч; ) MODIFIER LETTER CYRILLIC SMALL CHE
-1E046;1E046;1E046;0448;0448; # (𞁆; 𞁆; 𞁆; ш; ш; ) MODIFIER LETTER CYRILLIC SMALL SHA
-1E047;1E047;1E047;044B;044B; # (𞁇; 𞁇; 𞁇; ы; ы; ) MODIFIER LETTER CYRILLIC SMALL YERU
-1E048;1E048;1E048;044D;044D; # (𞁈; 𞁈; 𞁈; э; э; ) MODIFIER LETTER CYRILLIC SMALL E
-1E049;1E049;1E049;044E;044E; # (𞁉; 𞁉; 𞁉; ю; ю; ) MODIFIER LETTER CYRILLIC SMALL YU
-1E04A;1E04A;1E04A;A689;A689; # (𞁊; 𞁊; 𞁊; ꚉ; ꚉ; ) MODIFIER LETTER CYRILLIC SMALL DZZE
-1E04B;1E04B;1E04B;04D9;04D9; # (𞁋; 𞁋; 𞁋; ә; ә; ) MODIFIER LETTER CYRILLIC SMALL SCHWA
-1E04C;1E04C;1E04C;0456;0456; # (𞁌; 𞁌; 𞁌; і; і; ) MODIFIER LETTER CYRILLIC SMALL BYELORUSSIAN-UKRAINIAN I
-1E04D;1E04D;1E04D;0458;0458; # (𞁍; 𞁍; 𞁍; ј; ј; ) MODIFIER LETTER CYRILLIC SMALL JE
-1E04E;1E04E;1E04E;04E9;04E9; # (𞁎; 𞁎; 𞁎; ө; ө; ) MODIFIER LETTER CYRILLIC SMALL BARRED O
-1E04F;1E04F;1E04F;04AF;04AF; # (𞁏; 𞁏; 𞁏; ү; ү; ) MODIFIER LETTER CYRILLIC SMALL STRAIGHT U
-1E050;1E050;1E050;04CF;04CF; # (𞁐; 𞁐; 𞁐; ӏ; ӏ; ) MODIFIER LETTER CYRILLIC SMALL PALOCHKA
-1E051;1E051;1E051;0430;0430; # (𞁑; 𞁑; 𞁑; а; а; ) CYRILLIC SUBSCRIPT SMALL LETTER A
-1E052;1E052;1E052;0431;0431; # (𞁒; 𞁒; 𞁒; б; б; ) CYRILLIC SUBSCRIPT SMALL LETTER BE
-1E053;1E053;1E053;0432;0432; # (𞁓; 𞁓; 𞁓; в; в; ) CYRILLIC SUBSCRIPT SMALL LETTER VE
-1E054;1E054;1E054;0433;0433; # (𞁔; 𞁔; 𞁔; г; г; ) CYRILLIC SUBSCRIPT SMALL LETTER GHE
-1E055;1E055;1E055;0434;0434; # (𞁕; 𞁕; 𞁕; д; д; ) CYRILLIC SUBSCRIPT SMALL LETTER DE
-1E056;1E056;1E056;0435;0435; # (𞁖; 𞁖; 𞁖; е; е; ) CYRILLIC SUBSCRIPT SMALL LETTER IE
-1E057;1E057;1E057;0436;0436; # (𞁗; 𞁗; 𞁗; ж; ж; ) CYRILLIC SUBSCRIPT SMALL LETTER ZHE
-1E058;1E058;1E058;0437;0437; # (𞁘; 𞁘; 𞁘; з; з; ) CYRILLIC SUBSCRIPT SMALL LETTER ZE
-1E059;1E059;1E059;0438;0438; # (𞁙; 𞁙; 𞁙; и; и; ) CYRILLIC SUBSCRIPT SMALL LETTER I
-1E05A;1E05A;1E05A;043A;043A; # (𞁚; 𞁚; 𞁚; к; к; ) CYRILLIC SUBSCRIPT SMALL LETTER KA
-1E05B;1E05B;1E05B;043B;043B; # (𞁛; 𞁛; 𞁛; л; л; ) CYRILLIC SUBSCRIPT SMALL LETTER EL
-1E05C;1E05C;1E05C;043E;043E; # (𞁜; 𞁜; 𞁜; о; о; ) CYRILLIC SUBSCRIPT SMALL LETTER O
-1E05D;1E05D;1E05D;043F;043F; # (𞁝; 𞁝; 𞁝; п; п; ) CYRILLIC SUBSCRIPT SMALL LETTER PE
-1E05E;1E05E;1E05E;0441;0441; # (𞁞; 𞁞; 𞁞; с; с; ) CYRILLIC SUBSCRIPT SMALL LETTER ES
-1E05F;1E05F;1E05F;0443;0443; # (𞁟; 𞁟; 𞁟; у; у; ) CYRILLIC SUBSCRIPT SMALL LETTER U
-1E060;1E060;1E060;0444;0444; # (𞁠; 𞁠; 𞁠; ф; ф; ) CYRILLIC SUBSCRIPT SMALL LETTER EF
-1E061;1E061;1E061;0445;0445; # (𞁡; 𞁡; 𞁡; х; х; ) CYRILLIC SUBSCRIPT SMALL LETTER HA
-1E062;1E062;1E062;0446;0446; # (𞁢; 𞁢; 𞁢; ц; ц; ) CYRILLIC SUBSCRIPT SMALL LETTER TSE
-1E063;1E063;1E063;0447;0447; # (𞁣; 𞁣; 𞁣; ч; ч; ) CYRILLIC SUBSCRIPT SMALL LETTER CHE
-1E064;1E064;1E064;0448;0448; # (𞁤; 𞁤; 𞁤; ш; ш; ) CYRILLIC SUBSCRIPT SMALL LETTER SHA
-1E065;1E065;1E065;044A;044A; # (𞁥; 𞁥; 𞁥; ъ; ъ; ) CYRILLIC SUBSCRIPT SMALL LETTER HARD SIGN
-1E066;1E066;1E066;044B;044B; # (𞁦; 𞁦; 𞁦; ы; ы; ) CYRILLIC SUBSCRIPT SMALL LETTER YERU
-1E067;1E067;1E067;0491;0491; # (𞁧; 𞁧; 𞁧; ґ; ґ; ) CYRILLIC SUBSCRIPT SMALL LETTER GHE WITH UPTURN
-1E068;1E068;1E068;0456;0456; # (𞁨; 𞁨; 𞁨; і; і; ) CYRILLIC SUBSCRIPT SMALL LETTER BYELORUSSIAN-UKRAINIAN I
-1E069;1E069;1E069;0455;0455; # (𞁩; 𞁩; 𞁩; ѕ; ѕ; ) CYRILLIC SUBSCRIPT SMALL LETTER DZE
-1E06A;1E06A;1E06A;045F;045F; # (𞁪; 𞁪; 𞁪; џ; џ; ) CYRILLIC SUBSCRIPT SMALL LETTER DZHE
-1E06B;1E06B;1E06B;04AB;04AB; # (𞁫; 𞁫; 𞁫; ҫ; ҫ; ) MODIFIER LETTER CYRILLIC SMALL ES WITH DESCENDER
-1E06C;1E06C;1E06C;A651;A651; # (𞁬; 𞁬; 𞁬; ꙑ; ꙑ; ) MODIFIER LETTER CYRILLIC SMALL YERU WITH BACK YER
-1E06D;1E06D;1E06D;04B1;04B1; # (𞁭; 𞁭; 𞁭; ұ; ұ; ) MODIFIER LETTER CYRILLIC SMALL STRAIGHT U WITH STROKE
 1EE00;1EE00;1EE00;0627;0627; # (𞸀; 𞸀; 𞸀; ا; ا; ) ARABIC MATHEMATICAL ALEF
 1EE01;1EE01;1EE01;0628;0628; # (𞸁; 𞸁; 𞸁; ب; ب; ) ARABIC MATHEMATICAL BEH
 1EE02;1EE02;1EE02;062C;062C; # (𞸂; 𞸂; 𞸂; ج; ج; ) ARABIC MATHEMATICAL JEEM
@@ -18558,12 +18496,6 @@ FFEE;FFEE;FFEE;25CB;25CB; # (￮; ￮; ￮; ○; ○; ) HALFWIDTH WHITE CIRCLE
 0061 10EAB 0315 0300 05AE 0062;0061 05AE 10EAB 0300 0315 0062;0061 05AE 10EAB 0300 0315 0062;0061 05AE 10EAB 0300 0315 0062;0061 05AE 10EAB 0300 0315 0062; # (a◌𐺫◌̕◌̀◌֮b; a◌֮◌𐺫◌̀◌̕b; a◌֮◌𐺫◌̀◌̕b; a◌֮◌𐺫◌̀◌̕b; a◌֮◌𐺫◌̀◌̕b; ) LATIN SMALL LETTER A, YEZIDI COMBINING HAMZA MARK, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
 0061 0315 0300 05AE 10EAC 0062;00E0 05AE 10EAC 0315 0062;0061 05AE 0300 10EAC 0315 0062;00E0 05AE 10EAC 0315 0062;0061 05AE 0300 10EAC 0315 0062; # (a◌̕◌̀◌֮◌𐺬b; à◌֮◌𐺬◌̕b; a◌֮◌̀◌𐺬◌̕b; à◌֮◌𐺬◌̕b; a◌֮◌̀◌𐺬◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, YEZIDI COMBINING MADDA MARK, LATIN SMALL LETTER B
 0061 10EAC 0315 0300 05AE 0062;0061 05AE 10EAC 0300 0315 0062;0061 05AE 10EAC 0300 0315 0062;0061 05AE 10EAC 0300 0315 0062;0061 05AE 10EAC 0300 0315 0062; # (a◌𐺬◌̕◌̀◌֮b; a◌֮◌𐺬◌̀◌̕b; a◌֮◌𐺬◌̀◌̕b; a◌֮◌𐺬◌̀◌̕b; a◌֮◌𐺬◌̀◌̕b; ) LATIN SMALL LETTER A, YEZIDI COMBINING MADDA MARK, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
-0061 059A 0316 1DFA 10EFD 0062;0061 1DFA 0316 10EFD 059A 0062;0061 1DFA 0316 10EFD 059A 0062;0061 1DFA 0316 10EFD 059A 0062;0061 1DFA 0316 10EFD 059A 0062; # (a◌֚◌̖◌᷺◌𐻽b; a◌᷺◌̖◌𐻽◌֚b; a◌᷺◌̖◌𐻽◌֚b; a◌᷺◌̖◌𐻽◌֚b; a◌᷺◌̖◌𐻽◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, ARABIC SMALL LOW WORD SAKTA, LATIN SMALL LETTER B
-0061 10EFD 059A 0316 1DFA 0062;0061 1DFA 10EFD 0316 059A 0062;0061 1DFA 10EFD 0316 059A 0062;0061 1DFA 10EFD 0316 059A 0062;0061 1DFA 10EFD 0316 059A 0062; # (a◌𐻽◌֚◌̖◌᷺b; a◌᷺◌𐻽◌̖◌֚b; a◌᷺◌𐻽◌̖◌֚b; a◌᷺◌𐻽◌̖◌֚b; a◌᷺◌𐻽◌̖◌֚b; ) LATIN SMALL LETTER A, ARABIC SMALL LOW WORD SAKTA, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, LATIN SMALL LETTER B
-0061 059A 0316 1DFA 10EFE 0062;0061 1DFA 0316 10EFE 059A 0062;0061 1DFA 0316 10EFE 059A 0062;0061 1DFA 0316 10EFE 059A 0062;0061 1DFA 0316 10EFE 059A 0062; # (a◌֚◌̖◌᷺◌𐻾b; a◌᷺◌̖◌𐻾◌֚b; a◌᷺◌̖◌𐻾◌֚b; a◌᷺◌̖◌𐻾◌֚b; a◌᷺◌̖◌𐻾◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, ARABIC SMALL LOW WORD QASR, LATIN SMALL LETTER B
-0061 10EFE 059A 0316 1DFA 0062;0061 1DFA 10EFE 0316 059A 0062;0061 1DFA 10EFE 0316 059A 0062;0061 1DFA 10EFE 0316 059A 0062;0061 1DFA 10EFE 0316 059A 0062; # (a◌𐻾◌֚◌̖◌᷺b; a◌᷺◌𐻾◌̖◌֚b; a◌᷺◌𐻾◌̖◌֚b; a◌᷺◌𐻾◌̖◌֚b; a◌᷺◌𐻾◌̖◌֚b; ) LATIN SMALL LETTER A, ARABIC SMALL LOW WORD QASR, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, LATIN SMALL LETTER B
-0061 059A 0316 1DFA 10EFF 0062;0061 1DFA 0316 10EFF 059A 0062;0061 1DFA 0316 10EFF 059A 0062;0061 1DFA 0316 10EFF 059A 0062;0061 1DFA 0316 10EFF 059A 0062; # (a◌֚◌̖◌᷺◌𐻿b; a◌᷺◌̖◌𐻿◌֚b; a◌᷺◌̖◌𐻿◌֚b; a◌᷺◌̖◌𐻿◌֚b; a◌᷺◌̖◌𐻿◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, ARABIC SMALL LOW WORD MADDA, LATIN SMALL LETTER B
-0061 10EFF 059A 0316 1DFA 0062;0061 1DFA 10EFF 0316 059A 0062;0061 1DFA 10EFF 0316 059A 0062;0061 1DFA 10EFF 0316 059A 0062;0061 1DFA 10EFF 0316 059A 0062; # (a◌𐻿◌֚◌̖◌᷺b; a◌᷺◌𐻿◌̖◌֚b; a◌᷺◌𐻿◌̖◌֚b; a◌᷺◌𐻿◌̖◌֚b; a◌᷺◌𐻿◌̖◌֚b; ) LATIN SMALL LETTER A, ARABIC SMALL LOW WORD MADDA, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, LATIN SMALL LETTER B
 0061 059A 0316 1DFA 10F46 0062;0061 1DFA 0316 10F46 059A 0062;0061 1DFA 0316 10F46 059A 0062;0061 1DFA 0316 10F46 059A 0062;0061 1DFA 0316 10F46 059A 0062; # (a◌֚◌̖◌᷺◌𐽆b; a◌᷺◌̖◌𐽆◌֚b; a◌᷺◌̖◌𐽆◌֚b; a◌᷺◌̖◌𐽆◌֚b; a◌᷺◌̖◌𐽆◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, SOGDIAN COMBINING DOT BELOW, LATIN SMALL LETTER B
 0061 10F46 059A 0316 1DFA 0062;0061 1DFA 10F46 0316 059A 0062;0061 1DFA 10F46 0316 059A 0062;0061 1DFA 10F46 0316 059A 0062;0061 1DFA 10F46 0316 059A 0062; # (a◌𐽆◌֚◌̖◌᷺b; a◌᷺◌𐽆◌̖◌֚b; a◌᷺◌𐽆◌̖◌֚b; a◌᷺◌𐽆◌̖◌֚b; a◌᷺◌𐽆◌̖◌֚b; ) LATIN SMALL LETTER A, SOGDIAN COMBINING DOT BELOW, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, LATIN SMALL LETTER B
 0061 059A 0316 1DFA 10F47 0062;0061 1DFA 0316 10F47 059A 0062;0061 1DFA 0316 10F47 059A 0062;0061 1DFA 0316 10F47 059A 0062;0061 1DFA 0316 10F47 059A 0062; # (a◌֚◌̖◌᷺◌𐽇b; a◌᷺◌̖◌𐽇◌֚b; a◌᷺◌̖◌𐽇◌֚b; a◌᷺◌̖◌𐽇◌֚b; a◌᷺◌̖◌𐽇◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, SOGDIAN COMBINING TWO DOTS BELOW, LATIN SMALL LETTER B
@@ -18708,10 +18640,6 @@ FFEE;FFEE;FFEE;25CB;25CB; # (￮; ￮; ￮; ○; ○; ) HALFWIDTH WHITE CIRCLE
 0061 11D45 05B0 094D 3099 0062;0061 3099 11D45 094D 05B0 0062;0061 3099 11D45 094D 05B0 0062;0061 3099 11D45 094D 05B0 0062;0061 3099 11D45 094D 05B0 0062; # (a◌𑵅◌ְ◌्◌゙b; a◌゙◌𑵅◌्◌ְb; a◌゙◌𑵅◌्◌ְb; a◌゙◌𑵅◌्◌ְb; a◌゙◌𑵅◌्◌ְb; ) LATIN SMALL LETTER A, MASARAM GONDI VIRAMA, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
 0061 05B0 094D 3099 11D97 0062;0061 3099 094D 11D97 05B0 0062;0061 3099 094D 11D97 05B0 0062;0061 3099 094D 11D97 05B0 0062;0061 3099 094D 11D97 05B0 0062; # (a◌ְ◌्◌゙◌𑶗b; a◌゙◌्◌𑶗◌ְb; a◌゙◌्◌𑶗◌ְb; a◌゙◌्◌𑶗◌ְb; a◌゙◌्◌𑶗◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, GUNJALA GONDI VIRAMA, LATIN SMALL LETTER B
 0061 11D97 05B0 094D 3099 0062;0061 3099 11D97 094D 05B0 0062;0061 3099 11D97 094D 05B0 0062;0061 3099 11D97 094D 05B0 0062;0061 3099 11D97 094D 05B0 0062; # (a◌𑶗◌ְ◌्◌゙b; a◌゙◌𑶗◌्◌ְb; a◌゙◌𑶗◌्◌ְb; a◌゙◌𑶗◌्◌ְb; a◌゙◌𑶗◌्◌ְb; ) LATIN SMALL LETTER A, GUNJALA GONDI VIRAMA, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
-0061 05B0 094D 3099 11F41 0062;0061 3099 094D 11F41 05B0 0062;0061 3099 094D 11F41 05B0 0062;0061 3099 094D 11F41 05B0 0062;0061 3099 094D 11F41 05B0 0062; # (a◌ְ◌्◌゙𑽁b; a◌゙◌्𑽁◌ְb; a◌゙◌्𑽁◌ְb; a◌゙◌्𑽁◌ְb; a◌゙◌्𑽁◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, KAWI SIGN KILLER, LATIN SMALL LETTER B
-0061 11F41 05B0 094D 3099 0062;0061 3099 11F41 094D 05B0 0062;0061 3099 11F41 094D 05B0 0062;0061 3099 11F41 094D 05B0 0062;0061 3099 11F41 094D 05B0 0062; # (a𑽁◌ְ◌्◌゙b; a◌゙𑽁◌्◌ְb; a◌゙𑽁◌्◌ְb; a◌゙𑽁◌्◌ְb; a◌゙𑽁◌्◌ְb; ) LATIN SMALL LETTER A, KAWI SIGN KILLER, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
-0061 05B0 094D 3099 11F42 0062;0061 3099 094D 11F42 05B0 0062;0061 3099 094D 11F42 05B0 0062;0061 3099 094D 11F42 05B0 0062;0061 3099 094D 11F42 05B0 0062; # (a◌ְ◌्◌゙◌𑽂b; a◌゙◌्◌𑽂◌ְb; a◌゙◌्◌𑽂◌ְb; a◌゙◌्◌𑽂◌ְb; a◌゙◌्◌𑽂◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, KAWI CONJOINER, LATIN SMALL LETTER B
-0061 11F42 05B0 094D 3099 0062;0061 3099 11F42 094D 05B0 0062;0061 3099 11F42 094D 05B0 0062;0061 3099 11F42 094D 05B0 0062;0061 3099 11F42 094D 05B0 0062; # (a◌𑽂◌ְ◌्◌゙b; a◌゙◌𑽂◌्◌ְb; a◌゙◌𑽂◌्◌ְb; a◌゙◌𑽂◌्◌ְb; a◌゙◌𑽂◌्◌ְb; ) LATIN SMALL LETTER A, KAWI CONJOINER, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
 0061 16FF0 0334 16AF0 0062;0061 0334 16AF0 16FF0 0062;0061 0334 16AF0 16FF0 0062;0061 0334 16AF0 16FF0 0062;0061 0334 16AF0 16FF0 0062; # (a𖿰◌̴◌𖫰b; a◌̴◌𖫰𖿰b; a◌̴◌𖫰𖿰b; a◌̴◌𖫰𖿰b; a◌̴◌𖫰𖿰b; ) LATIN SMALL LETTER A, VIETNAMESE ALTERNATE READING MARK CA, COMBINING TILDE OVERLAY, BASSA VAH COMBINING HIGH TONE, LATIN SMALL LETTER B
 0061 16AF0 16FF0 0334 0062;0061 16AF0 0334 16FF0 0062;0061 16AF0 0334 16FF0 0062;0061 16AF0 0334 16FF0 0062;0061 16AF0 0334 16FF0 0062; # (a◌𖫰𖿰◌̴b; a◌𖫰◌̴𖿰b; a◌𖫰◌̴𖿰b; a◌𖫰◌̴𖿰b; a◌𖫰◌̴𖿰b; ) LATIN SMALL LETTER A, BASSA VAH COMBINING HIGH TONE, VIETNAMESE ALTERNATE READING MARK CA, COMBINING TILDE OVERLAY, LATIN SMALL LETTER B
 0061 16FF0 0334 16AF1 0062;0061 0334 16AF1 16FF0 0062;0061 0334 16AF1 16FF0 0062;0061 0334 16AF1 16FF0 0062;0061 0334 16AF1 16FF0 0062; # (a𖿰◌̴◌𖫱b; a◌̴◌𖫱𖿰b; a◌̴◌𖫱𖿰b; a◌̴◌𖫱𖿰b; a◌̴◌𖫱𖿰b; ) LATIN SMALL LETTER A, VIETNAMESE ALTERNATE READING MARK CA, COMBINING TILDE OVERLAY, BASSA VAH COMBINING LOW TONE, LATIN SMALL LETTER B
@@ -18884,8 +18812,6 @@ FFEE;FFEE;FFEE;25CB;25CB; # (￮; ￮; ￮; ○; ○; ) HALFWIDTH WHITE CIRCLE
 0061 1E029 0315 0300 05AE 0062;0061 05AE 1E029 0300 0315 0062;0061 05AE 1E029 0300 0315 0062;0061 05AE 1E029 0300 0315 0062;0061 05AE 1E029 0300 0315 0062; # (a◌𞀩◌̕◌̀◌֮b; a◌֮◌𞀩◌̀◌̕b; a◌֮◌𞀩◌̀◌̕b; a◌֮◌𞀩◌̀◌̕b; a◌֮◌𞀩◌̀◌̕b; ) LATIN SMALL LETTER A, COMBINING GLAGOLITIC LETTER IOTATED BIG YUS, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
 0061 0315 0300 05AE 1E02A 0062;00E0 05AE 1E02A 0315 0062;0061 05AE 0300 1E02A 0315 0062;00E0 05AE 1E02A 0315 0062;0061 05AE 0300 1E02A 0315 0062; # (a◌̕◌̀◌֮◌𞀪b; à◌֮◌𞀪◌̕b; a◌֮◌̀◌𞀪◌̕b; à◌֮◌𞀪◌̕b; a◌֮◌̀◌𞀪◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, COMBINING GLAGOLITIC LETTER FITA, LATIN SMALL LETTER B
 0061 1E02A 0315 0300 05AE 0062;0061 05AE 1E02A 0300 0315 0062;0061 05AE 1E02A 0300 0315 0062;0061 05AE 1E02A 0300 0315 0062;0061 05AE 1E02A 0300 0315 0062; # (a◌𞀪◌̕◌̀◌֮b; a◌֮◌𞀪◌̀◌̕b; a◌֮◌𞀪◌̀◌̕b; a◌֮◌𞀪◌̀◌̕b; a◌֮◌𞀪◌̀◌̕b; ) LATIN SMALL LETTER A, COMBINING GLAGOLITIC LETTER FITA, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
-0061 0315 0300 05AE 1E08F 0062;00E0 05AE 1E08F 0315 0062;0061 05AE 0300 1E08F 0315 0062;00E0 05AE 1E08F 0315 0062;0061 05AE 0300 1E08F 0315 0062; # (a◌̕◌̀◌֮◌𞂏b; à◌֮◌𞂏◌̕b; a◌֮◌̀◌𞂏◌̕b; à◌֮◌𞂏◌̕b; a◌֮◌̀◌𞂏◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, COMBINING CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I, LATIN SMALL LETTER B
-0061 1E08F 0315 0300 05AE 0062;0061 05AE 1E08F 0300 0315 0062;0061 05AE 1E08F 0300 0315 0062;0061 05AE 1E08F 0300 0315 0062;0061 05AE 1E08F 0300 0315 0062; # (a◌𞂏◌̕◌̀◌֮b; a◌֮◌𞂏◌̀◌̕b; a◌֮◌𞂏◌̀◌̕b; a◌֮◌𞂏◌̀◌̕b; a◌֮◌𞂏◌̀◌̕b; ) LATIN SMALL LETTER A, COMBINING CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
 0061 0315 0300 05AE 1E130 0062;00E0 05AE 1E130 0315 0062;0061 05AE 0300 1E130 0315 0062;00E0 05AE 1E130 0315 0062;0061 05AE 0300 1E130 0315 0062; # (a◌̕◌̀◌֮◌𞄰b; à◌֮◌𞄰◌̕b; a◌֮◌̀◌𞄰◌̕b; à◌֮◌𞄰◌̕b; a◌֮◌̀◌𞄰◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, NYIAKENG PUACHUE HMONG TONE-B, LATIN SMALL LETTER B
 0061 1E130 0315 0300 05AE 0062;0061 05AE 1E130 0300 0315 0062;0061 05AE 1E130 0300 0315 0062;0061 05AE 1E130 0300 0315 0062;0061 05AE 1E130 0300 0315 0062; # (a◌𞄰◌̕◌̀◌֮b; a◌֮◌𞄰◌̀◌̕b; a◌֮◌𞄰◌̀◌̕b; a◌֮◌𞄰◌̀◌̕b; a◌֮◌𞄰◌̀◌̕b; ) LATIN SMALL LETTER A, NYIAKENG PUACHUE HMONG TONE-B, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
 0061 0315 0300 05AE 1E131 0062;00E0 05AE 1E131 0315 0062;0061 05AE 0300 1E131 0315 0062;00E0 05AE 1E131 0315 0062;0061 05AE 0300 1E131 0315 0062; # (a◌̕◌̀◌֮◌𞄱b; à◌֮◌𞄱◌̕b; a◌֮◌̀◌𞄱◌̕b; à◌֮◌𞄱◌̕b; a◌֮◌̀◌𞄱◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, NYIAKENG PUACHUE HMONG TONE-M, LATIN SMALL LETTER B
@@ -18910,14 +18836,6 @@ FFEE;FFEE;FFEE;25CB;25CB; # (￮; ￮; ￮; ○; ○; ) HALFWIDTH WHITE CIRCLE
 0061 1E2EE 0315 0300 05AE 0062;0061 05AE 1E2EE 0300 0315 0062;0061 05AE 1E2EE 0300 0315 0062;0061 05AE 1E2EE 0300 0315 0062;0061 05AE 1E2EE 0300 0315 0062; # (a◌𞋮◌̕◌̀◌֮b; a◌֮◌𞋮◌̀◌̕b; a◌֮◌𞋮◌̀◌̕b; a◌֮◌𞋮◌̀◌̕b; a◌֮◌𞋮◌̀◌̕b; ) LATIN SMALL LETTER A, WANCHO TONE KOI, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
 0061 0315 0300 05AE 1E2EF 0062;00E0 05AE 1E2EF 0315 0062;0061 05AE 0300 1E2EF 0315 0062;00E0 05AE 1E2EF 0315 0062;0061 05AE 0300 1E2EF 0315 0062; # (a◌̕◌̀◌֮◌𞋯b; à◌֮◌𞋯◌̕b; a◌֮◌̀◌𞋯◌̕b; à◌֮◌𞋯◌̕b; a◌֮◌̀◌𞋯◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, WANCHO TONE KOINI, LATIN SMALL LETTER B
 0061 1E2EF 0315 0300 05AE 0062;0061 05AE 1E2EF 0300 0315 0062;0061 05AE 1E2EF 0300 0315 0062;0061 05AE 1E2EF 0300 0315 0062;0061 05AE 1E2EF 0300 0315 0062; # (a◌𞋯◌̕◌̀◌֮b; a◌֮◌𞋯◌̀◌̕b; a◌֮◌𞋯◌̀◌̕b; a◌֮◌𞋯◌̀◌̕b; a◌֮◌𞋯◌̀◌̕b; ) LATIN SMALL LETTER A, WANCHO TONE KOINI, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
-0061 035C 0315 0300 1E4EC 0062;00E0 0315 1E4EC 035C 0062;0061 0300 0315 1E4EC 035C 0062;00E0 0315 1E4EC 035C 0062;0061 0300 0315 1E4EC 035C 0062; # (a◌͜◌̕◌̀◌𞓬b; à◌̕◌𞓬◌͜b; a◌̀◌̕◌𞓬◌͜b; à◌̕◌𞓬◌͜b; a◌̀◌̕◌𞓬◌͜b; ) LATIN SMALL LETTER A, COMBINING DOUBLE BREVE BELOW, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, NAG MUNDARI SIGN MUHOR, LATIN SMALL LETTER B
-0061 1E4EC 035C 0315 0300 0062;00E0 1E4EC 0315 035C 0062;0061 0300 1E4EC 0315 035C 0062;00E0 1E4EC 0315 035C 0062;0061 0300 1E4EC 0315 035C 0062; # (a◌𞓬◌͜◌̕◌̀b; à◌𞓬◌̕◌͜b; a◌̀◌𞓬◌̕◌͜b; à◌𞓬◌̕◌͜b; a◌̀◌𞓬◌̕◌͜b; ) LATIN SMALL LETTER A, NAG MUNDARI SIGN MUHOR, COMBINING DOUBLE BREVE BELOW, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, LATIN SMALL LETTER B
-0061 035C 0315 0300 1E4ED 0062;00E0 0315 1E4ED 035C 0062;0061 0300 0315 1E4ED 035C 0062;00E0 0315 1E4ED 035C 0062;0061 0300 0315 1E4ED 035C 0062; # (a◌͜◌̕◌̀◌𞓭b; à◌̕◌𞓭◌͜b; a◌̀◌̕◌𞓭◌͜b; à◌̕◌𞓭◌͜b; a◌̀◌̕◌𞓭◌͜b; ) LATIN SMALL LETTER A, COMBINING DOUBLE BREVE BELOW, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, NAG MUNDARI SIGN TOYOR, LATIN SMALL LETTER B
-0061 1E4ED 035C 0315 0300 0062;00E0 1E4ED 0315 035C 0062;0061 0300 1E4ED 0315 035C 0062;00E0 1E4ED 0315 035C 0062;0061 0300 1E4ED 0315 035C 0062; # (a◌𞓭◌͜◌̕◌̀b; à◌𞓭◌̕◌͜b; a◌̀◌𞓭◌̕◌͜b; à◌𞓭◌̕◌͜b; a◌̀◌𞓭◌̕◌͜b; ) LATIN SMALL LETTER A, NAG MUNDARI SIGN TOYOR, COMBINING DOUBLE BREVE BELOW, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, LATIN SMALL LETTER B
-0061 059A 0316 1DFA 1E4EE 0062;0061 1DFA 0316 1E4EE 059A 0062;0061 1DFA 0316 1E4EE 059A 0062;0061 1DFA 0316 1E4EE 059A 0062;0061 1DFA 0316 1E4EE 059A 0062; # (a◌֚◌̖◌᷺◌𞓮b; a◌᷺◌̖◌𞓮◌֚b; a◌᷺◌̖◌𞓮◌֚b; a◌᷺◌̖◌𞓮◌֚b; a◌᷺◌̖◌𞓮◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, NAG MUNDARI SIGN IKIR, LATIN SMALL LETTER B
-0061 1E4EE 059A 0316 1DFA 0062;0061 1DFA 1E4EE 0316 059A 0062;0061 1DFA 1E4EE 0316 059A 0062;0061 1DFA 1E4EE 0316 059A 0062;0061 1DFA 1E4EE 0316 059A 0062; # (a◌𞓮◌֚◌̖◌᷺b; a◌᷺◌𞓮◌̖◌֚b; a◌᷺◌𞓮◌̖◌֚b; a◌᷺◌𞓮◌̖◌֚b; a◌᷺◌𞓮◌̖◌֚b; ) LATIN SMALL LETTER A, NAG MUNDARI SIGN IKIR, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, LATIN SMALL LETTER B
-0061 0315 0300 05AE 1E4EF 0062;00E0 05AE 1E4EF 0315 0062;0061 05AE 0300 1E4EF 0315 0062;00E0 05AE 1E4EF 0315 0062;0061 05AE 0300 1E4EF 0315 0062; # (a◌̕◌̀◌֮◌𞓯b; à◌֮◌𞓯◌̕b; a◌֮◌̀◌𞓯◌̕b; à◌֮◌𞓯◌̕b; a◌֮◌̀◌𞓯◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, NAG MUNDARI SIGN SUTUH, LATIN SMALL LETTER B
-0061 1E4EF 0315 0300 05AE 0062;0061 05AE 1E4EF 0300 0315 0062;0061 05AE 1E4EF 0300 0315 0062;0061 05AE 1E4EF 0300 0315 0062;0061 05AE 1E4EF 0300 0315 0062; # (a◌𞓯◌̕◌̀◌֮b; a◌֮◌𞓯◌̀◌̕b; a◌֮◌𞓯◌̀◌̕b; a◌֮◌𞓯◌̀◌̕b; a◌֮◌𞓯◌̀◌̕b; ) LATIN SMALL LETTER A, NAG MUNDARI SIGN SUTUH, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
 0061 059A 0316 1DFA 1E8D0 0062;0061 1DFA 0316 1E8D0 059A 0062;0061 1DFA 0316 1E8D0 059A 0062;0061 1DFA 0316 1E8D0 059A 0062;0061 1DFA 0316 1E8D0 059A 0062; # (a◌֚◌̖◌᷺◌𞣐b; a◌᷺◌̖◌𞣐◌֚b; a◌᷺◌̖◌𞣐◌֚b; a◌᷺◌̖◌𞣐◌֚b; a◌᷺◌̖◌𞣐◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, MENDE KIKAKUI COMBINING NUMBER TEENS, LATIN SMALL LETTER B
 0061 1E8D0 059A 0316 1DFA 0062;0061 1DFA 1E8D0 0316 059A 0062;0061 1DFA 1E8D0 0316 059A 0062;0061 1DFA 1E8D0 0316 059A 0062;0061 1DFA 1E8D0 0316 059A 0062; # (a◌𞣐◌֚◌̖◌᷺b; a◌᷺◌𞣐◌̖◌֚b; a◌᷺◌𞣐◌̖◌֚b; a◌᷺◌𞣐◌̖◌֚b; a◌᷺◌𞣐◌̖◌֚b; ) LATIN SMALL LETTER A, MENDE KIKAKUI COMBINING NUMBER TEENS, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, LATIN SMALL LETTER B
 0061 059A 0316 1DFA 1E8D1 0062;0061 1DFA 0316 1E8D1 059A 0062;0061 1DFA 0316 1E8D1 059A 0062;0061 1DFA 0316 1E8D1 059A 0062;0061 1DFA 0316 1E8D1 059A 0062; # (a◌֚◌̖◌᷺◌𞣑b; a◌᷺◌̖◌𞣑◌֚b; a◌᷺◌̖◌𞣑◌֚b; a◌᷺◌̖◌𞣑◌֚b; a◌᷺◌̖◌𞣑◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, MENDE KIKAKUI COMBINING NUMBER TENS, LATIN SMALL LETTER B

admin/unidata/PropertyValueAliases.txt

@@ -1,11 +1,11 @@
-# PropertyValueAliases-15.0.0.txt
-# Date: 2022-08-05, 23:42:17 GMT
-# © 2022 Unicode®, Inc.
+# PropertyValueAliases-14.0.0.txt
+# Date: 2021-05-10, 21:08:53 GMT
+# © 2021 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
-# For terms of use, see https://www.unicode.org/terms_of_use.html
+# For terms of use, see http://www.unicode.org/terms_of_use.html
 #
 # Unicode Character Database
-#   For documentation, see https://www.unicode.org/reports/tr44/
+#   For documentation, see http://www.unicode.org/reports/tr44/
 #
 # This file contains aliases for property values used in the UCD.
 # These names can be used for XML formats of UCD data, for regular-expression
@@ -90,7 +90,6 @@ age; 12.0                             ; V12_0
 age; 12.1                             ; V12_1
 age; 13.0                             ; V13_0
 age; 14.0                             ; V14_0
-age; 15.0                             ; V15_0
 age; NA                               ; Unassigned
 
 # Alphabetic (Alpha)
@@ -136,6 +135,7 @@ Bidi_M; Y                             ; Yes                              ; T
 
 # Bidi_Mirroring_Glyph (bmg)
 
+# @missing: 0000..10FFFF; Bidi_Mirroring_Glyph; <none>
 
 # Bidi_Paired_Bracket (bpb)
 
@@ -162,7 +162,6 @@ blk; Ancient_Symbols                  ; Ancient_Symbols
 blk; Arabic                           ; Arabic
 blk; Arabic_Ext_A                     ; Arabic_Extended_A
 blk; Arabic_Ext_B                     ; Arabic_Extended_B
-blk; Arabic_Ext_C                     ; Arabic_Extended_C
 blk; Arabic_Math                      ; Arabic_Mathematical_Alphabetic_Symbols
 blk; Arabic_PF_A                      ; Arabic_Presentation_Forms_A      ; Arabic_Presentation_Forms-A
 blk; Arabic_PF_B                      ; Arabic_Presentation_Forms_B
@@ -207,7 +206,6 @@ blk; CJK_Ext_D                        ; CJK_Unified_Ideographs_Extension_D
 blk; CJK_Ext_E                        ; CJK_Unified_Ideographs_Extension_E
 blk; CJK_Ext_F                        ; CJK_Unified_Ideographs_Extension_F
 blk; CJK_Ext_G                        ; CJK_Unified_Ideographs_Extension_G
-blk; CJK_Ext_H                        ; CJK_Unified_Ideographs_Extension_H
 blk; CJK_Radicals_Sup                 ; CJK_Radicals_Supplement
 blk; CJK_Strokes                      ; CJK_Strokes
 blk; CJK_Symbols                      ; CJK_Symbols_And_Punctuation
@@ -225,12 +223,10 @@ blk; Cyrillic                         ; Cyrillic
 blk; Cyrillic_Ext_A                   ; Cyrillic_Extended_A
 blk; Cyrillic_Ext_B                   ; Cyrillic_Extended_B
 blk; Cyrillic_Ext_C                   ; Cyrillic_Extended_C
-blk; Cyrillic_Ext_D                   ; Cyrillic_Extended_D
 blk; Cyrillic_Sup                     ; Cyrillic_Supplement              ; Cyrillic_Supplementary
 blk; Deseret                          ; Deseret
 blk; Devanagari                       ; Devanagari
 blk; Devanagari_Ext                   ; Devanagari_Extended
-blk; Devanagari_Ext_A                 ; Devanagari_Extended_A
 blk; Diacriticals                     ; Combining_Diacritical_Marks
 blk; Diacriticals_Ext                 ; Combining_Diacritical_Marks_Extended
 blk; Diacriticals_For_Symbols         ; Combining_Diacritical_Marks_For_Symbols; Combining_Marks_For_Symbols
@@ -292,7 +288,6 @@ blk; Jamo_Ext_A                       ; Hangul_Jamo_Extended_A
 blk; Jamo_Ext_B                       ; Hangul_Jamo_Extended_B
 blk; Javanese                         ; Javanese
 blk; Kaithi                           ; Kaithi
-blk; Kaktovik_Numerals                ; Kaktovik_Numerals
 blk; Kana_Ext_A                       ; Kana_Extended_A
 blk; Kana_Ext_B                       ; Kana_Extended_B
 blk; Kana_Sup                         ; Kana_Supplement
@@ -301,7 +296,6 @@ blk; Kangxi                           ; Kangxi_Radicals
 blk; Kannada                          ; Kannada
 blk; Katakana                         ; Katakana
 blk; Katakana_Ext                     ; Katakana_Phonetic_Extensions
-blk; Kawi                             ; Kawi
 blk; Kayah_Li                         ; Kayah_Li
 blk; Kharoshthi                       ; Kharoshthi
 blk; Khitan_Small_Script              ; Khitan_Small_Script
@@ -366,7 +360,6 @@ blk; Myanmar                          ; Myanmar
 blk; Myanmar_Ext_A                    ; Myanmar_Extended_A
 blk; Myanmar_Ext_B                    ; Myanmar_Extended_B
 blk; Nabataean                        ; Nabataean
-blk; Nag_Mundari                      ; Nag_Mundari
 blk; Nandinagari                      ; Nandinagari
 blk; NB                               ; No_Block
 blk; New_Tai_Lue                      ; New_Tai_Lue
@@ -670,6 +663,7 @@ EPres; Y                              ; Yes                              ; T
 
 # Equivalent_Unified_Ideograph (EqUIdeo)
 
+# @missing: 0000..10FFFF; Equivalent_Unified_Ideograph; <none>
 
 # Expands_On_NFC (XO_NFC)
 
@@ -1149,6 +1143,7 @@ NFD_QC; Y                             ; Yes
 
 # NFKC_Casefold (NFKC_CF)
 
+# @missing: 0000..10FFFF; NFKC_Casefold; <code point>
 
 # NFKC_Quick_Check (NFKC_QC)
 
@@ -1318,7 +1313,6 @@ sc ; Ital                             ; Old_Italic
 sc ; Java                             ; Javanese
 sc ; Kali                             ; Kayah_Li
 sc ; Kana                             ; Katakana
-sc ; Kawi                             ; Kawi
 sc ; Khar                             ; Kharoshthi
 sc ; Khmr                             ; Khmer
 sc ; Khoj                             ; Khojki
@@ -1351,7 +1345,6 @@ sc ; Mroo                             ; Mro
 sc ; Mtei                             ; Meetei_Mayek
 sc ; Mult                             ; Multani
 sc ; Mymr                             ; Myanmar
-sc ; Nagm                             ; Nag_Mundari
 sc ; Nand                             ; Nandinagari
 sc ; Narb                             ; Old_North_Arabian
 sc ; Nbat                             ; Nabataean
@@ -1425,6 +1418,7 @@ sc ; Zzzz                             ; Unknown
 
 # Script_Extensions (scx)
 
+# @missing: 0000..10FFFF; Script_Extensions; <script>
 
 # Sentence_Break (SB)
 

admin/unidata/README

@@ -6,31 +6,31 @@ copyright.html.
 The names, URLs, and dates for these files are as follows.
 
 BidiBrackets.txt
-https://www.unicode.org/Public/UNIDATA/BidiBrackets.txt
+http://www.unicode.org/Public/UNIDATA/BidiBrackets.txt
 2021-06-30
 
 BidiMirroring.txt
-https://www.unicode.org/Public/UNIDATA/BidiMirroring.txt
+http://www.unicode.org/Public/UNIDATA/BidiMirroring.txt
 2021-08-08
 
 Blocks.txt
-https://www.unicode.org/Public/8.0.0/ucd/Blocks.txt
+http://www.unicode.org/Public/8.0.0/ucd/Blocks.txt
 2021-01-22
 
 IVD_Sequences.txt
-https://www.unicode.org/ivd/
+http://www.unicode.org/ivd/
 2020-11-06
 
 NormalizationTest.txt
-https://www.unicode.org/Public/UNIDATA/NormalizationTest.txt
+http://www.unicode.org/Public/UNIDATA/NormalizationTest.txt
 2021-05-28
 
 SpecialCasing.txt
-https://unicode.org/Public/UNIDATA/SpecialCasing.txt
+http://unicode.org/Public/UNIDATA/SpecialCasing.txt
 2021-03-08
 
 UnicodeData.txt
-https://www.unicode.org/Public/UNIDATA/UnicodeData.txt
+http://www.unicode.org/Public/UNIDATA/UnicodeData.txt
 2021-07-06
 
 emoji-data.txt

admin/unidata/ScriptExtensions.txt

@@ -1,11 +1,11 @@
-# ScriptExtensions-15.0.0.txt
-# Date: 2022-02-02, 00:57:11 GMT
-# © 2022 Unicode®, Inc.
+# ScriptExtensions-14.0.0.txt
+# Date: 2021-06-04, 02:19:38 GMT
+# © 2021 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
-# For terms of use, see https://www.unicode.org/terms_of_use.html
+# For terms of use, see http://www.unicode.org/terms_of_use.html
 #
 # Unicode Character Database
-#   For documentation, see https://www.unicode.org/reports/tr44/
+#   For documentation, see http://www.unicode.org/reports/tr44/
 #
 # The Script_Extensions property indicates which characters are commonly used
 # with more than one script, but with a limited number of scripts.

admin/unidata/Scripts.txt

@@ -1,11 +1,11 @@
-# Scripts-15.0.0.txt
-# Date: 2022-04-26, 23:15:02 GMT
-# © 2022 Unicode®, Inc.
+# Scripts-14.0.0.txt
+# Date: 2021-07-10, 00:35:31 GMT
+# © 2021 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
-# For terms of use, see https://www.unicode.org/terms_of_use.html
+# For terms of use, see http://www.unicode.org/terms_of_use.html
 #
 # Unicode Character Database
-#   For documentation, see https://www.unicode.org/reports/tr44/
+#   For documentation, see http://www.unicode.org/reports/tr44/
 # For more information, see:
 #   UAX #24, Unicode Script Property: https://www.unicode.org/reports/tr24/
 #     Especially the sections:
@@ -532,7 +532,6 @@ FFFC..FFFD    ; Common # So   [2] OBJECT REPLACEMENT CHARACTER..REPLACEMENT CHAR
 1D183..1D184  ; Common # So   [2] MUSICAL SYMBOL ARPEGGIATO UP..MUSICAL SYMBOL ARPEGGIATO DOWN
 1D18C..1D1A9  ; Common # So  [30] MUSICAL SYMBOL RINFORZANDO..MUSICAL SYMBOL DEGREE SLASH
 1D1AE..1D1EA  ; Common # So  [61] MUSICAL SYMBOL PEDAL MARK..MUSICAL SYMBOL KORON
-1D2C0..1D2D3  ; Common # No  [20] KAKTOVIK NUMERAL ZERO..KAKTOVIK NUMERAL NINETEEN
 1D2E0..1D2F3  ; Common # No  [20] MAYAN NUMERAL ZERO..MAYAN NUMERAL NINETEEN
 1D300..1D356  ; Common # So  [87] MONOGRAM FOR EARTH..TETRAGRAM FOR FOSTERING
 1D360..1D378  ; Common # No  [25] COUNTING ROD UNIT DIGIT ONE..TALLY MARK FIVE
@@ -602,10 +601,10 @@ FFFC..FFFD    ; Common # So   [2] OBJECT REPLACEMENT CHARACTER..REPLACEMENT CHAR
 1F300..1F3FA  ; Common # So [251] CYCLONE..AMPHORA
 1F3FB..1F3FF  ; Common # Sk   [5] EMOJI MODIFIER FITZPATRICK TYPE-1-2..EMOJI MODIFIER FITZPATRICK TYPE-6
 1F400..1F6D7  ; Common # So [728] RAT..ELEVATOR
-1F6DC..1F6EC  ; Common # So  [17] WIRELESS..AIRPLANE ARRIVING
+1F6DD..1F6EC  ; Common # So  [16] PLAYGROUND SLIDE..AIRPLANE ARRIVING
 1F6F0..1F6FC  ; Common # So  [13] SATELLITE..ROLLER SKATE
-1F700..1F776  ; Common # So [119] ALCHEMICAL SYMBOL FOR QUINTESSENCE..LUNAR ECLIPSE
-1F77B..1F7D9  ; Common # So  [95] HAUMEA..NINE POINTED WHITE STAR
+1F700..1F773  ; Common # So [116] ALCHEMICAL SYMBOL FOR QUINTESSENCE..ALCHEMICAL SYMBOL FOR HALF OUNCE
+1F780..1F7D8  ; Common # So  [89] BLACK LEFT-POINTING ISOSCELES RIGHT TRIANGLE..NEGATIVE CIRCLED SQUARE
 1F7E0..1F7EB  ; Common # So  [12] LARGE ORANGE CIRCLE..LARGE BROWN SQUARE
 1F7F0         ; Common # So       HEAVY EQUALS SIGN
 1F800..1F80B  ; Common # So  [12] LEFTWARDS ARROW WITH SMALL TRIANGLE ARROWHEAD..DOWNWARDS ARROW WITH LARGE TRIANGLE ARROWHEAD
@@ -616,20 +615,22 @@ FFFC..FFFD    ; Common # So   [2] OBJECT REPLACEMENT CHARACTER..REPLACEMENT CHAR
 1F8B0..1F8B1  ; Common # So   [2] ARROW POINTING UPWARDS THEN NORTH WEST..ARROW POINTING RIGHTWARDS THEN CURVING SOUTH WEST
 1F900..1FA53  ; Common # So [340] CIRCLED CROSS FORMEE WITH FOUR DOTS..BLACK CHESS KNIGHT-BISHOP
 1FA60..1FA6D  ; Common # So  [14] XIANGQI RED GENERAL..XIANGQI BLACK SOLDIER
-1FA70..1FA7C  ; Common # So  [13] BALLET SHOES..CRUTCH
-1FA80..1FA88  ; Common # So   [9] YO-YO..FLUTE
-1FA90..1FABD  ; Common # So  [46] RINGED PLANET..WING
-1FABF..1FAC5  ; Common # So   [7] GOOSE..PERSON WITH CROWN
-1FACE..1FADB  ; Common # So  [14] MOOSE..PEA POD
-1FAE0..1FAE8  ; Common # So   [9] MELTING FACE..SHAKING FACE
-1FAF0..1FAF8  ; Common # So   [9] HAND WITH INDEX FINGER AND THUMB CROSSED..RIGHTWARDS PUSHING HAND
+1FA70..1FA74  ; Common # So   [5] BALLET SHOES..THONG SANDAL
+1FA78..1FA7C  ; Common # So   [5] DROP OF BLOOD..CRUTCH
+1FA80..1FA86  ; Common # So   [7] YO-YO..NESTING DOLLS
+1FA90..1FAAC  ; Common # So  [29] RINGED PLANET..HAMSA
+1FAB0..1FABA  ; Common # So  [11] FLY..NEST WITH EGGS
+1FAC0..1FAC5  ; Common # So   [6] ANATOMICAL HEART..PERSON WITH CROWN
+1FAD0..1FAD9  ; Common # So  [10] BLUEBERRIES..JAR
+1FAE0..1FAE7  ; Common # So   [8] MELTING FACE..BUBBLES
+1FAF0..1FAF6  ; Common # So   [7] HAND WITH INDEX FINGER AND THUMB CROSSED..HEART HANDS
 1FB00..1FB92  ; Common # So [147] BLOCK SEXTANT-1..UPPER HALF INVERSE MEDIUM SHADE AND LOWER HALF BLOCK
 1FB94..1FBCA  ; Common # So  [55] LEFT HALF INVERSE MEDIUM SHADE AND RIGHT HALF BLOCK..WHITE UP-POINTING CHEVRON
 1FBF0..1FBF9  ; Common # Nd  [10] SEGMENTED DIGIT ZERO..SEGMENTED DIGIT NINE
 E0001         ; Common # Cf       LANGUAGE TAG
 E0020..E007F  ; Common # Cf  [96] TAG SPACE..CANCEL TAG
 
-# Total code points: 8301
+# Total code points: 8252
 
 # ================================================
 
@@ -696,9 +697,8 @@ FF41..FF5A    ; Latin # L&  [26] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH LATIN
 1DF00..1DF09  ; Latin # L&  [10] LATIN SMALL LETTER FENG DIGRAPH WITH TRILL..LATIN SMALL LETTER T WITH HOOK AND RETROFLEX HOOK
 1DF0A         ; Latin # Lo       LATIN LETTER RETROFLEX CLICK WITH RETROFLEX HOOK
 1DF0B..1DF1E  ; Latin # L&  [20] LATIN SMALL LETTER ESH WITH DOUBLE BAR..LATIN SMALL LETTER S WITH CURL
-1DF25..1DF2A  ; Latin # L&   [6] LATIN SMALL LETTER D WITH MID-HEIGHT LEFT HOOK..LATIN SMALL LETTER T WITH MID-HEIGHT LEFT HOOK
 
-# Total code points: 1481
+# Total code points: 1475
 
 # ================================================
 
@@ -784,10 +784,8 @@ A680..A69B    ; Cyrillic # L&  [28] CYRILLIC CAPITAL LETTER DWE..CYRILLIC SMALL
 A69C..A69D    ; Cyrillic # Lm   [2] MODIFIER LETTER CYRILLIC HARD SIGN..MODIFIER LETTER CYRILLIC SOFT SIGN
 A69E..A69F    ; Cyrillic # Mn   [2] COMBINING CYRILLIC LETTER EF..COMBINING CYRILLIC LETTER IOTIFIED E
 FE2E..FE2F    ; Cyrillic # Mn   [2] COMBINING CYRILLIC TITLO LEFT HALF..COMBINING CYRILLIC TITLO RIGHT HALF
-1E030..1E06D  ; Cyrillic # Lm  [62] MODIFIER LETTER CYRILLIC SMALL A..MODIFIER LETTER CYRILLIC SMALL STRAIGHT U WITH STROKE
-1E08F         ; Cyrillic # Mn       COMBINING CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
 
-# Total code points: 506
+# Total code points: 443
 
 # ================================================
 
@@ -885,7 +883,6 @@ FDFD..FDFF    ; Arabic # So   [3] ARABIC LIGATURE BISMILLAH AR-RAHMAN AR-RAHEEM.
 FE70..FE74    ; Arabic # Lo   [5] ARABIC FATHATAN ISOLATED FORM..ARABIC KASRATAN ISOLATED FORM
 FE76..FEFC    ; Arabic # Lo [135] ARABIC FATHA ISOLATED FORM..ARABIC LIGATURE LAM WITH ALEF FINAL FORM
 10E60..10E7E  ; Arabic # No  [31] RUMI DIGIT ONE..RUMI FRACTION TWO THIRDS
-10EFD..10EFF  ; Arabic # Mn   [3] ARABIC SMALL LOW WORD SAKTA..ARABIC SMALL LOW WORD MADDA
 1EE00..1EE03  ; Arabic # Lo   [4] ARABIC MATHEMATICAL ALEF..ARABIC MATHEMATICAL DAL
 1EE05..1EE1F  ; Arabic # Lo  [27] ARABIC MATHEMATICAL WAW..ARABIC MATHEMATICAL DOTLESS QAF
 1EE21..1EE22  ; Arabic # Lo   [2] ARABIC MATHEMATICAL INITIAL BEH..ARABIC MATHEMATICAL INITIAL JEEM
@@ -921,7 +918,7 @@ FE76..FEFC    ; Arabic # Lo [135] ARABIC FATHA ISOLATED FORM..ARABIC LIGATURE LA
 1EEAB..1EEBB  ; Arabic # Lo  [17] ARABIC MATHEMATICAL DOUBLE-STRUCK LAM..ARABIC MATHEMATICAL DOUBLE-STRUCK GHAIN
 1EEF0..1EEF1  ; Arabic # Sm   [2] ARABIC MATHEMATICAL OPERATOR MEEM WITH HAH WITH TATWEEL..ARABIC MATHEMATICAL OPERATOR HAH WITH DAL
 
-# Total code points: 1368
+# Total code points: 1365
 
 # ================================================
 
@@ -973,9 +970,8 @@ A8FB          ; Devanagari # Lo       DEVANAGARI HEADSTROKE
 A8FC          ; Devanagari # Po       DEVANAGARI SIGN SIDDHAM
 A8FD..A8FE    ; Devanagari # Lo   [2] DEVANAGARI JAIN OM..DEVANAGARI LETTER AY
 A8FF          ; Devanagari # Mn       DEVANAGARI VOWEL SIGN AY
-11B00..11B09  ; Devanagari # Po  [10] DEVANAGARI HEAD MARK..DEVANAGARI SIGN MINDU
 
-# Total code points: 164
+# Total code points: 154
 
 # ================================================
 
@@ -1186,9 +1182,8 @@ A8FF          ; Devanagari # Mn       DEVANAGARI VOWEL SIGN AY
 0CE2..0CE3    ; Kannada # Mn   [2] KANNADA VOWEL SIGN VOCALIC L..KANNADA VOWEL SIGN VOCALIC LL
 0CE6..0CEF    ; Kannada # Nd  [10] KANNADA DIGIT ZERO..KANNADA DIGIT NINE
 0CF1..0CF2    ; Kannada # Lo   [2] KANNADA SIGN JIHVAMULIYA..KANNADA SIGN UPADHMANIYA
-0CF3          ; Kannada # Mc       KANNADA SIGN COMBINING ANUSVARA ABOVE RIGHT
 
-# Total code points: 91
+# Total code points: 90
 
 # ================================================
 
@@ -1268,11 +1263,11 @@ A8FF          ; Devanagari # Mn       DEVANAGARI VOWEL SIGN AY
 0EBD          ; Lao # Lo       LAO SEMIVOWEL SIGN NYO
 0EC0..0EC4    ; Lao # Lo   [5] LAO VOWEL SIGN E..LAO VOWEL SIGN AI
 0EC6          ; Lao # Lm       LAO KO LA
-0EC8..0ECE    ; Lao # Mn   [7] LAO TONE MAI EK..LAO YAMAKKAN
+0EC8..0ECD    ; Lao # Mn   [6] LAO TONE MAI EK..LAO NIGGAHITA
 0ED0..0ED9    ; Lao # Nd  [10] LAO DIGIT ZERO..LAO DIGIT NINE
 0EDC..0EDF    ; Lao # Lo   [4] LAO HO NO..LAO LETTER KHMU NYO
 
-# Total code points: 83
+# Total code points: 82
 
 # ================================================
 
@@ -1537,11 +1532,10 @@ AB70..ABBF    ; Cherokee # L&  [80] CHEROKEE SMALL LETTER A..CHEROKEE SMALL LETT
 309D..309E    ; Hiragana # Lm   [2] HIRAGANA ITERATION MARK..HIRAGANA VOICED ITERATION MARK
 309F          ; Hiragana # Lo       HIRAGANA DIGRAPH YORI
 1B001..1B11F  ; Hiragana # Lo [287] HIRAGANA LETTER ARCHAIC YE..HIRAGANA LETTER ARCHAIC WU
-1B132         ; Hiragana # Lo       HIRAGANA LETTER SMALL KO
 1B150..1B152  ; Hiragana # Lo   [3] HIRAGANA LETTER SMALL WI..HIRAGANA LETTER SMALL WO
 1F200         ; Hiragana # So       SQUARE HIRAGANA HOKA
 
-# Total code points: 381
+# Total code points: 380
 
 # ================================================
 
@@ -1558,10 +1552,9 @@ FF71..FF9D    ; Katakana # Lo  [45] HALFWIDTH KATAKANA LETTER A..HALFWIDTH KATAK
 1AFFD..1AFFE  ; Katakana # Lm   [2] KATAKANA LETTER MINNAN NASALIZED TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-8
 1B000         ; Katakana # Lo       KATAKANA LETTER ARCHAIC E
 1B120..1B122  ; Katakana # Lo   [3] KATAKANA LETTER ARCHAIC YI..KATAKANA LETTER ARCHAIC WU
-1B155         ; Katakana # Lo       KATAKANA LETTER SMALL KO
 1B164..1B167  ; Katakana # Lo   [4] KATAKANA LETTER SMALL WI..KATAKANA LETTER SMALL N
 
-# Total code points: 321
+# Total code points: 320
 
 # ================================================
 
@@ -1589,15 +1582,14 @@ FA70..FAD9    ; Han # Lo [106] CJK COMPATIBILITY IDEOGRAPH-FA70..CJK COMPATIBILI
 16FE3         ; Han # Lm       OLD CHINESE ITERATION MARK
 16FF0..16FF1  ; Han # Mc   [2] VIETNAMESE ALTERNATE READING MARK CA..VIETNAMESE ALTERNATE READING MARK NHAY
 20000..2A6DF  ; Han # Lo [42720] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6DF
-2A700..2B739  ; Han # Lo [4154] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B739
+2A700..2B738  ; Han # Lo [4153] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B738
 2B740..2B81D  ; Han # Lo [222] CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D
 2B820..2CEA1  ; Han # Lo [5762] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEA1
 2CEB0..2EBE0  ; Han # Lo [7473] CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0
 2F800..2FA1D  ; Han # Lo [542] CJK COMPATIBILITY IDEOGRAPH-2F800..CJK COMPATIBILITY IDEOGRAPH-2FA1D
 30000..3134A  ; Han # Lo [4939] CJK UNIFIED IDEOGRAPH-30000..CJK UNIFIED IDEOGRAPH-3134A
-31350..323AF  ; Han # Lo [4192] CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-323AF
 
-# Total code points: 98408
+# Total code points: 94215
 
 # ================================================
 
@@ -2101,13 +2093,10 @@ AADE..AADF    ; Tai_Viet # Po   [2] TAI VIET SYMBOL HO HOI..TAI VIET SYMBOL KOI
 
 # ================================================
 
-13000..1342F  ; Egyptian_Hieroglyphs # Lo [1072] EGYPTIAN HIEROGLYPH A001..EGYPTIAN HIEROGLYPH V011D
-13430..1343F  ; Egyptian_Hieroglyphs # Cf  [16] EGYPTIAN HIEROGLYPH VERTICAL JOINER..EGYPTIAN HIEROGLYPH END WALLED ENCLOSURE
-13440         ; Egyptian_Hieroglyphs # Mn       EGYPTIAN HIEROGLYPH MIRROR HORIZONTALLY
-13441..13446  ; Egyptian_Hieroglyphs # Lo   [6] EGYPTIAN HIEROGLYPH FULL BLANK..EGYPTIAN HIEROGLYPH WIDE LOST SIGN
-13447..13455  ; Egyptian_Hieroglyphs # Mn  [15] EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT TOP START..EGYPTIAN HIEROGLYPH MODIFIER DAMAGED
+13000..1342E  ; Egyptian_Hieroglyphs # Lo [1071] EGYPTIAN HIEROGLYPH A001..EGYPTIAN HIEROGLYPH AA032
+13430..13438  ; Egyptian_Hieroglyphs # Cf   [9] EGYPTIAN HIEROGLYPH VERTICAL JOINER..EGYPTIAN HIEROGLYPH END SEGMENT
 
-# Total code points: 1110
+# Total code points: 1080
 
 # ================================================
 
@@ -2451,10 +2440,8 @@ ABF0..ABF9    ; Meetei_Mayek # Nd  [10] MEETEI MAYEK DIGIT ZERO..MEETEI MAYEK DI
 11236..11237  ; Khojki # Mn   [2] KHOJKI SIGN NUKTA..KHOJKI SIGN SHADDA
 11238..1123D  ; Khojki # Po   [6] KHOJKI DANDA..KHOJKI ABBREVIATION SIGN
 1123E         ; Khojki # Mn       KHOJKI SIGN SUKUN
-1123F..11240  ; Khojki # Lo   [2] KHOJKI LETTER QA..KHOJKI LETTER SHORT I
-11241         ; Khojki # Mn       KHOJKI VOWEL SIGN VOCALIC R
 
-# Total code points: 65
+# Total code points: 62
 
 # ================================================
 
@@ -3001,31 +2988,4 @@ ABF0..ABF9    ; Meetei_Mayek # Nd  [10] MEETEI MAYEK DIGIT ZERO..MEETEI MAYEK DI
 
 # Total code points: 70
 
-# ================================================
-
-11F00..11F01  ; Kawi # Mn   [2] KAWI SIGN CANDRABINDU..KAWI SIGN ANUSVARA
-11F02         ; Kawi # Lo       KAWI SIGN REPHA
-11F03         ; Kawi # Mc       KAWI SIGN VISARGA
-11F04..11F10  ; Kawi # Lo  [13] KAWI LETTER A..KAWI LETTER O
-11F12..11F33  ; Kawi # Lo  [34] KAWI LETTER KA..KAWI LETTER JNYA
-11F34..11F35  ; Kawi # Mc   [2] KAWI VOWEL SIGN AA..KAWI VOWEL SIGN ALTERNATE AA
-11F36..11F3A  ; Kawi # Mn   [5] KAWI VOWEL SIGN I..KAWI VOWEL SIGN VOCALIC R
-11F3E..11F3F  ; Kawi # Mc   [2] KAWI VOWEL SIGN E..KAWI VOWEL SIGN AI
-11F40         ; Kawi # Mn       KAWI VOWEL SIGN EU
-11F41         ; Kawi # Mc       KAWI SIGN KILLER
-11F42         ; Kawi # Mn       KAWI CONJOINER
-11F43..11F4F  ; Kawi # Po  [13] KAWI DANDA..KAWI PUNCTUATION CLOSING SPIRAL
-11F50..11F59  ; Kawi # Nd  [10] KAWI DIGIT ZERO..KAWI DIGIT NINE
-
-# Total code points: 86
-
-# ================================================
-
-1E4D0..1E4EA  ; Nag_Mundari # Lo  [27] NAG MUNDARI LETTER O..NAG MUNDARI LETTER ELL
-1E4EB         ; Nag_Mundari # Lm       NAG MUNDARI SIGN OJOD
-1E4EC..1E4EF  ; Nag_Mundari # Mn   [4] NAG MUNDARI SIGN MUHOR..NAG MUNDARI SIGN SUTUH
-1E4F0..1E4F9  ; Nag_Mundari # Nd  [10] NAG MUNDARI DIGIT ZERO..NAG MUNDARI DIGIT NINE
-
-# Total code points: 42
-
 # EOF

admin/unidata/SpecialCasing.txt

@@ -1,11 +1,11 @@
-# SpecialCasing-15.0.0.txt
-# Date: 2022-02-02, 23:35:52 GMT
-# © 2022 Unicode®, Inc.
+# SpecialCasing-14.0.0.txt
+# Date: 2021-03-08, 19:35:55 GMT
+# © 2021 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
-# For terms of use, see https://www.unicode.org/terms_of_use.html
+# For terms of use, see http://www.unicode.org/terms_of_use.html
 #
 # Unicode Character Database
-#   For documentation, see https://www.unicode.org/reports/tr44/
+#   For documentation, see http://www.unicode.org/reports/tr44/
 #
 # Special Casing
 #

admin/unidata/UnicodeData.txt

@@ -2975,7 +2975,6 @@
 0CEF;KANNADA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
 0CF1;KANNADA SIGN JIHVAMULIYA;Lo;0;L;;;;;N;;;;;
 0CF2;KANNADA SIGN UPADHMANIYA;Lo;0;L;;;;;N;;;;;
-0CF3;KANNADA SIGN COMBINING ANUSVARA ABOVE RIGHT;Mc;0;L;;;;;N;;;;;
 0D00;MALAYALAM SIGN COMBINING ANUSVARA ABOVE;Mn;0;NSM;;;;;N;;;;;
 0D01;MALAYALAM SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
 0D02;MALAYALAM SIGN ANUSVARA;Mc;0;L;;;;;N;;;;;
@@ -3340,7 +3339,6 @@
 0ECB;LAO TONE MAI CATAWA;Mn;122;NSM;;;;;N;;;;;
 0ECC;LAO CANCELLATION MARK;Mn;0;NSM;;;;;N;;;;;
 0ECD;LAO NIGGAHITA;Mn;0;NSM;;;;;N;;;;;
-0ECE;LAO YAMAKKAN;Mn;0;NSM;;;;;N;;;;;
 0ED0;LAO DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
 0ED1;LAO DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
 0ED2;LAO DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
@@ -19395,9 +19393,6 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 10EAD;YEZIDI HYPHENATION MARK;Pd;0;R;;;;;N;;;;;
 10EB0;YEZIDI LETTER LAM WITH DOT ABOVE;Lo;0;R;;;;;N;;;;;
 10EB1;YEZIDI LETTER YOT WITH CIRCUMFLEX ABOVE;Lo;0;R;;;;;N;;;;;
-10EFD;ARABIC SMALL LOW WORD SAKTA;Mn;220;NSM;;;;;N;;;;;
-10EFE;ARABIC SMALL LOW WORD QASR;Mn;220;NSM;;;;;N;;;;;
-10EFF;ARABIC SMALL LOW WORD MADDA;Mn;220;NSM;;;;;N;;;;;
 10F00;OLD SOGDIAN LETTER ALEPH;Lo;0;R;;;;;N;;;;;
 10F01;OLD SOGDIAN LETTER FINAL ALEPH;Lo;0;R;;;;;N;;;;;
 10F02;OLD SOGDIAN LETTER BETH;Lo;0;R;;;;;N;;;;;
@@ -20063,9 +20058,6 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1123C;KHOJKI DOUBLE SECTION MARK;Po;0;L;;;;;N;;;;;
 1123D;KHOJKI ABBREVIATION SIGN;Po;0;L;;;;;N;;;;;
 1123E;KHOJKI SIGN SUKUN;Mn;0;NSM;;;;;N;;;;;
-1123F;KHOJKI LETTER QA;Lo;0;L;;;;;N;;;;;
-11240;KHOJKI LETTER SHORT I;Lo;0;L;;;;;N;;;;;
-11241;KHOJKI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
 11280;MULTANI LETTER A;Lo;0;L;;;;;N;;;;;
 11281;MULTANI LETTER I;Lo;0;L;;;;;N;;;;;
 11282;MULTANI LETTER U;Lo;0;L;;;;;N;;;;;
@@ -21264,16 +21256,6 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 11AF6;PAU CIN HAU LOW-FALLING TONE LONG FINAL;Lo;0;L;;;;;N;;;;;
 11AF7;PAU CIN HAU LOW-FALLING TONE FINAL;Lo;0;L;;;;;N;;;;;
 11AF8;PAU CIN HAU GLOTTAL STOP FINAL;Lo;0;L;;;;;N;;;;;
-11B00;DEVANAGARI HEAD MARK;Po;0;L;;;;;N;;;;;
-11B01;DEVANAGARI HEAD MARK WITH HEADSTROKE;Po;0;L;;;;;N;;;;;
-11B02;DEVANAGARI SIGN BHALE;Po;0;L;;;;;N;;;;;
-11B03;DEVANAGARI SIGN BHALE WITH HOOK;Po;0;L;;;;;N;;;;;
-11B04;DEVANAGARI SIGN EXTENDED BHALE;Po;0;L;;;;;N;;;;;
-11B05;DEVANAGARI SIGN EXTENDED BHALE WITH HOOK;Po;0;L;;;;;N;;;;;
-11B06;DEVANAGARI SIGN WESTERN FIVE-LIKE BHALE;Po;0;L;;;;;N;;;;;
-11B07;DEVANAGARI SIGN WESTERN NINE-LIKE BHALE;Po;0;L;;;;;N;;;;;
-11B08;DEVANAGARI SIGN REVERSED NINE-LIKE BHALE;Po;0;L;;;;;N;;;;;
-11B09;DEVANAGARI SIGN MINDU;Po;0;L;;;;;N;;;;;
 11C00;BHAIKSUKI LETTER A;Lo;0;L;;;;;N;;;;;
 11C01;BHAIKSUKI LETTER AA;Lo;0;L;;;;;N;;;;;
 11C02;BHAIKSUKI LETTER I;Lo;0;L;;;;;N;;;;;
@@ -21602,92 +21584,6 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 11EF6;MAKASAR VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
 11EF7;MAKASAR PASSIMBANG;Po;0;L;;;;;N;;;;;
 11EF8;MAKASAR END OF SECTION;Po;0;L;;;;;N;;;;;
-11F00;KAWI SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
-11F01;KAWI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
-11F02;KAWI SIGN REPHA;Lo;0;L;;;;;N;;;;;
-11F03;KAWI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
-11F04;KAWI LETTER A;Lo;0;L;;;;;N;;;;;
-11F05;KAWI LETTER AA;Lo;0;L;;;;;N;;;;;
-11F06;KAWI LETTER I;Lo;0;L;;;;;N;;;;;
-11F07;KAWI LETTER II;Lo;0;L;;;;;N;;;;;
-11F08;KAWI LETTER U;Lo;0;L;;;;;N;;;;;
-11F09;KAWI LETTER UU;Lo;0;L;;;;;N;;;;;
-11F0A;KAWI LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
-11F0B;KAWI LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
-11F0C;KAWI LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
-11F0D;KAWI LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
-11F0E;KAWI LETTER E;Lo;0;L;;;;;N;;;;;
-11F0F;KAWI LETTER AI;Lo;0;L;;;;;N;;;;;
-11F10;KAWI LETTER O;Lo;0;L;;;;;N;;;;;
-11F12;KAWI LETTER KA;Lo;0;L;;;;;N;;;;;
-11F13;KAWI LETTER KHA;Lo;0;L;;;;;N;;;;;
-11F14;KAWI LETTER GA;Lo;0;L;;;;;N;;;;;
-11F15;KAWI LETTER GHA;Lo;0;L;;;;;N;;;;;
-11F16;KAWI LETTER NGA;Lo;0;L;;;;;N;;;;;
-11F17;KAWI LETTER CA;Lo;0;L;;;;;N;;;;;
-11F18;KAWI LETTER CHA;Lo;0;L;;;;;N;;;;;
-11F19;KAWI LETTER JA;Lo;0;L;;;;;N;;;;;
-11F1A;KAWI LETTER JHA;Lo;0;L;;;;;N;;;;;
-11F1B;KAWI LETTER NYA;Lo;0;L;;;;;N;;;;;
-11F1C;KAWI LETTER TTA;Lo;0;L;;;;;N;;;;;
-11F1D;KAWI LETTER TTHA;Lo;0;L;;;;;N;;;;;
-11F1E;KAWI LETTER DDA;Lo;0;L;;;;;N;;;;;
-11F1F;KAWI LETTER DDHA;Lo;0;L;;;;;N;;;;;
-11F20;KAWI LETTER NNA;Lo;0;L;;;;;N;;;;;
-11F21;KAWI LETTER TA;Lo;0;L;;;;;N;;;;;
-11F22;KAWI LETTER THA;Lo;0;L;;;;;N;;;;;
-11F23;KAWI LETTER DA;Lo;0;L;;;;;N;;;;;
-11F24;KAWI LETTER DHA;Lo;0;L;;;;;N;;;;;
-11F25;KAWI LETTER NA;Lo;0;L;;;;;N;;;;;
-11F26;KAWI LETTER PA;Lo;0;L;;;;;N;;;;;
-11F27;KAWI LETTER PHA;Lo;0;L;;;;;N;;;;;
-11F28;KAWI LETTER BA;Lo;0;L;;;;;N;;;;;
-11F29;KAWI LETTER BHA;Lo;0;L;;;;;N;;;;;
-11F2A;KAWI LETTER MA;Lo;0;L;;;;;N;;;;;
-11F2B;KAWI LETTER YA;Lo;0;L;;;;;N;;;;;
-11F2C;KAWI LETTER RA;Lo;0;L;;;;;N;;;;;
-11F2D;KAWI LETTER LA;Lo;0;L;;;;;N;;;;;
-11F2E;KAWI LETTER WA;Lo;0;L;;;;;N;;;;;
-11F2F;KAWI LETTER SHA;Lo;0;L;;;;;N;;;;;
-11F30;KAWI LETTER SSA;Lo;0;L;;;;;N;;;;;
-11F31;KAWI LETTER SA;Lo;0;L;;;;;N;;;;;
-11F32;KAWI LETTER HA;Lo;0;L;;;;;N;;;;;
-11F33;KAWI LETTER JNYA;Lo;0;L;;;;;N;;;;;
-11F34;KAWI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
-11F35;KAWI VOWEL SIGN ALTERNATE AA;Mc;0;L;;;;;N;;;;;
-11F36;KAWI VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
-11F37;KAWI VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
-11F38;KAWI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
-11F39;KAWI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
-11F3A;KAWI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
-11F3E;KAWI VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
-11F3F;KAWI VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
-11F40;KAWI VOWEL SIGN EU;Mn;0;NSM;;;;;N;;;;;
-11F41;KAWI SIGN KILLER;Mc;9;L;;;;;N;;;;;
-11F42;KAWI CONJOINER;Mn;9;NSM;;;;;N;;;;;
-11F43;KAWI DANDA;Po;0;L;;;;;N;;;;;
-11F44;KAWI DOUBLE DANDA;Po;0;L;;;;;N;;;;;
-11F45;KAWI PUNCTUATION SECTION MARKER;Po;0;L;;;;;N;;;;;
-11F46;KAWI PUNCTUATION ALTERNATE SECTION MARKER;Po;0;L;;;;;N;;;;;
-11F47;KAWI PUNCTUATION FLOWER;Po;0;L;;;;;N;;;;;
-11F48;KAWI PUNCTUATION SPACE FILLER;Po;0;L;;;;;N;;;;;
-11F49;KAWI PUNCTUATION DOT;Po;0;L;;;;;N;;;;;
-11F4A;KAWI PUNCTUATION DOUBLE DOT;Po;0;L;;;;;N;;;;;
-11F4B;KAWI PUNCTUATION TRIPLE DOT;Po;0;L;;;;;N;;;;;
-11F4C;KAWI PUNCTUATION CIRCLE;Po;0;L;;;;;N;;;;;
-11F4D;KAWI PUNCTUATION FILLED CIRCLE;Po;0;L;;;;;N;;;;;
-11F4E;KAWI PUNCTUATION SPIRAL;Po;0;L;;;;;N;;;;;
-11F4F;KAWI PUNCTUATION CLOSING SPIRAL;Po;0;L;;;;;N;;;;;
-11F50;KAWI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
-11F51;KAWI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
-11F52;KAWI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
-11F53;KAWI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
-11F54;KAWI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
-11F55;KAWI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
-11F56;KAWI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
-11F57;KAWI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
-11F58;KAWI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
-11F59;KAWI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
 11FB0;LISU LETTER YHA;Lo;0;L;;;;;N;;;;;
 11FC0;TAMIL FRACTION ONE THREE-HUNDRED-AND-TWENTIETH;No;0;L;;;;1/320;N;;;;;
 11FC1;TAMIL FRACTION ONE ONE-HUNDRED-AND-SIXTIETH;No;0;L;;;;1/160;N;;;;;
@@ -24144,7 +24040,6 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1342C;EGYPTIAN HIEROGLYPH AA030;Lo;0;L;;;;;N;;;;;
 1342D;EGYPTIAN HIEROGLYPH AA031;Lo;0;L;;;;;N;;;;;
 1342E;EGYPTIAN HIEROGLYPH AA032;Lo;0;L;;;;;N;;;;;
-1342F;EGYPTIAN HIEROGLYPH V011D;Lo;0;L;;;;;N;;;;;
 13430;EGYPTIAN HIEROGLYPH VERTICAL JOINER;Cf;0;L;;;;;N;;;;;
 13431;EGYPTIAN HIEROGLYPH HORIZONTAL JOINER;Cf;0;L;;;;;N;;;;;
 13432;EGYPTIAN HIEROGLYPH INSERT AT TOP START;Cf;0;L;;;;;N;;;;;
@@ -24154,35 +24049,6 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 13436;EGYPTIAN HIEROGLYPH OVERLAY MIDDLE;Cf;0;L;;;;;N;;;;;
 13437;EGYPTIAN HIEROGLYPH BEGIN SEGMENT;Cf;0;L;;;;;N;;;;;
 13438;EGYPTIAN HIEROGLYPH END SEGMENT;Cf;0;L;;;;;N;;;;;
-13439;EGYPTIAN HIEROGLYPH INSERT AT MIDDLE;Cf;0;L;;;;;N;;;;;
-1343A;EGYPTIAN HIEROGLYPH INSERT AT TOP;Cf;0;L;;;;;N;;;;;
-1343B;EGYPTIAN HIEROGLYPH INSERT AT BOTTOM;Cf;0;L;;;;;N;;;;;
-1343C;EGYPTIAN HIEROGLYPH BEGIN ENCLOSURE;Cf;0;L;;;;;N;;;;;
-1343D;EGYPTIAN HIEROGLYPH END ENCLOSURE;Cf;0;L;;;;;N;;;;;
-1343E;EGYPTIAN HIEROGLYPH BEGIN WALLED ENCLOSURE;Cf;0;L;;;;;N;;;;;
-1343F;EGYPTIAN HIEROGLYPH END WALLED ENCLOSURE;Cf;0;L;;;;;N;;;;;
-13440;EGYPTIAN HIEROGLYPH MIRROR HORIZONTALLY;Mn;0;NSM;;;;;N;;;;;
-13441;EGYPTIAN HIEROGLYPH FULL BLANK;Lo;0;L;;;;;N;;;;;
-13442;EGYPTIAN HIEROGLYPH HALF BLANK;Lo;0;L;;;;;N;;;;;
-13443;EGYPTIAN HIEROGLYPH LOST SIGN;Lo;0;L;;;;;N;;;;;
-13444;EGYPTIAN HIEROGLYPH HALF LOST SIGN;Lo;0;L;;;;;N;;;;;
-13445;EGYPTIAN HIEROGLYPH TALL LOST SIGN;Lo;0;L;;;;;N;;;;;
-13446;EGYPTIAN HIEROGLYPH WIDE LOST SIGN;Lo;0;L;;;;;N;;;;;
-13447;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT TOP START;Mn;0;NSM;;;;;N;;;;;
-13448;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT BOTTOM START;Mn;0;NSM;;;;;N;;;;;
-13449;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT START;Mn;0;NSM;;;;;N;;;;;
-1344A;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT TOP END;Mn;0;NSM;;;;;N;;;;;
-1344B;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT TOP;Mn;0;NSM;;;;;N;;;;;
-1344C;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT BOTTOM START AND TOP END;Mn;0;NSM;;;;;N;;;;;
-1344D;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT START AND TOP;Mn;0;NSM;;;;;N;;;;;
-1344E;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT BOTTOM END;Mn;0;NSM;;;;;N;;;;;
-1344F;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT TOP START AND BOTTOM END;Mn;0;NSM;;;;;N;;;;;
-13450;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT BOTTOM;Mn;0;NSM;;;;;N;;;;;
-13451;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT START AND BOTTOM;Mn;0;NSM;;;;;N;;;;;
-13452;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT END;Mn;0;NSM;;;;;N;;;;;
-13453;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT TOP AND END;Mn;0;NSM;;;;;N;;;;;
-13454;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT BOTTOM AND END;Mn;0;NSM;;;;;N;;;;;
-13455;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED;Mn;0;NSM;;;;;N;;;;;
 14400;ANATOLIAN HIEROGLYPH A001;Lo;0;L;;;;;N;;;;;
 14401;ANATOLIAN HIEROGLYPH A002;Lo;0;L;;;;;N;;;;;
 14402;ANATOLIAN HIEROGLYPH A003;Lo;0;L;;;;;N;;;;;
@@ -27423,11 +27289,9 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1B120;KATAKANA LETTER ARCHAIC YI;Lo;0;L;;;;;N;;;;;
 1B121;KATAKANA LETTER ARCHAIC YE;Lo;0;L;;;;;N;;;;;
 1B122;KATAKANA LETTER ARCHAIC WU;Lo;0;L;;;;;N;;;;;
-1B132;HIRAGANA LETTER SMALL KO;Lo;0;L;;;;;N;;;;;
 1B150;HIRAGANA LETTER SMALL WI;Lo;0;L;;;;;N;;;;;
 1B151;HIRAGANA LETTER SMALL WE;Lo;0;L;;;;;N;;;;;
 1B152;HIRAGANA LETTER SMALL WO;Lo;0;L;;;;;N;;;;;
-1B155;KATAKANA LETTER SMALL KO;Lo;0;L;;;;;N;;;;;
 1B164;KATAKANA LETTER SMALL WI;Lo;0;L;;;;;N;;;;;
 1B165;KATAKANA LETTER SMALL WE;Lo;0;L;;;;;N;;;;;
 1B166;KATAKANA LETTER SMALL WO;Lo;0;L;;;;;N;;;;;
@@ -28709,26 +28573,6 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1D243;COMBINING GREEK MUSICAL TETRASEME;Mn;230;NSM;;;;;N;;;;;
 1D244;COMBINING GREEK MUSICAL PENTASEME;Mn;230;NSM;;;;;N;;;;;
 1D245;GREEK MUSICAL LEIMMA;So;0;ON;;;;;N;;;;;
-1D2C0;KAKTOVIK NUMERAL ZERO;No;0;L;;;;0;N;;;;;
-1D2C1;KAKTOVIK NUMERAL ONE;No;0;L;;;;1;N;;;;;
-1D2C2;KAKTOVIK NUMERAL TWO;No;0;L;;;;2;N;;;;;
-1D2C3;KAKTOVIK NUMERAL THREE;No;0;L;;;;3;N;;;;;
-1D2C4;KAKTOVIK NUMERAL FOUR;No;0;L;;;;4;N;;;;;
-1D2C5;KAKTOVIK NUMERAL FIVE;No;0;L;;;;5;N;;;;;
-1D2C6;KAKTOVIK NUMERAL SIX;No;0;L;;;;6;N;;;;;
-1D2C7;KAKTOVIK NUMERAL SEVEN;No;0;L;;;;7;N;;;;;
-1D2C8;KAKTOVIK NUMERAL EIGHT;No;0;L;;;;8;N;;;;;
-1D2C9;KAKTOVIK NUMERAL NINE;No;0;L;;;;9;N;;;;;
-1D2CA;KAKTOVIK NUMERAL TEN;No;0;L;;;;10;N;;;;;
-1D2CB;KAKTOVIK NUMERAL ELEVEN;No;0;L;;;;11;N;;;;;
-1D2CC;KAKTOVIK NUMERAL TWELVE;No;0;L;;;;12;N;;;;;
-1D2CD;KAKTOVIK NUMERAL THIRTEEN;No;0;L;;;;13;N;;;;;
-1D2CE;KAKTOVIK NUMERAL FOURTEEN;No;0;L;;;;14;N;;;;;
-1D2CF;KAKTOVIK NUMERAL FIFTEEN;No;0;L;;;;15;N;;;;;
-1D2D0;KAKTOVIK NUMERAL SIXTEEN;No;0;L;;;;16;N;;;;;
-1D2D1;KAKTOVIK NUMERAL SEVENTEEN;No;0;L;;;;17;N;;;;;
-1D2D2;KAKTOVIK NUMERAL EIGHTEEN;No;0;L;;;;18;N;;;;;
-1D2D3;KAKTOVIK NUMERAL NINETEEN;No;0;L;;;;19;N;;;;;
 1D2E0;MAYAN NUMERAL ZERO;No;0;L;;;;0;N;;;;;
 1D2E1;MAYAN NUMERAL ONE;No;0;L;;;;1;N;;;;;
 1D2E2;MAYAN NUMERAL TWO;No;0;L;;;;2;N;;;;;
@@ -30560,12 +30404,6 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1DF1C;LATIN SMALL LETTER TESH DIGRAPH WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
 1DF1D;LATIN SMALL LETTER C WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
 1DF1E;LATIN SMALL LETTER S WITH CURL;Ll;0;L;;;;;N;;;;;
-1DF25;LATIN SMALL LETTER D WITH MID-HEIGHT LEFT HOOK;Ll;0;L;;;;;N;;;;;
-1DF26;LATIN SMALL LETTER L WITH MID-HEIGHT LEFT HOOK;Ll;0;L;;;;;N;;;;;
-1DF27;LATIN SMALL LETTER N WITH MID-HEIGHT LEFT HOOK;Ll;0;L;;;;;N;;;;;
-1DF28;LATIN SMALL LETTER R WITH MID-HEIGHT LEFT HOOK;Ll;0;L;;;;;N;;;;;
-1DF29;LATIN SMALL LETTER S WITH MID-HEIGHT LEFT HOOK;Ll;0;L;;;;;N;;;;;
-1DF2A;LATIN SMALL LETTER T WITH MID-HEIGHT LEFT HOOK;Ll;0;L;;;;;N;;;;;
 1E000;COMBINING GLAGOLITIC LETTER AZU;Mn;230;NSM;;;;;N;;;;;
 1E001;COMBINING GLAGOLITIC LETTER BUKY;Mn;230;NSM;;;;;N;;;;;
 1E002;COMBINING GLAGOLITIC LETTER VEDE;Mn;230;NSM;;;;;N;;;;;
@@ -30604,69 +30442,6 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1E028;COMBINING GLAGOLITIC LETTER BIG YUS;Mn;230;NSM;;;;;N;;;;;
 1E029;COMBINING GLAGOLITIC LETTER IOTATED BIG YUS;Mn;230;NSM;;;;;N;;;;;
 1E02A;COMBINING GLAGOLITIC LETTER FITA;Mn;230;NSM;;;;;N;;;;;
-1E030;MODIFIER LETTER CYRILLIC SMALL A;Lm;0;L;<super> 0430;;;;N;;;;;
-1E031;MODIFIER LETTER CYRILLIC SMALL BE;Lm;0;L;<super> 0431;;;;N;;;;;
-1E032;MODIFIER LETTER CYRILLIC SMALL VE;Lm;0;L;<super> 0432;;;;N;;;;;
-1E033;MODIFIER LETTER CYRILLIC SMALL GHE;Lm;0;L;<super> 0433;;;;N;;;;;
-1E034;MODIFIER LETTER CYRILLIC SMALL DE;Lm;0;L;<super> 0434;;;;N;;;;;
-1E035;MODIFIER LETTER CYRILLIC SMALL IE;Lm;0;L;<super> 0435;;;;N;;;;;
-1E036;MODIFIER LETTER CYRILLIC SMALL ZHE;Lm;0;L;<super> 0436;;;;N;;;;;
-1E037;MODIFIER LETTER CYRILLIC SMALL ZE;Lm;0;L;<super> 0437;;;;N;;;;;
-1E038;MODIFIER LETTER CYRILLIC SMALL I;Lm;0;L;<super> 0438;;;;N;;;;;
-1E039;MODIFIER LETTER CYRILLIC SMALL KA;Lm;0;L;<super> 043A;;;;N;;;;;
-1E03A;MODIFIER LETTER CYRILLIC SMALL EL;Lm;0;L;<super> 043B;;;;N;;;;;
-1E03B;MODIFIER LETTER CYRILLIC SMALL EM;Lm;0;L;<super> 043C;;;;N;;;;;
-1E03C;MODIFIER LETTER CYRILLIC SMALL O;Lm;0;L;<super> 043E;;;;N;;;;;
-1E03D;MODIFIER LETTER CYRILLIC SMALL PE;Lm;0;L;<super> 043F;;;;N;;;;;
-1E03E;MODIFIER LETTER CYRILLIC SMALL ER;Lm;0;L;<super> 0440;;;;N;;;;;
-1E03F;MODIFIER LETTER CYRILLIC SMALL ES;Lm;0;L;<super> 0441;;;;N;;;;;
-1E040;MODIFIER LETTER CYRILLIC SMALL TE;Lm;0;L;<super> 0442;;;;N;;;;;
-1E041;MODIFIER LETTER CYRILLIC SMALL U;Lm;0;L;<super> 0443;;;;N;;;;;
-1E042;MODIFIER LETTER CYRILLIC SMALL EF;Lm;0;L;<super> 0444;;;;N;;;;;
-1E043;MODIFIER LETTER CYRILLIC SMALL HA;Lm;0;L;<super> 0445;;;;N;;;;;
-1E044;MODIFIER LETTER CYRILLIC SMALL TSE;Lm;0;L;<super> 0446;;;;N;;;;;
-1E045;MODIFIER LETTER CYRILLIC SMALL CHE;Lm;0;L;<super> 0447;;;;N;;;;;
-1E046;MODIFIER LETTER CYRILLIC SMALL SHA;Lm;0;L;<super> 0448;;;;N;;;;;
-1E047;MODIFIER LETTER CYRILLIC SMALL YERU;Lm;0;L;<super> 044B;;;;N;;;;;
-1E048;MODIFIER LETTER CYRILLIC SMALL E;Lm;0;L;<super> 044D;;;;N;;;;;
-1E049;MODIFIER LETTER CYRILLIC SMALL YU;Lm;0;L;<super> 044E;;;;N;;;;;
-1E04A;MODIFIER LETTER CYRILLIC SMALL DZZE;Lm;0;L;<super> A689;;;;N;;;;;
-1E04B;MODIFIER LETTER CYRILLIC SMALL SCHWA;Lm;0;L;<super> 04D9;;;;N;;;;;
-1E04C;MODIFIER LETTER CYRILLIC SMALL BYELORUSSIAN-UKRAINIAN I;Lm;0;L;<super> 0456;;;;N;;;;;
-1E04D;MODIFIER LETTER CYRILLIC SMALL JE;Lm;0;L;<super> 0458;;;;N;;;;;
-1E04E;MODIFIER LETTER CYRILLIC SMALL BARRED O;Lm;0;L;<super> 04E9;;;;N;;;;;
-1E04F;MODIFIER LETTER CYRILLIC SMALL STRAIGHT U;Lm;0;L;<super> 04AF;;;;N;;;;;
-1E050;MODIFIER LETTER CYRILLIC SMALL PALOCHKA;Lm;0;L;<super> 04CF;;;;N;;;;;
-1E051;CYRILLIC SUBSCRIPT SMALL LETTER A;Lm;0;L;<sub> 0430;;;;N;;;;;
-1E052;CYRILLIC SUBSCRIPT SMALL LETTER BE;Lm;0;L;<sub> 0431;;;;N;;;;;
-1E053;CYRILLIC SUBSCRIPT SMALL LETTER VE;Lm;0;L;<sub> 0432;;;;N;;;;;
-1E054;CYRILLIC SUBSCRIPT SMALL LETTER GHE;Lm;0;L;<sub> 0433;;;;N;;;;;
-1E055;CYRILLIC SUBSCRIPT SMALL LETTER DE;Lm;0;L;<sub> 0434;;;;N;;;;;
-1E056;CYRILLIC SUBSCRIPT SMALL LETTER IE;Lm;0;L;<sub> 0435;;;;N;;;;;
-1E057;CYRILLIC SUBSCRIPT SMALL LETTER ZHE;Lm;0;L;<sub> 0436;;;;N;;;;;
-1E058;CYRILLIC SUBSCRIPT SMALL LETTER ZE;Lm;0;L;<sub> 0437;;;;N;;;;;
-1E059;CYRILLIC SUBSCRIPT SMALL LETTER I;Lm;0;L;<sub> 0438;;;;N;;;;;
-1E05A;CYRILLIC SUBSCRIPT SMALL LETTER KA;Lm;0;L;<sub> 043A;;;;N;;;;;
-1E05B;CYRILLIC SUBSCRIPT SMALL LETTER EL;Lm;0;L;<sub> 043B;;;;N;;;;;
-1E05C;CYRILLIC SUBSCRIPT SMALL LETTER O;Lm;0;L;<sub> 043E;;;;N;;;;;
-1E05D;CYRILLIC SUBSCRIPT SMALL LETTER PE;Lm;0;L;<sub> 043F;;;;N;;;;;
-1E05E;CYRILLIC SUBSCRIPT SMALL LETTER ES;Lm;0;L;<sub> 0441;;;;N;;;;;
-1E05F;CYRILLIC SUBSCRIPT SMALL LETTER U;Lm;0;L;<sub> 0443;;;;N;;;;;
-1E060;CYRILLIC SUBSCRIPT SMALL LETTER EF;Lm;0;L;<sub> 0444;;;;N;;;;;
-1E061;CYRILLIC SUBSCRIPT SMALL LETTER HA;Lm;0;L;<sub> 0445;;;;N;;;;;
-1E062;CYRILLIC SUBSCRIPT SMALL LETTER TSE;Lm;0;L;<sub> 0446;;;;N;;;;;
-1E063;CYRILLIC SUBSCRIPT SMALL LETTER CHE;Lm;0;L;<sub> 0447;;;;N;;;;;
-1E064;CYRILLIC SUBSCRIPT SMALL LETTER SHA;Lm;0;L;<sub> 0448;;;;N;;;;;
-1E065;CYRILLIC SUBSCRIPT SMALL LETTER HARD SIGN;Lm;0;L;<sub> 044A;;;;N;;;;;
-1E066;CYRILLIC SUBSCRIPT SMALL LETTER YERU;Lm;0;L;<sub> 044B;;;;N;;;;;
-1E067;CYRILLIC SUBSCRIPT SMALL LETTER GHE WITH UPTURN;Lm;0;L;<sub> 0491;;;;N;;;;;
-1E068;CYRILLIC SUBSCRIPT SMALL LETTER BYELORUSSIAN-UKRAINIAN I;Lm;0;L;<sub> 0456;;;;N;;;;;
-1E069;CYRILLIC SUBSCRIPT SMALL LETTER DZE;Lm;0;L;<sub> 0455;;;;N;;;;;
-1E06A;CYRILLIC SUBSCRIPT SMALL LETTER DZHE;Lm;0;L;<sub> 045F;;;;N;;;;;
-1E06B;MODIFIER LETTER CYRILLIC SMALL ES WITH DESCENDER;Lm;0;L;<super> 04AB;;;;N;;;;;
-1E06C;MODIFIER LETTER CYRILLIC SMALL YERU WITH BACK YER;Lm;0;L;<super> A651;;;;N;;;;;
-1E06D;MODIFIER LETTER CYRILLIC SMALL STRAIGHT U WITH STROKE;Lm;0;L;<super> 04B1;;;;N;;;;;
-1E08F;COMBINING CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I;Mn;230;NSM;;;;;N;;;;;
 1E100;NYIAKENG PUACHUE HMONG LETTER MA;Lo;0;L;;;;;N;;;;;
 1E101;NYIAKENG PUACHUE HMONG LETTER TSA;Lo;0;L;;;;;N;;;;;
 1E102;NYIAKENG PUACHUE HMONG LETTER NTA;Lo;0;L;;;;;N;;;;;
@@ -30828,48 +30603,6 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1E2F8;WANCHO DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
 1E2F9;WANCHO DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
 1E2FF;WANCHO NGUN SIGN;Sc;0;ET;;;;;N;;;;;
-1E4D0;NAG MUNDARI LETTER O;Lo;0;L;;;;;N;;;;;
-1E4D1;NAG MUNDARI LETTER OP;Lo;0;L;;;;;N;;;;;
-1E4D2;NAG MUNDARI LETTER OL;Lo;0;L;;;;;N;;;;;
-1E4D3;NAG MUNDARI LETTER OY;Lo;0;L;;;;;N;;;;;
-1E4D4;NAG MUNDARI LETTER ONG;Lo;0;L;;;;;N;;;;;
-1E4D5;NAG MUNDARI LETTER A;Lo;0;L;;;;;N;;;;;
-1E4D6;NAG MUNDARI LETTER AJ;Lo;0;L;;;;;N;;;;;
-1E4D7;NAG MUNDARI LETTER AB;Lo;0;L;;;;;N;;;;;
-1E4D8;NAG MUNDARI LETTER ANY;Lo;0;L;;;;;N;;;;;
-1E4D9;NAG MUNDARI LETTER AH;Lo;0;L;;;;;N;;;;;
-1E4DA;NAG MUNDARI LETTER I;Lo;0;L;;;;;N;;;;;
-1E4DB;NAG MUNDARI LETTER IS;Lo;0;L;;;;;N;;;;;
-1E4DC;NAG MUNDARI LETTER IDD;Lo;0;L;;;;;N;;;;;
-1E4DD;NAG MUNDARI LETTER IT;Lo;0;L;;;;;N;;;;;
-1E4DE;NAG MUNDARI LETTER IH;Lo;0;L;;;;;N;;;;;
-1E4DF;NAG MUNDARI LETTER U;Lo;0;L;;;;;N;;;;;
-1E4E0;NAG MUNDARI LETTER UC;Lo;0;L;;;;;N;;;;;
-1E4E1;NAG MUNDARI LETTER UD;Lo;0;L;;;;;N;;;;;
-1E4E2;NAG MUNDARI LETTER UK;Lo;0;L;;;;;N;;;;;
-1E4E3;NAG MUNDARI LETTER UR;Lo;0;L;;;;;N;;;;;
-1E4E4;NAG MUNDARI LETTER E;Lo;0;L;;;;;N;;;;;
-1E4E5;NAG MUNDARI LETTER ENN;Lo;0;L;;;;;N;;;;;
-1E4E6;NAG MUNDARI LETTER EG;Lo;0;L;;;;;N;;;;;
-1E4E7;NAG MUNDARI LETTER EM;Lo;0;L;;;;;N;;;;;
-1E4E8;NAG MUNDARI LETTER EN;Lo;0;L;;;;;N;;;;;
-1E4E9;NAG MUNDARI LETTER ETT;Lo;0;L;;;;;N;;;;;
-1E4EA;NAG MUNDARI LETTER ELL;Lo;0;L;;;;;N;;;;;
-1E4EB;NAG MUNDARI SIGN OJOD;Lm;0;L;;;;;N;;;;;
-1E4EC;NAG MUNDARI SIGN MUHOR;Mn;232;NSM;;;;;N;;;;;
-1E4ED;NAG MUNDARI SIGN TOYOR;Mn;232;NSM;;;;;N;;;;;
-1E4EE;NAG MUNDARI SIGN IKIR;Mn;220;NSM;;;;;N;;;;;
-1E4EF;NAG MUNDARI SIGN SUTUH;Mn;230;NSM;;;;;N;;;;;
-1E4F0;NAG MUNDARI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
-1E4F1;NAG MUNDARI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
-1E4F2;NAG MUNDARI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
-1E4F3;NAG MUNDARI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
-1E4F4;NAG MUNDARI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
-1E4F5;NAG MUNDARI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
-1E4F6;NAG MUNDARI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
-1E4F7;NAG MUNDARI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
-1E4F8;NAG MUNDARI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
-1E4F9;NAG MUNDARI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
 1E7E0;ETHIOPIC SYLLABLE HHYA;Lo;0;L;;;;;N;;;;;
 1E7E1;ETHIOPIC SYLLABLE HHYU;Lo;0;L;;;;;N;;;;;
 1E7E2;ETHIOPIC SYLLABLE HHYI;Lo;0;L;;;;;N;;;;;
@@ -32945,7 +32678,6 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1F6D5;HINDU TEMPLE;So;0;ON;;;;;N;;;;;
 1F6D6;HUT;So;0;ON;;;;;N;;;;;
 1F6D7;ELEVATOR;So;0;ON;;;;;N;;;;;
-1F6DC;WIRELESS;So;0;ON;;;;;N;;;;;
 1F6DD;PLAYGROUND SLIDE;So;0;ON;;;;;N;;;;;
 1F6DE;WHEEL;So;0;ON;;;;;N;;;;;
 1F6DF;RING BUOY;So;0;ON;;;;;N;;;;;
@@ -33091,14 +32823,6 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1F771;ALCHEMICAL SYMBOL FOR MONTH;So;0;ON;;;;;N;;;;;
 1F772;ALCHEMICAL SYMBOL FOR HALF DRAM;So;0;ON;;;;;N;;;;;
 1F773;ALCHEMICAL SYMBOL FOR HALF OUNCE;So;0;ON;;;;;N;;;;;
-1F774;LOT OF FORTUNE;So;0;ON;;;;;N;;;;;
-1F775;OCCULTATION;So;0;ON;;;;;N;;;;;
-1F776;LUNAR ECLIPSE;So;0;ON;;;;;N;;;;;
-1F77B;HAUMEA;So;0;ON;;;;;N;;;;;
-1F77C;MAKEMAKE;So;0;ON;;;;;N;;;;;
-1F77D;GONGGONG;So;0;ON;;;;;N;;;;;
-1F77E;QUAOAR;So;0;ON;;;;;N;;;;;
-1F77F;ORCUS;So;0;ON;;;;;N;;;;;
 1F780;BLACK LEFT-POINTING ISOSCELES RIGHT TRIANGLE;So;0;ON;;;;;N;;;;;
 1F781;BLACK UP-POINTING ISOSCELES RIGHT TRIANGLE;So;0;ON;;;;;N;;;;;
 1F782;BLACK RIGHT-POINTING ISOSCELES RIGHT TRIANGLE;So;0;ON;;;;;N;;;;;
@@ -33188,7 +32912,6 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1F7D6;NEGATIVE CIRCLED TRIANGLE;So;0;ON;;;;;N;;;;;
 1F7D7;CIRCLED SQUARE;So;0;ON;;;;;N;;;;;
 1F7D8;NEGATIVE CIRCLED SQUARE;So;0;ON;;;;;N;;;;;
-1F7D9;NINE POINTED WHITE STAR;So;0;ON;;;;;N;;;;;
 1F7E0;LARGE ORANGE CIRCLE;So;0;ON;;;;;N;;;;;
 1F7E1;LARGE YELLOW CIRCLE;So;0;ON;;;;;N;;;;;
 1F7E2;LARGE GREEN CIRCLE;So;0;ON;;;;;N;;;;;
@@ -33711,9 +33434,6 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1FA72;BRIEFS;So;0;ON;;;;;N;;;;;
 1FA73;SHORTS;So;0;ON;;;;;N;;;;;
 1FA74;THONG SANDAL;So;0;ON;;;;;N;;;;;
-1FA75;LIGHT BLUE HEART;So;0;ON;;;;;N;;;;;
-1FA76;GREY HEART;So;0;ON;;;;;N;;;;;
-1FA77;PINK HEART;So;0;ON;;;;;N;;;;;
 1FA78;DROP OF BLOOD;So;0;ON;;;;;N;;;;;
 1FA79;ADHESIVE BANDAGE;So;0;ON;;;;;N;;;;;
 1FA7A;STETHOSCOPE;So;0;ON;;;;;N;;;;;
@@ -33726,8 +33446,6 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1FA84;MAGIC WAND;So;0;ON;;;;;N;;;;;
 1FA85;PINATA;So;0;ON;;;;;N;;;;;
 1FA86;NESTING DOLLS;So;0;ON;;;;;N;;;;;
-1FA87;MARACAS;So;0;ON;;;;;N;;;;;
-1FA88;FLUTE;So;0;ON;;;;;N;;;;;
 1FA90;RINGED PLANET;So;0;ON;;;;;N;;;;;
 1FA91;CHAIR;So;0;ON;;;;;N;;;;;
 1FA92;RAZOR;So;0;ON;;;;;N;;;;;
@@ -33757,9 +33475,6 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1FAAA;IDENTIFICATION CARD;So;0;ON;;;;;N;;;;;
 1FAAB;LOW BATTERY;So;0;ON;;;;;N;;;;;
 1FAAC;HAMSA;So;0;ON;;;;;N;;;;;
-1FAAD;FOLDING HAND FAN;So;0;ON;;;;;N;;;;;
-1FAAE;HAIR PICK;So;0;ON;;;;;N;;;;;
-1FAAF;KHANDA;So;0;ON;;;;;N;;;;;
 1FAB0;FLY;So;0;ON;;;;;N;;;;;
 1FAB1;WORM;So;0;ON;;;;;N;;;;;
 1FAB2;BEETLE;So;0;ON;;;;;N;;;;;
@@ -33771,18 +33486,12 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1FAB8;CORAL;So;0;ON;;;;;N;;;;;
 1FAB9;EMPTY NEST;So;0;ON;;;;;N;;;;;
 1FABA;NEST WITH EGGS;So;0;ON;;;;;N;;;;;
-1FABB;HYACINTH;So;0;ON;;;;;N;;;;;
-1FABC;JELLYFISH;So;0;ON;;;;;N;;;;;
-1FABD;WING;So;0;ON;;;;;N;;;;;
-1FABF;GOOSE;So;0;ON;;;;;N;;;;;
 1FAC0;ANATOMICAL HEART;So;0;ON;;;;;N;;;;;
 1FAC1;LUNGS;So;0;ON;;;;;N;;;;;
 1FAC2;PEOPLE HUGGING;So;0;ON;;;;;N;;;;;
 1FAC3;PREGNANT MAN;So;0;ON;;;;;N;;;;;
 1FAC4;PREGNANT PERSON;So;0;ON;;;;;N;;;;;
 1FAC5;PERSON WITH CROWN;So;0;ON;;;;;N;;;;;
-1FACE;MOOSE;So;0;ON;;;;;N;;;;;
-1FACF;DONKEY;So;0;ON;;;;;N;;;;;
 1FAD0;BLUEBERRIES;So;0;ON;;;;;N;;;;;
 1FAD1;BELL PEPPER;So;0;ON;;;;;N;;;;;
 1FAD2;OLIVE;So;0;ON;;;;;N;;;;;
@@ -33793,8 +33502,6 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1FAD7;POURING LIQUID;So;0;ON;;;;;N;;;;;
 1FAD8;BEANS;So;0;ON;;;;;N;;;;;
 1FAD9;JAR;So;0;ON;;;;;N;;;;;
-1FADA;GINGER ROOT;So;0;ON;;;;;N;;;;;
-1FADB;PEA POD;So;0;ON;;;;;N;;;;;
 1FAE0;MELTING FACE;So;0;ON;;;;;N;;;;;
 1FAE1;SALUTING FACE;So;0;ON;;;;;N;;;;;
 1FAE2;FACE WITH OPEN EYES AND HAND OVER MOUTH;So;0;ON;;;;;N;;;;;
@@ -33803,7 +33510,6 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1FAE5;DOTTED LINE FACE;So;0;ON;;;;;N;;;;;
 1FAE6;BITING LIP;So;0;ON;;;;;N;;;;;
 1FAE7;BUBBLES;So;0;ON;;;;;N;;;;;
-1FAE8;SHAKING FACE;So;0;ON;;;;;N;;;;;
 1FAF0;HAND WITH INDEX FINGER AND THUMB CROSSED;So;0;ON;;;;;N;;;;;
 1FAF1;RIGHTWARDS HAND;So;0;ON;;;;;N;;;;;
 1FAF2;LEFTWARDS HAND;So;0;ON;;;;;N;;;;;
@@ -33811,8 +33517,6 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1FAF4;PALM UP HAND;So;0;ON;;;;;N;;;;;
 1FAF5;INDEX POINTING AT THE VIEWER;So;0;ON;;;;;N;;;;;
 1FAF6;HEART HANDS;So;0;ON;;;;;N;;;;;
-1FAF7;LEFTWARDS PUSHING HAND;So;0;ON;;;;;N;;;;;
-1FAF8;RIGHTWARDS PUSHING HAND;So;0;ON;;;;;N;;;;;
 1FB00;BLOCK SEXTANT-1;So;0;ON;;;;;N;;;;;
 1FB01;BLOCK SEXTANT-2;So;0;ON;;;;;N;;;;;
 1FB02;BLOCK SEXTANT-12;So;0;ON;;;;;N;;;;;
@@ -34028,7 +33732,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 20000;<CJK Ideograph Extension B, First>;Lo;0;L;;;;;N;;;;;
 2A6DF;<CJK Ideograph Extension B, Last>;Lo;0;L;;;;;N;;;;;
 2A700;<CJK Ideograph Extension C, First>;Lo;0;L;;;;;N;;;;;
-2B739;<CJK Ideograph Extension C, Last>;Lo;0;L;;;;;N;;;;;
+2B738;<CJK Ideograph Extension C, Last>;Lo;0;L;;;;;N;;;;;
 2B740;<CJK Ideograph Extension D, First>;Lo;0;L;;;;;N;;;;;
 2B81D;<CJK Ideograph Extension D, Last>;Lo;0;L;;;;;N;;;;;
 2B820;<CJK Ideograph Extension E, First>;Lo;0;L;;;;;N;;;;;
@@ -34579,8 +34283,6 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 2FA1D;CJK COMPATIBILITY IDEOGRAPH-2FA1D;Lo;0;L;2A600;;;;N;;;;;
 30000;<CJK Ideograph Extension G, First>;Lo;0;L;;;;;N;;;;;
 3134A;<CJK Ideograph Extension G, Last>;Lo;0;L;;;;;N;;;;;
-31350;<CJK Ideograph Extension H, First>;Lo;0;L;;;;;N;;;;;
-323AF;<CJK Ideograph Extension H, Last>;Lo;0;L;;;;;N;;;;;
 E0001;LANGUAGE TAG;Cf;0;BN;;;;;N;;;;;
 E0020;TAG SPACE;Cf;0;BN;;;;;N;;;;;
 E0021;TAG EXCLAMATION MARK;Cf;0;BN;;;;;N;;;;;

admin/unidata/blocks.awk

@@ -1,6 +1,6 @@
 #!/usr/bin/awk -f
 
-## Copyright (C) 2015-2023 Free Software Foundation, Inc.
+## Copyright (C) 2015-2022 Free Software Foundation, Inc.
 
 ## Author: Glenn Morris <rgm@gnu.org>
 ## Maintainer: emacs-devel@gnu.org
@@ -23,7 +23,7 @@
 ### Commentary:
 
 ## This script takes as input Unicode's Blocks.txt
-## (https://www.unicode.org/Public/UNIDATA/Blocks.txt)
+## (http://www.unicode.org/Public/UNIDATA/Blocks.txt)
 ## and produces output for Emacs's lisp/international/charscript.el.
 
 ## It lumps together all the blocks belonging to the same language.
@@ -224,14 +224,9 @@ FILENAME ~ "emoji-data.txt" && /^[0-9A-F].*; Emoji_Presentation / {
 
 END {
     idx = 0
-    ## This is here so that font_range can choose Emoji presentation
-    ## for the preceding codepoint when it encounters a VS-16
-    ## (U+FE0F).  See also font_range and the comments in composite.el
-    ## around the setup of `composition-function-table' for
-    ## U+FE00..U+FE0E.
-    ## It originally covered the whole FE00-FE0F range, but that
-    ## turned out to be a mistake.
-    override_start[idx] = "FE0F"
+    # ## These are here so that font_range can choose Emoji presentation
+    # ## for the preceding codepoint when it encounters a VS
+    override_start[idx] = "FE00"
     override_end[idx] = "FE0F"
 
     for (k in override_start)

admin/unidata/confusables.txt

@@ -1,13 +1,13 @@
-# confusables.txt
-# Date: 2022-08-26, 16:49:08 GMT
-# © 2022 Unicode®, Inc.
+# confusables.txt
+# Date: 2021-05-29, 22:09:29 GMT
+# © 2021 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
-# For terms of use, see https://www.unicode.org/terms_of_use.html
+# For terms of use, see http://www.unicode.org/terms_of_use.html
 #
 # Unicode Security Mechanisms for UTS #39
-# Version: 15.0.0
+# Version: 14.0.0
 #
-# For documentation and usage, see https://www.unicode.org/reports/tr39
+# For documentation and usage, see http://www.unicode.org/reports/tr39
 #
 05AD ;	0596 ;	MA	# ( ֭ → ֖ ) HEBREW ACCENT DEHI → HEBREW ACCENT TIPEHA	#
 
@@ -2761,11 +2761,11 @@ FE87 ;	006C 0655 ;	MA	# ( ‎ﺇ‎ → lٕ ) ARABIC LETTER ALEF WITH HAMZA BELO
 
 02AB ;	006C 007A ;	MA	# ( ʫ → lz ) LATIN SMALL LETTER LZ DIGRAPH → LATIN SMALL LETTER L, LATIN SMALL LETTER Z	#
 
-0675 ;	006C 0674 ;	MA	# ( ‎ٵ‎ → ‎lٴ‎ ) ARABIC LETTER HIGH HAMZA ALEF → LATIN SMALL LETTER L, ARABIC LETTER HIGH HAMZA	# →‎اٴ‎→
 0623 ;	006C 0674 ;	MA	# ( ‎أ‎ → ‎lٴ‎ ) ARABIC LETTER ALEF WITH HAMZA ABOVE → LATIN SMALL LETTER L, ARABIC LETTER HIGH HAMZA	# →‎ٵ‎→→‎اٴ‎→
 FE84 ;	006C 0674 ;	MA	# ( ‎ﺄ‎ → ‎lٴ‎ ) ARABIC LETTER ALEF WITH HAMZA ABOVE FINAL FORM → LATIN SMALL LETTER L, ARABIC LETTER HIGH HAMZA	# →‎أ‎→→‎ٵ‎→→‎اٴ‎→
 FE83 ;	006C 0674 ;	MA	# ( ‎ﺃ‎ → ‎lٴ‎ ) ARABIC LETTER ALEF WITH HAMZA ABOVE ISOLATED FORM → LATIN SMALL LETTER L, ARABIC LETTER HIGH HAMZA	# →‎ٵ‎→→‎اٴ‎→
 0672 ;	006C 0674 ;	MA	# ( ‎ٲ‎ → ‎lٴ‎ ) ARABIC LETTER ALEF WITH WAVY HAMZA ABOVE → LATIN SMALL LETTER L, ARABIC LETTER HIGH HAMZA	# →‎أ‎→→‎ٵ‎→→‎اٴ‎→
+0675 ;	006C 0674 ;	MA	# ( ‎ٵ‎ → ‎lٴ‎ ) ARABIC LETTER HIGH HAMZA ALEF → LATIN SMALL LETTER L, ARABIC LETTER HIGH HAMZA	# →‎اٴ‎→
 
 FDF3 ;	006C 0643 0628 0631 ;	MA	# ( ‎ﷳ‎ → ‎lكبر‎ ) ARABIC LIGATURE AKBAR ISOLATED FORM → LATIN SMALL LETTER L, ARABIC LETTER KAF, ARABIC LETTER BEH, ARABIC LETTER REH	# →‎اكبر‎→
 
@@ -5351,10 +5351,10 @@ FBE2 ;	0648 0302 ;	MA	# ( ‎ﯢ‎ → ‎و̂‎ ) ARABIC LETTER KIRGHIZ YU IS
 FBDC ;	0648 0670 ;	MA	# ( ‎ﯜ‎ → ‎وٰ‎ ) ARABIC LETTER YU FINAL FORM → ARABIC LETTER WAW, ARABIC LETTER SUPERSCRIPT ALEF	# →‎ۈ‎→
 FBDB ;	0648 0670 ;	MA	# ( ‎ﯛ‎ → ‎وٰ‎ ) ARABIC LETTER YU ISOLATED FORM → ARABIC LETTER WAW, ARABIC LETTER SUPERSCRIPT ALEF	# →‎ۈ‎→
 
-0676 ;	0648 0674 ;	MA	# ( ‎ٶ‎ → ‎وٴ‎ ) ARABIC LETTER HIGH HAMZA WAW → ARABIC LETTER WAW, ARABIC LETTER HIGH HAMZA	#
 0624 ;	0648 0674 ;	MA	# ( ‎ؤ‎ → ‎وٴ‎ ) ARABIC LETTER WAW WITH HAMZA ABOVE → ARABIC LETTER WAW, ARABIC LETTER HIGH HAMZA	# →‎ٶ‎→
 FE86 ;	0648 0674 ;	MA	# ( ‎ﺆ‎ → ‎وٴ‎ ) ARABIC LETTER WAW WITH HAMZA ABOVE FINAL FORM → ARABIC LETTER WAW, ARABIC LETTER HIGH HAMZA	# →‎ٶ‎→
 FE85 ;	0648 0674 ;	MA	# ( ‎ﺅ‎ → ‎وٴ‎ ) ARABIC LETTER WAW WITH HAMZA ABOVE ISOLATED FORM → ARABIC LETTER WAW, ARABIC LETTER HIGH HAMZA	# →‎ٶ‎→
+0676 ;	0648 0674 ;	MA	# ( ‎ٶ‎ → ‎وٴ‎ ) ARABIC LETTER HIGH HAMZA WAW → ARABIC LETTER WAW, ARABIC LETTER HIGH HAMZA	#
 
 0677 ;	0648 0313 0674 ;	MA	# ( ‎ٷ‎ → ‎و̓ٴ‎ ) ARABIC LETTER U WITH HAMZA ABOVE → ARABIC LETTER WAW, COMBINING COMMA ABOVE, ARABIC LETTER HIGH HAMZA	# →‎ۇٴ‎→
 FBDD ;	0648 0313 0674 ;	MA	# ( ‎ﯝ‎ → ‎و̓ٴ‎ ) ARABIC LETTER U WITH HAMZA ABOVE ISOLATED FORM → ARABIC LETTER WAW, COMBINING COMMA ABOVE, ARABIC LETTER HIGH HAMZA	# →‎ۇٴ‎→
@@ -5446,12 +5446,12 @@ FCF1 ;	0649 006F ;	MA	# ( ‎ﳱ‎ → ‎ىo‎ ) ARABIC LIGATURE YEH WITH HEH
 
 FCE6 ;	0649 06DB 006F ;	MA	# ( ‎ﳦ‎ → ‎ىۛo‎ ) ARABIC LIGATURE THEH WITH HEH MEDIAL FORM → ARABIC LETTER ALEF MAKSURA, ARABIC SMALL HIGH THREE DOTS, LATIN SMALL LETTER O	# →‎ثه‎→
 
-0678 ;	0649 0674 ;	MA	# ( ‎ٸ‎ → ‎ىٴ‎ ) ARABIC LETTER HIGH HAMZA YEH → ARABIC LETTER ALEF MAKSURA, ARABIC LETTER HIGH HAMZA	# →‎يٴ‎→
 0626 ;	0649 0674 ;	MA	# ( ‎ئ‎ → ‎ىٴ‎ ) ARABIC LETTER YEH WITH HAMZA ABOVE → ARABIC LETTER ALEF MAKSURA, ARABIC LETTER HIGH HAMZA	# →‎ٸ‎→→‎يٴ‎→
 FE8B ;	0649 0674 ;	MA	# ( ‎ﺋ‎ → ‎ىٴ‎ ) ARABIC LETTER YEH WITH HAMZA ABOVE INITIAL FORM → ARABIC LETTER ALEF MAKSURA, ARABIC LETTER HIGH HAMZA	# →‎ئ‎→→‎ٸ‎→→‎يٴ‎→
 FE8C ;	0649 0674 ;	MA	# ( ‎ﺌ‎ → ‎ىٴ‎ ) ARABIC LETTER YEH WITH HAMZA ABOVE MEDIAL FORM → ARABIC LETTER ALEF MAKSURA, ARABIC LETTER HIGH HAMZA	# →‎ئ‎→→‎ٸ‎→→‎يٴ‎→
 FE8A ;	0649 0674 ;	MA	# ( ‎ﺊ‎ → ‎ىٴ‎ ) ARABIC LETTER YEH WITH HAMZA ABOVE FINAL FORM → ARABIC LETTER ALEF MAKSURA, ARABIC LETTER HIGH HAMZA	# →‎ئ‎→→‎ٸ‎→→‎يٴ‎→
 FE89 ;	0649 0674 ;	MA	# ( ‎ﺉ‎ → ‎ىٴ‎ ) ARABIC LETTER YEH WITH HAMZA ABOVE ISOLATED FORM → ARABIC LETTER ALEF MAKSURA, ARABIC LETTER HIGH HAMZA	# →‎ٸ‎→→‎يٴ‎→
+0678 ;	0649 0674 ;	MA	# ( ‎ٸ‎ → ‎ىٴ‎ ) ARABIC LETTER HIGH HAMZA YEH → ARABIC LETTER ALEF MAKSURA, ARABIC LETTER HIGH HAMZA	# →‎يٴ‎→
 
 FBEB ;	0649 0674 006C ;	MA	# ( ‎ﯫ‎ → ‎ىٴl‎ ) ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ALEF FINAL FORM → ARABIC LETTER ALEF MAKSURA, ARABIC LETTER HIGH HAMZA, LATIN SMALL LETTER L	# →‎ئا‎→
 FBEA ;	0649 0674 006C ;	MA	# ( ‎ﯪ‎ → ‎ىٴl‎ ) ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ALEF ISOLATED FORM → ARABIC LETTER ALEF MAKSURA, ARABIC LETTER HIGH HAMZA, LATIN SMALL LETTER L	# →‎ئا‎→
@@ -7535,10 +7535,10 @@ FA7E ;	5944 ;	MA	# ( 奄 → 奄 ) CJK COMPATIBILITY IDEOGRAPH-FA7E → CJK UNIF
 
 F90C ;	5948 ;	MA	# ( 奈 → 奈 ) CJK COMPATIBILITY IDEOGRAPH-F90C → CJK UNIFIED IDEOGRAPH-5948	#
 
-FA7F ;	5954 ;	MA	# ( 奔 → 奔 ) CJK COMPATIBILITY IDEOGRAPH-FA7F → CJK UNIFIED IDEOGRAPH-5954	#
-
 F909 ;	5951 ;	MA	# ( 契 → 契 ) CJK COMPATIBILITY IDEOGRAPH-F909 → CJK UNIFIED IDEOGRAPH-5951	#
 
+FA7F ;	5954 ;	MA	# ( 奔 → 奔 ) CJK COMPATIBILITY IDEOGRAPH-FA7F → CJK UNIFIED IDEOGRAPH-5954	#
+
 2F85F ;	5962 ;	MA	# ( 奢 → 奢 ) CJK COMPATIBILITY IDEOGRAPH-2F85F → CJK UNIFIED IDEOGRAPH-5962	#
 
 F981 ;	5973 ;	MA	# ( 女 → 女 ) CJK COMPATIBILITY IDEOGRAPH-F981 → CJK UNIFIED IDEOGRAPH-5973	#

admin/unidata/copyright.html

@@ -13,7 +13,7 @@
 <title>Unicode Terms of Use</title>
 <link rel="stylesheet" type="text/css"
 
-href="https://www.unicode.org/webscripts/standard_styles.css">
+href="http://www.unicode.org/webscripts/standard_styles.css">
 
 <style type="text/css">
 pre {
@@ -32,8 +32,8 @@
       <td colspan="2">
       <table width="100%" border="0" cellpadding="0" cellspacing="0">
         <tr>
-          <td class="icon" style="width:38px; height:35px"><a href="https://www.unicode.org/"><img border="0"
-      src="https://www.unicode.org/webscripts/logo60s2.gif" align="middle" alt="[Unicode]" width="34" height="33"></a></td>
+          <td class="icon" style="width:38px; height:35px"><a href="http://www.unicode.org/"><img border="0"
+      src="http://www.unicode.org/webscripts/logo60s2.gif" align="middle" alt="[Unicode]" width="34" height="33"></a></td>
           <td class="icon" style="vertical-align:middle;"> &nbsp;<a class="bar"
           href="https://www.unicode.org/copyright.html"><font size="3">Terms of Use</font></a></td>
           <td class="bar"><a href="https://www.unicode.org/main.html" class="bar">Tech Site</a>
@@ -82,7 +82,7 @@
         </tr>
         <tr>
           <td valign="top" class="navColCell">
-        <a href="https://www.unicode.org/license.txt">Unicode Data Files and Software License</a></td>
+        <a href="https://www.unicode.org/license.html">Unicode Data Files and Software License</a></td>
         </tr>
         <tr>
           <td class="navColTitle">Related Links</td>
@@ -112,13 +112,13 @@ <h1>Unicode® Copyright and Terms of Use</h1>
 
             <p>For the general privacy policy governing access to this site, see
             the&nbsp;
-            <a href="https://www.unicode.org/policies/privacy_policy.html">
+            <a href="http://www.unicode.org/policies/privacy_policy.html">
             Unicode Privacy Policy</a>.</p>
 
             <ol type="A">
               <li><u><a name="1"></a>Unicode Copyright</u>
               <ol>
-                <li>Copyright © 1991-2022 Unicode, Inc. All rights reserved.</li>
+                <li>Copyright © 1991-2021 Unicode, Inc. All rights reserved.</li>
               </ol>
               </li>
 
@@ -153,12 +153,12 @@ <h1>Unicode® Copyright and Terms of Use</h1>
                 herein.</li>
                 <li>Further specifications of rights and restrictions pertaining
                 to the use of the Unicode DATA FILES and SOFTWARE can be found in the
-                <a href="https://www.unicode.org/license.txt">Unicode Data Files and Software License</a>.</li>
+                <a href="https://www.unicode.org/license.html">Unicode Data Files and Software License</a>.</li>
                 <li>Each version of the Unicode Standard has further
                 specifications of rights and restrictions of use. For the book
                 editions (Unicode 5.0 and earlier), these are found on the back
                 of the
-                                <a href="https://www.unicode.org/versions/Unicode5.0.0/Title.pdf">title page</a>.</li>
+				<a href="http://www.unicode.org/versions/Unicode5.0.0/Title.pdf">title page</a>.</li>
                 <li>
                 The Unicode PDF <a href="https://www.unicode.org/charts/">online code charts</a> carry specific restrictions. Those restrictions are incorporated as the
                 first page of each PDF code chart.</li>
@@ -224,7 +224,7 @@ <h1>Unicode® Copyright and Terms of Use</h1>
               <li><u><a name="5"></a>Trademarks &amp; Logos</u>
                 <ol>
                 <li>The Unicode Word Mark and the Unicode Logo are trademarks of Unicode, Inc.  “The Unicode Consortium” and “Unicode, Inc.” are trade names of Unicode, Inc.  Use of the information and materials found on this website indicates your acknowledgement of Unicode, Inc.’s exclusive worldwide rights in the Unicode Word Mark, the Unicode Logo, and the Unicode trade names.</li>
-<li><a href="https://www.unicode.org/policies/logo_policy.html">The Unicode Consortium Name and Trademark Usage Policy</a> (“Trademark Policy”) are incorporated herein by reference and you agree to abide by the provisions of the Trademark Policy, which may be changed from time to time in the sole discretion of Unicode, Inc.</li>
+<li><a href="http://www.unicode.org/policies/logo_policy.html">The Unicode Consortium Name and Trademark Usage Policy</a> (“Trademark Policy”) are incorporated herein by reference and you agree to abide by the provisions of the Trademark Policy, which may be changed from time to time in the sole discretion of Unicode, Inc.</li>
 <li>All third party trademarks referenced herein are the property of their respective owners.</li>
               </ol>
               </li>
@@ -270,15 +270,15 @@ <h1>Unicode® Copyright and Terms of Use</h1>
               <center>
               <table cellspacing="0" cellpadding="0" border="0" id="table2">
                 <tr>
-                  <td><a href="https://www.unicode.org/copyright.html">
-                  <img src="https://www.unicode.org/img/hb_notice.gif"
+                  <td><a href="http://www.unicode.org/copyright.html">
+                  <img src="http://www.unicode.org/img/hb_notice.gif"
                   border="0" alt="Access to Copyright and terms of use"
                   width="216" height="50"></a></td>
                 </tr>
               </table>
 
                 <script language="Javascript" type="text/javascript"
-              src="https://www.unicode.org/webscripts/lastModified.js">
+              src="http://www.unicode.org/webscripts/lastModified.js">
                 </script>
 
               </center>

admin/unidata/emoji-data.txt

@@ -1,13 +1,13 @@
-# emoji-data.txt
-# Date: 2022-08-02, 00:26:10 GMT
-# © 2022 Unicode®, Inc.
+# emoji-data-14.0.0.txt
+# Date: 2021-08-26, 17:22:22 GMT
+# © 2021 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
-# For terms of use, see https://www.unicode.org/terms_of_use.html
+# For terms of use, see http://www.unicode.org/terms_of_use.html
 #
 # Emoji Data for UTS #51
-# Used with Emoji Version 15.0 and subsequent minor revisions (if any)
+# Used with Emoji Version 14.0 and subsequent minor revisions (if any)
 #
-# For documentation and usage, see https://www.unicode.org/reports/tr51
+# For documentation and usage, see http://www.unicode.org/reports/tr51
 #
 # Format:
 # <codepoint(s)> ; <property> # <comments>
@@ -20,6 +20,7 @@
 # ================================================
 
 # All omitted code points have Emoji=No
+# @missing: 0000..10FFFF  ; Emoji ; No
 
 0023          ; Emoji                # E0.0   [1] (#️)       hash sign
 002A          ; Emoji                # E0.0   [1] (*️)       asterisk
@@ -340,7 +341,6 @@
 1F6D1..1F6D2  ; Emoji                # E3.0   [2] (🛑..🛒)    stop sign..shopping cart
 1F6D5         ; Emoji                # E12.0  [1] (🛕)       hindu temple
 1F6D6..1F6D7  ; Emoji                # E13.0  [2] (🛖..🛗)    hut..elevator
-1F6DC         ; Emoji                # E15.0  [1] (🛜)       wireless
 1F6DD..1F6DF  ; Emoji                # E14.0  [3] (🛝..🛟)    playground slide..ring buoy
 1F6E0..1F6E5  ; Emoji                # E0.7   [6] (🛠️..🛥️)    hammer and wrench..motor boat
 1F6E9         ; Emoji                # E0.7   [1] (🛩️)       small airplane
@@ -401,36 +401,28 @@
 1F9E7..1F9FF  ; Emoji                # E11.0 [25] (🧧..🧿)    red envelope..nazar amulet
 1FA70..1FA73  ; Emoji                # E12.0  [4] (🩰..🩳)    ballet shoes..shorts
 1FA74         ; Emoji                # E13.0  [1] (🩴)       thong sandal
-1FA75..1FA77  ; Emoji                # E15.0  [3] (🩵..🩷)    light blue heart..pink heart
 1FA78..1FA7A  ; Emoji                # E12.0  [3] (🩸..🩺)    drop of blood..stethoscope
 1FA7B..1FA7C  ; Emoji                # E14.0  [2] (🩻..🩼)    x-ray..crutch
 1FA80..1FA82  ; Emoji                # E12.0  [3] (🪀..🪂)    yo-yo..parachute
 1FA83..1FA86  ; Emoji                # E13.0  [4] (🪃..🪆)    boomerang..nesting dolls
-1FA87..1FA88  ; Emoji                # E15.0  [2] (🪇..🪈)    maracas..flute
 1FA90..1FA95  ; Emoji                # E12.0  [6] (🪐..🪕)    ringed planet..banjo
 1FA96..1FAA8  ; Emoji                # E13.0 [19] (🪖..🪨)    military helmet..rock
 1FAA9..1FAAC  ; Emoji                # E14.0  [4] (🪩..🪬)    mirror ball..hamsa
-1FAAD..1FAAF  ; Emoji                # E15.0  [3] (🪭..🪯)    folding hand fan..khanda
 1FAB0..1FAB6  ; Emoji                # E13.0  [7] (🪰..🪶)    fly..feather
 1FAB7..1FABA  ; Emoji                # E14.0  [4] (🪷..🪺)    lotus..nest with eggs
-1FABB..1FABD  ; Emoji                # E15.0  [3] (🪻..🪽)    hyacinth..wing
-1FABF         ; Emoji                # E15.0  [1] (🪿)       goose
 1FAC0..1FAC2  ; Emoji                # E13.0  [3] (🫀..🫂)    anatomical heart..people hugging
 1FAC3..1FAC5  ; Emoji                # E14.0  [3] (🫃..🫅)    pregnant man..person with crown
-1FACE..1FACF  ; Emoji                # E15.0  [2] (🫎..🫏)    moose..donkey
 1FAD0..1FAD6  ; Emoji                # E13.0  [7] (🫐..🫖)    blueberries..teapot
 1FAD7..1FAD9  ; Emoji                # E14.0  [3] (🫗..🫙)    pouring liquid..jar
-1FADA..1FADB  ; Emoji                # E15.0  [2] (🫚..🫛)    ginger root..pea pod
 1FAE0..1FAE7  ; Emoji                # E14.0  [8] (🫠..🫧)    melting face..bubbles
-1FAE8         ; Emoji                # E15.0  [1] (🫨)       shaking face
 1FAF0..1FAF6  ; Emoji                # E14.0  [7] (🫰..🫶)    hand with index finger and thumb crossed..heart hands
-1FAF7..1FAF8  ; Emoji                # E15.0  [2] (🫷..🫸)    leftwards pushing hand..rightwards pushing hand
 
-# Total elements: 1424
+# Total elements: 1404
 
 # ================================================
 
 # All omitted code points have Emoji_Presentation=No
+# @missing: 0000..10FFFF  ; Emoji_Presentation ; No
 
 231A..231B    ; Emoji_Presentation   # E0.6   [2] (⌚..⌛)    watch..hourglass done
 23E9..23EC    ; Emoji_Presentation   # E0.6   [4] (⏩..⏬)    fast-forward button..fast down button
@@ -633,7 +625,6 @@
 1F6D1..1F6D2  ; Emoji_Presentation   # E3.0   [2] (🛑..🛒)    stop sign..shopping cart
 1F6D5         ; Emoji_Presentation   # E12.0  [1] (🛕)       hindu temple
 1F6D6..1F6D7  ; Emoji_Presentation   # E13.0  [2] (🛖..🛗)    hut..elevator
-1F6DC         ; Emoji_Presentation   # E15.0  [1] (🛜)       wireless
 1F6DD..1F6DF  ; Emoji_Presentation   # E14.0  [3] (🛝..🛟)    playground slide..ring buoy
 1F6EB..1F6EC  ; Emoji_Presentation   # E1.0   [2] (🛫..🛬)    airplane departure..airplane arrival
 1F6F4..1F6F6  ; Emoji_Presentation   # E3.0   [3] (🛴..🛶)    kick scooter..canoe
@@ -690,36 +681,28 @@
 1F9E7..1F9FF  ; Emoji_Presentation   # E11.0 [25] (🧧..🧿)    red envelope..nazar amulet
 1FA70..1FA73  ; Emoji_Presentation   # E12.0  [4] (🩰..🩳)    ballet shoes..shorts
 1FA74         ; Emoji_Presentation   # E13.0  [1] (🩴)       thong sandal
-1FA75..1FA77  ; Emoji_Presentation   # E15.0  [3] (🩵..🩷)    light blue heart..pink heart
 1FA78..1FA7A  ; Emoji_Presentation   # E12.0  [3] (🩸..🩺)    drop of blood..stethoscope
 1FA7B..1FA7C  ; Emoji_Presentation   # E14.0  [2] (🩻..🩼)    x-ray..crutch
 1FA80..1FA82  ; Emoji_Presentation   # E12.0  [3] (🪀..🪂)    yo-yo..parachute
 1FA83..1FA86  ; Emoji_Presentation   # E13.0  [4] (🪃..🪆)    boomerang..nesting dolls
-1FA87..1FA88  ; Emoji_Presentation   # E15.0  [2] (🪇..🪈)    maracas..flute
 1FA90..1FA95  ; Emoji_Presentation   # E12.0  [6] (🪐..🪕)    ringed planet..banjo
 1FA96..1FAA8  ; Emoji_Presentation   # E13.0 [19] (🪖..🪨)    military helmet..rock
 1FAA9..1FAAC  ; Emoji_Presentation   # E14.0  [4] (🪩..🪬)    mirror ball..hamsa
-1FAAD..1FAAF  ; Emoji_Presentation   # E15.0  [3] (🪭..🪯)    folding hand fan..khanda
 1FAB0..1FAB6  ; Emoji_Presentation   # E13.0  [7] (🪰..🪶)    fly..feather
 1FAB7..1FABA  ; Emoji_Presentation   # E14.0  [4] (🪷..🪺)    lotus..nest with eggs
-1FABB..1FABD  ; Emoji_Presentation   # E15.0  [3] (🪻..🪽)    hyacinth..wing
-1FABF         ; Emoji_Presentation   # E15.0  [1] (🪿)       goose
 1FAC0..1FAC2  ; Emoji_Presentation   # E13.0  [3] (🫀..🫂)    anatomical heart..people hugging
 1FAC3..1FAC5  ; Emoji_Presentation   # E14.0  [3] (🫃..🫅)    pregnant man..person with crown
-1FACE..1FACF  ; Emoji_Presentation   # E15.0  [2] (🫎..🫏)    moose..donkey
 1FAD0..1FAD6  ; Emoji_Presentation   # E13.0  [7] (🫐..🫖)    blueberries..teapot
 1FAD7..1FAD9  ; Emoji_Presentation   # E14.0  [3] (🫗..🫙)    pouring liquid..jar
-1FADA..1FADB  ; Emoji_Presentation   # E15.0  [2] (🫚..🫛)    ginger root..pea pod
 1FAE0..1FAE7  ; Emoji_Presentation   # E14.0  [8] (🫠..🫧)    melting face..bubbles
-1FAE8         ; Emoji_Presentation   # E15.0  [1] (🫨)       shaking face
 1FAF0..1FAF6  ; Emoji_Presentation   # E14.0  [7] (🫰..🫶)    hand with index finger and thumb crossed..heart hands
-1FAF7..1FAF8  ; Emoji_Presentation   # E15.0  [2] (🫷..🫸)    leftwards pushing hand..rightwards pushing hand
 
-# Total elements: 1205
+# Total elements: 1185
 
 # ================================================
 
 # All omitted code points have Emoji_Modifier=No
+# @missing: 0000..10FFFF  ; Emoji_Modifier ; No
 
 1F3FB..1F3FF  ; Emoji_Modifier       # E1.0   [5] (🏻..🏿)    light skin tone..dark skin tone
 
@@ -728,6 +711,7 @@
 # ================================================
 
 # All omitted code points have Emoji_Modifier_Base=No
+# @missing: 0000..10FFFF  ; Emoji_Modifier_Base ; No
 
 261D          ; Emoji_Modifier_Base  # E0.6   [1] (☝️)       index pointing up
 26F9          ; Emoji_Modifier_Base  # E0.7   [1] (⛹️)       person bouncing ball
@@ -778,13 +762,13 @@
 1F9D1..1F9DD  ; Emoji_Modifier_Base  # E5.0  [13] (🧑..🧝)    person..elf
 1FAC3..1FAC5  ; Emoji_Modifier_Base  # E14.0  [3] (🫃..🫅)    pregnant man..person with crown
 1FAF0..1FAF6  ; Emoji_Modifier_Base  # E14.0  [7] (🫰..🫶)    hand with index finger and thumb crossed..heart hands
-1FAF7..1FAF8  ; Emoji_Modifier_Base  # E15.0  [2] (🫷..🫸)    leftwards pushing hand..rightwards pushing hand
 
-# Total elements: 134
+# Total elements: 132
 
 # ================================================
 
 # All omitted code points have Emoji_Component=No
+# @missing: 0000..10FFFF  ; Emoji_Component ; No
 
 0023          ; Emoji_Component      # E0.0   [1] (#️)       hash sign
 002A          ; Emoji_Component      # E0.0   [1] (*️)       asterisk
@@ -802,6 +786,7 @@ E0020..E007F  ; Emoji_Component      # E0.0  [96] (󠀠..󠁿)      tag space..c
 # ================================================
 
 # All omitted code points have Extended_Pictographic=No
+# @missing: 0000..10FFFF  ; Extended_Pictographic ; No
 
 00A9          ; Extended_Pictographic# E0.6   [1] (©️)       copyright
 00AE          ; Extended_Pictographic# E0.6   [1] (®️)       registered
@@ -1205,8 +1190,7 @@ E0020..E007F  ; Emoji_Component      # E0.0  [96] (󠀠..󠁿)      tag space..c
 1F6D3..1F6D4  ; Extended_Pictographic# E0.0   [2] (🛓..🛔)    STUPA..PAGODA
 1F6D5         ; Extended_Pictographic# E12.0  [1] (🛕)       hindu temple
 1F6D6..1F6D7  ; Extended_Pictographic# E13.0  [2] (🛖..🛗)    hut..elevator
-1F6D8..1F6DB  ; Extended_Pictographic# E0.0   [4] (🛘..🛛)    <reserved-1F6D8>..<reserved-1F6DB>
-1F6DC         ; Extended_Pictographic# E15.0  [1] (🛜)       wireless
+1F6D8..1F6DC  ; Extended_Pictographic# E0.0   [5] (🛘..🛜)    <reserved-1F6D8>..<reserved-1F6DC>
 1F6DD..1F6DF  ; Extended_Pictographic# E14.0  [3] (🛝..🛟)    playground slide..ring buoy
 1F6E0..1F6E5  ; Extended_Pictographic# E0.7   [6] (🛠️..🛥️)    hammer and wrench..motor boat
 1F6E6..1F6E8  ; Extended_Pictographic# E0.0   [3] (🛦..🛨)    UP-POINTING MILITARY AIRPLANE..UP-POINTING SMALL AIRPLANE
@@ -1223,7 +1207,7 @@ E0020..E007F  ; Emoji_Component      # E0.0  [96] (󠀠..󠁿)      tag space..c
 1F6FA         ; Extended_Pictographic# E12.0  [1] (🛺)       auto rickshaw
 1F6FB..1F6FC  ; Extended_Pictographic# E13.0  [2] (🛻..🛼)    pickup truck..roller skate
 1F6FD..1F6FF  ; Extended_Pictographic# E0.0   [3] (🛽..🛿)    <reserved-1F6FD>..<reserved-1F6FF>
-1F774..1F77F  ; Extended_Pictographic# E0.0  [12] (🝴..🝿)    LOT OF FORTUNE..ORCUS
+1F774..1F77F  ; Extended_Pictographic# E0.0  [12] (🝴..🝿)    <reserved-1F774>..<reserved-1F77F>
 1F7D5..1F7DF  ; Extended_Pictographic# E0.0  [11] (🟕..🟟)    CIRCLED TRIANGLE..<reserved-1F7DF>
 1F7E0..1F7EB  ; Extended_Pictographic# E12.0 [12] (🟠..🟫)    orange circle..brown square
 1F7EC..1F7EF  ; Extended_Pictographic# E0.0   [4] (🟬..🟯)    <reserved-1F7EC>..<reserved-1F7EF>
@@ -1282,37 +1266,30 @@ E0020..E007F  ; Emoji_Component      # E0.0  [96] (󠀠..󠁿)      tag space..c
 1FA00..1FA6F  ; Extended_Pictographic# E0.0 [112] (🨀..🩯)    NEUTRAL CHESS KING..<reserved-1FA6F>
 1FA70..1FA73  ; Extended_Pictographic# E12.0  [4] (🩰..🩳)    ballet shoes..shorts
 1FA74         ; Extended_Pictographic# E13.0  [1] (🩴)       thong sandal
-1FA75..1FA77  ; Extended_Pictographic# E15.0  [3] (🩵..🩷)    light blue heart..pink heart
+1FA75..1FA77  ; Extended_Pictographic# E0.0   [3] (🩵..🩷)    <reserved-1FA75>..<reserved-1FA77>
 1FA78..1FA7A  ; Extended_Pictographic# E12.0  [3] (🩸..🩺)    drop of blood..stethoscope
 1FA7B..1FA7C  ; Extended_Pictographic# E14.0  [2] (🩻..🩼)    x-ray..crutch
 1FA7D..1FA7F  ; Extended_Pictographic# E0.0   [3] (🩽..🩿)    <reserved-1FA7D>..<reserved-1FA7F>
 1FA80..1FA82  ; Extended_Pictographic# E12.0  [3] (🪀..🪂)    yo-yo..parachute
 1FA83..1FA86  ; Extended_Pictographic# E13.0  [4] (🪃..🪆)    boomerang..nesting dolls
-1FA87..1FA88  ; Extended_Pictographic# E15.0  [2] (🪇..🪈)    maracas..flute
-1FA89..1FA8F  ; Extended_Pictographic# E0.0   [7] (🪉..🪏)    <reserved-1FA89>..<reserved-1FA8F>
+1FA87..1FA8F  ; Extended_Pictographic# E0.0   [9] (🪇..🪏)    <reserved-1FA87>..<reserved-1FA8F>
 1FA90..1FA95  ; Extended_Pictographic# E12.0  [6] (🪐..🪕)    ringed planet..banjo
 1FA96..1FAA8  ; Extended_Pictographic# E13.0 [19] (🪖..🪨)    military helmet..rock
 1FAA9..1FAAC  ; Extended_Pictographic# E14.0  [4] (🪩..🪬)    mirror ball..hamsa
-1FAAD..1FAAF  ; Extended_Pictographic# E15.0  [3] (🪭..🪯)    folding hand fan..khanda
+1FAAD..1FAAF  ; Extended_Pictographic# E0.0   [3] (🪭..🪯)    <reserved-1FAAD>..<reserved-1FAAF>
 1FAB0..1FAB6  ; Extended_Pictographic# E13.0  [7] (🪰..🪶)    fly..feather
 1FAB7..1FABA  ; Extended_Pictographic# E14.0  [4] (🪷..🪺)    lotus..nest with eggs
-1FABB..1FABD  ; Extended_Pictographic# E15.0  [3] (🪻..🪽)    hyacinth..wing
-1FABE         ; Extended_Pictographic# E0.0   [1] (🪾)       <reserved-1FABE>
-1FABF         ; Extended_Pictographic# E15.0  [1] (🪿)       goose
+1FABB..1FABF  ; Extended_Pictographic# E0.0   [5] (🪻..🪿)    <reserved-1FABB>..<reserved-1FABF>
 1FAC0..1FAC2  ; Extended_Pictographic# E13.0  [3] (🫀..🫂)    anatomical heart..people hugging
 1FAC3..1FAC5  ; Extended_Pictographic# E14.0  [3] (🫃..🫅)    pregnant man..person with crown
-1FAC6..1FACD  ; Extended_Pictographic# E0.0   [8] (🫆..🫍)    <reserved-1FAC6>..<reserved-1FACD>
-1FACE..1FACF  ; Extended_Pictographic# E15.0  [2] (🫎..🫏)    moose..donkey
+1FAC6..1FACF  ; Extended_Pictographic# E0.0  [10] (🫆..🫏)    <reserved-1FAC6>..<reserved-1FACF>
 1FAD0..1FAD6  ; Extended_Pictographic# E13.0  [7] (🫐..🫖)    blueberries..teapot
 1FAD7..1FAD9  ; Extended_Pictographic# E14.0  [3] (🫗..🫙)    pouring liquid..jar
-1FADA..1FADB  ; Extended_Pictographic# E15.0  [2] (🫚..🫛)    ginger root..pea pod
-1FADC..1FADF  ; Extended_Pictographic# E0.0   [4] (🫜..🫟)    <reserved-1FADC>..<reserved-1FADF>
+1FADA..1FADF  ; Extended_Pictographic# E0.0   [6] (🫚..🫟)    <reserved-1FADA>..<reserved-1FADF>
 1FAE0..1FAE7  ; Extended_Pictographic# E14.0  [8] (🫠..🫧)    melting face..bubbles
-1FAE8         ; Extended_Pictographic# E15.0  [1] (🫨)       shaking face
-1FAE9..1FAEF  ; Extended_Pictographic# E0.0   [7] (🫩..🫯)    <reserved-1FAE9>..<reserved-1FAEF>
+1FAE8..1FAEF  ; Extended_Pictographic# E0.0   [8] (🫨..🫯)    <reserved-1FAE8>..<reserved-1FAEF>
 1FAF0..1FAF6  ; Extended_Pictographic# E14.0  [7] (🫰..🫶)    hand with index finger and thumb crossed..heart hands
-1FAF7..1FAF8  ; Extended_Pictographic# E15.0  [2] (🫷..🫸)    leftwards pushing hand..rightwards pushing hand
-1FAF9..1FAFF  ; Extended_Pictographic# E0.0   [7] (🫹..🫿)    <reserved-1FAF9>..<reserved-1FAFF>
+1FAF7..1FAFF  ; Extended_Pictographic# E0.0   [9] (🫷..🫿)    <reserved-1FAF7>..<reserved-1FAFF>
 1FC00..1FFFD  ; Extended_Pictographic# E0.0[1022] (🰀..🿽)    <reserved-1FC00>..<reserved-1FFFD>
 
 # Total elements: 3537

admin/unidata/emoji-sequences.txt

@@ -1,13 +1,13 @@
 # emoji-sequences.txt
-# Date: 2022-08-15, 23:13:41 GMT
-# © 2022 Unicode®, Inc.
+# Date: 2021-08-26, 17:22:22 GMT
+# © 2021 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
-# For terms of use, see https://www.unicode.org/terms_of_use.html
+# For terms of use, see http://www.unicode.org/terms_of_use.html
 #
 # Emoji Sequence Data for UTS #51
-# Version: 15.0
+# Version: 14.0
 #
-# For documentation and usage, see https://www.unicode.org/reports/tr51
+# For documentation and usage, see http://www.unicode.org/reports/tr51
 #
 # Format:
 #   code_point(s) ; type_field ; description # comments
@@ -38,145 +38,144 @@
 
 # Basic_Emoji
 
-
-231A..231B    ; Basic_Emoji                  ; watch..hourglass done                                          # E0.6   [2] (⌚..⌛)
-23E9..23EC    ; Basic_Emoji                  ; fast-forward button..fast down button                          # E0.6   [4] (⏩..⏬)
+231A..231B    ; Basic_Emoji                  ; watch                                                          # E0.6   [2] (⌚..⌛)
+23E9..23EC    ; Basic_Emoji                  ; fast-forward button                                            # E0.6   [4] (⏩..⏬)
 23F0          ; Basic_Emoji                  ; alarm clock                                                    # E0.6   [1] (⏰)
 23F3          ; Basic_Emoji                  ; hourglass not done                                             # E0.6   [1] (⏳)
-25FD..25FE    ; Basic_Emoji                  ; white medium-small square..black medium-small square           # E0.6   [2] (◽..◾)
-2614..2615    ; Basic_Emoji                  ; umbrella with rain drops..hot beverage                         # E0.6   [2] (☔..☕)
-2648..2653    ; Basic_Emoji                  ; Aries..Pisces                                                  # E0.6  [12] (♈..♓)
+25FD..25FE    ; Basic_Emoji                  ; white medium-small square                                      # E0.6   [2] (◽..◾)
+2614..2615    ; Basic_Emoji                  ; umbrella with rain drops                                       # E0.6   [2] (☔..☕)
+2648..2653    ; Basic_Emoji                  ; Aries                                                          # E0.6  [12] (♈..♓)
 267F          ; Basic_Emoji                  ; wheelchair symbol                                              # E0.6   [1] (♿)
 2693          ; Basic_Emoji                  ; anchor                                                         # E0.6   [1] (⚓)
 26A1          ; Basic_Emoji                  ; high voltage                                                   # E0.6   [1] (⚡)
-26AA..26AB    ; Basic_Emoji                  ; white circle..black circle                                     # E0.6   [2] (⚪..⚫)
-26BD..26BE    ; Basic_Emoji                  ; soccer ball..baseball                                          # E0.6   [2] (⚽..⚾)
-26C4..26C5    ; Basic_Emoji                  ; snowman without snow..sun behind cloud                         # E0.6   [2] (⛄..⛅)
+26AA..26AB    ; Basic_Emoji                  ; white circle                                                   # E0.6   [2] (⚪..⚫)
+26BD..26BE    ; Basic_Emoji                  ; soccer ball                                                    # E0.6   [2] (⚽..⚾)
+26C4..26C5    ; Basic_Emoji                  ; snowman without snow                                           # E0.6   [2] (⛄..⛅)
 26CE          ; Basic_Emoji                  ; Ophiuchus                                                      # E0.6   [1] (⛎)
 26D4          ; Basic_Emoji                  ; no entry                                                       # E0.6   [1] (⛔)
 26EA          ; Basic_Emoji                  ; church                                                         # E0.6   [1] (⛪)
-26F2..26F3    ; Basic_Emoji                  ; fountain..flag in hole                                         # E0.6   [2] (⛲..⛳)
+26F2..26F3    ; Basic_Emoji                  ; fountain                                                       # E0.6   [2] (⛲..⛳)
 26F5          ; Basic_Emoji                  ; sailboat                                                       # E0.6   [1] (⛵)
 26FA          ; Basic_Emoji                  ; tent                                                           # E0.6   [1] (⛺)
 26FD          ; Basic_Emoji                  ; fuel pump                                                      # E0.6   [1] (⛽)
 2705          ; Basic_Emoji                  ; check mark button                                              # E0.6   [1] (✅)
-270A..270B    ; Basic_Emoji                  ; raised fist..raised hand                                       # E0.6   [2] (✊..✋)
+270A..270B    ; Basic_Emoji                  ; raised fist                                                    # E0.6   [2] (✊..✋)
 2728          ; Basic_Emoji                  ; sparkles                                                       # E0.6   [1] (✨)
 274C          ; Basic_Emoji                  ; cross mark                                                     # E0.6   [1] (❌)
 274E          ; Basic_Emoji                  ; cross mark button                                              # E0.6   [1] (❎)
-2753..2755    ; Basic_Emoji                  ; red question mark..white exclamation mark                      # E0.6   [3] (❓..❕)
+2753..2755    ; Basic_Emoji                  ; red question mark                                              # E0.6   [3] (❓..❕)
 2757          ; Basic_Emoji                  ; red exclamation mark                                           # E0.6   [1] (❗)
-2795..2797    ; Basic_Emoji                  ; plus..divide                                                   # E0.6   [3] (➕..➗)
+2795..2797    ; Basic_Emoji                  ; plus                                                           # E0.6   [3] (➕..➗)
 27B0          ; Basic_Emoji                  ; curly loop                                                     # E0.6   [1] (➰)
 27BF          ; Basic_Emoji                  ; double curly loop                                              # E1.0   [1] (➿)
-2B1B..2B1C    ; Basic_Emoji                  ; black large square..white large square                         # E0.6   [2] (⬛..⬜)
+2B1B..2B1C    ; Basic_Emoji                  ; black large square                                             # E0.6   [2] (⬛..⬜)
 2B50          ; Basic_Emoji                  ; star                                                           # E0.6   [1] (⭐)
 2B55          ; Basic_Emoji                  ; hollow red circle                                              # E0.6   [1] (⭕)
 1F004         ; Basic_Emoji                  ; mahjong red dragon                                             # E0.6   [1] (🀄)
 1F0CF         ; Basic_Emoji                  ; joker                                                          # E0.6   [1] (🃏)
 1F18E         ; Basic_Emoji                  ; AB button (blood type)                                         # E0.6   [1] (🆎)
-1F191..1F19A  ; Basic_Emoji                  ; CL button..VS button                                           # E0.6  [10] (🆑..🆚)
+1F191..1F19A  ; Basic_Emoji                  ; CL button                                                      # E0.6  [10] (🆑..🆚)
 1F201         ; Basic_Emoji                  ; Japanese “here” button                                         # E0.6   [1] (🈁)
 1F21A         ; Basic_Emoji                  ; Japanese “free of charge” button                               # E0.6   [1] (🈚)
 1F22F         ; Basic_Emoji                  ; Japanese “reserved” button                                     # E0.6   [1] (🈯)
-1F232..1F236  ; Basic_Emoji                  ; Japanese “prohibited” button..Japanese “not free of charge” button#E0.6 [5] (🈲..🈶)
-1F238..1F23A  ; Basic_Emoji                  ; Japanese “application” button..Japanese “open for business” button#E0.6 [3] (🈸..🈺)
-1F250..1F251  ; Basic_Emoji                  ; Japanese “bargain” button..Japanese “acceptable” button        # E0.6   [2] (🉐..🉑)
-1F300..1F30C  ; Basic_Emoji                  ; cyclone..milky way                                             # E0.6  [13] (🌀..🌌)
-1F30D..1F30E  ; Basic_Emoji                  ; globe showing Europe-Africa..globe showing Americas            # E0.7   [2] (🌍..🌎)
+1F232..1F236  ; Basic_Emoji                  ; Japanese “prohibited” button                                   # E0.6   [5] (🈲..🈶)
+1F238..1F23A  ; Basic_Emoji                  ; Japanese “application” button                                  # E0.6   [3] (🈸..🈺)
+1F250..1F251  ; Basic_Emoji                  ; Japanese “bargain” button                                      # E0.6   [2] (🉐..🉑)
+1F300..1F30C  ; Basic_Emoji                  ; cyclone                                                        # E0.6  [13] (🌀..🌌)
+1F30D..1F30E  ; Basic_Emoji                  ; globe showing Europe-Africa                                    # E0.7   [2] (🌍..🌎)
 1F30F         ; Basic_Emoji                  ; globe showing Asia-Australia                                   # E0.6   [1] (🌏)
 1F310         ; Basic_Emoji                  ; globe with meridians                                           # E1.0   [1] (🌐)
 1F311         ; Basic_Emoji                  ; new moon                                                       # E0.6   [1] (🌑)
 1F312         ; Basic_Emoji                  ; waxing crescent moon                                           # E1.0   [1] (🌒)
-1F313..1F315  ; Basic_Emoji                  ; first quarter moon..full moon                                  # E0.6   [3] (🌓..🌕)
-1F316..1F318  ; Basic_Emoji                  ; waning gibbous moon..waning crescent moon                      # E1.0   [3] (🌖..🌘)
+1F313..1F315  ; Basic_Emoji                  ; first quarter moon                                             # E0.6   [3] (🌓..🌕)
+1F316..1F318  ; Basic_Emoji                  ; waning gibbous moon                                            # E1.0   [3] (🌖..🌘)
 1F319         ; Basic_Emoji                  ; crescent moon                                                  # E0.6   [1] (🌙)
 1F31A         ; Basic_Emoji                  ; new moon face                                                  # E1.0   [1] (🌚)
 1F31B         ; Basic_Emoji                  ; first quarter moon face                                        # E0.6   [1] (🌛)
 1F31C         ; Basic_Emoji                  ; last quarter moon face                                         # E0.7   [1] (🌜)
-1F31D..1F31E  ; Basic_Emoji                  ; full moon face..sun with face                                  # E1.0   [2] (🌝..🌞)
-1F31F..1F320  ; Basic_Emoji                  ; glowing star..shooting star                                    # E0.6   [2] (🌟..🌠)
-1F32D..1F32F  ; Basic_Emoji                  ; hot dog..burrito                                               # E1.0   [3] (🌭..🌯)
-1F330..1F331  ; Basic_Emoji                  ; chestnut..seedling                                             # E0.6   [2] (🌰..🌱)
-1F332..1F333  ; Basic_Emoji                  ; evergreen tree..deciduous tree                                 # E1.0   [2] (🌲..🌳)
-1F334..1F335  ; Basic_Emoji                  ; palm tree..cactus                                              # E0.6   [2] (🌴..🌵)
-1F337..1F34A  ; Basic_Emoji                  ; tulip..tangerine                                               # E0.6  [20] (🌷..🍊)
+1F31D..1F31E  ; Basic_Emoji                  ; full moon face                                                 # E1.0   [2] (🌝..🌞)
+1F31F..1F320  ; Basic_Emoji                  ; glowing star                                                   # E0.6   [2] (🌟..🌠)
+1F32D..1F32F  ; Basic_Emoji                  ; hot dog                                                        # E1.0   [3] (🌭..🌯)
+1F330..1F331  ; Basic_Emoji                  ; chestnut                                                       # E0.6   [2] (🌰..🌱)
+1F332..1F333  ; Basic_Emoji                  ; evergreen tree                                                 # E1.0   [2] (🌲..🌳)
+1F334..1F335  ; Basic_Emoji                  ; palm tree                                                      # E0.6   [2] (🌴..🌵)
+1F337..1F34A  ; Basic_Emoji                  ; tulip                                                          # E0.6  [20] (🌷..🍊)
 1F34B         ; Basic_Emoji                  ; lemon                                                          # E1.0   [1] (🍋)
-1F34C..1F34F  ; Basic_Emoji                  ; banana..green apple                                            # E0.6   [4] (🍌..🍏)
+1F34C..1F34F  ; Basic_Emoji                  ; banana                                                         # E0.6   [4] (🍌..🍏)
 1F350         ; Basic_Emoji                  ; pear                                                           # E1.0   [1] (🍐)
-1F351..1F37B  ; Basic_Emoji                  ; peach..clinking beer mugs                                      # E0.6  [43] (🍑..🍻)
+1F351..1F37B  ; Basic_Emoji                  ; peach                                                          # E0.6  [43] (🍑..🍻)
 1F37C         ; Basic_Emoji                  ; baby bottle                                                    # E1.0   [1] (🍼)
-1F37E..1F37F  ; Basic_Emoji                  ; bottle with popping cork..popcorn                              # E1.0   [2] (🍾..🍿)
-1F380..1F393  ; Basic_Emoji                  ; ribbon..graduation cap                                         # E0.6  [20] (🎀..🎓)
-1F3A0..1F3C4  ; Basic_Emoji                  ; carousel horse..person surfing                                 # E0.6  [37] (🎠..🏄)
+1F37E..1F37F  ; Basic_Emoji                  ; bottle with popping cork                                       # E1.0   [2] (🍾..🍿)
+1F380..1F393  ; Basic_Emoji                  ; ribbon                                                         # E0.6  [20] (🎀..🎓)
+1F3A0..1F3C4  ; Basic_Emoji                  ; carousel horse                                                 # E0.6  [37] (🎠..🏄)
 1F3C5         ; Basic_Emoji                  ; sports medal                                                   # E1.0   [1] (🏅)
 1F3C6         ; Basic_Emoji                  ; trophy                                                         # E0.6   [1] (🏆)
 1F3C7         ; Basic_Emoji                  ; horse racing                                                   # E1.0   [1] (🏇)
 1F3C8         ; Basic_Emoji                  ; american football                                              # E0.6   [1] (🏈)
 1F3C9         ; Basic_Emoji                  ; rugby football                                                 # E1.0   [1] (🏉)
 1F3CA         ; Basic_Emoji                  ; person swimming                                                # E0.6   [1] (🏊)
-1F3CF..1F3D3  ; Basic_Emoji                  ; cricket game..ping pong                                        # E1.0   [5] (🏏..🏓)
-1F3E0..1F3E3  ; Basic_Emoji                  ; house..Japanese post office                                    # E0.6   [4] (🏠..🏣)
+1F3CF..1F3D3  ; Basic_Emoji                  ; cricket game                                                   # E1.0   [5] (🏏..🏓)
+1F3E0..1F3E3  ; Basic_Emoji                  ; house                                                          # E0.6   [4] (🏠..🏣)
 1F3E4         ; Basic_Emoji                  ; post office                                                    # E1.0   [1] (🏤)
-1F3E5..1F3F0  ; Basic_Emoji                  ; hospital..castle                                               # E0.6  [12] (🏥..🏰)
+1F3E5..1F3F0  ; Basic_Emoji                  ; hospital                                                       # E0.6  [12] (🏥..🏰)
 1F3F4         ; Basic_Emoji                  ; black flag                                                     # E1.0   [1] (🏴)
-1F3F8..1F407  ; Basic_Emoji                  ; badminton..rabbit                                              # E1.0  [16] (🏸..🐇)
+1F3F8..1F407  ; Basic_Emoji                  ; badminton                                                      # E1.0  [16] (🏸..🐇)
 1F408         ; Basic_Emoji                  ; cat                                                            # E0.7   [1] (🐈)
-1F409..1F40B  ; Basic_Emoji                  ; dragon..whale                                                  # E1.0   [3] (🐉..🐋)
-1F40C..1F40E  ; Basic_Emoji                  ; snail..horse                                                   # E0.6   [3] (🐌..🐎)
-1F40F..1F410  ; Basic_Emoji                  ; ram..goat                                                      # E1.0   [2] (🐏..🐐)
-1F411..1F412  ; Basic_Emoji                  ; ewe..monkey                                                    # E0.6   [2] (🐑..🐒)
+1F409..1F40B  ; Basic_Emoji                  ; dragon                                                         # E1.0   [3] (🐉..🐋)
+1F40C..1F40E  ; Basic_Emoji                  ; snail                                                          # E0.6   [3] (🐌..🐎)
+1F40F..1F410  ; Basic_Emoji                  ; ram                                                            # E1.0   [2] (🐏..🐐)
+1F411..1F412  ; Basic_Emoji                  ; ewe                                                            # E0.6   [2] (🐑..🐒)
 1F413         ; Basic_Emoji                  ; rooster                                                        # E1.0   [1] (🐓)
 1F414         ; Basic_Emoji                  ; chicken                                                        # E0.6   [1] (🐔)
 1F415         ; Basic_Emoji                  ; dog                                                            # E0.7   [1] (🐕)
 1F416         ; Basic_Emoji                  ; pig                                                            # E1.0   [1] (🐖)
-1F417..1F429  ; Basic_Emoji                  ; boar..poodle                                                   # E0.6  [19] (🐗..🐩)
+1F417..1F429  ; Basic_Emoji                  ; boar                                                           # E0.6  [19] (🐗..🐩)
 1F42A         ; Basic_Emoji                  ; camel                                                          # E1.0   [1] (🐪)
-1F42B..1F43E  ; Basic_Emoji                  ; two-hump camel..paw prints                                     # E0.6  [20] (🐫..🐾)
+1F42B..1F43E  ; Basic_Emoji                  ; two-hump camel                                                 # E0.6  [20] (🐫..🐾)
 1F440         ; Basic_Emoji                  ; eyes                                                           # E0.6   [1] (👀)
-1F442..1F464  ; Basic_Emoji                  ; ear..bust in silhouette                                        # E0.6  [35] (👂..👤)
+1F442..1F464  ; Basic_Emoji                  ; ear                                                            # E0.6  [35] (👂..👤)
 1F465         ; Basic_Emoji                  ; busts in silhouette                                            # E1.0   [1] (👥)
-1F466..1F46B  ; Basic_Emoji                  ; boy..woman and man holding hands                               # E0.6   [6] (👦..👫)
-1F46C..1F46D  ; Basic_Emoji                  ; men holding hands..women holding hands                         # E1.0   [2] (👬..👭)
-1F46E..1F4AC  ; Basic_Emoji                  ; police officer..speech balloon                                 # E0.6  [63] (👮..💬)
+1F466..1F46B  ; Basic_Emoji                  ; boy                                                            # E0.6   [6] (👦..👫)
+1F46C..1F46D  ; Basic_Emoji                  ; men holding hands                                              # E1.0   [2] (👬..👭)
+1F46E..1F4AC  ; Basic_Emoji                  ; police officer                                                 # E0.6  [63] (👮..💬)
 1F4AD         ; Basic_Emoji                  ; thought balloon                                                # E1.0   [1] (💭)
-1F4AE..1F4B5  ; Basic_Emoji                  ; white flower..dollar banknote                                  # E0.6   [8] (💮..💵)
-1F4B6..1F4B7  ; Basic_Emoji                  ; euro banknote..pound banknote                                  # E1.0   [2] (💶..💷)
-1F4B8..1F4EB  ; Basic_Emoji                  ; money with wings..closed mailbox with raised flag              # E0.6  [52] (💸..📫)
-1F4EC..1F4ED  ; Basic_Emoji                  ; open mailbox with raised flag..open mailbox with lowered flag  # E0.7   [2] (📬..📭)
+1F4AE..1F4B5  ; Basic_Emoji                  ; white flower                                                   # E0.6   [8] (💮..💵)
+1F4B6..1F4B7  ; Basic_Emoji                  ; euro banknote                                                  # E1.0   [2] (💶..💷)
+1F4B8..1F4EB  ; Basic_Emoji                  ; money with wings                                               # E0.6  [52] (💸..📫)
+1F4EC..1F4ED  ; Basic_Emoji                  ; open mailbox with raised flag                                  # E0.7   [2] (📬..📭)
 1F4EE         ; Basic_Emoji                  ; postbox                                                        # E0.6   [1] (📮)
 1F4EF         ; Basic_Emoji                  ; postal horn                                                    # E1.0   [1] (📯)
-1F4F0..1F4F4  ; Basic_Emoji                  ; newspaper..mobile phone off                                    # E0.6   [5] (📰..📴)
+1F4F0..1F4F4  ; Basic_Emoji                  ; newspaper                                                      # E0.6   [5] (📰..📴)
 1F4F5         ; Basic_Emoji                  ; no mobile phones                                               # E1.0   [1] (📵)
-1F4F6..1F4F7  ; Basic_Emoji                  ; antenna bars..camera                                           # E0.6   [2] (📶..📷)
+1F4F6..1F4F7  ; Basic_Emoji                  ; antenna bars                                                   # E0.6   [2] (📶..📷)
 1F4F8         ; Basic_Emoji                  ; camera with flash                                              # E1.0   [1] (📸)
-1F4F9..1F4FC  ; Basic_Emoji                  ; video camera..videocassette                                    # E0.6   [4] (📹..📼)
-1F4FF..1F502  ; Basic_Emoji                  ; prayer beads..repeat single button                             # E1.0   [4] (📿..🔂)
+1F4F9..1F4FC  ; Basic_Emoji                  ; video camera                                                   # E0.6   [4] (📹..📼)
+1F4FF..1F502  ; Basic_Emoji                  ; prayer beads                                                   # E1.0   [4] (📿..🔂)
 1F503         ; Basic_Emoji                  ; clockwise vertical arrows                                      # E0.6   [1] (🔃)
-1F504..1F507  ; Basic_Emoji                  ; counterclockwise arrows button..muted speaker                  # E1.0   [4] (🔄..🔇)
+1F504..1F507  ; Basic_Emoji                  ; counterclockwise arrows button                                 # E1.0   [4] (🔄..🔇)
 1F508         ; Basic_Emoji                  ; speaker low volume                                             # E0.7   [1] (🔈)
 1F509         ; Basic_Emoji                  ; speaker medium volume                                          # E1.0   [1] (🔉)
-1F50A..1F514  ; Basic_Emoji                  ; speaker high volume..bell                                      # E0.6  [11] (🔊..🔔)
+1F50A..1F514  ; Basic_Emoji                  ; speaker high volume                                            # E0.6  [11] (🔊..🔔)
 1F515         ; Basic_Emoji                  ; bell with slash                                                # E1.0   [1] (🔕)
-1F516..1F52B  ; Basic_Emoji                  ; bookmark..water pistol                                         # E0.6  [22] (🔖..🔫)
-1F52C..1F52D  ; Basic_Emoji                  ; microscope..telescope                                          # E1.0   [2] (🔬..🔭)
-1F52E..1F53D  ; Basic_Emoji                  ; crystal ball..downwards button                                 # E0.6  [16] (🔮..🔽)
-1F54B..1F54E  ; Basic_Emoji                  ; kaaba..menorah                                                 # E1.0   [4] (🕋..🕎)
-1F550..1F55B  ; Basic_Emoji                  ; one o’clock..twelve o’clock                                    # E0.6  [12] (🕐..🕛)
-1F55C..1F567  ; Basic_Emoji                  ; one-thirty..twelve-thirty                                      # E0.7  [12] (🕜..🕧)
+1F516..1F52B  ; Basic_Emoji                  ; bookmark                                                       # E0.6  [22] (🔖..🔫)
+1F52C..1F52D  ; Basic_Emoji                  ; microscope                                                     # E1.0   [2] (🔬..🔭)
+1F52E..1F53D  ; Basic_Emoji                  ; crystal ball                                                   # E0.6  [16] (🔮..🔽)
+1F54B..1F54E  ; Basic_Emoji                  ; kaaba                                                          # E1.0   [4] (🕋..🕎)
+1F550..1F55B  ; Basic_Emoji                  ; one o’clock                                                    # E0.6  [12] (🕐..🕛)
+1F55C..1F567  ; Basic_Emoji                  ; one-thirty                                                     # E0.7  [12] (🕜..🕧)
 1F57A         ; Basic_Emoji                  ; man dancing                                                    # E3.0   [1] (🕺)
-1F595..1F596  ; Basic_Emoji                  ; middle finger..vulcan salute                                   # E1.0   [2] (🖕..🖖)
+1F595..1F596  ; Basic_Emoji                  ; middle finger                                                  # E1.0   [2] (🖕..🖖)
 1F5A4         ; Basic_Emoji                  ; black heart                                                    # E3.0   [1] (🖤)
-1F5FB..1F5FF  ; Basic_Emoji                  ; mount fuji..moai                                               # E0.6   [5] (🗻..🗿)
+1F5FB..1F5FF  ; Basic_Emoji                  ; mount fuji                                                     # E0.6   [5] (🗻..🗿)
 1F600         ; Basic_Emoji                  ; grinning face                                                  # E1.0   [1] (😀)
-1F601..1F606  ; Basic_Emoji                  ; beaming face with smiling eyes..grinning squinting face        # E0.6   [6] (😁..😆)
-1F607..1F608  ; Basic_Emoji                  ; smiling face with halo..smiling face with horns                # E1.0   [2] (😇..😈)
-1F609..1F60D  ; Basic_Emoji                  ; winking face..smiling face with heart-eyes                     # E0.6   [5] (😉..😍)
+1F601..1F606  ; Basic_Emoji                  ; beaming face with smiling eyes                                 # E0.6   [6] (😁..😆)
+1F607..1F608  ; Basic_Emoji                  ; smiling face with halo                                         # E1.0   [2] (😇..😈)
+1F609..1F60D  ; Basic_Emoji                  ; winking face                                                   # E0.6   [5] (😉..😍)
 1F60E         ; Basic_Emoji                  ; smiling face with sunglasses                                   # E1.0   [1] (😎)
 1F60F         ; Basic_Emoji                  ; smirking face                                                  # E0.6   [1] (😏)
 1F610         ; Basic_Emoji                  ; neutral face                                                   # E0.7   [1] (😐)
 1F611         ; Basic_Emoji                  ; expressionless face                                            # E1.0   [1] (😑)
-1F612..1F614  ; Basic_Emoji                  ; unamused face..pensive face                                    # E0.6   [3] (😒..😔)
+1F612..1F614  ; Basic_Emoji                  ; unamused face                                                  # E0.6   [3] (😒..😔)
 1F615         ; Basic_Emoji                  ; confused face                                                  # E1.0   [1] (😕)
 1F616         ; Basic_Emoji                  ; confounded face                                                # E0.6   [1] (😖)
 1F617         ; Basic_Emoji                  ; kissing face                                                   # E1.0   [1] (😗)
@@ -184,142 +183,132 @@
 1F619         ; Basic_Emoji                  ; kissing face with smiling eyes                                 # E1.0   [1] (😙)
 1F61A         ; Basic_Emoji                  ; kissing face with closed eyes                                  # E0.6   [1] (😚)
 1F61B         ; Basic_Emoji                  ; face with tongue                                               # E1.0   [1] (😛)
-1F61C..1F61E  ; Basic_Emoji                  ; winking face with tongue..disappointed face                    # E0.6   [3] (😜..😞)
+1F61C..1F61E  ; Basic_Emoji                  ; winking face with tongue                                       # E0.6   [3] (😜..😞)
 1F61F         ; Basic_Emoji                  ; worried face                                                   # E1.0   [1] (😟)
-1F620..1F625  ; Basic_Emoji                  ; angry face..sad but relieved face                              # E0.6   [6] (😠..😥)
-1F626..1F627  ; Basic_Emoji                  ; frowning face with open mouth..anguished face                  # E1.0   [2] (😦..😧)
-1F628..1F62B  ; Basic_Emoji                  ; fearful face..tired face                                       # E0.6   [4] (😨..😫)
+1F620..1F625  ; Basic_Emoji                  ; angry face                                                     # E0.6   [6] (😠..😥)
+1F626..1F627  ; Basic_Emoji                  ; frowning face with open mouth                                  # E1.0   [2] (😦..😧)
+1F628..1F62B  ; Basic_Emoji                  ; fearful face                                                   # E0.6   [4] (😨..😫)
 1F62C         ; Basic_Emoji                  ; grimacing face                                                 # E1.0   [1] (😬)
 1F62D         ; Basic_Emoji                  ; loudly crying face                                             # E0.6   [1] (😭)
-1F62E..1F62F  ; Basic_Emoji                  ; face with open mouth..hushed face                              # E1.0   [2] (😮..😯)
-1F630..1F633  ; Basic_Emoji                  ; anxious face with sweat..flushed face                          # E0.6   [4] (😰..😳)
+1F62E..1F62F  ; Basic_Emoji                  ; face with open mouth                                           # E1.0   [2] (😮..😯)
+1F630..1F633  ; Basic_Emoji                  ; anxious face with sweat                                        # E0.6   [4] (😰..😳)
 1F634         ; Basic_Emoji                  ; sleeping face                                                  # E1.0   [1] (😴)
 1F635         ; Basic_Emoji                  ; face with crossed-out eyes                                     # E0.6   [1] (😵)
 1F636         ; Basic_Emoji                  ; face without mouth                                             # E1.0   [1] (😶)
-1F637..1F640  ; Basic_Emoji                  ; face with medical mask..weary cat                              # E0.6  [10] (😷..🙀)
-1F641..1F644  ; Basic_Emoji                  ; slightly frowning face..face with rolling eyes                 # E1.0   [4] (🙁..🙄)
-1F645..1F64F  ; Basic_Emoji                  ; person gesturing NO..folded hands                              # E0.6  [11] (🙅..🙏)
+1F637..1F640  ; Basic_Emoji                  ; face with medical mask                                         # E0.6  [10] (😷..🙀)
+1F641..1F644  ; Basic_Emoji                  ; slightly frowning face                                         # E1.0   [4] (🙁..🙄)
+1F645..1F64F  ; Basic_Emoji                  ; person gesturing NO                                            # E0.6  [11] (🙅..🙏)
 1F680         ; Basic_Emoji                  ; rocket                                                         # E0.6   [1] (🚀)
-1F681..1F682  ; Basic_Emoji                  ; helicopter..locomotive                                         # E1.0   [2] (🚁..🚂)
-1F683..1F685  ; Basic_Emoji                  ; railway car..bullet train                                      # E0.6   [3] (🚃..🚅)
+1F681..1F682  ; Basic_Emoji                  ; helicopter                                                     # E1.0   [2] (🚁..🚂)
+1F683..1F685  ; Basic_Emoji                  ; railway car                                                    # E0.6   [3] (🚃..🚅)
 1F686         ; Basic_Emoji                  ; train                                                          # E1.0   [1] (🚆)
 1F687         ; Basic_Emoji                  ; metro                                                          # E0.6   [1] (🚇)
 1F688         ; Basic_Emoji                  ; light rail                                                     # E1.0   [1] (🚈)
 1F689         ; Basic_Emoji                  ; station                                                        # E0.6   [1] (🚉)
-1F68A..1F68B  ; Basic_Emoji                  ; tram..tram car                                                 # E1.0   [2] (🚊..🚋)
+1F68A..1F68B  ; Basic_Emoji                  ; tram                                                           # E1.0   [2] (🚊..🚋)
 1F68C         ; Basic_Emoji                  ; bus                                                            # E0.6   [1] (🚌)
 1F68D         ; Basic_Emoji                  ; oncoming bus                                                   # E0.7   [1] (🚍)
 1F68E         ; Basic_Emoji                  ; trolleybus                                                     # E1.0   [1] (🚎)
 1F68F         ; Basic_Emoji                  ; bus stop                                                       # E0.6   [1] (🚏)
 1F690         ; Basic_Emoji                  ; minibus                                                        # E1.0   [1] (🚐)
-1F691..1F693  ; Basic_Emoji                  ; ambulance..police car                                          # E0.6   [3] (🚑..🚓)
+1F691..1F693  ; Basic_Emoji                  ; ambulance                                                      # E0.6   [3] (🚑..🚓)
 1F694         ; Basic_Emoji                  ; oncoming police car                                            # E0.7   [1] (🚔)
 1F695         ; Basic_Emoji                  ; taxi                                                           # E0.6   [1] (🚕)
 1F696         ; Basic_Emoji                  ; oncoming taxi                                                  # E1.0   [1] (🚖)
 1F697         ; Basic_Emoji                  ; automobile                                                     # E0.6   [1] (🚗)
 1F698         ; Basic_Emoji                  ; oncoming automobile                                            # E0.7   [1] (🚘)
-1F699..1F69A  ; Basic_Emoji                  ; sport utility vehicle..delivery truck                          # E0.6   [2] (🚙..🚚)
-1F69B..1F6A1  ; Basic_Emoji                  ; articulated lorry..aerial tramway                              # E1.0   [7] (🚛..🚡)
+1F699..1F69A  ; Basic_Emoji                  ; sport utility vehicle                                          # E0.6   [2] (🚙..🚚)
+1F69B..1F6A1  ; Basic_Emoji                  ; articulated lorry                                              # E1.0   [7] (🚛..🚡)
 1F6A2         ; Basic_Emoji                  ; ship                                                           # E0.6   [1] (🚢)
 1F6A3         ; Basic_Emoji                  ; person rowing boat                                             # E1.0   [1] (🚣)
-1F6A4..1F6A5  ; Basic_Emoji                  ; speedboat..horizontal traffic light                            # E0.6   [2] (🚤..🚥)
+1F6A4..1F6A5  ; Basic_Emoji                  ; speedboat                                                      # E0.6   [2] (🚤..🚥)
 1F6A6         ; Basic_Emoji                  ; vertical traffic light                                         # E1.0   [1] (🚦)
-1F6A7..1F6AD  ; Basic_Emoji                  ; construction..no smoking                                       # E0.6   [7] (🚧..🚭)
-1F6AE..1F6B1  ; Basic_Emoji                  ; litter in bin sign..non-potable water                          # E1.0   [4] (🚮..🚱)
+1F6A7..1F6AD  ; Basic_Emoji                  ; construction                                                   # E0.6   [7] (🚧..🚭)
+1F6AE..1F6B1  ; Basic_Emoji                  ; litter in bin sign                                             # E1.0   [4] (🚮..🚱)
 1F6B2         ; Basic_Emoji                  ; bicycle                                                        # E0.6   [1] (🚲)
-1F6B3..1F6B5  ; Basic_Emoji                  ; no bicycles..person mountain biking                            # E1.0   [3] (🚳..🚵)
+1F6B3..1F6B5  ; Basic_Emoji                  ; no bicycles                                                    # E1.0   [3] (🚳..🚵)
 1F6B6         ; Basic_Emoji                  ; person walking                                                 # E0.6   [1] (🚶)
-1F6B7..1F6B8  ; Basic_Emoji                  ; no pedestrians..children crossing                              # E1.0   [2] (🚷..🚸)
-1F6B9..1F6BE  ; Basic_Emoji                  ; men’s room..water closet                                       # E0.6   [6] (🚹..🚾)
+1F6B7..1F6B8  ; Basic_Emoji                  ; no pedestrians                                                 # E1.0   [2] (🚷..🚸)
+1F6B9..1F6BE  ; Basic_Emoji                  ; men’s room                                                     # E0.6   [6] (🚹..🚾)
 1F6BF         ; Basic_Emoji                  ; shower                                                         # E1.0   [1] (🚿)
 1F6C0         ; Basic_Emoji                  ; person taking bath                                             # E0.6   [1] (🛀)
-1F6C1..1F6C5  ; Basic_Emoji                  ; bathtub..left luggage                                          # E1.0   [5] (🛁..🛅)
+1F6C1..1F6C5  ; Basic_Emoji                  ; bathtub                                                        # E1.0   [5] (🛁..🛅)
 1F6CC         ; Basic_Emoji                  ; person in bed                                                  # E1.0   [1] (🛌)
 1F6D0         ; Basic_Emoji                  ; place of worship                                               # E1.0   [1] (🛐)
-1F6D1..1F6D2  ; Basic_Emoji                  ; stop sign..shopping cart                                       # E3.0   [2] (🛑..🛒)
+1F6D1..1F6D2  ; Basic_Emoji                  ; stop sign                                                      # E3.0   [2] (🛑..🛒)
 1F6D5         ; Basic_Emoji                  ; hindu temple                                                   # E12.0  [1] (🛕)
-1F6D6..1F6D7  ; Basic_Emoji                  ; hut..elevator                                                  # E13.0  [2] (🛖..🛗)
-1F6DC         ; Basic_Emoji                  ; wireless                                                       # E15.0  [1] (🛜)
-1F6DD..1F6DF  ; Basic_Emoji                  ; playground slide..ring buoy                                    # E14.0  [3] (🛝..🛟)
-1F6EB..1F6EC  ; Basic_Emoji                  ; airplane departure..airplane arrival                           # E1.0   [2] (🛫..🛬)
-1F6F4..1F6F6  ; Basic_Emoji                  ; kick scooter..canoe                                            # E3.0   [3] (🛴..🛶)
-1F6F7..1F6F8  ; Basic_Emoji                  ; sled..flying saucer                                            # E5.0   [2] (🛷..🛸)
+1F6D6..1F6D7  ; Basic_Emoji                  ; hut                                                            # E13.0  [2] (🛖..🛗)
+1F6DD..1F6DF  ; Basic_Emoji                  ; playground slide                                               # E14.0  [3] (🛝..🛟)
+1F6EB..1F6EC  ; Basic_Emoji                  ; airplane departure                                             # E1.0   [2] (🛫..🛬)
+1F6F4..1F6F6  ; Basic_Emoji                  ; kick scooter                                                   # E3.0   [3] (🛴..🛶)
+1F6F7..1F6F8  ; Basic_Emoji                  ; sled                                                           # E5.0   [2] (🛷..🛸)
 1F6F9         ; Basic_Emoji                  ; skateboard                                                     # E11.0  [1] (🛹)
 1F6FA         ; Basic_Emoji                  ; auto rickshaw                                                  # E12.0  [1] (🛺)
-1F6FB..1F6FC  ; Basic_Emoji                  ; pickup truck..roller skate                                     # E13.0  [2] (🛻..🛼)
-1F7E0..1F7EB  ; Basic_Emoji                  ; orange circle..brown square                                    # E12.0 [12] (🟠..🟫)
+1F6FB..1F6FC  ; Basic_Emoji                  ; pickup truck                                                   # E13.0  [2] (🛻..🛼)
+1F7E0..1F7EB  ; Basic_Emoji                  ; orange circle                                                  # E12.0 [12] (🟠..🟫)
 1F7F0         ; Basic_Emoji                  ; heavy equals sign                                              # E14.0  [1] (🟰)
 1F90C         ; Basic_Emoji                  ; pinched fingers                                                # E13.0  [1] (🤌)
-1F90D..1F90F  ; Basic_Emoji                  ; white heart..pinching hand                                     # E12.0  [3] (🤍..🤏)
-1F910..1F918  ; Basic_Emoji                  ; zipper-mouth face..sign of the horns                           # E1.0   [9] (🤐..🤘)
-1F919..1F91E  ; Basic_Emoji                  ; call me hand..crossed fingers                                  # E3.0   [6] (🤙..🤞)
+1F90D..1F90F  ; Basic_Emoji                  ; white heart                                                    # E12.0  [3] (🤍..🤏)
+1F910..1F918  ; Basic_Emoji                  ; zipper-mouth face                                              # E1.0   [9] (🤐..🤘)
+1F919..1F91E  ; Basic_Emoji                  ; call me hand                                                   # E3.0   [6] (🤙..🤞)
 1F91F         ; Basic_Emoji                  ; love-you gesture                                               # E5.0   [1] (🤟)
-1F920..1F927  ; Basic_Emoji                  ; cowboy hat face..sneezing face                                 # E3.0   [8] (🤠..🤧)
-1F928..1F92F  ; Basic_Emoji                  ; face with raised eyebrow..exploding head                       # E5.0   [8] (🤨..🤯)
+1F920..1F927  ; Basic_Emoji                  ; cowboy hat face                                                # E3.0   [8] (🤠..🤧)
+1F928..1F92F  ; Basic_Emoji                  ; face with raised eyebrow                                       # E5.0   [8] (🤨..🤯)
 1F930         ; Basic_Emoji                  ; pregnant woman                                                 # E3.0   [1] (🤰)
-1F931..1F932  ; Basic_Emoji                  ; breast-feeding..palms up together                              # E5.0   [2] (🤱..🤲)
-1F933..1F93A  ; Basic_Emoji                  ; selfie..person fencing                                         # E3.0   [8] (🤳..🤺)
-1F93C..1F93E  ; Basic_Emoji                  ; people wrestling..person playing handball                      # E3.0   [3] (🤼..🤾)
+1F931..1F932  ; Basic_Emoji                  ; breast-feeding                                                 # E5.0   [2] (🤱..🤲)
+1F933..1F93A  ; Basic_Emoji                  ; selfie                                                         # E3.0   [8] (🤳..🤺)
+1F93C..1F93E  ; Basic_Emoji                  ; people wrestling                                               # E3.0   [3] (🤼..🤾)
 1F93F         ; Basic_Emoji                  ; diving mask                                                    # E12.0  [1] (🤿)
-1F940..1F945  ; Basic_Emoji                  ; wilted flower..goal net                                        # E3.0   [6] (🥀..🥅)
-1F947..1F94B  ; Basic_Emoji                  ; 1st place medal..martial arts uniform                          # E3.0   [5] (🥇..🥋)
+1F940..1F945  ; Basic_Emoji                  ; wilted flower                                                  # E3.0   [6] (🥀..🥅)
+1F947..1F94B  ; Basic_Emoji                  ; 1st place medal                                                # E3.0   [5] (🥇..🥋)
 1F94C         ; Basic_Emoji                  ; curling stone                                                  # E5.0   [1] (🥌)
-1F94D..1F94F  ; Basic_Emoji                  ; lacrosse..flying disc                                          # E11.0  [3] (🥍..🥏)
-1F950..1F95E  ; Basic_Emoji                  ; croissant..pancakes                                            # E3.0  [15] (🥐..🥞)
-1F95F..1F96B  ; Basic_Emoji                  ; dumpling..canned food                                          # E5.0  [13] (🥟..🥫)
-1F96C..1F970  ; Basic_Emoji                  ; leafy green..smiling face with hearts                          # E11.0  [5] (🥬..🥰)
+1F94D..1F94F  ; Basic_Emoji                  ; lacrosse                                                       # E11.0  [3] (🥍..🥏)
+1F950..1F95E  ; Basic_Emoji                  ; croissant                                                      # E3.0  [15] (🥐..🥞)
+1F95F..1F96B  ; Basic_Emoji                  ; dumpling                                                       # E5.0  [13] (🥟..🥫)
+1F96C..1F970  ; Basic_Emoji                  ; leafy green                                                    # E11.0  [5] (🥬..🥰)
 1F971         ; Basic_Emoji                  ; yawning face                                                   # E12.0  [1] (🥱)
 1F972         ; Basic_Emoji                  ; smiling face with tear                                         # E13.0  [1] (🥲)
-1F973..1F976  ; Basic_Emoji                  ; partying face..cold face                                       # E11.0  [4] (🥳..🥶)
-1F977..1F978  ; Basic_Emoji                  ; ninja..disguised face                                          # E13.0  [2] (🥷..🥸)
+1F973..1F976  ; Basic_Emoji                  ; partying face                                                  # E11.0  [4] (🥳..🥶)
+1F977..1F978  ; Basic_Emoji                  ; ninja                                                          # E13.0  [2] (🥷..🥸)
 1F979         ; Basic_Emoji                  ; face holding back tears                                        # E14.0  [1] (🥹)
 1F97A         ; Basic_Emoji                  ; pleading face                                                  # E11.0  [1] (🥺)
 1F97B         ; Basic_Emoji                  ; sari                                                           # E12.0  [1] (🥻)
-1F97C..1F97F  ; Basic_Emoji                  ; lab coat..flat shoe                                            # E11.0  [4] (🥼..🥿)
-1F980..1F984  ; Basic_Emoji                  ; crab..unicorn                                                  # E1.0   [5] (🦀..🦄)
-1F985..1F991  ; Basic_Emoji                  ; eagle..squid                                                   # E3.0  [13] (🦅..🦑)
-1F992..1F997  ; Basic_Emoji                  ; giraffe..cricket                                               # E5.0   [6] (🦒..🦗)
-1F998..1F9A2  ; Basic_Emoji                  ; kangaroo..swan                                                 # E11.0 [11] (🦘..🦢)
-1F9A3..1F9A4  ; Basic_Emoji                  ; mammoth..dodo                                                  # E13.0  [2] (🦣..🦤)
-1F9A5..1F9AA  ; Basic_Emoji                  ; sloth..oyster                                                  # E12.0  [6] (🦥..🦪)
-1F9AB..1F9AD  ; Basic_Emoji                  ; beaver..seal                                                   # E13.0  [3] (🦫..🦭)
-1F9AE..1F9AF  ; Basic_Emoji                  ; guide dog..white cane                                          # E12.0  [2] (🦮..🦯)
-1F9B0..1F9B9  ; Basic_Emoji                  ; red hair..supervillain                                         # E11.0 [10] (🦰..🦹)
-1F9BA..1F9BF  ; Basic_Emoji                  ; safety vest..mechanical leg                                    # E12.0  [6] (🦺..🦿)
+1F97C..1F97F  ; Basic_Emoji                  ; lab coat                                                       # E11.0  [4] (🥼..🥿)
+1F980..1F984  ; Basic_Emoji                  ; crab                                                           # E1.0   [5] (🦀..🦄)
+1F985..1F991  ; Basic_Emoji                  ; eagle                                                          # E3.0  [13] (🦅..🦑)
+1F992..1F997  ; Basic_Emoji                  ; giraffe                                                        # E5.0   [6] (🦒..🦗)
+1F998..1F9A2  ; Basic_Emoji                  ; kangaroo                                                       # E11.0 [11] (🦘..🦢)
+1F9A3..1F9A4  ; Basic_Emoji                  ; mammoth                                                        # E13.0  [2] (🦣..🦤)
+1F9A5..1F9AA  ; Basic_Emoji                  ; sloth                                                          # E12.0  [6] (🦥..🦪)
+1F9AB..1F9AD  ; Basic_Emoji                  ; beaver                                                         # E13.0  [3] (🦫..🦭)
+1F9AE..1F9AF  ; Basic_Emoji                  ; guide dog                                                      # E12.0  [2] (🦮..🦯)
+1F9B0..1F9B9  ; Basic_Emoji                  ; red hair                                                       # E11.0 [10] (🦰..🦹)
+1F9BA..1F9BF  ; Basic_Emoji                  ; safety vest                                                    # E12.0  [6] (🦺..🦿)
 1F9C0         ; Basic_Emoji                  ; cheese wedge                                                   # E1.0   [1] (🧀)
-1F9C1..1F9C2  ; Basic_Emoji                  ; cupcake..salt                                                  # E11.0  [2] (🧁..🧂)
-1F9C3..1F9CA  ; Basic_Emoji                  ; beverage box..ice                                              # E12.0  [8] (🧃..🧊)
+1F9C1..1F9C2  ; Basic_Emoji                  ; cupcake                                                        # E11.0  [2] (🧁..🧂)
+1F9C3..1F9CA  ; Basic_Emoji                  ; beverage box                                                   # E12.0  [8] (🧃..🧊)
 1F9CB         ; Basic_Emoji                  ; bubble tea                                                     # E13.0  [1] (🧋)
 1F9CC         ; Basic_Emoji                  ; troll                                                          # E14.0  [1] (🧌)
-1F9CD..1F9CF  ; Basic_Emoji                  ; person standing..deaf person                                   # E12.0  [3] (🧍..🧏)
-1F9D0..1F9E6  ; Basic_Emoji                  ; face with monocle..socks                                       # E5.0  [23] (🧐..🧦)
-1F9E7..1F9FF  ; Basic_Emoji                  ; red envelope..nazar amulet                                     # E11.0 [25] (🧧..🧿)
-1FA70..1FA73  ; Basic_Emoji                  ; ballet shoes..shorts                                           # E12.0  [4] (🩰..🩳)
+1F9CD..1F9CF  ; Basic_Emoji                  ; person standing                                                # E12.0  [3] (🧍..🧏)
+1F9D0..1F9E6  ; Basic_Emoji                  ; face with monocle                                              # E5.0  [23] (🧐..🧦)
+1F9E7..1F9FF  ; Basic_Emoji                  ; red envelope                                                   # E11.0 [25] (🧧..🧿)
+1FA70..1FA73  ; Basic_Emoji                  ; ballet shoes                                                   # E12.0  [4] (🩰..🩳)
 1FA74         ; Basic_Emoji                  ; thong sandal                                                   # E13.0  [1] (🩴)
-1FA75..1FA77  ; Basic_Emoji                  ; light blue heart..pink heart                                   # E15.0  [3] (🩵..🩷)
-1FA78..1FA7A  ; Basic_Emoji                  ; drop of blood..stethoscope                                     # E12.0  [3] (🩸..🩺)
-1FA7B..1FA7C  ; Basic_Emoji                  ; x-ray..crutch                                                  # E14.0  [2] (🩻..🩼)
-1FA80..1FA82  ; Basic_Emoji                  ; yo-yo..parachute                                               # E12.0  [3] (🪀..🪂)
-1FA83..1FA86  ; Basic_Emoji                  ; boomerang..nesting dolls                                       # E13.0  [4] (🪃..🪆)
-1FA87..1FA88  ; Basic_Emoji                  ; maracas..flute                                                 # E15.0  [2] (🪇..🪈)
-1FA90..1FA95  ; Basic_Emoji                  ; ringed planet..banjo                                           # E12.0  [6] (🪐..🪕)
-1FA96..1FAA8  ; Basic_Emoji                  ; military helmet..rock                                          # E13.0 [19] (🪖..🪨)
-1FAA9..1FAAC  ; Basic_Emoji                  ; mirror ball..hamsa                                             # E14.0  [4] (🪩..🪬)
-1FAAD..1FAAF  ; Basic_Emoji                  ; folding hand fan..khanda                                       # E15.0  [3] (🪭..🪯)
-1FAB0..1FAB6  ; Basic_Emoji                  ; fly..feather                                                   # E13.0  [7] (🪰..🪶)
-1FAB7..1FABA  ; Basic_Emoji                  ; lotus..nest with eggs                                          # E14.0  [4] (🪷..🪺)
-1FABB..1FABD  ; Basic_Emoji                  ; hyacinth..wing                                                 # E15.0  [3] (🪻..🪽)
-1FABF         ; Basic_Emoji                  ; goose                                                          # E15.0  [1] (🪿)
-1FAC0..1FAC2  ; Basic_Emoji                  ; anatomical heart..people hugging                               # E13.0  [3] (🫀..🫂)
-1FAC3..1FAC5  ; Basic_Emoji                  ; pregnant man..person with crown                                # E14.0  [3] (🫃..🫅)
-1FACE..1FACF  ; Basic_Emoji                  ; moose..donkey                                                  # E15.0  [2] (🫎..🫏)
-1FAD0..1FAD6  ; Basic_Emoji                  ; blueberries..teapot                                            # E13.0  [7] (🫐..🫖)
-1FAD7..1FAD9  ; Basic_Emoji                  ; pouring liquid..jar                                            # E14.0  [3] (🫗..🫙)
-1FADA..1FADB  ; Basic_Emoji                  ; ginger root..pea pod                                           # E15.0  [2] (🫚..🫛)
-1FAE0..1FAE7  ; Basic_Emoji                  ; melting face..bubbles                                          # E14.0  [8] (🫠..🫧)
-1FAE8         ; Basic_Emoji                  ; shaking face                                                   # E15.0  [1] (🫨)
-1FAF0..1FAF6  ; Basic_Emoji                  ; hand with index finger and thumb crossed..heart hands          # E14.0  [7] (🫰..🫶)
-1FAF7..1FAF8  ; Basic_Emoji                  ; leftwards pushing hand..rightwards pushing hand                # E15.0  [2] (🫷..🫸)
+1FA78..1FA7A  ; Basic_Emoji                  ; drop of blood                                                  # E12.0  [3] (🩸..🩺)
+1FA7B..1FA7C  ; Basic_Emoji                  ; x-ray                                                          # E14.0  [2] (🩻..🩼)
+1FA80..1FA82  ; Basic_Emoji                  ; yo-yo                                                          # E12.0  [3] (🪀..🪂)
+1FA83..1FA86  ; Basic_Emoji                  ; boomerang                                                      # E13.0  [4] (🪃..🪆)
+1FA90..1FA95  ; Basic_Emoji                  ; ringed planet                                                  # E12.0  [6] (🪐..🪕)
+1FA96..1FAA8  ; Basic_Emoji                  ; military helmet                                                # E13.0 [19] (🪖..🪨)
+1FAA9..1FAAC  ; Basic_Emoji                  ; mirror ball                                                    # E14.0  [4] (🪩..🪬)
+1FAB0..1FAB6  ; Basic_Emoji                  ; fly                                                            # E13.0  [7] (🪰..🪶)
+1FAB7..1FABA  ; Basic_Emoji                  ; lotus                                                          # E14.0  [4] (🪷..🪺)
+1FAC0..1FAC2  ; Basic_Emoji                  ; anatomical heart                                               # E13.0  [3] (🫀..🫂)
+1FAC3..1FAC5  ; Basic_Emoji                  ; pregnant man                                                   # E14.0  [3] (🫃..🫅)
+1FAD0..1FAD6  ; Basic_Emoji                  ; blueberries                                                    # E13.0  [7] (🫐..🫖)
+1FAD7..1FAD9  ; Basic_Emoji                  ; pouring liquid                                                 # E14.0  [3] (🫗..🫙)
+1FAE0..1FAE7  ; Basic_Emoji                  ; melting face                                                   # E14.0  [8] (🫠..🫧)
+1FAF0..1FAF6  ; Basic_Emoji                  ; hand with index finger and thumb crossed                       # E14.0  [7] (🫰..🫶)
 00A9 FE0F     ; Basic_Emoji                  ; copyright                                                      # E0.6   [1] (©️)
 00AE FE0F     ; Basic_Emoji                  ; registered                                                     # E0.6   [1] (®️)
 203C FE0F     ; Basic_Emoji                  ; double exclamation mark                                        # E0.6   [1] (‼️)
@@ -528,13 +517,12 @@
 1F6F0 FE0F    ; Basic_Emoji                  ; satellite                                                      # E0.7   [1] (🛰️)
 1F6F3 FE0F    ; Basic_Emoji                  ; passenger ship                                                 # E0.7   [1] (🛳️)
 
-# Total elements: 1386
+# Total elements: 1366
 
 # ================================================
 
 # Emoji_Keycap_Sequence
 
-
 0023 FE0F 20E3; Emoji_Keycap_Sequence        ; keycap: \x{23}                                                 # E0.6   [1] (#️⃣)
 002A FE0F 20E3; Emoji_Keycap_Sequence        ; keycap: *                                                      # E2.0   [1] (*️⃣)
 0030 FE0F 20E3; Emoji_Keycap_Sequence        ; keycap: 0                                                      # E0.6   [1] (0️⃣)
@@ -555,7 +543,6 @@
 # RGI_Emoji_Flag_Sequence: This list does not include deprecated or macroregion flags, except for UN and EU.
 # See Annex B of TR51 for more information.
 
-
 1F1E6 1F1E8   ; RGI_Emoji_Flag_Sequence      ; flag: Ascension Island                                         # E2.0   [1] (🇦🇨)
 1F1E6 1F1E9   ; RGI_Emoji_Flag_Sequence      ; flag: Andorra                                                  # E2.0   [1] (🇦🇩)
 1F1E6 1F1EA   ; RGI_Emoji_Flag_Sequence      ; flag: United Arab Emirates                                     # E2.0   [1] (🇦🇪)
@@ -821,7 +808,6 @@
 
 # RGI_Emoji_Tag_Sequence: See Annex C of TR51 for more information.
 
-
 1F3F4 E0067 E0062 E0065 E006E E0067 E007F; RGI_Emoji_Tag_Sequence; flag: England                              # E5.0   [1] (🏴󠁧󠁢󠁥󠁮󠁧󠁿)
 1F3F4 E0067 E0062 E0073 E0063 E0074 E007F; RGI_Emoji_Tag_Sequence; flag: Scotland                             # E5.0   [1] (🏴󠁧󠁢󠁳󠁣󠁴󠁿)
 1F3F4 E0067 E0062 E0077 E006C E0073 E007F; RGI_Emoji_Tag_Sequence; flag: Wales                                # E5.0   [1] (🏴󠁧󠁢󠁷󠁬󠁳󠁿)
@@ -832,7 +818,6 @@
 
 # RGI_Emoji_Modifier_Sequence
 
-
 261D 1F3FB    ; RGI_Emoji_Modifier_Sequence  ; index pointing up: light skin tone                             # E1.0   [1] (☝🏻)
 261D 1F3FC    ; RGI_Emoji_Modifier_Sequence  ; index pointing up: medium-light skin tone                      # E1.0   [1] (☝🏼)
 261D 1F3FD    ; RGI_Emoji_Modifier_Sequence  ; index pointing up: medium skin tone                            # E1.0   [1] (☝🏽)
@@ -1238,11 +1223,11 @@
 1F91C 1F3FD   ; RGI_Emoji_Modifier_Sequence  ; right-facing fist: medium skin tone                            # E3.0   [1] (🤜🏽)
 1F91C 1F3FE   ; RGI_Emoji_Modifier_Sequence  ; right-facing fist: medium-dark skin tone                       # E3.0   [1] (🤜🏾)
 1F91C 1F3FF   ; RGI_Emoji_Modifier_Sequence  ; right-facing fist: dark skin tone                              # E3.0   [1] (🤜🏿)
-1F91D 1F3FB   ; RGI_Emoji_Modifier_Sequence  ; handshake: light skin tone                                     # E14.0  [1] (🤝🏻)
-1F91D 1F3FC   ; RGI_Emoji_Modifier_Sequence  ; handshake: medium-light skin tone                              # E14.0  [1] (🤝🏼)
-1F91D 1F3FD   ; RGI_Emoji_Modifier_Sequence  ; handshake: medium skin tone                                    # E14.0  [1] (🤝🏽)
-1F91D 1F3FE   ; RGI_Emoji_Modifier_Sequence  ; handshake: medium-dark skin tone                               # E14.0  [1] (🤝🏾)
-1F91D 1F3FF   ; RGI_Emoji_Modifier_Sequence  ; handshake: dark skin tone                                      # E14.0  [1] (🤝🏿)
+1F91D 1F3FB   ; RGI_Emoji_Modifier_Sequence  ; handshake: light skin tone                                     # E3.0   [1] (🤝🏻)
+1F91D 1F3FC   ; RGI_Emoji_Modifier_Sequence  ; handshake: medium-light skin tone                              # E3.0   [1] (🤝🏼)
+1F91D 1F3FD   ; RGI_Emoji_Modifier_Sequence  ; handshake: medium skin tone                                    # E3.0   [1] (🤝🏽)
+1F91D 1F3FE   ; RGI_Emoji_Modifier_Sequence  ; handshake: medium-dark skin tone                               # E3.0   [1] (🤝🏾)
+1F91D 1F3FF   ; RGI_Emoji_Modifier_Sequence  ; handshake: dark skin tone                                      # E3.0   [1] (🤝🏿)
 1F91E 1F3FB   ; RGI_Emoji_Modifier_Sequence  ; crossed fingers: light skin tone                               # E3.0   [1] (🤞🏻)
 1F91E 1F3FC   ; RGI_Emoji_Modifier_Sequence  ; crossed fingers: medium-light skin tone                        # E3.0   [1] (🤞🏼)
 1F91E 1F3FD   ; RGI_Emoji_Modifier_Sequence  ; crossed fingers: medium skin tone                              # E3.0   [1] (🤞🏽)
@@ -1478,17 +1463,7 @@
 1FAF6 1F3FD   ; RGI_Emoji_Modifier_Sequence  ; heart hands: medium skin tone                                  # E14.0  [1] (🫶🏽)
 1FAF6 1F3FE   ; RGI_Emoji_Modifier_Sequence  ; heart hands: medium-dark skin tone                             # E14.0  [1] (🫶🏾)
 1FAF6 1F3FF   ; RGI_Emoji_Modifier_Sequence  ; heart hands: dark skin tone                                    # E14.0  [1] (🫶🏿)
-1FAF7 1F3FB   ; RGI_Emoji_Modifier_Sequence  ; leftwards pushing hand: light skin tone                        # E15.0  [1] (🫷🏻)
-1FAF7 1F3FC   ; RGI_Emoji_Modifier_Sequence  ; leftwards pushing hand: medium-light skin tone                 # E15.0  [1] (🫷🏼)
-1FAF7 1F3FD   ; RGI_Emoji_Modifier_Sequence  ; leftwards pushing hand: medium skin tone                       # E15.0  [1] (🫷🏽)
-1FAF7 1F3FE   ; RGI_Emoji_Modifier_Sequence  ; leftwards pushing hand: medium-dark skin tone                  # E15.0  [1] (🫷🏾)
-1FAF7 1F3FF   ; RGI_Emoji_Modifier_Sequence  ; leftwards pushing hand: dark skin tone                         # E15.0  [1] (🫷🏿)
-1FAF8 1F3FB   ; RGI_Emoji_Modifier_Sequence  ; rightwards pushing hand: light skin tone                       # E15.0  [1] (🫸🏻)
-1FAF8 1F3FC   ; RGI_Emoji_Modifier_Sequence  ; rightwards pushing hand: medium-light skin tone                # E15.0  [1] (🫸🏼)
-1FAF8 1F3FD   ; RGI_Emoji_Modifier_Sequence  ; rightwards pushing hand: medium skin tone                      # E15.0  [1] (🫸🏽)
-1FAF8 1F3FE   ; RGI_Emoji_Modifier_Sequence  ; rightwards pushing hand: medium-dark skin tone                 # E15.0  [1] (🫸🏾)
-1FAF8 1F3FF   ; RGI_Emoji_Modifier_Sequence  ; rightwards pushing hand: dark skin tone                        # E15.0  [1] (🫸🏿)
 
-# Total elements: 655
+# Total elements: 645
 
 #EOF

admin/unidata/emoji-test.txt

@@ -1,13 +1,13 @@
 # emoji-test.txt
-# Date: 2022-08-12, 20:24:39 GMT
-# © 2022 Unicode®, Inc.
+# Date: 2021-08-26, 17:22:23 GMT
+# © 2021 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
-# For terms of use, see https://www.unicode.org/terms_of_use.html
+# For terms of use, see http://www.unicode.org/terms_of_use.html
 #
 # Emoji Keyboard/Display Test Data for UTS #51
-# Version: 15.0
+# Version: 14.0
 #
-# For documentation and usage, see https://www.unicode.org/reports/tr51
+# For documentation and usage, see http://www.unicode.org/reports/tr51
 #
 # This file provides data for testing which emoji forms should be in keyboards and which should also be displayed/processed.
 # Format: code points; status # emoji name
@@ -92,7 +92,6 @@
 1F62C                                                  ; fully-qualified     # 😬 E1.0 grimacing face
 1F62E 200D 1F4A8                                       ; fully-qualified     # 😮‍💨 E13.1 face exhaling
 1F925                                                  ; fully-qualified     # 🤥 E3.0 lying face
-1FAE8                                                  ; fully-qualified     # 🫨 E15.0 shaking face
 
 # subgroup: face-sleepy
 1F60C                                                  ; fully-qualified     # 😌 E0.6 relieved face
@@ -156,7 +155,7 @@
 
 # subgroup: face-negative
 1F624                                                  ; fully-qualified     # 😤 E0.6 face with steam from nose
-1F621                                                  ; fully-qualified     # 😡 E0.6 enraged face
+1F621                                                  ; fully-qualified     # 😡 E0.6 pouting face
 1F620                                                  ; fully-qualified     # 😠 E0.6 angry face
 1F92C                                                  ; fully-qualified     # 🤬 E5.0 face with symbols on mouth
 1F608                                                  ; fully-qualified     # 😈 E1.0 smiling face with horns
@@ -191,7 +190,8 @@
 1F649                                                  ; fully-qualified     # 🙉 E0.6 hear-no-evil monkey
 1F64A                                                  ; fully-qualified     # 🙊 E0.6 speak-no-evil monkey
 
-# subgroup: heart
+# subgroup: emotion
+1F48B                                                  ; fully-qualified     # 💋 E0.6 kiss mark
 1F48C                                                  ; fully-qualified     # 💌 E0.6 love letter
 1F498                                                  ; fully-qualified     # 💘 E0.6 heart with arrow
 1F49D                                                  ; fully-qualified     # 💝 E0.6 heart with ribbon
@@ -210,20 +210,14 @@
 2764 200D 1FA79                                        ; unqualified         # ❤‍🩹 E13.1 mending heart
 2764 FE0F                                              ; fully-qualified     # ❤️ E0.6 red heart
 2764                                                   ; unqualified         # ❤ E0.6 red heart
-1FA77                                                  ; fully-qualified     # 🩷 E15.0 pink heart
 1F9E1                                                  ; fully-qualified     # 🧡 E5.0 orange heart
 1F49B                                                  ; fully-qualified     # 💛 E0.6 yellow heart
 1F49A                                                  ; fully-qualified     # 💚 E0.6 green heart
 1F499                                                  ; fully-qualified     # 💙 E0.6 blue heart
-1FA75                                                  ; fully-qualified     # 🩵 E15.0 light blue heart
 1F49C                                                  ; fully-qualified     # 💜 E0.6 purple heart
 1F90E                                                  ; fully-qualified     # 🤎 E12.0 brown heart
 1F5A4                                                  ; fully-qualified     # 🖤 E3.0 black heart
-1FA76                                                  ; fully-qualified     # 🩶 E15.0 grey heart
 1F90D                                                  ; fully-qualified     # 🤍 E12.0 white heart
-
-# subgroup: emotion
-1F48B                                                  ; fully-qualified     # 💋 E0.6 kiss mark
 1F4AF                                                  ; fully-qualified     # 💯 E0.6 hundred points
 1F4A2                                                  ; fully-qualified     # 💢 E0.6 anger symbol
 1F4A5                                                  ; fully-qualified     # 💥 E0.6 collision
@@ -232,20 +226,21 @@
 1F4A8                                                  ; fully-qualified     # 💨 E0.6 dashing away
 1F573 FE0F                                             ; fully-qualified     # 🕳️ E0.7 hole
 1F573                                                  ; unqualified         # 🕳 E0.7 hole
+1F4A3                                                  ; fully-qualified     # 💣 E0.6 bomb
 1F4AC                                                  ; fully-qualified     # 💬 E0.6 speech balloon
 1F441 FE0F 200D 1F5E8 FE0F                             ; fully-qualified     # 👁️‍🗨️ E2.0 eye in speech bubble
 1F441 200D 1F5E8 FE0F                                  ; unqualified         # 👁‍🗨️ E2.0 eye in speech bubble
-1F441 FE0F 200D 1F5E8                                  ; minimally-qualified # 👁️‍🗨 E2.0 eye in speech bubble
+1F441 FE0F 200D 1F5E8                                  ; unqualified         # 👁️‍🗨 E2.0 eye in speech bubble
 1F441 200D 1F5E8                                       ; unqualified         # 👁‍🗨 E2.0 eye in speech bubble
 1F5E8 FE0F                                             ; fully-qualified     # 🗨️ E2.0 left speech bubble
 1F5E8                                                  ; unqualified         # 🗨 E2.0 left speech bubble
 1F5EF FE0F                                             ; fully-qualified     # 🗯️ E0.7 right anger bubble
 1F5EF                                                  ; unqualified         # 🗯 E0.7 right anger bubble
 1F4AD                                                  ; fully-qualified     # 💭 E1.0 thought balloon
-1F4A4                                                  ; fully-qualified     # 💤 E0.6 ZZZ
+1F4A4                                                  ; fully-qualified     # 💤 E0.6 zzz
 
-# Smileys & Emotion subtotal:		180
-# Smileys & Emotion subtotal:		180	w/o modifiers
+# Smileys & Emotion subtotal:		177
+# Smileys & Emotion subtotal:		177	w/o modifiers
 
 # group: People & Body
 
@@ -305,18 +300,6 @@
 1FAF4 1F3FD                                            ; fully-qualified     # 🫴🏽 E14.0 palm up hand: medium skin tone
 1FAF4 1F3FE                                            ; fully-qualified     # 🫴🏾 E14.0 palm up hand: medium-dark skin tone
 1FAF4 1F3FF                                            ; fully-qualified     # 🫴🏿 E14.0 palm up hand: dark skin tone
-1FAF7                                                  ; fully-qualified     # 🫷 E15.0 leftwards pushing hand
-1FAF7 1F3FB                                            ; fully-qualified     # 🫷🏻 E15.0 leftwards pushing hand: light skin tone
-1FAF7 1F3FC                                            ; fully-qualified     # 🫷🏼 E15.0 leftwards pushing hand: medium-light skin tone
-1FAF7 1F3FD                                            ; fully-qualified     # 🫷🏽 E15.0 leftwards pushing hand: medium skin tone
-1FAF7 1F3FE                                            ; fully-qualified     # 🫷🏾 E15.0 leftwards pushing hand: medium-dark skin tone
-1FAF7 1F3FF                                            ; fully-qualified     # 🫷🏿 E15.0 leftwards pushing hand: dark skin tone
-1FAF8                                                  ; fully-qualified     # 🫸 E15.0 rightwards pushing hand
-1FAF8 1F3FB                                            ; fully-qualified     # 🫸🏻 E15.0 rightwards pushing hand: light skin tone
-1FAF8 1F3FC                                            ; fully-qualified     # 🫸🏼 E15.0 rightwards pushing hand: medium-light skin tone
-1FAF8 1F3FD                                            ; fully-qualified     # 🫸🏽 E15.0 rightwards pushing hand: medium skin tone
-1FAF8 1F3FE                                            ; fully-qualified     # 🫸🏾 E15.0 rightwards pushing hand: medium-dark skin tone
-1FAF8 1F3FF                                            ; fully-qualified     # 🫸🏿 E15.0 rightwards pushing hand: dark skin tone
 
 # subgroup: hand-fingers-partial
 1F44C                                                  ; fully-qualified     # 👌 E0.6 OK hand
@@ -490,11 +473,11 @@
 1F932 1F3FE                                            ; fully-qualified     # 🤲🏾 E5.0 palms up together: medium-dark skin tone
 1F932 1F3FF                                            ; fully-qualified     # 🤲🏿 E5.0 palms up together: dark skin tone
 1F91D                                                  ; fully-qualified     # 🤝 E3.0 handshake
-1F91D 1F3FB                                            ; fully-qualified     # 🤝🏻 E14.0 handshake: light skin tone
-1F91D 1F3FC                                            ; fully-qualified     # 🤝🏼 E14.0 handshake: medium-light skin tone
-1F91D 1F3FD                                            ; fully-qualified     # 🤝🏽 E14.0 handshake: medium skin tone
-1F91D 1F3FE                                            ; fully-qualified     # 🤝🏾 E14.0 handshake: medium-dark skin tone
-1F91D 1F3FF                                            ; fully-qualified     # 🤝🏿 E14.0 handshake: dark skin tone
+1F91D 1F3FB                                            ; fully-qualified     # 🤝🏻 E3.0 handshake: light skin tone
+1F91D 1F3FC                                            ; fully-qualified     # 🤝🏼 E3.0 handshake: medium-light skin tone
+1F91D 1F3FD                                            ; fully-qualified     # 🤝🏽 E3.0 handshake: medium skin tone
+1F91D 1F3FE                                            ; fully-qualified     # 🤝🏾 E3.0 handshake: medium-dark skin tone
+1F91D 1F3FF                                            ; fully-qualified     # 🤝🏿 E3.0 handshake: dark skin tone
 1FAF1 1F3FB 200D 1FAF2 1F3FC                           ; fully-qualified     # 🫱🏻‍🫲🏼 E14.0 handshake: light skin tone, medium-light skin tone
 1FAF1 1F3FB 200D 1FAF2 1F3FD                           ; fully-qualified     # 🫱🏻‍🫲🏽 E14.0 handshake: light skin tone, medium skin tone
 1FAF1 1F3FB 200D 1FAF2 1F3FE                           ; fully-qualified     # 🫱🏻‍🫲🏾 E14.0 handshake: light skin tone, medium-dark skin tone
@@ -1472,7 +1455,7 @@
 1F575 1F3FF                                            ; fully-qualified     # 🕵🏿 E2.0 detective: dark skin tone
 1F575 FE0F 200D 2642 FE0F                              ; fully-qualified     # 🕵️‍♂️ E4.0 man detective
 1F575 200D 2642 FE0F                                   ; unqualified         # 🕵‍♂️ E4.0 man detective
-1F575 FE0F 200D 2642                                   ; minimally-qualified # 🕵️‍♂ E4.0 man detective
+1F575 FE0F 200D 2642                                   ; unqualified         # 🕵️‍♂ E4.0 man detective
 1F575 200D 2642                                        ; unqualified         # 🕵‍♂ E4.0 man detective
 1F575 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🕵🏻‍♂️ E4.0 man detective: light skin tone
 1F575 1F3FB 200D 2642                                  ; minimally-qualified # 🕵🏻‍♂ E4.0 man detective: light skin tone
@@ -1486,7 +1469,7 @@
 1F575 1F3FF 200D 2642                                  ; minimally-qualified # 🕵🏿‍♂ E4.0 man detective: dark skin tone
 1F575 FE0F 200D 2640 FE0F                              ; fully-qualified     # 🕵️‍♀️ E4.0 woman detective
 1F575 200D 2640 FE0F                                   ; unqualified         # 🕵‍♀️ E4.0 woman detective
-1F575 FE0F 200D 2640                                   ; minimally-qualified # 🕵️‍♀ E4.0 woman detective
+1F575 FE0F 200D 2640                                   ; unqualified         # 🕵️‍♀ E4.0 woman detective
 1F575 200D 2640                                        ; unqualified         # 🕵‍♀ E4.0 woman detective
 1F575 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🕵🏻‍♀️ E4.0 woman detective: light skin tone
 1F575 1F3FB 200D 2640                                  ; minimally-qualified # 🕵🏻‍♀ E4.0 woman detective: light skin tone
@@ -2319,7 +2302,7 @@
 1F3CC 1F3FF                                            ; fully-qualified     # 🏌🏿 E4.0 person golfing: dark skin tone
 1F3CC FE0F 200D 2642 FE0F                              ; fully-qualified     # 🏌️‍♂️ E4.0 man golfing
 1F3CC 200D 2642 FE0F                                   ; unqualified         # 🏌‍♂️ E4.0 man golfing
-1F3CC FE0F 200D 2642                                   ; minimally-qualified # 🏌️‍♂ E4.0 man golfing
+1F3CC FE0F 200D 2642                                   ; unqualified         # 🏌️‍♂ E4.0 man golfing
 1F3CC 200D 2642                                        ; unqualified         # 🏌‍♂ E4.0 man golfing
 1F3CC 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🏌🏻‍♂️ E4.0 man golfing: light skin tone
 1F3CC 1F3FB 200D 2642                                  ; minimally-qualified # 🏌🏻‍♂ E4.0 man golfing: light skin tone
@@ -2333,7 +2316,7 @@
 1F3CC 1F3FF 200D 2642                                  ; minimally-qualified # 🏌🏿‍♂ E4.0 man golfing: dark skin tone
 1F3CC FE0F 200D 2640 FE0F                              ; fully-qualified     # 🏌️‍♀️ E4.0 woman golfing
 1F3CC 200D 2640 FE0F                                   ; unqualified         # 🏌‍♀️ E4.0 woman golfing
-1F3CC FE0F 200D 2640                                   ; minimally-qualified # 🏌️‍♀ E4.0 woman golfing
+1F3CC FE0F 200D 2640                                   ; unqualified         # 🏌️‍♀ E4.0 woman golfing
 1F3CC 200D 2640                                        ; unqualified         # 🏌‍♀ E4.0 woman golfing
 1F3CC 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🏌🏻‍♀️ E4.0 woman golfing: light skin tone
 1F3CC 1F3FB 200D 2640                                  ; minimally-qualified # 🏌🏻‍♀ E4.0 woman golfing: light skin tone
@@ -2444,7 +2427,7 @@
 26F9 1F3FF                                             ; fully-qualified     # ⛹🏿 E2.0 person bouncing ball: dark skin tone
 26F9 FE0F 200D 2642 FE0F                               ; fully-qualified     # ⛹️‍♂️ E4.0 man bouncing ball
 26F9 200D 2642 FE0F                                    ; unqualified         # ⛹‍♂️ E4.0 man bouncing ball
-26F9 FE0F 200D 2642                                    ; minimally-qualified # ⛹️‍♂ E4.0 man bouncing ball
+26F9 FE0F 200D 2642                                    ; unqualified         # ⛹️‍♂ E4.0 man bouncing ball
 26F9 200D 2642                                         ; unqualified         # ⛹‍♂ E4.0 man bouncing ball
 26F9 1F3FB 200D 2642 FE0F                              ; fully-qualified     # ⛹🏻‍♂️ E4.0 man bouncing ball: light skin tone
 26F9 1F3FB 200D 2642                                   ; minimally-qualified # ⛹🏻‍♂ E4.0 man bouncing ball: light skin tone
@@ -2458,7 +2441,7 @@
 26F9 1F3FF 200D 2642                                   ; minimally-qualified # ⛹🏿‍♂ E4.0 man bouncing ball: dark skin tone
 26F9 FE0F 200D 2640 FE0F                               ; fully-qualified     # ⛹️‍♀️ E4.0 woman bouncing ball
 26F9 200D 2640 FE0F                                    ; unqualified         # ⛹‍♀️ E4.0 woman bouncing ball
-26F9 FE0F 200D 2640                                    ; minimally-qualified # ⛹️‍♀ E4.0 woman bouncing ball
+26F9 FE0F 200D 2640                                    ; unqualified         # ⛹️‍♀ E4.0 woman bouncing ball
 26F9 200D 2640                                         ; unqualified         # ⛹‍♀ E4.0 woman bouncing ball
 26F9 1F3FB 200D 2640 FE0F                              ; fully-qualified     # ⛹🏻‍♀️ E4.0 woman bouncing ball: light skin tone
 26F9 1F3FB 200D 2640                                   ; minimally-qualified # ⛹🏻‍♀ E4.0 woman bouncing ball: light skin tone
@@ -2479,7 +2462,7 @@
 1F3CB 1F3FF                                            ; fully-qualified     # 🏋🏿 E2.0 person lifting weights: dark skin tone
 1F3CB FE0F 200D 2642 FE0F                              ; fully-qualified     # 🏋️‍♂️ E4.0 man lifting weights
 1F3CB 200D 2642 FE0F                                   ; unqualified         # 🏋‍♂️ E4.0 man lifting weights
-1F3CB FE0F 200D 2642                                   ; minimally-qualified # 🏋️‍♂ E4.0 man lifting weights
+1F3CB FE0F 200D 2642                                   ; unqualified         # 🏋️‍♂ E4.0 man lifting weights
 1F3CB 200D 2642                                        ; unqualified         # 🏋‍♂ E4.0 man lifting weights
 1F3CB 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🏋🏻‍♂️ E4.0 man lifting weights: light skin tone
 1F3CB 1F3FB 200D 2642                                  ; minimally-qualified # 🏋🏻‍♂ E4.0 man lifting weights: light skin tone
@@ -2493,7 +2476,7 @@
 1F3CB 1F3FF 200D 2642                                  ; minimally-qualified # 🏋🏿‍♂ E4.0 man lifting weights: dark skin tone
 1F3CB FE0F 200D 2640 FE0F                              ; fully-qualified     # 🏋️‍♀️ E4.0 woman lifting weights
 1F3CB 200D 2640 FE0F                                   ; unqualified         # 🏋‍♀️ E4.0 woman lifting weights
-1F3CB FE0F 200D 2640                                   ; minimally-qualified # 🏋️‍♀ E4.0 woman lifting weights
+1F3CB FE0F 200D 2640                                   ; unqualified         # 🏋️‍♀ E4.0 woman lifting weights
 1F3CB 200D 2640                                        ; unqualified         # 🏋‍♀ E4.0 woman lifting weights
 1F3CB 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🏋🏻‍♀️ E4.0 woman lifting weights: light skin tone
 1F3CB 1F3FB 200D 2640                                  ; minimally-qualified # 🏋🏻‍♀ E4.0 woman lifting weights: light skin tone
@@ -3279,8 +3262,8 @@
 1FAC2                                                  ; fully-qualified     # 🫂 E13.0 people hugging
 1F463                                                  ; fully-qualified     # 👣 E0.6 footprints
 
-# People & Body subtotal:		2998
-# People & Body subtotal:		508	w/o modifiers
+# People & Body subtotal:		2986
+# People & Body subtotal:		506	w/o modifiers
 
 # group: Component
 
@@ -3323,8 +3306,6 @@
 1F405                                                  ; fully-qualified     # 🐅 E1.0 tiger
 1F406                                                  ; fully-qualified     # 🐆 E1.0 leopard
 1F434                                                  ; fully-qualified     # 🐴 E0.6 horse face
-1FACE                                                  ; fully-qualified     # 🫎 E15.0 moose
-1FACF                                                  ; fully-qualified     # 🫏 E15.0 donkey
 1F40E                                                  ; fully-qualified     # 🐎 E0.6 horse
 1F984                                                  ; fully-qualified     # 🦄 E1.0 unicorn
 1F993                                                  ; fully-qualified     # 🦓 E5.0 zebra
@@ -3392,9 +3373,6 @@
 1F9A9                                                  ; fully-qualified     # 🦩 E12.0 flamingo
 1F99A                                                  ; fully-qualified     # 🦚 E11.0 peacock
 1F99C                                                  ; fully-qualified     # 🦜 E11.0 parrot
-1FABD                                                  ; fully-qualified     # 🪽 E15.0 wing
-1F426 200D 2B1B                                        ; fully-qualified     # 🐦‍⬛ E15.0 black bird
-1FABF                                                  ; fully-qualified     # 🪿 E15.0 goose
 
 # subgroup: animal-amphibian
 1F438                                                  ; fully-qualified     # 🐸 E0.6 frog
@@ -3421,7 +3399,6 @@
 1F419                                                  ; fully-qualified     # 🐙 E0.6 octopus
 1F41A                                                  ; fully-qualified     # 🐚 E0.6 spiral shell
 1FAB8                                                  ; fully-qualified     # 🪸 E14.0 coral
-1FABC                                                  ; fully-qualified     # 🪼 E15.0 jellyfish
 
 # subgroup: animal-bug
 1F40C                                                  ; fully-qualified     # 🐌 E0.6 snail
@@ -3456,7 +3433,6 @@
 1F33B                                                  ; fully-qualified     # 🌻 E0.6 sunflower
 1F33C                                                  ; fully-qualified     # 🌼 E0.6 blossom
 1F337                                                  ; fully-qualified     # 🌷 E0.6 tulip
-1FABB                                                  ; fully-qualified     # 🪻 E15.0 hyacinth
 
 # subgroup: plant-other
 1F331                                                  ; fully-qualified     # 🌱 E0.6 seedling
@@ -3475,10 +3451,9 @@
 1F343                                                  ; fully-qualified     # 🍃 E0.6 leaf fluttering in wind
 1FAB9                                                  ; fully-qualified     # 🪹 E14.0 empty nest
 1FABA                                                  ; fully-qualified     # 🪺 E14.0 nest with eggs
-1F344                                                  ; fully-qualified     # 🍄 E0.6 mushroom
 
-# Animals & Nature subtotal:		159
-# Animals & Nature subtotal:		159	w/o modifiers
+# Animals & Nature subtotal:		151
+# Animals & Nature subtotal:		151	w/o modifiers
 
 # group: Food & Drink
 
@@ -3517,11 +3492,10 @@
 1F966                                                  ; fully-qualified     # 🥦 E5.0 broccoli
 1F9C4                                                  ; fully-qualified     # 🧄 E12.0 garlic
 1F9C5                                                  ; fully-qualified     # 🧅 E12.0 onion
+1F344                                                  ; fully-qualified     # 🍄 E0.6 mushroom
 1F95C                                                  ; fully-qualified     # 🥜 E3.0 peanuts
 1FAD8                                                  ; fully-qualified     # 🫘 E14.0 beans
 1F330                                                  ; fully-qualified     # 🌰 E0.6 chestnut
-1FADA                                                  ; fully-qualified     # 🫚 E15.0 ginger root
-1FADB                                                  ; fully-qualified     # 🫛 E15.0 pea pod
 
 # subgroup: food-prepared
 1F35E                                                  ; fully-qualified     # 🍞 E0.6 bread
@@ -3633,8 +3607,8 @@
 1FAD9                                                  ; fully-qualified     # 🫙 E14.0 jar
 1F3FA                                                  ; fully-qualified     # 🏺 E1.0 amphora
 
-# Food & Drink subtotal:		135
-# Food & Drink subtotal:		135	w/o modifiers
+# Food & Drink subtotal:		134
+# Food & Drink subtotal:		134	w/o modifiers
 
 # group: Travel & Places
 
@@ -4000,10 +3974,11 @@
 1F3AF                                                  ; fully-qualified     # 🎯 E0.6 bullseye
 1FA80                                                  ; fully-qualified     # 🪀 E12.0 yo-yo
 1FA81                                                  ; fully-qualified     # 🪁 E12.0 kite
-1F52B                                                  ; fully-qualified     # 🔫 E0.6 water pistol
 1F3B1                                                  ; fully-qualified     # 🎱 E0.6 pool 8 ball
 1F52E                                                  ; fully-qualified     # 🔮 E0.6 crystal ball
 1FA84                                                  ; fully-qualified     # 🪄 E13.0 magic wand
+1F9FF                                                  ; fully-qualified     # 🧿 E11.0 nazar amulet
+1FAAC                                                  ; fully-qualified     # 🪬 E14.0 hamsa
 1F3AE                                                  ; fully-qualified     # 🎮 E0.6 video game
 1F579 FE0F                                             ; fully-qualified     # 🕹️ E0.7 joystick
 1F579                                                  ; unqualified         # 🕹 E0.7 joystick
@@ -4038,8 +4013,8 @@
 1F9F6                                                  ; fully-qualified     # 🧶 E11.0 yarn
 1FAA2                                                  ; fully-qualified     # 🪢 E13.0 knot
 
-# Activities subtotal:		96
-# Activities subtotal:		96	w/o modifiers
+# Activities subtotal:		97
+# Activities subtotal:		97	w/o modifiers
 
 # group: Objects
 
@@ -4065,7 +4040,6 @@
 1FA73                                                  ; fully-qualified     # 🩳 E12.0 shorts
 1F459                                                  ; fully-qualified     # 👙 E0.6 bikini
 1F45A                                                  ; fully-qualified     # 👚 E0.6 woman’s clothes
-1FAAD                                                  ; fully-qualified     # 🪭 E15.0 folding hand fan
 1F45B                                                  ; fully-qualified     # 👛 E0.6 purse
 1F45C                                                  ; fully-qualified     # 👜 E0.6 handbag
 1F45D                                                  ; fully-qualified     # 👝 E0.6 clutch bag
@@ -4081,7 +4055,6 @@
 1F461                                                  ; fully-qualified     # 👡 E0.6 woman’s sandal
 1FA70                                                  ; fully-qualified     # 🩰 E12.0 ballet shoes
 1F462                                                  ; fully-qualified     # 👢 E0.6 woman’s boot
-1FAAE                                                  ; fully-qualified     # 🪮 E15.0 hair pick
 1F451                                                  ; fully-qualified     # 👑 E0.6 crown
 1F452                                                  ; fully-qualified     # 👒 E0.6 woman’s hat
 1F3A9                                                  ; fully-qualified     # 🎩 E0.6 top hat
@@ -4130,8 +4103,6 @@
 1FA95                                                  ; fully-qualified     # 🪕 E12.0 banjo
 1F941                                                  ; fully-qualified     # 🥁 E3.0 drum
 1FA98                                                  ; fully-qualified     # 🪘 E13.0 long drum
-1FA87                                                  ; fully-qualified     # 🪇 E15.0 maracas
-1FA88                                                  ; fully-qualified     # 🪈 E15.0 flute
 
 # subgroup: phone
 1F4F1                                                  ; fully-qualified     # 📱 E0.6 mobile phone
@@ -4304,7 +4275,7 @@
 1F5E1                                                  ; unqualified         # 🗡 E0.7 dagger
 2694 FE0F                                              ; fully-qualified     # ⚔️ E1.0 crossed swords
 2694                                                   ; unqualified         # ⚔ E1.0 crossed swords
-1F4A3                                                  ; fully-qualified     # 💣 E0.6 bomb
+1F52B                                                  ; fully-qualified     # 🔫 E0.6 water pistol
 1FA83                                                  ; fully-qualified     # 🪃 E13.0 boomerang
 1F3F9                                                  ; fully-qualified     # 🏹 E1.0 bow and arrow
 1F6E1 FE0F                                             ; fully-qualified     # 🛡️ E0.7 shield
@@ -4383,14 +4354,12 @@
 1FAA6                                                  ; fully-qualified     # 🪦 E13.0 headstone
 26B1 FE0F                                              ; fully-qualified     # ⚱️ E1.0 funeral urn
 26B1                                                   ; unqualified         # ⚱ E1.0 funeral urn
-1F9FF                                                  ; fully-qualified     # 🧿 E11.0 nazar amulet
-1FAAC                                                  ; fully-qualified     # 🪬 E14.0 hamsa
 1F5FF                                                  ; fully-qualified     # 🗿 E0.6 moai
 1FAA7                                                  ; fully-qualified     # 🪧 E13.0 placard
 1FAAA                                                  ; fully-qualified     # 🪪 E14.0 identification card
 
-# Objects subtotal:		310
-# Objects subtotal:		310	w/o modifiers
+# Objects subtotal:		304
+# Objects subtotal:		304	w/o modifiers
 
 # group: Symbols
 
@@ -4486,7 +4455,6 @@
 262E                                                   ; unqualified         # ☮ E1.0 peace symbol
 1F54E                                                  ; fully-qualified     # 🕎 E1.0 menorah
 1F52F                                                  ; fully-qualified     # 🔯 E0.6 dotted six-pointed star
-1FAAF                                                  ; fully-qualified     # 🪯 E15.0 khanda
 
 # subgroup: zodiac
 2648                                                   ; fully-qualified     # ♈ E0.6 Aries
@@ -4535,7 +4503,6 @@
 1F505                                                  ; fully-qualified     # 🔅 E1.0 dim button
 1F506                                                  ; fully-qualified     # 🔆 E1.0 bright button
 1F4F6                                                  ; fully-qualified     # 📶 E0.6 antenna bars
-1F6DC                                                  ; fully-qualified     # 🛜 E15.0 wireless
 1F4F3                                                  ; fully-qualified     # 📳 E0.6 vibration mode
 1F4F4                                                  ; fully-qualified     # 📴 E0.6 mobile phone off
 
@@ -4726,8 +4693,8 @@
 1F533                                                  ; fully-qualified     # 🔳 E0.6 white square button
 1F532                                                  ; fully-qualified     # 🔲 E0.6 black square button
 
-# Symbols subtotal:		304
-# Symbols subtotal:		304	w/o modifiers
+# Symbols subtotal:		302
+# Symbols subtotal:		302	w/o modifiers
 
 # group: Flags
 
@@ -4742,7 +4709,7 @@
 1F3F3 200D 1F308                                       ; unqualified         # 🏳‍🌈 E4.0 rainbow flag
 1F3F3 FE0F 200D 26A7 FE0F                              ; fully-qualified     # 🏳️‍⚧️ E13.0 transgender flag
 1F3F3 200D 26A7 FE0F                                   ; unqualified         # 🏳‍⚧️ E13.0 transgender flag
-1F3F3 FE0F 200D 26A7                                   ; minimally-qualified # 🏳️‍⚧ E13.0 transgender flag
+1F3F3 FE0F 200D 26A7                                   ; unqualified         # 🏳️‍⚧ E13.0 transgender flag
 1F3F3 200D 26A7                                        ; unqualified         # 🏳‍⚧ E13.0 transgender flag
 1F3F4 200D 2620 FE0F                                   ; fully-qualified     # 🏴‍☠️ E11.0 pirate flag
 1F3F4 200D 2620                                        ; minimally-qualified # 🏴‍☠ E11.0 pirate flag
@@ -5016,9 +4983,9 @@
 # Flags subtotal:		275	w/o modifiers
 
 # Status Counts
-# fully-qualified : 3655
-# minimally-qualified : 827
-# unqualified : 242
+# fully-qualified : 3624
+# minimally-qualified : 817
+# unqualified : 252
 # component : 9
 
 #EOF

admin/unidata/emoji-zwj-sequences.txt

@@ -1,13 +1,13 @@
 # emoji-zwj-sequences.txt
-# Date: 2022-05-06, 16:14:52 GMT
-# © 2022 Unicode®, Inc.
+# Date: 2021-06-08, 05:19:16 GMT
+# © 2021 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
-# For terms of use, see https://www.unicode.org/terms_of_use.html
+# For terms of use, see http://www.unicode.org/terms_of_use.html
 #
 # Emoji ZWJ Sequences for UTS #51
-# Version: 15.0
+# Version: 14.0
 #
-# For documentation and usage, see https://www.unicode.org/reports/tr51
+# For documentation and usage, see http://www.unicode.org/reports/tr51
 #
 # Format:
 #   code_point(s) ; type_field ; description # comments
@@ -1398,7 +1398,6 @@
 1F3F4 200D 2620 FE0F                        ; RGI_Emoji_ZWJ_Sequence  ; pirate flag                                                    # E11.0  [1] (🏴‍☠️)
 1F408 200D 2B1B                             ; RGI_Emoji_ZWJ_Sequence  ; black cat                                                      # E13.0  [1] (🐈‍⬛)
 1F415 200D 1F9BA                            ; RGI_Emoji_ZWJ_Sequence  ; service dog                                                    # E12.0  [1] (🐕‍🦺)
-1F426 200D 2B1B                             ; RGI_Emoji_ZWJ_Sequence  ; black bird                                                     # E15.0  [1] (🐦‍⬛)
 1F43B 200D 2744 FE0F                        ; RGI_Emoji_ZWJ_Sequence  ; polar bear                                                     # E13.0  [1] (🐻‍❄️)
 1F441 FE0F 200D 1F5E8 FE0F                  ; RGI_Emoji_ZWJ_Sequence  ; eye in speech bubble                                           # E2.0   [1] (👁️‍🗨️)
 1F62E 200D 1F4A8                            ; RGI_Emoji_ZWJ_Sequence  ; face exhaling                                                  # E13.1  [1] (😮‍💨)
@@ -1406,6 +1405,6 @@
 1F636 200D 1F32B FE0F                       ; RGI_Emoji_ZWJ_Sequence  ; face in clouds                                                 # E13.1  [1] (😶‍🌫️)
 1F9D1 200D 1F384                            ; RGI_Emoji_ZWJ_Sequence  ; mx claus                                                       # E13.0  [1] (🧑‍🎄)
 
-# Total elements: 14
+# Total elements: 13
 
 #EOF

admin/unidata/emoji-zwj.awk

@@ -1,6 +1,6 @@
 #!/usr/bin/awk -f
 
-## Copyright (C) 2020, 2022-2023 Free Software Foundation, Inc.
+## Copyright (C) 2020, 2022 Free Software Foundation, Inc.
 
 ## Author: Robert Pluim <rpluim@gmail.com>
 

admin/unidata/unidata-gen.el

@@ -1,6 +1,6 @@
 ;;; unidata-gen.el --- Create files containing character property data  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2008-2023 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2022 Free Software Foundation, Inc.
 
 ;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
@@ -212,12 +212,12 @@ Property value is one of the following symbols:
       ;; Character Database (UCD).
       (L (#x0600 #x07BF AL) (#x0860 #x08FF AL) (#xFB50 #xFDCF AL)
          (#xFDF0 #xFDFF AL) (#xFE70 #xFEFF AL) (#x10D00 #x10D3F AL)
-         (#x10EC0 #x10EFF AL) (#x10F30 #x10F6F AL) (#x1EC70 #x1ECBF AL)
-         (#x1ED00 #x1ED4F AL) (#x1EE00 #x1EEFF AL)
+         (#x10F30 #x10F6F AL) (#x1EC70 #x1ECBF AL) (#x1ED00 #x1ED4F AL)
+         (#x1EE00 #x1EEFF AL)
 	 (#x0590 #x05FF R) (#x07C0 #x085F R) (#xFB1D #xFB4F R)
-         (#x10800 #x10CFF R) (#x10D40 #x10EBF R) (#x10F00 #x10F2F R)
-         (#x10F70 #x10FFF R) (#x1E800 #x1EC6F R) (#x1ECC0 #x1ECFF R)
-         (#x1ED50 #x1EDFF R) (#x1EF00 #x1EFFF R)
+         (#x10800 #x10CFF R) (#x10D40 #x10F2F R) (#x10F70 #x10FFF R)
+         (#x1E800 #x1EC6F R) (#x1ECC0 #x1ECFF R) (#x1ED50 #x1EDFF R)
+         (#x1EF00 #x1EFFF R)
          (#x20A0 #x20CF ET))
       ;; The order of elements must be in sync with bidi_type_t in
       ;; src/dispextern.h.
@@ -1083,8 +1083,8 @@ Property value is a symbol `o' (Open), `c' (Close), or `n' (None)."
 
 (defun unidata--ensure-compiled (&rest funcs)
   (dolist (fun funcs)
-    (unless (compiled-function-p (symbol-function fun))
-      (byte-compile fun))))
+    (or (byte-code-function-p (symbol-function fun))
+	(byte-compile fun))))
 
 (defun unidata-gen-table-name (prop index &rest _ignore)
   (let* ((table (unidata-gen-table-word-list prop index 'unidata-split-name))

admin/unidata/uvs.el

@@ -1,6 +1,6 @@
 ;;; uvs.el --- utility for UVS (format 14) cmap subtables in OpenType fonts  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2014-2023 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2022 Free Software Foundation, Inc.
 
 ;; Author: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
 

admin/update-copyright

@@ -7,7 +7,7 @@
 # By default, this script uses the local-time calendar year.
 # Set the UPDATE_COPYRIGHT_YEAR environment variable to override the default.
 
-# Copyright 2013-2023 Free Software Foundation, Inc.
+# Copyright 2013-2022 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -31,8 +31,6 @@
 # updated and some should not be, due to registration numbers, so
 # this script leaves these copyright years alone for now.
 
-set -o nounset
-
 : ${UPDATE_COPYRIGHT_USE_INTERVALS=1}
 export UPDATE_COPYRIGHT_USE_INTERVALS