auto upstream

25 files changed, 414 insertions, 181 deletions

diff --git a/ChangeLog b/ChangeLog
index 6a90eb178f5..9db5d2c3f39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix AIX port (Bug#13650).
+        * configure.ac (DATA_START, DATA_SEG_BITS): Set to 0x20000000 on AIX.
+
 2013-02-12  Eli Zaretskii  <eliz@gnu.org>
 
         * lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/memrchr.$(O).
diff --git a/autogen/configure b/autogen/configure
index 8f58b87ab20..0ba98637fa4 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -15815,6 +15815,12 @@ case $opsys in
 
     ;;
 
+  aix*)
+        $as_echo "#define DATA_START 0x20000000" >>confdefs.h
+
+    $as_echo "#define DATA_SEG_BITS 0x20000000" >>confdefs.h
+
+    ;;
   hpux*)
         $as_echo "#define DATA_START 0x40000000" >>confdefs.h
 
diff --git a/configure.ac b/configure.ac
index ce96ca042ca..146166fbe45 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3811,6 +3811,11 @@ case $opsys in
     AC_DEFINE(DATA_START, [({ extern int data_start; (char *) &data_start; })])
     ;;
 
+  aix*)
+    dnl This works with 32-bit executables; Emacs doesn't support 64-bit.
+    AC_DEFINE(DATA_START, [0x20000000])
+    AC_DEFINE(DATA_SEG_BITS, [0x20000000])
+    ;;
   hpux*)
     dnl The data segment on this machine always starts at address 0x40000000.
     AC_DEFINE(DATA_START, [0x40000000])
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index be1bdfcfa3d..d8a08ee5d3e 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-15  Glenn Morris  <rgm@gnu.org>
+
+        * modes.texi (Basic Major Modes): 'z' no longer bound in special-mode.
+
 2013-02-13  Glenn Morris  <rgm@gnu.org>
 
         * objects.texi (Char-Table Type): Add footnote about #^^.
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 5f1eb8619ee..7d42d2591d6 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -905,9 +905,8 @@ modes derived from Special mode are given a @code{mode-class} property
 of @code{special} (@pxref{Major Mode Conventions}).
 
 Special mode sets the buffer to read-only.  Its keymap defines several
