Merge from origin/emacs-25

a9c48d5 Additional fixes for file notification
6bd9d69 Fix documentation of 'global-disable-point-adjustment'
8c22ac9 ; Spelling fix
2975784 Set file modes of pinentry socket for extra safety
2667b3e Clarify GnuPG version compatibility chapter
5e34c36 Revert "Change the default socket location for pinentry"
e19c1c3 Kill off xref--display-history
5698947 Keep the xref buffer visible until the user quits it explicitly
e34fbde Change the default socket location for pinentry
5f89658 Mention how to enable pinentry feature
db51224 Sync with gnulib
aa5a794 Remove `semanticdb-save-all-db-idle' from `auto-save-hook'
2d8b2fd Restore point when writing semantic table to disk
27d3430 Mention pinentry.el in epa manual
5baa001 Fix Bug#22736
7261355 Grammar fix in doc string
d0f3b18 Naming fix for consistency
74ec92d Prefer customized value for GnuPG executable
ea0b604 Fix memory reservation on MS-Windows
c5f72aa Update NextStep readme and add wish list.
6de26a7 Report also result in `file-notify--test-event-handler'
5d17ae7 Improve file-notify-test08-watched-file-in-watched-dir
1cb1268 Fix todo-mode item date editing bugs
1e996cf Fix "[:upper:]" for non-ASCII characters
896f993 Allow customising the article mode cursor behavior
24c1c1d Use pop-to-buffer-same-window in woman.el
2a75f64 New filenotify test for bug#22736
c9bccf7 Report critical battery errors
d675db9 Make eww message toggling message clearer
5e0bb40 * lisp/calc/calc-units.el (math-standard-units): Update to 2014 CODATA adjustment.
fa8fd65 ; Improve character-folding entries in NEWS
3722a69 Fix bugs in window resizing code
289d5c6 Fix decoding DOS EOL in a unibyte buffer
2abcb06 Correct c-parse-state cache manipulation error.
14aec91 Take advantage of new GnuPG version check function
e80c2a7 Make GnuPG version check robuster
15a9464 Fix x-load-color-file pointer signedness
132dbf0 * lisp/time-stamp.el (time-stamp-time-zone): Fix doc string punct.
78ab6f1 Follow convention for greek letter constants.
106b5bb Add Stefan-Boltzmann constant to calc units table.
b96baa8 * lisp/calc/calc-units.el (math-build-units-table-buffer): Use special-mode.
5f91cf9 Avoid loading cl-lib for term/xterm.elc, eg in -Q -nw.  (Bug#22669)
2d40f7d Fix soffice UserInstallation-URL for Windows
b1a3ebe Fix display of <pre> elements
57d0e3d ; * lisp/help-fns.el: Remove outdated comment.
7a0628d ; * admin/make-tarball.txt: Mention cleaning.

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);