Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

9 files changed, 775 insertions, 335 deletions

diff --git a/admin/admin.el b/admin/admin.el
index 5428e3a10bc..e81e7f1e7e1 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -655,7 +655,10 @@ style=\"text-align:left\">")
     ("@GZIP_PROG@" . "gzip")
     ("@INSTALL@" . "install -c")
     ("@INSTALL_DATA@" . "${INSTALL} -m 644")
-    ("@configure_input@" . ""))
+    ("@configure_input@" . "")
+    ("@AM_DEFAULT_VERBOSITY@" . "0")
+    ("@AM_V@" . "${V}")
+    ("@AM_DEFAULT_V@" . "${AM_DEFAULT_VERBOSITY}"))
   "Alist of (REGEXP . REPLACEMENT) pairs for `make-manuals-dist'.")
 
 (defun make-manuals-dist--1 (root type)
@@ -675,7 +678,9 @@ style=\"text-align:left\">")
         (delete-directory stem t))
     (make-directory stem)
     (copy-file "../doc/misc/texinfo.tex" stem)
-    (or (equal type "emacs") (copy-file "../doc/emacs/emacsver.texi" stem))
+    (unless (equal type "emacs")
+      (copy-file "../doc/emacs/emacsver.texi" stem)
+      (copy-file "../doc/emacs/docstyle.texi" stem))
     (dolist (file (directory-files (format "../doc/%s" type) t))
       (if (or (string-match-p "\\(\\.texi\\'\\|/README\\'\\)" file)
               (and (equal type "lispintro")
diff --git a/admin/authors.el b/admin/authors.el
index d8f56fd9258..86d42be8dc6 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2000-2017 Free Software Foundation, Inc.
 
 ;; Author: Gerd Moellmann <gerd@gnu.org>
-;; Maintainer: Kim F. Storm <storm@cua.dk>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: maint
 ;; Package: emacs
 
@@ -27,9 +27,6 @@
 ;; Use M-x authors RET to create an *Authors* buffer that can used as
 ;; or merged with Emacs's AUTHORS file.
 
-;; FIXME: This needs to modernized in the light of current practice,
-;; which generates a single top-level ChangeLog file from commit logs.
-
 ;;; Code:
 
 (defvar authors-coding-system 'utf-8
@@ -81,6 +78,7 @@ files.")
     ("François Pinard" "Francois Pinard")
     ("Francesco Potortì" "Francesco Potorti" "Francesco Potorti`")
     ("Frederic Pierresteguy" "Fred Pierresteguy")
+    (nil "^FSF")
     ("Gerd Möllmann" "Gerd Moellmann")
     ("Hallvard B. Furuseth" "Hallvard B Furuseth" "Hallvard Furuseth")
     ("Hrvoje Nikšić" "Hrvoje Niksic")
@@ -141,6 +139,7 @@ files.")
     ("Peter J. Weisberg" "PJ Weisberg")
     ("Peter S. Galbraith" "Peter S Galbraith" "Peter Galbraith")
     ("Peter Runestig" "Peter 'luna' Runestig")
+    ("Philipp Stephani" "Philipp .*phst@google")
     ("Piotr Zieliński" "Piotr Zielinski")
     ("Przemysław Wojnowski" "Przemyslaw Wojnowski")
     ("Rainer Schöpf" "Rainer Schoepf")
@@ -154,6 +153,7 @@ files.")
     ("Roland B. Roberts" "Roland B Roberts" "Roland Roberts")
     ("Ron Schnell" "Ronnie Schnell")
     ("Rui-Tao Dong" "Rui-Tao Dong ~{6-HpLN~}")
+    ("Ryan Thompson" "Ryan .*rct@thompsonclan")
     ("Sacha Chua" "Sandra Jean Chua")
     ("Sam Steingold" "Sam Shteingold")
     ("Satyaki Das" "Indexed search by Satyaki Das")
@@ -170,6 +170,7 @@ files.")
     ("Takaaki Ota" "Tak Ota")
     ("Takahashi Naoto" "Naoto Takahashi")
     ("Teodor Zlatanov" "Ted Zlatanov")
+    (nil "The PCL-CVS Trust")
     ("Thomas Dye" "Tom Dye")
     ("Thomas Horsley" "Tom Horsley")    ; FIXME ?
     ("Thomas Wurgler" "Tom Wurgler")
@@ -209,7 +210,7 @@ If REALNAME is nil, ignore that author.")
     "David O'Toole"
     "Devon Sean McCullough"
     "Dominique de Waleffe"
-    "Edward O'Connor"
+    "Theresa O'Connor"
     "Exal de Jesus Garcia Carrillo"
     "George McNinch"
     "Greg McGary"
@@ -261,7 +262,13 @@ If REALNAME is nil, ignore that author.")
     "\\.\\(bzr\\|cvs\\|git\\)ignore$"           ; obsolete or uninteresting
     "\\.arch-inventory$"
     "ChangeLog\\(\\.[0-9]+\\)?\\'"
-    "automated/data/"              ; not interesting
+    "\\(automated\\|test\\)/data/"      ; not interesting
+    "cedet/tests/"
+    "test/etags/"
+    "\\`\\(indent\\|automated\\)\\'" "indent/" "mod-test/"
+    "-resources/"
+    "unidata/.*\\.txt\\'"
+    "BidiCharacterTest.txt"
     ;; TODO lib/? Matches other things?
     "build-aux/" "m4/" "Emacs.xcodeproj" "mapfiles" "\\.map\\'"
     "preferences\\.\\(nib\\|gorm\\)"
@@ -273,7 +280,8 @@ Changes to files matching one of the regexps in this list are not listed.")
 
 (defconst authors-no-scan-regexps
   '("etc/nxml/"
-    "automated/data/")
+    "test/data/"
+    "test/.*-resources/")
   "Lists of regexps matching files not to scan for authorship.")
 
 (defconst authors-ignored-files
@@ -315,6 +323,7 @@ Changes to files matching one of the regexps in this list are not listed.")
     "*.el"
     ;; Autogen:
     "cus-load.el" "finder-inf.el" "ldefs-boot.el" "loaddefs-boot.el"
+    "lisp/ldefs-boot-manual.el" "lisp/ldefs-boot-auto.el"
     "compile" "config.guess" "config.sub" "depcomp"
     "autogen/compile" "autogen/config.guess" "autogen/config.in"
     "autogen/config.sub" "autogen/depcomp" "autogen/install-sh"
@@ -384,10 +393,12 @@ Changes to files matching one of the regexps in this list are not listed.")
     ;; Not in gnulib anymore
     "lib/qset-acl.c" "lib/qcopy-acl.c" "lib/file-has-acl.c"
     ;; files from old MS Windows build procedures
+    "nt/gnulib-modules-to-delete.cfg"
     "makefile.w32-in"
     "admin/unidata/makefile.w32-in"
     "unidata/makefile.w32-in"
     "lib/makefile.w32-in"
+    "lib-src/makefile.w32-in"
     "leim/makefile.w32-in"
     "lisp/makefile.w32-in"
     "src/makefile.w32-in"
@@ -401,12 +412,13 @@ Changes to files matching one of the regexps in this list are not listed.")
     "src/paths.h"
     "envadd.bat"
     "multi-install-info.bat"
-    "INSTALL.OLD"
+    "INSTALL.OLD" "nt/INSTALL.OLD"
     "nt/src/paths.h"
     "nmake.defs"
     "gmake.defs"
     "zipdist.bat"
     "nt/makefile.w32-in"
+    "nt/subdirs.el"
     "config.nt"
     "nextstep/WISHLIST"
     )
@@ -652,9 +664,11 @@ Changes to files in this list are not listed.")
     "configure" "config.h"
     "is_exec.c" "sigaction.c"
     ;; nt/
-    "ebuild.bat" "install.bat" "fast-install.bat"
+    "config.nt" "gmake.defs" "gnulib.mk" "nmake.defs"
+    "ebuild.bat" "envadd.bat" "fast-install.bat" "install.bat"
+    "multi-install-info.bat" "zipdist.bat"
     "debug.bat.in" "emacs.bat.in" "addsection.c"
-    "inc/sys/dir.h" "inc/gettext.h"
+    "inc/sys/dir.h" "inc/gettext.h" "nt/inc/socket.h"
     "time.h"
     ".gdbinit-union"
     "alloca.s"
@@ -693,6 +707,7 @@ Changes to files in this list are not listed.")
     "images/gnus/reverse-smile.xpm"
     "notes/commits" "notes/changelogs"
     "revdiff"                           ; admin/
+    "admin/ldefs-clean.el"
     "vcdiff" "rcs-checkin" "tindex.pl"
     "mainmake" "sed1.inp" "sed2.inp" "sed3.inp" ; msdos/
     "mac-fix-env.m"
@@ -733,7 +748,10 @@ Changes to files in this list are not listed.")
     "dns-mode.el" "run-at-time.el" "gnus-encrypt.el" "sha1-el.el"
     "gnus-gl.el" "gnus.sum.el" "proto-stream.el" "color.el" "color-lab.el"
     "eww.el" "shr-color.el" "shr.el" "earcon.el" "gnus-audio.el" "encrypt.el"
-    "format-spec.el" "gnus-move.el"
+    "format-spec.el" "gnus-move.el" "gnus-sync.el"
+    "auth-source.el" "ecomplete.el" "gravatar.el" "mailcap.el" "plstore.el"
+    "pop3.el" "qp.el" "registry.el" "rfc2231.el" "rtree.el"
+    "sieve.el" "sieve-mode.el"
     ;; doc
     "getopt.c" "texindex.c" "news.texi" "vc.texi" "vc2-xtra.texi"
     "back.texi" "vol1.texi" "vol2.texi" "elisp-covers.texi" "two.el"
@@ -747,7 +765,11 @@ Changes to files in this list are not listed.")
     ;; lib/
     "lib/stdio.c" "lib/gl_openssl.h" "lib/sigprocmask.c"
     "lib/pthread_sigprocmask.c" "lib/ldtoastr.c" "lib/dummy.c"
-    "lib/ignore-value.h"
+    "lib/ignore-value.h" "lib/Makefile.am"
+    "lib/pathmax.h" "lib/stat.c" "lib/strtoul.c" "lib/strtoull.c"
+    "lib/strtoumax.c" "lib/unsetenv.c"
+    "lib/getopt_cdefs.in.h" "lib/getopt_core.h" "lib/getopt_ext.h"
+    "lib/getopt_pfx_core.h" "lib/getopt_pfx_ext.h"
     ;; lib-src/
     "cvtmail.c" "digest-doc.c" "emacsserver.c" "emacstool.c" "env.c"
     "etags-vmslib.c" "fakemail.c" "getdate.c" "getopt.h" "getopt1.c"
@@ -763,11 +785,22 @@ Changes to files in this list are not listed.")
     "emacsclient.c" "etags.c" "hexl.c" "make-docfile.c" "movemail.c"
     "test-distrib.c" "testfile"
     "tpu-edt.doc"                       ; see below
+    "iso-swed.el"
+    "lisp/obsolete/vc-mcvs.el"
     "obsolete/vc-mcvs.el"
     "nnwarchive.el"
     "nnultimate.el"
     "nnslashdot.el"
+    "keyswap.el"
+    "mouse-sel.el"
+    "nxml-glyph.el"
+    "tramp-gw.el"
     "webmail.el"
+    "biditest.el"
+    "redisplay-testsuite.el"
+    "cedet-utests.el" "ede-tests.el" "semantic-ia-utest.el"
+    "semantic-tests.el" "semantic-utest-c.el" "semantic-utest.el"
+    "srecode-tests.el" "make-test-deps.emacs-lisp"
     )
   "File names which are valid, but no longer exist (or cannot be found)
 in the repository.")
@@ -879,11 +912,16 @@ in the repository.")
     ;; From lisp/ to etc/nxml.
     ("nxml/test.invalid.xml" . "test-invalid.xml")
     ("nxml/test.valid.xml" . "test-valid.xml")
+    ("automated/Makefile.in" . "test/Makefile.in")
+    ("rmailmm.el" . "test/rmailmm.el")
     ;; The one in lisp is eshell/eshell.el.
-    ("eshell.el" . "automated/eshell.el")
-    ("eshell/esh-test.el" . "automated/eshell.el")
-    ("automated/cl-lib.el" . "automated/cl-lib-tests.el")
-    ("automated/package-x-test.el" . "automated/package-test.el")
+    ("eshell.el" . "eshell-tests.el")
+    ("automated/eshell.el" . "eshell-tests.el")
+    ("eshell/esh-test.el" . "eshell-tests.el")
+    ("automated/cl-lib.el" . "cl-lib-tests.el")
+    ("automated/cl-lib-tests.el" . "cl-lib-tests.el")
+    ("automated/package-x-test.el" . "package-tests.el")
+    ("automated/package-test.el" . "package-tests.el")
     ("indent/js-indent-first-initialiser-t.js" . "indent/js-indent-init-t.js")
     ("indent/js-indent-first-initialiser-dynamic.js" .
      "indent/js-indent-init-dynamic.js")
@@ -930,7 +968,20 @@ in the repository.")
     ("GNU.JOKES" . "JOKES")
     ("CHARACTERS" . "TODO")
     ("lisp/character-fold.el" . "lisp/char-fold.el")
-    ("test/automated/character-fold-tests.el" . "test/automated/char-fold-tests.el")
+    ("test/automated/character-fold-tests.el" . "char-fold-tests.el")
+    ("test/automated/char-fold-tests.el" . "char-fold-tests.el")
+    ("test/lisp/character-fold-tests.el" . "char-fold-tests.el")
+    ("test/manual/cycle-tests.el" . "fns-tests.el")
+    ("test/manual/cyclic-tests.el" . "fns-tests.el")
+    ("test/lisp/dns-mode-tests.el" . "dns-mode-tests.el")
+    ("test/lisp/legacy/core-elisp-tests.el" . "lisp-tests.el")
+    ("test/lisp/legacy/decoder-test.el" . "coding-tests.el")
+    ("test/lisp/legacy/files-tests.el" . "files-tests.el")
+    ("test/lisp/legacy/font-parse-tests.el" . "font-tests.el")
+    ("test/lisp/legacy/lexbind-tests.el" . "bytecomp-test.el")
+    ("test/lisp/legacy/occur-tests.el" . "replace-tests.el")
+    ("test/lisp/legacy/syntax-tests.el" . "syntax-tests.el")
+    ("test/file-organisation.org" . "file-organization.org")
     ("images/gnus/mail_send.xpm" . "mail-send.xpm") ; still in images/gnus
     ("schema/xhtml-basic-form.rnc" . "xhtml-bform.rnc" )
     ("schema/xhtml-basic-table.rnc" . "xhtml-btable.rnc")
@@ -950,6 +1001,7 @@ in the repository.")
     ("icons/emacs21.ico" . "emacs21.ico")
     ("ja-dic" . "leim/ja-dic")
     ("quail" . "leim/quail")
+    ("admin/notes/triage" . "bug-triage")
     ;; Moved from autogen/ to admin/.
     ("autogen/update_autogen" . "update_autogen")
     ;; Moved from etc/ to admin/.
@@ -1040,9 +1092,13 @@ ediff\\|emerge\\|log-edit\\|log-view\\|pcvs\\|smerge-mode\\|vc\\)\\.el\\'"
     ;; From test/ to test/automated/.
     ("comint-testsuite.el" "automated/\\&")
     ("\\`\\(bytecomp\\|font-parse\\|icalendar\\|occur\\|newsticker\\)\
--testsuite\\.el" "automated/\\1-tests.el")
+-testsuite\\.el" "\\1-tests.el")
     ("automated/flymake/warnpred/\\(Makefile\\|test\\.\\(?:c\\|pl\\)\\)\\'"
      "automated/data/flymake/\\1")
+    ;; More complicated than this, but we only use the basename of the RHS.
+    ("automated/\\([^/]*-test[^/]*\\.el\\)\\'" "\\1")
+    ;; Maybe not the exact new name, but disambiguates from lisp/.
+    ("automated/\\([^/]*\\)\\.el\\'" "\\1-tests.el")
     ;; NB lax rules should come last.
     ("^m/m-\\(.*\\.h\\)$" "m/\\1" t)
     ("^m-\\(.*\\.h\\)$" "\\1" t)
@@ -1076,6 +1132,7 @@ Additionally, for these logs we apply the `lax' elements of
 
 (defvar authors-checked-files-alist)
 (defvar authors-invalid-file-names)
+(defvar authors-ignored-names)
 
 ;; This has become rather yucky. :(
 (defun authors-disambiguate-file-name (fullname)
@@ -1218,7 +1275,7 @@ author and what he did in hash table TABLE.  See the description of
           (nconc entry (list (cons action 1))))))))
 
 
-(defun authors-canonical-author-name (author)
+(defun authors-canonical-author-name (author file pos)
   "Return a canonicalized form of AUTHOR, an author name.
 If AUTHOR has an entry in `authors-aliases', use that.  Remove
 email addresses.  Capitalize words in the author's name, unless
@@ -1240,7 +1297,11 @@ it is found in `authors-fixed-case'."
     (setq author (replace-regexp-in-string "\\`[ \t]+" "" author))
     (setq author (replace-regexp-in-string "[ \t]+$" "" author))
     (setq author (replace-regexp-in-string "[ \t]+" " " author))
+    ;; NB this ignores the first name only case.
     (unless (string-match "[-, \t]" author)
+      (push (format-message "%s:%d: ignored `%s'"
+                            file (1+ (count-lines (point-min) pos)) author)
+            authors-ignored-names)
       (setq author ""))
     (or (car (member author authors-fixed-case))
         (capitalize author))))
