Merge from trunk; up to 2012-12-09T01:04:43Z!rgm@gnu.org.

4 files changed, 20 insertions, 13 deletions

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index 20c97f886dd..13c3da1745a 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -419,14 +419,7 @@ PTY_TTY_NAME_SPRINTF
 PURESIZE
 RUN_TIME_REMAP
 SETUP_SLAVE_PTY
-SIGALRM
-SIGCHLD
-SIGHUP
-SIGKILL
 SIGNALS_VIA_CHARACTERS
-SIGPIPE
-SIGQUIT
-SIGTRAP
 STDC_HEADERS
 SYSTEM_PURESIZE_EXTRA
 SYSTEM_MALLOC
@@ -436,7 +429,6 @@ TERM
 TIME_WITH_SYS_TIME
 TIOCSIGSEND
 TM_IN_SYS_TIME
-ULIMIT_BREAK_VALUE
 UNIX98_PTYS
 USE_TOOLKIT_SCROLL_BARS
 USG_SUBTTY_WORKS
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 05c1463d325..9c6413aa14f 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,19 @@
+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.
diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index ea9c4a3c2d1..eda28b639d2 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -57,8 +57,7 @@ For each step, check for possible errors.
     M-x ediff.  Especially check that Info files aren't built.
 
 10.  cd EMACS_ROOT_DIR; bzr tag TAG
-    TAG is EMACS_PRETEST_XX_YY_ZZZ for a pretest, EMACS_XX_YY for a
-    release.
+    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
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 792818b2efe..1f60bb2973e 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -31,10 +31,10 @@ GNULIB_MODULES='
   dtoastr dtotimespec dup2 environ execinfo faccessat
   fcntl-h filemode getloadavg getopt-gnu gettime gettimeofday
   ignore-value intprops largefile lstat
-  manywarnings mktime pselect pthread_sigmask readlink
-  socklen stat-time stdalign stdarg stdbool stdio
+  manywarnings mktime pselect pthread_sigmask putenv readlink
+  sig2str socklen stat-time stdalign stdarg stdbool stdio
   strftime strtoimax strtoumax symlink sys_stat
-  sys_time time timer-time timespec-add timespec-sub utimens
+  sys_time time timer-time timespec-add timespec-sub unsetenv utimens
   warnings
 '