Merge from trunk.

1 files changed, 430 insertions, 12 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 4da85943b7f..05c1463d325 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,421 @@
+2012-11-24  Ken Brown  <kbrown@cornell.edu>
+
+        * CPP-DEFINES (HAVE_MOUSE): Remove.
+
+2012-11-23  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Assume POSIX 1003.1-1988 or later for dirent.h (Bug#12958).
+        * CPP-DEFINES (HAVE_CLOSEDIR, HAVE_DIRENT_H): Remove.
+        * notes/copyright: Adjust to src/ndir.h -> nt/inc/dirent.h renaming.
+
+2012-11-21  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Assume POSIX 1003.1-1988 or later for unistd.h (Bug#12945).
+        * CPP-DEFINES (BROKEN_GETWD, HAVE_GETCWD, HAVE_GETWD, HAVE_SIZE_T)
+        (HAVE_UNISTD_H): Remove.
+
+2012-11-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Assume POSIX 1003.1-1988 or later for fcntl.h (Bug#12881).
+        * CPP-DEFINES (O_RDONLY, O_RDWR, HAVE_FCNTL_H): Remove.
+        * merge-gnulib (GNULIB_MODULES): Add fcntl-h.
+
+2012-11-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Remove no-longer-used pty_max_bytes variable.
+        * CPP-DEFINES (HAVE_FPATHCONF): Remove.
+
+2012-11-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use faccessat, not access, when checking file permissions (Bug#12632).
+        * merge-gnulib (GNULIB_MODULES): Add faccessat.
+        (GNULIB_TOOL_FLAGS): Avoid at-internal, fchdir, malloc-posix,
+        openat-die, openat-h, save-cwd.  Do not avoid fcntl-h.
+        Omit gnulib's m4/fcntl-o.m4.
+
+2012-11-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Assume at least POSIX.1-1988 for getpgrp, setpgid, setsid (Bug#12800).
+        * CPP-DEFINES (HAVE_SETPGID, HAVE_SETSID, SETPGRP_RELEASES_CTTY):
+        Remove; obsolete.
+
+        Simplify by assuming __fpending.
+        * CPP-DEFINES (PENDING_OUTPUT_COUNT): Remove.
+
+2012-11-03  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (set-copyright): Add msdos/sed2v2.inp.
+
+2012-11-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix data-loss with --batch (Bug#9574).
+        * merge-gnulib (GNULIB_MODULES): Add close-stream.
+
+2012-10-12  Kenichi Handa  <handa@gnu.org>
+
+        * charsets/Makefile (JISC6226.map): Add missing mappings.
+
+2012-10-11  Kenichi Handa  <handa@gnu.org>
+
+        * charsets/mapconv: Adjusted for the change of mapfiles/*.gz to
+        mapfiles/*.
+
+        * charsets/gb180302.awk: Handle 4-byte sequences in the input file.
+
+        * charsets/Makefile: Be sure to call mapconv script of the current
+        directory.  Adjusted for the change of mapfiles/*.gz to
+        mapfiles/*.
+        (SED_SCRIPT): New variable.
+        (jisx2131-filter): New target.
+        (JISX2131.map): Use jisx2131-filter to filter out characters added
+        for the 2004 year version.
+        (clear): Remove ${SED_SCRIPT} too.
+
+        * charsets/mapfiles/MULE-ethiopic.map,
+        charsets/mapfiles/MULE-ipa.map,
+        charsets/mapfiles/MULE-is13194.map,
+        charsets/mapfiles/MULE-lviscii.map,
+        charsets/mapfiles/MULE-sisheng.map,
+        charsets/mapfiles/MULE-tibetan.map,
+        charsets/mapfiles/MULE-uviscii.map: Fix typo.
+
+2012-10-09  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (cusver-scan-cus-start): New function.
+        (cusver-check): Scan old cus-start.el.
+
+2012-10-07  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (cusver-new-version): Set default.
+        (cusver-check): Improve interactive argument reading.
+
+2012-10-06  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (cusver-new-version): New variable.
+        (cusver-scan): Check if containing group has a :version.
+        (cusver-check): Add VERSION argument.
+
+2012-10-01  David Engster  <deng@randomsample.de>
+
+        * grammars/bovine-grammar.el:
+        * grammars/wisent-grammar.el: Move to lisp directory.
+
+2012-10-01  David Engster  <deng@randomsample.de>
+
+        * grammars/bovine-grammar.el (bovine--grammar-newstyle-unquote):
+        Remove.
+        (bovine-grammar-expand-form): Test for emacs-major-version.
+
+        * grammars/c.by: Add EXPLICIT to keyword tokens.
+
+        * grammars/f90.by: Add %provide token.
+
+        * grammar/grammar.wy (semantic-grammar-lexer): Remove, since it
+        was copied to grammar.el.  New %provide token to generate prefix
+        which conforms with Emacs conventions.  Remove lexer definition,
+        which is now in grammar.el.
+
+2012-09-27  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (set-version): Set msdos.c's Vwindow_system_version.
+
+2012-09-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Check more robustly for timer_settime.
+        * merge-gnulib (GNULIB_MODULES): Add timer-time.
+
+2012-09-26  Juanma Barranquero  <lekktu@gmail.com>
+
+        * unidata/BidiMirroring.txt:
+        * unidata/UnicodeData.txt: Update to Unicode 6.2.
+
+2012-09-17  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (add-log-time-format): Declare.
+
+        * admin.el (cusver-scan, cusver-check): Bind local variables.
+
+        * admin.el (set-version): Set major version in
+        etc/refcards/ru-refcard.tex and etc/refcards/emacsver.tex.
+        (set-copyright): In etc/refcards, only change ru-refcard.tex
+        and emacsver.tex.
+
+        * admin.el (set-copyright): No more need to set copyrights for
+        nextstep, or .c files.  Add configure.ac and config.nt.
+
+2012-09-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Remove configure's --without-sync-input option (Bug#12450).
+        * CPP-DEFINES (BROKEN_SA_RESTART, SA_RESTART): Remove.
+
+2012-09-16  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (set-version): No more need to set nextstep versions.
+        (set-copyright): Update for moved nextstep files.
+
+2012-09-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Simplify SIGIO usage (Bug#12408).
+        * CPP_DEFINES (BROKEN_SIGAIO, BROKEN_SIGIO, BROKEN_SIGPOLL)
+        (BROKEN_SIGPTY, NO_TERMIO): Remove.
+
+2012-09-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Simplify, document, and port floating-point (Bug#12381).
+        * CPP-DEFINES (HAVE_CBRT, HAVE_LOGB, logb): Remove.
+
+2012-09-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Assume C89 or later for math functions (Bug#12381).
+        * CPP-DEFINES (HAVE_FMOD, HAVE_FREXP, FLOAT_CHECK_DOMAIN)
+        (HAVE_INVERSE_HYPERBOLIC, NO_MATHERR): Remove.
+
+2012-09-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Simplify redefinition of 'abort' (Bug#12316).
+        * CPP-DEFINES (NO_ABORT): Remove.
+
+2012-08-28  Glenn Morris  <rgm@gnu.org>
+
+        * bzrmerge.el (bzrmerge-merges): Allow unversioned files in the tree.
+
+2012-08-28  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * charsets/mule-charsets.el (header): Fix typo.
+
+2012-08-24  Paul Eggert  <eggert@cs.ucla.edu>
+
+        On assertion failure, print backtrace if available.
+        * merge-gnulib (GNULIB_MODULES): Add execinfo.
+
+2012-08-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use ASCII tests for character types.
+        * merge-gnulib (GNULIB_MODULES): Add c-ctype.  This documents a
+        new direct dependency; c-ctype was already being used indirectly
+        via other gnulib modules.
+
+2012-08-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use bool for Emacs Lisp booleans.
+        * merge-gnulib (GNULIB_MODULES): Add stdbool.  This documents a
+        new direct dependency; stdbool was already being used indirectly
+        via other gnulib modules.
+
+2012-08-11  Glenn Morris  <rgm@gnu.org>
+
+        * bzrmerge.el (bzrmerge-resolve): Disable local eval:.
+
+2012-08-07  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * coccinelle/overlay.cocci, coccinelle/symbol.cocci: Remove.
+
+2012-08-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Port to Solaris 8.
+        * CPP-DEFINES (WRETCODE): Remove.
+
+2012-08-01  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * coccinelle/overlay.cocci: Semantic patch to replace direct
+        access to Lisp_Object members of struct Lisp_Overlay to MVAR.
+
+2012-08-01  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * coccinelle/symbol.cocci: Semantic patch to replace direct
+        access to Lisp_Object members of struct Lisp_Symbol to SVAR.
+
+2012-08-01  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * coccinelle/process.cocci: Semantic patch to replace direct
+        access to Lisp_Object members of struct Lisp_Process to PVAR.
+
+2012-08-01  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * coccinelle/window.cocci: Semantic patch to replace direct
+        access to Lisp_Object members of struct window to WVAR.
+
+2012-07-31  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * coccinelle/frame.cocci: Semantic patch to replace direct
+        access to Lisp_Object members of struct frame to FVAR.
+
+2012-07-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use Gnulib environ and stdalign modules (Bug#9772, Bug#9960).
+        * merge-gnulib: Add environ, stdalign.
+
+2012-07-20  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * coccinelle/unibyte_string.cocci: Semantic patch to convert from
+        make_unibyte_string to build_unibyte_string where appropriate.
+
+2012-07-17  Eli Zaretskii  <eliz@gnu.org>
+
+        * CPP-DEFINES: Remove FILE_SYSTEM_CASE.
+
+2012-07-17  Chong Yidong  <cyd@gnu.org>
+
+        * Version 24.1 released.
+
+2012-07-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Assume mkdir, perror, rename, rmdir, strerror.
+        * CPP-DEFINES (HAVE_MKDIR, HAVE_PERROR, HAVE_RENAME, HAVE_RMDIR)
+        (HAVE_STRERROR, strerror):
+        Remove.
+
+2012-07-10  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * coccinelle/list_loop.cocci: Semantic patch to convert from Fcdr
+        to XCDR and consistently use CONSP in the list iteration loops.
+        * coccinelle/vector_contents.cocci: Fix indentation.
+
+2012-07-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * bzrmerge.el: Use cl-lib.
+
+2012-07-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Rename configure.in to configure.ac (Bug#11603).
+        * admin.el (set-version):
+        * quick-install-emacs (VERSION):
+        Get version number from configure.ac, not configure.in.
+
+2012-07-06  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use c_strcasecmp for ASCII case-insensitive comparison (Bug#11786).
+        * merge-gnulib (GNULIB_MODULES): Add c-strcase.
+
+2012-07-05  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * coccinelle/xzalloc.cocci: Semantic patch to convert
+        calls to xmalloc with following memset to xzalloc.
+
+2012-07-04  Juanma Barranquero  <lekktu@gmail.com>
+
+        * CPP-DEFINES (LISP_FLOAT_TYPE): Remove, obsolete.
+
+2012-06-26  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * coccinelle/build_string.cocci: Semantic patch
+        to convert from make_string to build_string.
+
+2012-06-24  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        First Coccinelle semantic patch.
+        * coccinelle: New subdirectory
+        * coccinelle/README: Documentation stub.
+        * coccinelle/vector_contents.cocci: Semantic patch to replace direct
+        access to `contents' member of Lisp_Vector objects with AREF and ASET
+        where appropriate.
+
+2012-06-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Support higher-resolution time stamps (Bug#9000).
+        * merge-gnulib (GNULIB_MODULES): Add dtotimespec, gettime,
+        gettimeofday, pselect, stat-time, sys_time, time, timespec-add,
+        timespec-sub, utimens.
+        (GNULIB_TOOL_FLAGS): Add --avoid=select --avoid=sigprocmask.
+        This trims down the gnulib import, from the very latest gnulib.
+        Emacs does its own implementation of 'select' and 'sigprocmask'
+        on Windows, and it assumes 'select' and 'sigprocmask' on non-Windows
+        hosts, so it doesn't need these modules.
+        Similarly, avoid errno, fcntl, fcntl-h, fstat, and sys_types, as
+        these gnulib modules are only for Windows porting and Emacs ports
+        to Windows in a different way.
+
+2012-06-13  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * make-emacs: Rename --union-type to --check-lisp-type.
+        Define CHECK_LISP_OBJECT_TYPE insted of USE_LISP_UNION_TYPE.
+        * CPP-DEFINES (DEBUG_LISP_OBJECT_TYPE): Rename from
+        USE_LISP_UNION_TYPE.
+
+2012-06-03  Glenn Morris  <rgm@gnu.org>
+
+        * quick-install-emacs (PUBLIC_LIBSRC_SCRIPTS): Remove rcs-checkin.
+
+2012-06-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Remove --disable-maintainer-mode option from 'configure'.  (Bug#11555)
+        * make-tarball.txt: Don't worry about maintainer mode.
+
+2012-05-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * CPP-DEFINES: Remove HAVE_SYSINFO.
+
+2012-05-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Assume gnulib does largefile.
+        * merge-gnulib (GNULIB_MODULES): Add largefile.
+
+2012-05-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Remove src/m/*.
+        * CPP-DEFINES: Do not mention src/m/*.h.
+        (BITS_PER_EMACS_INT, BITS_PER_LONG, BITS_PER_CHAR)
+        (BITS_PER_SHORT, BITS_PER_INT): Remove.
+        * MAINTAINERS: Remove src/m/.
+
+2012-05-21  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use full name for m4/gnulib-comp.m4.  (Bug#11529)
+        * merge-gnulib: Leave m4/gnulib-comp.m4's name alone.
+
+        Assume C89 or later.
+        * CPP-DEFINES: Remove NULL, const.
+
+        Make merging from gnulib a script, not a makefile action.
+        * merge-gnulib: New script, with actions moved here from
+        ../Makefile.in.
+
+2012-05-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * CPP-DEFINES (HAVE_GETDOMAINNAME): Remove.
+
+        * CPP-DEFINES (HAVE_FTIME): Remove.
+
+2012-05-02  Glenn Morris  <rgm@gnu.org>
+
+        * bzrmerge.el (bzrmerge-skip-regexp): Add "Auto-commit".
+
+2012-04-10  Glenn Morris  <rgm@gnu.org>
+
+        * bzrmerge.el (bzrmerge-skip-regexp): Add "from trunk".
+
+        * unidata/Makefile.in: Add FSF copyright.
+        Make it use autoconf features, and work for out-of-tree builds.
+
+2012-04-07  Eli Zaretskii  <eliz@gnu.org>
+
+        * unidata/README:
+        * unidata/copyright.html:
+        * unidata/BidiMirroring.txt:
+        * unidata/UnicodeData.txt: Update for the latest version 6.1 of
+        the Unicode Standard.
+
+2012-02-16  Kenichi Handa  <handa@m17n.org>
+
+        * unidata/unidata-gen.el (unidata-prop-alist): Change the default
+        values of name and old-name to nil.
+        (unidata-get-name): Return nil for the default value.
+
+2012-02-11  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (cusver-find-files, cusver-scan, cusver-goto-xref)
+        (cusver-check): New functions.
+
+2012-01-19  Glenn Morris  <rgm@gnu.org>
+
+        * bzrmerge.el (bzrmerge-missing): Allow a definitive "no" answer to the
+        "skip?" question, since there can be multiple such for any revision.
+
+2012-01-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * FOR-RELEASE (Check the Emacs Tutorial): Mark TUTORIAL.he as
+        updated and checked.
+
 2011-11-26  Andreas Schwab  <schwab@linux-m68k.org>
 
         * grammars/bovine-grammar.el (bovine--grammar-newstyle-unquote):
@@ -82,11 +500,11 @@
 
         * unidata/makefile.w32-in (all): Remove src/biditype.h and
         src/bidimirror.h.
-        (../../src/biditype.h, ../../src/bidimirror.h): Deleted.
+        (../../src/biditype.h, ../../src/bidimirror.h): Delete.
 
         * unidata/Makefile.in (all): Remove src/biditype.h and
         src/bidimirror.h.
-        (../../src/biditype.h, ../../src/bidimirror.h): Deleted.
+        (../../src/biditype.h, ../../src/bidimirror.h): Delete.
 
 2011-07-07  Juanma Barranquero  <lekktu@gmail.com>
 
@@ -97,8 +515,8 @@
 
         * unidata/unidata-gen.el (unidata-dir): New variable.
         (unidata-setup-list): Expand unidata-text-file in unidata-dir.
-        (unidata-prop-alist): INDEX element may be a function.  New
-        optional element VAL-LIST (for general-category and bidi-class).
+        (unidata-prop-alist): INDEX element may be a function.
+        New optional element VAL-LIST (for general-category and bidi-class).
         New entry `mirroring'.
         (unidata-prop-default, unidata-prop-val-list): New subst.
         (unidata-get-character, unidata-put-character): Delete them.
@@ -454,13 +872,13 @@
 
 2009-04-17  Kenichi Handa  <handa@m17n.org>
 
-        * unidata/unidata-gen.el (unidata-get-decomposition): Adjust
-        Hangle decomposition rule to Unicode.
+        * unidata/unidata-gen.el (unidata-get-decomposition):
+        Adjust Hangle decomposition rule to Unicode.
 
 2009-04-09  Kenichi Handa  <handa@m17n.org>
 
-        * unidata/unidata-gen.el (unidata-describe-decomposition): Return
-        a string with a composition property to disable combining
+        * unidata/unidata-gen.el (unidata-describe-decomposition):
+        Return a string with a composition property to disable combining
         characters being composed.
 
 2009-03-11  Miles Bader  <miles@gnu.org>
@@ -473,7 +891,7 @@
 
 2009-02-23  Jason Rumney  <jasonr@gnu.org>
 
-        * nt/README-ftp-server: Update for 23.0.91
+        * nt/README-ftp-server: Update for 23.0.91.
 
         * nt/README.W32: Remove ever expanding versions of Windows.
         Shorten FAQ URL.  Remove mention of obsolete lock directory.
@@ -955,7 +1373,7 @@
 
 2005-10-17  Bill Wohler  <wohler@newt.com>
 
-        * FOR-RELEASE (DOCUMENTATION): Removed lisp/toolbar from list
+        * FOR-RELEASE (DOCUMENTATION): Remove lisp/toolbar from list
         since it's gone.  Also marked mh-e as done.
 
 2005-10-11  Juanma Barranquero  <lekktu@gmail.com>
@@ -1002,7 +1420,7 @@
 
 2005-03-30  Marcelo Toledo  <marcelo@marcelotoledo.org>
 
-        * FOR-RELEASE (Documentation): Added check the Emacs Tutorial.
+        * FOR-RELEASE (Documentation): Add check the Emacs Tutorial.
         The first line of every tutorial must begin with a sentence saying
         "Emacs Tutorial" in the respective language.  This should be
         followed by "See end for copying conditions", likewise in the
@@ -1226,7 +1644,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2001-2011  Free Software Foundation, Inc.
+  Copyright (C) 2001-2012 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.