-common bindings, including @kbd{q} for @code{quit-window}, @kbd{z} for
-@code{kill-this-buffer}, and @kbd{g} for @code{revert-buffer}
-(@pxref{Reverting}).
+common bindings, including @kbd{q} for @code{quit-window} and @kbd{g}
+for @code{revert-buffer} (@pxref{Reverting}).
 
 An example of a major mode derived from Special mode is Buffer Menu
 mode, which is used by the @file{*Buffer List*} buffer.  @xref{List
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5a752fe0c3a..99704a0b532 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,55 @@
+2013-02-15  Alan Mackenzie  <acm@muc.de>
+
+        * emacs-lisp/easy-mmode.el (define-globalized-minor-mode): When a
+        global minor mode has been enabled, call the minor mode function
+        for a new buffer once only, after the major mode hook, whilst
+        allowing that hook explicitly to disable the minor mode.
+        (MODE-disable-in-buffer): new (generated) function.
+        (disable-MODE): new (generated) buffer local variable.
+
+2013-02-15  Jambunathan K  <kjambunathan@gmail.com>
+
+        * iswitchb.el (iswitchb-read-buffer): Bind `C-.' and `C-,' to
+        `iswitchb-next-match' and `iswitchb-prev-match' resply.
+
+        * ido.el (ido-init-completion-maps): Bind `C-.' and `C-,' to
+        `ido-next-match' and `ido-prev-match' resply.
+
+        * icomplete.el (icomplete-minibuffer-map): Unbind `C-s' and `C-r'.
+        Bind `C-.' and `C-,' to `icomplete-forward-completions' and
+        `icomplete-backward-completions' (Bug#13708).
+
+2013-02-15  Michael Albinus  <michael.albinus@gmx.de>
+
+        * emacs-lisp/easy-mmode.el (define-minor-mode): Doc fix.
+
+2013-02-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * net/goto-addr.el (goto-address-fontify): Add start and end args.
+        (goto-address-fontify-region): Use them instead of narrowing, so
+        syntax-ppss has access to the whole buffer.
+
+2013-02-15  Fabián Ezequiel Gallina  <fgallina@cuca>
+
+        * progmodes/python.el: Explain how to restore "cc-mode"-like
+        forward-sexp movement in header documentation (Bug#13642).
+        (python-nav--forward-sexp): Behave like emacs-lisp-mode in
+        comments and strings (GH bug 114).
+
+2013-02-15  Fabián Ezequiel Gallina  <fgallina@cuca>
+
+        * progmodes/python.el (python-info-current-defun): Fix current
+        defun detection (Bug#13618).
+
+2013-02-15  Chong Yidong  <cyd@gnu.org>
+
+        * xml.el (xml-parse-string): Fix typo in handling of bad character
+        references.
+
+2013-02-15  Glenn Morris  <rgm@gnu.org>
+
+        * play/fortune.el (fortune-compile): Simplify and fix previous change.
+
 2013-02-14  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/tramp.el (tramp-debug-message): Add
diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index 9173d148c6a..2088e690228 100644
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -132,13 +132,14 @@ BODY contains code to execute each time the mode is enabled or disabled.
 :require SYM    Same as in `defcustom'.
 :variable PLACE The location to use instead of the variable MODE to store
                 the state of the mode.  This can be simply a different
-                named variable, or more generally anything that can be used
-                with the CL macro `setf'.  PLACE can also be of the form
-                \(GET . SET), where GET is an expression that returns the
-                current state, and SET is a function that takes one argument,
-                the new state, and sets it.  If you specify a :variable,
-                this function does not define a MODE variable (nor any of
-                the terms used in :variable).
+                named variable, or a generalized variable.
+                PLACE can also be of the form \(GET . SET), where GET is
+                an expression that returns the current state, and SET is
+                a function that takes one argument, the new state, and
+                sets it.  If you specify a :variable, this function does
+                not define a MODE variable (nor any of the terms used
+                in :variable).
+
 :after-hook     A single lisp form which is evaluated after the mode hooks
                 have been run.  It should not be quoted.
 
@@ -340,9 +341,14 @@ If MODE's set-up depends on the major mode in effect when it was
 enabled, then disabling and reenabling MODE should make MODE work
 correctly with the current major mode.  This is important to
 prevent problems with derived modes, that is, major modes that
-call another major mode in their body."
+call another major mode in their body.
+
+When a major mode is initialized, MODE is actually turned on just
+after running the major mode's hook.  However, MODE is not turned
+on if the hook has explicitly disabled it."
   (declare (doc-string 2))
   (let* ((global-mode-name (symbol-name global-mode))
+         (mode-name (symbol-name mode))
          (pretty-name (easy-mmode-pretty-mode-name mode))
          (pretty-global-name (easy-mmode-pretty-mode-name global-mode))
          (group nil)
@@ -353,6 +359,10 @@ call another major mode in their body."
          (MODE-check-buffers
           (intern (concat global-mode-name "-check-buffers")))
          (MODE-cmhh (intern (concat global-mode-name "-cmhh")))
+         (MODE-disable-in-buffer
+          (intern (concat global-mode-name "-disable-in-buffer")))
+         (minor-MODE-hook (intern (concat mode-name "-hook")))
+         (disable-MODE (intern (concat "disable-" mode-name)))
          (MODE-major-mode (intern (concat (symbol-name mode) "-major-mode")))
          keyw)
 
@@ -396,8 +406,6 @@ See `%s' for more information on %s."
              (progn
                (add-hook 'after-change-major-mode-hook
                          ',MODE-enable-in-buffers)
-               (add-hook 'change-major-mode-after-body-hook
-                         ',MODE-enable-in-buffers)
                (add-hook 'find-file-hook ',MODE-check-buffers)
                (add-hook 'change-major-mode-hook ',MODE-cmhh))
            (remove-hook 'after-change-major-mode-hook ',MODE-enable-in-buffers)
@@ -415,6 +423,10 @@ See `%s' for more information on %s."
        ;; up-to-here.
        :autoload-end
 
+       ;; A function which checks whether MODE has been disabled in the major
+       ;; mode hook which has just been run.
+       (add-hook ',minor-MODE-hook ',MODE-disable-in-buffer)
+
        ;; List of buffers left to process.
        (defvar ,MODE-buffers nil)
 
@@ -423,14 +435,15 @@ See `%s' for more information on %s."
          (dolist (buf ,MODE-buffers)
            (when (buffer-live-p buf)
              (with-current-buffer buf
-               (unless (eq ,MODE-major-mode major-mode)
-                 (if ,mode
-                     (progn
-                       (,mode -1)
-                       (,turn-on)
-                       (setq ,MODE-major-mode major-mode))
-                   (,turn-on)
-                   (setq ,MODE-major-mode major-mode)))))))
+               (if ,disable-MODE
+                   (if ,mode (,mode -1))
+                 (unless (eq ,MODE-major-mode major-mode)
+                   (if ,mode
+                       (progn
+                         (,mode -1)
+                         (,turn-on))
+                     (,turn-on))))
+               (setq ,MODE-major-mode major-mode)))))
        (put ',MODE-enable-in-buffers 'definition-name ',global-mode)
 
        (defun ,MODE-check-buffers ()
@@ -443,7 +456,14 @@ See `%s' for more information on %s."
        (defun ,MODE-cmhh ()
          (add-to-list ',MODE-buffers (current-buffer))
          (add-hook 'post-command-hook ',MODE-check-buffers))
-       (put ',MODE-cmhh 'definition-name ',global-mode))))
+       (put ',MODE-cmhh 'definition-name ',global-mode)
+       ;; disable-MODE is set in MODE-disable-in-buffer and cleared by
+       ;; kill-all-local-variables.
+       (defvar-local ,disable-MODE nil)
+       (defun ,MODE-disable-in-buffer ()
+         (unless ,mode
+           (setq ,disable-MODE t)))
+       (put ',MODE-disable-in-buffer 'definition-name ',global-mode))))
 
 ;;;
 ;;; easy-mmode-defmap
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 1f9b4a3afe6..73049df097d 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -168,8 +168,8 @@ except those on this list.")
   (let ((map (make-sparse-keymap)))
     (define-key map [?\M-\t] 'minibuffer-force-complete)
     (define-key map [?\C-j]  'minibuffer-force-complete-and-exit)
-    (define-key map [?\C-s]  'icomplete-forward-completions)
-    (define-key map [?\C-r]  'icomplete-backward-completions)
+    (define-key map [?\C-.]  'icomplete-forward-completions)
+    (define-key map [?\C-,]  'icomplete-backward-completions)
     map))
 
 (defun icomplete-forward-completions ()
diff --git a/lisp/ido.el b/lisp/ido.el
index 008561aa268..066d8276af5 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -1585,6 +1585,8 @@ This function also adds a hook to the minibuffer."
     (define-key map "\C-p" 'ido-toggle-prefix)
     (define-key map "\C-r" 'ido-prev-match)
     (define-key map "\C-s" 'ido-next-match)
+    (define-key map [?\C-.] 'ido-next-match)
+    (define-key map [?\C-,] 'ido-prev-match)
     (define-key map "\C-t" 'ido-toggle-regexp)
     (define-key map "\C-z" 'ido-undo-merge-work-directory)
     (define-key map [(control ?\s)] 'ido-restrict-to-matches)
diff --git a/lisp/iswitchb.el b/lisp/iswitchb.el
index 93d589c7706..68749f1b012 100644
--- a/lisp/iswitchb.el
+++ b/lisp/iswitchb.el
@@ -471,6 +471,8 @@ interfere with other minibuffer usage.")
     (define-key map "?" 'iswitchb-completion-help)
     (define-key map "\C-s" 'iswitchb-next-match)
     (define-key map "\C-r" 'iswitchb-prev-match)
+    (define-key map [?\C-.] 'iswitchb-next-match)
+    (define-key map [?\C-,] 'iswitchb-prev-match)
     (define-key map "\t" 'iswitchb-complete)
     (define-key map "\C-j" 'iswitchb-select-buffer-text)
     (define-key map "\C-t" 'iswitchb-toggle-regexp)
diff --git a/lisp/net/goto-addr.el b/lisp/net/goto-addr.el
index 1005285917e..59e4da16619 100644
--- a/lisp/net/goto-addr.el
+++ b/lisp/net/goto-addr.el
@@ -156,18 +156,19 @@ A value of t means there is no limit--fontify regardless of the size."
 
 (defvar goto-address-prog-mode)
 
-(defun goto-address-fontify ()
+(defun goto-address-fontify (&optional start end)
   "Fontify the URLs and e-mail addresses in the current buffer.
 This function implements `goto-address-highlight-p'
 and `goto-address-fontify-p'."
   ;; Clean up from any previous go.
-  (goto-address-unfontify (point-min) (point-max))
+  (goto-address-unfontify (or start (point-min)) (or end (point-max)))
   (save-excursion
     (let ((inhibit-point-motion-hooks t))
-      (goto-char (point-min))
+      (goto-char (or start (point-min)))
       (when (or (eq t goto-address-fontify-maximum-size)
-                (< (- (point-max) (point)) goto-address-fontify-maximum-size))
-        (while (re-search-forward goto-address-url-regexp nil t)
+                (< (- (or end (point-max)) (point))
+                   goto-address-fontify-maximum-size))
+        (while (re-search-forward goto-address-url-regexp end t)
           (let* ((s (match-beginning 0))
                  (e (match-end 0))
                  this-overlay)
@@ -187,8 +188,8 @@ and `goto-address-fontify-p'."
               (overlay-put this-overlay
                            'keymap goto-address-highlight-keymap)
               (overlay-put this-overlay 'goto-address t))))
-        (goto-char (point-min))
-        (while (re-search-forward goto-address-mail-regexp nil t)
+        (goto-char (or start (point-min)))
+        (while (re-search-forward goto-address-mail-regexp end t)
           (let* ((s (match-beginning 0))
                  (e (match-end 0))
                  this-overlay)
@@ -212,11 +213,9 @@ and `goto-address-fontify-p'."
 (defun goto-address-fontify-region (start end)
   "Fontify URLs and e-mail addresses in the given region."
   (save-excursion
-    (save-restriction
-      (let ((beg-line (progn (goto-char start) (line-beginning-position)))
-            (end-line (progn (goto-char end) (line-end-position))))
-        (narrow-to-region beg-line end-line)
-        (goto-address-fontify)))))
+    (let ((beg-line (progn (goto-char start) (line-beginning-position)))
+          (end-line (progn (goto-char end) (line-end-position))))
+      (goto-address-fontify beg-line end-line))))
 
 ;; code to find and goto addresses; much of this has been blatantly
 ;; snarfed from browse-url.el
diff --git a/lisp/play/fortune.el b/lisp/play/fortune.el
index 0920012b280..cb58c0d0af0 100644
--- a/lisp/play/fortune.el
+++ b/lisp/play/fortune.el
@@ -244,17 +244,14 @@ the value of `fortune-file'.  This currently cannot handle directories."
   (let* ((fortune-file (expand-file-name (substitute-in-file-name file)))
          (fortune-dat (expand-file-name
                        (substitute-in-file-name
-                        (concat fortune-file fortune-database-extension))))
-         (fortune-dat-exist (file-exists-p fortune-dat)))
-    (cond ((file-exists-p fortune-file)
-           (if (or (not fortune-dat-exist)
-                   (and fortune-dat-exist
-                        (file-newer-than-file-p fortune-file fortune-dat)))
-               (message "Compiling new fortune database %s" fortune-dat)
-             (shell-command
-              (concat fortune-strfile fortune-strfile-options
-                      " " fortune-file fortune-quiet-strfile-options))))
-          (t (error "Can't compile fortune file %s" fortune-file)))))
+                        (concat fortune-file fortune-database-extension)))))
+  (cond ((file-exists-p fortune-file)
+         (cond ((file-newer-than-file-p fortune-file fortune-dat)
+                (message "Compiling new fortune database %s" fortune-dat)
+                (shell-command
+                 (concat fortune-strfile fortune-strfile-options
+                         " " fortune-file fortune-quiet-strfile-options)))))
+        (t (error "Can't compile fortune file %s" fortune-file)))))
 
 
 ;;; **************
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 35c5ba19e33..eadb06fa61e 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -54,8 +54,13 @@
 ;; `python-nav-beginning-of-statement', `python-nav-end-of-statement',
 ;; `python-nav-beginning-of-block' and `python-nav-end-of-block' are
 ;; included but no bound to any key.  At last but not least the
