Merge from mainline.

11 files changed, 133 insertions, 40 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index cbcd698e8b1..29118deba7f 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,30 @@
+2013-08-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * unidata/Makefile.in (SHELL): Now @SHELL@, not /bin/sh,
+        for portability to hosts where /bin/sh has problems.
+
+2013-08-27  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (manual-misc-manuals): Use INFO_COMMON rather than
+        INFO_TARGETS.  "faq" does not need special treatment any more.
+
+2013-08-15  Glenn Morris  <rgm@gnu.org>
+
+        * make-tarball.txt: Mention generating pdfs in etc/refcards.
+
+2013-08-15  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * notes/hydra: More information about Hydra.
+
+2013-08-10  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * notes/hydra: New file.
+
+2013-08-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix some minor races in hosts lacking mkostemp (Bug#15015).
+        * merge-gnulib (GNULIB_MODULES): Add mkostemp.
+
 2013-07-12  Glenn Morris  <rgm@gnu.org>
 
         * admin.el (manual-style-string): Use non-abbreviated url.
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 53186b21688..c578d3d37e1 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -3,6 +3,10 @@ Tasks needed before the next release.
 * TO BE DONE SHORTLY BEFORE RELEASE
 
 ** Manuals
+Check for node names using problematic characters:
+  find doc -name '*.texi' -exec grep '^@node[^,]*[:.()]' {} +
+Sadly makeinfo does not warn about such characters.
+
 Check cross-references between the manuals (eg from emacs to elisp)
 are correct.  You can use something like the following in the info
 directory in the Emacs build tree:
diff --git a/admin/admin.el b/admin/admin.el
index 9c0015fc413..f8ca8aec261 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -195,19 +195,21 @@ Root must be the root of an Emacs source tree."
 
 (defun manual-misc-manuals (root)
   "Return doc/misc manuals as list of strings."
-  ;; Like `make -C doc/misc echo-info', but works if unconfigured.
+  ;; Similar to `make -C doc/misc echo-info', but works if unconfigured,
+  ;; and for INFO_TARGETS rather than INFO_INSTALL.
   (with-temp-buffer
     (insert-file-contents (expand-file-name "doc/misc/Makefile.in" root))
-    (search-forward "INFO_TARGETS = ")
-    (let ((start (point))
-          res)
+    ;; Should really use expanded value of INFO_TARGETS.
+    (search-forward "INFO_COMMON = ")
+    (let ((start (point)))
       (end-of-line)
       (while (and (looking-back "\\\\")
                   (zerop (forward-line 1)))
         (end-of-line))
-      (split-string (replace-regexp-in-string
-                     "\\(\\\\\\|\\.info\\)" ""
-                     (buffer-substring start (point)))))))
+      (append (split-string (replace-regexp-in-string
+                             "\\(\\\\\\|\\.info\\)" ""
+                             (buffer-substring start (point))))
+              '("efaq-w32")))))
 
 (defun make-manuals (root &optional type)
   "Generate the web manuals for the Emacs webpage.
@@ -287,9 +289,8 @@ Optional argument TYPE is type of output (nil means all)."
 
 (defun manual-misc-html (name root html-node-dir html-mono-dir)
   ;; Hack to deal with the cases where .texi creates a different .info.
-  ;; Blech.  TODO Why not just rename the .texi files?
+  ;; Blech.  TODO Why not just rename the .texi (or .info) files?
   (let* ((texiname (cond ((equal name "ccmode") "cc-mode")
-                         ((equal name "efaq") "faq")
                          (t name)))
          (texi (expand-file-name (format "doc/misc/%s.texi" texiname) root)))
     (manual-html-node texi (expand-file-name name html-node-dir))
diff --git a/admin/cus-test.el b/admin/cus-test.el
index 6b8ec9abe02..54d26cc11d6 100644
--- a/admin/cus-test.el
+++ b/admin/cus-test.el
@@ -202,6 +202,8 @@ The detected problematic options are stored in `cus-test-errors'."
 
            ;; Check the values
            (mapc (lambda (value)
+                   ;; TODO for booleans, check for values that can be
+                   ;; evaluated and are not t or nil.  Usually a bug.
                    (unless (widget-apply conv :match value)
                      (setq mismatch 'mismatch)))
                  values)
diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index 005c6694228..fc7f81f0c28 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -61,6 +61,9 @@ General steps (for each step, check for possible errors):
 5.   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.
 
     Commit etc/AUTHORS, lisp/ldefs-boot.el, and the files changed
@@ -144,6 +147,8 @@ General steps (for each step, check for possible errors):
     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.)
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 82e0cd77fca..97126704d10 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -32,7 +32,7 @@ GNULIB_MODULES='
   fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync
   getloadavg getopt-gnu gettime gettimeofday
   intprops largefile lstat
-  manywarnings memrchr mktime
+  manywarnings memrchr mkostemp mktime
   pipe2 pselect pthread_sigmask putenv qacl readlink readlinkat
   sig2str socklen stat-time stdalign stdarg stdbool stdio
   strftime strtoimax strtoumax symlink sys_stat
diff --git a/admin/notes/bzr b/admin/notes/bzr
index 8f7d0d94fa8..d3886abfd69 100644
--- a/admin/notes/bzr
+++ b/admin/notes/bzr
@@ -347,6 +347,9 @@ Runs on commit.  Projects can enable it themselves by using `bzr
 config' to set post_commit_to option for a branch.  See `bzr help email'
 (if you have the plugin installed) for other options.
 
+The From: address will be that of your Savannah account, rather than
+your `bzr whoami' information.
+
 Note: if you have the bzr-email plugin installed locally, then when
 you commit to the Emacs repository it will also try to send a commit
 email from your local machine.  If your machine is not configured to
diff --git a/admin/notes/elpa b/admin/notes/elpa
index db14456fe32..469a0ca8bd1 100644
--- a/admin/notes/elpa
+++ b/admin/notes/elpa
@@ -1,24 +1,21 @@
 NOTES ON THE EMACS PACKAGE ARCHIVE
 
-The GNU Emacs package archive, at elpa.gnu.org, is managed using a Bzr
-branch named "elpa", hosted on Savannah.  To check it out:
+The GNU Emacs package archive, at elpa.gnu.org, is managed using a Git
+repository named "elpa", hosted on Savannah.  To check it out:
 
-  bzr branch bzr+ssh://USER@bzr.savannah.gnu.org/emacs/elpa elpa
+  git clone git://bzr.sv.gnu.org/emacs/elpa
   cd elpa
-  echo "public_branch = bzr+ssh://USER@bzr.savannah.gnu.org/emacs/elpa" >> .bzr/branch/branch.conf
-  bzr bind bzr+ssh://USERNAME@bzr.savannah.gnu.org/emacs/elpa
+  git remote set-url --push origin git+ssh://bzr.sv.gnu.org/srv/git/emacs/elpa
   [create task branch for edits, etc.]
 
-Changes to this branch propagate to elpa.gnu.org in a semi-manual way.
-There exists a copy of the elpa branch on that machine.  Someone with
-access logs in, pulls the latest changes from Savannah, and runs a
-"deployment" script.  This script (which is itself kept in the Bzr
-branch) generates the content visible at http://elpa.gnu.org/packages.
+Changes to this branch propagate to elpa.gnu.org via a "deployment" script run
+daily.  This script (which is kept in elpa/admin/update-archive.sh) generates
+the content visible at http://elpa.gnu.org/packages.
 
-The reason we set things up this way, instead of using the package
-upload commands in package-x.el, is to let Emacs hackers conveniently
-edit the contents of the "elpa" branch.  (In particular, multi-file
-packages are stored on the branch in source form, not as tarfiles.)
+A new package is released as soon as the "version number" of that package is
+changed.  So you can use `elpa' to work on a package without fear of releasing
+those changes prematurely.  And once the code is ready, just bump the
+version number to make a new release of the package.
 
 It is easy to use the elpa branch to deploy a "local" copy of the
 package archive.  For details, see the README file in the elpa branch.
diff --git a/admin/notes/hydra b/admin/notes/hydra
new file mode 100644
index 00000000000..71e35d092c8
--- /dev/null
+++ b/admin/notes/hydra
@@ -0,0 +1,66 @@
+-*- outline -*-
+
+Copyright (C) 2013 Free Software Foundation, Inc.
+See the end of the file for license conditions.
+
+NOTES FOR EMACS CONTINUOUS BUILD ON HYDRA
+
+A continuous build for Emacs can be found at
+http://hydra.nixos.org/jobset/gnu/emacs-trunk
+http://hydra.nixos.org/jobset/gnu/emacs-24
+
+* It builds Emacs on various platforms.
+Sometimes jobs fail due to hydra problems rather than Emacs problems.
+Eg it seems like the cygwin build will never work again.
+http://lists.gnu.org/archive/html/hydra-users/2013-08/msg00000.html
+
+* Mail notifications
+In addition to the web interface, Hydra can send notifications by
+email when the build status of a project changes—e.g., from
+`SUCCEEDED' to `FAILED'.  It sends notifications about build status in
+Emacs trunk to emacs-buildstatus@gnu.org.
+
+If you want to receive these notifications, please subscribe at
+http://lists.gnu.org/mailman/listinfo/emacs-buildstatus
+
+* The Emacs jobset consists of the following jobs:
+
+** The `tarball' job
+which gets a checkout from bzr, and does a bootstrap followed
+by running make-dist to create a tarball.  If this job fails, all the
+others will too (because they use the tarball as input).
+
+** The `build' job
+which starts from the tarball and does a normal build
+
+** The 'coverage' job
+does a gcov build and then runs `make check'.  Fails if any test fails.
+
+* Nix expressions
+The recipe for GNU Emacs are available via Git:
+http://git.savannah.gnu.org/cgit/hydra-recipes.git/tree/emacs
+
+To modify the build job, email the patch to hydra-users@gnu.org.  The
+build recipes are written in the Nix language.
+
+* Other Information
+For a list of other GNU packages that have a continuous build on
+Hydra, see http://hydra.nixos.org/project/gnu
+
+See http://www.gnu.org/software/devel.html#Hydra for more information.
+
+
+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/>.
diff --git a/admin/nt/README-ftp-server b/admin/nt/README-ftp-server
index 3a21733747d..304251f3ce4 100644
--- a/admin/nt/README-ftp-server
+++ b/admin/nt/README-ftp-server
@@ -16,12 +16,6 @@ See the end of the file for license conditions.
   accustomed to compiling programs themselves.  Corresponding source
   can be found in the parent directory in emacs-24.3.tar.gz.
 
-  If you have access to the World Wide Web, I would recommend pointing
-  your favorite web browser to the following document (if you haven't
-  already):
-
-        http://www.gnu.org/software/emacs/windows/ntemacs.html
-
 * IMPORTANT LEGAL REMINDER
 
   If you want to redistribute any of the precompiled distributions of
@@ -230,16 +224,10 @@ See the end of the file for license conditions.
 
 * Further information
 
-  If you have access to the World Wide Web, I would recommend pointing
-  your favorite web browser to following the document (if you haven't
-  already):
-
-        http://www.gnu.org/software/emacs/windows/ntemacs.html
+  The Emacs on MS Windows FAQ is distributed with Emacs (info
+  manual "efaq-w32"), and at
 
-  This document serves as an FAQ and a source for further information
-  about the Windows port and related software packages. Note that as
-  most of the information in that FAQ is for earlier versions, so some
-  information may not be relevant to Emacs-24.3.
+        http://www.gnu.org/software/emacs/manual/efaq-w32.html
 
   In addition to the FAQ, there is a mailing list for discussing issues
   related to the Windows port of Emacs.  For information about the
diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in
index c759079a49a..df225cc8cbf 100644
--- a/admin/unidata/Makefile.in
+++ b/admin/unidata/Makefile.in
@@ -21,7 +21,7 @@
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 abs_builddir = @abs_builddir@