@@ -1282,7 +1343,7 @@ with the file and the number of each action:
 Suggested\\|Trivial\\|Version\\|Originally\\|From:\\|Patch[ \t]+[Bb]y\\)")))
                    (push (authors-canonical-author-name
                           (buffer-substring-no-properties
-                           (point) (line-end-position))) authors)
+                           (point) (line-end-position)) log-file pos) authors)
                    (forward-line 1)))
                 ((looking-at "^[ \t]+\\*")
                  (let ((line (buffer-substring-no-properties
@@ -1315,7 +1376,7 @@ TABLE is a hash table to add author information to."
          (enable-local-variables :safe) ; for find-file, hence let*
          (enable-local-eval nil)
          (buffer (find-file-noselect file)))
-    (setq file (authors-disambiguate-file-name (expand-file-name file)))
+    (setq file (expand-file-name file))
     (with-current-buffer buffer
       (save-restriction
         (widen)
@@ -1332,7 +1393,8 @@ TABLE is a hash table to add author information to."
               (skip-chars-forward "-0-9 \t")
               (push (authors-canonical-author-name
                      (buffer-substring-no-properties
-                      (point) (line-end-position))) authors)
+                      (point) (line-end-position))
+                     file (line-beginning-position)) authors)
               ;; tips.texi says the continuation line should begin
               ;; with a tab, but often spaces are used.
               (setq continue
@@ -1343,7 +1405,9 @@ TABLE is a hash table to add author information to."
             (and (> (length authors) 1)
                  (setq action :cowrote))
             (mapc (lambda (author)
-                    (authors-add author file action table))
+                    (authors-add
+                     author
+                     (authors-disambiguate-file-name file) action table))
                   authors)))))
     (unless existing-buffer
       (kill-buffer buffer))))
