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

4 files changed, 1 insertions, 71 deletions

diff --git a/admin/admin.el b/admin/admin.el
index 267f2c4afea..914f187b1e8 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -88,21 +88,12 @@ Root must be the root of an Emacs source tree."
                        (rx (and "AC_INIT" (1+ (not (in ?,)))
                                 ?, (0+ space)
                                 (submatch (1+ (in "0-9."))))))
-  ;; No longer used, broken in multiple ways, updating version seems pointless.
-  (set-version-in-file root "nt/config.nt" version
-                       (rx (and bol "#" (0+ blank) "define" (1+ blank)
-                                "VERSION" (1+ blank) "\""
-                                (submatch (1+ (in "0-9."))))))
   ;; TODO: msdos could easily extract the version number from
   ;; configure.ac with sed, rather than duplicating the information.
   (set-version-in-file root "msdos/sed2v2.inp" version
                        (rx (and bol "/^#undef " (1+ not-newline)
                                 "define VERSION" (1+ space) "\""
                                 (submatch (1+ (in "0-9."))))))
-  ;; No longer used, broken in multiple ways, updating version seems pointless.
-  (set-version-in-file root "nt/makefile.w32-in" version
-                       (rx (and "VERSION" (0+ space) "=" (0+ space)
-                                (submatch (1+ (in "0-9."))))))
   ;; Major version only.
   (when (string-match "\\([0-9]\\{2,\\}\\)" version)
     (setq version (match-string 1 version))
@@ -134,10 +125,6 @@ Root must be the root of an Emacs source tree."
                        (rx (and bol "/^#undef " (1+ not-newline)
                                 "define COPYRIGHT" (1+ space)
                                 ?\" (submatch (1+ (not (in ?\")))) ?\")))
-  (set-version-in-file root "nt/config.nt" copyright
-                       (rx (and bol "#" (0+ blank) "define" (1+ blank)
-                                "COPYRIGHT" (1+ blank)
-                                ?\" (submatch (1+ (not (in ?\")))) ?\")))
   (set-version-in-file root "lib-src/rcs2log" copyright
                        (rx (and "Copyright" (0+ space) ?= (0+ space)
                                 ?\' (submatch (1+ nonl)))))
diff --git a/admin/authors.el b/admin/authors.el
index c7ec3bcfdd6..547e046a8d7 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -1154,7 +1154,7 @@ it is found in `authors-fixed-case'."
           (setq regexps (cdr regexps))))))
   (when author
     (setq author (replace-regexp-in-string "[ \t]*[(<].*$" "" author))
-    (setq author (replace-regexp-in-string "\`[ \t]+" "" author))
+    (setq author (replace-regexp-in-string "\\`[ \t]+" "" author))
     (setq author (replace-regexp-in-string "[ \t]+$" "" author))
     (setq author (replace-regexp-in-string "[ \t]+" " " author))
     (unless (string-match "[-, \t]" author)
diff --git a/admin/notes/unicode b/admin/notes/unicode
index ebec417193f..079173f6b52 100644
--- a/admin/notes/unicode
+++ b/admin/notes/unicode
@@ -226,7 +226,6 @@ nontrivial changes to the build process.
         lisp/leim/quail/japanese.el
         lisp/leim/quail/py-punct.el
         lisp/leim/quail/pypunct-b5.el
-        lisp/term/x-win.el
 
      This file contains just Chinese characters, and has same problem.
      Also, it contains characters that cannot be encoded in UTF-8.
diff --git a/admin/unidata/makefile.w32-in b/admin/unidata/makefile.w32-in
deleted file mode 100644
index 0e9b9f0d2bd..00000000000
--- a/admin/unidata/makefile.w32-in
+++ /dev/null
@@ -1,56 +0,0 @@
-# makefile.w32-in -- W32 -*- Makefile -*- to generate character property tables.
-# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011
-#   National Institute of Advanced Industrial Science and Technology (AIST)
-#   Registration Number H13PRO009
-#
-# This file is part of GNU Emacs.
-
-# GNU Emacs is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# GNU Emacs is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-
-EMACS = ../../src/$(BLD)/emacs.exe
-DSTDIR = ../../lisp/international
-lisp = $(CURDIR)/../../lisp
-# EMACSLOADPATH should include international, so Emacs finds encoded-kb.
-# It should include emacs-lisp, so Emacs finds bytecomp.  This is because
-# lisp/subdirs.el is not generated yet when the commands below run.
-EMACSLOADPATH = $(lisp);$(lisp)/international;$(lisp)/emacs-lisp
-# Quote EMACS so it could be a file name with embedded whitespace
-RUNEMACS = "$(EMACS)" -Q -batch
-
-all: $(DSTDIR)/charprop.el
-
-.el.elc:
-        $(RUNEMACS) -f batch-byte-compile $<
-
-unidata.txt: UnicodeData.txt
-        sed -e \
-          $(ARGQUOTE)s/\([^;]*\);\(.*\)/(#x\1 $(DQUOTE)\2$(DQUOTE))/$(ARGQUOTE)\
-          -e $(ARGQUOTE)s/;/$(DQUOTE) $(DQUOTE)/g$(ARGQUOTE) < UnicodeData.txt > $@
-
-charprop-SH: unidata-gen.elc unidata.txt
-        ELC=$(CURDIR)/unidata-gen.elc; \
-        DATADIR=$(CURDIR); \
-        DATA=unidata.txt; \
-        cd $(DSTDIR); \
-          $(RUNEMACS) --load $${ELC} -f unidata-gen-files $${DATADIR} $${DATA}
-
-charprop-CMD: unidata-gen.elc unidata.txt
-        $(RUNEMACS) --eval $(ARGQUOTE)(cd $(DQUOTE)$(DSTDIR)$(DQUOTE))$(ARGQUOTE) --load $(CURDIR)/unidata-gen.elc -f unidata-gen-files $(CURDIR) unidata.txt
-
-${DSTDIR}/charprop.el: charprop-$(SHELLTYPE)
-
-clean:
-        - $(DEL) unidata-gen.elc unidata.txt
-