9 files changed, 163 insertions, 54 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ffa4bdf927f..e147889f796 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,32 @@
+2013-01-25  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32notify.c (Fw32notify_add_watch): Doc fix.  (Bug#13540)
+
+2013-01-25  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * font.c (num_fonts): Remove the leftover from old
+        debugging code.  Adjust comment style here and there.
+        * insdel.c (insert_1): Remove.
+        * lisp.h (insert_1): Remove prototype.
+        * xdisp.c (message_dolog): Adjust users to call insert_1_both.
+
+2013-01-25  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32.c (max_filename_mbslen): New function.
+        (normalize_filename, readdir): Use it to detect locales where ANSI
+        encoding of file names uses a double-byte character set (DBCS).
+        If a DBCS encoding is used, advance by characters using
+        CharNextExA, instead of incrementing a 'char *' pointer.  Use
+        _mbslwr instead of _strlwr.  (Bug#13515)
+
+        * w32heap.c (allocate_heap) [!_WIN64]: Decrease the initial
+        request of memory reservation to 1.7GB.  (Bug#13065)
+
+2013-01-25  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * coding.c (detect_coding_iso_2022): Move back mis-reordered code
+        at check_extra_latin label.  (Bug#13505)
+
 2013-01-24  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * nsfont.m (ns_escape_name, ns_unescape_name, ns_registry_to_script):
@@ -19,7 +48,7 @@
         (w32_read_socket): Save iconified state to generate DEICONIFY_EVENT
         properly.  Likewise for obscured.
         * xterm.c: Ditto.
-        (handle_one_xevent): Save visible state go generate ICONIFY_EVENT
+        (handle_one_xevent): Save visible state to generate ICONIFY_EVENT
         properly.
         * nsterm.m: Ditto.
         (windowDidDeminiaturize): Generate DEICONIFY_EVENT.
diff --git a/src/coding.c b/src/coding.c
index a9bf9032a69..93da9db0d36 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -3057,20 +3057,7 @@ detect_coding_iso_2022 (struct coding_system *coding,
             }
           if (single_shifting)
             break;
-        check_extra_latin:
-          if (! VECTORP (Vlatin_extra_code_table)
-              || NILP (AREF (Vlatin_extra_code_table, c)))
-            {
-              rejected = CATEGORY_MASK_ISO;
-              break;
-            }
-          if (CODING_ISO_FLAGS (&coding_categories[coding_category_iso_8_1])
-              & CODING_ISO_FLAG_LATIN_EXTRA)
-            found |= CATEGORY_MASK_ISO_8_1;
-          else
-            rejected |= CATEGORY_MASK_ISO_8_1;
-          rejected |= CATEGORY_MASK_ISO_8_2;
-          break;
+          goto check_extra_latin;
 
         default:
           if (c < 0)
@@ -3121,6 +3108,20 @@ detect_coding_iso_2022 (struct coding_system *coding,
                 }
               break;
             }
+        check_extra_latin:
+          if (! VECTORP (Vlatin_extra_code_table)
+              || NILP (AREF (Vlatin_extra_code_table, c)))
+            {
+              rejected = CATEGORY_MASK_ISO;
+              break;
+            }
+          if (CODING_ISO_FLAGS (&coding_categories[coding_category_iso_8_1])
+              & CODING_ISO_FLAG_LATIN_EXTRA)
+            found |= CATEGORY_MASK_ISO_8_1;
+          else
+            rejected |= CATEGORY_MASK_ISO_8_1;
+          rejected |= CATEGORY_MASK_ISO_8_2;
+          break;
         }
     }
   detect_info->rejected |= CATEGORY_MASK_ISO;
diff --git a/src/font.c b/src/font.c
index 18caf751643..3cffe2558ae 100644
--- a/src/font.c
+++ b/src/font.c
@@ -717,7 +717,7 @@ font_put_extra (Lisp_Object font, Lisp_Object prop, Lisp_Object val)
 }
 
 
-/* Font name parser and unparser */
+/* Font name parser and unparser.  */
 
 static int parse_matrix (const char *);
 static int font_expand_wildcards (Lisp_Object *, int);
