auto upstream

6 files changed, 15 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e945e221593..ff059cf1a3c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-19  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32proc.c (new_child): Avoid leaking handles if the subprocess
+        resources were not orderly released.
+
 2013-02-17  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (x_draw_vertical_border): For a window that is neither
diff --git a/src/ChangeLog.10 b/src/ChangeLog.10
index c878c48a4f4..508a2a9dd4c 100644
--- a/src/ChangeLog.10
+++ b/src/ChangeLog.10
@@ -19171,7 +19171,7 @@
         * coding.c (code_convert_region_unwind):
         Set Vlast_coding_system_used to the argument.
         (code_convert_region): If post-read-conversion function changed
-        the value of last-coding-sytem, keep the new value in
+        the value of last-coding-system, keep the new value in
         coding->symbol so that it won't be overridden.
         (run_pre_post_conversion_on_str): Likewise.
         (coding_system_accept_latin_extra_p): New function.
diff --git a/src/lisp.h b/src/lisp.h
index c023d5b4892..e7a86892908 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3053,7 +3053,7 @@ extern Lisp_Object Qautomatic_gc;
 extern Lisp_Object Qchar_table_extra_slots;
 extern struct Lisp_Vector *allocate_vector (EMACS_INT);
 
-/* Make an unitialized vector for SIZE objects.  NOTE: you must
+/* Make an uninitialized vector for SIZE objects.  NOTE: you must
    be sure that GC cannot happen until the vector is completely
    initialized.  E.g. the following code is likely to crash:
 
diff --git a/src/marker.c b/src/marker.c
index 0d992c0abfa..63027d3be5e 100644
--- a/src/marker.c
+++ b/src/marker.c
@@ -500,7 +500,7 @@ set_marker_internal (Lisp_Object marker, Lisp_Object position,
       register ptrdiff_t charpos, bytepos;
 
       /* Do not use CHECK_NUMBER_COERCE_MARKER because we
-         don't want to call buf_charpos_to_bytepos if POSTION
+         don't want to call buf_charpos_to_bytepos if POSITION
          is a marker and so we know the bytepos already.  */
       if (INTEGERP (position))
         charpos = XINT (position), bytepos = -1;
diff --git a/src/w32proc.c b/src/w32proc.c
index 3f3e97c77a0..961791a40ed 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -849,6 +849,12 @@ new_child (void)
   cp = &child_procs[child_proc_count++];
 
  Initialize:
+  /* Last opportunity to avoid leaking handles before we forget them
+     for good.  */
+  if (cp->procinfo.hProcess)
+    CloseHandle (cp->procinfo.hProcess);
+  if (cp->procinfo.hThread)
+    CloseHandle (cp->procinfo.hThread);
   memset (cp, 0, sizeof (*cp));
   cp->fd = -1;
   cp->pid = -1;
diff --git a/src/xdisp.c b/src/xdisp.c
index 68be426f807..9207355bc09 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -28496,7 +28496,7 @@ x_draw_vertical_border (struct window *w)
   if (FRAME_HAS_VERTICAL_SCROLL_BARS (XFRAME (w->frame)))
     return;
 
-  /* Note: It is necessary to redraw bot the left and the right
+  /* Note: It is necessary to redraw both the left and the right
      borders, for when only this single window W is being
      redisplayed.  */
   if (!WINDOW_RIGHTMOST_P (w)