Merge from trunk.

4 files changed, 23 insertions, 5 deletions

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index 661cde9c43e..0a4c14cb95c 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -298,9 +298,7 @@ HAVE_SENDTO
 HAVE_SEQPACKET
 HAVE_SETITIMER
 HAVE_SETLOCALE
-HAVE_SETPGID
 HAVE_SETRLIMIT
-HAVE_SETSID
 HAVE_SHARED_GAME_DIR
 HAVE_SHUTDOWN
 HAVE_SIGNED_${GLTYPE}
@@ -425,7 +423,6 @@ ORDINARY_LINK
 O_RDONLY
 O_RDWR
 PAGESIZE
-PENDING_OUTPUT_COUNT
 PREFER_VSUSP
 PTY_ITERATION
 PTY_NAME_SPRINTF
@@ -433,7 +430,6 @@ PTY_OPEN
 PTY_TTY_NAME_SPRINTF
 PURESIZE
 RUN_TIME_REMAP
-SETPGRP_RELEASES_CTTY
 SETUP_SLAVE_PTY
 SIGALRM
 SIGCHLD
diff --git a/admin/ChangeLog b/admin/ChangeLog
index e21293d618d..496e1c1bb6a 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,21 @@
+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.
diff --git a/admin/admin.el b/admin/admin.el
index 59d085b6405..ec78fb27865 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -158,6 +158,10 @@ Root must be the root of an Emacs source tree."
   (set-version-in-file root "configure.ac" copyright
                        (rx (and bol "copyright" (0+ (not (in ?\")))
                                 ?\" (submatch (1+ (not (in ?\")))) ?\")))
+  (set-version-in-file root "msdos/sed2v2.inp" copyright
+                       (rx (and bol "/^#undef " (1+ not-newline)
+                                "define COPYRIGHT" (1+ space)
+                                ?\" (submatch (1+ (not (in ?\")))) ?\")))
   (set-version-in-file root "nt/config.nt" copyright
                        (rx (and bol "#" (0+ blank) "define" (1+ blank)
                                 "COPYRIGHT" (1+ blank)
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 7fc0b5f4844..901daf4e442 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -27,7 +27,7 @@ GNULIB_URL=git://git.savannah.gnu.org/gnulib.git
 
 GNULIB_MODULES='
   alloca-opt c-ctype c-strcase
-  careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512
+  careadlinkat close-stream crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512
   dtoastr dtotimespec dup2 environ execinfo
   filemode getloadavg getopt-gnu gettime gettimeofday
   ignore-value intprops largefile lstat