Merge branch 'trunk' into xwidget

Conflicts:
	src/xdisp.c

5 files changed, 139 insertions, 57 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 8746657517e..cbcd698e8b1 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,36 @@
+2013-07-12  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (manual-style-string): Use non-abbreviated url.
+
+2013-07-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Port recent close-on-exec changes to Cygwin (Bug#14821).
+        * merge-gnulib (GNULIB_TOOL_FLAGS): Don't avoid binary-io.
+
+        Handle error numbers a bit more reliably.
+        * merge-gnulib (GNULIB_MODULES): Remove ignore-value.
+
+2013-07-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Make file descriptors close-on-exec when possible (Bug#14803).
+        * merge-gnulib (GNULIB_MODULES): Add fcntl, pipe2.
+        (GNULIB_TOOL_FLAGS): Avoid binary-io, close.  Do not avoid fcntl.
+
+2013-07-06  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (manual-misc-manuals): New function.
+        (make-manuals): Avoid hard-coding list of misc manuals.
+        Add the option to only make certain type(s) of output.
+        (manual-misc-html): Special-case ccmode and efaq.
+        (manual-html-mono, manual-html-node, manual-pdf, manual-ps):
+        Move creation of output directory here from make-manuals.
+        (manual-html-fix-index-2): Avoid dynamic reference to `f'.
+
+2013-07-05  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (make-manuals): Use a standard location for lispintro.
+        Use a pdf/ subdirectory for pdf versions.
+
 2013-06-29  Glenn Morris  <rgm@gnu.org>
 
         * admin.el (make-manuals): Don't bother with txt or dvi any more.
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 0821593955e..53186b21688 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -18,6 +18,20 @@ in the web pages repository.  E.g.:
 Redirect /software/emacs/manual/html_mono/automake.html /software/automake/manual/automake.html
 Redirect /software/emacs/manual/html_node/automake/ /software/automake/manual/html_node/
 
+Another tool you can use to check links is gnu.org's linc.py:
+http://www.gnu.org/server/source/
+
+You run this something like:
+
+cd /path/to/cvs/emacs-www
+linc.py -o /path/to/output-dir --url http://www.gnu.org/software/emacs/ .
+
+Be warned that it is really, really slow (as in, can take ~ a full day
+to check the manual/ directory).  It is probably best to run it on a
+single directory at a time from eg manual/html_node.  It is very
+inefficient, but may reveal a few things that info-xref does not.
+
+
 make emacs.dvi, elisp.dvi, and deal with any errors (undefined
 references etc) in the output.  Break any overfull lines.
 Underfull hboxes are not serious, but it can be nice to get rid of
diff --git a/admin/admin.el b/admin/admin.el
index 2bc4955810d..9c0015fc413 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -193,58 +193,82 @@ Root must be the root of an Emacs source tree."
 
 ;;; Various bits of magic for generating the web manuals
 
-(defun make-manuals (root)
-  "Generate the web manuals for the Emacs webpage."
-  (interactive "DEmacs root directory: ")
+(defun manual-misc-manuals (root)
+  "Return doc/misc manuals as list of strings."
+  ;; Like `make -C doc/misc echo-info', but works if unconfigured.
+  (with-temp-buffer
+    (insert-file-contents (expand-file-name "doc/misc/Makefile.in" root))
+    (search-forward "INFO_TARGETS = ")
+    (let ((start (point))
+          res)
+      (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)))))))
+
+(defun make-manuals (root &optional type)
+  "Generate the web manuals for the Emacs webpage.
+Interactively with a prefix argument, prompt for TYPE.
+Optional argument TYPE is type of output (nil means all)."
+  (interactive (let ((root (read-directory-name "Emacs root directory: "
+                                                source-directory nil t)))
+                 (list root
+                       (if current-prefix-arg
+                           (completing-read
+                            "Type: "
+                            (append
+                             '("misc" "pdf" "ps")
+                             (let (res)
+                               (dolist (i '("emacs" "elisp" "eintr") res)
+                                 (dolist (j '("" "-mono" "-node" "-ps" "-pdf"))
+                                   (push (concat i j) res))))
+                             (manual-misc-manuals root)))))))
   (let* ((dest (expand-file-name "manual" root))
          (html-node-dir (expand-file-name "html_node" dest))
          (html-mono-dir (expand-file-name "html_mono" dest))
-         (ps-dir (expand-file-name "ps" dest)))
+         (ps-dir (expand-file-name "ps" dest))
+         (pdf-dir (expand-file-name "pdf" dest))
+         (emacs (expand-file-name "doc/emacs/emacs.texi" root))
+         (elisp (expand-file-name "doc/lispref/elisp.texi" root))
+         (eintr (expand-file-name "doc/lispintro/emacs-lisp-intro.texi" root))
+         (misc (manual-misc-manuals root)))
+    ;; TODO this makes it non-continuable.
+    ;; Instead, delete the individual dest directory each time.
     (when (file-directory-p dest)
-      (if (y-or-n-p (format "Directory %s exists, delete it first?" dest))
+      (if (y-or-n-p (format "Directory %s exists, delete it first? " dest))
           (delete-directory dest t)
-        (error "Aborted")))
-    (make-directory dest)
-    (make-directory html-node-dir)
-    (make-directory html-mono-dir)
-    (make-directory ps-dir)
-    ;; Emacs manual
-    (let ((texi (expand-file-name "doc/emacs/emacs.texi" root)))
-      (manual-html-node texi (expand-file-name "emacs" html-node-dir))
-      (manual-html-mono texi (expand-file-name "emacs.html" html-mono-dir))
-      (manual-pdf texi (expand-file-name "emacs.pdf" dest))
-      (manual-ps texi (expand-file-name "emacs.ps" ps-dir)))
-    ;; Lisp manual
-    (let ((texi (expand-file-name "doc/lispref/elisp.texi" root)))
-      (manual-html-node texi (expand-file-name "elisp" html-node-dir))
-      (manual-html-mono texi (expand-file-name "elisp.html" html-mono-dir))
-      (manual-pdf texi (expand-file-name "elisp.pdf" dest))
-      (manual-ps texi (expand-file-name "elisp.ps" ps-dir)))
-    (let ((texi (expand-file-name "doc/lispintro/emacs-lisp-intro.texi" root))
-          (dest (expand-file-name "emacs-lisp-intro" dest))
-          dest2)
-      ;; Mimic the atypical directory layout used for emacs-lisp-intro.
-      (make-directory dest)
-      (make-directory (setq dest2 (expand-file-name "html_node" dest)))
-      (manual-html-node texi dest2)
-      (make-directory (setq dest2 (expand-file-name "html_mono" dest)))
-      (manual-html-mono texi (expand-file-name "emacs-lisp-intro.html" dest2))
-      (manual-pdf texi (expand-file-name "emacs-lisp-intro.pdf" dest))
-      (make-directory (setq dest2 (expand-file-name "ps" dest)))
-      (manual-ps texi (expand-file-name "emacs-lisp-intro.ps" dest2)))
+        (user-error "Aborted")))
+    (if (member type '(nil "emacs" "emacs-node"))
+        (manual-html-node emacs (expand-file-name "emacs" html-node-dir)))
+    (if (member type '(nil "emacs" "emacs-mono"))
+        (manual-html-mono emacs (expand-file-name "emacs.html" html-mono-dir)))
+    (if (member type '(nil "emacs" "emacs-pdf" "pdf"))
+        (manual-pdf emacs (expand-file-name "emacs.pdf" pdf-dir)))
+    (if (member type '(nil "emacs" "emacs-ps" "ps"))
+        (manual-ps emacs (expand-file-name "emacs.ps" ps-dir)))
+    (if (member type '(nil "elisp" "elisp-node"))
+        (manual-html-node elisp (expand-file-name "elisp" html-node-dir)))
+    (if (member type '(nil "elisp" "elisp-mono"))
+        (manual-html-mono elisp (expand-file-name "elisp.html" html-mono-dir)))
+    (if (member type '(nil "elisp" "elisp-pdf" "pdf"))
+        (manual-pdf elisp (expand-file-name "elisp.pdf" pdf-dir)))
+    (if (member type '(nil "elisp" "elisp-ps" "ps"))
+        (manual-ps elisp (expand-file-name "elisp.ps" ps-dir)))
+    (if (member type '(nil "eintr" "eintr-node"))
+        (manual-html-node eintr (expand-file-name "eintr" html-node-dir)))
+    (if (member type '(nil "eintr" "eintr-node"))
+        (manual-html-mono eintr (expand-file-name "eintr.html" html-mono-dir)))
+    (if (member type '(nil "eintr" "eintr-pdf" "pdf"))
+        (manual-pdf eintr (expand-file-name "eintr.pdf" pdf-dir)))
+    (if (member type '(nil "eintr" "eintr-ps" "ps"))
+        (manual-ps eintr (expand-file-name "eintr.ps" ps-dir)))
     ;; Misc manuals
-    (let ((manuals '("ada-mode" "auth" "autotype" "bovine" "calc" "cc-mode"
-                     "cl" "dbus" "dired-x" "ebrowse" "ede" "ediff"
-                     "edt" "eieio" "emacs-gnutls" "emacs-mime" "epa" "erc" "ert"
-                     "eshell" "eudc" "faq" "flymake" "forms"
-                     "gnus" "htmlfontify" "idlwave" "info"
-                     "mairix-el" "message" "mh-e" "newsticker"
-                     "nxml-mode" "org" "pcl-cvs" "pgg" "rcirc"
-                     "reftex" "remember" "sasl" "sc" "semantic"
-                     "ses" "sieve" "smtpmail" "speedbar" "srecode" "tramp"
-                     "url" "vip" "viper" "widget" "wisent" "woman")))
-      (dolist (manual manuals)
-        (manual-misc-html manual root html-node-dir html-mono-dir)))
+    (dolist (manual misc)
+      (if (member type `(nil ,manual "misc"))
+          (manual-misc-html manual root html-node-dir html-mono-dir)))
     (message "Manuals created in %s" dest)))
 
 (defconst manual-doctype-string
@@ -259,10 +283,15 @@ Root must be the root of an Emacs source tree."
 <meta name=\"DC.title\" content=\"gnu.org\">\n\n")
 
 (defconst manual-style-string "<style type=\"text/css\">
-@import url('/s/emacs/manual.css');\n</style>\n")
+@import url('/software/emacs/manual.css');\n</style>\n")
 
 (defun manual-misc-html (name root html-node-dir html-mono-dir)
-  (let ((texi (expand-file-name (format "doc/misc/%s.texi" name) root)))
+  ;; Hack to deal with the cases where .texi creates a different .info.
+  ;; Blech.  TODO Why not just rename the .texi 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))
     (manual-html-mono texi (expand-file-name (concat name ".html")
                                              html-mono-dir))))
@@ -272,6 +301,7 @@ Root must be the root of an Emacs source tree."
 This function also edits the HTML files so that they validate as
 HTML 4.01 Transitional, and pulls in the gnu.org stylesheet using
 the @import directive."
+  (make-directory (or (file-name-directory dest) ".") t)
   (call-process "makeinfo" nil nil nil
                 "-D" "WWW_GNU_ORG"
                 "-I" (expand-file-name "../emacs"
@@ -298,6 +328,7 @@ HTML 4.01 Transitional, and pulls in the gnu.org stylesheet using
 the @import directive."
   (unless (file-exists-p texi-file)
     (error "Manual file %s not found" texi-file))
+  (make-directory dir t)
   (call-process "makeinfo" nil nil nil
                 "-D" "WWW_GNU_ORG"
                 "-I" (expand-file-name "../emacs"
@@ -334,6 +365,7 @@ the @import directive."
 
 (defun manual-pdf (texi-file dest)
   "Run texi2pdf on TEXI-FILE, emitting pdf output to DEST."
+  (make-directory (or (file-name-directory dest) ".") t)
   (let ((default-directory (file-name-directory texi-file)))
     (call-process "texi2pdf" nil nil nil
                   "-I" "../emacs" "-I" "../misc"
@@ -341,6 +373,7 @@ the @import directive."
 
 (defun manual-ps (texi-file dest)
   "Generate a PostScript version of TEXI-FILE as DEST."
+  (make-directory (or (file-name-directory dest) ".") t)
   (let ((dvi-dest (concat (file-name-sans-extension dest) ".dvi"))
         (default-directory (file-name-directory texi-file)))
     (call-process "texi2dvi" nil nil nil
@@ -452,7 +485,8 @@ the @import directive."
         (setq done t))
        (t
         (if (eobp)
-            (error "Parse error in %s" f)) ; f is bound in manual-html-node
+            (error "Parse error in %s"
+                   (file-name-nondirectory buffer-file-name)))
         (unless open-td
           (setq done t))))
       (forward-line 1))))
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index c8bfe0dacc3..82e0cd77fca 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -29,11 +29,11 @@ GNULIB_MODULES='
   alloca-opt c-ctype c-strcase
   careadlinkat close-stream crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512
   dtoastr dtotimespec dup2 environ execinfo faccessat
-  fcntl-h fdatasync fdopendir filemode fstatat fsync
+  fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync
   getloadavg getopt-gnu gettime gettimeofday
-  ignore-value intprops largefile lstat
+  intprops largefile lstat
   manywarnings memrchr mktime
-  pselect pthread_sigmask putenv qacl readlink readlinkat
+  pipe2 pselect pthread_sigmask putenv qacl readlink readlinkat
   sig2str socklen stat-time stdalign stdarg stdbool stdio
   strftime strtoimax strtoumax symlink sys_stat
   sys_time time timer-time timespec-add timespec-sub unsetenv utimens
@@ -41,8 +41,8 @@ GNULIB_MODULES='
 '
 
 GNULIB_TOOL_FLAGS='
-  --avoid=dup
-  --avoid=fchdir --avoid=fcntl --avoid=fstat
+  --avoid=close --avoid=dup
+  --avoid=fchdir --avoid=fstat
   --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow
   --avoid=open --avoid=openat-die --avoid=opendir
   --avoid=raise
diff --git a/admin/notes/changelogs b/admin/notes/changelogs
index ae9ce40aa0a..1025cfc217f 100644
--- a/admin/notes/changelogs
+++ b/admin/notes/changelogs
@@ -3,9 +3,10 @@ entry in their name, not yours.
 
 
 http://lists.gnu.org/archive/html/emacs-devel/2007-09/msg00793.html
-http://lists.gnu.org/archive/html/emacs-devel/2013-06/msg00485.html
-  There is no need to make trivial change log entries for files such
-  as NEWS, MAINTAINERS, and FOR-RELEASE.
+  There is no need to make change log entries for files such as NEWS,
+  MAINTAINERS, and FOR-RELEASE.
+"There is no need" means you don't have to, but you can if you want to.
+
 
 http://lists.gnu.org/archive/html/emacs-devel/2006-12/msg01135.html
   There is no need to indicate regeneration of files such as configure