@@ -1746,7 +1746,7 @@ font_parse_family_registry (Lisp_Object family, Lisp_Object registry, Lisp_Objec
 /* This part (through the next ^L) is still experimental and not
    tested much.  We may drastically change codes.  */
 
-/* OTF handler */
+/* OTF handler.  */
 
 #if 0
 
@@ -2035,7 +2035,7 @@ font_otf_Anchor (OTF_Anchor *anchor)
 #endif  /* 0 */
 
 
-/* Font sorting */
+/* Font sorting.  */
 
 static unsigned font_score (Lisp_Object, Lisp_Object *);
 static int font_compare (const void *, const void *);
@@ -2565,7 +2565,6 @@ font_get_cache (FRAME_PTR f, struct font_driver *driver)
   return val;
 }
 
-static int num_fonts;
 
 static void
 font_clear_cache (FRAME_PTR f, Lisp_Object cache, struct font_driver *driver)
@@ -2598,7 +2597,6 @@ font_clear_cache (FRAME_PTR f, Lisp_Object cache, struct font_driver *driver)
                         {
                           eassert (font && driver == font->driver);
                           driver->close (f, font);
-                          num_fonts--;
                         }
                     }
                   if (driver->free_entity)
@@ -2856,7 +2854,6 @@ font_open_entity (FRAME_PTR f, Lisp_Object entity, int pixel_size)
     return Qnil;
   ASET (entity, FONT_OBJLIST_INDEX,
         Fcons (font_object, AREF (entity, FONT_OBJLIST_INDEX)));
-  num_fonts++;
 
   font = XFONT_OBJECT (font_object);
   min_width = (font->min_width ? font->min_width
@@ -2901,7 +2898,6 @@ font_close_object (FRAME_PTR f, Lisp_Object font_object)
   eassert (FRAME_X_DISPLAY_INFO (f)->n_fonts);
   FRAME_X_DISPLAY_INFO (f)->n_fonts--;
 #endif
-  num_fonts--;
 }
 
 
