Merge from trunk; up to 2014-02-23T23:41:17Z!lekktu@gmail.com.

51 files changed, 2382 insertions, 663 deletions

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index da8dec5a0f6..27d87dcaa2a 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -9,7 +9,6 @@ documented in config.in, and this file would not be necessary.
 
 AIX
 _AIX
-BSD_SYSTEM
 CYGWIN          Compiling the Cygwin port.
 __CYGWIN__      Ditto
 GNU_LINUX
@@ -25,7 +24,6 @@ _MSC_VER	Compiling the W32 port with the Microsoft C compiler.
 DARWIN_OS       Compiling on Mac OS X or pure Darwin (and using s/darwin.h).
 SOLARIS2
 USG
-USG5
 USG5_4
 
 ** Distinguishing GUIs **
@@ -136,8 +134,6 @@ HAVE_DECL_STRTOUMAX
 HAVE_DECL_SYS_SIGLIST
 HAVE_DECL_TZNAME
 HAVE_DECL___SYS_SIGLIST
-HAVE_DES_H
-HAVE_DEV_PTMX
 HAVE_DIALOGS
 HAVE_DIFFTIME
 HAVE_DUP2
@@ -149,7 +145,6 @@ HAVE_FORK
 HAVE_FREEIFADDRS
 HAVE_FREETYPE
 HAVE_FSEEKO
-HAVE_FSYNC
 HAVE_FUTIMENS
 HAVE_FUTIMES
 HAVE_FUTIMESAT
@@ -176,8 +171,6 @@ HAVE_GET_CURRENT_DIR_NAME
 HAVE_GHOSTSCRIPT
 HAVE_GIF
 HAVE_GNUTLS
-HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY
-HAVE_GNUTLS_CERTIFICATE_SET_VERIFY_FUNCTION
 HAVE_GPM
 HAVE_GRANTPT
 HAVE_GSETTINGS
@@ -200,26 +193,15 @@ HAVE_IMAGEMAGICK
 HAVE_INET_SOCKETS
 HAVE_INTTYPES_H
 HAVE_JPEG
-HAVE_KERBEROSIV_DES_H
 HAVE_KERBEROSIV_KRB_H
-HAVE_KERBEROS_DES_H
 HAVE_KERBEROS_KRB_H
 HAVE_KRB5_ERROR_E_TEXT
 HAVE_KRB5_ERROR_TEXT
 HAVE_KRB5_H
 HAVE_KRB_H
 HAVE_LANGINFO_CODESET
-HAVE_LIBCOM_ERR
-HAVE_LIBCRYPTO
-HAVE_LIBDES
-HAVE_LIBDES425
 HAVE_LIBDGC
 HAVE_LIBDNET
-HAVE_LIBHESIOD
-HAVE_LIBK5CRYPTO
-HAVE_LIBKRB
-HAVE_LIBKRB4
-HAVE_LIBKRB5
 HAVE_LIBKSTAT
 HAVE_LIBLOCKFILE
 HAVE_LIBM
@@ -228,12 +210,10 @@ HAVE_LIBOTF
 HAVE_LIBPERFSTAT
 HAVE_LIBPNG_PNG_H
 HAVE_LIBPTHREADS
-HAVE_LIBRESOLV
 HAVE_LIBSELINUX
 HAVE_LIBXEXT
 HAVE_LIBXML2
 HAVE_LIBXMU
-HAVE_LINUX_VERSION_H
 HAVE_LOCALTIME_R
 HAVE_LOCAL_SOCKETS
 HAVE_LONG_FILE_NAMES
@@ -300,7 +280,6 @@ HAVE_SNPRINTF
 HAVE_SOCKETS
 HAVE_SOUND
 HAVE_SOUNDCARD_H
-HAVE_SPEED_T
 HAVE_STDINT_H
 HAVE_STDIO_EXT_H
 HAVE_STDLIB_H
@@ -379,7 +358,6 @@ HAVE_WS2TCPIP_H
 HAVE_XAW3D
 HAVE_XFT
 HAVE_XIM
