Merge branch 'master' of https://github.com/emacs-mirror/emacs

Author: Yuuki Harano

.gitignore

@@ -23,6 +23,9 @@
 # in Git 1.8.2 (March 2013).
 
 
+# Personal customization.
+.dir-locals-2.el
+
 # Built by 'autogen.sh'.
 /aclocal.m4
 /configure
@@ -256,7 +259,6 @@ gnustmp*
 ChangeLog
 [0-9]*.patch
 [0-9]*.txt
-.dir-locals?.el
 /vc-dwim-log-*
 
 # Built by 'make install'.

CONTRIBUTE

@@ -7,11 +7,14 @@ or run the shell command 'info "(emacs)Contributing"'.)
 ** The Emacs repository
 
 Emacs development uses Git on Savannah for its main repository.
-Briefly, the following shell commands build and run Emacs from scratch:
+To configure Git for Emacs development, you can run the following:
 
 	git config --global user.name 'Your Name'
 	git config --global user.email '[email protected]'
 	git config --global transfer.fsckObjects true
+
+The following shell commands then build and run Emacs from scratch:
+
 	git clone git://git.sv.gnu.org/emacs.git
 	cd emacs
 	./autogen.sh

ChangeLog.3

@@ -1,3 +1,11 @@
+2019-05-25  Eric S. Raymond <[email protected]>
+
+	Implement and document XDG-style startup files under ~/.config.
+
+	* lisp/startup.el (command-line): Allow XDG-style as well as old
+	style paths.
+	* doc/startup.texi: Document the above change.
+
 2019-04-11  Eli Zaretskii  <[email protected]>
 
 	Improve documentation of 'read-command'

INSTALL.REPO

@@ -1,8 +1,15 @@
 	     Building and Installing Emacs from the Repository
 
-Simply run 'make'.  This should work if your files are freshly checked
-out from the repository, and if you have the proper tools installed.
-If it doesn't work, or if you have special build requirements, the
+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 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
+from the repository, and if you have the proper tools installed.  If
+it doesn't work, or if you have special build requirements, the
 following information may be helpful.
 
 Building Emacs from the source-code repository requires some tools

admin/authors.el

@@ -3,6 +3,7 @@
 ;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Gerd Moellmann <[email protected]>
+;; Maintainer: [email protected]
 ;; Keywords: maint
 ;; Package: emacs
 

admin/charsets/Makefile.in

@@ -96,7 +96,7 @@ MULE =	MULE-ethiopic.map MULE-ipa.map MULE-is13194.map \
 	MULE-sisheng.map MULE-tibetan.map \
 	MULE-lviscii.map MULE-uviscii.map
 
-SED_SCRIPT = jisx2131-filter
+SED_SCRIPT = $(srcdir)/jisx2131-filter
 
 TRANS_TABLE = cp51932.el eucjp-ms.el
 TRANS_TABLE := $(addprefix ${lispintdir}/,${TRANS_TABLE})
@@ -200,12 +200,13 @@ ${charsetdir}/JISX0208.map: ${GLIBC_CHARMAPS}/EUC-JP.gz ${mapconv}
 ${charsetdir}/JISX0212.map: ${GLIBC_CHARMAPS}/EUC-JP.gz ${mapconv} ${compact}
 	${AM_V_GEN}${run_mapconv} $< '/^<.*[ 	]\/x8f/ s,/x8f,,' GLIBC-2-7 ${compact} > $@
 
-jisx2131-filter: ${mapfiledir}/JISX213A.map
+$(SED_SCRIPT): ${mapfiledir}/JISX213A.map
 	${AM_V_at}sed -n -e '/^#/d' -e 's,.*0x\([0-9A-Z]*\)$$,/0x0*\1$$/d,p' < $< > $@
 
-${charsetdir}/JISX2131.map: ${GLIBC_CHARMAPS}/EUC-JISX0213.gz ${mapconv} jisx2131-filter
+${charsetdir}/JISX2131.map: ${GLIBC_CHARMAPS}/EUC-JISX0213.gz ${mapconv} \
+  $(SED_SCRIPT)
 	${AM_V_GEN}${run_mapconv} $< '/^<.*[ 	]\/x[a-f]/' GLIBC-2-7 \
-	  | sed -f jisx2131-filter \
+	  | sed -f $(SED_SCRIPT) \
 	  | sed -e 's/0x2015/0x2014/' -e 's/0x2299/0x29BF/' > $@
 
 ${charsetdir}/JISX2132.map: ${GLIBC_CHARMAPS}/EUC-JISX0213.gz ${mapconv}
@@ -307,7 +308,6 @@ ${charsetdir}/%.map: ${GLIBC_CHARMAPS}/%.gz ${mapconv} ${compact}
 .PHONY: clean bootstrap-clean distclean maintainer-clean extraclean
 
 clean:
-	rm -f ${SED_SCRIPT}
 
 bootstrap-clean: clean
 
@@ -318,4 +318,4 @@ maintainer-clean: distclean
 
 ## Do not remove these files, even in a bootstrap.  They rarely change.
 extraclean:
-	rm -f ${CHARSETS} ${TRANS_TABLE} ${srcdir}/charsets.stamp
+	rm -f ${CHARSETS} ${SED_SCRIPT} ${TRANS_TABLE} ${srcdir}/charsets.stamp

admin/cus-test.el

@@ -2,8 +2,7 @@
 
 ;; Copyright (C) 1998, 2000, 2002-2019 Free Software Foundation, Inc.
 
-;; Author: Markus Rost <[email protected]>
-;; Maintainer: Markus Rost <[email protected]>
+;; Author: Markus Rost <[email protected]>
 ;; Created: 13 Sep 1998
 ;; Keywords: maint
 

admin/find-gc.el

@@ -2,6 +2,8 @@
 
 ;; Copyright (C) 1992, 2001-2019 Free Software Foundation, Inc.
 
+;; Maintainer: [email protected]
+
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software: you can redistribute it and/or modify

admin/grammars/grammar.wy

@@ -3,7 +3,6 @@
 ;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: David Ponce <[email protected]>
-;; Maintainer: David Ponce <[email protected]>
 ;; Created: 26 Aug 2002
 ;; Keywords: syntax
 ;; X-RCS: $Id: semantic-grammar.wy,v 1.16 2005/09/30 20:20:27 zappo Exp $

admin/grammars/java-tags.wy

@@ -3,7 +3,6 @@
 ;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: David Ponce <[email protected]>
-;; Maintainer: David Ponce <[email protected]>
 ;; Created: 26 Aug 2002
 ;; Keywords: syntax