@@ -3578,7 +3574,7 @@ font_filter_properties (Lisp_Object font,
   Lisp_Object it;
   int i;
 
-  /* Set boolean values to Qt or Qnil */
+  /* Set boolean values to Qt or Qnil.  */
   for (i = 0; boolean_properties[i] != NULL; ++i)
     for (it = alist; ! NILP (it); it = XCDR (it))
       {
@@ -3757,7 +3753,7 @@ font_range (ptrdiff_t pos, ptrdiff_t *limit, struct window *w, struct face *face
 #endif
 
 
-/* Lisp API */
+/* Lisp API.  */
 
 DEFUN ("fontp", Ffontp, Sfontp, 1, 2, 0,
        doc: /* Return t if OBJECT is a font-spec, font-entity, or font-object.
diff --git a/src/insdel.c b/src/insdel.c
index 303247816ca..4cf4e6452a1 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -658,17 +658,6 @@ insert_before_markers_and_inherit (const char *string,
     }
 }
 
-/* Subroutine used by the insert functions above.  */
-
-void
-insert_1 (const char *string, ptrdiff_t nbytes,
-          bool inherit, bool prepare, bool before_markers)
-{
-  insert_1_both (string, chars_in_text ((unsigned char *) string, nbytes),
-                 nbytes, inherit, prepare, before_markers);
-}
-
-
 #ifdef BYTE_COMBINING_DEBUG
 
 /* See if the bytes before POS/POS_BYTE combine with bytes
diff --git a/src/lisp.h b/src/lisp.h
index 718c970006c..7128c3d4b18 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2879,7 +2879,6 @@ extern int count_combining_after (const unsigned char *,
                                   ptrdiff_t, ptrdiff_t, ptrdiff_t);
 extern void insert (const char *, ptrdiff_t);
 extern void insert_and_inherit (const char *, ptrdiff_t);
-extern void insert_1 (const char *, ptrdiff_t, bool, bool, bool);
 extern void insert_1_both (const char *, ptrdiff_t, ptrdiff_t,
                            bool, bool, bool);
 extern void insert_from_gap (ptrdiff_t, ptrdiff_t);
diff --git a/src/w32.c b/src/w32.c
index d014609076e..f722bc5f397 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -37,7 +37,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* must include CRT headers *before* config.h */
 
 #include <config.h>
-#include <mbstring.h>   /* for _mbspbrk */
+#include <mbstring.h>   /* for _mbspbrk and _mbslwr */
 
 #undef access
 #undef chdir
@@ -1531,6 +1531,67 @@ srandom (int seed)
   srand (seed);
 }
 
+/* Current codepage for encoding file names.  */
+static int file_name_codepage;
+
+/* Return the maximum length in bytes of a multibyte character
+   sequence encoded in the current ANSI codepage.  This is required to
+   correctly walk the encoded file names one character at a time.  */
+static int
+max_filename_mbslen (void)
+{
+  /* A simple cache to avoid calling GetCPInfo every time we need to
+     normalize a file name.  The file-name encoding is not supposed to
+     be changed too frequently, if ever.  */
+  static Lisp_Object last_file_name_encoding;
+  static int last_max_mbslen;
+  Lisp_Object current_encoding;
+
+  current_encoding = Vfile_name_coding_system;
+  if (NILP (current_encoding))
+    current_encoding = Vdefault_file_name_coding_system;
+
+  if (!EQ (last_file_name_encoding, current_encoding))
+    {
+      CPINFO cp_info;
+
+      last_file_name_encoding = current_encoding;
+      /* Default to the current ANSI codepage.  */
+      file_name_codepage = w32_ansi_code_page;
+      if (!NILP (current_encoding))
+        {
+          char *cpname = SDATA (SYMBOL_NAME (current_encoding));
+          char *cp = NULL, *end;
+          int cpnum;
+
+          if (strncmp (cpname, "cp", 2) == 0)
+            cp = cpname + 2;
+          else if (strncmp (cpname, "windows-", 8) == 0)
+            cp = cpname + 8;
+
+          if (cp)
+            {
+              end = cp;
+              cpnum = strtol (cp, &end, 10);
+              if (cpnum && *end == '\0' && end - cp >= 2)
+                file_name_codepage = cpnum;
+            }
+        }
+
+      if (!file_name_codepage)
+        file_name_codepage = CP_ACP; /* CP_ACP = 0, but let's not assume that */
+
+      if (!GetCPInfo (file_name_codepage, &cp_info))
+        {
+          file_name_codepage = CP_ACP;
+          if (!GetCPInfo (file_name_codepage, &cp_info))
+            emacs_abort ();
+        }
+      last_max_mbslen = cp_info.MaxCharSize;
+    }
+
+  return last_max_mbslen;
+}
 
 /* Normalize filename by converting all path separators to
    the specified separator.  Also conditionally convert upper
@@ -1540,14 +1601,20 @@ static void
 normalize_filename (register char *fp, char path_sep)
 {
   char sep;
-  char *elem;
+  char *elem, *p2;
+  int dbcs_p = max_filename_mbslen () > 1;
 
   /* Always lower-case drive letters a-z, even if the filesystem
      preserves case in filenames.
      This is so filenames can be compared by string comparison
      functions that are case-sensitive.  Even case-preserving filesystems
      do not distinguish case in drive letters.  */
-  if (fp[1] == ':' && *fp >= 'A' && *fp <= 'Z')
+  if (dbcs_p)
+    p2 = CharNextExA (file_name_codepage, fp, 0);
+  else
+    p2 = fp + 1;
+
+  if (*p2 == ':' && *fp >= 'A' && *fp <= 'Z')
     {
       *fp += 'a' - 'A';
       fp += 2;
@@ -1559,7 +1626,10 @@ normalize_filename (register char *fp, char path_sep)
         {
           if (*fp == '/' || *fp == '\\')
             *fp = path_sep;
-          fp++;
+          if (!dbcs_p)
+            fp++;
+          else
+            fp = CharNextExA (file_name_codepage, fp, 0);
         }
       return;
     }
@@ -1582,13 +1652,20 @@ normalize_filename (register char *fp, char path_sep)
         if (elem && elem != fp)
           {
             *fp = 0;            /* temporary end of string */
-            _strlwr (elem);     /* while we convert to lower case */
+            _mbslwr (elem);     /* while we convert to lower case */
           }
         *fp = sep;              /* convert (or restore) path separator */
         elem = fp + 1;          /* next element starts after separator */
         sep = path_sep;
       }
-  } while (*fp++);
+    if (*fp)
+      {
+        if (!dbcs_p)
+          fp++;
+        else
+          fp = CharNextExA (file_name_codepage, fp, 0);
+      }
+  } while (*fp);
 }
 
 /* Destructively turn backslashes into slashes.  */
@@ -2860,15 +2937,22 @@ readdir (DIR *dirp)
     strcpy (dir_static.d_name, dir_find_data.cFileName);
   dir_static.d_namlen = strlen (dir_static.d_name);
   if (dir_is_fat)
