Merge from emacs-24; up to 2012-12-01T13:25:13Z!cyd@gnu.org

7 files changed, 66 insertions, 43 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 24f32f141e9..acd8d4481e7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,31 @@
+2012-12-21  Eli Zaretskii  <eliz@gnu.org>
+
+        * fileio.c (Finsert_file_contents): Doc fix.
+
+        * w32proc.c (new_child, delete_child, find_child_pid): For a
+        subprocess, consider its slot being in use as long as its process
+        handle (procinfo.hProcess) is not NULL.  This avoids reusing the
+        slot when a new process is started immediately after killing
+        another one, without waiting enough time for the first process to
+        be reaped and resources allocated for it be orderly freed.
+        (Bug#13086)
+        Suggested by Fabrice Popineau <fabrice.popineau@supelec.fr>.
+
+2012-12-21  Chong Yidong  <cyd@gnu.org>
+
+        * buffer.c (Fset_buffer_major_mode): Doc fix (Bug#13231).
+
+        * fns.c (Fcompare_strings): Doc fix (Bug#13081).
+
+2012-12-21  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32.c (get_name_and_id): Always pass NULL as the first argument
+        of lookup_account_sid.  Avoids crashes with UNC file names that
+        refer to DFS domains, not to specific machine names.  (Bug#12621)
+        Remove now unused argument FNAME; all callers changed.
+        (get_file_owner_and_group): Remove now unused argument FNAME; all
+        callers changed.
+
 2012-12-21  Chong Yidong  <cyd@gnu.org>
 
         * editfns.c (Finsert_char): Since read-char-by-name now signals an
diff --git a/src/buffer.c b/src/buffer.c
index 748422df73a..3cf590d4db7 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -2049,7 +2049,7 @@ DEFUN ("bury-buffer-internal", Fbury_buffer_internal, Sbury_buffer_internal,
 DEFUN ("set-buffer-major-mode", Fset_buffer_major_mode, Sset_buffer_major_mode, 1, 1, 0,
        doc: /* Set an appropriate major mode for BUFFER.
 For the *scratch* buffer, use `initial-major-mode', otherwise choose a mode
-according to `default-major-mode'.
+according to the default value of `major-mode'.
 Use this function before selecting the buffer, since it may need to inspect
 the current buffer's major mode.  */)
   (Lisp_Object buffer)
diff --git a/src/fileio.c b/src/fileio.c
index 45f3b77d721..50fbaa7ff04 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3417,7 +3417,10 @@ the number of characters that replace previous buffer contents.
 
 This function does code conversion according to the value of
 `coding-system-for-read' or `file-coding-system-alist', and sets the
-variable `last-coding-system-used' to the coding system actually used.  */)
+variable `last-coding-system-used' to the coding system actually used.
+
+In addition, this function decodes the inserted text from known formats
+by calling `format-decode', which see.  */)
   (Lisp_Object filename, Lisp_Object visit, Lisp_Object beg, Lisp_Object end, Lisp_Object replace)
 {
   struct stat st;
diff --git a/src/fns.c b/src/fns.c
index 7c2222e9805..4c6e537ea84 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -211,12 +211,18 @@ Symbols are also allowed; their print names are used instead.  */)
 
 DEFUN ("compare-strings", Fcompare_strings, Scompare_strings, 6, 7, 0,
        doc: /* Compare the contents of two strings, converting to multibyte if needed.
-In string STR1, skip the first START1 characters and stop at END1.
-In string STR2, skip the first START2 characters and stop at END2.
-END1 and END2 default to the full lengths of the respective strings.
-
-Case is significant in this comparison if IGNORE-CASE is nil.
-Unibyte strings are converted to multibyte for comparison.
+The arguments START1, END1, START2, and END2, if non-nil, are
+positions specifying which parts of STR1 or STR2 to compare.  In
+string STR1, compare the part between START1 (inclusive) and END1
+\(exclusive).  If START1 is nil, it defaults to 0, the beginning of
+the string; if END1 is nil, it defaults to the length of the string.
+Likewise, in string STR2, compare the part between START2 and END2.
+
+The strings are compared by the numeric values of their characters.
+For instance, STR1 is "less than" STR2 if its first differing
+character has a smaller numeric value.  If IGNORE-CASE is non-nil,
+characters are converted to lower-case before comparing them.  Unibyte
+strings are converted to multibyte for comparison.
 
 The value is t if the strings (or specified portions) match.
 If string STR1 is less, the value is a negative number N;
diff --git a/src/search.c b/src/search.c
index 394012b2761..297904cbf1b 100644
--- a/src/search.c
+++ b/src/search.c
@@ -1313,8 +1313,11 @@ search_buffer (Lisp_Object string, ptrdiff_t pos, ptrdiff_t pos_byte,
              non-nil, we can use boyer-moore search only if TRT can be
              represented by the byte array of 256 elements.  For that,
              all non-ASCII case-equivalents of all case-sensitive
-             characters in STRING must belong to the same charset and
-             row.  */
+             characters in STRING must belong to the same character
+             group (two characters belong to the same group iff their
+             multibyte forms are the same except for the last byte;
+             i.e. every 64 characters form a group; U+0000..U+003F,
+             U+0040..U+007F, U+0080..U+00BF, ...).  */
 
           while (--len >= 0)
             {
diff --git a/src/w32.c b/src/w32.c
index 0bb7a4e19c7..aa3431a1357 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -3644,8 +3644,7 @@ w32_add_to_cache (PSID sid, unsigned id, char *name)
 #define GID 2
 
 static int
-get_name_and_id (PSECURITY_DESCRIPTOR psd, const char *fname,
-                 unsigned *id, char *nm, int what)
+get_name_and_id (PSECURITY_DESCRIPTOR psd, unsigned *id, char *nm, int what)
 {
   PSID sid = NULL;
   char machine[MAX_COMPUTERNAME_LENGTH+1];
@@ -3655,7 +3654,6 @@ get_name_and_id (PSECURITY_DESCRIPTOR psd, const char *fname,
   DWORD name_len = sizeof (name);
   char domain[1024];
   DWORD domain_len = sizeof (domain);
-  char *mp = NULL;
   int use_dflt = 0;
   int result;
 
@@ -3670,22 +3668,7 @@ get_name_and_id (PSECURITY_DESCRIPTOR psd, const char *fname,
     use_dflt = 1;
   else if (!w32_cached_id (sid, id, nm))
     {
-      /* If FNAME is a UNC, we need to lookup account on the
-         specified machine.  */
-      if (IS_DIRECTORY_SEP (fname[0]) && IS_DIRECTORY_SEP (fname[1])
-          && fname[2] != '\0')
-        {
-          const char *s;
-          char *p;
-
-          for (s = fname + 2, p = machine;
-               *s && !IS_DIRECTORY_SEP (*s); s++, p++)
-            *p = *s;
-          *p = '\0';
-          mp = machine;
-        }
-
-      if (!lookup_account_sid (mp, sid, name, &name_len,
+      if (!lookup_account_sid (NULL, sid, name, &name_len,
                                domain, &domain_len, &ignore)
           || name_len > UNLEN+1)
         use_dflt = 1;
@@ -3700,9 +3683,7 @@ get_name_and_id (PSECURITY_DESCRIPTOR psd, const char *fname,
 }
 
 static void
-get_file_owner_and_group (PSECURITY_DESCRIPTOR psd,
-                          const char *fname,
-                          struct stat *st)
+get_file_owner_and_group (PSECURITY_DESCRIPTOR psd, struct stat *st)
 {
   int dflt_usr = 0, dflt_grp = 0;
 
@@ -3713,9 +3694,9 @@ get_file_owner_and_group (PSECURITY_DESCRIPTOR psd,
     }
   else
     {
-      if (get_name_and_id (psd, fname, &st->st_uid, st->st_uname, UID))
+      if (get_name_and_id (psd, &st->st_uid, st->st_uname, UID))
         dflt_usr = 1;
-      if (get_name_and_id (psd, fname, &st->st_gid, st->st_gname, GID))
+      if (get_name_and_id (psd, &st->st_gid, st->st_gname, GID))
         dflt_grp = 1;
     }
   /* Consider files to belong to current user/group, if we cannot get
@@ -3939,23 +3920,23 @@ stat_worker (const char * path, struct stat * buf, int follow_symlinks)
          If getting security by handle fails, and we don't need to
          resolve symlinks, we try getting security by name.  */
       if (!w32_stat_get_owner_group || is_windows_9x () == TRUE)
-        get_file_owner_and_group (NULL, name, buf);
+        get_file_owner_and_group (NULL, buf);
       else
         {
           psd = get_file_security_desc_by_handle (fh);
           if (psd)
             {
-              get_file_owner_and_group (psd, name, buf);
+              get_file_owner_and_group (psd, buf);
               LocalFree (psd);
             }
           else if (!(is_a_symlink && follow_symlinks))
             {
               psd = get_file_security_desc_by_name (name);
-              get_file_owner_and_group (psd, name, buf);
+              get_file_owner_and_group (psd, buf);
               xfree (psd);
             }
           else
-            get_file_owner_and_group (NULL, name, buf);
+            get_file_owner_and_group (NULL, buf);
         }
       CloseHandle (fh);
     }
@@ -4064,7 +4045,7 @@ stat_worker (const char * path, struct stat * buf, int follow_symlinks)
       else
         buf->st_mode = S_IFREG;
 
-      get_file_owner_and_group (NULL, name, buf);
+      get_file_owner_and_group (NULL, buf);
     }
 
 #if 0
diff --git a/src/w32proc.c b/src/w32proc.c
index 43ecf4d68f3..1693b2ad501 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -800,7 +800,7 @@ new_child (void)
   DWORD id;
 
   for (cp = child_procs + (child_proc_count-1); cp >= child_procs; cp--)
-    if (!CHILD_ACTIVE (cp))
+    if (!CHILD_ACTIVE (cp) && cp->procinfo.hProcess == NULL)
       goto Initialize;
   if (child_proc_count == MAX_CHILDREN)
     return NULL;
@@ -859,7 +859,7 @@ delete_child (child_process *cp)
     if (fd_info[i].cp == cp)
       emacs_abort ();
 
-  if (!CHILD_ACTIVE (cp))
+  if (!CHILD_ACTIVE (cp) && cp->procinfo.hProcess == NULL)
     return;
 
   /* Delete the child's temporary input file, if any, that is pending
@@ -918,7 +918,8 @@ delete_child (child_process *cp)
   if (cp == child_procs + child_proc_count - 1)
     {
       for (i = child_proc_count-1; i >= 0; i--)
-        if (CHILD_ACTIVE (&child_procs[i]))
+        if (CHILD_ACTIVE (&child_procs[i])
+            || child_procs[i].procinfo.hProcess != NULL)
           {
             child_proc_count = i + 1;
             break;
@@ -935,7 +936,8 @@ find_child_pid (DWORD pid)
   child_process *cp;
 
   for (cp = child_procs + (child_proc_count-1); cp >= child_procs; cp--)
-    if (CHILD_ACTIVE (cp) && pid == cp->pid)
+    if ((CHILD_ACTIVE (cp) || cp->procinfo.hProcess != NULL)
+        && pid == cp->pid)
       return cp;
   return NULL;
 }