5 files changed, 24 insertions, 16 deletions

diff --git a/src/coding.c b/src/coding.c
index 3bee16c4f0c..e591bedc3e5 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -6828,11 +6828,11 @@ decode_eol (struct coding_system *coding)
         }
       else
         {
-          ptrdiff_t pos_byte = coding->dst_pos_byte;
           ptrdiff_t pos = coding->dst_pos;
-          ptrdiff_t pos_end = pos + coding->produced_char - 1;
+          ptrdiff_t pos_byte = coding->dst_pos_byte;
+          ptrdiff_t pos_end = pos_byte + coding->produced - 1;
 
-          while (pos < pos_end)
+          while (pos_byte < pos_end)
             {
               p = BYTE_POS_ADDR (pos_byte);
               if (*p == '\r' && p[1] == '\n')
diff --git a/src/keyboard.c b/src/keyboard.c
index 3431cd8fbd2..4d107277634 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -11622,10 +11622,10 @@ It's called with one argument, the help string to display.  */);
   DEFVAR_LISP ("disable-point-adjustment", Vdisable_point_adjustment,
                doc: /* If non-nil, suppress point adjustment after executing a command.
 
-After a command is executed, if point is moved into a region that has
-special properties (e.g. composition, display), we adjust point to
-the boundary of the region.  But, when a command sets this variable to
-non-nil, we suppress the point adjustment.
+After a command is executed, if point moved into a region that has
+special properties (e.g. composition, display), Emacs adjusts point to
+the boundary of the region.  But when a command binds this variable to
+non-nil, this point adjustment is suppressed.
 
 This variable is set to nil before reading a command, and is checked
 just after executing the command.  */);
@@ -11633,9 +11633,9 @@ just after executing the command.  */);
 
   DEFVAR_LISP ("global-disable-point-adjustment",
                Vglobal_disable_point_adjustment,
-               doc: /* If non-nil, always suppress point adjustment.
+               doc: /* If non-nil, always suppress point adjustments.
 
-The default value is nil, in which case, point adjustment are
+The default value is nil, in which case point adjustments are
 suppressed only after special commands that set
 `disable-point-adjustment' (which see) to non-nil.  */);
   Vglobal_disable_point_adjustment = Qnil;
diff --git a/src/regex.c b/src/regex.c
index dd3f2b3cd67..164eb4612ae 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -5444,7 +5444,7 @@ re_match_2_internal (struct re_pattern_buffer *bufp, const_re_char *string1,
         case charset:
         case charset_not:
           {
-            register unsigned int c;
+            register unsigned int c, corig;
             boolean not = (re_opcode_t) *(p - 1) == charset_not;
             int len;
 
@@ -5473,7 +5473,7 @@ re_match_2_internal (struct re_pattern_buffer *bufp, const_re_char *string1,
               }
 
             PREFETCH ();
-            c = RE_STRING_CHAR_AND_LENGTH (d, len, target_multibyte);
+            corig = c = RE_STRING_CHAR_AND_LENGTH (d, len, target_multibyte);
             if (target_multibyte)
               {
                 int c1;
@@ -5517,11 +5517,17 @@ re_match_2_internal (struct re_pattern_buffer *bufp, const_re_char *string1,
               {
                 int class_bits = CHARSET_RANGE_TABLE_BITS (&p[-1]);
 
-                if (  (class_bits & BIT_LOWER && ISLOWER (c))
+                if (  (class_bits & BIT_LOWER
+                       && (ISLOWER (c)
+                           || (corig != c
+                               && c == upcase (corig) && ISUPPER(c))))
                     | (class_bits & BIT_MULTIBYTE)
                     | (class_bits & BIT_PUNCT && ISPUNCT (c))
                     | (class_bits & BIT_SPACE && ISSPACE (c))
-                    | (class_bits & BIT_UPPER && ISUPPER (c))
+                    | (class_bits & BIT_UPPER
+                       && (ISUPPER (c)
+                           || (corig != c
+                               && c == downcase (corig) && ISLOWER (c))))
                     | (class_bits & BIT_WORD  && ISWORD  (c))
                     | (class_bits & BIT_ALPHA && ISALPHA (c))
                     | (class_bits & BIT_ALNUM && ISALNUM (c))
diff --git a/src/w32heap.c b/src/w32heap.c
index 69706a3a57d..b908169b96c 100644
--- a/src/w32heap.c
+++ b/src/w32heap.c
@@ -641,12 +641,14 @@ mmap_alloc (void **var, size_t nbytes)
      advance, and the buffer is enlarged several times as the data is
      decompressed on the fly.  */
   if (nbytes < MAX_BUFFER_SIZE)
-    p = VirtualAlloc (NULL, (nbytes * 2), MEM_RESERVE, PAGE_READWRITE);
+    p = VirtualAlloc (NULL, ROUND_UP (nbytes * 2, get_allocation_unit ()),
+                      MEM_RESERVE, PAGE_READWRITE);
 
   /* If it fails, or if the request is above 512MB, try with the
      requested size.  */
   if (p == NULL)
-    p = VirtualAlloc (NULL, nbytes, MEM_RESERVE, PAGE_READWRITE);
+    p = VirtualAlloc (NULL, ROUND_UP (nbytes, get_allocation_unit ()),
+                      MEM_RESERVE, PAGE_READWRITE);
 
   if (p != NULL)
     {
diff --git a/src/xfaces.c b/src/xfaces.c
index 2880eedc1e5..7762e0f61e9 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -6207,7 +6207,7 @@ where R,G,B are numbers between 0 and 255 and name is an arbitrary string.  */)
       int num;
 
       while (fgets (buf, sizeof (buf), fp) != NULL) {
-        if (sscanf (buf, "%u %u %u %n", &red, &green, &blue, &num) == 3)
+        if (sscanf (buf, "%d %d %d %n", &red, &green, &blue, &num) == 3)
           {
 #ifdef HAVE_NTGUI
             int color = RGB (red, green, blue);