-    _strlwr (dir_static.d_name);
+    _mbslwr (dir_static.d_name);
   else if (downcase)
     {
       register char *p;
-      for (p = dir_static.d_name; *p; p++)
-        if (*p >= 'a' && *p <= 'z')
-          break;
+      int dbcs_p = max_filename_mbslen () > 1;
+      for (p = dir_static.d_name; *p; )
+        {
+          if (*p >= 'a' && *p <= 'z')
+            break;
+          if (dbcs_p)
+            p = CharNextExA (file_name_codepage, p, 0);
+          else
+            p++;
+        }
       if (!*p)
-        _strlwr (dir_static.d_name);
+        _mbslwr (dir_static.d_name);
     }
 
   return &dir_static;
diff --git a/src/w32heap.c b/src/w32heap.c
index 9c189dbda6d..81206ce2834 100644
--- a/src/w32heap.c
+++ b/src/w32heap.c
@@ -98,7 +98,11 @@ allocate_heap (void)
 #ifdef _WIN64
   size_t size = 0x4000000000i64; /* start by asking for 32GB */
 #else
-  size_t size = 0x80000000; /* start by asking for 2GB */
+  /* We used to start with 2GB here, but on Windows 7 that would leave
+     too little room in the address space for threads started by
+     Windows on our behalf, e.g. when we pop up the file selection
+     dialog.  */
+  size_t size = 0x68000000; /* start by asking for 1.7GB */
 #endif
   void *ptr = NULL;
 
diff --git a/src/w32notify.c b/src/w32notify.c
index d78e55f43ed..1bcaa794565 100644
--- a/src/w32notify.c
+++ b/src/w32notify.c
@@ -442,8 +442,8 @@ DEFUN ("w32notify-add-watch", Fw32notify_add_watch,
 This arranges for filesystem events pertaining to FILE to be reported
 to Emacs.  Use `w32notify-rm-watch' to cancel the watch.
 
-Value is a descriptor for the added watch, or nil if the file
-cannot be watched.
+Value is a descriptor for the added watch.  If the file cannot be
+watched for some reason, this function signals a `file-error' error.
 
 FILTER is a list of conditions for reporting an event.  It can include
 the following symbols:
@@ -476,7 +476,13 @@ following:
   'renamed-from' -- a file was renamed whose old name was FILE
   'renamed-to'   -- a file was renamed and its new name is FILE
 
-FILE is the name of the file whose event is being reported.  */)
+FILE is the name of the file whose event is being reported.
+
+Note that some networked filesystems, such as Samba-mounted Unix
+volumes, might not send notifications about file changes.  In these
+cases, this function will return a valid descriptor, but notifications
+will never come in.  Volumes shared from remote Windows machines do
+generate notifications correctly, though.  */)
   (Lisp_Object file, Lisp_Object filter, Lisp_Object callback)
 {
   Lisp_Object encoded_file, watch_object, watch_descriptor;
diff --git a/src/xdisp.c b/src/xdisp.c
index c7ee0d37f47..9fb9487732f 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -9516,13 +9516,14 @@ message_dolog (const char *m, ptrdiff_t nbytes, int nlflag, int multibyte)
             }
         }
       else if (nbytes)
-        insert_1 (m, nbytes, 1, 0, 0);
+        insert_1_both (m, chars_in_text (msg, nbytes), nbytes, 1, 0, 0);
 
       if (nlflag)
         {
           ptrdiff_t this_bol, this_bol_byte, prev_bol, prev_bol_byte;
           printmax_t dups;
-          insert_1 ("\n", 1, 1, 0, 0);
+
+          insert_1_both ("\n", 1, 1, 1, 0, 0);
 
           scan_newline (Z, Z_BYTE, BEG, BEG_BYTE, -2, 0);
           this_bol = PT;
@@ -9551,7 +9552,7 @@ message_dolog (const char *m, ptrdiff_t nbytes, int nlflag, int multibyte)
                          change message_log_check_duplicate.  */
                       int duplen = sprintf (dupstr, " [%"pMd" times]", dups);
                       TEMP_SET_PT_BOTH (Z - 1, Z_BYTE - 1);
-                      insert_1 (dupstr, duplen, 1, 0, 1);
+                      insert_1_both (dupstr, duplen, duplen, 1, 0, 1);
                     }
                 }
             }