-HAVE_XKBGETKEYBOARD
 HAVE_XPM
 HAVE_XRMSETDATABASE
 HAVE_XSCREENNUMBEROFSCREEN
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 28e25ad98a3..f27a03af773 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,440 @@
+2014-02-06  David Engster  <deng@randomsample.de>
+
+        * grammars/c.by (function-pointer): Correctly deal with anonymous
+        function pointers.
+        (opt-brackets-after-symbol): New.
+        (multi-stage-dereference): Use it.  Add rules for explicit
+        matching the last dereference.
+
+2014-01-16  Eric S. Raymond  <esr@thyrsus.com>
+
+        * notes/commits: Add a 'graph on VCS-independent ways of
+        identifying commits and the desirability thereof.
+
+2014-01-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix copyright license notices for Adobe Unicode mapping files.
+        * charsets/mapfiles/README: The copied files are not compressed.
+        Check for copies as of today.
+        * charsets/mapfiles/stdenc.txt, charsets/mapfiles/symbol.txt:
+        Update from table version 0.2 (1999-03-30) to 1.0 (2011-07-12).
+        This doesn't change the table data, just copyright license notice.
+        The new notices are compatible with the GPL, the old ones were not.
+
+2014-01-13  Glenn Morris  <rgm@gnu.org>
+
+        * update_autogen (status): New function.  Use throughout.
+
+2014-01-10  Glenn Morris  <rgm@gnu.org>
+
+        * update_autogen: Fix sed bug that was losing the last AUTOGEN_VCS.
+
+2014-01-04  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (manual-html-fix-node-div): Handle Texinfo 5's movable <hr>.
+        (manual-html-fix-index-2): Tweak Texinfo 5 table format.
+        Fix minor Texinfo 4 issue with start of detailed menu.
+
+2014-01-03  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el: More Texinfo 5 updates.
+        (manual-html-fix-headers): Tweak Texinfo 5 body.
+        (manual-html-fix-node-div): Treat "header" like "node".
+        (manual-html-fix-index-1): Handle Texinfo 5 top heading.
+        (manual-html-fix-index-2): Tweak Texinfo 5 listing tables.
+
+2014-01-02  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * check-doc-strings: Replace `perl -w' with `use warnings;'.
+
+2013-12-30  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (manual-html-fix-headers, manual-html-fix-index-1):
+        Some updates for changes in Texinfo 5 output.
+
+2013-12-29  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * make-emacs:
+        * build-configs: Add the "use strict;" and "use warnings;" pragmas.
+
+2013-12-28  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (cusver-scan): Warn about missing :types.
+        (cusver-check): Interactively, require existing directories.
+
+2013-12-27  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * admin.el (manual-misc-manuals, make-manuals):
+        (manual-pdf, cusver-find-files):
+        (cusver-new-version, cusver-scan, cusver-goto-xref):
+        (cusver-check): Doc fix.
+        (manual-html-node, cusver-check): Use `user-error'.
+
+2013-12-24  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Automate the procedure for updating copyright year.
+        * merge-gnulib (GNULIB_MODULES): Add update-copyright.
+        * notes/years: Mention admin/update-copyright.
+        * update-copyright: New file.
+
+2013-12-24  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * admin.el (add-release-logs):
+        (set-version-in-file, set-version, set-copyright):
+        Use `user-error'.
+
+2013-12-22  Eli Zaretskii  <eliz@gnu.org>
+
+        * unidata/unidata-gen.el (unidata-split-name): Don't give any NAME
+        to <control> characters: the Unicode Standard says they have no
+        name.  (Bug#16216)
+        (unidata-describe-bidi-class): Add new "isolate" classes
+        introduced by Unicode 6.3.
+
+2013-12-12  David Engster  <deng@randomsample.de>
+
+        * grammars/c.by (expr-binop): Add MOD.
+        (variablearg): Add 'opt-assign'.
+        (variablearg, varnamelist): Add default values so that it can be
+        later expanded into the tag.
+        (opt-stuff-after-symbol): Rename to 'brackets-after-symbol' and
+        remove empty match.
+        (multi-stage-dereference): Adapt to above rename.
+        (unaryexpression): Use 'symbol' instead of 'namespace-symbol',
+        since the latter also leads to an empty match at the end which
+        would make this too greedy.
+        (variablearg-opt-name): Support parsing of function pointers
+        inside an argument list.
+
+2013-12-12  Glenn Morris  <rgm@gnu.org>
+
+        * update_autogen (info_dir):
+        Use dir_top from build-aux/ rather than admin/.
+
+        * update_autogen: Add option to generate info/dir.
+        (Usage): Add -I.
+        (info_flag): New variable.
+        (-I): New option.
+        (doc): Maybe check its status.
+        (info_dir): New function.
+        * dir_top: New file.
+
+2013-12-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Remove the option of using libcrypto.
+        * merge-gnulib: Remove lib/gl_openssh.h and m4/gl-openssl.m4.
+
+2013-12-04  Eli Zaretskii  <eliz@gnu.org>
+
+        * unidata/unidata-gen.el (unidata-prop-alist): Update bidi-class
+        to include the new isolate-related classes introduced with Unicode
+        v6.3.
+        (unidata-encode-val): Accept an additional optional argument, a
+        warning message to emit when UnicodeData.txt defines bidi-class
+        values that are not in unidata-prop-alist.  Add a comment
+        explaining what should maintainers do if/when such a warning ever
+        appears.
+        (unidata-gen-table): Call unidata-encode-val with 3rd arg non-nil
+        when generating uni-bidi.el.
+
+2013-12-01  Glenn Morris  <rgm@gnu.org>
+
+        * unidata/Makefile.in (${DSTDIR}/charprop.el):
+        Ensure output files are writable.
+
+2013-11-30  Glenn Morris  <rgm@gnu.org>
+
+        * grammars/Makefile.in: Ensure output files are writable.
+
+2013-11-30  Eli Zaretskii  <eliz@gnu.org>
+
+        * charsets/mule-charsets.el: Rewritten to work in Emacs 23 and
+        later.  (Bug#16007)
+
+2013-11-30  Glenn Morris  <rgm@gnu.org>
+
+        Stop keeping (most) generated cedet grammar files in the repository.
+        * grammars/README: Remove.
+        * grammars/Makefile.in: New file.
+        * grammars/c.by, grammars/java-tags.wy, grammars/js.wy:
+        * grammars/python.wy: Update declarations to match generated outputs.
+
+2013-11-28  Glenn Morris  <rgm@gnu.org>
+
+        * unidata/unidata-gen.el (unidata-gen-files):
+        Disable autoloads in generated files.
+
+2013-11-27  Glenn Morris  <rgm@gnu.org>
+
+        * unidata/Makefile.in (all, install, clean, bootstrap-clean)
+        (distclean, maintainer-clean): Declare as PHONY.
+        (compile, extraclean): New.
+        (${DSTDIR}/charprop.el): Depend on source files rather than
+        intermediate products.
+
+2013-11-11  Glenn Morris  <rgm@gnu.org>
+
+        * unidata/BidiMirroring.txt, unidata/UnicodeData.txt: Update to 6.3.0.
+
+        * unidata/unidata-gen.el (unidata-gen-files):
+        Tweak whitespace in generated files.
+
+2013-11-09  Glenn Morris  <rgm@gnu.org>
+
+        * unidata/unidata-gen.el (unidata-gen-files):
+        Fix deletion of existing output files after 2013-10-30 changes.
+
+2013-11-07  Glenn Morris  <rgm@gnu.org>
+
+        * unidata/unidata-gen.el (unidata-gen-files):
+        Disable version-control in generated files.
+        Update Unicode Inc. copyright years.
+
+2013-11-05  Glenn Morris  <rgm@gnu.org>
+
+        * update_autogen: Move here from ../autogen.
+        (usage): Update.  Remove -l, add -A.
+        (autogendir): New variable.
+        (ldefs_flag): Default to set.
+        (genfiles): Reduce to only ms-dos relevant files.
+        (main): Make checking autogen sources optional.
+        Make copying of autogen files optional.
+
+2013-10-30  Glenn Morris  <rgm@gnu.org>
+
+        * unidata/unidata-gen.el (unidata-gen-files): Use pop.
+        Also take the output directory as an argument.
+        * unidata/Makefile.in: Simplify now that unidata-gen-files takes
+        the output directory as an argument (no need to cd, etc).
+        (abs_srcdir, abs_builddir): Remove.
+        (abs_top_builddir): Replace by top_builddir.
+        (${DSTDIR}/charprop.el): No need to cd.  Pass dest as argument.
+        (${DSTDIR}/charprop.el, charprop.el):
+        No need to pass unidata.txt as argument.
+
+        * unidata/unidata-gen.el (unidata--ensure-compiled): New function.
+        (unidata-gen-table-name, unidata-gen-table-decomposition)
+        (unidata-gen-files): Use unidata--ensure-compiled.
+
+        * unidata/Makefile.in (abs_srcdir): New, set by configure.
+        (${DSTDIR}/charprop.el, charprop.el): Update for srcdir not absolute.
+        (clean): Delete all .elc files.
+        (bootstrap-clean): New rule.
+
+2013-10-23  Glenn Morris  <rgm@gnu.org>
+
+        * unidata/Makefile.in (emacs, ${DSTDIR}/charprop.el):
+        Quote entities that might contain whitespace.
+
+2013-10-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Improve support for popcount and counting trailing zeros (Bug#15550).
+        * merge-gnulib (GNULIB_MODULES): Add count-one-bits
+        and count-trailing-zeros.
+
+2013-10-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use hardware support for byteswapping on glibc x86 etc.
+        * merge-gnulib (GNULIB_MODULES): Add byteswap.
+
+2013-08-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * unidata/Makefile.in (SHELL): Now @SHELL@, not /bin/sh,
+        for portability to hosts where /bin/sh has problems.
+
+2013-08-27  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (manual-misc-manuals): Use INFO_COMMON rather than
+        INFO_TARGETS.  "faq" does not need special treatment any more.
+
+2013-08-15  Glenn Morris  <rgm@gnu.org>
+
+        * make-tarball.txt: Mention generating pdfs in etc/refcards.
+
+2013-08-15  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * notes/hydra: More information about Hydra.
+
+2013-08-10  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * notes/hydra: New file.
+
+2013-08-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix some minor races in hosts lacking mkostemp (Bug#15015).
+        * merge-gnulib (GNULIB_MODULES): Add mkostemp.
+
+2013-07-12  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (manual-style-string): Use non-abbreviated url.
+
+2013-07-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Port recent close-on-exec changes to Cygwin (Bug#14821).
+        * merge-gnulib (GNULIB_TOOL_FLAGS): Don't avoid binary-io.
+
+        Handle error numbers a bit more reliably.
+        * merge-gnulib (GNULIB_MODULES): Remove ignore-value.
+
+2013-07-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Make file descriptors close-on-exec when possible (Bug#14803).
+        * merge-gnulib (GNULIB_MODULES): Add fcntl, pipe2.
+        (GNULIB_TOOL_FLAGS): Avoid binary-io, close.  Do not avoid fcntl.
+
+2013-07-06  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (manual-misc-manuals): New function.
+        (make-manuals): Avoid hard-coding list of misc manuals.
+        Add the option to only make certain type(s) of output.
+        (manual-misc-html): Special-case ccmode and efaq.
+        (manual-html-mono, manual-html-node, manual-pdf, manual-ps):
+        Move creation of output directory here from make-manuals.
+        (manual-html-fix-index-2): Avoid dynamic reference to `f'.
+
+2013-07-05  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (make-manuals): Use a standard location for lispintro.
+        Use a pdf/ subdirectory for pdf versions.
+
+2013-06-29  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (make-manuals): Don't bother with txt or dvi any more.
+        (manual-txt): Remove.
+        (manual-pdf): Doc fix.
+        (manual-ps): Rename from manual-dvi.
+        (manual-pdf, manual-ps): Work in the directory with the texi file,
+        so that TeX intermediate files go there rather than to PWD.
+
+2013-06-15  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * notes/changelogs: Mention trivial changes in Change Log.
+
+2013-06-13  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (manual-style-string): Use new file manual.css.
+
+2013-06-02  Eric Ludlam  <zappo@gnu.org>
+
+        * grammars/srecode-template.wy (variable): Accept a single number
+        as a variable value.  Allows the 'priority' to be set to a number.
+        (wisent-srecode-template-lexer): Move number up so it can be created.
+
+2013-05-16  Glenn Morris  <rgm@gnu.org>
+
+        * cus-test.el (cus-test-cus-load-groups): New function.
+        (cus-test-get-options): Add option to return groups.
+        (cus-test-noloads): Also check custom groups.
+
+2013-05-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * quick-install-emacs: Don't prune DOC-* files a any more.
+
+2013-05-14  Glenn Morris  <rgm@gnu.org>
+
+        * cus-test.el (cus-test-get-lisp-files): Ignore obsolete/.
+        (cus-test-libs): Fix let-binding of default-directory.
+        (cus-test-noloads): Load all libs for the comparison.
+
+2013-05-11  Glenn Morris  <rgm@gnu.org>
+
+        * cus-test.el (cus-test-libs-noloads): Add a few more files.
+        (cus-test-load-libs, cus-test-opts):
+        Add option to load more/all Lisp files.
+        (cus-test-get-lisp-files): Ignore .*.el files.
+
+2013-05-10  Glenn Morris  <rgm@gnu.org>
+
+        * cus-test.el (cus-test-libs-noloads): Add some files.
+        (cus-test-get-lisp-files): New function.
+        (cus-test-libs): Add option to load more/all Lisp files.
+
+2013-05-09  Glenn Morris  <rgm@gnu.org>
+
+        * cus-test.el: No need to provide bbdb, bbdb-com any more.
+        (cus-test-libs-noloads): Add dunnet in the defvar.
+        (dunnet): Don't always load it.
+        (viper-mode): Only set if interactive.
+        (cus-test-load-custom-loads): Load dunnet if necessary.
+        (cus-test-load-1): New macro, with common code from cus-test-load-libs
+        and cus-test-libs.
+        (cus-test-load-libs, cus-test-libs): Use cus-test-load-1 macro.
+        Update for cus-test-get-autoload-deps changed result.
+        (cus-test-get-autoload-deps): Simplify.  Return file names as they
+        appear in loaddefs.el (directory parts are needed now that not all
+        lisp subdirs are in load-path).
+        (cus-test-deps): Explicitly skip dunnet.
+
+2013-05-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use Gnulib ACL implementation, for benefit of Solaris etc.  (Bug#14295)
+        * merge-gnulib (GNULIB_MODULES): Add qacl.
+        (GNULIB_TOOL_FLAGS): Do not avoid errno.
+
+2013-04-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use UTF-8 for most files with non-ASCII characters (Bug#13936).
+        * notes/unicode (etc/tutorials/TUTORIAL.ko, leim/quail/hanja.el)
+        (leim/quail/hanja3.el, leim/quail/symbol-ksc.el):
+        Now utf-8, not iso-2022-7bit.  Also, files that contain non-UTF-8
+        characters are now encoded in utf-8-emacs, not iso-2022-7bit.
+
+2013-03-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * notes/unicode: Mention some more iso-2022-7bit files (Bug#13936).
+
+        Automate the build of ja-dic.el (Bug#13984).
+        * notes/unicode: ja-dic.el is now UTF-8.
+
+2013-03-16  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (manual-pdf, manual-dvi): Pass -I to texi2pdf, texi2dvi.
+
+2013-03-16  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (manual-html-mono, manual-html-node): Add -DWWW_GNU_ORG.
+
+2013-03-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+        File synchronization fixes (Bug#13944).
+        * CPP-DEFINES (BSD_SYSTEM, HAVE_FSYNC): Remove.
+        * merge-gnulib (GNULIB_MODULES): Add fsync, fdatasync.
+
+2013-03-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * notes/unicode: Improve notes about Emacs source file encoding.
+
+2013-03-11  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (make-manuals): Add emacs-lisp-intro and some more
+        doc/misc manuals.
+        (manual-html-mono, manual-html-node, manual-txt):
+        Pass -I to makeinfo.
+
+2013-03-10  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (add-release-logs): Use UTC for release date.
+
+2013-03-09  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (add-release-logs): Provide interactive defaults.
+        Allow specification of the release date.  Don't exclude gnus/.
+
+2013-03-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * notes/unicode: Add notes about Emacs source file encoding.
+
+2013-03-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * grammars/java-tags.wy (CHAR): Remove "('\u0000' to '\uffff')"
+        from summary, as this causes javat-wy.el to contain both a null byte
+        and a byte sequence that is not valid UTF-8, which is inconvenient.
+
+2013-03-03  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * bzrmerge.el (bzrmerge-apply): Omit Latin-1 char from diagnostic.
+        If there were a real need, it should be UTF-8 anyway.
+
 2013-02-25  Paul Eggert  <eggert@cs.ucla.edu>
 
         Simplify data_start configuration (Bug#13783).
@@ -29,7 +466,7 @@
 
 2012-12-14  Paul Eggert  <eggert@cs.ucla.edu>
 
-        Fix permissions bugs with setgid directories etc. (Bug#13125)
+        Fix permissions bugs with setgid directories etc.  (Bug#13125)
         * CPP-DEFINES (BSD4_2): Remove.
 
 2012-12-08  Paul Eggert  <eggert@cs.ucla.edu>
@@ -145,10 +582,10 @@
         (cusver-scan): Check if containing group has a :version.
         (cusver-check): Add VERSION argument.
 
-2012-10-01  David Engster  <deng@randomsample.de>
+2012-10-06  David Engster  <deng@randomsample.de>
 
         * grammars/bovine-grammar.el:
-        * grammars/wisent-grammar.el: Move to lisp directory.
+        * grammars/wisent-grammar.el: Move to lisp/cedet/semantic directory.
 
 2012-10-01  David Engster  <deng@randomsample.de>
 
@@ -161,7 +598,7 @@
 
         * grammars/grammar.wy (semantic-grammar-lexer): Remove, since it
         was copied to grammar.el.  New %provide token to generate prefix
-        which conforms with Emacs conventions.  Remove lexer definition,
+        which conforms with Emacs conventions.  Remove lexer definition,
         which is now in grammar.el.
 
 2012-09-27  Glenn Morris  <rgm@gnu.org>
@@ -607,6 +1044,10 @@
 
         * notes/bugtracker (bugtracker_debbugs_url): Fix typo.
 
+2011-02-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * notes/copyright: Remove src/md5.c and src/md5.h as special cases.
+
 2011-02-19  Eli Zaretskii  <eliz@gnu.org>
 
         * admin.el (set-version): Add msdos/sed2v2.inp.
@@ -616,6 +1057,7 @@
         Remove no-longer needed getloadavg symbols.
         * CPP-DEFINES (LOAD_AVE_CVT, LOAD_AVE_TYPE, FSCALE, KERNEL_FILE):
         (LDAV_SYMBOL): Remove.
+        * notes/copyright: Remove src/getloadavg.c as a special case.
 
 2011-02-12  Glenn Morris  <rgm@gnu.org>
 
@@ -1138,7 +1580,7 @@
         Sub-directory `unidata' is for codes to generate charprop.el and
         many other uni-*.el files from `UnicodeData.txt'.
 
-        * Unidata/README: New file.
+        * unidata/README: New file.
 
         * unidata/Makefile: New file.
 
@@ -1564,8 +2006,6 @@
         emacs.exe before zipping, and including batch file to recreate
         after unpacking.
 
-        * nt/stitch.bat: New file.
-
         * nt/README-ftp-server: Update wording and version number etc.
         Add extra instructions for installing multi-file .zip
         distribution.
@@ -1685,7 +2125,7 @@
 
 2001-09-04  Andrew Innes  <andrewi@gnu.org>
 
-        * admin/nt/makedist.bat: Remove reference to obsolete file
+        * nt/makedist.bat: Remove reference to obsolete file
         GETTING.GNU.SOFTWARE.  Remove outdated comments.  Explain about
         version of tar used.
 
@@ -1693,7 +2133,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2001-2013 Free Software Foundation, Inc.
+  Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 1e4f9f3b48d..8b6bddbbd2f 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -2,7 +2,13 @@ Tasks needed before the next release.
 
 * TO BE DONE SHORTLY BEFORE RELEASE
 
+** Either update, test, and support the old w32 build method, or remove it.
+
 ** Manuals
+Check for node names using problematic characters:
+  find doc -name '*.texi' -exec grep '^@node[^,]*[:.()]' {} +
+Sadly makeinfo does not warn about such characters.
+
 Check cross-references between the manuals (eg from emacs to elisp)
 are correct.  You can use something like the following in the info
 directory in the Emacs build tree:
@@ -10,6 +16,28 @@ directory in the Emacs build tree:
 emacs -Q --eval "(progn (require 'info) (setq Info-directory-list '(\".\")))" \
   -f info-xref-check-all
 
+Setting Info-directory-list avoids having system info pages confuse
+things.  References to external manuals will be flagged as
+uncheckable.  You should still check these, and also that each
+external manual has an appropriate redirect in the file manual/.htaccess
+in the web pages repository.  E.g.:
+Redirect /software/emacs/manual/html_mono/automake.html /software/automake/manual/automake.html
+Redirect /software/emacs/manual/html_node/automake/ /software/automake/manual/html_node/
+
+Another tool you can use to check links is gnu.org's linc.py:
+http://www.gnu.org/server/source/
+
+You run this something like:
+
+cd /path/to/cvs/emacs-www
+linc.py -o /path/to/output-dir --url http://www.gnu.org/software/emacs/ .
+
+Be warned that it is really, really slow (as in, can take ~ a full day
+to check the manual/ directory).  It is probably best to run it on a
+single directory at a time from eg manual/html_node.  It is very
+inefficient, but may reveal a few things that info-xref does not.
+
+
 make emacs.dvi, elisp.dvi, and deal with any errors (undefined
 references etc) in the output.  Break any overfull lines.
 Underfull hboxes are not serious, but it can be nice to get rid of
@@ -42,7 +70,6 @@ I think this is different to what you get if you just use eg `make
 emacs.pdf' (e.g., enable "smallbook").
 
 ** Check the keybindings in the refcards are correct, and add any new ones.
-Regenerate the pdf versions in etc/refcards/.
 What paper size are the English versions supposed to be on?
 On Debian testing, the packages texlive-lang-czechslovak and
 texlive-lang-polish will let you generate the cs-* and sk-* pdfs.
@@ -112,7 +139,7 @@ SECTION                  READERS
 ----------------------------------
 TUTORIAL             cyd
 TUTORIAL.bg          ogi
-TUTORIAL.cn
+TUTORIAL.cn          xfq
 TUTORIAL.cs          
 TUTORIAL.de          wl
 TUTORIAL.eo
@@ -120,7 +147,7 @@ TUTORIAL.es
 TUTORIAL.fr          
 TUTORIAL.he          eliz
 TUTORIAL.it          
-TUTORIAL.ja              
+TUTORIAL.ja          
 TUTORIAL.ko
 TUTORIAL.nl          Pieter Schoenmakers
 TUTORIAL.pl          
@@ -191,7 +218,6 @@ xresources.texi   cyd
 ** Check the Lisp manual.
 
 abbrevs.texi      rgm
-advice.texi       cyd
 anti.texi         rgm
 back.texi         rgm
 backups.texi      cyd
diff --git a/admin/README b/admin/README
index d696a14176e..6a5fce688a9 100644
--- a/admin/README
+++ b/admin/README
@@ -1,4 +1,4 @@
-Copyright (C) 2001-2013 Free Software Foundation, Inc.
+Copyright (C) 2001-2014 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
diff --git a/admin/admin.el b/admin/admin.el
index e815dfade47..007cb06e592 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -1,6 +1,6 @@
 ;;; admin.el --- utilities for Emacs administration
 
-;; Copyright (C) 2001-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -21,46 +21,64 @@
 
 ;; add-release-logs     Add ``Version X released'' change log entries.
 ;; set-version          Change Emacs version number in source tree.
-;; set-copyright        Change emacs short copyright string (eg as
+;; set-copyright        Change Emacs short copyright string (eg as
 ;;                      printed by --version) in source tree.
 
 ;;; Code:
 
 (defvar add-log-time-format)            ; in add-log
 
-(defun add-release-logs (root version)
+;; Does this information need to be in every ChangeLog, as opposed to
+;; just the top-level one?  Only if you allow changes the same
+;; day as the release.
+;; http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00161.html
+(defun add-release-logs (root version &optional date)
   "Add \"Version VERSION released.\" change log entries in ROOT.
-Root must be the root of an Emacs source tree."
-  (interactive "DEmacs root directory: \nNVersion number: ")
+Root must be the root of an Emacs source tree.
+Optional argument DATE is the release date, default today."
+  (interactive (list (read-directory-name "Emacs root directory: ")
+                     (read-string "Version number: "
+                                  (format "%s.%s" emacs-major-version
+                                          emacs-minor-version))
+                     (read-string "Release date: "
+                                  (progn (require 'add-log)
+                                         (let ((add-log-time-zone-rule t))
+                                           (funcall add-log-time-format))))))
   (setq root (expand-file-name root))
   (unless (file-exists-p (expand-file-name "src/emacs.c" root))
-    (error "%s doesn't seem to be the root of an Emacs source tree" root))
+    (user-error "%s doesn't seem to be the root of an Emacs source tree" root))
   (require 'add-log)
+  (or date (setq date (let ((add-log-time-zone-rule t))
+                        (funcall add-log-time-format))))
   (let* ((logs (process-lines "find" root "-name" "ChangeLog"))
          (entry (format "%s  %s  <%s>\n\n\t* Version %s released.\n\n"
-                        (funcall add-log-time-format)
+                        date
                         (or add-log-full-name (user-full-name))
                         (or add-log-mailing-address user-mail-address)
                         version)))
     (dolist (log logs)
-      (unless (string-match "/gnus/" log)
-        (find-file log)
-        (goto-char (point-min))
-        (insert entry)))))
+      (find-file log)
+      (goto-char (point-min))
+      (insert entry))))
 
 (defun set-version-in-file (root file version rx)
+  "Subroutine of `set-version' and `set-copyright'."
   (find-file (expand-file-name file root))
   (goto-char (point-min))
-  (unless (re-search-forward rx nil t)
-    (error "Version not found in %s" file))
+  (unless (re-search-forward rx nil :noerror)
+    (user-error "Version not found in %s" file))
   (replace-match (format "%s" version) nil nil nil 1))
 
+;; TODO report the progress
 (defun set-version (root version)
   "Set Emacs version to VERSION in relevant files under ROOT.
 Root must be the root of an Emacs source tree."
   (interactive "DEmacs root directory: \nsVersion number: ")
   (unless (file-exists-p (expand-file-name "src/emacs.c" root))
-    (error "%s doesn't seem to be the root of an Emacs source tree" root))
+    (user-error "%s doesn't seem to be the root of an Emacs source tree" root))
+  ;; There's also a "version 3" (standing for GPLv3) at the end of
+  ;; `README', but since `set-version-in-file' only replaces the first
+  ;; occurrence, it won't be replaced.
   (set-version-in-file root "README" version
                        (rx (and "version" (1+ space)
                                 (submatch (1+ (in "0-9."))))))
@@ -91,7 +109,7 @@ Root must be the root of an Emacs source tree."
   ;; in two places those commas are followed by space, in two other
   ;; places they are not.
   (let* ((version-components (append (split-string version "\\.")
-                                    '("0" "0")))
+                                     '("0" "0")))
          (comma-version
           (concat (car version-components) ","
                   (cadr version-components) ","
@@ -144,6 +162,7 @@ Root must be the root of an Emacs source tree."
 
 
 ;; Note this makes some assumptions about form of short copyright.
+;; TODO report the progress
 (defun set-copyright (root copyright)
   "Set Emacs short copyright to COPYRIGHT in relevant files under ROOT.
 Root must be the root of an Emacs source tree."
@@ -154,7 +173,7 @@ Root must be the root of an Emacs source tree."
                  (format "Copyright (C) %s Free Software Foundation, Inc."
                          (format-time-string "%Y")))))
   (unless (file-exists-p (expand-file-name "src/emacs.c" root))
-    (error "%s doesn't seem to be the root of an Emacs source tree" root))
+    (user-error "%s doesn't seem to be the root of an Emacs source tree" root))
   (set-version-in-file root "configure.ac" copyright
                        (rx (and bol "copyright" (0+ (not (in ?\")))
                                 ?\" (submatch (1+ (not (in ?\")))) ?\")))
@@ -180,54 +199,87 @@ Root must be the root of an Emacs source tree."
 
 ;;; Various bits of magic for generating the web manuals
 
-(defun make-manuals (root)
-  "Generate the web manuals for the Emacs webpage."
-  (interactive "DEmacs root directory: ")
+(defun manual-misc-manuals (root)
+  "Return doc/misc manuals as list of strings.
+ROOT should be the root of an Emacs source tree."
+  ;; Similar to `make -C doc/misc echo-info', but works if unconfigured,
+  ;; and for INFO_TARGETS rather than INFO_INSTALL.
+  (with-temp-buffer
+    (insert-file-contents (expand-file-name "doc/misc/Makefile.in" root))
+    ;; Should really use expanded value of INFO_TARGETS.
+    (search-forward "INFO_COMMON = ")
+    (let ((start (point)))
+      (end-of-line)
+      (while (and (looking-back "\\\\")
+                  (zerop (forward-line 1)))
+        (end-of-line))
+      (append (split-string (replace-regexp-in-string
+                             "\\(\\\\\\|\\.info\\)" ""
+                             (buffer-substring start (point))))
+              '("efaq-w32")))))
+
+;; TODO report the progress
+(defun make-manuals (root &optional type)
+  "Generate the web manuals for the Emacs webpage.
+ROOT should be the root of an Emacs source tree.
+Interactively with a prefix argument, prompt for TYPE.
+Optional argument TYPE is type of output (nil means all)."
+  (interactive (let ((root (read-directory-name "Emacs root directory: "
+                                                source-directory nil t)))
+                 (list root
+                       (if current-prefix-arg
+                           (completing-read
+                            "Type: "
+                            (append
+                             '("misc" "pdf" "ps")
+                             (let (res)
+                               (dolist (i '("emacs" "elisp" "eintr") res)
+                                 (dolist (j '("" "-mono" "-node" "-ps" "-pdf"))
+                                   (push (concat i j) res))))
+                             (manual-misc-manuals root)))))))
   (let* ((dest (expand-file-name "manual" root))
          (html-node-dir (expand-file-name "html_node" dest))
          (html-mono-dir (expand-file-name "html_mono" dest))
-         (txt-dir (expand-file-name "text" dest))
-         (dvi-dir (expand-file-name "dvi" dest))
-         (ps-dir (expand-file-name "ps" dest)))
+         (ps-dir (expand-file-name "ps" dest))
+         (pdf-dir (expand-file-name "pdf" dest))
+         (emacs (expand-file-name "doc/emacs/emacs.texi" root))
+         (elisp (expand-file-name "doc/lispref/elisp.texi" root))
+         (eintr (expand-file-name "doc/lispintro/emacs-lisp-intro.texi" root))
+         (misc (manual-misc-manuals root)))
+    ;; TODO this makes it non-continuable.
+    ;; Instead, delete the individual dest directory each time.
     (when (file-directory-p dest)
-      (if (y-or-n-p (format "Directory %s exists, delete it first?" dest))
+      (if (y-or-n-p (format "Directory %s exists, delete it first? " dest))
           (delete-directory dest t)
-        (error "Aborted")))
-    (make-directory dest)
-    (make-directory html-node-dir)
-    (make-directory html-mono-dir)
-    (make-directory txt-dir)
-    (make-directory dvi-dir)
-    (make-directory ps-dir)
-    ;; Emacs manual
-    (let ((texi (expand-file-name "doc/emacs/emacs.texi" root)))
-      (manual-html-node texi (expand-file-name "emacs" html-node-dir))
-      (manual-html-mono texi (expand-file-name "emacs.html" html-mono-dir))
-      (manual-txt texi (expand-file-name "emacs.txt" txt-dir))
-      (manual-pdf texi (expand-file-name "emacs.pdf" dest))
-      (manual-dvi texi (expand-file-name "emacs.dvi" dvi-dir)
-                  (expand-file-name "emacs.ps" ps-dir)))
-    ;; Lisp manual
-    (let ((texi (expand-file-name "doc/lispref/elisp.texi" root)))
-      (manual-html-node texi (expand-file-name "elisp" html-node-dir))
-      (manual-html-mono texi (expand-file-name "elisp.html" html-mono-dir))
-      (manual-txt texi (expand-file-name "elisp.txt" txt-dir))
-      (manual-pdf texi (expand-file-name "elisp.pdf" dest))
-      (manual-dvi texi (expand-file-name "elisp.dvi" dvi-dir)
-                  (expand-file-name "elisp.ps" ps-dir)))
+        (user-error "Aborted")))
+    (if (member type '(nil "emacs" "emacs-node"))
+        (manual-html-node emacs (expand-file-name "emacs" html-node-dir)))
+    (if (member type '(nil "emacs" "emacs-mono"))
+        (manual-html-mono emacs (expand-file-name "emacs.html" html-mono-dir)))
+    (if (member type '(nil "emacs" "emacs-pdf" "pdf"))
+        (manual-pdf emacs (expand-file-name "emacs.pdf" pdf-dir)))
+    (if (member type '(nil "emacs" "emacs-ps" "ps"))
+        (manual-ps emacs (expand-file-name "emacs.ps" ps-dir)))
+    (if (member type '(nil "elisp" "elisp-node"))
+        (manual-html-node elisp (expand-file-name "elisp" html-node-dir)))
+    (if (member type '(nil "elisp" "elisp-mono"))
+        (manual-html-mono elisp (expand-file-name "elisp.html" html-mono-dir)))
+    (if (member type '(nil "elisp" "elisp-pdf" "pdf"))
+        (manual-pdf elisp (expand-file-name "elisp.pdf" pdf-dir)))
+    (if (member type '(nil "elisp" "elisp-ps" "ps"))
+        (manual-ps elisp (expand-file-name "elisp.ps" ps-dir)))
+    (if (member type '(nil "eintr" "eintr-node"))
+        (manual-html-node eintr (expand-file-name "eintr" html-node-dir)))
+    (if (member type '(nil "eintr" "eintr-node"))
+        (manual-html-mono eintr (expand-file-name "eintr.html" html-mono-dir)))
+    (if (member type '(nil "eintr" "eintr-pdf" "pdf"))
+        (manual-pdf eintr (expand-file-name "eintr.pdf" pdf-dir)))
+    (if (member type '(nil "eintr" "eintr-ps" "ps"))
+        (manual-ps eintr (expand-file-name "eintr.ps" ps-dir)))
     ;; Misc manuals
-    (let ((manuals '("ada-mode" "auth" "autotype" "calc" "cc-mode"
-                     "cl" "dbus" "dired-x" "ebrowse" "ede" "ediff"
-                     "edt" "eieio" "emacs-mime" "epa" "erc" "ert"
-                     "eshell" "eudc" "faq" "flymake" "forms"
-                     "gnus" "emacs-gnutls" "idlwave" "info"
-                     "mairix-el" "message" "mh-e" "newsticker"
-                     "nxml-mode" "org" "pcl-cvs" "pgg" "rcirc"
-                     "remember" "reftex" "sasl" "sc" "semantic"
-                     "ses" "sieve" "smtpmail" "speedbar" "tramp"
-                     "url" "vip" "viper" "widget" "woman")))
-      (dolist (manual manuals)
-        (manual-misc-html manual root html-node-dir html-mono-dir)))
+    (dolist (manual misc)
+      (if (member type `(nil ,manual "misc"))
+          (manual-misc-html manual root html-node-dir html-mono-dir)))
     (message "Manuals created in %s" dest)))
 
 (defconst manual-doctype-string
@@ -242,10 +294,14 @@ Root must be the root of an Emacs source tree."
 <meta name=\"DC.title\" content=\"gnu.org\">\n\n")
 
 (defconst manual-style-string "<style type=\"text/css\">
-@import url('/style.css');\n</style>\n")
+@import url('/software/emacs/manual.css');\n</style>\n")
 
 (defun manual-misc-html (name root html-node-dir html-mono-dir)
-  (let ((texi (expand-file-name (format "doc/misc/%s.texi" name) root)))
+  ;; Hack to deal with the cases where .texi creates a different .info.
+  ;; Blech.  TODO Why not just rename the .texi (or .info) files?
+  (let* ((texiname (cond ((equal name "ccmode") "cc-mode")
+                         (t name)))
+         (texi (expand-file-name (format "doc/misc/%s.texi" texiname) root)))
     (manual-html-node texi (expand-file-name name html-node-dir))
     (manual-html-mono texi (expand-file-name (concat name ".html")
                                              html-mono-dir))))
@@ -255,7 +311,13 @@ Root must be the root of an Emacs source tree."
 This function also edits the HTML files so that they validate as
 HTML 4.01 Transitional, and pulls in the gnu.org stylesheet using
 the @import directive."
+  (make-directory (or (file-name-directory dest) ".") t)
   (call-process "makeinfo" nil nil nil
+                "-D" "WWW_GNU_ORG"
+                "-I" (expand-file-name "../emacs"
+                                       (file-name-directory texi-file))
+                "-I" (expand-file-name "../misc"
+                                       (file-name-directory texi-file))
                 "--html" "--no-split" texi-file "-o" dest)
   (with-temp-buffer
     (insert-file-contents dest)
@@ -266,6 +328,7 @@ the @import directive."
     (manual-html-fix-node-div)
     (goto-char (point-max))
     (re-search-backward "</body>[\n \t]*</html>")
+    ;; Close the div id="content" that fix-index-1 added.
     (insert "</div>\n\n")
     (save-buffer)))
 
@@ -275,8 +338,14 @@ This function also edits the HTML files so that they validate as
 HTML 4.01 Transitional, and pulls in the gnu.org stylesheet using
 the @import directive."
   (unless (file-exists-p texi-file)
-    (error "Manual file %s not found" texi-file))
+    (user-error "Manual file %s not found" texi-file))
+  (make-directory dir t)
   (call-process "makeinfo" nil nil nil
+                "-D" "WWW_GNU_ORG"
+                "-I" (expand-file-name "../emacs"
+                                       (file-name-directory texi-file))
+                "-I" (expand-file-name "../misc"
+                                       (file-name-directory texi-file))
                 "--html" texi-file "-o" dir)
   ;; Loop through the node files, fixing them up.
   (dolist (f (directory-files dir nil "\\.html\\'"))
@@ -300,143 +369,244 @@ the @import directive."
                 (manual-html-fix-index-2)
                 (if copyright-text
                     (insert copyright-text))
+                ;; Close the div id="content" that fix-index-1 added.
                 (insert "\n</div>\n"))
             ;; For normal nodes, give the header div a blue bg.
-            (manual-html-fix-node-div))
+            (manual-html-fix-node-div t))
           (save-buffer))))))
 
-(defun manual-txt (texi-file dest)
-  "Run Makeinfo on TEXI-FILE, emitting plaintext output to DEST."
-  (call-process "makeinfo" nil nil nil
-                "--plaintext" "--no-split" texi-file "-o" dest)
-  (shell-command (concat "gzip -c " dest " > " (concat dest ".gz"))))
-
 (defun manual-pdf (texi-file dest)
-  "Run texi2pdf on TEXI-FILE, emitting plaintext output to DEST."
-  (call-process "texi2pdf" nil nil nil texi-file "-o" dest))
-
-(defun manual-dvi (texi-file dest ps-dest)
-  "Run texi2dvi on TEXI-FILE, emitting dvi output to DEST.
-Also generate PostScript output in PS-DEST."
-  (call-process "texi2dvi" nil nil nil texi-file "-o" dest)
-  (call-process "dvips" nil nil nil dest "-o" ps-dest)
-  (call-process "gzip" nil nil nil dest)
-  (call-process "gzip" nil nil nil ps-dest))
+  "Run texi2pdf on TEXI-FILE, emitting PDF output to DEST."
+  (make-directory (or (file-name-directory dest) ".") t)
+  (let ((default-directory (file-name-directory texi-file)))
+    (call-process "texi2pdf" nil nil nil
+                  "-I" "../emacs" "-I" "../misc"
+                  texi-file "-o" dest)))
+
+(defun manual-ps (texi-file dest)
+  "Generate a PostScript version of TEXI-FILE as DEST."
+  (make-directory (or (file-name-directory dest) ".") t)
+  (let ((dvi-dest (concat (file-name-sans-extension dest) ".dvi"))
+        (default-directory (file-name-directory texi-file)))
+    ;; FIXME: Use `texi2dvi --ps'?  --xfq
+    (call-process "texi2dvi" nil nil nil
+                  "-I" "../emacs" "-I" "../misc"
+                  texi-file "-o" dvi-dest)
+    (call-process "dvips" nil nil nil dvi-dest "-o" dest)
+    (delete-file dvi-dest)
+    (call-process "gzip" nil nil nil dest)))
 
 (defun manual-html-fix-headers ()
   "Fix up HTML headers for the Emacs manual in the current buffer."
-  (let (opoint)
-    (insert manual-doctype-string)
+  (let ((texi5 (search-forward "<!DOCTYPE" nil t))
+        opoint)
+    ;; Texinfo 5 supplies a DOCTYPE.
+    (or texi5
+        (insert manual-doctype-string))
     (search-forward "<head>\n")
     (insert manual-meta-string)
     (search-forward "<meta")
     (setq opoint (match-beginning 0))
-    (re-search-forward "<!--")
+    (unless texi5
+      (search-forward "<!--")
+      (goto-char (match-beginning 0))
+      (delete-region opoint (point))
+      (search-forward "<meta http-equiv=\"Content-Style")
+      (setq opoint (match-beginning 0)))
+    (search-forward "</head>")
     (goto-char (match-beginning 0))
     (delete-region opoint (point))
     (insert manual-style-string)
-    (search-forward "<meta http-equiv=\"Content-Style")
-    (setq opoint (match-beginning 0))
-    (search-forward "</head>")
-    (delete-region opoint (match-beginning 0))))
+    ;; Remove Texinfo 5 hard-coding bgcolor, text, link, vlink, alink.
+    (when (re-search-forward "<body lang=\"[^\"]+\"" nil t)
+      (setq opoint (point))
+      (search-forward ">")
+      (if (> (point) (1+ opoint))
+          (delete-region opoint (1- (point))))
+      (search-backward "</head"))))
 
-(defun manual-html-fix-node-div ()
+;; Texinfo 5 changed these from class = "node" to "header", yay.
+(defun manual-html-fix-node-div (&optional split)
   "Fix up HTML \"node\" divs in the current buffer."
-  (let (opoint div-end)
-    (while (search-forward "<div class=\"node\">" nil t)
-      (replace-match
-       "<div class=\"node\" style=\"background-color:#DDDDFF\">"
-       t t)
+  (let (opoint div-end type)
+    (while (re-search-forward "<div class=\"\\(node\\|header\\)\"\\(>\\)" nil t)
+      (setq type (match-string 1))
+      ;; NB it is this that makes the bg of non-header cells in the
+      ;; index tables be blue.  Is that intended?
+      ;; Also, if you don't remove the <hr>, the color of the first
+      ;; row in the table will be wrong.
+      ;; This all seems rather odd to me...
+      (replace-match " style=\"background-color:#DDDDFF\">" t t nil 2)
       (setq opoint (point))
-      (re-search-forward "</div>")
-      (setq div-end (match-beginning 0))
-      (goto-char opoint)
-      (if (search-forward "<hr>" div-end 'move)
-          (replace-match "" t t)))))
+      (when (or split (equal type "node"))
+        ;; In Texinfo 4, the <hr> (and anchor) comes after the <div>.
+        (re-search-forward "</div>")
+        (setq div-end (if (equal type "node")
+                          (match-beginning 0)
+                        (line-end-position 2)))
+        (goto-char opoint)
+        (if (search-forward "<hr>" div-end 'move)
+                (replace-match "" t t)
+          (if split (forward-line -1))))
+      ;; In Texinfo 5, the <hr> (and anchor) comes before the <div> (?).
+      ;; Except in split output, where it comes on the line after
+      ;; the <div>.  But only sometimes.  I have no clue what the
+      ;; logic of where it goes is.
+      (when (equal type "header")
+        (goto-char opoint)
+        (when (re-search-backward "^<hr>$" (line-beginning-position -3) t)
+          (replace-match "")
+          (goto-char opoint))))))
+
 
 (defun manual-html-fix-index-1 ()
+  "Remove the h1 header, and the short and long contents lists.
+Also start a \"content\" div."
   (let (opoint)
-    (re-search-forward "<body>\n")
+    (re-search-forward "<body.*>\n")
     (setq opoint (match-end 0))
-    (search-forward "<h2 class=\"")
+    ;; FIXME?  Fragile if a Texinfo 5 document does not use @top.
+    (or (re-search-forward "<h1 class=\"top\"" nil t) ; Texinfo 5
+        (search-forward "<h2 class=\""))
     (goto-char (match-beginning 0))
     (delete-region opoint (point))
+    ;; NB caller must close this div.
     (insert "<div id=\"content\" class=\"inner\">\n\n")))
 
 (defun manual-html-fix-index-2 (&optional table-workaround)
-  "Replace the index list in the current buffer with a HTML table."
-  (let (done open-td tag desc)
-    ;; Convert the list that Makeinfo made into a table.
-    (or (search-forward "<ul class=\"menu\">" nil t)
-        (search-forward "<ul>"))
-    (replace-match "<table style=\"float:left\" width=\"100%\">")
-    (forward-line 1)
-    (while (not done)
-      (cond
-       ((or (looking-at "<li>\\(<a.+</a>\\):[ \t]+\\(.*\\)$")
-            (looking-at "<li>\\(<a.+</a>\\)$"))
-        (setq tag (match-string 1))
-        (setq desc (match-string 2))
-        (replace-match "" t t)
-        (when open-td
-          (save-excursion
-            (forward-char -1)
-            (skip-chars-backward " ")
-            (delete-region (point) (line-end-position))
-            (insert "</td>\n  </tr>")))
-        (insert "  <tr>\n    ")
-        (if table-workaround
-            ;; This works around a Firefox bug in the mono file.
-            (insert "<td bgcolor=\"white\">")
-          (insert "<td>"))
-        (insert tag "</td>\n    <td>" (or desc ""))
-        (setq open-td t))
-       ((eq (char-after) ?\n)
-        (delete-char 1)
-        ;; Negate the following `forward-line'.
-        (forward-line -1))
-       ((looking-at "<!-- ")
-        (search-forward "-->"))
-       ((looking-at "<p>[- ]*The Detailed Node Listing[- \n]*")
-        (replace-match "  </td></tr></table>\n
+  "Replace the index list in the current buffer with a HTML table.
+Leave point after the table."
+  (if (re-search-forward "<table class=\"menu\"\\(.*\\)>" nil t)
+      ;; Texinfo 5 already uses a table.  Tweak it a bit.
+      (let (opoint done)
+        (replace-match " style=\"float:left\" width=\"100%\"" nil t nil 1)
+        (forward-line 1)
+        (while (not done)
+          (cond ((re-search-forward "<tr><td.*&bull; \\(<a.*</a>\\)\
+:</td><td>&nbsp;&nbsp;</td><td[^>]*>\\(.*\\)" (line-end-position) t)
+                 (replace-match (format "<tr><td%s>\\1</td>\n<td>\\2"
+                                        (if table-workaround
+                                            " bgcolor=\"white\"" "")))
+                 (search-forward "</td></tr>")
+                 (forward-line 1))
+                ((looking-at "<tr><th.*<pre class=\"menu-comment\">\n")
+                 (replace-match "<tr><th colspan=\"2\" align=\"left\" \
+style=\"text-align:left\">")
+                 (search-forward "</pre></th></tr>")
+                 (replace-match "</th></tr>\n"))
+                ;; Not all manuals have the detailed menu.
+                ;; If it is there, split it into a separate table.
+                ((re-search-forward "<tr>.*The Detailed Node Listing *"
+                                    (line-end-position) t)
+                 (setq opoint (match-beginning 0))
+                 (while (and (looking-at " *&mdash;")
+                             (zerop (forward-line 1))))
+                 (delete-region opoint (point))
+                 (insert "</table>\n\n\
+<h2>Detailed Node Listing</h2>\n\n<p>")
+                 ;; FIXME Fragile!
+                 ;; The Emacs and Elisp manual have some text at the
+                 ;; start of the detailed menu that is not part of the menu.
+                 ;; Other manuals do not.
+                 (if (re-search-forward "in one step:" (line-end-position 3) t)
+                     (forward-line 1))
+                 (insert "</p>\n")
+                 (search-forward "</pre></th></tr>")
+                 (delete-region (match-beginning 0) (match-end 0))
+                 (forward-line -1)
+                 (or (looking-at "^$") (error "Parse error 1"))
+                 (forward-line -1)
+                 (if (looking-at "^$") (error "Parse error 2"))
+                 (forward-line -1)
+                 (or (looking-at "^$") (error "Parse error 3"))
+                 (forward-line 1)
+                 (insert "<table class=\"menu\" style=\"float:left\" width=\"100%\">\n\
+<tr><th colspan=\"2\" align=\"left\" style=\"text-align:left\">\n")
+                 (forward-line 1)
+                 (insert "</th></tr>")
+                 (forward-line 1))
+                ((looking-at ".*</table")
+                 (forward-line 1)
+                 (setq done t)))))
+    (let (done open-td tag desc)
+      ;; Convert the list that Makeinfo made into a table.
+      (or (search-forward "<ul class=\"menu\">" nil t)
+          ;; FIXME?  The following search seems dangerously lax.
+          (search-forward "<ul>"))
+      (replace-match "<table style=\"float:left\" width=\"100%\">")
+      (forward-line 1)
+      (while (not done)
+        (cond
+         ((or (looking-at "<li>\\(<a.+</a>\\):[ \t]+\\(.*\\)$")
+              (looking-at "<li>\\(<a.+</a>\\)$"))
+          (setq tag (match-string 1))
+          (setq desc (match-string 2))
+          (replace-match "" t t)
+          (when open-td
+            (save-excursion
+              (forward-char -1)
+              (skip-chars-backward " ")
+              (delete-region (point) (line-end-position))
+              (insert "</td>\n  </tr>")))
+          (insert "  <tr>\n    ")
+          (if table-workaround
+              ;; This works around a Firefox bug in the mono file.
+              (insert "<td bgcolor=\"white\">")
+            (insert "<td>"))
+          (insert tag "</td>\n    <td>" (or desc ""))
+          (setq open-td t))
+         ((eq (char-after) ?\n)
+          (delete-char 1)
+          ;; Negate the following `forward-line'.
+          (forward-line -1))
+         ((looking-at "<!-- ")
+          (search-forward "-->"))
+         ((looking-at "<p>[- ]*The Detailed Node Listing[- \n]*")
+          (replace-match "  </td></tr></table>\n
 <h3>Detailed Node Listing</h3>\n\n" t t)
-        (search-forward "<p>")
-        (search-forward "<p>" nil t)
-        (goto-char (match-beginning 0))
-        (skip-chars-backward "\n ")
-        (setq open-td nil)
-        (insert "</p>\n\n<table  style=\"float:left\" width=\"100%\">"))
-       ((looking-at "</li></ul>")
-        (replace-match "" t t))
-       ((looking-at "<p>")
-        (replace-match "" t t)
-        (when open-td
-          (insert "  </td></tr>")
-          (setq open-td nil))
-        (insert "  <tr>
+          (search-forward "<p>")
+          ;; FIXME Fragile!
+          ;; The Emacs and Elisp manual have some text at the
+          ;; start of the detailed menu that is not part of the menu.
+          ;; Other manuals do not.
+          (if (looking-at "Here are some other nodes")
+              (search-forward "<p>"))
+          (goto-char (match-beginning 0))
+          (skip-chars-backward "\n ")
+          (setq open-td nil)
+          (insert "</p>\n\n<table  style=\"float:left\" width=\"100%\">"))
+         ((looking-at "</li></ul>")
+          (replace-match "" t t))
+         ((looking-at "<p>")
+          (replace-match "" t t)
+          (when open-td
+            (insert "  </td></tr>")
+            (setq open-td nil))
+          (insert "  <tr>
     <th colspan=\"2\" align=\"left\" style=\"text-align:left\">")
-        (if (re-search-forward "</p>[ \t\n]*<ul class=\"menu\">" nil t)
-            (replace-match "  </th></tr>")))
-       ((looking-at "[ \t]*</ul>[ \t]*$")
-        (replace-match
-         (if open-td
-             "  </td></tr>\n</table>"
-           "</table>") t t)
-        (setq done t))
-       (t
-        (if (eobp)
-            (error "Parse error in %s" f)) ; f is bound in manual-html-node
-        (unless open-td
-          (setq done t))))
-      (forward-line 1))))
+          (if (re-search-forward "</p>[ \t\n]*<ul class=\"menu\">" nil t)
+              (replace-match "  </th></tr>")))
+         ((looking-at "[ \t]*</ul>[ \t]*$")
+          (replace-match
+           (if open-td
+               "  </td></tr>\n</table>"
+             "</table>") t t)
+          (setq done t))
+         (t
+          (if (eobp)
+              (error "Parse error in %s"
+                     (file-name-nondirectory buffer-file-name)))
+          (unless open-td
+            (setq done t))))
+        (forward-line 1)))))
 
 
-;; Stuff to check new defcustoms got :version tags.
+;; Stuff to check new `defcustom's got :version tags.
 ;; Adapted from check-declare.el.
 
 (defun cusver-find-files (root &optional old)
-  "Find .el files beneath directory ROOT that contain defcustoms.
-If optional OLD is non-nil, also include defvars."
+  "Find .el files beneath directory ROOT that contain `defcustom's.
+If optional OLD is non-nil, also include `defvar's."
   (process-lines find-program root
                  "-name" "*.el"
                  "-exec" grep-program
@@ -448,14 +618,14 @@ If optional OLD is non-nil, also include defvars."
 
 (defvar cusver-new-version (format "%s.%s" emacs-major-version
                                    (1+ emacs-minor-version))
-  "Version number that new defcustoms should have.")
+  "Version number that new `defcustom's should have.")
 
 (defun cusver-scan (file &optional old)
   "Scan FILE for `defcustom' calls.
 Return a list with elements of the form (VAR . VER),
 This means that FILE contains a defcustom for variable VAR, with
 a :version tag having value VER (may be nil).
-If optional argument OLD is non-nil, also scan for defvars."
+If optional argument OLD is non-nil, also scan for `defvar's."
   (let ((m (format "Scanning %s..." file))
         (re (format "^[ \t]*\\((def%s\\)[ \t\n]"
                     (if old "\\(custom\\|var\\)" "\\(custom\\|group\\)")))
@@ -464,13 +634,19 @@ If optional argument OLD is non-nil, also scan for defvars."
     (with-temp-buffer
       (insert-file-contents file)
       ;; FIXME we could theoretically be inside a string.
-      (while (re-search-forward re nil t)
+      (while (re-search-forward re nil :noerror)
         (goto-char (match-beginning 1))
         (if (and (setq form (ignore-errors (read (current-buffer))))
                  (setq var (car-safe (cdr-safe form)))
                  ;; Exclude macros, eg (defcustom ,varname ...).
                  (symbolp var))
             (progn
+              ;; FIXME It should be cus-test-apropos that does this.
+              (and (not old)
+                   (equal "custom" (match-string 2))
+                   (not (memq :type form))
+                   (display-warning 'custom
+                                    (format "Missing type in: `%s'" form)))
               (setq ver (car (cdr-safe (memq :version form))))
               (if (equal "group" (match-string 2))
                   ;; Group :version could be old.
@@ -506,7 +682,7 @@ If optional argument OLD is non-nil, also scan for defvars."
 (define-button-type 'cusver-xref 'action #'cusver-goto-xref)
 
 (defun cusver-goto-xref (button)
-  "Jump to a lisp file for the BUTTON at point."
+  "Jump to a Lisp file for the BUTTON at point."
   (let ((file (button-get button 'file))
         (var (button-get button 'var)))
     (if (not (file-readable-p file))
@@ -522,34 +698,36 @@ If optional argument OLD is non-nil, also scan for defvars."
 ;; TODO Check cus-start if something moved from C to Lisp.
 ;; TODO Handle renamed things with aliases to the old names.
 (defun cusver-check (newdir olddir version)
-  "Check that defcustoms have :version tags where needed.
-NEWDIR is the current lisp/ directory, OLDDIR is that from the previous
-release.  A defcustom that is only in NEWDIR should have a :version
-tag.  We exclude cases where a defvar exists in OLDDIR, since
-just converting a defvar to a defcustom does not require a :version bump.
+  "Check that `defcustom's have :version tags where needed.
+NEWDIR is the current lisp/ directory, OLDDIR is that from the
+previous release, VERSION is the new version number.  A
+`defcustom' that is only in NEWDIR should have a :version tag.
+We exclude cases where a `defvar' exists in OLDDIR, since just
+converting a `defvar' to a `defcustom' does not require
+a :version bump.
 
 Note that a :version tag should also be added if the value of a defcustom
 changes (in a non-trivial way).  This function does not check for that."
-  (interactive (list (read-directory-name "New Lisp directory: ")
-                     (read-directory-name "Old Lisp directory: ")
+  (interactive (list (read-directory-name "New Lisp directory: " nil nil t)
+                     (read-directory-name "Old Lisp directory: " nil nil t)
                      (number-to-string
                       (read-number "New version number: "
                                    (string-to-number cusver-new-version)))))
   (or (file-directory-p (setq newdir (expand-file-name newdir)))
-      (error "Directory `%s' not found" newdir))
+      (user-error "Directory `%s' not found" newdir))
   (or (file-directory-p (setq olddir (expand-file-name olddir)))
-      (error "Directory `%s' not found" olddir))
+      (user-error "Directory `%s' not found" olddir))
   (setq cusver-new-version version)
-  (let* ((newfiles (progn (message "Finding new files with defcustoms...")
+  (let* ((newfiles (progn (message "Finding new files with `defcustom's...")
                           (cusver-find-files newdir)))
-         (oldfiles (progn (message "Finding old files with defcustoms...")
+         (oldfiles (progn (message "Finding old files with `defcustom's...")
                           (cusver-find-files olddir t)))
-         (newcus (progn (message "Reading new defcustoms...")
+         (newcus (progn (message "Reading new `defcustom's...")
                         (mapcar
                          (lambda (file)
                            (cons file (cusver-scan file))) newfiles)))
          oldcus result thisfile file)
-    (message "Reading old defcustoms...")
+    (message "Reading old `defcustom's...")
     (dolist (file oldfiles)
       (setq oldcus (append oldcus (cusver-scan file t))))
     (setq oldcus (append oldcus (cusver-scan-cus-start
@@ -574,7 +752,7 @@ changes (in a non-trivial way).  This function does not check for that."
         (message "No missing :version tags")
       (pop-to-buffer "*cusver*")
       (erase-buffer)
-      (insert "These defcustoms might be missing :version tags:\n\n")
+      (insert "These `defcustom's might be missing :version tags:\n\n")
       (dolist (elem result)
         (let* ((str (file-relative-name (car elem) newdir))
                (strlen (length str)))
diff --git a/admin/alloc-colors.c b/admin/alloc-colors.c
index d8fc97cc721..a63e1bacef5 100644
--- a/admin/alloc-colors.c
+++ b/admin/alloc-colors.c
@@ -1,6 +1,6 @@
 /* Allocate X colors.  Used for testing with dense colormaps.
 
-Copyright (C) 2001-2013 Free Software Foundation, Inc.
+Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/admin/build-configs b/admin/build-configs
index 8b738befb18..6a369416696 100755
--- a/admin/build-configs
+++ b/admin/build-configs
@@ -1,7 +1,7 @@
 #! /usr/bin/perl
 # Build Emacs in several different configurations.
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -20,6 +20,8 @@
 
 
 require 5;
+use strict;
+use warnings;
 use Getopt::Long;
 use File::Basename;
 use Cwd;
diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el
index b95c96d77ef..924033b1554 100644
--- a/admin/bzrmerge.el
+++ b/admin/bzrmerge.el
@@ -1,6 +1,6 @@
 ;;; bzrmerge.el --- help merge one Emacs bzr branch to another
 
-;; Copyright (C) 2010-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: maint
@@ -50,7 +50,7 @@ The list returned is sorted by oldest-first."
     (call-process "bzr" nil t nil "status" "-v")
     (goto-char (point-min))
     (when (re-search-forward "^conflicts:\n" nil t)
-      (error "You still have unresolved conflicts"))
+      (user-error "You still have unresolved conflicts"))
     (let ((merges ())
           found)
       (if (not (re-search-forward "^pending merges:\n" nil t))
@@ -62,7 +62,7 @@ The list returned is sorted by oldest-first."
                            (setq found
                                  (not (equal "unknown" (match-string 1)))))))
                   found)
-            (error "You still have uncommitted changes"))
+            (user-error "You still have uncommitted changes"))
         ;; This is really stupid, but it seems there's no easy way to figure
         ;; out which revisions have been merged already.  The only info I can
         ;; find is the "pending merges" from "bzr status -v", which is not
@@ -171,7 +171,7 @@ Type `y' to skip this revision,
                                  (enable-local-eval nil))
                              (find-file-noselect file))
         (if (buffer-modified-p)
-            (error "Unsaved changes in %s" (current-buffer)))
+            (user-error "Unsaved changes in %s" (current-buffer)))
         (save-excursion
           (cond
            ((derived-mode-p 'change-log-mode)
@@ -320,10 +320,10 @@ Does not make other difference."
                   ;; bzrmerge-add-metadata does not work when there
                   ;; are conflicts.
                   (display-warning 'bzrmerge "Resolve conflicts manually.
-¡BEWARE!  Important metadata is kept in this Emacs session!
+BEWARE!  Important metadata is kept in this Emacs session!
 Do not commit without re-running `M-x bzrmerge' first!"
                                    :warning bzrmerge-warning-buffer))
-              (error "Resolve conflicts manually")))))
+              (user-error "Resolve conflicts manually")))))
         (cons merge skip)))))
 
 (defun bzrmerge (from)
diff --git a/admin/charsets/mapfiles/README b/admin/charsets/mapfiles/README
index 0a742854811..15ec320589f 100644
--- a/admin/charsets/mapfiles/README
+++ b/admin/charsets/mapfiles/README
@@ -1,4 +1,4 @@
-Copyright (C) 2009-2013 Free Software Foundation, Inc.
+Copyright (C) 2009-2014 Free Software Foundation, Inc.
 Copyright (C) 2009, 2010, 2011
   National Institute of Advanced Industrial Science and Technology (AIST)
   Registration Number H13PRO009
@@ -6,47 +6,48 @@ See the end of the file for license conditions.
 
                    The charset map files directory
 
-This directory contains two kinds of charset map files; verbatim copies
-(or their compressed versions) of files freely available in the
-Internet, and newly created files based on freely available
-information.
+This directory contains two kinds of charset map files; verbatim
+copies of files freely available in the Internet, and newly created
+files based on freely available information.
 
-(1) Copied files (all files are copied on 2009-06-12)
+(1) Copied files (all files were copied on 2014-01-15):
 
-* CP932.TXT.gz
+* CP932.TXT
 
-The uncompressed version is available at:
+Available at:
     <http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP932.TXT>
 
-* PTCP154.gz
+* PTCP154
 
-The uncompressed version is available at:
+Available at:
     <http://www.iana.org/assignments/charset-reg/PTCP154>
 
-* Uni2JIS.gz
+* Uni2JIS
 
 The version compressed by Unix's "compress" command is available at:
     <http://kanji.zinbun.kyoto-u.ac.jp/~yasuoka/ftp/CJKtable/Uni2JIS.Z>
+This directory's copy has corrected the misspellings of "characters"
+and of "Byelorussian".
 
-* bulgarian-mik.txt.gz
+* bulgarian-mik.txt
 
-It is available at:
-    <http://czyborra.com/charsets/bulgarian-mik.txt.gz>.
+The compressed version is available at:
+    <http://czyborra.com/charsets/bulgarian-mik.txt.gz>
 
-* cns2ucsdkw.txt.gz
+* cns2ucsdkw.txt
 
-Uncompressed version is available at:
+Available at:
     <http://kanji-database.cvs.sourceforge.net/viewvc/*checkout*/kanji-database/kanji-database/data/cns2ucsdkw.txt?revision=1.4>
 
-* stdenc.txt.gz and symbol.txt.gz
+* stdenc.txt and symbol.txt
 
-The uncompressed versions are available at:
+Available at:
     <http://www.unicode.org/Public/MAPPINGS/VENDORS/ADOBE/stdenc.txt>
     <http://www.unicode.org/Public/MAPPINGS/VENDORS/ADOBE/symbol.txt>
 
 (2) Newly created files
 
-* CP720.map.gz and CP858.map.gz
+* CP720.map and CP858.map
 
 Created manually by looking at these pages:
     <http://en.wikipedia.org/wiki/Code_page_720>.
@@ -54,13 +55,13 @@ Created manually by looking at these pages:
 The text in that page is under the terms of the GNU Free Documentation
 License.
 
-* JISX213A.map.gz
+* JISX213A.map
 
 Created manually based on the description of the section 33 in "JIS X
 0213:2004 Amendment 1".  It lists 10 characters that are newly added
 to "JIS X 0213:2004".
 
-* MULE-*.map.gz
+* MULE-*.map
 
 Created by using ../mule-charsets.el in Emacs 22 as this:
     % emacs-22 -batch -l ../mule-charsets.el
diff --git a/admin/charsets/mapfiles/stdenc.txt b/admin/charsets/mapfiles/stdenc.txt
index d4b9d7c9343..e39486a3195 100644
--- a/admin/charsets/mapfiles/stdenc.txt
+++ b/admin/charsets/mapfiles/stdenc.txt
@@ -1,10 +1,10 @@
 #
 #  Name:             Adobe Standard Encoding to Unicode
 #  Unicode version:  2.0
-#  Table version:    0.2
-#  Date:             30 March 1999
+#  Table version:    1.0
+#  Date:             2011 July 12
 #  
-#  Copyright (c) 1991-1999 Unicode, Inc. All Rights reserved.
+#  Copyright (c) 1991-2011 Unicode, Inc. All Rights reserved.
 #  
 #  This file is provided as-is by Unicode, Inc. (The Unicode Consortium). No
 #  claims are made as to fitness for any particular purpose. No warranties of
@@ -13,12 +13,12 @@
 #  magnetic media by Unicode, Inc., the sole remedy for any claim will be
 #  exchange of defective media within 90 days of receipt.
 #  
-#  Recipient is granted the right to make copies in any form for internal
-#  distribution and to freely use the information supplied in the creation of
-#  products supporting Unicode. Unicode, Inc. specifically excludes the right
-#  to re-distribute this file directly to third parties or other organizations
-#  whether for profit or not.
-#  
+#  Unicode, Inc. hereby grants the right to freely use the information
+#  supplied in this file in the creation of products supporting the
+#  Unicode Standard, and to make copies of this file in any form for
+#  internal or external distribution as long as this notice remains
+#  attached.
+#
 #  Format: 4 tab-delimited fields:
 #
 #    (1) The Unicode value (in hexadecimal)
@@ -36,8 +36,17 @@
 #    Standard Encoding characters, such as "space", are mapped to 2 Unicode
 #    values. Refer to the above document for more details.
 #
+#    2011 July 12: The above link is no longer valid. For comparable,
+#    more current information, see the document, "Glyph", at:
+#    <http://www.adobe.com/devnet/opentype/archives/glyph.html>
+#
 #  Revision History:
 #
+#    [v1.0, 2011 July 12]
+#    Updated terms of use to current wording.
+#    Updated contact information and document link.
+#    No changes to the mapping data.
+#
 #    [v0.2, 30 March 1999]
 #    Different algorithm to produce Unicode values (see notes above) results in
 #    some character codes being mapped to 2 Unicode values. Updated Unicode
@@ -45,7 +54,8 @@
 #    
 #    [v0.1, 5 May 1995] First release.
 #
-#  Contact <unicode-inc@unicode.org> with any questions or comments.
+#  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
 00A0    20      # NO-BREAK SPACE        # space
diff --git a/admin/charsets/mapfiles/symbol.txt b/admin/charsets/mapfiles/symbol.txt
index a545915a323..b98baf6cf0c 100644
--- a/admin/charsets/mapfiles/symbol.txt
+++ b/admin/charsets/mapfiles/symbol.txt
@@ -1,10 +1,10 @@
 #
 #  Name:             Adobe Symbol Encoding to Unicode
 #  Unicode version:  2.0
-#  Table version:    0.2
-#  Date:             30 March 1999
+#  Table version:    1.0
+#  Date:             2011 July 12
 #  
-#  Copyright (c) 1991-1999 Unicode, Inc. All Rights reserved.
+#  Copyright (c) 1991-2011 Unicode, Inc. All Rights reserved.
 #  
 #  This file is provided as-is by Unicode, Inc. (The Unicode Consortium). No
 #  claims are made as to fitness for any particular purpose. No warranties of
@@ -13,11 +13,11 @@
 #  magnetic media by Unicode, Inc., the sole remedy for any claim will be
 #  exchange of defective media within 90 days of receipt.
 #  
-#  Recipient is granted the right to make copies in any form for internal
-#  distribution and to freely use the information supplied in the creation of
-#  products supporting Unicode. Unicode, Inc. specifically excludes the right
-#  to re-distribute this file directly to third parties or other organizations
-#  whether for profit or not.
+#  Unicode, Inc. hereby grants the right to freely use the information
+#  supplied in this file in the creation of products supporting the
+#  Unicode Standard, and to make copies of this file in any form for
+#  internal or external distribution as long as this notice remains
+#  attached.
 #  
 #  Format: 4 tab-delimited fields:
 #
@@ -37,8 +37,17 @@
 #    Corporate Use Subarea; these are indicated by "(CUS)" in field 4. Refer to
 #    the above document for more details.
 #
+#    2011 July 12: The above link is no longer valid. For comparable,
+#    more current information, see the document, "Glyph", at:
+#    <http://www.adobe.com/devnet/opentype/archives/glyph.html>
+#
 #  Revision History:
 #
+#    [v1.0, 2011 July 12]
+#    Updated terms of use to current wording.
+#    Updated contact information and document link.
+#    No changes to the mapping data.
+#
 #    [v0.2, 30 March 1999]
 #    Different algorithm to produce Unicode values (see notes above) results in
 #    some character codes being mapped to 2 Unicode values; use of Corporate
@@ -48,7 +57,8 @@
 #
 #    [v0.1, 5 May 1995] First release.
 #
-#  Contact <unicode-inc@unicode.org> with any questions or comments.
+#  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
 00A0    20      # NO-BREAK SPACE        # space
diff --git a/admin/charsets/mule-charsets.el b/admin/charsets/mule-charsets.el
index 4a48d994b1b..4ccf4bfb5be 100644
--- a/admin/charsets/mule-charsets.el
+++ b/admin/charsets/mule-charsets.el
@@ -19,20 +19,32 @@
 ;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 
-(if (not (or (and (= emacs-major-version 21) (= emacs-minor-version 4))
-             (= emacs-major-version 22)))
-    (error "Use Emacs of version 21.4 or any of version 22"))
-
-(defun func (start end)
-  (while (<= start end)
-    (let ((split (split-char start))
-          (unicode (encode-char start 'ucs)))
-      (if unicode
-          (if (nth 2 split)
-              (insert (format "0x%02X%02X 0x%04X\n"
-                              (nth 1 split) (nth 2 split) unicode))
-            (insert (format "0x%02X 0x%04X\n" (nth 1 split) unicode)))))
-    (setq start (1+ start))))
+;; For the record: the old, pre-v23 code was this:
+;; (if (not (or (and (= emacs-major-version 21) (= emacs-minor-version 4))
+;;           (= emacs-major-version 22)))
+;;     (error "Use Emacs of version 21.4 or any of version 22"))
+;;
+;; (defun func (start end)
+;;   (while (<= start end)
+;;     (let ((split (split-char start))
+;;        (unicode (encode-char start 'ucs)))
+;;       (if unicode
+;;        (if (nth 2 split)
+;;            (insert (format "0x%02X%02X 0x%04X\n"
+;;                            (nth 1 split) (nth 2 split) unicode))
+;;          (insert (format "0x%02X 0x%04X\n" (nth 1 split) unicode)))))
+;;     (setq start (1+ start))))
+
+(defun func (range charset)
+  (let ((start (car range))
+        (end (cdr range)))
+    (while (and (<= start end) (<= start #x10ffff))
+      (let ((ch (encode-char start charset)))
+        (if ch
+            (if (> ch 256)
+                (insert (format "0x%04X 0x%04X\n" ch start))
+              (insert (format "0x%02X 0x%04X\n" ch start)))))
+      (setq start (1+ start)))))
 
 (defconst charset-alist
   '(("MULE-ethiopic.map" . ethiopic)
@@ -51,6 +63,8 @@
 (dolist (elt charset-alist)
   (with-temp-buffer
     (insert header)
-    (map-charset-chars 'func (cdr elt))
-    (write-file (car elt))))
+    (map-charset-chars 'func (cdr elt) (cdr elt))
+    (sort-lines nil (point-min) (point-max))
+    (let ((coding-system-for-write 'unix))
+      (write-file (car elt)))))
 
diff --git a/admin/check-doc-strings b/admin/check-doc-strings
index c69ff47ebfb..a0b5acb623f 100755
--- a/admin/check-doc-strings
+++ b/admin/check-doc-strings
@@ -1,11 +1,12 @@
 : #-*- Perl -*-
-eval 'exec perl -w -S $0 ${1+"$@"}' # Portability kludge
+eval 'exec perl -S $0 ${1+"$@"}' # Portability kludge
     if 0;
 
 # Author: Martin Buchholz
 # This program is in the public domain.
 
 use strict;
+use warnings;
 use POSIX;
 
 (my $myName = $0) =~ s@.*/@@; my $usage="
diff --git a/admin/cus-test.el b/admin/cus-test.el
index c93a14297f8..b60eac28d2a 100644
--- a/admin/cus-test.el
+++ b/admin/cus-test.el
@@ -1,6 +1,6 @@
 ;;; cus-test.el --- tests for custom types and load problems
 
-;; Copyright (C) 1998, 2000, 2002-2013 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2000, 2002-2014 Free Software Foundation, Inc.
 
 ;; Author: Markus Rost <markus.rost@mathematik.uni-regensburg.de>
 ;; Maintainer: Markus Rost <rost@math.ohio-state.edu>
@@ -30,11 +30,11 @@
 ;;
 ;; The basic tests can be run in batch mode.  Invoke them with
 ;;
-;;   src/emacs -batch -l admin/cus-test.el -f cus-test-opts
+;;   src/emacs -batch -l admin/cus-test.el -f cus-test-opts [all]
 ;;
 ;;   src/emacs -batch -l admin/cus-test.el -f cus-test-deps
 ;;
-;;   src/emacs -batch -l admin/cus-test.el -f cus-test-libs
+;;   src/emacs -batch -l admin/cus-test.el -f cus-test-libs [all]
 ;;
 ;;   src/emacs -batch -l admin/cus-test.el -f cus-test-noloads
 ;;
@@ -87,43 +87,6 @@
 ;; The command `cus-test-noloads' returns a list of variables which
 ;; are somewhere declared as custom options, but not loaded by
 ;; `custom-load-symbol'.
-;;
-;; Some results from October 2002:
-;;
-;; 4523 options tested
-;; The following variables might have problems:
-;; ps-mule-font-info-database-default
-;; grep-tree-command
-;; grep-find-command
-;;
-;; 288 features required
-;; 10 files loaded
-;; The following load problems appeared:
-;; (killing x-win (file-error Cannot open load file x-win))
-;; Symbol faces has loaddefs as custom dependency
-;; (reftex-index-support reftex-vars (void-function reftex-set-dirty))
-;; (eshell-script em-script (void-variable eshell-directory-name))
-;; (pcomplete em-cmpl (void-function eshell-under-windows-p))
-;; (eshell-ext esh-ext (void-function eshell-under-windows-p))
-;; ...
-;;
-;; 422 libraries had no load errors
-;; The following load problems appeared:
-;; (eudc-export error 255)
-;; (ada-xref error 255)
-;; (ada-stmt error 255)
-;;
-;; The following options were not loaded by custom-load-symbol:
-;; edt-bottom-scroll-margin
-;; edt-keep-current-page-delimiter
-;; edt-top-scroll-margin
-;; edt-use-EDT-control-key-bindings
-;; edt-word-entities
-;; grep-find-use-xargs
-;; master-mode-hook
-;; outline-level
-;; outline-minor-mode-hook
-;; refill-mode-hook
 
 
 ;;; Code:
@@ -136,24 +99,23 @@
 (defvar cus-test-skip-list nil
   "List of variables to disregard by `cus-test-apropos'.")
 
-(defvar cus-test-libs-noloads nil
-  "List of libraries not to load by `cus-test-load-libs'.")
-
-;; The file eudc-export.el loads libraries "bbdb" and "bbdb-com" which
-;; are not part of GNU Emacs:  (locate-library "bbdb") => nil
-;; We avoid the resulting errors from loading eudc-export.el:
-(provide 'bbdb)
-(provide 'bbdb-com)
+(defvar cus-test-libs-noloads
+  ;; Loading dunnet in batch mode leads to a Dead end.
+  ;; blessmail writes a file.
+  ;; characters cannot be loaded twice ("Category `a' is already defined").
+  '("play/dunnet.el" "emulation/edt-mapper.el"
+    "loadup.el" "mail/blessmail.el" "international/characters.el"
+    "cedet/ede/loaddefs.el" "cedet/semantic/loaddefs.el"
+    "net/tramp-loaddefs.el")
+  "List of files not to load by `cus-test-load-libs'.
+Names should be as they appear in loaddefs.el.")
 
 ;; This avoids a hang of `cus-test-apropos' in 21.2.
 ;; (add-to-list 'cus-test-skip-list 'sh-alias-alist)
 
-;; Loading dunnet in batch mode leads to a Dead end.
-(let (noninteractive) (load "dunnet"))
-(add-to-list 'cus-test-libs-noloads "dunnet")
-
-;; Never Viperize.
-(setq viper-mode nil)
+(or noninteractive
+    ;; Never Viperize.
+    (setq viper-mode nil))
 
 ;; Don't create a file `save-place-file'.
 (eval-after-load "saveplace"
@@ -225,6 +187,9 @@ The detected problematic options are stored in `cus-test-errors'."
      (message "Cus Test running...%s %s"
               (length cus-test-tested-variables) symbol)
      (condition-case alpha
+         ;; FIXME This defaults to 'sexp if no type was specified.
+         ;; Always report such instances as a type mismatch.
+         ;; Currently abusing cusver-scan to do that.
          (let* ((type (custom-variable-type symbol))
                 (conv (widget-convert type))
                 (get (or (get symbol 'custom-get) 'default-value))
@@ -240,6 +205,8 @@ The detected problematic options are stored in `cus-test-errors'."
 
            ;; Check the values
            (mapc (lambda (value)
+                   ;; 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)
                      (setq mismatch 'mismatch)))
                  values)
@@ -270,17 +237,38 @@ The detected problematic options are stored in `cus-test-errors'."
            (length cus-test-tested-variables))
   (cus-test-errors-display))
 
-(defun cus-test-get-options (regexp)
-  "Return a list of custom options matching REGEXP."
-  (let (found)
+(defun cus-test-cus-load-groups (&optional cus-load)
+  "Return a list of current custom groups.
+If CUS-LOAD is non-nil, include groups from cus-load.el."
+  (append (mapcar 'cdr custom-current-group-alist)
+          (if cus-load
+              (with-temp-buffer
+                (insert-file-contents (locate-library "cus-load.el"))
+                (search-forward "(put '")
+                (beginning-of-line)
+                (let (res)
+                  (while (and (looking-at "^(put '\\(\\S-+\\)")
+                              (zerop (forward-line 1)))
+                    (push (intern (match-string 1)) res))
+                  res)))))
+
+(defun cus-test-get-options (regexp &optional group)
+  "Return a list of custom options matching REGEXP.
+If GROUP is non-nil, return groups rather than options.
+If GROUP is `cus-load', include groups listed in cus-loads as well as
+currently defined groups."
+  (let ((groups (if group (cus-test-cus-load-groups (eq group 'cus-load))))
+        found)
     (mapatoms
      (lambda (symbol)
        (and
-        (or
-         ;; (user-variable-p symbol)
-         (get symbol 'standard-value)
-         ;; (get symbol 'saved-value)
-         (get symbol 'custom-type))
+        (if group
+            (memq symbol groups)
+          (or
+           ;; (user-variable-p symbol)
+           (get symbol 'standard-value)
+           ;; (get symbol 'saved-value)
+           (get symbol 'custom-type)))
         (string-match regexp (symbol-name symbol))
         (not (member symbol cus-test-skip-list))
         (push symbol found))))
@@ -302,49 +290,71 @@ The detected problematic options are stored in `cus-test-errors'."
 (defun cus-test-load-custom-loads ()
   "Call `custom-load-symbol' on all atoms."
   (interactive)
+  (if noninteractive (let (noninteractive) (require 'dunnet)))
   (mapatoms 'custom-load-symbol)
   (run-hooks 'cus-test-after-load-libs-hook))
 
-(defun cus-test-load-libs ()
+(defmacro cus-test-load-1 (&rest body)
+  `(progn
+     (setq cus-test-libs-errors nil
+           cus-test-libs-loaded nil)
+     ,@body
+     (message "%s libraries loaded successfully"
+              (length cus-test-libs-loaded))
+     (if (not cus-test-libs-errors)
+         (message "No load problems encountered")
+       (message "The following load problems appeared:")
+       (cus-test-message cus-test-libs-errors))
+     (run-hooks 'cus-test-after-load-libs-hook)))
+
+;; This is just cus-test-libs, but loading in the current Emacs process.
+(defun cus-test-load-libs (&optional more)
   "Load the libraries with autoloads.
-Don't load libraries in `cus-test-libs-noloads'."
+Don't load libraries in `cus-test-libs-noloads'.
+If optional argument MORE is \"defcustom\", load all files with defcustoms.
+If it is \"all\", load all Lisp files."
   (interactive)
-  (setq cus-test-libs-errors nil)
-  (setq cus-test-libs-loaded nil)
-  (mapc
-   (lambda (file)
-     (condition-case alpha
-         (unless (member file cus-test-libs-noloads)
-           (load file)
-           (push file cus-test-libs-loaded))
-       (error
-        (push (cons file alpha) cus-test-libs-errors)
-        (message "Error for %s: %s" file alpha))))
-   (cus-test-get-autoload-deps))
-  (message "%s libraries loaded successfully"
-           (length cus-test-libs-loaded))
-  (if (not cus-test-libs-errors)
-      (message "No load problems encountered")
-    (message "The following load problems appeared:")
-    (cus-test-message cus-test-libs-errors))
-  (run-hooks 'cus-test-after-load-libs-hook))
+  (cus-test-load-1
+   (let ((lispdir (file-name-directory (locate-library "loaddefs"))))
+     (mapc
+      (lambda (file)
+        (condition-case alpha
+            (unless (member file cus-test-libs-noloads)
+              (load (file-name-sans-extension (expand-file-name file lispdir)))
+              (push file cus-test-libs-loaded))
+          (error
+           (push (cons file alpha) cus-test-libs-errors)
+           (message "Error for %s: %s" file alpha))))
+      (if more
+          (cus-test-get-lisp-files (equal more "all"))
+        (cus-test-get-autoload-deps))))))
 
 (defun cus-test-get-autoload-deps ()
-  "Return the list of libraries with autoloads."
+  "Return the list of files with autoloads."
   (with-temp-buffer
     (insert-file-contents (locate-library "loaddefs"))
-    ;; This is from `customize-option'.
-    (let (deps file)
-      (while
-          (search-forward "\n;;; Generated autoloads from " nil t)
-        (goto-char (match-end 0))
-        (setq file (buffer-substring (point)
-                                     (progn (end-of-line) (point))))
-        (setq file (file-name-nondirectory file))
-        (string-match "\\.el\\'" file)
-        (setq file (substring file 0 (match-beginning 0)))
-        (setq deps (nconc deps (list file))))
-      deps)))
+    (let (files)
+      (while (search-forward "\n;;; Generated autoloads from " nil t)
+        (push (buffer-substring (match-end 0) (line-end-position)) files))
+      files)))
+
+(defun cus-test-get-lisp-files (&optional all)
+  "Return list of all Lisp files with defcustoms.
+Optional argument ALL non-nil means list all (non-obsolete) Lisp files."
+  (let ((default-directory (expand-file-name "lisp/" source-directory))
+        (msg "Finding files..."))
+    (message "%s" msg)
+    (prog1
+        ;; Hack to remove leading "./".
+        (mapcar (lambda (e) (substring e 2))
+                (apply 'process-lines find-program
+                       "-name" "obsolete" "-prune" "-o"
+                       "-name" "[^.]*.el" ; ignore .dir-locals.el
+                       (if all
+                           '("-print")
+                         (list "-exec" grep-program
+                               "-l" "^[ \t]*(defcustom" "{}" "+"))))
+      (message "%sdone" msg))))
 
 (defun cus-test-message (list)
   "Print the members of LIST line by line."
@@ -353,16 +363,21 @@ Don't load libraries in `cus-test-libs-noloads'."
 
 ;;; The routines for batch mode:
 
-(defun cus-test-opts ()
+(defun cus-test-opts (&optional all)
   "Test custom options.
 This function is suitable for batch mode.  E.g., invoke
 
   src/emacs -batch -l admin/cus-test.el -f cus-test-opts
 
-in the Emacs source directory."
+in the Emacs source directory.
+Normally only tests options belonging to files in loaddefs.el.
+If optional argument ALL is non-nil, test all files with defcustoms."
   (interactive)
+  (and noninteractive
+       command-line-args-left
+       (setq all (pop command-line-args-left)))
   (message "Running %s" 'cus-test-load-libs)
-  (cus-test-load-libs)
+  (cus-test-load-libs (if all "defcustom"))
   (message "Running %s" 'cus-test-load-custom-loads)
   (cus-test-load-custom-loads)
   (message "Running %s" 'cus-test-apropos)
@@ -392,7 +407,8 @@ in the Emacs source directory."
           ((symbolp load)
            ;; (condition-case nil (require load) (error nil))
            (condition-case alpha
-               (unless (featurep load)
+               (unless (or (featurep load)
+                           (and noninteractive (eq load 'dunnet)))
                  (require load)
                  (push (list symbol load) cus-test-deps-required))
              (error
@@ -444,47 +460,54 @@ in the Emacs source directory."
     (cus-test-message cus-test-deps-errors))
   (run-hooks 'cus-test-after-load-libs-hook))
 
-(defun cus-test-libs ()
+(defun cus-test-libs (&optional more)
   "Load the libraries with autoloads in separate processes.
 This function is useful to detect load problems of libraries.
 It is suitable for batch mode.  E.g., invoke
 
-  src/emacs -batch -l admin/cus-test.el -f cus-test-libs
+  ./src/emacs -batch -l admin/cus-test.el -f cus-test-libs
 
-in the Emacs source directory."
+in the Emacs source directory.
+
+If optional argument MORE is \"defcustom\", load all files with defcustoms.
+If it is \"all\", load all Lisp files."
   (interactive)
-  (with-temp-buffer
-    (setq cus-test-libs-errors nil)
-    (setq cus-test-libs-loaded nil)
-    (cd source-directory)
-    (if (not (file-executable-p "src/emacs"))
-        (error "No Emacs executable in %ssrc" default-directory))
-    (mapc
-     (lambda (file)
-       (condition-case alpha
-           (let (fn cmd status)
-             (setq fn (locate-library file))
-             (if (not fn)
-                 (error "Library %s not found" file))
-             (setq cmd (concat "src/emacs -batch -l " fn))
-             (setq status (call-process shell-file-name nil nil nil
-                                        shell-command-switch cmd))
-             (if (equal status 0)
-                 (message "%s" file)
-               (error "%s" status))
-             (push file cus-test-libs-loaded))
-         (error
-          (push (cons file alpha) cus-test-libs-errors)
-          (message "Error for %s: %s" file alpha))))
-     (cus-test-get-autoload-deps))
-    (message "Default Directory: %s" default-directory)
-    (message "%s libraries had no load errors"
-             (length cus-test-libs-loaded))
-    (if (not cus-test-libs-errors)
-        (message "No load problems encountered")
-      (message "The following load problems appeared:")
-      (cus-test-message cus-test-libs-errors))
-    (run-hooks 'cus-test-after-load-libs-hook)))
+  (and noninteractive
+       command-line-args-left
+       (setq more (pop command-line-args-left)))
+  (cus-test-load-1
+   (let* ((default-directory source-directory)
+          (emacs (expand-file-name "src/emacs"))
+          skipped)
+     (or (file-executable-p emacs)
+         (error "No such executable `%s'" emacs))
+     (mapc
+      (lambda (file)
+        (if (member file cus-test-libs-noloads)
+            (push file skipped)
+          (condition-case alpha
+              (let* ((fn (expand-file-name file "lisp/"))
+                     (elc (concat fn "c"))
+                     status)
+                (if (file-readable-p elc) ; load compiled if present (faster)
+                    (setq fn elc)
+                  (or (file-readable-p fn)
+                      (error "Library %s not found" file)))
+                (if (equal 0 (setq status (call-process emacs nil nil nil
+                                                        "-batch" "-l" fn)))
+                    (message "%s" file)
+                  (error "%s" status))
+                (push file cus-test-libs-loaded))
+            (error
+             (push (cons file alpha) cus-test-libs-errors)
+             (message "Error for %s: %s" file alpha)))))
+      (if more
+          (cus-test-get-lisp-files (equal more "all"))
+        (cus-test-get-autoload-deps)))
+     (message "Default directory: %s" default-directory)
+     (when skipped
+       (message "The following libraries were skipped:")
+       (cus-test-message skipped)))))
 
 (defun cus-test-noloads ()
   "Find custom options not loaded by `custom-load-symbol'.
@@ -495,17 +518,17 @@ It is suitable for batch mode.  E.g., invoke
 
 in the Emacs source directory."
   (interactive)
-  (let (cus-loaded)
+  (let ((groups-loaded (cus-test-get-options "" 'cus-load))
+        cus-loaded groups-not-loaded)
 
     (message "Running %s" 'cus-test-load-custom-loads)
     (cus-test-load-custom-loads)
-    (setq cus-loaded
-          (cus-test-get-options ""))
+    (setq cus-loaded (cus-test-get-options ""))
 
     (message "Running %s" 'cus-test-load-libs)
-    (cus-test-load-libs)
-    (setq cus-test-vars-not-cus-loaded
-          (cus-test-get-options ""))
+    (cus-test-load-libs "all")
+    (setq cus-test-vars-not-cus-loaded (cus-test-get-options "")
+          groups-not-loaded (cus-test-get-options "" t))
 
     (dolist (o cus-loaded)
       (setq cus-test-vars-not-cus-loaded
@@ -515,12 +538,15 @@ in the Emacs source directory."
         (message "No options not loaded by custom-load-symbol found")
       (message "The following options were not loaded by custom-load-symbol:")
       (cus-test-message
-       (sort cus-test-vars-not-cus-loaded 'string<)))))
+       (sort cus-test-vars-not-cus-loaded 'string<)))
 
-;; And last but not least a quiz:
-;;
-;; Evaluation of the form (customize-option 'debug-on-error) yields a
-;; *Customize* buffer with a mismatch mess.  Why?
+    (dolist (o groups-loaded)
+      (setq groups-not-loaded (delete o groups-not-loaded)))
+
+    (if (not groups-not-loaded)
+        (message "No groups not in cus-load.el found")
+      (message "The following groups are not in cus-load.el:")
+      (cus-test-message (sort groups-not-loaded 'string<)))))
 
 (provide 'cus-test)
 
diff --git a/admin/diff-tar-files b/admin/diff-tar-files
index af892d6ce41..9bdc91ff5fd 100755
--- a/admin/diff-tar-files
+++ b/admin/diff-tar-files
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff --git a/admin/grammars/Makefile.in b/admin/grammars/Makefile.in
new file mode 100644
index 00000000000..827240a8d4e
--- /dev/null
+++ b/admin/grammars/Makefile.in
@@ -0,0 +1,113 @@
+### @configure_input@
+
+## Copyright (C) 2013-2014 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 <http://www.gnu.org/licenses/>.
+
+### Commentary:
+
+## This directory contains grammar files in Bison and Wisent,
+## used to generate the parser data in the lisp/cedet directory.
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+top_builddir = @top_builddir@
+
+EMACS = ${top_builddir}/src/emacs
+emacs = EMACSLOADPATH= "${EMACS}" -batch --no-site-file --no-site-lisp
+
+make_bovine = ${emacs} -l semantic/bovine/grammar -f bovine-batch-make-parser
+make_wisent = ${emacs} -l semantic/wisent/grammar -f wisent-batch-make-parser
+
+cedetdir = ${top_srcdir}/lisp/cedet
+bovinedir = ${cedetdir}/semantic/bovine
+wisentdir = ${cedetdir}/semantic/wisent
+
+BOVINE = \
+        ${bovinedir}/c-by.el \
+        ${bovinedir}/make-by.el \
+        ${bovinedir}/scm-by.el
+
+## FIXME Should include this one too:
+##      ${cedetdir}/semantic/grammar-wy.el
+## but semantic/grammar.el (which is what we use to generate grammar-wy.el)
+## requires it!
+WISENT = \
+        ${wisentdir}/javat-wy.el \
+        ${wisentdir}/js-wy.el \
+        ${wisentdir}/python-wy.el \
+        ${cedetdir}/srecode/srt-wy.el
+
+ALL = ${BOVINE} ${WISENT}
+
+.PHONY: all bovine wisent
+
+all: ${ALL}
+
+bovine: ${BOVINE}
+
+wisent: ${WISENT}
+
+
+${bovinedir}/c-by.el: ${srcdir}/c.by
+        [ ! -f "$@" ] || chmod +w "$@"
+        ${make_bovine} -o "$@" ${srcdir}/c.by
+
+${bovinedir}/make-by.el: ${srcdir}/make.by
+        [ ! -f "$@" ] || chmod +w "$@"
+        ${make_bovine} -o "$@" ${srcdir}/make.by
+
+${bovinedir}/scm-by.el: ${srcdir}/scheme.by
+        [ ! -f "$@" ] || chmod +w "$@"
+        ${make_bovine} -o "$@" ${srcdir}/scheme.by
+
+
+${cedetdir}/semantic/grammar-wy.el: ${srcdir}/grammar.wy
+        [ ! -f "$@" ] || chmod +w "$@"
+        ${make_wisent} -o "$@" ${srcdir}/grammar.wy
+
+${wisentdir}/javat-wy.el: ${srcdir}/java-tags.wy
+        [ ! -f "$@" ] || chmod +w "$@"
+        ${make_wisent} -o "$@" ${srcdir}/java-tags.wy
+
+${wisentdir}/js-wy.el: ${srcdir}/js.wy
+        [ ! -f "$@" ] || chmod +w "$@"
+        ${make_wisent} -o "$@" ${srcdir}/js.wy
+
+${wisentdir}/python-wy.el: ${srcdir}/python.wy
+        [ ! -f "$@" ] || chmod +w "$@"
+        ${make_wisent} -o "$@" ${srcdir}/python.wy
+
+${cedetdir}/srecode/srt-wy.el: ${srcdir}/srecode-template.wy
+        [ ! -f "$@" ] || chmod +w "$@"
+        ${make_wisent} -o "$@" ${srcdir}/srecode-template.wy
+
+
+.PHONY: distclean bootstrap-clean maintainer-clean extraclean
+
+distclean:
+        rm -f Makefile
+
+bootstrap-clean maintainer-clean: distclean
+
+## We do not normally delete the generated files, even in bootstrap.
+## Creating them does not take long, so we could easily change this.
+extraclean:
+        rm -f ${ALL}
+
+# Makefile.in ends here
diff --git a/admin/grammars/README b/admin/grammars/README
deleted file mode 100644
index e38260952a5..00000000000
--- a/admin/grammars/README
+++ /dev/null
@@ -1,11 +0,0 @@
-This directory contains grammar files in Bison and Wisent, used to
-generate the parser data in the lisp/semantic/bovine/ and
-lisp/semantic/wisent/ directories.  You can run the parser generators
-with
-
-emacs -batch -Q -l semantic/bovine/grammar -f bovine-make-parsers
-emacs -batch -Q -l semantic/wisent/grammar -f wisent-make-parsers
-
-Currently, the parser files in lisp/ are not generated directly from
-these grammar files when making Emacs.  This state of affairs, and the
-contents of this directory, will change in a future version of Emacs.
diff --git a/admin/grammars/c.by b/admin/grammars/c.by
index 5d2f407e8e3..0fd8a33f25a 100644
--- a/admin/grammars/c.by
+++ b/admin/grammars/c.by
@@ -1,5 +1,5 @@
 ;;; c.by -- LL grammar for C/C++ language specification
-;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2014 Free Software Foundation, Inc.
 ;;
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;;         David Ponce <david@dponce.com>
@@ -41,9 +41,13 @@
 %provide semantic/bovine/c-by
 
 %{
-(declare-function semantic-c-reconstitute-token "semantic/bovine/c")
-(declare-function semantic-c-reconstitute-template "semantic/bovine/c")
-(declare-function semantic-expand-c-tag "semantic/bovine/c")
+(declare-function semantic-c-reconstitute-token "semantic/bovine/c"
+                  (tokenpart declmods typedecl))
+(declare-function semantic-c-reconstitute-template "semantic/bovine/c"
+                  (tag specifier))
+(declare-function semantic-expand-c-tag "semantic/bovine/c" (tag))
+(declare-function semantic-parse-region "semantic"
+                  (start end &optional nonterminal depth returnonerror))
 }
 
 %languagemode  c-mode c++-mode
@@ -897,8 +901,8 @@ varname
 ;; I should store more in this def, but leave it simple for now.
 ;; Klaus Berndl: const and volatile can be written after the type!
 variablearg
-  : declmods typeformbase cv-declmods opt-ref variablearg-opt-name
-    ( VARIABLE-TAG (list $5) $2 nil
+  : declmods typeformbase cv-declmods opt-ref variablearg-opt-name opt-assign
+    ( VARIABLE-TAG (list (append $5 ,$6)) $2 nil
                    :constant-flag (if (member "const" (append $1 $3)) t nil)
                    :typemodifiers (delete "const" (append $1 $3))
                    :reference (car ,$4)
@@ -908,6 +912,8 @@ variablearg
 variablearg-opt-name
   : varname
     ( ,$1 )
+  | semantic-list arg-list
+    ( (car ( EXPAND $1 function-pointer )) $2)
  ;; Klaus Berndl: This allows variableargs without a arg-name being
  ;; parsed correct even if there several pointers (*)
   | opt-stars
@@ -922,9 +928,9 @@ varname-opt-initializer
 
 varnamelist
   : opt-ref varname varname-opt-initializer COMA varnamelist
-    ( ,(cons $2 $5) )
+    ( ,(cons (append $2 $3) $5) )
   | opt-ref varname varname-opt-initializer
-    ( $2 )
+    ( (append $2 $3) )
   ;
 
 ;; Klaus Berndl: Is necessary to parse stuff like
@@ -1107,8 +1113,8 @@ functionname
   ;
 
 function-pointer
-  : LPAREN STAR symbol RPAREN
-    ( (concat "*" $3) )
+  : LPAREN STAR opt-symbol RPAREN
+    ( (concat "*" ,(car $3)) )
   | LPAREN symbol RPAREN
     ( $2 )
   ;
@@ -1148,16 +1154,26 @@ type-cast-list
   : open-paren typeformbase close-paren
   ;
 
-opt-stuff-after-symbol
+opt-brackets-after-symbol
+  : brackets-after-symbol
+  | ;; EMPTY
+  ;
+
+brackets-after-symbol
   : PAREN_BLCK
   | BRACK_BLCK
-  | ;; EMPTY
   ;
 
 multi-stage-dereference
-  : namespace-symbol opt-stuff-after-symbol PERIOD multi-stage-dereference ;; method call
-  | namespace-symbol opt-stuff-after-symbol MINUS GREATER multi-stage-dereference ;;method call
-  | namespace-symbol opt-stuff-after-symbol
+  : namespace-symbol opt-brackets-after-symbol
+    PERIOD multi-stage-dereference ;; method call
+  | namespace-symbol opt-brackets-after-symbol
+    MINUS GREATER multi-stage-dereference ;;method call
+  | namespace-symbol opt-brackets-after-symbol
+    PERIOD namespace-symbol opt-brackets-after-symbol
+  | namespace-symbol opt-brackets-after-symbol
+    MINUS GREATER namespace-symbol opt-brackets-after-symbol
+  | namespace-symbol brackets-after-symbol
   ;
 
 string-seq
@@ -1183,6 +1199,7 @@ expr-binop
   | AMPERSAND
   | OR OR
   | OR
+  | MOD
  ;; There are more.
   ;
 
@@ -1200,8 +1217,7 @@ unaryexpression
   | multi-stage-dereference
   | NEW multi-stage-dereference
   | NEW builtintype-types semantic-list
- ;; Klaus Berndl: symbol -> namespace-symbol!
-  | namespace-symbol
+  | symbol
  ;; Klaus Berndl: C/C++ allows sequences of strings which are
  ;; concatenated by the precompiler to one string
   | string-seq
diff --git a/admin/grammars/grammar.wy b/admin/grammars/grammar.wy
index c5e5413e64c..4605e3c4f70 100644
--- a/admin/grammars/grammar.wy
+++ b/admin/grammars/grammar.wy
@@ -1,6 +1,6 @@
 ;;; semantic-grammar.wy -- LALR grammar of Semantic input grammars
 ;;
-;; Copyright (C) 2002-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2014 Free Software Foundation, Inc.
 ;;
 ;; Author: David Ponce <david@dponce.com>
 ;; Maintainer: David Ponce <david@dponce.com>
@@ -94,7 +94,7 @@
 %token <open-paren>  LBRACE      "{"
 %token <close-paren> RBRACE      "}"
 
-;; Punctuations
+;; Punctuation
 %type  <punctuation>
 %token <punctuation> COLON       ":"
 %token <punctuation> SEMI        ";"
diff --git a/admin/grammars/java-tags.wy b/admin/grammars/java-tags.wy
index 408d0f0da29..9ff27f3a2be 100644
--- a/admin/grammars/java-tags.wy
+++ b/admin/grammars/java-tags.wy
@@ -1,6 +1,6 @@
 ;;; java-tags.wy -- Semantic LALR grammar for Java
 
-;; Copyright (C) 2002-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2014 Free Software Foundation, Inc.
 ;;
 ;; Author: David Ponce <david@dponce.com>
 ;; Maintainer: David Ponce <david@dponce.com>
@@ -25,6 +25,11 @@
 %package wisent-java-tags-wy
 %provide semantic/wisent/javat-wy
 
+%{
+(declare-function semantic-parse-region "semantic"
+                  (start end &optional nonterminal depth returnonerror))
+}
+
 %languagemode  java-mode
 
 ;; The default start symbol
@@ -154,7 +159,7 @@
 
 %keyword CHAR         "char"
 %put     CHAR summary
-"Integral primitive type ('\u0000' to '\uffff') (0 to 65535)"
+"Integral primitive type (0 to 65535)"
 
 %keyword CLASS        "class"
 %put     CLASS summary
@@ -312,7 +317,7 @@
 %keyword WHILE        "while"
 %put     WHILE summary
 "while (<expr>) <stmt> | do <stmt> while (<expr>);"
-  
+
 ;; --------------------------
 ;; Official javadoc line tags
 ;; --------------------------
@@ -340,27 +345,27 @@
 %keyword _AUTHOR      "@author"
 %put     _AUTHOR      javadoc (seq 1 usage (type))
 %keyword _VERSION     "@version"
-%put     _VERSION     javadoc (seq 2 usage (type)) 
+%put     _VERSION     javadoc (seq 2 usage (type))
 %keyword _PARAM       "@param"
-%put     _PARAM       javadoc (seq 3 usage (function) with-name t) 
+%put     _PARAM       javadoc (seq 3 usage (function) with-name t)
 %keyword _RETURN      "@return"
-%put     _RETURN      javadoc (seq 4 usage (function)) 
+%put     _RETURN      javadoc (seq 4 usage (function))
 %keyword _EXCEPTION   "@exception"
-%put     _EXCEPTION   javadoc (seq 5 usage (function) with-name t) 
+%put     _EXCEPTION   javadoc (seq 5 usage (function) with-name t)
 %keyword _THROWS      "@throws"
-%put     _THROWS      javadoc (seq 6 usage (function) with-name t) 
+%put     _THROWS      javadoc (seq 6 usage (function) with-name t)
 %keyword _SEE         "@see"
-%put     _SEE         javadoc (seq 7 usage (type function variable) opt t with-ref t) 
+%put     _SEE         javadoc (seq 7 usage (type function variable) opt t with-ref t)
 %keyword _SINCE       "@since"
-%put     _SINCE       javadoc (seq 8 usage (type function variable) opt t) 
+%put     _SINCE       javadoc (seq 8 usage (type function variable) opt t)
 %keyword _SERIAL      "@serial"
-%put     _SERIAL      javadoc (seq 9 usage (variable) opt t) 
+%put     _SERIAL      javadoc (seq 9 usage (variable) opt t)
 %keyword _SERIALDATA  "@serialData"
-%put     _SERIALDATA  javadoc (seq 10 usage (function) opt t) 
+%put     _SERIALDATA  javadoc (seq 10 usage (function) opt t)
 %keyword _SERIALFIELD "@serialField"
-%put     _SERIALFIELD javadoc (seq 11 usage (variable) opt t) 
+%put     _SERIALFIELD javadoc (seq 11 usage (variable) opt t)
 %keyword _DEPRECATED  "@deprecated"
-%put     _DEPRECATED  javadoc (seq 12 usage (type function variable) opt t) 
+%put     _DEPRECATED  javadoc (seq 12 usage (type function variable) opt t)
 
 %%
 
@@ -387,7 +392,7 @@ package_declaration
   ;
 
 ;;; Include file token
-;; ("FILE" include SYSTEM "DOCSTRING") 
+;; ("FILE" include SYSTEM "DOCSTRING")
 import_declaration
   : IMPORT qualified_name SEMICOLON
     (INCLUDE-TAG $2 nil)
@@ -476,7 +481,7 @@ static_initializer
   ;
 
 ;;; Function token
-;; ("NAME" function "TYPE" ( ARG-LIST ) EXTRA-SPEC "DOCSTRING") 
+;; ("NAME" function "TYPE" ( ARG-LIST ) EXTRA-SPEC "DOCSTRING")
 constructor_declaration
   : modifiers_opt constructor_declarator throwsc_opt constructor_body
     (FUNCTION-TAG (car $2) nil (cdr $2)
@@ -491,11 +496,11 @@ constructor_declarator
   ;
 
 constructor_body
-  : block 
+  : block
   ;
 
 ;;; Function token
-;; ("NAME" function "TYPE" ( ARG-LIST ) EXTRA-SPEC "DOCSTRING") 
+;; ("NAME" function "TYPE" ( ARG-LIST ) EXTRA-SPEC "DOCSTRING")
 method_declaration
   : modifiers_opt VOID method_declarator throwsc_opt method_body
     (FUNCTION-TAG (car $3) $2 (cdr $3) :typemodifiers $1 :throws $4)
diff --git a/admin/grammars/js.wy b/admin/grammars/js.wy
index 3b602296552..91dbff2330d 100644
--- a/admin/grammars/js.wy
+++ b/admin/grammars/js.wy
@@ -1,6 +1,6 @@
 ;;; javascript-jv.wy -- LALR grammar for Javascript
 
-;; Copyright (C) 2005-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2014 Free Software Foundation, Inc.
 ;; Copyright (C) 1998-2011 Ecma International.
 
 ;; Author: Joakim Verona
@@ -59,7 +59,13 @@
 
 %package wisent-javascript-jv-wy
 %provide semantic/wisent/js-wy
-;; JAVE I prefere ecmascript-mode
+
+%{
+(declare-function semantic-parse-region "semantic"
+                  (start end &optional nonterminal depth returnonerror))
+}
+
+;; JAVE I preferred ecmascript-mode.
 %languagemode ecmascript-mode javascript-mode
 
 ;; The default goal
@@ -270,8 +276,8 @@ Statement : Block
           | BreakStatement
           | ReturnStatement
           | WithStatement
-          ;   
-      
+          ;
+
 FunctionDeclaration : FUNCTION VARIABLE FormalParameterListBlock Block
                       (FUNCTION-TAG $2 nil $3)
                     ;
@@ -347,7 +353,7 @@ IterationExpression : WHILE OPEN_PARENTHESIS Expression CLOSE_PARENTHESIS Statem
 ContinueStatement : CONTINUE SEMICOLON
                   ;
 
-;;JAVE break needs labels 
+;;JAVE break needs labels
 BreakStatement : BREAK SEMICOLON
               ;;               | BREAK identifier SEMICOLON
                ;
diff --git a/admin/grammars/make.by b/admin/grammars/make.by
index dcb3bb2f7d7..7fc39518faf 100644
--- a/admin/grammars/make.by
+++ b/admin/grammars/make.by
@@ -1,6 +1,6 @@
 ;;; make.by -- BY notation for Makefiles.
 
-;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2014 Free Software Foundation, Inc.
 ;;
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;;         David Ponce <david@dponce.com>
diff --git a/admin/grammars/python.wy b/admin/grammars/python.wy
index 02fb7390b01..330264de459 100644
--- a/admin/grammars/python.wy
+++ b/admin/grammars/python.wy
@@ -1,6 +1,6 @@
 ;;; python.wy -- LALR grammar for Python
 
-;; Copyright (C) 2002-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2014 Free Software Foundation, Inc.
 ;; Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
 ;; 2009, 2010 Python Software Foundation; All Rights Reserved
 
@@ -91,8 +91,12 @@
 %provide semantic/wisent/python-wy
 
 %{
-(declare-function wisent-python-reconstitute-function-tag "semantic/wisent/python")
-(declare-function wisent-python-reconstitute-class-tag "semantic/wisent/python")
+(declare-function wisent-python-reconstitute-function-tag
+                  "semantic/wisent/python" (tag suite))
+(declare-function wisent-python-reconstitute-class-tag "semantic/wisent/python"
+                  (tag))
+(declare-function semantic-parse-region "semantic"
+                  (start end &optional nonterminal depth returnonerror))
 }
 
 %languagemode python-mode
diff --git a/admin/grammars/scheme.by b/admin/grammars/scheme.by
index a433d776df5..cceec0914f6 100644
--- a/admin/grammars/scheme.by
+++ b/admin/grammars/scheme.by
@@ -1,6 +1,6 @@
 ;;; scheme.by -- Scheme BNF language specification
 
-;; Copyright (C) 2001-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/admin/grammars/srecode-template.wy b/admin/grammars/srecode-template.wy
index de9bf351ac6..d4dd2ad907a 100644
--- a/admin/grammars/srecode-template.wy
+++ b/admin/grammars/srecode-template.wy
@@ -1,6 +1,6 @@
 ;;; srecode-template.wy --- Semantic Recoder Template parser
 
-;; Copyright (C) 2005-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
 ;; Author: Eric Ludlam <zappo@gnu.org>
 ;; Keywords: syntax
@@ -125,6 +125,10 @@ opt-read-fcn
 variable
   : SET symbol insertable-string-list newline
     (VARIABLE-TAG $2 nil $3)
+  | SET symbol number newline
+    ;; 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
     (VARIABLE-TAG $2 nil t)
   ;
@@ -260,8 +264,8 @@ It ignores whitespace, newlines and comments."
   srecode-template-separator-block
   srecode-template-wy--<keyword>-keyword-analyzer
   srecode-template-property-analyzer
-  srecode-template-wy--<symbol>-regexp-analyzer
   srecode-template-wy--<number>-regexp-analyzer
+  srecode-template-wy--<symbol>-regexp-analyzer
   srecode-template-wy--<string>-sexp-analyzer
   srecode-template-wy--<punctuation>-string-analyzer
   semantic-lex-default-action
diff --git a/admin/make-emacs b/admin/make-emacs
index 58295c9607a..17d1cdc239a 100755
--- a/admin/make-emacs
+++ b/admin/make-emacs
@@ -2,7 +2,7 @@
 # Build Emacs with various options for profiling, debugging,
 # with and without warnings enabled etc.
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -21,6 +21,8 @@
 
 
 require 5;
+use strict;
+use warnings;
 use Getopt::Long;
 use File::Basename;
 use Cwd;
diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index 3825ac49278..50183f75561 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -1,5 +1,5 @@
-Instructions to create pretest or release tarballs.
--- originally written by Gerd Moellmann, amended by Francesco Potortì
+Instructions to create pretest or release tarballs. -*- coding: utf-8 -*-
+-- originally written by Gerd Moellmann, amended by Francesco Potortì
    with the initial help of Eli Zaretskii
 
 
@@ -28,14 +28,10 @@ General steps (for each step, check for possible errors):
       M-: (require 'authors) RET
       M-x authors RET
 
-    There is almost guaranteed to be an "*Authors Errors*" buffer with
-    problems caused by certain bad ChangeLog entries.  You can ignore
-    the very old ones (eg lisp/erc has a lot).  If there are errors
-    related to new entries (especially entries that are new since the
-    last pretest), see if you can fix them.  If there was a ChangeLog
-    typo, fix it.  If a file was deleted or renamed, consider adding
-    an appropriate entry to authors-ignored-files, authors-valid-file-names,
-    or authors-renamed-files-alist.
+    If there is an "*Authors Errors*" buffer, address the issues.
+    If there was a ChangeLog typo, fix it.  If a file was deleted or
+    renamed, consider adding an appropriate entry to authors-ignored-files,
+    authors-valid-file-names, or authors-renamed-files-alist.
 
     If necessary, repeat M-x authors after making those changes.
     Save the "*Authors*" buffer as etc/AUTHORS.
@@ -50,9 +46,20 @@ General steps (for each step, check for possible errors):
     For a pretest, start at version .90.  After .99, use .990 (so that
     it sorts).
 
+    The final pretest should be a release candidate.  Set the version
+    number to that of the actual release.  Pick a date about a week
+    from now when you intend to make the release.  Use M-x add-release-logs
+    to add the ChangeLog entries for that date to the tar file (but
+    not yet to the repository).  Name the tar file as
+    emacs-XX.Y-rc1.tar.  If all goes well in the following week, you
+    can simply rename the file and use it for the actual release.
+
 5.   autoreconf -i -I m4 --force
      make bootstrap
 
+     make -C etc/refcards
+     make -C etc/refcards clean
+
 6.  Copy lisp/loaddefs.el to lisp/ldefs-boot.el.
 
     Commit etc/AUTHORS, lisp/ldefs-boot.el, and the files changed
@@ -77,7 +84,8 @@ General steps (for each step, check for possible errors):
     compile-NEW.log and compare it against an old one.  The easiest way
     to do that is to visit the old log in Emacs, change the version
     number of the old Emacs to __, do the same with the new log and do
-    M-x ediff.  Especially check that Info files aren't built.
+    M-x ediff.  Especially check that Info files aren't built, and that
+    no autotools (autoconf etc) run.
 
 9.  cd EMACS_ROOT_DIR && bzr tag TAG
     TAG is emacs-XX.Y.ZZ for a pretest, emacs-XX.Y for a release.
@@ -135,6 +143,8 @@ General steps (for each step, check for possible errors):
     Download them and check the signatures.  Check they build.
 
 12. For a pretest, announce it on emacs-devel and info-gnu-emacs@gnu.org.
+    Probably should also include the platform-testers list:
+    https://lists.gnu.org/mailman/listinfo/platform-testers
     For a release, also announce it on info-gnu@gnu.org.  (Probably
     bcc the info- addresses to make it less likely that people will
     followup on those lists.)
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index b43f2bd9bb8..75808d30b60 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -4,7 +4,7 @@
 #
 #       admin/merge-gnulib
 
-# Copyright 2012-2013 Free Software Foundation, Inc.
+# Copyright 2012-2014 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -26,22 +26,25 @@
 GNULIB_URL=git://git.savannah.gnu.org/gnulib.git
 
 GNULIB_MODULES='
-  alloca-opt c-ctype c-strcase
-  careadlinkat close-stream crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512
+  alloca-opt byteswap c-ctype c-strcase
+  careadlinkat close-stream count-one-bits count-trailing-zeros
+  crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512
   dtoastr dtotimespec dup2 environ execinfo faccessat
-  fcntl-h fdopendir filemode fstatat getloadavg getopt-gnu gettime gettimeofday
-  ignore-value intprops largefile lstat
-  manywarnings memrchr mktime
-  pselect pthread_sigmask putenv readlink readlinkat
+  fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync
+  getloadavg getopt-gnu gettime gettimeofday
+  intprops largefile lstat
+  manywarnings memrchr mkostemp mktime
+  pipe2 pselect pthread_sigmask putenv qacl readlink readlinkat
   sig2str socklen stat-time stdalign stdarg stdbool stdio
   strftime strtoimax strtoumax symlink sys_stat
-  sys_time time timer-time timespec-add timespec-sub unsetenv utimens
+  sys_time time timer-time timespec-add timespec-sub
+  unsetenv update-copyright utimens
   warnings
 '
 
 GNULIB_TOOL_FLAGS='
-  --avoid=dup
-  --avoid=errno --avoid=fchdir --avoid=fcntl --avoid=fstat
+  --avoid=close --avoid=dup
+  --avoid=fchdir --avoid=fstat
   --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow
   --avoid=open --avoid=openat-die --avoid=opendir
   --avoid=raise
@@ -89,7 +92,8 @@ test -x "$gnulib_srcdir"/gnulib-tool || {
 }
 
 "$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS $GNULIB_MODULES &&
-rm -- "$src"m4/fcntl-o.m4 "$src"m4/gnulib-cache.m4 "$src"m4/warn-on-use.m4 &&
+rm -- "$src"lib/gl_openssl.h "$src"m4/fcntl-o.m4 "$src"m4/gl-openssl.m4 \
+      "$src"m4/gnulib-cache.m4"$src" m4/warn-on-use.m4 &&
 cp -- "$gnulib_srcdir"/build-aux/texinfo.tex "$src"doc/misc &&
 cp -- "$gnulib_srcdir"/build-aux/move-if-change "$src"build-aux &&
 autoreconf -i -I m4 -- ${src:+"$src"}
diff --git a/admin/notes/bugtracker b/admin/notes/bugtracker
index ee385f4dd75..7947b17973b 100644
--- a/admin/notes/bugtracker
+++ b/admin/notes/bugtracker
@@ -8,7 +8,8 @@ This is 95% of all you will ever need to know.
 
 ** How do I report a bug?
 Use M-x report-emacs-bug, or send mail to bug-gnu-emacs@gnu.org.
-If you want to Cc someone, use an "X-Debbugs-CC" header instead.
+If you want to Cc someone, use an "X-Debbugs-CC" header (or
+pseudo-header, see below) instead.
 
 ** How do I comment on a bug?
 Reply to a mail on the bug-gnu-emacs list in the normal way.
@@ -52,8 +53,8 @@ i) Your report will be assigned a number and generate an automatic reply.
 ii) Optionally, you can set some database parameters when you first
 report a bug (see "Setting bug parameters" below).
 
-iii) If you want to CC: someone, use X-Debbugs-CC: (this is important;
-see below).
+iii) If you want to CC: someone, use X-Debbugs-CC: (note this only
+applies to _new_ reports, not followups).
 
 Once your report is filed and assigned a number, it is sent out to the
 bug mailing list.  In some cases, it may be appropriate to just file a
@@ -92,18 +93,21 @@ but create duplicates and errors.  (It is possible, but unlikely, that
 you might want to have a dialog with the owner address, outside of
 normal bug reporting.)
 
-** When reporting a bug, to send a Cc to another address
+** When reporting a new bug, to send a Cc to another address
 (e.g. bug-cc-mode@gnu.org), do NOT just use a Cc: header.
 Instead, use "X-Debbugs-CC:".  This ensures the Cc address will get a
 mail with the bug report number in.  If you do not do this, each reply
-in the subsequent discussion will end up creating a new bug.
-This is annoying.
+in the subsequent discussion might end up creating a new bug.
+This is annoying.  (So annoying that a form of message-id tracking has
+been implemented to hopefully stop this happening, but it is still
+better to use X-Debbugs-CC.)
 
-(So annoying that a form of message-id tracking has been implemented
-to hopefully stop this happening, but it is still better to use X-Debbugs-CC.)
+Like any X-Debbugs- header, this one can also be specified in the
+pseudo-header (see below), if your mail client does not let you add
+"X-" headers.
 
 If a new report contains X-Debbugs-CC in the input, this is
-converted to a real Cc header in the output.  (See Bug#1720).
+converted to a real Cc header in the output.  (See Bug#1780,5384)
 It is also merged into the Resent-CC header (see below).
 
 ** How does Debbugs send out mails?
@@ -218,8 +222,8 @@ Package: emacs
 Version: 23.0.60
 Severity: minor
 
-This can also include tags.  Some things (e.g. submitter) don't seem to
-work here.
+This can also include tags, or any X-Debbugs- setting.
+Some things (e.g. submitter) don't seem to work here.
 
 Otherwise, send mail to the control server, control@debbugs.gnu.org.
 At the start of the message body, supply the desired commands, one per
@@ -627,7 +631,9 @@ following headers:
 
 1) The leading envelope From line.
 2) Message-ID (get it from /var/log/mailman/vette).
-3) X-Debbugs-Envelope-To: submit
+3) X-Debbugs-Envelope-To: xxx
+For a new report, xxx = submit; for a control message, xxx = control;
+for a reply to bug#123, xxx = 123
 
 Then pipe it to receive as above.
 
diff --git a/admin/notes/bzr b/admin/notes/bzr
index f35ff95f9d6..a3a125cd675 100644
--- a/admin/notes/bzr
+++ b/admin/notes/bzr
@@ -316,3 +316,85 @@ When finished, use
   bzr bisect reset
 
 or simply delete the entire branch if you created it just for this.
+
+* Commit emails
+
+** Old method: bzr-hookless-email
+https://launchpad.net/bzr-hookless-email
+
+Runs hourly via cron.  Must ask Savannah admins to enable/disable it
+for each branch.  Stores the last revision that it mailed as
+last_revision_mailed in branch.conf on the server.  Breaks with bzr 2.6:
+
+http://lists.gnu.org/archive/html/savannah-hackers-public/2013-05/msg00000.html
+
+Fix from https://bugs.launchpad.net/bzr-hookless-email/+bug/988195
+only partially works.  Breaks again on every merge commit:
+
+https://lists.ubuntu.com/archives/bazaar/2013q2/075520.html
+http://lists.gnu.org/archive/html/savannah-hackers-public/2013-05/msg00024.html
+
+You can force it to skip the merge commit by changing the value for
+last_revision_mailed, eg:
+
+bzr config last_revision_mailed=xfq.free@gmail.com-20130603233720-u1aumaxvf3o0rlai -d bzr+ssh://USERNAME@bzr.savannah.gnu.org/emacs/trunk/
+
+** New method: bzr-email plugin
+https://launchpad.net/bzr-email
+http://lists.gnu.org/archive/html/savannah-hackers-public/2013-06/msg00007.html
+
+Runs on commit.  Projects can enable it themselves by using `bzr
+config' to set post_commit_to option for a branch.  See `bzr help email'
+(if you have the plugin installed) for other options.
+
+The From: address will be that of your Savannah account, rather than
+your `bzr whoami' information.
+
+Note: if you have the bzr-email plugin installed locally, then when
+you commit to the Emacs repository it will also try to send a commit
+email from your local machine.  If your machine is not configured to
+send external mail, this will just fail.  In any case, you may prefer
+to either remove the plugin from your machine, or disable it for Emacs
+branches.  You can do this either by editing branch.conf in your Emacs
+branches, to override the server setting (untested; not sure this
+works), or by adding an entry to ~/.bazaar/locations.conf:
+
+  [bzr+ssh://USERNAME@bzr.savannah.gnu.org/emacs/*/]
+  post_commit_to = ""
+
+You have to use locations.conf rather than bazaar.conf because the
+latter has a lower priority than branch.conf.
+
+* Using git-bzr
+
+** initially
+
+You can use Git locally to talk to the Bazaar repo as a "remote" repo
+via git-bzr (aka git-remote-bzr).  Initial clone:
+
+ git clone bzr::bzr+ssh://USER@bzr.sv.gnu.org/emacs/trunk e
+
+This creates the working dir e/ (with subdir .git, etc).  Disk usage
+is 13G (as of early 2014), so you will probably want to repack:
+
+ git repack -a -d -f --window=250 --depth=250 --window-memory=N
+
+where N is chosen to avoid swapping.  E.g., given 512MB RAM, N="200m"
+results in "du -sh .git" => 559M, about double the smallest reported
+value (obtained with "deprecated" command "git gc --aggressive").
+
+** steady-state
+
+Use "fetch", "pull" and other remote-to-local commands as usual.
+
+For "push", the Emacs Bazaar repo is configured with
+
+ append_revisions_only = True
+
+so some versions of git-remote-bzr may raise AppendRevisionsOnlyViolation
+(in func do_export) instead of displaying a "non fast-forward" message
+and skipping the branch.  See:
+
+ http://lists.gnu.org/archive/html/emacs-devel/2014-01/msg00436.html
+
+which includes a provisional patch to git-remote-bzr to do that.
diff --git a/admin/notes/changelogs b/admin/notes/changelogs
index 2e954570ce8..1025cfc217f 100644
--- a/admin/notes/changelogs
+++ b/admin/notes/changelogs
@@ -5,6 +5,8 @@ entry in their name, not yours.
 http://lists.gnu.org/archive/html/emacs-devel/2007-09/msg00793.html
   There is no need to make change log entries for files such as NEWS,
   MAINTAINERS, and FOR-RELEASE.
+"There is no need" means you don't have to, but you can if you want to.
+
 
 http://lists.gnu.org/archive/html/emacs-devel/2006-12/msg01135.html
   There is no need to indicate regeneration of files such as configure
diff --git a/admin/notes/commits b/admin/notes/commits
index 2c6f80c56f0..f33c6905d4c 100644
--- a/admin/notes/commits
+++ b/admin/notes/commits
@@ -45,6 +45,15 @@ Date: 	 Tue, 31 Mar 2009 12:21:20 +0900
     for modern source-control systems with a global log, it's better to
     have something like "Regenerate configure".
 
+(4) (Added in 2014) In commit comments, and ChangeLog files, it is best
+    to use ways of identifying revisions that are not dependent on a
+    particular version control system.  (At time of writing Emacs is
+    about to move to its fourth VCS and another move in the future is
+    not impossible.)  An excellent way to identify commits is by
+    quoting their summary line.  Another is with an action stamp - an
+    RFC3339 date followed by ! followed by the committer's email - for
+    example, "2014-01-16T05:43:35Z!esr@thyrsus.com". Often, "my
+    previous commit" will suffice.
 
 Followup discussion:
 http://lists.gnu.org/archive/html/emacs-devel/2010-01/msg00897.html
diff --git a/admin/notes/copyright b/admin/notes/copyright
index 3a404b69678..a54bcb6108b 100644
--- a/admin/notes/copyright
+++ b/admin/notes/copyright
@@ -1,4 +1,4 @@
-Copyright (C) 2007-2013 Free Software Foundation, Inc.
+Copyright (C) 2007-2014 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
diff --git a/admin/notes/elpa b/admin/notes/elpa
index db14456fe32..469a0ca8bd1 100644
--- a/admin/notes/elpa
+++ b/admin/notes/elpa
@@ -1,24 +1,21 @@
 NOTES ON THE EMACS PACKAGE ARCHIVE
 
-The GNU Emacs package archive, at elpa.gnu.org, is managed using a Bzr
-branch named "elpa", hosted on Savannah.  To check it out:
+The GNU Emacs package archive, at elpa.gnu.org, is managed using a Git
+repository named "elpa", hosted on Savannah.  To check it out:
 
-  bzr branch bzr+ssh://USER@bzr.savannah.gnu.org/emacs/elpa elpa
+  git clone git://bzr.sv.gnu.org/emacs/elpa
   cd elpa
-  echo "public_branch = bzr+ssh://USER@bzr.savannah.gnu.org/emacs/elpa" >> .bzr/branch/branch.conf
-  bzr bind bzr+ssh://USERNAME@bzr.savannah.gnu.org/emacs/elpa
+  git remote set-url --push origin git+ssh://bzr.sv.gnu.org/srv/git/emacs/elpa
   [create task branch for edits, etc.]
 
-Changes to this branch propagate to elpa.gnu.org in a semi-manual way.
-There exists a copy of the elpa branch on that machine.  Someone with
-access logs in, pulls the latest changes from Savannah, and runs a
-"deployment" script.  This script (which is itself kept in the Bzr
-branch) generates the content visible at http://elpa.gnu.org/packages.
+Changes to this branch propagate to elpa.gnu.org via a "deployment" script run
+daily.  This script (which is kept in elpa/admin/update-archive.sh) generates
+the content visible at http://elpa.gnu.org/packages.
 
-The reason we set things up this way, instead of using the package
-upload commands in package-x.el, is to let Emacs hackers conveniently
-edit the contents of the "elpa" branch.  (In particular, multi-file
-packages are stored on the branch in source form, not as tarfiles.)
+A new package is released as soon as the "version number" of that package is
+changed.  So you can use `elpa' to work on a package without fear of releasing
+those changes prematurely.  And once the code is ready, just bump the
+version number to make a new release of the package.
 
 It is easy to use the elpa branch to deploy a "local" copy of the
 package archive.  For details, see the README file in the elpa branch.
diff --git a/admin/notes/font-backend b/admin/notes/font-backend
index cdf2001580d..5c36cf08c62 100644
--- a/admin/notes/font-backend
+++ b/admin/notes/font-backend
@@ -1,4 +1,4 @@
-Copyright (C) 2002-2013 Free Software Foundation, Inc.
+Copyright (C) 2002-2014 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
diff --git a/admin/notes/hydra b/admin/notes/hydra
new file mode 100644
index 00000000000..3b6bc87a2f6
--- /dev/null
+++ b/admin/notes/hydra
@@ -0,0 +1,66 @@
+-*- outline -*-
+
+Copyright (C) 2013-2014 Free Software Foundation, Inc.
+See the end of the file for license conditions.
+
+NOTES FOR EMACS CONTINUOUS BUILD ON HYDRA
+
+A continuous build for Emacs can be found at
+http://hydra.nixos.org/jobset/gnu/emacs-trunk
+http://hydra.nixos.org/jobset/gnu/emacs-24
+
+* It builds Emacs on various platforms.
+Sometimes jobs fail due to hydra problems rather than Emacs problems.
+Eg it seems like the cygwin build will never work again.
+http://lists.gnu.org/archive/html/hydra-users/2013-08/msg00000.html
+
+* Mail notifications
+In addition to the web interface, Hydra can send notifications by
+email when the build status of a project changes—e.g., from
+`SUCCEEDED' to `FAILED'.  It sends notifications about build status in
+Emacs trunk to emacs-buildstatus@gnu.org.
+
+If you want to receive these notifications, please subscribe at
+http://lists.gnu.org/mailman/listinfo/emacs-buildstatus
+
+* The Emacs jobset consists of the following jobs:
+
+** The `tarball' job
+which gets a checkout from bzr, and does a bootstrap followed
+by running make-dist to create a tarball.  If this job fails, all the
+others will too (because they use the tarball as input).
+
+** The `build' job
+which starts from the tarball and does a normal build
+
+** The 'coverage' job
+does a gcov build and then runs `make check'.  Fails if any test fails.
+
+* Nix expressions
+The recipe for GNU Emacs are available via Git:
+http://git.savannah.gnu.org/cgit/hydra-recipes.git/tree/emacs
+
+To modify the build job, email the patch to hydra-users@gnu.org.  The
+build recipes are written in the Nix language.
+
+* Other Information
+For a list of other GNU packages that have a continuous build on
+Hydra, see http://hydra.nixos.org/project/gnu
+
+See http://www.gnu.org/software/devel.html#Hydra for more information.
+
+
+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/>.
diff --git a/admin/notes/lel-TODO b/admin/notes/lel-TODO
index 2c6d86a4ffd..4a4ccb5e6e8 100644
--- a/admin/notes/lel-TODO
+++ b/admin/notes/lel-TODO
@@ -1,6 +1,6 @@
 Some lisp/emacs-lisp/ Features and Where They Are Documented
 
-Copyright (C) 2007-2013 Free Software Foundation, Inc.
+Copyright (C) 2007-2014 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
diff --git a/admin/notes/multi-tty b/admin/notes/multi-tty
index c4edd3abc93..dff788351a9 100644
--- a/admin/notes/multi-tty
+++ b/admin/notes/multi-tty
@@ -1,6 +1,6 @@
 -*- coding: utf-8; mode: text; -*-
 
-Copyright (C) 2007-2013 Free Software Foundation, Inc.
+Copyright (C) 2007-2014 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 From README.multi-tty in the multi-tty branch.
diff --git a/admin/notes/unicode b/admin/notes/unicode
index 21704c78a00..654580639f7 100644
--- a/admin/notes/unicode
+++ b/admin/notes/unicode
@@ -1,6 +1,6 @@
-                                            -*-mode: text; coding: latin-1;-*-
+                                            -*-mode: text; coding: utf-8;-*-
 
-Copyright (C) 2002-2013 Free Software Foundation, Inc.
+Copyright (C) 2002-2014 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 Problems, fixmes and other unicode-related issues
@@ -12,9 +12,9 @@ regard to completeness.
 
  * SINGLE_BYTE_CHAR_P returns true for Latin-1 characters, which has
    undesirable effects.  E.g.:
-   (multibyte-string-p (let ((s "x")) (aset s 0 ?£) s)) => nil
-   (multibyte-string-p (concat [?£])) => nil
-   (text-char-description ?£) => "M-#"
+   (multibyte-string-p (let ((s "x")) (aset s 0 ?£) s)) => nil
+   (multibyte-string-p (concat [?£])) => nil
+   (text-char-description ?£) => "M-#"
 
         These examples are all fixed by the change of 2002-10-14, but
         there still exist questionable SINGLE_BYTE_CHAR_P in the
@@ -77,7 +77,7 @@ regard to completeness.
    spelling and calendar, but that's not a Unicode issue.)
 
  * Handle Unicode combining characters usefully, e.g. diacritics, and
-   handle more scripts specifically (à la Devanagari).  There are
+   handle more scripts specifically (à la Devanagari).  There are
    issues with canonicalization.
 
  * We need tabular input methods, e.g. for maths symbols.  (Not
@@ -98,6 +98,134 @@ regard to completeness.
  * Old auto-save files, and similar files, such as Gnus drafts,
    containing non-ASCII characters probably won't be re-read correctly.
 
+
+Source file encoding
+--------------------
+
+Most Emacs source files are encoded in UTF-8 (or in ASCII, which is a
+subset), but there are a few exceptions, listed below.  Perhaps
+someday many of these files will be converted to UTF-8, for
+convenience when using tools like 'grep -r', but this might need
+nontrivial changes to the build process.
+
+ * chinese-big5
+
+     These are verbatim copies of files taken from external sources.
+     They haven't been converted to UTF-8.
+
+        leim/CXTERM-DIC/4Corner.tit
+        leim/CXTERM-DIC/ARRAY30.tit
+        leim/CXTERM-DIC/ECDICT.tit
+        leim/CXTERM-DIC/ETZY.tit
+        leim/CXTERM-DIC/PY-b5.tit
+        leim/CXTERM-DIC/Punct-b5.tit
+        leim/CXTERM-DIC/QJ-b5.tit
+        leim/CXTERM-DIC/ZOZY.tit
+        leim/MISC-DIC/CTLau-b5.html
+        leim/MISC-DIC/cangjie-table.b5
+
+ * chinese-iso-8bit
+
+     These are verbatim copies of files taken from external sources.
+     They haven't been converted to UTF-8.
+
+        leim/CXTERM-DIC/CCDOSPY.tit
+        leim/CXTERM-DIC/Punct.tit
+        leim/CXTERM-DIC/QJ.tit
+        leim/CXTERM-DIC/SW.tit
+        leim/CXTERM-DIC/TONEPY.tit
+        leim/MISC-DIC/pinyin.map
+        leim/MISC-DIC/CTLau.html
+        leim/MISC-DIC/ziranma.cin
+
+ * cp850
+
+     This file contains non-ASCII characters in unibyte strings.  When
+     editing a keyboard layout it's more convenient to see 'é' than
+     '\202', and the MS-DOS compiler requires the single byte if a
+     backslash escape is not being used.
+
+        src/msdos.c
+
+ * iso-2022-cn-ext
+
+     This file is externally generated from leim/MISC-DIC/cangjie-table.b5
+     by Big5->CNS converter.  It hasn't been converted to UTF-8.
+
+        leim/MISC-DIC/cangjie-table.cns
+
+ * iso-latin-2
+
+     These files are processed by csplain, a program that requires
+     Latin-2 input.  In 2012 the csplain maintainers started
+     recommending UTF-8, but these files haven't been converted yet.
+
+        etc/refcards/cs-dired-ref.tex
+        etc/refcards/cs-refcard.tex
+        etc/refcards/cs-survival.tex
+        etc/refcards/sk-dired-ref.tex
+        etc/refcards/sk-refcard.tex
+        etc/refcards/sk-survival.tex
+
+ * japanese-iso-8bit
+
+     SKK-JISYO.L is a verbatim copy of a file taken from an external source.
+     It hasn't been converted to UTF-8.
+
+        leim/SKK-DIC/SKK-JISYO.L
+
+ * japanese-shift-jis
+
+     This is a verbatim copy of a file taken from an external source.
+     It hasn't been converted to UTF-8.
+
+        admin/charsets/mapfiles/cns2ucsdkw.txt
+
+ * no-conversion
+
+     This file purposely contains arbitrary bytes interspersed within text,
+     to test whether the Emacs distribution is corrupted.
+
+        lib-src/testfile
+
+ * iso-2022-7bit
+
+     This file switches between CJK charsets, which is not encoded in UTF-8.
+
+        etc/HELLO
+
+     Each of these files contains just one CJK charset, but Emacs
+     currently has no easy way to specify set-charset-priority on a
+     per-file basis, so converting any of these files to UTF-8 might
+     change the file's appearance when viewed by an Emacs that is
+     operating in some other language environment.
+
+        etc/tutorials/TUTORIAL.ja
+        leim/quail/cyril-jis.el
+        leim/quail/hanja-jis.el
+        leim/quail/japanese.el
+        leim/quail/py-punct.el
+        leim/quail/pypunct-b5.el
+        lisp/international/ja-dic-cnv.el
+        lisp/international/ja-dic-utl.el
+        lisp/international/kinsoku.el
+        lisp/international/kkc.el
+        lisp/international/titdic-cnv.el
+        lisp/language/japan-util.el
+        lisp/language/japanese.el
+        lisp/term/x-win.el
+
+ * utf-8-emacs
+
+     These files contain characters that cannot be encoded in UTF-8.
+
+        leim/quail/tibetan.el
+        leim/quail/ethiopic.el
+        lisp/international/titdic-cnv.el
+        lisp/language/tibetan.el
+        lisp/language/tibet-util.el
+        lisp/language/ind-util.el
+
 
 This file is part of GNU Emacs.
 
diff --git a/admin/notes/www b/admin/notes/www
new file mode 100644
index 00000000000..4d092ca7fa0
--- /dev/null
+++ b/admin/notes/www
@@ -0,0 +1,82 @@
+-*- outline -*-
+
+Copyright (C) 2013-2014 Free Software Foundation, Inc.
+See the end of the file for license conditions.
+
+NOTES FOR EMACS WWW PAGES
+
+* Renaming pages, redirects
+
+Sometimes you want to move a page to a new location.
+If the old location might be referenced somewhere else, you should add
+some form of redirect to the new location.  There are several ways to
+do this:
+
+** Use a refresh directive in the old file
+https://www.gnu.org/server/standards/README.webmastering.html#htaccess
+
+Change the entire contents of the old file to be something like:
+
+<meta http-equiv="refresh" content="0; url=/software/emacs/manual/elisp.html">
+
+I can't think of any reason to use this method.
+
+** Use a .symlinks file
+https://www.gnu.org/server/standards/README.webmastering.html#symlinks
+
+This is really an interface to mod_rewrite rules, but it acts like
+symlinks.  Remove old-page.html altogether, and create a ".symlinks"
+file in the relevant directory, with contents of the form:
+
+  # This is a comment line.
+  old-page.html new-page.html
+
+Anyone visiting old-page.html will be shown the contents of new-page.html.
+Note that changes to .symlinks file are only updated periodically on
+the server via cron (twice an hour?).  So there will be a delay (of up
+to 30 minutes?) before you see your changes take effect.
+
+This method is ok, but:
+i) a person visiting old-page.html has no idea that the page has moved.
+They still see old-page.html in their address bar.  (In other words,
+the mod_rewrite rule does not use the [R] flag.)  Sometimes this is
+what you want, sometimes not.
+
+ii) it doesn't work right if the new page is in a different directory
+to the old page: relative links from the visited page will break.
+
+** Use a .htaccess file
+
+Remove old-page.html altogether, and create a ".htaccess" file in the
+relevant directory, with contents of the form:
+
+  # This is a comment line.
+  Redirect 301 /software/emacs/old-page.html /software/emacs/dir/new-page.html
+
+Use "301" for a permanent redirection, otherwise you can omit the number.
+Note that paths must (?) be relative to the top-level www.gnu.org.
+
+I think this is the best method.  You can specify temporary or
+permanent redirects, and changes go live more-or-less straight away.
+
+This method is useful for making cross-references to non-Emacs manuals
+work; see manual/.htaccess in the repository.  You only have to add a
+single redirect for every given external manual, you can redirect
+html_node to hmtl_node and html_mono to html_mono.
+
+
+
+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/>.
diff --git a/admin/notes/years b/admin/notes/years
index e6b38c5aefd..342fe9e2307 100644
--- a/admin/notes/years
+++ b/admin/notes/years
@@ -2,6 +2,8 @@ HOW TO MAINTAIN COPYRIGHT YEARS FOR GNU EMACS
 
 Maintaining copyright years is now very simple: every time a new year
 rolls around, add that year to every FSF (and AIST) copyright notice.
+Do this by running the 'admin/update-copyright' script on a fresh bzr
+checkout.  Inspect the results for plausibility, then commit them.
 
 There's no need to worry about whether an individual file has changed
 in a given year - it's sufficient that Emacs as a whole has changed.
@@ -28,10 +30,10 @@ but should keep the full list in a comment in the source.
  since Emacs 21 came out in 2001, all the subsequent years[1].  We don't
  need to check whether *that file* was changed in those years.
  It's sufficient that *Emacs* was changed in those years (and it was!).
-  
+
  For those files that have been added since then, we should add
  the year it was added to Emacs, and all subsequent years."
-  
+
  --RMS, 2005-07-13
 
 [1] Note that this includes 2001 - see
diff --git a/admin/nt/README-UNDUMP.W32 b/admin/nt/README-UNDUMP.W32
index 8138d0ba0f1..2859140ce42 100644
--- a/admin/nt/README-UNDUMP.W32
+++ b/admin/nt/README-UNDUMP.W32
@@ -1,4 +1,4 @@
-Copyright (C) 2001-2013 Free Software Foundation, Inc.
+Copyright (C) 2001-2014 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
                            Emacs for Windows
diff --git a/admin/nt/README-ftp-server b/admin/nt/README-ftp-server
index 5983a0f9617..5f5b4a951af 100644
--- a/admin/nt/README-ftp-server
+++ b/admin/nt/README-ftp-server
@@ -1,12 +1,12 @@
-Copyright (C) 2001-2013 Free Software Foundation, Inc.
+Copyright (C) 2001-2014 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
                       Precompiled Distributions of
                            Emacs for Windows
 
-                            Version 24.1
+                            Version 24.3
 
-                              January 1, 2011
+                           March 18, 2013
 
   This directory contains precompiled distributions for GNU Emacs on
   Windows (versions before Windows 95 and NT4 are not supported).
@@ -14,21 +14,15 @@ See the end of the file for license conditions.
   Free Software Foundation; the precompiled distributions are provided
   here for convenience since the majority of Windows users are not
   accustomed to compiling programs themselves.  Corresponding source
-  can be found in the parent directory in emacs-24.1.tar.gz.
-
-  If you have access to the World Wide Web, I would recommend pointing
-  your favorite web browser to the following document (if you haven't
-  already):
-
-        http://www.gnu.org/software/emacs/windows/ntemacs.html
+  can be found in the parent directory in emacs-24.3.tar.gz.
 
 * IMPORTANT LEGAL REMINDER
 
   If you want to redistribute any of the precompiled distributions of
   Emacs, be careful to check the implications of the GPL.  For instance,
-  if you put the emacs-24.1-bin-i386.tar.gz file from this directory on
+  if you put the emacs-24.3-bin-i386.zip file from this directory on
   an Internet site, you must arrange to distribute the source files of
-  the SAME version (i.e. ../emacs-24.1.tar.gz).
+  the SAME version (i.e. ../emacs-24.3.tar.gz).
 
   Making a link to our copy of the source is NOT sufficient, since we
   might upgrade to a new version while you are still distributing the
@@ -37,8 +31,8 @@ See the end of the file for license conditions.
 
 * Files in this directory
 
-  + emacs-24.1-bin-i386.zip
-    Windows binaries of Emacs-24.1, with all lisp code and documentation
+  + emacs-24.3-bin-i386.zip
+    Windows binaries of Emacs-24.3, with all lisp code and documentation
     included.
 
     Download this file if you want a single installation package, and
@@ -49,21 +43,12 @@ See the end of the file for license conditions.
     If you need the C source code at a later date, it will be safe to
     unpack the source distribution on top of this installation.
 
-  + emacs-24.1-barebin-i386.zip
-    Windows binaries of Emacs-24.1, without lisp code or documentation.
-
-    Download this file if you already have the source distribution.
-
-    Unpack this over the top of the source distribution. It contains the
-    bin subdirectory and etc/DOC file.
-
-  + libxpm-3.5.7-w32-src.zip
-    Source code required to compile libXpm-3.5.7 on Windows. Contains
+  + libXpm-3.5.8-w32-src.zip
+    Source code required to compile libXpm-3.5.8 on Windows. Contains
     a basic Makefile for compiling with mingw32 and a .def file for
     generating a DLL with the appropriate exports in addition to the
     source code to provide the subset of functionality Emacs uses from
-    libXpm. This corresponds to the libXpm.dll in emacs-24.1-bin-i386.zip
-    and emacs-24.1-barebin-i386.zip.
+    libXpm. This corresponds to the libXpm.dll in emacs-24.3-bin-i386.zip.
 
 * Prerequisites for running Emacs on Windows 9X
 
@@ -73,7 +58,7 @@ See the end of the file for license conditions.
 
 * Image support
 
-  Emacs 24.1 contains support for images, however for most image
+  Emacs 24.3 contains support for images, however for most image
   formats supporting libraries are required.  This distribution has
   been tested with the libraries that are distributed with GTK for
   Windows (http://www.gtk.org/download/win32.php), and the libraries
@@ -112,6 +97,16 @@ See the end of the file for license conditions.
       as well as the base librsvg library. Known to crash Emacs on many
       sample images.
 
+* XML support
+
+  In order to support XML via libxml2 at runtime, a libxml2-enabled
+  Emacs must be able to find the relevant DLLs during startup; failure
+  to do so is not an error, but libxml2 features won't be available to
+  the running session.
+
+  You can get pre-built binaries (including any required DLL and the
+  header files) at http://sourceforge.net/projects/ezwinports/files/.
+
 * Distributions in .tar.gz and .zip format
 
   Emacs is distributed primarily as source code in a large gzipped tar
@@ -229,16 +224,10 @@ See the end of the file for license conditions.
 
 * Further information
 
-  If you have access to the World Wide Web, I would recommend pointing
-  your favorite web browser to following the document (if you haven't
-  already):
+  The Emacs on MS Windows FAQ is distributed with Emacs (info
+  manual "efaq-w32"), and at
 
-        http://www.gnu.org/software/emacs/windows/ntemacs.html
-
-  This document serves as an FAQ and a source for further information
-  about the Windows port and related software packages. Note that as
-  most of the information in that FAQ is for earlier versions, so some
-  information may not be relevant to Emacs-24.1.
+        http://www.gnu.org/software/emacs/manual/efaq-w32.html
 
   In addition to the FAQ, there is a mailing list for discussing issues
   related to the Windows port of Emacs.  For information about the
@@ -268,11 +257,8 @@ See the end of the file for license conditions.
 
   Enjoy!
 
-  Jason Rumney
-  (jasonr@gnu.org)
-
-  Most of this README was contributed by former maintainer Andrew Innes
-  (andrewi@gnu.org)
+  Most of this README was contributed by former maintainers Andrew Innes
+  (andrewi@gnu.org) and Jason Rumney (jasonr@gnu.org).
 
 
 This file is part of GNU Emacs.
diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs
index e74a2a5af49..f29d1cb377f 100755
--- a/admin/quick-install-emacs
+++ b/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-2013 Free Software Foundation, Inc.
+## Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
 ## Author: Miles Bader <miles@gnu.org>
 
@@ -105,8 +105,8 @@ and build directories reside.
 
 Optionally, $me can also remove old versions of
 automatically generated files that are version-specific (such as the
-versioned emacs executables in the \`src' directory, and the DOC-* files
-in the \`etc' directory).  The latter action is called \`pruning,' and
+versioned emacs executables in the \`src' directory).
+The latter action is called \`pruning,' and
 can be enabled using the \`-p' or \`--prune' options.
 EOF
       exit 0
@@ -209,10 +209,6 @@ maybe_mkdir "$DST_INFO"
 
 PRUNED=""
 if test x"$PRUNE" != xno; then
-  for D in `ls -1t $BUILD/etc/DOC-* | sed 1d`; do
-    echo $REMOVE_CMD $D
-    PRUNED="$PRUNED $D"
-  done
   for D in `ls -1t $BUILD/src/emacs-$VERSION.* | sed 1d`; do
     echo $REMOVE_CMD $D
     PRUNED="$PRUNED $D"
diff --git a/admin/unidata/BidiMirroring.txt b/admin/unidata/BidiMirroring.txt
index ec41b769375..d97c0dd9617 100644
--- a/admin/unidata/BidiMirroring.txt
+++ b/admin/unidata/BidiMirroring.txt
@@ -1,19 +1,19 @@
-# BidiMirroring-6.2.0.txt
-# Date: 2012-05-15, 24:19:00 GMT [KW, LI]
+# BidiMirroring-6.3.0.txt
+# Date: 2013-02-12, 08:20:00 GMT [KW, LI]
 #
 # Bidi_Mirroring_Glyph Property
 # 
 # This file is an informative contributory data file in the
 # Unicode Character Database.
 #
-# Copyright (c) 1991-2012 Unicode, Inc.
+# Copyright (c) 1991-2013 Unicode, Inc.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 #
 # This data file lists characters that have the Bidi_Mirrored=Yes property
 # 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 6.2.0.
+# The repertoire covered by the file is Unicode 6.3.0.
 # 
 # The file contains a list of lines with mappings from one code point
 # to another one for character-based mirroring.
@@ -42,7 +42,7 @@
 # 
 # This file was originally created by Markus Scherer.
 # Extended for Unicode 3.2, 4.0, 4.1, 5.0, 5.1, 5.2, and 6.0 by Ken Whistler,
-# and for Unicode 6.1 and 6.2 by Ken Whistler and Laurentiu Iancu.
+# and for Unicode 6.1, 6.2, and 6.3 by Ken Whistler and Laurentiu Iancu.
 # 
 # ############################################################
 #
@@ -204,8 +204,8 @@
 276F; 276E # HEAVY RIGHT-POINTING ANGLE QUOTATION MARK ORNAMENT
 2770; 2771 # HEAVY LEFT-POINTING ANGLE BRACKET ORNAMENT
 2771; 2770 # HEAVY RIGHT-POINTING ANGLE BRACKET ORNAMENT
-2772; 2773 # LIGHT LEFT TORTOISE SHELL BRACKET
-2773; 2772 # LIGHT RIGHT TORTOISE SHELL BRACKET
+2772; 2773 # LIGHT LEFT TORTOISE SHELL BRACKET ORNAMENT
+2773; 2772 # LIGHT RIGHT TORTOISE SHELL BRACKET ORNAMENT
 2774; 2775 # MEDIUM LEFT CURLY BRACKET ORNAMENT
 2775; 2774 # MEDIUM RIGHT CURLY BRACKET ORNAMENT
 27C3; 27C4 # OPEN SUBSET
diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in
index 49cd9bb6d3a..3ad81a94bae 100644
--- a/admin/unidata/Makefile.in
+++ b/admin/unidata/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile -- Makefile to generate character property tables.
+### @configure_input@
 
-# Copyright (C) 2012-2013 Free Software Foundation, Inc.
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
 
 # Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011
 #   National Institute of Advanced Industrial Science and Technology (AIST)
@@ -21,16 +21,17 @@
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 srcdir = @srcdir@
-abs_builddir = @abs_builddir@
 top_srcdir = @top_srcdir@
-abs_top_builddir = @abs_top_builddir@
+top_builddir = @top_builddir@
 
-EMACS = ${abs_top_builddir}/src/emacs
+EMACS = ${top_builddir}/src/emacs
 DSTDIR = ${top_srcdir}/lisp/international
-emacs = ${EMACS} -batch --no-site-file --no-site-lisp
+emacs = "${EMACS}" -batch --no-site-file --no-site-lisp
+
+.PHONY: all compile install
 
 all: ${DSTDIR}/charprop.el
 
@@ -40,14 +41,25 @@ all: ${DSTDIR}/charprop.el
 unidata.txt: ${srcdir}/UnicodeData.txt
         sed -e 's/\([^;]*\);\(.*\)/(#x\1 "\2")/' -e 's/;/" "/g' < ${srcdir}/UnicodeData.txt > $@
 
-${DSTDIR}/charprop.el: ${srcdir}/unidata-gen.elc unidata.txt
-        cd ${DSTDIR} && ${emacs} -l ${srcdir}/unidata-gen \
-          -f unidata-gen-files ${srcdir} ${abs_builddir}/unidata.txt
+compile: ${srcdir}/unidata-gen.elc
+
+## Depend on .el rather than .elc so as not to needlessly rebuild
+## uni-*.el files just because .elc is missing.
+## Same for UnicodeData.txt v unidata.txt.
+${DSTDIR}/charprop.el: ${srcdir}/unidata-gen.el ${srcdir}/UnicodeData.txt
+        ${MAKE} ${MFLAGS} compile unidata.txt EMACS="${EMACS}"
+        -if [ -f "$@" ]; then \
+          cd ${DSTDIR} && chmod +w charprop.el `sed -n 's/^;; FILE: //p' < charprop.el`; \
+        fi
+        ${emacs} -L ${srcdir} -l unidata-gen -f unidata-gen-files \
+          ${srcdir} "${DSTDIR}"
 
 ## Like the above, but generate in PWD rather than lisp/international.
 charprop.el: ${srcdir}/unidata-gen.elc unidata.txt
-        ${emacs} -l ${srcdir}/unidata-gen \
-          -f unidata-gen-files ${srcdir} unidata.txt
+        ${emacs} -L ${srcdir} -l unidata-gen -f unidata-gen-files \
+          ${srcdir}
+
+.PHONY: clean bootstrap-clean distclean maintainer-clean extraclean
 
 install: charprop.el
         cp charprop.el ${DSTDIR}
@@ -57,9 +69,20 @@ clean:
         if test -f charprop.el; then \
           rm -f `sed -n 's/^;; FILE: //p' < charprop.el`; \
         fi
-        rm -f charprop.el ${srcdir}/unidata-gen.elc unidata.txt
+        rm -f charprop.el ${srcdir}/*.elc unidata.txt
+
+bootstrap-clean: clean
 
 distclean: clean
-        -rm -f ./Makefile
+        rm -f Makefile
 
 maintainer-clean: distclean
+
+## Do not remove these files, even in a bootstrap, because they rarely
+## change and it slows down bootstrap (a tiny bit).
+## Cf leim/ja-dic (which is much slower).
+extraclean:
+        if test -f ${DSTDIR}/charprop.el; then \
+          (cd ${DSTDIR} && rm -f `sed -n 's/^;; FILE: //p' < charprop.el`); \
+          rm -f ${DSTDIR}/charprop.el; \
+        fi
diff --git a/admin/unidata/UnicodeData.txt b/admin/unidata/UnicodeData.txt
index 086379eb4f3..9fffa71a1e9 100644
--- a/admin/unidata/UnicodeData.txt
+++ b/admin/unidata/UnicodeData.txt
@@ -1509,6 +1509,7 @@
 0619;ARABIC SMALL DAMMA;Mn;31;NSM;;;;;N;;;;;
 061A;ARABIC SMALL KASRA;Mn;32;NSM;;;;;N;;;;;
 061B;ARABIC SEMICOLON;Po;0;AL;;;;;N;;;;;
+061C;ARABIC LETTER MARK;Cf;0;AL;;;;;N;;;;;
 061E;ARABIC TRIPLE DOT PUNCTUATION MARK;Po;0;AL;;;;;N;;;;;
 061F;ARABIC QUESTION MARK;Po;0;AL;;;;;N;;;;;
 0620;ARABIC LETTER KASHMIRI YEH;Lo;0;AL;;;;;N;;;;;
@@ -5296,7 +5297,7 @@
 180B;MONGOLIAN FREE VARIATION SELECTOR ONE;Mn;0;NSM;;;;;N;;;;;
 180C;MONGOLIAN FREE VARIATION SELECTOR TWO;Mn;0;NSM;;;;;N;;;;;
 180D;MONGOLIAN FREE VARIATION SELECTOR THREE;Mn;0;NSM;;;;;N;;;;;
-180E;MONGOLIAN VOWEL SEPARATOR;Zs;0;WS;;;;;N;;;;;
+180E;MONGOLIAN VOWEL SEPARATOR;Cf;0;BN;;;;;N;;;;;
 1810;MONGOLIAN DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
 1811;MONGOLIAN DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
 1812;MONGOLIAN DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
@@ -5751,7 +5752,7 @@
 1A18;BUGINESE VOWEL SIGN U;Mn;220;NSM;;;;;N;;;;;
 1A19;BUGINESE VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
 1A1A;BUGINESE VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
-1A1B;BUGINESE VOWEL SIGN AE;Mc;0;L;;;;;N;;;;;
+1A1B;BUGINESE VOWEL SIGN AE;Mn;0;NSM;;;;;N;;;;;
 1A1E;BUGINESE PALLAWA;Po;0;L;;;;;N;;;;;
 1A1F;BUGINESE END OF SECTION;Po;0;L;;;;;N;;;;;
 1A20;TAI THAM LETTER HIGH KA;Lo;0;L;;;;;N;;;;;
@@ -7116,6 +7117,10 @@
 2062;INVISIBLE TIMES;Cf;0;BN;;;;;N;;;;;
 2063;INVISIBLE SEPARATOR;Cf;0;BN;;;;;N;;;;;
 2064;INVISIBLE PLUS;Cf;0;BN;;;;;N;;;;;
+2066;LEFT-TO-RIGHT ISOLATE;Cf;0;LRI;;;;;N;;;;;
+2067;RIGHT-TO-LEFT ISOLATE;Cf;0;RLI;;;;;N;;;;;
+2068;FIRST STRONG ISOLATE;Cf;0;FSI;;;;;N;;;;;
+2069;POP DIRECTIONAL ISOLATE;Cf;0;PDI;;;;;N;;;;;
 206A;INHIBIT SYMMETRIC SWAPPING;Cf;0;BN;;;;;N;;;;;
 206B;ACTIVATE SYMMETRIC SWAPPING;Cf;0;BN;;;;;N;;;;;
 206C;INHIBIT ARABIC FORM SHAPING;Cf;0;BN;;;;;N;;;;;
@@ -7738,10 +7743,10 @@
 2305;PROJECTIVE;So;0;ON;;;;;N;;;;;
 2306;PERSPECTIVE;So;0;ON;;;;;N;;;;;
 2307;WAVY LINE;So;0;ON;;;;;N;;;;;
-2308;LEFT CEILING;Sm;0;ON;;;;;Y;;;;;
-2309;RIGHT CEILING;Sm;0;ON;;;;;Y;;;;;
-230A;LEFT FLOOR;Sm;0;ON;;;;;Y;;;;;
-230B;RIGHT FLOOR;Sm;0;ON;;;;;Y;;;;;
+2308;LEFT CEILING;Ps;0;ON;;;;;Y;;;;;
+2309;RIGHT CEILING;Pe;0;ON;;;;;Y;;;;;
+230A;LEFT FLOOR;Ps;0;ON;;;;;Y;;;;;
+230B;RIGHT FLOOR;Pe;0;ON;;;;;Y;;;;;
 230C;BOTTOM RIGHT CROP;So;0;ON;;;;;N;;;;;
 230D;BOTTOM LEFT CROP;So;0;ON;;;;;N;;;;;
 230E;TOP RIGHT CROP;So;0;ON;;;;;N;;;;;
@@ -18740,8 +18745,8 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 12453;CUNEIFORM NUMERIC SIGN FOUR BAN2 VARIANT FORM;Nl;0;L;;;;4;N;;;;;
 12454;CUNEIFORM NUMERIC SIGN FIVE BAN2;Nl;0;L;;;;5;N;;;;;
 12455;CUNEIFORM NUMERIC SIGN FIVE BAN2 VARIANT FORM;Nl;0;L;;;;5;N;;;;;
-12456;CUNEIFORM NUMERIC SIGN NIGIDAMIN;Nl;0;L;;;;-1;N;;;;;
-12457;CUNEIFORM NUMERIC SIGN NIGIDAESH;Nl;0;L;;;;-1;N;;;;;
+12456;CUNEIFORM NUMERIC SIGN NIGIDAMIN;Nl;0;L;;;;2;N;;;;;
+12457;CUNEIFORM NUMERIC SIGN NIGIDAESH;Nl;0;L;;;;3;N;;;;;
 12458;CUNEIFORM NUMERIC SIGN ONE ESHE3;Nl;0;L;;;;1;N;;;;;
 12459;CUNEIFORM NUMERIC SIGN TWO ESHE3;Nl;0;L;;;;2;N;;;;;
 1245A;CUNEIFORM NUMERIC SIGN ONE THIRD DISH;Nl;0;L;;;;1/3;N;;;;;
diff --git a/admin/unidata/copyright.html b/admin/unidata/copyright.html
index 90cd895d984..81722bd091f 100644
--- a/admin/unidata/copyright.html
+++ b/admin/unidata/copyright.html
@@ -10,7 +10,7 @@
 
 <meta name="VI60_defaultClientScript" content="JavaScript">
 
-<meta name="GENERATOR" content="Microsoft FrontPage 5.0">
+<meta name="GENERATOR" content="Microsoft FrontPage 12.0">
 
 <meta name="keywords" content="Unicode Standard, copyright">
 
@@ -136,7 +136,7 @@ href="http://www.unicode.org/webscripts/standard_styles.css">
             <ol type="A">
               <li><u><a name="1"></a>Unicode Copyright.</u>
               <ol>
-                <li>Copyright © 1991-2012 Unicode, Inc. All rights reserved.</li>
+                <li>Copyright © 1991-2013 Unicode, Inc. All rights reserved.</li>
                 <li>Certain documents and files on this website contain a legend 
                 indicating that &quot;Modification is permitted.&quot; Any person is 
                 hereby authorized, without fee, to modify such documents and 
@@ -268,7 +268,7 @@ http://www.unicode.org/cldr/data/</a>.</p>
 <p>NOTICE TO USER: Carefully read the following legal agreement. BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"), YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.</p>
 <p>COPYRIGHT AND PERMISSION NOTICE</p>
 
-<p>Copyright © 1991-2012 Unicode, Inc. All rights reserved. Distributed under the Terms of Use in 
+<p>Copyright © 1991-2013 Unicode, Inc. All rights reserved. Distributed under the Terms of Use in 
 <a href="http://www.unicode.org/copyright.html">http://www.unicode.org/copyright.html</a>.</p>
 
 <p>Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and 
diff --git a/admin/unidata/unidata-gen.el b/admin/unidata/unidata-gen.el
index d9277217f0e..ff45b79aab7 100644
--- a/admin/unidata/unidata-gen.el
+++ b/admin/unidata/unidata-gen.el
@@ -1,4 +1,7 @@
 ;; unidata-gen.el -- Create files containing character property data.
+
+;; Copyright (C) 2008-2014 Free Software Foundation, Inc.
+
 ;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
@@ -23,13 +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-files' must be runnable by `temacs'.
 
 ;; FILES TO BE GENERATED
 ;;
 ;;   The entry function `unidata-gen-files' generates these files in
-;;   the current directory.
+;;   in directory specified by its dest-dir argument.
 ;;
 ;;   charprop.el
 ;;      It contains a series of forms of this format:
@@ -88,9 +90,9 @@
 
 (defvar unidata-list nil)
 
-;; Name of the directory containing files of Unicode Character
-;; Database.
+;; Name of the directory containing files of Unicode Character Database.
 
+;; Dynamically bound in unidata-gen-files.
 (defvar unidata-dir nil)
 
 (defun unidata-setup-list (unidata-text-file)
@@ -192,8 +194,8 @@ Property value is an integer."
      4 unidata-gen-table-symbol "uni-bidi.el"
      "Unicode bidi class.
 Property value is one of the following symbols:
-  L, LRE, LRO, R, AL, RLE, RLO, PDF, EN, ES, ET,
-  AN, CS, NSM, BN, B, S, WS, ON"
+  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
@@ -203,7 +205,8 @@ Property value is one of the following symbols:
         (#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 ES ET CS NSM S WS ON))
+     (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.
@@ -395,12 +398,17 @@ is the character itself.")))
 ;; If VAL is one of VALn, just return n.
 ;; Otherwise, VAL-LIST is modified to this:
 ;;   ((nil . 0) (VAL1 . 1) (VAL2 . 2) ... (VAL . n+1))
+;;
+;; WARN is an optional warning to display when the value list is
+;; extended, for property values that need to be in sync with other
+;; parts of Emacs; currently only used for bidi-class.
 
-(defun unidata-encode-val (val-list val)
+(defun unidata-encode-val (val-list val &optional warn)
   (let ((slot (assoc val val-list))
         val-code)
     (if slot
         (cdr slot)
+      (if warn (message warn val))
       (setq val-code (length val-list))
       (nconc val-list (list (cons val val-code)))
       val-code)))
@@ -411,6 +419,16 @@ is the character itself.")))
   (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;
+        ;; (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
+        ;; (4) possibly update the switch cases in
+        ;;     bidi.c:bidi_get_type and bidi.c:bidi_get_category.
+        (bidi-warning "\
+** Found new bidi-class '%s', please update bidi.c and dispextern.h")
         tail elt range val val-code idx slot
         prev-range-data)
     (setq val-list (cons nil (copy-sequence val-list)))
@@ -436,7 +454,9 @@ is the character itself.")))
       (setq elt (car tail) tail (cdr tail))
       (setq range (car elt)
             val (funcall val-func (nth prop-idx elt)))
-      (setq val-code (if val (unidata-encode-val val-list val)))
+      (setq val-code (if val (unidata-encode-val val-list val
+                                                 (and (eq prop 'bidi-class)
+                                                      bidi-warning))))
       (if (consp range)
           (when val-code
             (set-char-table-range table range val-code)
@@ -484,7 +504,9 @@ is the character itself.")))
             (setq new-val (funcall val-func (nth prop-idx elt)))
             (if (not (eq val new-val))
                 (setq val new-val
-                      val-code (if val (unidata-encode-val val-list val))))
+                      val-code (if val (unidata-encode-val
+                                        val-list val (and (eq prop 'bidi-class)
+                                                          bidi-warning)))))
             (if val-code
                 (aset vec (- range start) val-code))
             (setq tail (cdr tail)))
@@ -962,7 +984,14 @@ is the character itself.")))
           (l nil)
           (idx 0)
           c)
-      (if (= len 0)
+      (if (or (= len 0)
+              ;; Unicode Standard, paragraph 4.8: "For all other
+              ;; Unicode code points of all other types (Control,
+              ;; Private-Use, Surrogate, Noncharacter, and Reserved),
+              ;; the value of the Name property is the null string."
+              ;; We already handle elsewhere all the characters except
+              ;; Cc, Control characters, which are handled here.
+              (string= str "<control>"))
           nil
         (dotimes (i len)
           (setq c (aref str i))
@@ -975,11 +1004,15 @@ is the character itself.")))
                       idx (1+ i)))))
         (nreverse (cons (intern (substring str idx)) l))))))
 
+(defun unidata--ensure-compiled (&rest funcs)
+  (dolist (fun funcs)
+    (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))
          (word-tables (char-table-extra-slot table 4)))
-    (byte-compile 'unidata-get-name)
-    (byte-compile 'unidata-put-name)
+    (unidata--ensure-compiled 'unidata-get-name 'unidata-put-name)
     (set-char-table-extra-slot table 1 (symbol-function 'unidata-get-name))
     (set-char-table-extra-slot table 2 (symbol-function 'unidata-put-name))
 
@@ -1017,8 +1050,8 @@ is the character itself.")))
 (defun unidata-gen-table-decomposition (prop &rest ignore)
   (let* ((table (unidata-gen-table-word-list prop 'unidata-split-decomposition))
          (word-tables (char-table-extra-slot table 4)))
-    (byte-compile 'unidata-get-decomposition)
-    (byte-compile 'unidata-put-decomposition)
+    (unidata--ensure-compiled 'unidata-get-decomposition
+                              'unidata-put-decomposition)
     (set-char-table-extra-slot table 1
                                (symbol-function 'unidata-get-decomposition))
     (set-char-table-extra-slot table 2
@@ -1101,6 +1134,10 @@ is the character itself.")))
                (RLE . "Right-to-Left Embedding")
                (RLO . "Right-to-Left Override")
                (PDF . "Pop Directional Format")
+               (LRI . "Left-to-Right Isolate")
+               (RLI . "Right-to-Left Isolate")
+               (FSI . "First Strong Isolate")
+               (PDI . "Pop Directional Isolate")
                (EN . "European Number")
                (ES . "European Number Separator")
                (ET . "European Number Terminator")
@@ -1176,18 +1213,21 @@ is the character itself.")))
 ;; The entry function.  It generates files described in the header
 ;; comment of this file.
 
-(defun unidata-gen-files (&optional data-dir unidata-text-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 (car command-line-args-left)
-            command-line-args-left (cdr command-line-args-left)
-            unidata-text-file (car command-line-args-left)
-            command-line-args-left (cdr command-line-args-left)))
+      (setq data-dir (pop command-line-args-left)
+            dest-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)
-        (charprop-file "charprop.el")
+        (charprop-file (expand-file-name "charprop.el" dest-dir))
         (unidata-dir data-dir))
     (dolist (elt unidata-prop-alist)
       (let* ((prop (car elt))
-             (file (unidata-prop-file prop)))
+             (file (expand-file-name (unidata-prop-file prop) dest-dir)))
         (if (file-exists-p file)
             (delete-file file))))
     (unidata-setup-list unidata-text-file)
@@ -1196,7 +1236,8 @@ is the character itself.")))
       (dolist (elt unidata-prop-alist)
         (let* ((prop (car elt))
                (generator (unidata-prop-generator prop))
-               (file (unidata-prop-file 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))
@@ -1204,9 +1245,9 @@ is the character itself.")))
                table)
           ;; Filename in this comment line is extracted by sed in
           ;; Makefile.
-          (insert (format ";; FILE: %s\n" file))
+          (insert (format ";; FILE: %s\n" basename))
           (insert (format "(define-char-code-property '%S %S\n  %S)\n"
-                          prop file docstring))
+                          prop basename docstring))
           (with-temp-buffer
             (message "Generating %s..." file)
             (when (file-exists-p file)
@@ -1216,30 +1257,35 @@ is the character itself.")))
             (setq table (funcall generator prop default-value val-list))
             (when describer
               (unless (subrp (symbol-function describer))
-                (byte-compile describer)
+                (unidata--ensure-compiled describer)
                 (setq describer (symbol-function describer)))
               (set-char-table-extra-slot table 3 describer))
             (if (bobp)
-                (insert ";; Copyright (C) 1991-2009 Unicode, Inc.
+                (insert ";; Copyright (C) 1991-2013 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 %S %S)\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" file)))
+                        (format ";; %s ends here\n" basename)))
             (write-file file)
             (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" charprop-file)))))
+              (format ";; %s ends here\n"
+                      (file-name-nondirectory charprop-file))))))
 
 
 
diff --git a/admin/update-copyright b/admin/update-copyright
new file mode 100755
index 00000000000..2b33506f9c1
--- /dev/null
+++ b/admin/update-copyright
@@ -0,0 +1,75 @@
+#! /bin/sh
+# Update the copyright dates in Emacs sources.
+# Typical usage:
+#
+#       admin/update-copyright
+#
+# By default, this script uses the local-time calendar year.
+# Set the UPDATE_COPYRIGHT_YEAR environment variable to override the default.
+
+# Copyright 2013-2014 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 <http://www.gnu.org/licenses/>.
+
+# written by Paul Eggert
+
+# FIXME: The file 'notes/copyright' says that the AIST copyright years
+# should be updated, but by inspection it appears that some should be
+# updated and some should not be, due to registration numbers, so
+# this script leaves these copyright years alone for now.
+
+: ${UPDATE_COPYRIGHT_USE_INTERVALS=1}
+export UPDATE_COPYRIGHT_USE_INTERVALS
+
+: ${UPDATE_COPYRIGHT_YEAR=$(date +%Y)}
+export UPDATE_COPYRIGHT_YEAR
+
+emacsver=etc/refcards/emacsver.tex
+sed 's/\\def\\year[{][0-9]*[}]/\\def\\year{'"$UPDATE_COPYRIGHT_YEAR"'}'/g \
+  $emacsver >$emacsver.aux &&
+{ cmp -s $emacsver $emacsver.aux ||
+  cp $emacsver.aux $emacsver
+} &&
+rm $emacsver.aux &&
+
+bzr_files=$(bzr ls -RV --kind file) &&
+
+# Do not update the copyright of files that have one or more of the
+# following problems:
+# . They are license files, maintained by the FSF, with their own dates.
+# . Their format cannot withstand changing the contents of copyright strings.
+
+updatable_files=$(find $bzr_files \
+  ! -name COPYING \
+  ! -name doclicense.texi \
+  ! -name gpl.texi \
+  ! -name '*-gzipped' \
+  ! -name '*.ico' \
+  ! -name '*.icns' \
+  ! -name '*.pbm' \
+  ! -name '*.pdf' \
+  ! -name '*.png' \
+  ! -name '*.sig' \
+  ! -name '*.tar' \
+  ! -name '*.tiff' \
+  ! -name '*.xpm' \
+  ! -name eterm-color \
+  ! -name hand.cur \
+  ! -name key.pub \
+  ! -name key.sec \
+  -print) &&
+
+build-aux/update-copyright $updatable_files
diff --git a/admin/update_autogen b/admin/update_autogen
new file mode 100755
index 00000000000..b9511969a15
--- /dev/null
+++ b/admin/update_autogen
@@ -0,0 +1,375 @@
+#!/bin/bash
+### update_autogen - update some auto-generated files in the Emacs tree
+
+## Copyright (C) 2011-2014 Free Software Foundation, Inc.
+
+## Author: Glenn Morris <rgm@gnu.org>
+
+## This file is part of GNU Emacs.
+
+## GNU Emacs is free software: you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
+
+## GNU Emacs is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+
+## You should have received a copy of the GNU General Public License
+## along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+### Commentary:
+
+## This is a helper script to update some generated files in the Emacs
+## repository.  This is suitable for running from cron.
+## Only Emacs maintainers need use this, so it uses bash features.
+##
+## By default, it updates the versioned loaddefs-like files in lisp,
+## except ldefs-boot.el.
+
+### Code:
+
+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
+
+## This should be the admin directory.
+cd $PD
+cd ../
+[ -d admin ] || die "Could not locate admin directory"
+
+
+usage ()
+{
+    cat 1>&2 <<EOF
+Usage: ${PN} [-f] [-c] [-q] [-A dir] [-I] [-L] [-C] [-- make-flags]
+Update some auto-generated files in the Emacs tree.
+By default, only does the versioned loaddefs-like files in lisp/.
+This requires a build.  Passes any non-option args to make (eg -- -j2).
+Options:
+-f: force an update even if the source files are locally modified.
+-c: if the update succeeds and the generated files are modified,
+    commit them (caution).
+-q: be quiet; only give error messages, not status messages.
+-A: only update autotools files, copying into specified dir.
+-I: also update info/dir.
+-L: also update ldefs-boot.el.
+-C: start from a clean state.  Slower, but more correct.
+EOF
+    exit 1
+}
+
+
+## Defaults.
+
+force=
+commit=
+quiet=
+clean=
+autogendir=                     # was "autogen"
+ldefs_flag=1
+lboot_flag=
+info_flag=
+
+## Parameters.
+ldefs_in=lisp/loaddefs.el
+ldefs_out=lisp/ldefs-boot.el
+sources="configure.ac lib/Makefile.am"
+## Files to copy into autogendir.
+## Everything:
+genfiles="
+  configure aclocal.m4 src/config.in lib/Makefile.in
+  build-aux/compile build-aux/config.guess build-aux/config.sub
+  build-aux/depcomp build-aux/install-sh build-aux/missing
+"
+## msdos-only:
+genfiles="src/config.in lib/Makefile.in"
+
+for g in $genfiles; do
+    basegen="$basegen ${g##*/}"
+done
+
+[ "$basegen" ] || die "internal error"
+
+tempfile=/tmp/$PN.$$
+
+trap "rm -f $tempfile 2> /dev/null" EXIT
+
+
+while getopts ":hcfqA:CIL" option ; do
+    case $option in
+        (h) usage ;;
+
+        (c) commit=1 ;;
+
+        (f) force=1 ;;
+
+        (q) quiet=1 ;;
+
+        (A) autogendir=$OPTARG
+            [ -d "$autogendir" ] || die "No autogen directory: $autogendir"
+            ;;
+
+        (C) clean=1 ;;
+
+        (I) info_flag=1 ;;
+
+        (L) lboot_flag=1 ;;
+
+        (\?) die "Bad option -$OPTARG" ;;
+
+        (:) die "Option -$OPTARG requires an argument" ;;
+
+        (*) die "getopts error" ;;
+    esac
+done
+shift $(( --OPTIND ))
+OPTIND=1
+
+
+## Does not work 100% because a lot of Emacs batch output comes on stderr (?).
+[ "$quiet" ] && exec 1> /dev/null
+
+
+## Run status on inputs, list modified files on stdout.
+status ()
+{
+    bzr status -S "$@" >| $tempfile || die "bzr status error for $@"
+
+    local stat file modified
+
+    while read stat file; do
+
+        [ "$stat" != "M" ] && \
+            die "Unexpected status ($stat) for generated $file"
+        modified="$modified $file"
+
+    done < $tempfile
+
+    echo "$modified"
+
+    return 0
+}                               # function status
+
+
+echo "Checking input file status..."
+
+## The lisp portion could be more permissive, eg only care about .el files.
+modified=$(status ${autogendir:+$sources} ${ldefs_flag:+lisp} ${info_flag:+doc}) || die
+
+[ "$modified" ] && {
+    echo "Locally modified: $modified"
+    [ "$force" ] || die "There are local modifications"
+}
+
+
+## Probably this is overkill, and there's no need to "bootstrap" just
+## for making autoloads.
+[ "$clean" ] && {
+
+    echo "Running 'make maintainer-clean'..."
+
+    make maintainer-clean #|| die "Cleaning error"
+
+    rm -f $ldefs_in
+}
+
+
+echo "Running autoreconf..."
+
+autoreconf ${clean:+-f} -i -I m4 2>| $tempfile
+
+retval=$?
+
+## Annoyingly, autoreconf puts the "installing `./foo' messages on stderr.
+if [ "$quiet" ]; then
+    grep -v 'installing `\.' $tempfile 1>&2
+else
+    cat "$tempfile" 1>&2
+fi
+
+[ $retval -ne 0 ] && die "autoreconf error"
+
+
+## Uses global $commit.
+commit ()
+{
+    local type=$1
+    shift
+
+    [ $# -gt 0 ] || {
+        echo "No files were modified"
+        return 0
+    }
+
+    echo "Modified file(s): $@"
+
+    [ "$commit" ] || return 0
+
+    echo "Committing..."
+
+    ## bzr status output is always relative to top-level, not PWD.
+    bzr commit -m "Auto-commit of $type files." "$@" || return $?
+
+    echo "Committed files: $@"
+}                               # function commit
+
+
+## No longer used since info/dir is now generated at install time if needed,
+## and is not in the repository any more.
+info_dir ()
+{
+    local basefile=build-aux/dir_top outfile=info/dir
+
+    echo "Regenerating info/dir..."
+
+    ## Header contains non-printing characters, so this is more
+    ## reliable than using echo.
+    rm -f $outfile
+    cp $basefile $outfile
+
+    local topic file dircat dirent
+
+    ## FIXME inefficient looping.
+    for topic in "Texinfo documentation system" "Emacs" "GNU Emacs Lisp" \
+        "Emacs editing modes" "Emacs network features" "Emacs misc features" \
+        "Emacs lisp libraries"; do
+
+        cat - <<EOF >> $outfile
+
+$topic
+EOF
+        ## Bit faster than doc/*/*.texi.
+        for file in doc/emacs/emacs.texi doc/lispintro/*.texi \
+            doc/lispref/elisp.texi doc/misc/*.texi; do
+
+            ## FIXME do not ignore w32 if OS is w32.
+            case $file in
+                *-xtra.texi|*efaq-w32.texi) continue ;;
+            esac
+
+            dircat=`sed -n -e 's/@value{emacsname}/Emacs/' -e 's/^@dircategory //p' $file`
+
+            ## TODO warn about unknown topics (check-info in top-level
+            ## Makefile does this).
+            [ "$dircat" = "$topic" ] || continue
+
+            sed -n -e 's/@value{emacsname}/Emacs/' \
+                -e 's/@acronym{\([A-Z]*\)}/\1/' \
+                -e '/^@direntry/,/^@end direntry/ s/^\([^@]\)/\1/p' \
+                $file >> $outfile
+
+        done
+    done
+
+    local modified
+
+    modified=$(status $outfile) || die
+
+    commit "info/dir" $modified || die "commit error"
+}                               # function info_dir
+
+
+[ "$autogendir" ] && {
+
+    oldpwd=$PWD
+
+    cp $genfiles $autogendir/
+
+    cd $autogendir || die "cd error for $autogendir"
+
+    echo "Checking status of generated files..."
+
+    modified=$(status $basegen) || die
+
+    cd $oldpwd
+
+    commit "generated" $modified || die "commit error"
+
+    exit 0
+}                               # $autogendir
+
+
+[ "$info_flag" ] && info_dir
+
+
+[ "$ldefs_flag" ] || exit 0
+
+
+echo "Finding loaddef targets..."
+
+sed -n -e '/^AUTOGEN_VCS/,/^$/p' lisp/Makefile.in | \
+    sed -e '/AUTOGEN_VCS/d' -e '/^$/d' -e 's/\\//' \
+    >| $tempfile || die "sed error"
+
+genfiles=
+
+while read genfile; do
+
+    [ -r lisp/$genfile ] || die "Unable to read $genfile"
+
+    genfiles="$genfiles $genfile"
+done < $tempfile
+
+
+[ "$genfiles" ] || die "Error setting genfiles"
+
+
+[ -e Makefile ] || {
+    echo "Running ./configure..."
+
+    ## Minimize required packages.
+    ./configure --without-x || die "configure error"
+}
+
+
+## Build the minimum needed to get the autoloads.
+echo "Running lib/ make..."
+
+make -C lib "$@" all || die "make lib error"
+
+
+echo "Running src/ make..."
+
+make -C src "$@" bootstrap-emacs || die "make src error"
+
+
+echo "Running lisp/ make..."
+
+make -C lisp "$@" autoloads EMACS=../src/bootstrap-emacs || die "make src error"
+
+
+## Ignore comment differences.
+[ ! "$lboot_flag" ] || \
+    diff -q -I '^;' $ldefs_in $ldefs_out || \
+    cp $ldefs_in $ldefs_out || die "cp ldefs_boot error"
+
+
+cd lisp
+
+echo "Checking status of loaddef files..."
+
+## It probably would be fine to just check+commit lisp/, since
+## making autoloads should not effect any other files.  But better
+## safe than sorry.
+modified=$(status $genfiles ${ldefs_out#lisp/}) || die
+
+
+cd ../
+
+
+commit "loaddefs" $modified || die "commit error"
+
+
+exit 0
+
+### update_autogen ends here