merge from trunk

1 files changed, 198 insertions, 0 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 145028ec815..6a6b1bd8da6 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,201 @@
+2012-12-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix permissions bugs with setgid directories etc. (Bug#13125)
+        * CPP-DEFINES (BSD4_2): Remove.
+
+2012-12-08  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use putenv+unsetenv instead of modifying environ directly (Bug#13070).
+        * merge-gnulib (GNULIB_MODULES): Add putenv, unsetenv.
+
+        Simplify get_lim_data.
+        * CPP-DEFINES (ULIMIT_BREAK_VALUE): Remove.
+
+2012-12-03  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Assume POSIX 1003.1-1988 or later for signal.h (Bug#13026).
+        * CPP-DEFINES (SIGALRM, SIGCHLD, SIGHUP, SIGKILL, SIGPIPE, SIGQUIT):
+        Remove.
+        (SIGTRAP): Remove this one too, as config.h no longer defines it.
+        * merge-gnulib (GNULIB_MODULES): Add sig2str.
+
+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.