-;; specialized `python-nav-forward-sexp' allows easy
-;; navigation between code blocks.
+;; specialized `python-nav-forward-sexp' allows easy navigation
+;; between code blocks.  If you prefer `cc-mode'-like `forward-sexp'
+;; movement, setting `forward-sexp-function' to nil is enough, You can
+;; do that using the `python-mode-hook':
+
+;; (add-hook 'python-mode-hook
+;;           (lambda () (setq forward-sexp-function nil)))
 
 ;; Shell interaction: is provided and allows you to execute easily any
 ;; block of code of your current buffer in an inferior Python process.
@@ -1349,13 +1354,10 @@ backwards."
                            're-search-backward))
            (context-type (python-syntax-context-type)))
       (cond
-       ((eq context-type 'string)
+       ((memq context-type '(string comment))
         ;; Inside of a string, get out of it.
-        (while (and (funcall re-search-fn "[\"']" nil t)
-                    (python-syntax-context 'string))))
-       ((eq context-type 'comment)
-        ;; Inside of a comment, just move forward.
-        (python-util-forward-comment dir))
+        (let ((forward-sexp-function))
+          (forward-sexp dir)))
        ((or (eq context-type 'paren)
             (and forward-p (looking-at (python-rx open-paren)))
             (and (not forward-p)
@@ -1378,16 +1380,16 @@ backwards."
                 (save-excursion
                   (python-nav-lisp-forward-sexp-safe dir)
                   (point)))
-              (next-sexp-context
-               (save-excursion
-                 (goto-char next-sexp-pos)
-                 (cond
-                  ((python-info-beginning-of-block-p) 'block-start)
-                  ((python-info-end-of-block-p) 'block-end)
-                  ((python-info-beginning-of-statement-p) 'statement-start)
-                  ((python-info-end-of-statement-p) 'statement-end)
-                  ((python-info-statement-starts-block-p) 'starts-block)
-                  ((python-info-statement-ends-block-p) 'ends-block)))))
+               (next-sexp-context
+                (save-excursion
+                  (goto-char next-sexp-pos)
+                  (cond
+                   ((python-info-beginning-of-block-p) 'block-start)
+                   ((python-info-end-of-block-p) 'block-end)
+                   ((python-info-beginning-of-statement-p) 'statement-start)
+                   ((python-info-end-of-statement-p) 'statement-end)
+                   ((python-info-statement-starts-block-p) 'starts-block)
+                   ((python-info-statement-ends-block-p) 'ends-block)))))
           (if forward-p
               (cond ((and (not (eobp))
                           (python-info-current-line-empty-p))
@@ -1411,8 +1413,8 @@ backwards."
                     (t (goto-char next-sexp-pos)))
             (cond ((and (not (bobp))
                         (python-info-current-line-empty-p))
-                     (python-util-forward-comment dir)
-                     (python-nav--forward-sexp dir))
+                   (python-util-forward-comment dir)
+                   (python-nav--forward-sexp dir))
                   ((eq context 'block-end)
                    (python-nav-beginning-of-block))
                   ((eq context 'statement-end)
@@ -2946,40 +2948,61 @@ Optional argument INCLUDE-TYPE indicates to include the type of the defun.
 This function is compatible to be used as
 `add-log-current-defun-function' since it returns nil if point is
 not inside a defun."
-    (save-restriction
-      (widen)
-      (save-excursion
-        (end-of-line 1)
-        (let ((names)
-              (starting-indentation
-               (save-excursion
-                 (and
-                  (python-nav-beginning-of-defun 1)
-                  ;; This extra number is just for checking code
-                  ;; against indentation to work well on first run.
-                  (+ (current-indentation) 4))))
-              (starting-point (point)))
-          ;; Check point is inside a defun.
-          (when (and starting-indentation
-                     (< starting-point
+  (save-restriction
+    (widen)
+    (save-excursion
+      (end-of-line 1)
+      (let ((names)
+            (starting-indentation (current-indentation))
+            (starting-pos (point))
+            (first-run t)
+            (last-indent)
+            (type))
+        (catch 'exit
+          (while (python-nav-beginning-of-defun 1)
+            (when (and
+                   (or (not last-indent)
+                       (< (current-indentation) last-indent))
+                   (or
+                    (and first-run
                          (save-excursion
-                           (python-nav-end-of-defun)
-                           (point))))
-            (catch 'exit
-              (while (python-nav-beginning-of-defun 1)
-                (when (< (current-indentation) starting-indentation)
-                  (setq starting-indentation (current-indentation))
-                  (setq names
-                        (cons
-                         (if (not include-type)
-                             (match-string-no-properties 1)
-                           (mapconcat 'identity
-                                      (split-string
-                                       (match-string-no-properties 0)) " "))
-                         names)))
-                (and (= (current-indentation) 0) (throw 'exit t)))))
-          (and names
-               (mapconcat (lambda (string) string) names "."))))))
+                           ;; If this is the first run, we may add
+                           ;; the current defun at point.
+                           (setq first-run nil)
+                           (goto-char starting-pos)
+                           (python-nav-beginning-of-statement)
+                           (beginning-of-line 1)
+                           (looking-at-p
+                            python-nav-beginning-of-defun-regexp)))
+                    (< starting-pos
+                       (save-excursion
+                         (let ((min-indent
+                                (+ (current-indentation)
+                                   python-indent-offset)))
+                           (if (< starting-indentation  min-indent)
+                               ;; If the starting indentation is not
+                               ;; within the min defun indent make the
+                               ;; check fail.
+                               starting-pos
+                             ;; Else go to the end of defun and add
+                             ;; up the current indentation to the
+                             ;; ending position.
+                             (python-nav-end-of-defun)
+                             (+ (point)
+                                (if (>= (current-indentation) min-indent)
+                                    (1+ (current-indentation))
+                                  0))))))))
+              (setq last-indent (current-indentation))
+              (if (or (not include-type) type)
+                  (setq names (cons (match-string-no-properties 1) names))
+                (let ((match (split-string (match-string-no-properties 0))))
+                  (setq type (car match))
+                  (setq names (cons (cadr match) names)))))
+            ;; Stop searching ASAP.
+            (and (= (current-indentation) 0) (throw 'exit t))))
+        (and names
+             (concat (and type (format "%s " type))
+                     (mapconcat 'identity names ".")))))))
 
 (defun python-info-current-symbol (&optional replace-self)
   "Return current symbol using dotty syntax.
diff --git a/lisp/xml.el b/lisp/xml.el
index 2232746f02a..a3d34670bfb 100644
--- a/lisp/xml.el
+++ b/lisp/xml.el
@@ -611,7 +611,7 @@ references."
                    xml-validating-parser
                    (error "XML: (Validity) Invalid character reference `%s'"
                           (match-string 0)))
-              (replace-match (or (string val) xml-undefined-entity) t t))
+              (replace-match (if val (string val) xml-undefined-entity) t t))
           ;; For an entity reference, search again from the start of
           ;; the replaced text, since the replacement can contain
           ;; entity or character references, or markup.
@@ -620,7 +620,7 @@ references."
           (and (null val)
                xml-validating-parser
                (error "XML: (Validity) Undefined entity `%s'" ref))
-          (replace-match (cdr val) t t)
+          (replace-match (or (cdr val) xml-undefined-entity) t t)
           (goto-char (match-beginning 0)))
         ;; Check for XML bombs.
         (and xml-entity-expansion-limit
diff --git a/src/ChangeLog b/src/ChangeLog
index 8b1c429e406..6ff25edac50 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,59 @@
+2013-02-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * process.c (h_errno) [!HAVE_H_ERRNO]: Remove unused decl.
+
+2013-02-15  Eli Zaretskii  <eliz@gnu.org>
+
+        * keyboard.c (read_char): Fix calculation of auto-save time out
+        when auto-save-timeout is less than 4.  (Bug#13720)
+
+        * w32proc.c (new_child): Free up to 2 slots of dead processes at a
+        time.  Improve diagnostics in DebPrint.  (Bug#13546)
+
+        * w32.c (sys_socket, sys_bind, sys_connect, sys_gethostname)
+        (sys_gethostbyname, sys_getservbyname, sys_getpeername)
+        (sys_shutdown, sys_setsockopt, sys_listen, sys_getsockname)
+        (sys_accept, sys_recvfrom, sys_sendto, fcntl): In case of failure,
+        make sure errno is set to an appropriate value.  (Bug#13546)
+        (socket_to_fd): Add assertion against indexing fd_info[] with a
+        value that is out of bounds.
+        (sys_accept): If fd is negative, do not set up the child_process
+        structure for reading.
+
+2013-02-15  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * composite.c (fill_gstring_header): Remove useless prototype.
+        Break long line.
+        * lisp.h (message_dolog, compile_pattern): Adjust prototype.
+        * print.c (PRINTDECLARE, print_object):
+        * search.c (compile_pattern, fast_looking_at, search_buffer):
+        (simple_search, boyer_moore, Freplace_match):
+        * xdisp.c (c_string_pos, number_of_chars, message_dolog):
+        (get_overlay_arrow_glyph_row, display_mode_element):
+        (decode_mode_spec_coding, message3):
+        * xfaces.c (face_at_string_position): Use bool for booleans.
+        Adjust comments.
+
+2013-02-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix AIX port (Bug#13650).
+        * lisp.h (XPNTR) [!USE_LSB_TAG && DATA_SEG_BITS]:
+        Fix bug introduced in 2012-07-27 change.  DATA_SEG_BITS, if set,
+        was #undeffed earlier, so it cannot be used as a macro here.
+        Use the constant and not the macro.
+
+2013-02-15  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32proc.c (new_child): If no vacant slots are found in
+        child_procs[], make another pass looking for slots whose process
+        has exited or died.  (Bug#13546)
+
+        * w32.c (sys_pipe): When failing due to file descriptors above
+        MAXDESC, set errno to EMFILE.
+        (_sys_read_ahead): Update cp->status when failing to read serial
+        communications input, so that the status doesn't stay at
+        STATUS_READ_IN_PROGRESS.  (Bug#13546)
+
 2013-02-14  Jan Djärv  <jan.h.d@swipnet.se>
 
         * gtkutil.c (tb_size_cb): New function.
diff --git a/src/composite.c b/src/composite.c
index 9bbd4550c7b..2da98cfc36c 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -698,10 +698,6 @@ composition_gstring_from_id (ptrdiff_t id)
   return HASH_VALUE (h, id);
 }
 
-static Lisp_Object fill_gstring_header (Lisp_Object, Lisp_Object,
-                                        Lisp_Object, Lisp_Object,
-                                        Lisp_Object);
-
 bool
 composition_gstring_p (Lisp_Object gstring)
 {
@@ -791,7 +787,8 @@ static Lisp_Object gstring_work;
 static Lisp_Object gstring_work_headers;
 
 static Lisp_Object
-fill_gstring_header (Lisp_Object header, Lisp_Object start, Lisp_Object end, Lisp_Object font_object, Lisp_Object string)
+fill_gstring_header (Lisp_Object header, Lisp_Object start, Lisp_Object end,
+                     Lisp_Object font_object, Lisp_Object string)
 {
   ptrdiff_t from, to, from_byte;
   ptrdiff_t len, i;
diff --git a/src/keyboard.c b/src/keyboard.c
index 5cd7e8473d2..0d60dc8929d 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2660,9 +2660,10 @@ read_char (int commandflag, Lisp_Object map,
           && XINT (Vauto_save_timeout) > 0)
         {
           Lisp_Object tem0;
-          EMACS_INT timeout = (delay_level
-                               * min (XFASTINT (Vauto_save_timeout) / 4,
-                                      MOST_POSITIVE_FIXNUM / delay_level));
+          EMACS_INT timeout = XFASTINT (Vauto_save_timeout);
+
+          timeout = min (timeout, MOST_POSITIVE_FIXNUM / delay_level * 4);
+          timeout = delay_level * timeout / 4;
           save_getcjmp (save_jump);
           restore_getcjmp (local_getcjmp);
           tem0 = sit_for (make_number (timeout), 1, 1);
diff --git a/src/lisp.h b/src/lisp.h
index 154f1ec5e5f..c023d5b4892 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -510,13 +510,9 @@ static EMACS_INT const VALMASK
   (XIL ((EMACS_INT) ((EMACS_UINT) (type) << VALBITS)  \
         + ((intptr_t) (ptr) & VALMASK)))
 
-#if DATA_SEG_BITS
 /* DATA_SEG_BITS forces extra bits to be or'd in with any pointers
    which were stored in a Lisp_Object.  */
 #define XPNTR(a) ((uintptr_t) ((XLI (a) & VALMASK)) | DATA_SEG_BITS))
-#else
-#define XPNTR(a) ((uintptr_t) (XLI (a) & VALMASK))
-#endif
 
 #endif /* not USE_LSB_TAG */
 
@@ -2962,7 +2958,7 @@ extern void message1 (const char *);
 extern void message1_nolog (const char *);
 extern void message3 (Lisp_Object);
 extern void message3_nolog (Lisp_Object);
-extern void message_dolog (const char *, ptrdiff_t, int, int);
+extern void message_dolog (const char *, ptrdiff_t, bool, bool);
 extern void message_with_string (const char *, Lisp_Object, int);
 extern void message_log_maybe_newline (void);
 extern void update_echo_area (void);
@@ -3344,7 +3340,7 @@ extern void record_unwind_save_match_data (void);
 struct re_registers;
 extern struct re_pattern_buffer *compile_pattern (Lisp_Object,
                                                   struct re_registers *,
-                                                  Lisp_Object, int, int);
+                                                  Lisp_Object, int, bool);
 extern ptrdiff_t fast_string_match (Lisp_Object, Lisp_Object);
 extern ptrdiff_t fast_c_string_match_ignore_case (Lisp_Object, const char *,
                                                   ptrdiff_t);
diff --git a/src/print.c b/src/print.c
index f5f8450545d..9a84903e306 100644
--- a/src/print.c
+++ b/src/print.c
@@ -104,7 +104,8 @@ int print_output_debug_flag EXTERNALLY_VISIBLE = 1;
    ptrdiff_t old_point_byte = -1, start_point_byte = -1;                \
    ptrdiff_t specpdl_count = SPECPDL_INDEX ();                          \
    int free_print_buffer = 0;                                           \
-   int multibyte = !NILP (BVAR (current_buffer, enable_multibyte_characters));  \
+   bool multibyte                                                       \
+     = !NILP (BVAR (current_buffer, enable_multibyte_characters));      \
    Lisp_Object original
 
 #define PRINTPREPARE                                                    \
@@ -1398,7 +1399,7 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
           /* 1 means we must ensure that the next character we output
              cannot be taken as part of a hex character escape.  */
           int need_nonhex = 0;
-          int multibyte = STRING_MULTIBYTE (obj);
+          bool multibyte = STRING_MULTIBYTE (obj);
 
           GCPRO1 (obj);
 
diff --git a/src/process.c b/src/process.c
index f210065b98e..9d6e8c097a1 100644
--- a/src/process.c
+++ b/src/process.c
@@ -180,10 +180,6 @@ static Lisp_Object Qlast_nonmenu_event;
 #define SERIALCONN_P(p) (EQ (XPROCESS (p)->type, Qserial))
 #define SERIALCONN1_P(p) (EQ (p->type, Qserial))
 
-#ifndef HAVE_H_ERRNO
-extern int h_errno;
-#endif
-
 /* Number of events of change of status of a process.  */
 static EMACS_INT process_tick;
 /* Number of events for which the user or sentinel has been notified.  */
@@ -5567,7 +5563,7 @@ Output from processes can arrive in between bunches.  */)
   if (XINT (start) < GPT && XINT (end) > GPT)
     move_gap_both (XINT (start), start_byte);
 
-  send_process (proc, (char *) BYTE_POS_ADDR (start_byte), 
+  send_process (proc, (char *) BYTE_POS_ADDR (start_byte),
                 end_byte - start_byte, Fcurrent_buffer ());
 
   return Qnil;
diff --git a/src/search.c b/src/search.c
index c25d2441018..d4508004bf6 100644
--- a/src/search.c
+++ b/src/search.c
@@ -209,7 +209,8 @@ clear_regexp_cache (void)
    for this pattern.  0 means backtrack only enough to get a valid match.  */
 
 struct re_pattern_buffer *
-compile_pattern (Lisp_Object pattern, struct re_registers *regp, Lisp_Object translate, int posix, int multibyte)
+compile_pattern (Lisp_Object pattern, struct re_registers *regp,
+                 Lisp_Object translate, int posix, bool multibyte)
 {
   struct regexp_cache *cp, **cpp;
 
@@ -534,9 +535,10 @@ fast_string_match_ignore_case (Lisp_Object regexp, Lisp_Object string)
    data.  */
 
 ptrdiff_t
-fast_looking_at (Lisp_Object regexp, ptrdiff_t pos, ptrdiff_t pos_byte, ptrdiff_t limit, ptrdiff_t limit_byte, Lisp_Object string)
+fast_looking_at (Lisp_Object regexp, ptrdiff_t pos, ptrdiff_t pos_byte,
+                 ptrdiff_t limit, ptrdiff_t limit_byte, Lisp_Object string)
 {
-  int multibyte;
+  bool multibyte;
   struct re_pattern_buffer *buf;
   unsigned char *p1, *p2;
   ptrdiff_t s1, s2;
@@ -1248,7 +1250,7 @@ search_buffer (Lisp_Object string, ptrdiff_t pos, ptrdiff_t pos_byte,
       ptrdiff_t raw_pattern_size;
       ptrdiff_t raw_pattern_size_byte;
       unsigned char *patbuf;
-      int multibyte = !NILP (BVAR (current_buffer, enable_multibyte_characters));
+      bool multibyte = !NILP (BVAR (current_buffer, enable_multibyte_characters));
       unsigned char *base_pat;
       /* Set to positive if we find a non-ASCII char that need
          translation.  Otherwise set to zero later.  */
@@ -1461,8 +1463,8 @@ simple_search (EMACS_INT n, unsigned char *pat,
                ptrdiff_t pos, ptrdiff_t pos_byte,
                ptrdiff_t lim, ptrdiff_t lim_byte)
 {
-  int multibyte = ! NILP (BVAR (current_buffer, enable_multibyte_characters));
-  int forward = n > 0;
+  bool multibyte = ! NILP (BVAR (current_buffer, enable_multibyte_characters));
+  bool forward = n > 0;
   /* Number of buffer bytes matched.  Note that this may be different
      from len_byte in a multibyte buffer.  */
   ptrdiff_t match_byte = PTRDIFF_MIN;
@@ -1681,7 +1683,7 @@ boyer_moore (EMACS_INT n, unsigned char *base_pat,
   register ptrdiff_t i;
   register int j;
   unsigned char *pat, *pat_end;
-  int multibyte = ! NILP (BVAR (current_buffer, enable_multibyte_characters));
+  bool multibyte = ! NILP (BVAR (current_buffer, enable_multibyte_characters));
 
   unsigned char simple_translate[0400];
   /* These are set to the preceding bytes of a byte to be translated
@@ -2507,8 +2509,8 @@ since only regular expressions have distinguished subexpressions.  */)
       ptrdiff_t length = SBYTES (newtext);
       unsigned char *substed;
       ptrdiff_t substed_alloc_size, substed_len;
-      int buf_multibyte = !NILP (BVAR (current_buffer, enable_multibyte_characters));
-      int str_multibyte = STRING_MULTIBYTE (newtext);
+      bool buf_multibyte = !NILP (BVAR (current_buffer, enable_multibyte_characters));
+      bool str_multibyte = STRING_MULTIBYTE (newtext);
       int really_changed = 0;
 
       substed_alloc_size = ((STRING_BYTES_BOUND - 100) / 2 < length
diff --git a/src/w32.c b/src/w32.c
index 8b89bd3e660..25cc2185793 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -6232,7 +6232,7 @@ sys_socket (int af, int type, int protocol)
 
   if (winsock_lib == NULL)
     {
-      h_errno = ENETDOWN;
+      errno = h_errno = ENETDOWN;
       return INVALID_SOCKET;
     }
 
@@ -6242,7 +6242,13 @@ sys_socket (int af, int type, int protocol)
   s = pfn_socket (af, type, protocol);
 
   if (s != INVALID_SOCKET)
-    return socket_to_fd (s);
+    {
+      int retval = socket_to_fd (s);
+
+      if (retval == -1)
+        errno = h_errno;
+      return retval;
+    }
 
   set_errno ();
   return -1;
@@ -6309,6 +6315,7 @@ socket_to_fd (SOCKET s)
               }
           }
       }
+      eassert (fd < MAXDESC);
       fd_info[fd].hnd = (HANDLE) s;
 
       /* set our own internal flags */
@@ -6347,7 +6354,7 @@ sys_bind (int s, const struct sockaddr * addr, int namelen)
 {
   if (winsock_lib == NULL)
     {
-      h_errno = ENOTSOCK;
+      errno = h_errno = ENOTSOCK;
       return SOCKET_ERROR;
     }
 
@@ -6359,7 +6366,7 @@ sys_bind (int s, const struct sockaddr * addr, int namelen)
         set_errno ();
       return rc;
     }
-  h_errno = ENOTSOCK;
+  errno = h_errno = ENOTSOCK;
   return SOCKET_ERROR;
 }
 
@@ -6368,7 +6375,7 @@ sys_connect (int s, const struct sockaddr * name, int namelen)
 {
   if (winsock_lib == NULL)
     {
-      h_errno = ENOTSOCK;
+      errno = h_errno = ENOTSOCK;
       return SOCKET_ERROR;
     }
 
@@ -6380,7 +6387,7 @@ sys_connect (int s, const struct sockaddr * name, int namelen)
         set_errno ();
       return rc;
     }
-  h_errno = ENOTSOCK;
+  errno = h_errno = ENOTSOCK;
   return SOCKET_ERROR;
 }
 
@@ -6414,7 +6421,7 @@ sys_gethostname (char * name, int namelen)
   if (namelen > MAX_COMPUTERNAME_LENGTH)
     return !GetComputerName (name, (DWORD *)&namelen);
 
-  h_errno = EFAULT;
+  errno = h_errno = EFAULT;
   return SOCKET_ERROR;
 }
 
@@ -6425,7 +6432,7 @@ sys_gethostbyname (const char * name)
 
   if (winsock_lib == NULL)
     {
-      h_errno = ENETDOWN;
+      errno = h_errno = ENETDOWN;
       return NULL;
     }
 
@@ -6443,7 +6450,7 @@ sys_getservbyname (const char * name, const char * proto)
 
   if (winsock_lib == NULL)
     {
-      h_errno = ENETDOWN;
+      errno = h_errno = ENETDOWN;
       return NULL;
     }
 
@@ -6459,7 +6466,7 @@ sys_getpeername (int s, struct sockaddr *addr, int * namelen)
 {
   if (winsock_lib == NULL)
     {
-      h_errno = ENETDOWN;
+      errno = h_errno = ENETDOWN;
       return SOCKET_ERROR;
     }
 
@@ -6471,7 +6478,7 @@ sys_getpeername (int s, struct sockaddr *addr, int * namelen)
         set_errno ();
       return rc;
     }
-  h_errno = ENOTSOCK;
+  errno = h_errno = ENOTSOCK;
   return SOCKET_ERROR;
 }
 
@@ -6480,7 +6487,7 @@ sys_shutdown (int s, int how)
 {
   if (winsock_lib == NULL)
     {
-      h_errno = ENETDOWN;
+      errno = h_errno = ENETDOWN;
       return SOCKET_ERROR;
     }
 
@@ -6492,7 +6499,7 @@ sys_shutdown (int s, int how)
         set_errno ();
       return rc;
     }
-  h_errno = ENOTSOCK;
+  errno = h_errno = ENOTSOCK;
   return SOCKET_ERROR;
 }
 
@@ -6501,7 +6508,7 @@ sys_setsockopt (int s, int level, int optname, const void * optval, int optlen)
 {
   if (winsock_lib == NULL)
     {
-      h_errno = ENETDOWN;
+      errno = h_errno = ENETDOWN;
       return SOCKET_ERROR;
     }
 
@@ -6514,7 +6521,7 @@ sys_setsockopt (int s, int level, int optname, const void * optval, int optlen)
         set_errno ();
       return rc;
     }
-  h_errno = ENOTSOCK;
+  errno = h_errno = ENOTSOCK;
   return SOCKET_ERROR;
 }
 
@@ -6523,7 +6530,7 @@ sys_listen (int s, int backlog)
 {
   if (winsock_lib == NULL)
     {
-      h_errno = ENETDOWN;
+      errno = h_errno = ENETDOWN;
       return SOCKET_ERROR;
     }
 
@@ -6537,7 +6544,7 @@ sys_listen (int s, int backlog)
         fd_info[s].flags |= FILE_LISTEN;
       return rc;
     }
-  h_errno = ENOTSOCK;
+  errno = h_errno = ENOTSOCK;
   return SOCKET_ERROR;
 }
 
@@ -6546,7 +6553,7 @@ sys_getsockname (int s, struct sockaddr * name, int * namelen)
 {
   if (winsock_lib == NULL)
     {
-      h_errno = ENETDOWN;
+      errno = h_errno = ENETDOWN;
       return SOCKET_ERROR;
     }
 
@@ -6558,7 +6565,7 @@ sys_getsockname (int s, struct sockaddr * name, int * namelen)
         set_errno ();
       return rc;
     }
-  h_errno = ENOTSOCK;
+  errno = h_errno = ENOTSOCK;
   return SOCKET_ERROR;
 }
 
@@ -6567,7 +6574,7 @@ sys_accept (int s, struct sockaddr * addr, int * addrlen)
 {
   if (winsock_lib == NULL)
     {
-      h_errno = ENETDOWN;
+      errno = h_errno = ENETDOWN;
       return -1;
     }
 
@@ -6579,13 +6586,20 @@ sys_accept (int s, struct sockaddr * addr, int * addrlen)
       if (t == INVALID_SOCKET)
         set_errno ();
       else
-        fd = socket_to_fd (t);
+        {
+          fd = socket_to_fd (t);
+          if (fd < 0)
+            errno = h_errno;    /* socket_to_fd sets h_errno */
+        }
 
-      fd_info[s].cp->status = STATUS_READ_ACKNOWLEDGED;
-      ResetEvent (fd_info[s].cp->char_avail);
+      if (fd >= 0)
+        {
+          fd_info[s].cp->status = STATUS_READ_ACKNOWLEDGED;
+          ResetEvent (fd_info[s].cp->char_avail);
+        }
       return fd;
     }
-  h_errno = ENOTSOCK;
+  errno = h_errno = ENOTSOCK;
   return -1;
 }
 
@@ -6595,7 +6609,7 @@ sys_recvfrom (int s, char * buf, int len, int flags,
 {
   if (winsock_lib == NULL)
     {
-      h_errno = ENETDOWN;
+      errno = h_errno = ENETDOWN;
       return SOCKET_ERROR;
     }
 
@@ -6607,7 +6621,7 @@ sys_recvfrom (int s, char * buf, int len, int flags,
         set_errno ();
       return rc;
     }
-  h_errno = ENOTSOCK;
+  errno = h_errno = ENOTSOCK;
   return SOCKET_ERROR;
 }
 
@@ -6617,7 +6631,7 @@ sys_sendto (int s, const char * buf, int len, int flags,
 {
   if (winsock_lib == NULL)
     {
-      h_errno = ENETDOWN;
+      errno = h_errno = ENETDOWN;
       return SOCKET_ERROR;
     }
 
@@ -6629,7 +6643,7 @@ sys_sendto (int s, const char * buf, int len, int flags,
         set_errno ();
       return rc;
     }
-  h_errno = ENOTSOCK;
+  errno = h_errno = ENOTSOCK;
   return SOCKET_ERROR;
 }
 
@@ -6640,7 +6654,7 @@ fcntl (int s, int cmd, int options)
 {
   if (winsock_lib == NULL)
     {
-      h_errno = ENETDOWN;
+      errno = h_errno = ENETDOWN;
       return -1;
     }
 
@@ -6663,7 +6677,7 @@ fcntl (int s, int cmd, int options)
           return SOCKET_ERROR;
         }
     }
-  h_errno = ENOTSOCK;
+  errno = h_errno = ENOTSOCK;
   return SOCKET_ERROR;
 }
 
@@ -6800,6 +6814,7 @@ sys_pipe (int * phandles)
         {
           _close (phandles[0]);
           _close (phandles[1]);
+          errno = EMFILE;
           rc = -1;
         }
       else
@@ -6873,19 +6888,31 @@ _sys_read_ahead (int fd)
 
       /* Configure timeouts for blocking read.  */
       if (!GetCommTimeouts (hnd, &ct))
-        return STATUS_READ_ERROR;
+        {
+          cp->status = STATUS_READ_ERROR;
+          return STATUS_READ_ERROR;
+        }
       ct.ReadIntervalTimeout            = 0;
       ct.ReadTotalTimeoutMultiplier     = 0;
       ct.ReadTotalTimeoutConstant       = 0;
       if (!SetCommTimeouts (hnd, &ct))
-        return STATUS_READ_ERROR;
+        {
+          cp->status = STATUS_READ_ERROR;
+          return STATUS_READ_ERROR;
+        }
 
       if (!ReadFile (hnd, &cp->chr, sizeof (char), (DWORD*) &rc, ovl))
         {
           if (GetLastError () != ERROR_IO_PENDING)
-            return STATUS_READ_ERROR;
+            {
+              cp->status = STATUS_READ_ERROR;
+              return STATUS_READ_ERROR;
+            }
           if (!GetOverlappedResult (hnd, ovl, (DWORD*) &rc, TRUE))
-            return STATUS_READ_ERROR;
+            {
+              cp->status = STATUS_READ_ERROR;
+              return STATUS_READ_ERROR;
+            }
         }
     }
   else if (fd_info[fd].flags & FILE_SOCKET)
diff --git a/src/w32proc.c b/src/w32proc.c
index 8bf57602927..3f3e97c77a0 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -803,6 +803,48 @@ new_child (void)
     if (!CHILD_ACTIVE (cp) && cp->procinfo.hProcess == NULL)
       goto Initialize;
   if (child_proc_count == MAX_CHILDREN)
+    {
+      int i = 0;
+      child_process *dead_cp = NULL;
+
+      DebPrint (("new_child: No vacant slots, looking for dead processes\n"));
+      for (cp = child_procs + (child_proc_count-1); cp >= child_procs; cp--)
+        if (!CHILD_ACTIVE (cp) && cp->procinfo.hProcess)
+          {
+            DWORD status = 0;
+
+            if (!GetExitCodeProcess (cp->procinfo.hProcess, &status))
+              {
+                DebPrint (("new_child.GetExitCodeProcess: error %lu for PID %lu\n",
+                           GetLastError (), cp->procinfo.dwProcessId));
+                status = STILL_ACTIVE;
+              }
+            if (status != STILL_ACTIVE
+                || WaitForSingleObject (cp->procinfo.hProcess, 0) == WAIT_OBJECT_0)
+              {
+                DebPrint (("new_child: Freeing slot of dead process %d, fd %d\n",
+                           cp->procinfo.dwProcessId, cp->fd));
+                CloseHandle (cp->procinfo.hProcess);
+                cp->procinfo.hProcess = NULL;
+                CloseHandle (cp->procinfo.hThread);
+                cp->procinfo.hThread = NULL;
+                /* Free up to 2 dead slots at a time, so that if we
+                   have a lot of them, they will eventually all be
+                   freed when the tornado ends.  */
+                if (i == 0)
+                  dead_cp = cp;
+                else
+                  break;
+                i++;
+              }
+          }
+      if (dead_cp)
+        {
+          cp = dead_cp;
+          goto Initialize;
+        }
+    }
+  if (child_proc_count == MAX_CHILDREN)
     return NULL;
   cp = &child_procs[child_proc_count++];
 
@@ -979,8 +1021,9 @@ reader_thread (void *arg)
          read-ahead has completed, whether successfully or not. */
       if (!SetEvent (cp->char_avail))
         {
-          DebPrint (("reader_thread.SetEvent failed with %lu for fd %ld\n",
-                     GetLastError (), cp->fd));
+          DebPrint (("reader_thread.SetEvent(0x%x) failed with %lu for fd %ld (PID %d)\n",
+                     (DWORD_PTR)cp->char_avail, GetLastError (),
+                     cp->fd, cp->pid));
           return 1;
         }
 
@@ -2008,7 +2051,7 @@ count_children:
     /* Some child_procs might be sockets; ignore them.  Also some
        children may have died already, but we haven't finished reading
        the process output; ignore them too.  */
-    if (CHILD_ACTIVE (cp) && cp->procinfo.hProcess
+    if ((CHILD_ACTIVE (cp) && cp->procinfo.hProcess)
         && (cp->fd < 0
             || (fd_info[cp->fd].flags & FILE_SEND_SIGCHLD) == 0
             || (fd_info[cp->fd].flags & FILE_AT_EOF) != 0)
diff --git a/src/xdisp.c b/src/xdisp.c
index df0d55566e8..9da8679382e 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -915,8 +915,8 @@ static int forward_to_next_line_start (struct it *, int *, struct bidi_it *);
 static struct text_pos string_pos_nchars_ahead (struct text_pos,
                                                 Lisp_Object, ptrdiff_t);
 static struct text_pos string_pos (ptrdiff_t, Lisp_Object);
-static struct text_pos c_string_pos (ptrdiff_t, const char *, int);
-static ptrdiff_t number_of_chars (const char *, int);
+static struct text_pos c_string_pos (ptrdiff_t, const char *, bool);
+static ptrdiff_t number_of_chars (const char *, bool);
 static void compute_stop_pos (struct it *);
 static void compute_string_pos (struct text_pos *, struct text_pos,
                                 Lisp_Object);
@@ -1655,7 +1655,7 @@ string_pos (ptrdiff_t charpos, Lisp_Object string)
    means recognize multibyte characters.  */
 
 static struct text_pos
-c_string_pos (ptrdiff_t charpos, const char *s, int multibyte_p)
+c_string_pos (ptrdiff_t charpos, const char *s, bool multibyte_p)
 {
   struct text_pos pos;
 
@@ -1686,7 +1686,7 @@ c_string_pos (ptrdiff_t charpos, const char *s, int multibyte_p)
    non-zero means recognize multibyte characters.  */
 
 static ptrdiff_t
-number_of_chars (const char *s, int multibyte_p)
+number_of_chars (const char *s, bool multibyte_p)
 {
   ptrdiff_t nchars;
 
@@ -9411,8 +9411,8 @@ message_log_maybe_newline (void)
 
 
 /* Add a string M of length NBYTES to the message log, optionally
-   terminated with a newline when NLFLAG is non-zero.  MULTIBYTE, if
-   nonzero, means interpret the contents of M as multibyte.  This
+   terminated with a newline when NLFLAG is true.  MULTIBYTE, if
+   true, means interpret the contents of M as multibyte.  This
    function calls low-level routines in order to bypass text property
    hooks, etc. which might not be safe to run.
 
@@ -9420,7 +9420,7 @@ message_log_maybe_newline (void)
    so the buffer M must NOT point to a Lisp string.  */
 
 void
-message_dolog (const char *m, ptrdiff_t nbytes, int nlflag, int multibyte)
+message_dolog (const char *m, ptrdiff_t nbytes, bool nlflag, bool multibyte)
 {
   const unsigned char *msg = (const unsigned char *) m;
 
@@ -9645,7 +9645,7 @@ message3 (Lisp_Object m)
   if (STRINGP (m))
     {
       ptrdiff_t nbytes = SBYTES (m);
-      int multibyte = STRING_MULTIBYTE (m);
+      bool multibyte = STRING_MULTIBYTE (m);
       USE_SAFE_ALLOCA;
       char *buffer = SAFE_ALLOCA (nbytes);
       memcpy (buffer, SDATA (m), nbytes);
@@ -18169,7 +18169,7 @@ get_overlay_arrow_glyph_row (struct window *w, Lisp_Object overlay_arrow_string)
   const unsigned char *arrow_end = arrow_string + arrow_len;
   const unsigned char *p;
   struct it it;
-  int multibyte_p;
+  bool multibyte_p;
   int n_glyphs_before;
 
   set_buffer_temp (buffer);
@@ -20600,7 +20600,7 @@ display_mode_element (struct it *it, int depth, int field_width, int precision,
                                              risky);
                 else if (c != 0)
                   {
-                    int multibyte;
+                    bool multibyte;
                     ptrdiff_t bytepos, charpos;
                     const char *spec;
                     Lisp_Object string;
@@ -21205,7 +21205,7 @@ static char *
 decode_mode_spec_coding (Lisp_Object coding_system, register char *buf, int eol_flag)
 {
   Lisp_Object val;
-  int multibyte = !NILP (BVAR (current_buffer, enable_multibyte_characters));
+  bool multibyte = !NILP (BVAR (current_buffer, enable_multibyte_characters));
   const unsigned char *eol_str;
   int eol_str_len;
   /* The EOL conversion we are using.  */
diff --git a/src/xfaces.c b/src/xfaces.c
index 33a221fdd52..71709446c1d 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -6152,7 +6152,7 @@ face_at_string_position (struct window *w, Lisp_Object string,
   struct frame *f = XFRAME (WINDOW_FRAME (w));
   Lisp_Object attrs[LFACE_VECTOR_SIZE];
   struct face *base_face;
-  int multibyte_p = STRING_MULTIBYTE (string);
+  bool multibyte_p = STRING_MULTIBYTE (string);
   Lisp_Object prop_name = mouse_p ? Qmouse_face : Qface;
 
   /* Get the value of the face property at the current position within