upstream

52 files changed, 2117 insertions, 569 deletions

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index 27d87dcaa2a..066347b3826 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -86,8 +86,6 @@ BROKEN_FIONREAD
 BROKEN_GET_CURRENT_DIR_NAME
 BROKEN_NON_BLOCKING_CONNECT
 BROKEN_PTY_READ_AFTER_EAGAIN
-CLASH_DETECTION
-DATA_SEG_BITS
 DEFAULT_SOUND_DEVICE
 DEVICE_SEP
 DIRECTORY_SEP
@@ -201,17 +199,13 @@ HAVE_KRB5_H
 HAVE_KRB_H
 HAVE_LANGINFO_CODESET
 HAVE_LIBDGC
-HAVE_LIBDNET
 HAVE_LIBKSTAT
 HAVE_LIBLOCKFILE
-HAVE_LIBM
 HAVE_LIBMAIL
 HAVE_LIBOTF
 HAVE_LIBPERFSTAT
 HAVE_LIBPNG_PNG_H
-HAVE_LIBPTHREADS
 HAVE_LIBSELINUX
-HAVE_LIBXEXT
 HAVE_LIBXML2
 HAVE_LIBXMU
 HAVE_LOCALTIME_R
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 29118deba7f..79adb4f543d 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,293 @@
+2014-05-25  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * mac/uvs.el: New file from Mac port.  Generates src/macuvs.h.
+
+2014-05-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Assume C99 or later (Bug#17487).
+        * merge-gnulib (GNULIB_MODULES): Remove stdarg, stdbool.
+        (GNULIB_TOOL_FLAGS): Avoid stdarg, stdbool.
+
+2014-05-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Don't require pkg-config when building from repository.
+        * merge-pkg-config: New script.
+        * notes/copyright: Update for m4/*.m4, in particular m4/pkg.m4.
+
+2014-05-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * merge-gnulib: Defer to autogen.sh for ACLOCAL_PATH computation.
+
+2014-05-12  Glenn Morris  <rgm@gnu.org>
+
+        * find-gc.el: Move here from ../lisp/emacs-lisp.
+
+        * admin.el (set-version-in-file): Don't set identical version.
+        (set-version): Provide default version number.
+        (set-version, set-copyright): Give start/end messages.
+
+2014-04-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * notes/bzr: Update instructions for merging from gnulib.
+        Remove obsolete note about tramp.el and tramp-sh.el.
+        Change "emacs-23" to "emacs-24".
+
+2014-04-11  Glenn Morris  <rgm@gnu.org>
+
+        * grammars/Makefile.in (EMACSDATA, EMACSDOC, EMACSPATH): Unexport.
+
+2014-03-22  Glenn Morris  <rgm@gnu.org>
+
+        * quick-install-emacs (AVOID): Remove testfile and test-distrib.
+
+2014-03-21  Glenn Morris  <rgm@gnu.org>
+
+        * update_autogen: Auto-detect VCS in use.
+        (vcs): New variable.
+        (status, commit, main): Handle git.
+
+2014-03-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix oversight preventing lib/sys/types.h from being generated.
+        * merge-gnulib (GNULIB_TOOL_FLAGS): Don't avoid sys_types.
+
+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,
@@ -128,7 +418,7 @@
 
 2013-05-07  Paul Eggert  <eggert@cs.ucla.edu>
 
-        Use Gnulib ACL implementation, for benefit of Solaris etc. (Bug#14295)
+        Use Gnulib ACL implementation, for benefit of Solaris etc.  (Bug#14295)
         * merge-gnulib (GNULIB_MODULES): Add qacl.
         (GNULIB_TOOL_FLAGS): Do not avoid errno.
 
@@ -343,10 +633,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>
 
@@ -805,6 +1095,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.
@@ -812,8 +1106,9 @@
 2011-02-16  Paul Eggert  <eggert@cs.ucla.edu>
 
         Remove no-longer needed getloadavg symbols.
-        * CPP-DEFINES (LOAD_AVE_CVT, LOAD_AVE_TYPE, FSCALE, KERNEL_FILE):
+        * 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>
 
@@ -1336,7 +1631,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.
 
@@ -1762,8 +2057,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.
@@ -1883,7 +2176,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.
 
@@ -1891,7 +2184,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 c578d3d37e1..6af5027f73c 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -2,6 +2,8 @@ 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[^,]*[:.()]' {} +
@@ -68,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.
@@ -138,7 +139,7 @@ SECTION                  READERS
 ----------------------------------
 TUTORIAL             cyd
 TUTORIAL.bg          ogi
-TUTORIAL.cn
+TUTORIAL.cn          xfq
 TUTORIAL.cs          
 TUTORIAL.de          wl
 TUTORIAL.eo
@@ -146,7 +147,7 @@ TUTORIAL.es
 TUTORIAL.fr          
 TUTORIAL.he          eliz
 TUTORIAL.it          
-TUTORIAL.ja              
+TUTORIAL.ja          
 TUTORIAL.ko
 TUTORIAL.nl          Pieter Schoenmakers
 TUTORIAL.pl          
@@ -161,111 +162,110 @@ TUTORIAL.zh
 
 ** Check the manual.
 
-abbrevs.texi      cyd
-ack.texi          rgm
-anti.texi         cyd
-arevert-xtra.texi cyd
-basic.texi        cyd
-buffers.texi      cyd
-building.texi     cyd
-calendar.texi     rgm
-cal-xtra.texi     rgm
-cmdargs.texi      cyd
-commands.texi     cyd
-custom.texi       cyd
-dired.texi        cyd
-dired-xtra.texi   rgm
-display.texi      cyd
-emacs.texi        rgm
-emacs-xtra.texi   rgm
-emerge-xtra.texi  rgm
-entering.texi     cyd
-files.texi        cyd
-fixit.texi        cyd
-fortran-xtra.texi rgm
-frames.texi       cyd
-glossary.texi     rgm
-help.texi         cyd
-indent.texi       cyd
-killing.texi      cyd
-kmacro.texi       cyd
-macos.texi        rgm  (can't actually test any of it though)
-maintaining.texi  cyd
-mark.texi         cyd
-mini.texi         rgm
-misc.texi         cyd
-modes.texi        cyd
-msdog.texi        rgm  (can't actually test any of it though)
-msdog-xtra.texi   rgm  (can't actually test any of it though)
-mule.texi         rgm  (not 100% sure about "Fontsets")
-m-x.texi          cyd
-package.texi      cyd
-picture-xtra.texi rgm
-programs.texi     cyd
-regs.texi         cyd
-rmail.texi        rgm
-screen.texi       cyd
-search.texi       cyd
-sending.texi      cyd
-text.texi         cyd
-trouble.texi      cyd
-vc-xtra.texi      cyd
-vc1-xtra.texi     cyd
-windows.texi      cyd
-xresources.texi   cyd
+abbrevs.texi      
+ack.texi          
+anti.texi         
+arevert-xtra.texi 
+basic.texi        
+buffers.texi      
+building.texi     
+calendar.texi     
+cal-xtra.texi     
+cmdargs.texi      
+commands.texi     
+custom.texi       
+dired.texi        
+dired-xtra.texi   
+display.texi      
+emacs.texi        
+emacs-xtra.texi   
+emerge-xtra.texi  
+entering.texi     
+files.texi        
+fixit.texi        
+fortran-xtra.texi 
+frames.texi       
+glossary.texi     
+help.texi         
+indent.texi       
+killing.texi      
+kmacro.texi       
+macos.texi        
+maintaining.texi  
+mark.texi         
+mini.texi         
+misc.texi         
+modes.texi        
+msdog.texi        
+msdog-xtra.texi   
+mule.texi         
+m-x.texi          
+package.texi      
+picture-xtra.texi 
+programs.texi     
+regs.texi         
+rmail.texi        
+screen.texi       
+search.texi       
+sending.texi      
+text.texi         
+trouble.texi      
+vc-xtra.texi      
+vc1-xtra.texi     
+windows.texi      
+xresources.texi   
 
 ** Check the Lisp manual.
 
-abbrevs.texi      rgm
-advice.texi       cyd
-anti.texi         rgm
-back.texi         rgm
-backups.texi      cyd
-buffers.texi      cyd
-commands.texi     cyd
-compile.texi      cyd
-control.texi      cyd
-customize.texi    cyd
-debugging.texi    cyd
-display.texi      cyd
-edebug.texi       rgm
+abbrevs.texi      
+anti.texi         
+back.texi         
+backups.texi      
+buffers.texi      
+commands.texi     
+compile.texi      
+control.texi      
+customize.texi    
+debugging.texi    
+display.texi      
+edebug.texi       
 elisp.texi
-errors.texi       rgm
-eval.texi         cyd
-files.texi        cyd
-frames.texi       cyd
-functions.texi    cyd
-hash.texi         cyd
-help.texi         cyd
-hooks.texi        rgm
+errors.texi       
+eval.texi         
+files.texi        
+frames.texi       
+functions.texi    
+hash.texi         
+help.texi         
+hooks.texi        
 index.texi
-internals.texi    rgm  cyd
-intro.texi        cyd
-keymaps.texi      cyd
-lists.texi        cyd
-loading.texi      cyd
-macros.texi       cyd
-maps.texi         rgm
-markers.texi      rgm
-minibuf.texi      rgm
-modes.texi        cyd
-nonascii.texi     cyd
-numbers.texi      cyd
-objects.texi      cyd
-os.texi           cyd
-package.texi      rgm
-positions.texi    cyd
-processes.texi    rgm
-searching.texi    rgm
-sequences.texi    cyd
-streams.texi      cyd
-strings.texi      cyd
-symbols.texi      cyd
-syntax.texi       cyd
-text.texi         cyd
-tips.texi         rgm
-variables.texi    cyd
-windows.texi      rgm (skimmed)
+internals.texi    
+intro.texi        
+keymaps.texi      
+lists.texi        
+loading.texi      
+macros.texi       
+maps.texi         
+markers.texi      
+minibuf.texi      
+modes.texi        
+nonascii.texi     
+numbers.texi      Paul Eggert (24.4)
+objects.texi      
+os.texi           
+package.texi      
+positions.texi    
+processes.texi    
+searching.texi    
+sequences.texi    
+streams.texi      
+strings.texi      
+symbols.texi      
+syntax.texi       
+text.texi         
+tips.texi         
+variables.texi    
+windows.texi      
 
 
 Local variables:
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 f8ca8aec261..7af9ffa4177 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,7 +21,7 @@
 
 ;; 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:
@@ -46,7 +46,7 @@ Optional argument DATE is the release date, default today."
                                            (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))))
@@ -62,18 +62,31 @@ Optional argument DATE is the release date, default today."
       (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))
-  (replace-match (format "%s" version) nil nil nil 1))
+  (setq version (format "%s" version))
+  (unless (re-search-forward rx nil :noerror)
+    (user-error "Version not found in %s" file))
+  (if (not (equal version (match-string 1)))
+      (replace-match version nil nil nil 1)
+    (kill-buffer)
+    (message "No need to update `%s'" file)))
 
 (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: ")
+  (interactive (list
+                (read-directory-name "Emacs root directory: " source-directory)
+                (read-string "Version number: "
+                             (replace-regexp-in-string "\\.[0-9]+\\'" ""
+                                                       emacs-version))))
   (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))
+  (message "Setting version numbers...")
+  ;; 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."))))))
@@ -104,7 +117,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) ","
@@ -153,8 +166,8 @@ Root must be the root of an Emacs source tree."
 {\\([0-9]\\{2,\\}\\)}.+%.+version of Emacs")
       (set-version-in-file root "etc/refcards/emacsver.tex" version
                            "\\\\def\\\\versionemacs\
-{\\([0-9]\\{2,\\}\\)}.+%.+version of Emacs"))))
-
+{\\([0-9]\\{2,\\}\\)}.+%.+version of Emacs")))
+  (message "Setting version numbers...done"))
 
 ;; Note this makes some assumptions about form of short copyright.
 (defun set-copyright (root copyright)
@@ -167,7 +180,8 @@ 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))
+  (message "Setting copyrights...")
   (set-version-in-file root "configure.ac" copyright
                        (rx (and bol "copyright" (0+ (not (in ?\")))
                                 ?\" (submatch (1+ (not (in ?\")))) ?\")))
@@ -189,12 +203,14 @@ Root must be the root of an Emacs source tree."
 {\\([0-9]\\{4\\}\\)}.+%.+copyright year")
     (set-version-in-file root "etc/refcards/emacsver.tex" copyright
                          "\\\\def\\\\year\
-{\\([0-9]\\{4\\}\\)}.+%.+copyright year")))
+{\\([0-9]\\{4\\}\\)}.+%.+copyright year"))
+  (message "Setting copyrights...done"))
 
 ;;; Various bits of magic for generating the web manuals
 
 (defun manual-misc-manuals (root)
-  "Return doc/misc manuals as list of strings."
+  "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
@@ -211,8 +227,10 @@ Root must be the root of an Emacs source tree."
                              (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: "
@@ -319,6 +337,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)))
 
@@ -328,7 +347,7 @@ 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"
@@ -359,13 +378,14 @@ 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-pdf (texi-file dest)
-  "Run texi2pdf on TEXI-FILE, emitting pdf output to 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
@@ -377,6 +397,7 @@ the @import directive."
   (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)
@@ -386,119 +407,215 @@ the @import directive."
 
 (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"
-                   (file-name-nondirectory buffer-file-name)))
-        (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
@@ -510,14 +627,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\\)")))
@@ -526,13 +643,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.
@@ -568,7 +691,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))
@@ -584,34 +707,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
@@ -636,7 +761,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 42d39d3071a..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
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 54d26cc11d6..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>
@@ -187,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))
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/find-gc.el b/admin/find-gc.el
new file mode 100644
index 00000000000..83eb26e86d7
--- /dev/null
+++ b/admin/find-gc.el
@@ -0,0 +1,149 @@
+;;; find-gc.el --- detect functions that call the garbage collector
+
+;; Copyright (C) 1992, 2001-2014 Free Software Foundation, Inc.
+
+;; Maintainer: emacs-devel@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:
+
+;; Produce in find-gc-unsafe-list the set of all functions that may invoke GC.
+;; This expects the Emacs sources to live in find-gc-source-directory.
+
+;;; Code:
+
+(defvar find-gc-unsafe-list nil
+  "The list of unsafe functions is placed here by `find-gc-unsafe'.")
+
+(defvar find-gc-source-directory
+  (file-name-as-directory (expand-file-name "src" source-directory))
+  "Directory containing Emacs C sources.")
+
+(defvar find-gc-subrs-callers nil
+  "Alist of users of subrs, from GC testing.
+Each entry has the form (FUNCTION . FUNCTIONS-THAT-CALL-IT).")
+
+(defvar find-gc-subrs-called nil
+  "Alist of subrs called, in GC testing.
+Each entry has the form (FUNCTION . FUNCTIONS-IT-CALLS).")
+
+
+;;; Functions on this list are safe, even if they appear to be able
+;;; to call the target.
+
+(defvar find-gc-noreturn-list '(Fsignal Fthrow wrong_type_argument))
+
+;;; This was originally generated directory-files, but there were
+;;; too many files there that were not actually compiled.  The
+;;; list below was created for a HP-UX 7.0 system.
+
+(defvar find-gc-source-files
+  '("dispnew.c" "scroll.c" "xdisp.c" "window.c"
+    "term.c" "cm.c" "emacs.c" "keyboard.c" "macros.c"
+    "keymap.c" "sysdep.c" "buffer.c" "filelock.c"
+    "insdel.c" "marker.c" "minibuf.c" "fileio.c"
+    "dired.c" "cmds.c" "casefiddle.c"
+    "indent.c" "search.c" "regex.c" "undo.c"
+    "alloc.c" "data.c" "doc.c" "editfns.c"
+    "callint.c" "eval.c" "fns.c" "print.c" "lread.c"
+    "syntax.c" "unexcoff.c"
+    "bytecode.c" "process.c" "callproc.c" "doprnt.c"
+    "xterm.c" "xfns.c"))
+
+
+(defun find-gc-unsafe ()
+  "Return a list of unsafe functions--that is, which can call GC.
+Also store it in `find-gc-unsafe-list'."
+  (trace-call-tree nil)
+  (trace-use-tree)
+  (find-unsafe-funcs 'Fgarbage_collect)
+  (setq find-gc-unsafe-list
+        (sort find-gc-unsafe-list
+              (function (lambda (x y)
+                          (string-lessp (car x) (car y)))))))
+
+;;; This does a depth-first search to find all functions that can
+;;; ultimately call the function "target".  The result is an a-list
+;;; in find-gc-unsafe-list; the cars are the unsafe functions, and the cdrs
+;;; are (one of) the unsafe functions that these functions directly
+;;; call.
+
+(defun find-unsafe-funcs (target)
+  (setq find-gc-unsafe-list (list (list target)))
+  (trace-unsafe target))
+
+(defun trace-unsafe (func)
+  (let ((used (assq func find-gc-subrs-callers)))
+    (or used
+        (error "No find-gc-subrs-callers for %s" (car find-gc-unsafe-list)))
+    (while (setq used (cdr used))
+      (or (assq (car used) find-gc-unsafe-list)
+          (memq (car used) find-gc-noreturn-list)
+          (progn
+            (push (cons (car used) func) find-gc-unsafe-list)
+            (trace-unsafe (car used)))))))
+
+
+
+
+(defun trace-call-tree (&optional ignored)
+  (message "Setting up directories...")
+  (setq find-gc-subrs-called nil)
+  (let ((case-fold-search nil)
+        (default-directory find-gc-source-directory)
+        (files find-gc-source-files)
+        name entry rtlfile)
+    (dolist (file files)
+      (message "Compiling %s..." file)
+      (call-process "gcc" nil nil nil "-I" "." "-I" "../lib"
+                    "-fdump-rtl-expand" "-o" null-device "-c" file)
+      (setq rtlfile
+            (file-expand-wildcards (format "%s.*.expand" file) t))
+      (if (/= 1 (length rtlfile))
+          (message "Error compiling `%s'?" file)
+        (with-temp-buffer
+          (insert-file-contents (setq rtlfile (car rtlfile)))
+          (delete-file rtlfile)
+          (while (re-search-forward ";; Function \\|(call_insn " nil t)
+            (if (= (char-after (- (point) 3)) ?o)
+                (progn
+                  (looking-at "[a-zA-Z0-9_]+")
+                  (setq name (intern (match-string 0)))
+                  (message "%s : %s" (car files) name)
+                  (setq entry (list name)
+                        find-gc-subrs-called
+                        (cons entry find-gc-subrs-called)))
+              (if (looking-at ".*\n?.*\"\\([A-Za-z0-9_]+\\)\"")
+                  (progn
+                    (setq name (intern (match-string 1)))
+                    (or (memq name (cdr entry))
+                        (setcdr entry (cons name (cdr entry)))))))))))))
+
+(defun trace-use-tree ()
+  (setq find-gc-subrs-callers (mapcar 'list (mapcar 'car find-gc-subrs-called)))
+  (let ((ptr find-gc-subrs-called)
+        p2 found)
+    (while ptr
+      (setq p2 (car ptr))
+      (while (setq p2 (cdr p2))
+        (if (setq found (assq (car p2) find-gc-subrs-callers))
+            (setcdr found (cons (car (car ptr)) (cdr found)))))
+      (setq ptr (cdr ptr)))))
+
+(provide 'find-gc)
+
+;;; find-gc.el ends here
diff --git a/admin/grammars/Makefile.in b/admin/grammars/Makefile.in
new file mode 100644
index 00000000000..b89df7116a6
--- /dev/null
+++ b/admin/grammars/Makefile.in
@@ -0,0 +1,116 @@
+### @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@
+
+# Prevent any settings in the user environment causing problems.
+unexport EMACSDATA EMACSDOC EMACSPATH
+
+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 71607f452a0..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
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 fd3f61905d3..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
diff --git a/admin/mac/uvs.el b/admin/mac/uvs.el
new file mode 100644
index 00000000000..a9a0c9120d3
--- /dev/null
+++ b/admin/mac/uvs.el
@@ -0,0 +1,213 @@
+;;; uvs.el --- utility for UVS (format 14) cmap subtables in OpenType fonts.
+
+;; Copyright (C) 2014  Free Software Foundation, Inc.
+
+;; Author: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
+
+;; 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:
+
+;; To extract a C array definition of a UVS table for the Adobe-Japan1
+;; character collection from an IVD Sequences file, execute
+;;   $ emacs -batch -l uvs.el \
+;;      --eval '(uvs-print-table-ivd "IVD_Sequences.txt" "Adobe-Japan1")' \
+;;      > uvs.h
+
+;;; Code:
+
+(defun uvs-fields-total-size (fields)
+  (apply '+ (mapcar (lambda (field) (get field 'uvs-field-size)) fields)))
+
+;;; Fields in Format 14 header.
+(defconst uvs-format-14-header-fields
+  '(format length num-var-selector-records))
+(put 'format 'uvs-field-size 2)
+(put 'length 'uvs-field-size 4)
+(put 'num-var-selector-records 'uvs-field-size 4)
+(defconst uvs-format-14-header-size
+  (uvs-fields-total-size uvs-format-14-header-fields))
+
+;;; Fields in Variation Selector Record.
+(defconst uvs-variation-selector-record-fields
+  '(var-selector default-uvs-offset non-default-uvs-offset))
+(put 'var-selector 'uvs-field-size 3)
+(put 'default-uvs-offset 'uvs-field-size 4)
+(put 'non-default-uvs-offset 'uvs-field-size 4)
+(defconst uvs-variation-selector-record-size
+  (uvs-fields-total-size uvs-variation-selector-record-fields))
+
+;;; Fields in Non-Default UVS Table.
+(defconst uvs-non-default-uvs-table-header-fields '(num-uvs-mappings))
+(put 'num-uvs-mappings 'uvs-field-size 4)
+(defconst uvs-non-default-uvs-table-header-size
+  (uvs-fields-total-size uvs-non-default-uvs-table-header-fields))
+
+;;; Fields in UVS Mapping.
+(defconst uvs-uvs-mapping-fields '(unicode-value glyph-id))
+(put 'unicode-value 'uvs-field-size 3)
+(put 'glyph-id 'uvs-field-size 2)
+(defconst uvs-uvs-mapping-size
+  (uvs-fields-total-size uvs-uvs-mapping-fields))
+
+(defun uvs-alist-from-ivd (collection-id sequence-id-to-glyph-function)
+  "Create UVS alist from IVD Sequences and COLLECTION-ID.
+The IVD (Ideographic Variation Database) Sequences are obtained
+from the contents of the current buffer, and should be in the
+form of IVD_Sequences.txt specified in Unicode Technical Standard
+#37.  COLLECTION-ID is a string specifying the identifier of the
+collection to extract (e.g., \"Adobe-Japan1\").
+SEQUENCE-ID-TO-GLYPH-FUNC is a function to convert an identifier
+string of the sequence to a glyph number.  UVS alist is of the
+following form:
+  ((SELECTOR1 . ((BASE11 . GLYPH11) (BASE12 . GLYPH12) ...))
+   (SELECTOR2 . ((BASE21 . GLYPH21) (BASE22 . GLYPH22) ...)) ...),
+where selectors and bases are sorted in ascending order."
+  (let (uvs-alist)
+    (goto-char (point-min))
+    (while (re-search-forward
+            (concat "^[[:blank:]]*"
+                    "\\([[:xdigit:]]+\\) \\([[:xdigit:]]+\\)"
+                    "[[:blank:]]*;[[:blank:]]*"
+                    "\\(?:" (regexp-quote collection-id) "\\)"
+                    "[[:blank:]]*;[[:blank:]]*"
+                    "\\([^\n[:blank:]]+\\)"
+                    "[[:blank:]]*$") nil t)
+      (let* ((base (string-to-number (match-string 1) 16))
+             (selector (string-to-number (match-string 2) 16))
+             (sequence-id (match-string 3))
+             (glyph (funcall sequence-id-to-glyph-function sequence-id)))
+        (let ((selector-bgs (assq selector uvs-alist))
+              (base-glyph (cons base glyph)))
+          (if selector-bgs
+              (setcdr selector-bgs (cons base-glyph (cdr selector-bgs)))
+            (push (cons selector (list base-glyph)) uvs-alist)))))
+    (dolist (selector-bgs uvs-alist)
+      (setcdr selector-bgs
+              (sort (cdr selector-bgs)
+                    (lambda (bg1 bg2) (< (car bg1) (car bg2))))))
+    (sort uvs-alist (lambda (sb1 sb2) (< (car sb1) (car sb2))))))
+
+(defun uvs-int-to-bytes (value size)
+  "Convert integer VALUE to a list of SIZE bytes.
+The most significant byte comes first."
+  (let (result)
+    (dotimes (i size)
+      (push (logand value #xff) result)
+      (setq value (lsh value -8)))
+    result))
+
+(defun uvs-insert-fields-as-bytes (fields &rest values)
+  "Insert VALUES for FIELDS as a sequence of bytes to the current buffer.
+VALUES and FIELDS are lists of integers and field symbols,
+respectively.  Byte length of each value is determined by the
+'uvs-field-size' property of the corresponding field."
+  (while fields
+    (let ((field (car fields))
+          (value (car values)))
+      (insert (apply 'unibyte-string
+                     (uvs-int-to-bytes value (get field 'uvs-field-size))))
+      (setq fields (cdr fields) values (cdr values)))))
+
+(defun uvs-insert-alist-as-bytes (uvs-alist)
+  "Insert UVS-ALIST as a sequence of bytes to the current buffer."
+  (let* ((nrecords (length uvs-alist))  ; # of selectors
+         (total-nmappings
+          (apply '+ (mapcar
+                     (lambda (selector-bgs) (length (cdr selector-bgs)))
+                     uvs-alist)))
+         (non-default-offset
+          (+ uvs-format-14-header-size
+             (* uvs-variation-selector-record-size nrecords))))
+    (uvs-insert-fields-as-bytes uvs-format-14-header-fields
+                                14
+                                (+ uvs-format-14-header-size
+                                   (* uvs-variation-selector-record-size
+                                      nrecords)
+                                   (* uvs-non-default-uvs-table-header-size
+                                      nrecords)
+                                   (* uvs-uvs-mapping-size total-nmappings))
+                                nrecords)
+    (dolist (selector-bgs uvs-alist)
+      (uvs-insert-fields-as-bytes uvs-variation-selector-record-fields
+                                  (car selector-bgs)
+                                  0     ; No Default UVS Tables.
+                                  non-default-offset)
+      (setq non-default-offset
+            (+ non-default-offset
+               uvs-non-default-uvs-table-header-size
+               (* (length (cdr selector-bgs)) uvs-uvs-mapping-size))))
+    (dolist (selector-bgs uvs-alist)
+      (uvs-insert-fields-as-bytes uvs-non-default-uvs-table-header-fields
+                                  (length (cdr selector-bgs)))
+      (dolist (base-glyph (cdr selector-bgs))
+        (uvs-insert-fields-as-bytes uvs-uvs-mapping-fields
+                                    (car base-glyph)
+                                    (cdr base-glyph))))))
+
+(defun uvs-dump (&optional bytes-per-line separator separator-eol line-prefix)
+  "Print the current buffer as in representation of C array contents."
+  (or bytes-per-line (setq bytes-per-line 8))
+  (or separator (setq separator ", "))
+  (or separator-eol (setq separator-eol ","))
+  (or line-prefix (setq line-prefix "    "))
+  (goto-char (point-min))
+  (while (> (- (point-max) (point)) bytes-per-line)
+    (princ line-prefix)
+    (princ (mapconcat (lambda (byte) (format "0x%02x" byte))
+                      (string-to-unibyte
+                       (buffer-substring (point) (+ (point) bytes-per-line)))
+                      separator))
+    (princ separator-eol)
+    (terpri)
+    (forward-char bytes-per-line))
+  (princ line-prefix)
+  (princ (mapconcat (lambda (byte) (format "0x%02x" byte))
+                    (string-to-unibyte
+                     (buffer-substring (point) (point-max)))
+                    separator))
+  (terpri))
+
+(defun uvs-print-table-ivd (filename collection-id
+                                     &optional sequence-id-to-glyph-func)
+  "Print a C array definition of a UVS table for IVD Sequences.
+FILENAME specifies the IVD Sequences file.  COLLECTION-ID is a
+string specifying the identifier of the collection to
+extract (e.g., \"Adobe-Japan1\").  SEQUENCE-ID-TO-GLYPH-FUNC is a
+function to convert an identifier string of the sequence to a
+glyph number, and nil means to convert \"CID\\+[0-9]+\" to the
+corresponding number."
+  (or sequence-id-to-glyph-func
+      (setq sequence-id-to-glyph-func
+            (lambda (sequence-id)
+              (string-match "\\`CID\\+\\([[:digit:]]+\\)\\'" sequence-id)
+              (string-to-number (match-string 1 sequence-id)))))
+  (let ((uvs-alist
+         (with-temp-buffer
+           (insert-file-contents filename)
+           (setq uvs-alist (uvs-alist-from-ivd collection-id
+                                               sequence-id-to-glyph-func)))))
+    (princ
+     (format "static const unsigned char mac_uvs_table_%s_bytes[] =\n  {\n"
+             (replace-regexp-in-string "[^_[:alnum:]]" "_"
+                                       (downcase collection-id))))
+    (with-temp-buffer
+      (set-buffer-multibyte nil)
+      (uvs-insert-alist-as-bytes uvs-alist)
+      (uvs-dump))
+    (princ "  };\n")))
+
+;;; uvs.el ends here
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 fc7f81f0c28..a2e8a9e7da3 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -5,6 +5,11 @@ Instructions to create pretest or release tarballs. -*- coding: utf-8 -*-
 
 Steps to take before starting on the first pretest in any release sequence:
 
+0.  The release branch (e.g. emacs-24) should already have been made
+    and you should use it for all that follows.  Diffs from this
+    branch should be going to the emacs-diffs mailing list (see
+    admin/notes/bzr section on bzr-email plugin).
+
 1.  Decide on versions of automake and autoconf, and ensure you will
     have them available for the duration of the release process.
 
@@ -14,28 +19,22 @@ Steps to take before starting on the first pretest in any release sequence:
     when preparing the first pretest for a major Emacs release.)
     Commit cus-edit.el if changed.
 
+3.  Remove any old pretests from ftp://alpha.gnu.org/gnu/emacs/pretest.
+    You can use `gnupload --delete' (see below for more gnupload details).
 
 General steps (for each step, check for possible errors):
 
 1.  `bzr update' (for a bound branch), or `bzr pull'.
      bzr status   # check for locally modified files
 
-2.  Bootstrap to make 100% sure all elc files are up-to-date, and to
-    make sure that the later tagged version will bootstrap, should it be
-    necessary to check it out.
-
-3.  Regenerate the etc/AUTHORS file:
+2.  Regenerate the etc/AUTHORS file:
       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.
@@ -43,7 +42,7 @@ General steps (for each step, check for possible errors):
     authors-ambiguous-files or authors-aliases, and repeat.
     Commit any fixes to ChangeLogs or authors.el.
 
-4.  Set the version number (M-x load-file RET admin/admin.el RET, then
+3.  Set the version number (M-x load-file RET admin/admin.el RET, then
     M-x set-version RET).  For a release, add released ChangeLog
     entries (M-x add-release-logs RET).
 
@@ -58,31 +57,37 @@ General steps (for each step, check for possible errors):
     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
+4.   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.
+5.  Copy lisp/loaddefs.el to lisp/ldefs-boot.el.
 
     Commit etc/AUTHORS, lisp/ldefs-boot.el, and the files changed
-    by M-x set-version.
+    by M-x set-version.  Use a commit log message that bzrmerge.el
+    will ignore (eg "Bump version...").
     For a release, also commit the ChangeLog files in all directories.
 
-7.  ./make-dist --snapshot --no-compress
+    If someone else made a commit between step 1 and now,
+    you need to repeat from step 4 onwards.  (You can commit the files
+    from step 2 and 3 earlier to reduce the chance of this.)
+
+6.  ./make-dist --snapshot --no-compress
 
-    Check the contents of the new tar with
-    admin/diff-tar-files against an older tar file.  Some old pretest
-    tarballs may be found at <ftp://alpha.gnu.org/gnu/emacs/pretest>;
-    old release tarballs are at <ftp://ftp.gnu.org/pub/gnu/emacs/>.
+    Check the contents of the new tar with admin/diff-tar-files
+    against the previous release (if this is the first pretest) or the
+    previous pretest.  If you did not make the previous pretest
+    yourself, find it at <ftp://alpha.gnu.org/gnu/emacs/pretest>.
+    Releases are of course at <ftp://ftp.gnu.org/pub/gnu/emacs/>.
 
     If this is the first pretest of a major release, just comparing
     with the previous release may overlook many new files.  You can try
     something like `find . | sort' in a clean bzr tree, and compare the
     results against the new tar contents.
 
-8.   tar -xf emacs-NEW.tar; cd emacs-NEW
+7.   tar -xf emacs-NEW.tar; cd emacs-NEW
      ./configure --prefix=/tmp/emacs && make && make install
     Use `script' or M-x compile to save the compilation log in
     compile-NEW.log and compare it against an old one.  The easiest way
@@ -91,25 +96,21 @@ General steps (for each step, check for possible errors):
     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
+8.  cd EMACS_ROOT_DIR && bzr tag TAG
     TAG is emacs-XX.Y.ZZ for a pretest, emacs-XX.Y for a release.
 
-    Shortly before the release, cut the version branch also, and open
-    a Savannah support request asking for commits to the new branch to
-    be sent to the emacs-diffs mailing list (by default, the list
-    normally only gets commits to the trunk).
-
-10. Decide what compression schemes to offer.
+9. Decide what compression schemes to offer.
     For a release, at least gz and xz:
       gzip --best -c emacs-NEW.tar > emacs-NEW.tar.gz
       xz -c emacs-NEW.tar > emacs-NEW.tar.xz
+    For pretests, just xz is probably fine (saves bandwidth).
 
     Now you should upload the files to the GNU ftp server.  In order to
     do that, you must be registered as an Emacs maintainer and have your
     GPG key acknowledged by the ftp people.  For instructions, see
     http://www.gnu.org/prep/maintain/html_node/Automated-Upload-Registration.html
-    The simplest method is to use the gnulib <http://www.gnu.org/s/gnulib/>
-    script "build-aux/gnupload" to upload each FILE, like this:
+    The simplest method to upload is to use the gnulib
+    <http://www.gnu.org/s/gnulib/> script "build-aux/gnupload":
 
     For a pretest:
      gnupload [--user your@gpg.key.email] --to alpha.gnu.org:emacs/pretest \
@@ -140,19 +141,21 @@ General steps (for each step, check for possible errors):
     For a pretest, place the files in /incoming/alpha instead, so that
     they appear on ftp://alpha.gnu.org/.
 
-11. After five minutes, verify that the files are visible at
+10. After five minutes, verify that the files are visible at
     ftp://alpha.gnu.org/gnu/emacs/pretest/ for a pretest, or
     ftp://ftp.gnu.org/gnu/emacs/ for a release.
 
     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.)
-
-13. For a release, update the Emacs homepage in the web repository.
-    Also add the new NEWS file as NEWS.xx.y.
-    Maybe regenerate the html manuals, update the FAQ, etc, etc.
+11. Send an announcement to: emacs-devel, and bcc: info-gnu-emacs@gnu.org.
+    For a pretest, also bcc: platform-testers@gnu.org.
+    (The reason for using bcc: is to make it less likely that people
+    will followup on the wrong list.)
+    See the info-gnu-emacs mailing list archives for the form
+    of past announcements.  The first pretest announcement, and the
+    release announcement, should have more detail.
+
+12. For a release, update the Emacs homepage in the web repository.
+    Also update history.html, and add the new NEWS file as NEWS.xx.y.
+    Regenerate the html manuals (use make-manuals from admin.el).
+    If there are new manuals, add appropriate index pages.
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 97126704d10..5df2020f3aa 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,17 +26,19 @@
 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 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
+  sig2str socklen stat-time stdalign 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
 '
 
@@ -46,7 +48,8 @@ GNULIB_TOOL_FLAGS='
   --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow
   --avoid=open --avoid=openat-die --avoid=opendir
   --avoid=raise
-  --avoid=save-cwd --avoid=select --avoid=sigprocmask --avoid=sys_types
+  --avoid=save-cwd --avoid=select --avoid=sigprocmask
+  --avoid=stdarg --avoid=stdbool
   --avoid=threadlib
   --conditional-dependencies --import --no-changelog --no-vc-files
   --makefile-name=gnulib.mk
@@ -90,7 +93,9 @@ 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"}
+{ test -z "$src" || cd "$src"; } &&
+./autogen.sh
diff --git a/admin/merge-pkg-config b/admin/merge-pkg-config
new file mode 100755
index 00000000000..fd03a441b11
--- /dev/null
+++ b/admin/merge-pkg-config
@@ -0,0 +1,63 @@
+#! /bin/sh
+# Merge pkg-config macros into Emacs sources.
+# Typical usage:
+#
+#       admin/merge-pkg-config
+
+# Copyright 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
+
+{
+  # Maybe ACLOCAL_PATH is already set-up.
+  oIFS=$IFS
+  IFS=:
+  for dir in $ACLOCAL_PATH ''; do
+    test -n "$dir" && test -r "$dir/pkg.m4" && break
+  done
+  IFS=$oIFS
+
+  test -n "$dir"
+} || {
+  # Use the pkg.m4 installed where aclocal knows about it.
+  # Maybe we are running our own aclocal, which doesn't know where
+  # the standard pkg.m4 is installed, so try running all the
+  # aclocal programs in our PATH.
+  oIFS=$IFS
+  IFS=:
+  for dir in $PATH ''; do
+    if test -n "$dir" && test -x "$dir/aclocal"; then
+      dir=$("$dir/aclocal" --print-ac-dir) && test -r "$dir/pkg.m4" && break
+    fi
+  done
+  IFS=$oIFS
+
+  test -n "$dir"
+} || {
+  echo >&2 "$0: cannot find pkg.m4"
+  exit 1
+}
+
+test -d m4 || {
+  echo >&2 "$0: please run this command in the main source directory"
+  exit 1
+}
+
+echo >&2 "$0: copying $dir/pkg.m4 to m4/pkg.m4"
+
+cp $dir/pkg.m4 m4
diff --git a/admin/notes/bzr b/admin/notes/bzr
index d3886abfd69..13a3beb4ca8 100644
--- a/admin/notes/bzr
+++ b/admin/notes/bzr
@@ -3,9 +3,9 @@ NOTES ON COMMITTING TO EMACS'S BAZAAR REPO    -*- outline -*-
 * Install changes only on one branch, let them get merged elsewhere if needed.
 In particular, install bug-fixes only on the release branch (if there
 is one) and let them get synced to the trunk; do not install them by
-hand on the trunk as well.  E.g. if there is an active "emacs-23" branch
-and you have a bug-fix appropriate for the next Emacs-23.x release,
-install it only on the emacs-23 branch, not on the trunk as well.
+hand on the trunk as well.  E.g. if there is an active "emacs-24" branch
+and you have a bug-fix appropriate for the next emacs-24.x release,
+install it only on the emacs-24 branch, not on the trunk as well.
 
 Installing things manually into more than one branch makes merges more
 difficult.
@@ -18,7 +18,7 @@ In that case, it's helpful if you can apply the change to both trunk
 and branch yourself (when committing the branch change, indicate
 in the commit log that it should not be merged to the trunk; see below).
 
-* Backporting a bug-fix from the trunk to a branch (e.g. "emacs-23").
+* Backporting a bug-fix from the trunk to a branch (e.g. "emacs-24").
 Indicate in the commit log that there is no need to merge the commit
 to the trunk.  Anything that matches `bzrmerge-skip-regexp' will do;
 eg start the commit message with "Backport:".  This is helpful for the
@@ -49,7 +49,7 @@ http://lists.gnu.org/archive/html/emacs-devel/2010-04/msg00086.html
 * Installing changes from gnulib
 Some of the files in Emacs are copied from gnulib.  To synchronize
 these files from the version of gnulib that you have checked out into
-a sibling directory of your branch, type "make sync-from-gnulib"; this
+a sibling directory of your branch, type "admin/merge-gnulib"; this
 will check out the latest version of gnulib if there is no sibling
 directory already.  It is a good idea to run "bzr status" afterwards,
 so that if a gnulib module added a file, you can record the new file
@@ -57,17 +57,12 @@ using "bzr add".  After synchronizing from gnulib, do a "make" in the
 usual way.
 
 To change the set of gnulib modules, change the GNULIB_MODULES
-variable in the top-level Makefile.in, and then run:
+variable in admin/merge-gnulib before running it.
 
-  ./config.status
-  make sync-from-gnulib
-  bzr status
-
-The last command will mention files that may need to be added using
-"bzr add".  If you remove a gnulib module, or if a gnulib module
+If you remove a gnulib module, or if a gnulib module
 removes a file, then remove the corresponding files by hand.
 
-* How to merge changes from emacs-23 to trunk
+* How to merge changes from emacs-24 to trunk
 
 The following description uses bound branches, presumably it works in
 a similar way with unbound ones.
@@ -90,7 +85,7 @@ copy in ~/.bazaar if you upgrade bzr.
 Maybe the default Emacs behavior without this plugin is better,
 though, it's not clear yet.
 
-1) Get clean, up-to-date copies of the emacs-23 and trunk branches.
+1) Get clean, up-to-date copies of the emacs-24 and trunk branches.
 Check for any uncommitted changes with bzr status.
 
 2) M-x cd /path/to/trunk
@@ -102,7 +97,7 @@ changelog_merge_files = ChangeLog
 
 3) load admin/bzrmerge.el
 
-4) M-x bzrmerge RET /path/to/emacs-23 RET
+4) M-x bzrmerge RET /path/to/emacs-24 RET
 
 It will prompt about revisions that should be skipped, based on the
 regexp in bzrmerge-missing.  If there are more revisions that you know
@@ -119,7 +114,7 @@ Do not commit (or exit Emacs) until you have run bzrmerge to completion.
 
 Before committing, check bzr status and bzr diff output.
 If you have run bzrmerge enough times, the "pending merge tip" in bzr
-status should be the last revision from the emacs-23 branch, and
+status should be the last revision from the emacs-24 branch, and
 bzr status -v should show all the revisions you expect to merge.
 
 (Note that it will also show "skipped" revisions.  This is expected,
@@ -141,18 +136,13 @@ authors, don't break the logical ordering in doing this.
 
 Notes:
 
-1) A lot that was in tramp.el in emacs-23 has moved to tramp-sh.el in
-the trunk.  If you end up with a conflict in tramp.el, the changes may
-need to go to tramp-sh.el instead.  Remember to update the file name in
-the ChangeLog.
-
-2) If a file is modified in emacs-23, and deleted in the trunk, you
+1) If a file is modified in emacs-24, and deleted in the trunk, you
 get a "contents conflict".  Assuming the changes don't need to be in
 the trunk at all, use `bzr resolve path/to/file --take-this' to keep the
 trunk version.  Prior to bzr 2.2.3, this may fail.  You can just
 delete the .OTHER etc files by hand and use bzr resolve path/to/file.
 
-3) Conflicts in autoload md5sums in comments.  Strictly speaking, the
+2) Conflicts in autoload md5sums in comments.  Strictly speaking, the
 right thing to do is merge everything else, resolve the conflict by
 choosing either the trunk or branch version, then run `make -C lisp
 autoloads' to update the md5sums to the correct trunk value before
@@ -364,3 +354,45 @@ works), or by adding an entry to ~/.bazaar/locations.conf:
 
 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.
+
+** remote name
+
+Although Git itself is agnostic about what names you choose for
+the remote repo, it seems git-bzr is more likely to get confused.
+After the clone as described above, the remote name is "origin";
+changing it is Not Recommended.  [Insert 9-hour high-entropy then
+mysterious bug w/ JSON parsing errors anecdote here. --ttn]
diff --git a/admin/notes/changelogs b/admin/notes/changelogs
index 1025cfc217f..e8158060e70 100644
--- a/admin/notes/changelogs
+++ b/admin/notes/changelogs
@@ -1,3 +1,12 @@
+Emacs generally follows the GNU coding standards when it comes to ChangeLogs:
+http://www.gnu.org/prep/standards/html_node/Change-Logs.html
+
+One exception is that we still sometimes quote `like-this' (as the
+standards used to recommend) rather than 'like-this' (as they do now),
+because `...' is so widely used elsewhere in Emacs.
+http://lists.gnu.org/archive/html/emacs-devel/2014-05/msg00514.html
+
+
 If installing changes written by someone else, make the ChangeLog
 entry in their name, not yours.
 
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..ebef0633032 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.
 
 
@@ -137,7 +137,10 @@ GNUstep/Emacs.base/Resources/Info-gnustep.plist
 aclocal.m4
 configure
 m4/*.m4
- - copyright FSF, with unlimited permission to copy, distribute and modify
+ - These files are copyright FSF, with unlimited permission to copy,
+   distribute and modify, so long as the copyright notice is preserved.
+   Exception: m4/pkg.m4 is copyright Scott James Remnant; it is
+   distributed under the same terms as for the rest of Emacs.
 
 lib/Makefile.in
  - copyright FSF, with MIT-like license
@@ -161,13 +164,6 @@ etc/letter.pbm,letter.xpm
 etc/FTP, ORDERS
   - trivial (at time of writing), no license needed
 
-etc/GNU, INTERVIEW, LINUX-GNU, MOTIVATION, SERVICE, THE-GNU-PROJECT,
-WHY-FREE
-  rms: "These are statements of opinion or testimony. Their licenses
-  should permit verbatim copying only. Please don't change the
-  licenses that they have. They are distributed with Emacs but they
-  are not part of Emacs."
-
 etc/HELLO
   standard notices. Just a note that although the file itself is not
   really copyrightable, in the wider context of it being part of
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
index 71e35d092c8..3b6bc87a2f6 100644
--- a/admin/notes/hydra
+++ b/admin/notes/hydra
@@ -1,6 +1,6 @@
 -*- outline -*-
 
-Copyright (C) 2013 Free Software Foundation, Inc.
+Copyright (C) 2013-2014 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 NOTES FOR EMACS CONTINUOUS BUILD ON HYDRA
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..f67911d0ff4 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.
@@ -101,16 +101,6 @@ Known problems:
           I plan to implement better user notification and support for
           breaking out of single-kboard mode from locked displays.
 
-        * Mac and DOS support is broken, doesn't even
-          compile.  Multiple display support will probably not provide
-          new Emacs features on these systems, but the multi-tty
-          branch changed a few low-level interfaces, and the
-          system-dependent source files need to be adapted
-          accordingly.  The changes are mostly trivial, so almost
-          anyone can help, if only by compiling the branch and
-          reporting the compiler errors.
-
-
 TESTING
 -------
 
@@ -504,17 +494,6 @@ THINGS TO DO
 
    (This is likely an error in the CVS trunk.)
 
-** Dan Nicolaescu suggests that -nw should be added as an alias for -t
-   in emacsclient.  Good idea.  (Alas, implementing this is not
-   trivial, getopt_long does not seem to support two-letter ``short''
-   options.  Patches are welcome.)
-
-** Mark Plaksin suggests that emacsclient should accept the same
-   X-related command-line arguments as Emacs.  Most of the X-related
-   argument-handling is done in Lisp, so this should be quite easy to
-   implement.  (For example, Samium Gromoff wants emacsclient to
-   support --geometry; implementing this would add that support.)
-
 ** Gergely Nagy suggests that C-x # should only kill the current
    frame, not any other emacsclient frame that may have the same file
    opened for editing.  I think I agree with him.
@@ -532,21 +511,9 @@ THINGS TO DO
    an initial frame.  (The user would connect to it and open frames
    later, with emacsclient.)
 
-** Fix Mac support (I can't do this entirely myself).  Note that the
-   current state of Mac-specific source files in the multi-tty tree
-   are not useful; before starting work on Mac support, revert to
-   pristine, pre-multi-tty versions.
-
-** Fix DOS support (I can't do this entirely myself).  Note that the
-   current state of DOS-specific source files in the multi-tty tree
-   are not useful; before starting work on DOS support, revert to
-   pristine, pre-multi-tty versions.
-
-** Fix Windows support. Currently bootstrapping works on w32, but Emacs
-   crashes on startup and none of the multi-tty features are
-   implemented. Many XXX comments mark things that probably need
-   updating, ChangeLogs will help in spotting changes to X specific
-   files that may need porting.
+** Implement Mac/Windows/DOS support.  Many XXX comments mark things
+   that probably need updating, ChangeLogs will help in spotting
+   changes to X specific files that may need porting.
 
 ** Do a grep on XXX and ?? for more issues.
 
@@ -1085,18 +1052,6 @@ DIARY OF CHANGES
 
    (Done.)
 
--- Miles Bader suggests that C-x C-c on an emacsclient frame should
-   only close the frame, not exit the entire Emacs session.  Update:
-   see above for a function that does this.  Maybe this should be the
-   new default?
-
-   (Done.  This is the new default.  No complaints so far.)
-
--- Clean up the frame-local variable system.  I think it's ugly and
-   error-prone.  But maybe I just haven't yet fully understood it.
-
-   (Nothing to do.  It doesn't seem ugly any more.  It's rather clever.)
-
 -- Support multiple character locales.  A version of
    `set-locale-environment' needs to be written for setting up
    display-local settings on ttys.  I think calling
@@ -1114,18 +1069,6 @@ DIARY OF CHANGES
    (Done, by making `function-key-map' terminal-local (i.e., part of
    struct kboard).  This has probably covered all the remaining problems.)
 
--- Make `function-key-map' and `key-translation-map' terminal-local.
-
-   (Done.)
-
--- Implement `terminal-local-value' and `set-terminal-local-value' to
-   allow deterministic access to terminal local bindings.  The
-   encode-kb package can not set up `key-translation-map' without
-   these.  The terminal-local bindings seem to be independent of what
-   frame is selected.
-
-   (Done.)
-
 -- xt-mouse.el needs to be adapted for multi-tty.  It currently
    signals an error on kill-emacs under X, which prevents the user
    from exiting Emacs. (Reported by Mnemonikk on freenode.)
diff --git a/admin/notes/unicode b/admin/notes/unicode
index 6db5bb7d05c..841b7ebd5e4 100644
--- a/admin/notes/unicode
+++ b/admin/notes/unicode
@@ -1,6 +1,6 @@
                                             -*-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
@@ -181,13 +181,6 @@ nontrivial changes to the build process.
 
         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.
diff --git a/admin/notes/www b/admin/notes/www
index 0bb0850af0d..4d092ca7fa0 100644
--- a/admin/notes/www
+++ b/admin/notes/www
@@ -1,6 +1,6 @@
 -*- outline -*-
 
-Copyright (C) 2013 Free Software Foundation, Inc.
+Copyright (C) 2013-2014 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 NOTES FOR EMACS WWW PAGES
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 304251f3ce4..5f5b4a951af 100644
--- a/admin/nt/README-ftp-server
+++ b/admin/nt/README-ftp-server
@@ -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.
 
                       Precompiled Distributions of
diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs
index 98bd61f839d..5edc8d4d9ad 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>
 
@@ -30,7 +30,7 @@
 PUBLIC_LIBSRC_BINARIES='emacsclient etags ctags ebrowse'
 PUBLIC_LIBSRC_SCRIPTS='grep-changelog'
 
-AVOID="CVS -DIC README COPYING ChangeLog ~ [.]orig$ [.]rej$ Makefile$ Makefile.in$ makefile$ makefile.w32-in$ stamp-subdir [.]cvsignore [.]arch-ids [{]arch[}] [.][cho]$ make-docfile testfile test-distrib"
+AVOID="CVS -DIC README COPYING ChangeLog ~ [.]orig$ [.]rej$ Makefile$ Makefile.in$ makefile$ makefile.w32-in$ stamp-subdir [.]cvsignore [.]arch-ids [{]arch[}] [.][cho]$ make-docfile"
 
 # Prune old binaries lying around in the source tree
 PRUNE=no
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 df225cc8cbf..3ad81a94bae 100644
--- a/admin/unidata/Makefile.in
+++ b/admin/unidata/Makefile.in
@@ -1,6 +1,6 @@
 ### @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)
@@ -24,13 +24,14 @@
 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..d9d34fa3d6e
--- /dev/null
+++ b/admin/update_autogen
@@ -0,0 +1,391 @@
+#!/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"
+
+if [ -d .bzr ]; then
+    vcs=bzr
+elif [ -d .git ]; then
+    vcs=git
+else
+    die "Cannot determine vcs"
+fi
+
+
+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 ()
+{
+    local statflag="-S"
+    [ "$vcs" = "git" ] && statflag="-s"
+
+    $vcs status $statflag "$@" >| $tempfile || die "$vcs 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..."
+
+    $vcs commit -m "Auto-commit of $type files." "$@" || return $?
+
+    [ "$vcs" = "git" ] && {
+        $vcs push || 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
+
+    ## bzr status output is always relative to top-level, not PWD.
+    [ "$vcs" = "bzr" ] && 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
+
+
+## bzr status output is always relative to top-level, not PWD.
+[ "$vcs" = "bzr" ] && cd ../
+
+
+commit "loaddefs" $modified || die "commit error"
+
+
+exit 0
+
+### update_autogen ends here