@@ -1434,7 +1498,8 @@ and a buffer *Authors Errors* containing references to unknown files."
         (table (make-hash-table :test 'equal))
         (buffer-name "*Authors*")
         authors-checked-files-alist
-        authors-invalid-file-names)
+        authors-invalid-file-names
+        authors-ignored-names)
     (authors-add-fixed-entries table)
     (dolist (log logs)
       (when (string-match "ChangeLog\\(.[0-9]+\\)?$" log)
@@ -1498,14 +1563,20 @@ list of their contributions.\n")
             (symbol-name authors-coding-system) "\nEnd:\n")
     (message "Generating buffer %s... done" buffer-name)
     (unless noninteractive
-      (when authors-invalid-file-names
+      (when (or authors-invalid-file-names authors-ignored-names)
         (with-current-buffer (get-buffer-create "*Authors Errors*")
           (setq buffer-read-only nil)
           (erase-buffer)
           (set-buffer-file-coding-system authors-coding-system)
-          (insert "Unrecognized file entries found:\n\n")
-          (mapc (lambda (f) (if (not (string-match "^[A-Za-z]+$" f)) (insert f "\n")))
-                (sort authors-invalid-file-names 'string-lessp))
+          (when authors-invalid-file-names
+            (insert "Unrecognized file entries found:\n\n")
+            (mapc (lambda (f) (if (not (string-match "^[A-Za-z]+$" f)) (insert f "\n")))
+                  (sort authors-invalid-file-names 'string-lessp)))
+          (when authors-ignored-names
+            (insert "\n\nThese authors were ignored:\n\n"
+                    (mapconcat
+                     'identity
+                     (sort authors-ignored-names 'string-lessp) "\n")))
           (goto-char (point-min))
           (compilation-mode)
           (message "Errors were found.  See buffer %s" (buffer-name))))
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 52fcd41b1cd..85921ba1ba6 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -30,17 +30,17 @@ GNULIB_MODULES='
   careadlinkat close-stream
   count-leading-zeros count-one-bits count-trailing-zeros
   crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512
-  dtoastr dtotimespec dup2 environ execinfo faccessat
+  diffseq dtoastr dtotimespec dup2 environ execinfo faccessat
   fcntl fcntl-h fdatasync fdopendir
   filemode filevercmp flexmember fstatat fsync
   getloadavg getopt-gnu gettime gettimeofday gitlog-to-changelog
   ignore-value intprops largefile lstat
-  manywarnings memrchr mkostemp mktime
+  manywarnings memrchr minmax mkostemp mktime
   pipe2 pselect pthread_sigmask putenv qcopy-acl readlink readlinkat
   sig2str socklen stat-time std-gnu11 stdalign stddef stdio
-  stpcpy strftime strtoimax strtoumax symlink sys_stat
+  stpcpy strftime strtoimax symlink sys_stat
   sys_time time time_r time_rz timegm timer-time timespec-add timespec-sub
-  update-copyright utimens
+  update-copyright unlocked-io utimens
   vla warnings
 '
 
@@ -48,8 +48,8 @@ AVOIDED_MODULES='
   close dup fchdir fstat
   malloc-posix msvc-inval msvc-nothrow
   open openat-die opendir raise
-  save-cwd select setenv sigprocmask stdarg stdbool
-  threadlib unsetenv
+  save-cwd select setenv sigprocmask stat stdarg stdbool
+  threadlib tzset unsetenv utime utime-h
 '
 
 GNULIB_TOOL_FLAGS='
diff --git a/admin/notes/repo b/admin/notes/repo
index 3ab3da78071..0da1e1e227a 100644
--- a/admin/notes/repo
+++ b/admin/notes/repo
@@ -1,12 +1,5 @@
 NOTES ON COMMITTING TO EMACS'S REPOSITORY    -*- outline -*-
 
-** elpa
-
-This branch does not contain a copy of Emacs, but of the Emacs Lisp
-package archive (elpa.gnu.org).  See admin/notes/elpa for further
-explanation, and the README file in the branch for usage
-instructions.
-
 * Install changes only on one branch, let them get merged elsewhere if needed.
 
 In particular, install bug-fixes only on the release branch (if there
diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in
index f58303b6d76..5cc43bc3718 100644
--- a/admin/unidata/Makefile.in
+++ b/admin/unidata/Makefile.in
@@ -33,6 +33,9 @@ EMACS = ${top_builddir}/src/emacs
 unidir = ${top_srcdir}/lisp/international
 emacs = "${EMACS}" -batch --no-site-file --no-site-lisp
 
+lparen = (
+unifiles = $(addprefix ${unidir}/,$(sort $(shell sed -n 's/^[ \t][ \t]*${lparen}"\(uni-[^"]*\)"$$/\1/p' ${srcdir}/unidata-gen.el)))
+
 # 'make' verbosity.
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 
@@ -51,9 +54,10 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 =
 
-.PHONY: all unifiles
+.PHONY: all
 
-all: ${top_srcdir}/src/macuvs.h unifiles ${unidir}/charscript.el
+all: ${top_srcdir}/src/macuvs.h ${unifiles} ${unidir}/charscript.el \
+  ${unidir}/charprop.el
 
 ## Specify .elc as an order-only prereq so as to not needlessly rebuild
 ## target just because the .elc is missing.
@@ -71,30 +75,21 @@ unidata.txt: ${srcdir}/UnicodeData.txt
         $(AM_V_GEN)sed -e 's/\([^;]*\);\(.*\)/(#x\1 "\2")/' -e 's/;/" "/g' \
           < $< > $@
 
-PHONY_EXTRAS =
-.PHONY: $(PHONY_EXTRAS)
+## charprop doesn't actually depend on unifiles, but for now at least
+## pretend that it does since other Makefiles assume that if charprop
+## is up-to-date, the unifiles are too.
+${unidir}/charprop.el: ${unifiles} ${srcdir}/unidata-gen.el | ${srcdir}/unidata-gen.elc
+        $(AM_V_at)[ ! -f $@ ] || chmod +w $@
+        $(AM_V_GEN)${emacs} -L ${srcdir} -l unidata-gen \
+          -f unidata-gen-charprop $@
 
-${unidir}/charprop.el: ${srcdir}/unidata-gen.el \
+${unifiles}: ${srcdir}/unidata-gen.el \
   ${srcdir}/UnicodeData.txt ${srcdir}/BidiMirroring.txt \
   ${srcdir}/BidiBrackets.txt | \
   ${srcdir}/unidata-gen.elc unidata.txt
-  ifneq (,$(wildcard $@))
-        $(AM_V_at)cd $(unidir) && \
-        for f in charprop.el `sed -n 's/^;; FILE: //p' < charprop.el`; do \
-          [ ! -f $$f ] || [ -w $$f ] || chmod +w $$f || exit; \
-        done
-  endif
-        $(AM_V_GEN)${emacs} -L ${srcdir} -l unidata-gen -f unidata-gen-files \
-          ${srcdir} "${unidir}"
-
-## Check for deleted uni- files, and if any such, force a rebuild.
-## Perhaps a more elegant way would be for the previous rule
-## to generate a Makefile fragment explicitly listing the uni- files,
-## which this file could include.  If no fragment, rebuild everything.
-unifiles: ${unidir}/charprop.el
-        $(AM_V_at)for f in `sed -n 's/^;; FILE: //p' < $<`; do \
-          [ -f $(unidir)/$$f ] || exec $(MAKE) PHONY_EXTRAS=$< $<; \
-        done
+        $(AM_V_at)[ ! -f $@ ] || chmod +w $@
+        $(AM_V_GEN)${emacs} -L ${srcdir} -l unidata-gen \
+          -f unidata-gen-file $@ ${srcdir}
 
 
 .PHONY: charscript.el
@@ -123,7 +118,5 @@ maintainer-clean: distclean
 ## Cf leim/ja-dic (which is much slower).
 extraclean:
         rm -f ${top_srcdir}/src/macuvs.h ${unidir}/charscript.el*
-  ifneq (,$(wildcard $(unidir)/charprop.el))
-        cd $(unidir) && \
-          rm -f `sed -n 's/^;; FILE: //p' < charprop.el` charprop.el
-  endif
+        rm -f ${unifiles} ${unidir}/charprop.el
+
diff --git a/admin/unidata/README b/admin/unidata/README
index 534670ce6db..06a66663a72 100644
--- a/admin/unidata/README
+++ b/admin/unidata/README
@@ -24,3 +24,7 @@ http://www.unicode.org/Public/8.0.0/ucd/Blocks.txt
 NormalizationTest.txt
 http://www.unicode.org/Public/UNIDATA/NormalizationTest.txt
 2016-07-16
+
+SpecialCasing.txt
+http://unicode.org/Public/UNIDATA/SpecialCasing.txt
+2016-03-03
diff --git a/admin/unidata/SpecialCasing.txt b/admin/unidata/SpecialCasing.txt
new file mode 100644
index 00000000000..b23fa7f7680
--- /dev/null
+++ b/admin/unidata/SpecialCasing.txt
@@ -0,0 +1,281 @@
+# SpecialCasing-9.0.0.txt
+# Date: 2016-03-02, 18:55:13 GMT
+# © 2016 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 http://www.unicode.org/terms_of_use.html
+#
+# Unicode Character Database
+#   For documentation, see http://www.unicode.org/reports/tr44/
+#
+# Special Casing
+#
+# This file is a supplement to the UnicodeData.txt file. It does not define any
+# properties, but rather provides additional information about the casing of
+# Unicode characters, for situations when casing incurs a change in string length
+# or is dependent on context or locale. For compatibility, the UnicodeData.txt
+# file only contains simple case mappings for characters where they are one-to-one
+# and independent of context and language. The data in this file, combined with
+# the simple case mappings in UnicodeData.txt, defines the full case mappings
+# Lowercase_Mapping (lc), Titlecase_Mapping (tc), and Uppercase_Mapping (uc).
+#
+# Note that the preferred mechanism for defining tailored casing operations is
+# the Unicode Common Locale Data Repository (CLDR). For more information, see the
+# discussion of case mappings and case algorithms in the Unicode Standard.
+#
+# All code points not listed in this file that do not have a simple case mappings
+# in UnicodeData.txt map to themselves.
+# ================================================================================
+# Format
+# ================================================================================
+# The entries in this file are in the following machine-readable format:
+#
+# <code>; <lower>; <title>; <upper>; (<condition_list>;)? # <comment>
+#
+# <code>, <lower>, <title>, and <upper> provide the respective full case mappings
+# of <code>, expressed as character values in hex. If there is more than one character,
+# they are separated by spaces. Other than as used to separate elements, spaces are
+# to be ignored.
+#
+# The <condition_list> is optional. Where present, it consists of one or more language IDs
+# or casing contexts, separated by spaces. In these conditions:
+# - A condition list overrides the normal behavior if all of the listed conditions are true.
+# - The casing context is always the context of the characters in the original string,
+#   NOT in the resulting string.
+# - Case distinctions in the condition list are not significant.
+# - Conditions preceded by "Not_" represent the negation of the condition.
+# The condition list is not represented in the UCD as a formal property.
+#
+# A language ID is defined by BCP 47, with '-' and '_' treated equivalently.
+#
+# A casing context for a character is defined by Section 3.13 Default Case Algorithms
+# of The Unicode Standard.
+#
+# Parsers of this file must be prepared to deal with future additions to this format:
+#  * Additional contexts
+#  * Additional fields
+# ================================================================================
+
+# ================================================================================
+# Unconditional mappings
+# ================================================================================
+
+# The German es-zed is special--the normal mapping is to SS.
+# Note: the titlecase should never occur in practice. It is equal to titlecase(uppercase(<es-zed>))
+
+00DF; 00DF; 0053 0073; 0053 0053; # LATIN SMALL LETTER SHARP S
+
+# Preserve canonical equivalence for I with dot. Turkic is handled below.
+
+0130; 0069 0307; 0130; 0130; # LATIN CAPITAL LETTER I WITH DOT ABOVE
+
+# Ligatures
+
+FB00; FB00; 0046 0066; 0046 0046; # LATIN SMALL LIGATURE FF
+FB01; FB01; 0046 0069; 0046 0049; # LATIN SMALL LIGATURE FI
+FB02; FB02; 0046 006C; 0046 004C; # LATIN SMALL LIGATURE FL
+FB03; FB03; 0046 0066 0069; 0046 0046 0049; # LATIN SMALL LIGATURE FFI
+FB04; FB04; 0046 0066 006C; 0046 0046 004C; # LATIN SMALL LIGATURE FFL
+FB05; FB05; 0053 0074; 0053 0054; # LATIN SMALL LIGATURE LONG S T
+FB06; FB06; 0053 0074; 0053 0054; # LATIN SMALL LIGATURE ST
+
+0587; 0587; 0535 0582; 0535 0552; # ARMENIAN SMALL LIGATURE ECH YIWN
+FB13; FB13; 0544 0576; 0544 0546; # ARMENIAN SMALL LIGATURE MEN NOW
+FB14; FB14; 0544 0565; 0544 0535; # ARMENIAN SMALL LIGATURE MEN ECH
+FB15; FB15; 0544 056B; 0544 053B; # ARMENIAN SMALL LIGATURE MEN INI
+FB16; FB16; 054E 0576; 054E 0546; # ARMENIAN SMALL LIGATURE VEW NOW
+FB17; FB17; 0544 056D; 0544 053D; # ARMENIAN SMALL LIGATURE MEN XEH
+
+# No corresponding uppercase precomposed character
+
+0149; 0149; 02BC 004E; 02BC 004E; # LATIN SMALL LETTER N PRECEDED BY APOSTROPHE
+0390; 0390; 0399 0308 0301; 0399 0308 0301; # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
+03B0; 03B0; 03A5 0308 0301; 03A5 0308 0301; # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
+01F0; 01F0; 004A 030C; 004A 030C; # LATIN SMALL LETTER J WITH CARON
+1E96; 1E96; 0048 0331; 0048 0331; # LATIN SMALL LETTER H WITH LINE BELOW
+1E97; 1E97; 0054 0308; 0054 0308; # LATIN SMALL LETTER T WITH DIAERESIS
+1E98; 1E98; 0057 030A; 0057 030A; # LATIN SMALL LETTER W WITH RING ABOVE
+1E99; 1E99; 0059 030A; 0059 030A; # LATIN SMALL LETTER Y WITH RING ABOVE
+1E9A; 1E9A; 0041 02BE; 0041 02BE; # LATIN SMALL LETTER A WITH RIGHT HALF RING
+1F50; 1F50; 03A5 0313; 03A5 0313; # GREEK SMALL LETTER UPSILON WITH PSILI
+1F52; 1F52; 03A5 0313 0300; 03A5 0313 0300; # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
+1F54; 1F54; 03A5 0313 0301; 03A5 0313 0301; # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
+1F56; 1F56; 03A5 0313 0342; 03A5 0313 0342; # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
+1FB6; 1FB6; 0391 0342; 0391 0342; # GREEK SMALL LETTER ALPHA WITH PERISPOMENI
+1FC6; 1FC6; 0397 0342; 0397 0342; # GREEK SMALL LETTER ETA WITH PERISPOMENI
+1FD2; 1FD2; 0399 0308 0300; 0399 0308 0300; # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA
+1FD3; 1FD3; 0399 0308 0301; 0399 0308 0301; # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND OXIA
+1FD6; 1FD6; 0399 0342; 0399 0342; # GREEK SMALL LETTER IOTA WITH PERISPOMENI
+1FD7; 1FD7; 0399 0308 0342; 0399 0308 0342; # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI
+1FE2; 1FE2; 03A5 0308 0300; 03A5 0308 0300; # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA
+1FE3; 1FE3; 03A5 0308 0301; 03A5 0308 0301; # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND OXIA
+1FE4; 1FE4; 03A1 0313; 03A1 0313; # GREEK SMALL LETTER RHO WITH PSILI
+1FE6; 1FE6; 03A5 0342; 03A5 0342; # GREEK SMALL LETTER UPSILON WITH PERISPOMENI
+1FE7; 1FE7; 03A5 0308 0342; 03A5 0308 0342; # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI
+1FF6; 1FF6; 03A9 0342; 03A9 0342; # GREEK SMALL LETTER OMEGA WITH PERISPOMENI
+
+# IMPORTANT-when iota-subscript (0345) is uppercased or titlecased,
+#  the result will be incorrect unless the iota-subscript is moved to the end
+#  of any sequence of combining marks. Otherwise, the accents will go on the capital iota.
+#  This process can be achieved by first transforming the text to NFC before casing.
+#  E.g. <alpha><iota_subscript><acute> is uppercased to <ALPHA><acute><IOTA>
+
+# The following cases are already in the UnicodeData.txt file, so are only commented here.
+
+# 0345; 0345; 0345; 0399; # COMBINING GREEK YPOGEGRAMMENI
+
+# All letters with YPOGEGRAMMENI (iota-subscript) or PROSGEGRAMMENI (iota adscript)
+# have special uppercases.
+# Note: characters with PROSGEGRAMMENI are actually titlecase, not uppercase!
+
+1F80; 1F80; 1F88; 1F08 0399; # GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI
+1F81; 1F81; 1F89; 1F09 0399; # GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI
+1F82; 1F82; 1F8A; 1F0A 0399; # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+1F83; 1F83; 1F8B; 1F0B 0399; # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+1F84; 1F84; 1F8C; 1F0C 0399; # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+1F85; 1F85; 1F8D; 1F0D 0399; # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+1F86; 1F86; 1F8E; 1F0E 0399; # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+1F87; 1F87; 1F8F; 1F0F 0399; # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+1F88; 1F80; 1F88; 1F08 0399; # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI
+1F89; 1F81; 1F89; 1F09 0399; # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI
+1F8A; 1F82; 1F8A; 1F0A 0399; # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+1F8B; 1F83; 1F8B; 1F0B 0399; # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+1F8C; 1F84; 1F8C; 1F0C 0399; # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+1F8D; 1F85; 1F8D; 1F0D 0399; # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+1F8E; 1F86; 1F8E; 1F0E 0399; # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+1F8F; 1F87; 1F8F; 1F0F 0399; # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+1F90; 1F90; 1F98; 1F28 0399; # GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI
+1F91; 1F91; 1F99; 1F29 0399; # GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI
+1F92; 1F92; 1F9A; 1F2A 0399; # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+1F93; 1F93; 1F9B; 1F2B 0399; # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+1F94; 1F94; 1F9C; 1F2C 0399; # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+1F95; 1F95; 1F9D; 1F2D 0399; # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+1F96; 1F96; 1F9E; 1F2E 0399; # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+1F97; 1F97; 1F9F; 1F2F 0399; # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+1F98; 1F90; 1F98; 1F28 0399; # GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI
+1F99; 1F91; 1F99; 1F29 0399; # GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI
+1F9A; 1F92; 1F9A; 1F2A 0399; # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+1F9B; 1F93; 1F9B; 1F2B 0399; # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+1F9C; 1F94; 1F9C; 1F2C 0399; # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+1F9D; 1F95; 1F9D; 1F2D 0399; # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+1F9E; 1F96; 1F9E; 1F2E 0399; # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+1F9F; 1F97; 1F9F; 1F2F 0399; # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+1FA0; 1FA0; 1FA8; 1F68 0399; # GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI
+1FA1; 1FA1; 1FA9; 1F69 0399; # GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI
+1FA2; 1FA2; 1FAA; 1F6A 0399; # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+1FA3; 1FA3; 1FAB; 1F6B 0399; # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+1FA4; 1FA4; 1FAC; 1F6C 0399; # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+1FA5; 1FA5; 1FAD; 1F6D 0399; # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+1FA6; 1FA6; 1FAE; 1F6E 0399; # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+1FA7; 1FA7; 1FAF; 1F6F 0399; # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+1FA8; 1FA0; 1FA8; 1F68 0399; # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI
+1FA9; 1FA1; 1FA9; 1F69 0399; # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI
+1FAA; 1FA2; 1FAA; 1F6A 0399; # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+1FAB; 1FA3; 1FAB; 1F6B 0399; # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+1FAC; 1FA4; 1FAC; 1F6C 0399; # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+1FAD; 1FA5; 1FAD; 1F6D 0399; # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+1FAE; 1FA6; 1FAE; 1F6E 0399; # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+1FAF; 1FA7; 1FAF; 1F6F 0399; # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+1FB3; 1FB3; 1FBC; 0391 0399; # GREEK SMALL LETTER ALPHA WITH YPOGEGRAMMENI
+1FBC; 1FB3; 1FBC; 0391 0399; # GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI
+1FC3; 1FC3; 1FCC; 0397 0399; # GREEK SMALL LETTER ETA WITH YPOGEGRAMMENI
+1FCC; 1FC3; 1FCC; 0397 0399; # GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI
+1FF3; 1FF3; 1FFC; 03A9 0399; # GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI
+1FFC; 1FF3; 1FFC; 03A9 0399; # GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI
+
+# Some characters with YPOGEGRAMMENI also have no corresponding titlecases
+
+1FB2; 1FB2; 1FBA 0345; 1FBA 0399; # GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI
+1FB4; 1FB4; 0386 0345; 0386 0399; # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
+1FC2; 1FC2; 1FCA 0345; 1FCA 0399; # GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI
+1FC4; 1FC4; 0389 0345; 0389 0399; # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
+1FF2; 1FF2; 1FFA 0345; 1FFA 0399; # GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI
+1FF4; 1FF4; 038F 0345; 038F 0399; # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
+
+1FB7; 1FB7; 0391 0342 0345; 0391 0342 0399; # GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI
+1FC7; 1FC7; 0397 0342 0345; 0397 0342 0399; # GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI
+1FF7; 1FF7; 03A9 0342 0345; 03A9 0342 0399; # GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI
+
+# ================================================================================
+# Conditional Mappings
+# The remainder of this file provides conditional casing data used to produce 
+# full case mappings.
+# ================================================================================
+# Language-Insensitive Mappings
+# These are characters whose full case mappings do not depend on language, but do
+# depend on context (which characters come before or after). For more information
+# see the header of this file and the Unicode Standard.
+# ================================================================================
+
+# Special case for final form of sigma
+
+03A3; 03C2; 03A3; 03A3; Final_Sigma; # GREEK CAPITAL LETTER SIGMA
+
+# Note: the following cases for non-final are already in the UnicodeData.txt file.
+
+# 03A3; 03C3; 03A3; 03A3; # GREEK CAPITAL LETTER SIGMA
+# 03C3; 03C3; 03A3; 03A3; # GREEK SMALL LETTER SIGMA
+# 03C2; 03C2; 03A3; 03A3; # GREEK SMALL LETTER FINAL SIGMA
+
+# Note: the following cases are not included, since they would case-fold in lowercasing
+
+# 03C3; 03C2; 03A3; 03A3; Final_Sigma; # GREEK SMALL LETTER SIGMA
+# 03C2; 03C3; 03A3; 03A3; Not_Final_Sigma; # GREEK SMALL LETTER FINAL SIGMA
+
+# ================================================================================
+# Language-Sensitive Mappings
+# These are characters whose full case mappings depend on language and perhaps also
+# context (which characters come before or after). For more information
+# see the header of this file and the Unicode Standard.
+# ================================================================================
+
+# Lithuanian
+
+# Lithuanian retains the dot in a lowercase i when followed by accents.
+
+# Remove DOT ABOVE after "i" with upper or titlecase
+
+0307; 0307; ; ; lt After_Soft_Dotted; # COMBINING DOT ABOVE
+
+# Introduce an explicit dot above when lowercasing capital I's and J's
+# whenever there are more accents above.
+# (of the accents used in Lithuanian: grave, acute, tilde above, and ogonek)
+
+0049; 0069 0307; 0049; 0049; lt More_Above; # LATIN CAPITAL LETTER I
+004A; 006A 0307; 004A; 004A; lt More_Above; # LATIN CAPITAL LETTER J
+012E; 012F 0307; 012E; 012E; lt More_Above; # LATIN CAPITAL LETTER I WITH OGONEK
+00CC; 0069 0307 0300; 00CC; 00CC; lt; # LATIN CAPITAL LETTER I WITH GRAVE
+00CD; 0069 0307 0301; 00CD; 00CD; lt; # LATIN CAPITAL LETTER I WITH ACUTE
+0128; 0069 0307 0303; 0128; 0128; lt; # LATIN CAPITAL LETTER I WITH TILDE
+
+# ================================================================================
+
+# Turkish and Azeri
+
+# I and i-dotless; I-dot and i are case pairs in Turkish and Azeri
+# The following rules handle those cases.
+
+0130; 0069; 0130; 0130; tr; # LATIN CAPITAL LETTER I WITH DOT ABOVE
+0130; 0069; 0130; 0130; az; # LATIN CAPITAL LETTER I WITH DOT ABOVE
+
+# When lowercasing, remove dot_above in the sequence I + dot_above, which will turn into i.
+# This matches the behavior of the canonically equivalent I-dot_above
+
+0307; ; 0307; 0307; tr After_I; # COMBINING DOT ABOVE
+0307; ; 0307; 0307; az After_I; # COMBINING DOT ABOVE
+
+# When lowercasing, unless an I is before a dot_above, it turns into a dotless i.
+
+0049; 0131; 0049; 0049; tr Not_Before_Dot; # LATIN CAPITAL LETTER I
+0049; 0131; 0049; 0049; az Not_Before_Dot; # LATIN CAPITAL LETTER I
+
+# When uppercasing, i turns into a dotted capital I
+
+0069; 0069; 0130; 0130; tr; # LATIN SMALL LETTER I
+0069; 0069; 0130; 0130; az; # LATIN SMALL LETTER I
+
+# Note: the following case is already in the UnicodeData.txt file.
+
+# 0131; 0131; 0049; 0049; tr; # LATIN SMALL LETTER DOTLESS I
+
+# EOF
+
diff --git a/admin/unidata/unidata-gen.el b/admin/unidata/unidata-gen.el
index 3c5119a8a3d..478099c831a 100644
--- a/admin/unidata/unidata-gen.el
+++ b/admin/unidata/unidata-gen.el
@@ -26,12 +26,12 @@
 ;; SPECIAL NOTICE
 ;;
 ;;   This file must be byte-compilable/loadable by `temacs' and also
-;;   the entry function `unidata-gen-files' must be runnable by `temacs'.
+;;   the entry function `unidata-gen-file' must be runnable by `temacs'.
 
 ;; FILES TO BE GENERATED
 ;;
-;;   The entry function `unidata-gen-files' generates these files in
-;;   in directory specified by its dest-dir argument.
+;;   The entry functions `unidata-gen-file' and `unidata-gen-charprop'
+;;   generate these files:
 ;;
 ;;   charprop.el
 ;;      It contains a series of forms of this format:
@@ -94,7 +94,7 @@
 
 ;; Name of the directory containing files of Unicode Character Database.
 
-;; Dynamically bound in unidata-gen-files.
+;; Dynamically bound in unidata-gen-file.
 (defvar unidata-dir nil)
 
 (defun unidata-setup-list (unidata-text-file)
@@ -149,14 +149,14 @@
     (setq unidata-list (cdr table))))
 
 ;; Alist of this form:
-;;   (PROP INDEX GENERATOR FILENAME DOCSTRING DESCRIBER DEFAULT VAL-LIST)
+;;   (FILENAME (PROP INDEX GENERATOR DOCSTRING DESCRIBER DEFAULT VAL-LIST) ...)
+;; FILENAME: filename to store the char-table(s)
 ;; PROP: character property
 ;; INDEX: index to each element of unidata-list for PROP.
 ;;   It may be a function that generates an alist of character codes
 ;;   vs. the corresponding property values.  Currently, only character
 ;;   codepoints or symbol values are supported in this case.
 ;; GENERATOR: function to generate a char-table
-;; FILENAME: filename to store the char-table
 ;; DOCSTRING: docstring for the property
 ;; DESCRIBER: function to call to get a description string of property value
 ;; DEFAULT: the default value of the property.  It may have the form
@@ -166,139 +166,196 @@
 ;;   between FROMn and TOn is VALn.
 ;; VAL-LIST: list of specially ordered property values
 
-(defconst unidata-prop-alist
-  '((name
-     1 unidata-gen-table-name "uni-name.el"
-     "Unicode character name.
+(defconst unidata-file-alist
+  '(
+    ;; NB this list is parsed by the Makefile to extract the names of
+    ;; the uni-*.el files, so preserve the formatting of those lines.
+    ("uni-name.el"
+     (name
+      1 unidata-gen-table-name
+      "Unicode character name.
 Property value is a string or nil.
 The value nil stands for the default value \"null string\")."
-     nil
-     nil)
-    (general-category
-     2 unidata-gen-table-symbol "uni-category.el"
-     "Unicode general category.
+      nil
+      nil))
+    ("uni-category.el"
+     (general-category
+      2 unidata-gen-table-symbol
+      "Unicode general category.
 Property value is one of the following symbols:
   Lu, Ll, Lt, Lm, Lo, Mn, Mc, Me, Nd, Nl, No, Pc, Pd, Ps, Pe, Pi, Pf, Po,
   Sm, Sc, Sk, So, Zs, Zl, Zp, Cc, Cf, Cs, Co, Cn"
-     unidata-describe-general-category
-     Cn
-     ;; The order of elements must be in sync with unicode_category_t
-     ;; in src/character.h.
-     (Lu Ll Lt Lm Lo Mn Mc Me Nd Nl No Pc Pd Ps Pe Pi Pf Po
-         Sm Sc Sk So Zs Zl Zp Cc Cf Cs Co Cn))
-    (canonical-combining-class
-     3 unidata-gen-table-integer "uni-combining.el"
-     "Unicode canonical combining class.
+      unidata-describe-general-category
+      Cn
+      ;; The order of elements must be in sync with
+      ;; unicode_category_t in src/character.h.
+      (Lu Ll Lt Lm Lo Mn Mc Me Nd Nl No Pc Pd Ps Pe Pi Pf Po
+          Sm Sc Sk So Zs Zl Zp Cc Cf Cs Co Cn)))
+    ("uni-combining.el"
+     (canonical-combining-class
+      3 unidata-gen-table-integer
+      "Unicode canonical combining class.
 Property value is an integer."
-     unidata-describe-canonical-combining-class
-     0)
-    (bidi-class
-     4 unidata-gen-table-symbol "uni-bidi.el"
-     "Unicode bidi class.
+      unidata-describe-canonical-combining-class
+      0))
+    ("uni-bidi.el"
+     (bidi-class
+      4 unidata-gen-table-symbol
+      "Unicode bidi class.
 Property value is one of the following symbols:
   L, LRE, LRO, LRI, R, AL, RLE, RLO, RLI, FSI, PDF, PDI,
   EN, ES, ET, AN, CS, NSM, BN, B, S, WS, ON"
-     unidata-describe-bidi-class
-     ;; The assignment of default values to blocks of code points
-     ;; follows the file DerivedBidiClass.txt from the Unicode
-     ;; Character Database (UCD).
-     (L (#x0600 #x06FF AL) (#xFB50 #xFDFF AL) (#xFE70 #xFEFF AL)
-        (#x0590 #x05FF R) (#x07C0 #x08FF R)
-        (#xFB1D #xFB4F R) (#x10800 #x10FFF R) (#x1E800 #x1EFFF R))
-     ;; The order of elements must be in sync with bidi_type_t in
-     ;; src/dispextern.h.
-     (L R EN AN BN B AL LRE LRO RLE RLO PDF LRI RLI FSI PDI
-        ES ET CS NSM S WS ON))
-    (decomposition
-     5 unidata-gen-table-decomposition "uni-decomposition.el"
-     "Unicode decomposition mapping.
+      unidata-describe-bidi-class
+      ;; The assignment of default values to blocks of code points
+      ;; follows the file DerivedBidiClass.txt from the Unicode
+      ;; Character Database (UCD).
+      (L (#x0600 #x06FF AL) (#xFB50 #xFDFF AL) (#xFE70 #xFEFF AL)
+         (#x0590 #x05FF R) (#x07C0 #x08FF R)
+         (#xFB1D #xFB4F R) (#x10800 #x10FFF R) (#x1E800 #x1EFFF R))
+      ;; The order of elements must be in sync with bidi_type_t in
+      ;; src/dispextern.h.
+      (L R EN AN BN B AL LRE LRO RLE RLO PDF LRI RLI FSI PDI
+         ES ET CS NSM S WS ON)))
+    ("uni-decomposition.el"
+     (decomposition
+      5 unidata-gen-table-decomposition
+      "Unicode decomposition mapping.
 Property value is a list of characters.  The first element may be
 one of these symbols representing compatibility formatting tag:
   font, noBreak, initial, medial, final, isolated, circle, super,
   sub, vertical, wide, narrow, small, square, fraction, compat"
-     unidata-describe-decomposition)
-    (decimal-digit-value
-     6 unidata-gen-table-integer "uni-decimal.el"
-     "Unicode numeric value (decimal digit).
+      unidata-describe-decomposition))
+    ("uni-decimal.el"
+     (decimal-digit-value
+      6 unidata-gen-table-integer
+      "Unicode numeric value (decimal digit).
 Property value is an integer 0..9, or nil.
-The value nil stands for NaN \"Numeric_Value\".")
-    (digit-value
-     7 unidata-gen-table-integer "uni-digit.el"
-     "Unicode numeric value (digit).
+The value nil stands for NaN \"Numeric_Value\"."))
+    ("uni-digit.el"
+     (digit-value
+      7 unidata-gen-table-integer
+      "Unicode numeric value (digit).
 Property value is an integer 0..9, or nil.
-The value nil stands for NaN \"Numeric_Value\".")
-    (numeric-value
-     8 unidata-gen-table-numeric "uni-numeric.el"
-     "Unicode numeric value (numeric).
+The value nil stands for NaN \"Numeric_Value\"."))
+    ("uni-numeric.el"
+     (numeric-value
+      8 unidata-gen-table-numeric
+      "Unicode numeric value (numeric).
 Property value is an integer, a floating point, or nil.
-The value nil stands for NaN \"Numeric_Value\".")
-    (mirrored
-     9 unidata-gen-table-symbol "uni-mirrored.el"
-     "Unicode bidi mirrored flag.
+The value nil stands for NaN \"Numeric_Value\"."))
+    ("uni-mirrored.el"
+     (mirrored
+      9 unidata-gen-table-symbol
+      "Unicode bidi mirrored flag.
 Property value is a symbol `Y' or `N'.  See also the property `mirroring'."
-     nil
-     N)
-    (old-name
-     10 unidata-gen-table-name "uni-old-name.el"
-     "Unicode old names as published in Unicode 1.0.
+      nil
+      N)
+     (mirroring
+      unidata-gen-mirroring-list unidata-gen-table-character
+      "Unicode bidi-mirroring characters.
+Property value is a character that has the corresponding mirroring image or nil.
+The value nil means that the actual property value of a character
+is the character itself."))
+    ("uni-old-name.el"
+     (old-name
+      10 unidata-gen-table-name
+      "Unicode old names as published in Unicode 1.0.
 Property value is a string or nil.
-The value nil stands for the default value \"null string\").")
-    (iso-10646-comment
-     11 unidata-gen-table-name "uni-comment.el"
-     "Unicode ISO 10646 comment.
-Property value is a string.")
-    (uppercase
-     12 unidata-gen-table-character "uni-uppercase.el"
-     "Unicode simple uppercase mapping.
+The value nil stands for the default value \"null string\")."))
+    ("uni-comment.el"
+     (iso-10646-comment
+      11 unidata-gen-table-name
+      "Unicode ISO 10646 comment.
+Property value is a string."))
+    ("uni-uppercase.el"
+     (uppercase
+      12 unidata-gen-table-character
+      "Unicode simple uppercase mapping.
 Property value is a character or nil.
 The value nil means that the actual property value of a character
 is the character itself."
-     string)
-    (lowercase
-     13 unidata-gen-table-character "uni-lowercase.el"
-     "Unicode simple lowercase mapping.
+      string))
+    ("uni-lowercase.el"
+     (lowercase
+      13 unidata-gen-table-character
+      "Unicode simple lowercase mapping.
 Property value is a character or nil.
 The value nil means that the actual property value of a character
 is the character itself."
-     string)
-    (titlecase
-     14 unidata-gen-table-character "uni-titlecase.el"
-     "Unicode simple titlecase mapping.
+      string))
+    ("uni-titlecase.el"
+     (titlecase
+      14 unidata-gen-table-character
+      "Unicode simple titlecase mapping.
 Property value is a character or nil.
 The value nil means that the actual property value of a character
 is the character itself."
-     string)
-    (mirroring
-     unidata-gen-mirroring-list unidata-gen-table-character "uni-mirrored.el"
-     "Unicode bidi-mirroring characters.
-Property value is a character that has the corresponding mirroring image or nil.
-The value nil means that the actual property value of a character
-is the character itself.")
-    (paired-bracket
-     unidata-gen-brackets-list unidata-gen-table-character "uni-brackets.el"
-     "Unicode bidi paired-bracket characters.
+      string))
+    ("uni-special-uppercase.el"
+     (special-uppercase
+      2 unidata-gen-table-special-casing
+      "Unicode unconditional special casing mapping.
+
+Property value is (possibly empty) string or nil.  The value nil denotes that
+`uppercase' property should be consulted instead.  A string denotes what
+sequence of characters given character maps into.
+
+This mapping includes language- and context-independent special casing rules
+defined by Unicode only.  It also does not include association which would
+duplicate information from `uppercase' property."
+      nil))
+    ("uni-special-lowercase.el"
+     (special-lowercase
+      0 unidata-gen-table-special-casing
+      "Unicode unconditional special casing mapping.
+
+Property value is (possibly empty) string or nil.  The value nil denotes that
+`lowercase' property should be consulted instead.  A string denotes what
+sequence of characters given character maps into.
+
+This mapping includes language- and context-independent special casing rules
+defined by Unicode only.  It also does not include association which would
+duplicate information from `lowercase' property."
+      nil))
+    ("uni-special-titlecase.el"
+     (special-titlecase
+      1 unidata-gen-table-special-casing
+      "Unicode unconditional special casing mapping.
+
+Property value is (possibly empty) string or nil.  The value nil denotes that
+`titlecase' property should be consulted instead.  A string denotes what
+sequence of characters given character maps into.
+
+This mapping includes language- and context-independent special casing rules
+defined by Unicode only.  It also does not include association which would
+duplicate information from `titlecase' property."
+      nil))
+    ("uni-brackets.el"
+     (paired-bracket
+      unidata-gen-brackets-list unidata-gen-table-character
+      "Unicode bidi paired-bracket characters.
 Property value is the paired bracket character, or nil.
 The value nil means that the character is neither an opening nor
 a closing paired bracket."
-     string)
-    (bracket-type
-     unidata-gen-bracket-type-list unidata-gen-table-symbol "uni-brackets.el"
-     "Unicode bidi paired-bracket type.
+      string)
+     (bracket-type
+      unidata-gen-bracket-type-list unidata-gen-table-symbol
+      "Unicode bidi paired-bracket type.
 Property value is a symbol `o' (Open), `c' (Close), or `n' (None)."
-     unidata-describe-bidi-bracket-type
-     n
-     ;; The order of elements must be in sync with bidi_bracket_type_t
-     ;; in src/dispextern.h.
-     (n o c))))
+      unidata-describe-bidi-bracket-type
+      n
+      ;; The order of elements must be in sync with bidi_bracket_type_t
+      ;; in src/dispextern.h.
+      (n o c)))))
 
 ;; Functions to access the above data.
-(defsubst unidata-prop-index (prop) (nth 1 (assq prop unidata-prop-alist)))
-(defsubst unidata-prop-generator (prop) (nth 2 (assq prop unidata-prop-alist)))
-(defsubst unidata-prop-file (prop) (nth 3 (assq prop unidata-prop-alist)))
-(defsubst unidata-prop-docstring (prop) (nth 4 (assq prop unidata-prop-alist)))
-(defsubst unidata-prop-describer (prop) (nth 5 (assq prop unidata-prop-alist)))
-(defsubst unidata-prop-default (prop) (nth 6 (assq prop unidata-prop-alist)))
-(defsubst unidata-prop-val-list (prop) (nth 7 (assq prop unidata-prop-alist)))
+(defsubst unidata-prop-prop (proplist) (nth 0 proplist))
+(defsubst unidata-prop-index (proplist) (nth 1 proplist))
+(defsubst unidata-prop-generator (proplist) (nth 2 proplist))
+(defsubst unidata-prop-docstring (proplist) (nth 3 proplist))
+(defsubst unidata-prop-describer (proplist) (nth 4 proplist))
+(defsubst unidata-prop-default (proplist) (nth 5 proplist))
+(defsubst unidata-prop-val-list (proplist) (nth 6 proplist))
 
 
 ;; SIMPLE TABLE
@@ -326,9 +383,8 @@ Property value is a symbol `o' (Open), `c' (Close), or `n' (None)."
 ;;   3rd: 0 (corresponding to uniprop_encode_character in chartab.c)
 ;;   4th to 5th: nil
 
-(defun unidata-gen-table-character (prop &rest ignore)
+(defun unidata-gen-table-character (prop prop-idx &rest ignore)
   (let ((table (make-char-table 'char-code-property-table))
-        (prop-idx (unidata-prop-index prop))
         (vec (make-vector 128 0))
         (tail unidata-list)
         elt range val idx slot)
@@ -433,13 +489,12 @@ Property value is a symbol `o' (Open), `c' (Close), or `n' (None)."
 
 ;; Generate a char-table for the character property PROP.
 
-(defun unidata-gen-table (prop val-func default-value val-list)
+(defun unidata-gen-table (prop prop-idx val-func default-value val-list)
   (let ((table (make-char-table 'char-code-property-table))
-        (prop-idx (unidata-prop-index prop))
         (vec (make-vector 128 0))
         ;; When this warning is printed, there's a need to make the
         ;; following changes:
-        ;; (1) update unidata-prop-alist with the new bidi-class values;
+        ;; (1) update unidata-file-alist with the new bidi-class values;
         ;; (2) extend bidi_type_t enumeration on src/dispextern.h to
         ;;     include the new classes;
         ;; (3) possibly update the assertion in bidi.c:bidi_check_type; and
@@ -560,8 +615,8 @@ Property value is a symbol `o' (Open), `c' (Close), or `n' (None)."
     (set-char-table-extra-slot table 4 (vconcat (mapcar 'car val-list)))
     table))
 
-(defun unidata-gen-table-symbol (prop default-value val-list)
-  (let ((table (unidata-gen-table prop
+(defun unidata-gen-table-symbol (prop index default-value val-list)
+  (let ((table (unidata-gen-table prop index
                                   #'(lambda (x) (and (> (length x) 0)
                                                      (intern x)))
                                   default-value val-list)))
@@ -569,8 +624,8 @@ Property value is a symbol `o' (Open), `c' (Close), or `n' (None)."
     (set-char-table-extra-slot table 2 1)
     table))
 
-(defun unidata-gen-table-integer (prop default-value val-list)
-  (let ((table (unidata-gen-table prop
+(defun unidata-gen-table-integer (prop index default-value val-list)
+  (let ((table (unidata-gen-table prop index
                                   #'(lambda (x) (and (> (length x) 0)
                                                      (string-to-number x)))
                                   default-value val-list)))
@@ -578,8 +633,8 @@ Property value is a symbol `o' (Open), `c' (Close), or `n' (None)."
     (set-char-table-extra-slot table 2 1)
     table))
 
-(defun unidata-gen-table-numeric (prop default-value val-list)
-  (let ((table (unidata-gen-table prop
+(defun unidata-gen-table-numeric (prop index default-value val-list)
+  (let ((table (unidata-gen-table prop index
                                   #'(lambda (x)
                                       (if (string-match "/" x)
                                           (/ (float (string-to-number x))
@@ -885,9 +940,8 @@ Property value is a symbol `o' (Open), `c' (Close), or `n' (None)."
 
 ;; Generate a char-table for character names.
 
-(defun unidata-gen-table-word-list (prop val-func)
+(defun unidata-gen-table-word-list (prop prop-idx val-func)
   (let ((table (make-char-table 'char-code-property-table))
-        (prop-idx (unidata-prop-index prop))
         (word-list (list nil))
         word-table
         block-list block-word-table block-end
@@ -1032,8 +1086,8 @@ Property value is a symbol `o' (Open), `c' (Close), or `n' (None)."
     (or (byte-code-function-p (symbol-function fun))
         (byte-compile fun))))
 
-(defun unidata-gen-table-name (prop &rest ignore)
-  (let* ((table (unidata-gen-table-word-list prop 'unidata-split-name))
+(defun unidata-gen-table-name (prop index &rest ignore)
+  (let* ((table (unidata-gen-table-word-list prop index 'unidata-split-name))
          (word-tables (char-table-extra-slot table 4)))
     (unidata--ensure-compiled 'unidata-get-name 'unidata-put-name)
     (set-char-table-extra-slot table 1 (symbol-function 'unidata-get-name))
@@ -1070,8 +1124,8 @@ Property value is a symbol `o' (Open), `c' (Close), or `n' (None)."
         (nreverse l)))))
 
 
-(defun unidata-gen-table-decomposition (prop &rest ignore)
-  (let* ((table (unidata-gen-table-word-list prop 'unidata-split-decomposition))
+(defun unidata-gen-table-decomposition (prop index &rest ignore)
+  (let* ((table (unidata-gen-table-word-list prop index 'unidata-split-decomposition))
          (word-tables (char-table-extra-slot table 4)))
     (unidata--ensure-compiled 'unidata-get-decomposition
                               'unidata-put-decomposition)
@@ -1084,6 +1138,50 @@ Property value is a symbol `o' (Open), `c' (Close), or `n' (None)."
 
 
 
+
+(defvar unidata-gen-table-special-casing--cache nil
+  "Cached value for `unidata-gen-table-special-casing' function.")
+
+(defun unidata-gen-table-special-casing--do-load ()
+  (let (result)
+    (with-temp-buffer
+      (insert-file-contents (expand-file-name "SpecialCasing.txt" unidata-dir))
+      (goto-char (point-min))
+      (while (not (eobp))
+        ;; Ignore empty lines and comments.
+        (unless (or (eq (char-after) ?\n) (eq (char-after) ?#))
+          (let ((line (split-string
+                       (buffer-substring (point) (progn (end-of-line) (point)))
+                       ";" "")))
+            ;; Ignore entries with conditions, i.e. those with six values.
+            (when (= (length line) 5)
+              (let ((ch (string-to-number (pop line) 16)))
+                (setcdr (cddr line) nil) ; strip comment
+                (push
+                 (cons ch
+                       (mapcar (lambda (entry)
+                                 (mapcar (lambda (n) (string-to-number n 16))
+                                         (split-string entry)))
+                               line))
+                 result)))))
+        (forward-line)))
+    result))
+
+(defun unidata-gen-table-special-casing (prop prop-idx &rest ignore)
+  (let ((table (make-char-table 'char-code-property-table)))
+    (set-char-table-extra-slot table 0 prop)
+    (mapc (lambda (entry)
+            (let ((ch (car entry)) (v (nth prop-idx (cdr entry))))
+              ;; If character maps to a single character, the mapping is already
+              ;; covered by regular casing property.  Don’t store those.
+              (when (/= (length v) 1)
+                (set-char-table-range table ch (apply 'string v)))))
+          (or unidata-gen-table-special-casing--cache
+              (setq unidata-gen-table-special-casing--cache
+                    (unidata-gen-table-special-casing--do-load))))
+    table))
+
+
 (defun unidata-describe-general-category (val)
   (cdr (assq val
              '((nil . "Uknown")
@@ -1241,137 +1339,142 @@ Property value is a symbol `o' (Open), `c' (Close), or `n' (None)."
 ;;   (unidata-check))
 
 (defun unidata-check ()
-  (dolist (elt unidata-prop-alist)
-    (let* ((prop (car elt))
-           (index (unidata-prop-index prop))
-           (generator (unidata-prop-generator prop))
-           (default-value (unidata-prop-default prop))
-           (val-list (unidata-prop-val-list prop))
-           (table (progn
-                    (message "Generating %S table..." prop)
-                    (funcall generator prop default-value val-list)))
-           (decoder (char-table-extra-slot table 1))
-           (alist (and (functionp index)
-                       (funcall index)))
-           (check #x400))
-      (dolist (e unidata-list)
-        (let* ((char (car e))
-               (val1
-                (if alist (nth 1 (assoc char alist))
-                  (nth index e)))
-               val2)
-          (if (and (stringp val1) (= (length val1) 0))
-              (setq val1 nil))
-          (unless (or (consp char)
-                      (integerp decoder))
-            (setq val2
-                  (cond ((functionp decoder)
-                         (funcall decoder char (aref table char) table))
-                        (t              ; must be nil
-                         (aref table char))))
-            (if val1
-                (cond ((eq generator 'unidata-gen-table-symbol)
-                       (setq val1 (intern val1)))
-                      ((eq generator 'unidata-gen-table-integer)
-                       (setq val1 (string-to-number val1)))
-                      ((eq generator 'unidata-gen-table-character)
-                       (setq val1 (string-to-number val1 16)))
-                      ((eq generator 'unidata-gen-table-decomposition)
-                       (setq val1 (unidata-split-decomposition val1))))
-              (cond ((eq prop 'decomposition)
-                     (setq val1 (list char)))
-                    ((eq prop 'bracket-type)
-                     (setq val1 'n))))
-            (when (>= char check)
-              (message "%S %04X" prop check)
-              (setq check (+ check #x400)))
-            (or (equal val1 val2)
-                ;; <control> characters get a 'name' property of nil
-                (and (eq prop 'name) (string= val1 "<control>") (null val2))
-                (insert (format "> %04X %S\n< %04X %S\n"
-                                char val1 char val2)))
-            (sit-for 0)))))))
-
-;; The entry function.  It generates files described in the header
+  (dolist (elt unidata-file-alist)
+    (dolist (proplist (cdr elt))
+      (let* ((prop (unidata-prop-prop proplist))
+             (index (unidata-prop-index proplist))
+             (generator (unidata-prop-generator proplist))
+             (default-value (unidata-prop-default proplist))
+             (val-list (unidata-prop-val-list proplist))
+             (check #x400)
+             table decoder alist)
+        ;; We compare values in unidata.txt with the ones returned by various
+        ;; generator functions.  However, SpecialCasing.txt is read directly by
+        ;; unidata-gen-table-special-casing--do-load and there is no other file
+        ;; to compare those values with.  This is why we’re skipping the check
+        ;; for special casing properties.
+        (unless (eq generator 'unidata-gen-table-special-casing)
+          (setq table (progn
+                        (message "Generating %S table..." prop)
+                        (funcall generator prop index default-value val-list))
+                decoder (char-table-extra-slot table 1))
+          (unless (integerp decoder)
+            (setq alist (and (functionp index) (funcall index)))
+            (dolist (e unidata-list)
+              (let ((char (car e)) val1 val2)
+                (unless (consp char)
+                  (setq val1 (if alist
+                                 (nth 1 (assoc char alist))
+                               (nth index e)))
+                  (and (stringp val1)
+                       (= (length val1) 0)
+                       (setq val1 nil))
+                  (if val1
+                      (cond ((eq generator 'unidata-gen-table-symbol)
+                             (setq val1 (intern val1)))
+                            ((eq generator 'unidata-gen-table-integer)
+                             (setq val1 (string-to-number val1)))
+                            ((eq generator 'unidata-gen-table-character)
+                             (setq val1 (string-to-number val1 16)))
+                            ((eq generator 'unidata-gen-table-decomposition)
+                             (setq val1 (unidata-split-decomposition val1))))
+                    (cond ((eq prop 'decomposition)
+                           (setq val1 (list char)))
+                          ((eq prop 'bracket-type)
+                           (setq val1 'n))))
+                  (setq val2 (aref table char))
+                  (when decoder
+                    (setq val2 (funcall decoder char val2 table)))
+                  (when (>= char check)
+                    (message "%S %04X" prop check)
+                    (setq check (+ check #x400)))
+                  (or (equal val1 val2)
+                      ;; <control> characters get a 'name' property of nil
+                      (and (eq prop 'name)
+                           (string= val1 "<control>")
+                           (null val2))
+                      (insert (format "> %04X %S\n< %04X %S\n"
+                                      char val1 char val2)))
+                  (sit-for 0))))))))))
+
+;; The entry functions.  They generate files described in the header
 ;; comment of this file.
 
-;; Write files (charprop.el, uni-*.el) to dest-dir (default PWD),
-;; using as input files from data-dir, and
-;; unidata-text-file (default "unidata.txt" in PWD).
-(defun unidata-gen-files (&optional data-dir dest-dir unidata-text-file)
-  (or data-dir
-      (setq data-dir (pop command-line-args-left)
-            dest-dir (or (pop command-line-args-left) default-directory)
+(defun unidata-gen-file (&optional file data-dir unidata-text-file)
+  "Generate lisp file FILE from Unicode data."
+  (or file
+      (setq file (pop command-line-args-left)
+            data-dir (or (pop command-line-args-left) default-directory)
             unidata-text-file (or (pop command-line-args-left)
                                   (expand-file-name "unidata.txt"))))
-  (let ((coding-system-for-write 'utf-8-unix)
-        (coding-system-for-read 'utf-8)
-        (charprop-file (expand-file-name "charprop.el" dest-dir))
-        (unidata-dir data-dir))
-    (dolist (elt unidata-prop-alist)
-      (let* ((prop (car elt))
-             (file (expand-file-name (unidata-prop-file prop) dest-dir)))
-        (if (file-exists-p file)
-            (delete-file file))))
-    (unidata-setup-list unidata-text-file)
-    (with-temp-file charprop-file
-      (insert ";; Automatically generated by unidata-gen.el.\n")
-      (dolist (elt unidata-prop-alist)
-        (let* ((prop (car elt))
-               (generator (unidata-prop-generator prop))
-               (file (expand-file-name (unidata-prop-file prop) dest-dir))
-               (basename (file-name-nondirectory file))
-               (docstring (unidata-prop-docstring prop))
-               (describer (unidata-prop-describer prop))
-               (default-value (unidata-prop-default prop))
-               (val-list (unidata-prop-val-list prop))
-               ;; Avoid creating backup files for those uni-*.el files
-               ;; that hold more than one table.
-               (backup-inhibited t)
-               table)
-          ;; Filename in this comment line is extracted by sed in
-          ;; Makefile.
-          (insert (format ";; FILE: %s\n" basename))
-          (insert (format "(define-char-code-property '%S %S\n  %S)\n"
-                          prop basename docstring))
-          (with-temp-buffer
-            (or noninteractive (message "Generating %s..." file))
-            (when (file-exists-p file)
-              (insert-file-contents file)
-              (goto-char (point-max))
-              (search-backward ";; Local Variables:"))
-            (setq table (funcall generator prop default-value val-list))
-            (when describer
-              (unless (subrp (symbol-function describer))
-                (unidata--ensure-compiled describer)
-                (setq describer (symbol-function describer)))
-              (set-char-table-extra-slot table 3 describer))
-            (if (bobp)
-                (insert ";; Copyright (C) 1991-2014 Unicode, Inc.
-;; This file was generated from the Unicode data files at
-;; http://www.unicode.org/Public/UNIDATA/.
-;; See lisp/international/README for the copyright and permission notice.\n"))
-            (insert (format "(define-char-code-property '%S\n  %S\n  %S)\n"
-                            prop table docstring))
-            (if (eobp)
-                (insert ";; Local Variables:\n"
-                        ";; coding: utf-8\n"
-                        ";; version-control: never\n"
-                        ";; no-byte-compile: t\n"
-                        ";; no-update-autoloads: t\n"
-                        ";; End:\n\n"
-                        (format ";; %s ends here\n" basename)))
-            (write-file file)
-            (or noninteractive (message "Generating %s...done" file)))))
-      (message "Writing %s..." charprop-file)
-      (insert ";; Local Variables:\n"
-              ";; coding: utf-8\n"
-              ";; version-control: never\n"
-              ";; no-byte-compile: t\n"
-              ";; no-update-autoloads: t\n"
-              ";; End:\n\n"
-              (format ";; %s ends here\n"
-                      (file-name-nondirectory charprop-file))))))
+  (let* ((coding-system-for-write 'utf-8-unix)
+         (coding-system-for-read 'utf-8)
+         (unidata-dir data-dir)
+         (copyright (with-temp-buffer
+                      (insert-file-contents
+                       (expand-file-name "copyright.html" unidata-dir))
+                      (re-search-forward "^Copyright .*Unicode, Inc.")
+                      (match-string 0))))
+    (or unidata-list (unidata-setup-list unidata-text-file))
+    (let* ((basename (file-name-nondirectory file))
+           (elt (assoc basename unidata-file-alist)))
+      (or elt (user-error "Unknown output file: %s" basename))
+      (or noninteractive (message "Generating %s..." file))
+      (with-temp-file file
+        (insert ";; " copyright "
+;; Generated from Unicode data files by unidata-gen.el.
+;; The sources for this file are found in the admin/unidata/ directory in
+;; the Emacs sources.  The Unicode data files are used under the
+;; Unicode Terms of Use, as contained in the file copyright.html in that
+;; same directory.\n")
+        (dolist (proplist (cdr elt))
+          (let ((prop (unidata-prop-prop proplist))
+                (index (unidata-prop-index proplist))
+                (generator (unidata-prop-generator proplist))
+                (docstring (unidata-prop-docstring proplist))
+                (describer (unidata-prop-describer proplist))
+                (default-value (unidata-prop-default proplist))
+                (val-list (unidata-prop-val-list proplist))
+                table)
+            (setq table (funcall generator prop index default-value val-list))
+            (when describer
+              (unless (subrp (symbol-function describer))
+                (unidata--ensure-compiled describer)
+                (setq describer (symbol-function describer)))
+              (set-char-table-extra-slot table 3 describer))
+            (insert (format "(define-char-code-property '%S\n  %S\n  %S)\n"
+                            prop table docstring))))
+        (insert ";; Local Variables:\n"
+                ";; coding: utf-8\n"
+                ";; version-control: never\n"
+                ";; no-byte-compile: t\n"
+                ";; no-update-autoloads: t\n"
+                ";; End:\n\n"
+                (format ";; %s ends here\n" basename)))))
+  (or noninteractive (message "Generating %s...done" file)))
+
+(defun unidata-gen-charprop (&optional charprop-file)
+  (or charprop-file (setq charprop-file (pop command-line-args-left)))
+  (with-temp-file charprop-file
+    (insert ";; Automatically generated by unidata-gen.el.\n"
+            ";; See the admin/unidata/ directory in the Emacs sources.\n")
+    (dolist (elt unidata-file-alist)
+      (dolist (proplist (cdr elt))
+        (insert (format "(define-char-code-property '%S %S\n  %S)\n"
+                        (unidata-prop-prop proplist) (car elt)
+                        (unidata-prop-docstring proplist)))))
+    (or noninteractive (message "Writing %s..." charprop-file))
+    (insert "\n"
+            "(provide 'charprop)\n"
+            "\n"
+            ";; Local Variables:\n"
+            ";; coding: utf-8\n"
+            ";; version-control: never\n"
+            ";; no-byte-compile: t\n"
+            ";; no-update-autoloads: t\n"
+            ";; End:\n\n"
+            (format ";; %s ends here\n"
+                    (file-name-nondirectory charprop-file)))))
 
 
 
diff --git a/admin/update_autogen b/admin/update_autogen
index 898432eae60..ba4ed00fa39 100755
--- a/admin/update_autogen
+++ b/admin/update_autogen
@@ -47,14 +47,7 @@ cd $PD
 cd ../
 [ -d admin ] || die "Could not locate admin directory"
 
-if [ -d .bzr ]; then
-    vcs=bzr
-elif [ -e .git ]; then
-    vcs=git
-else
-    die "Cannot determine vcs"
-fi
-
+[ -d .git ] || die "No .git directory"
 
 usage ()
 {
@@ -157,10 +150,7 @@ OPTIND=1
 ## Run status on inputs, list modified files on stdout.
 status ()
 {
-    local statflag="-S"
-    [ "$vcs" = "git" ] && statflag="-s"
-
-    $vcs status $statflag "$@" >| $tempfile || die "$vcs status error for $@"
+    git status -s "$@" >| $tempfile || die "git status error for $@"
 
     local stat file modified
 
@@ -234,11 +224,11 @@ commit ()
 
     echo "Committing..."
 
-    $vcs commit -m "; Auto-commit of $type files." "$@" || return $?
+    git commit -m "; Auto-commit of $type files." "$@" || return $?
 
-    [ "$vcs" = "git" ] && {
-        $vcs push || return $?
-    }
+    ## In case someone else pushed something while we were working.
+    git pull --rebase || return $?
+    git push || return $?
 
     echo "Committed files: $@"
 }                               # function commit