Merge from origin/emacs-25

d4b93e1 Minor fixes in global-auto-composition-mode
02b037b Allow arithmetic operators inside C++ template constructs.
44b16f6 Avoid crashes in semi-malformed 'condition-case'
652e5b4 Allow arithmetic operators inside C++ template constructs.
d9ea795 Fix regression with 'recent-keys' and keyboard macros
903603f Fix wording in a doc-view.el comment
cf79616 ; Spelling fixes
f8bf1b3 CONTRIBUTE cleanups and updates
f3aaca3 Port USE_STACK_LISP_OBJECTS fix to Clang
1834ac7 Port to x86 GCC 4.3.1 and earlier
8482949 Fix point movement under 'scroll-conservatively'
c1313b5 Replace colon in file name (not legal on Windows)
f7af26c Fix a typo in edt.texi
8badf95 Make 'mmap_realloc' on MS-Windows more reliable
856cd94 Grep alias `all' shall not match parent directory

6 files changed, 66 insertions, 49 deletions

diff --git a/src/emacs.c b/src/emacs.c
index 628b9be3131..c512885076c 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1316,8 +1316,8 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
 #endif
 
 #ifdef HAVE_NS
-  /* Initialise the locale from user defaults. */
-  ns_init_locale();
+  /* Initialize the locale from user defaults.  */
+  ns_init_locale ();
 #endif
 
   /* Initialize and GC-protect Vinitial_environment and
diff --git a/src/eval.c b/src/eval.c
index 6c912bc4762..26104a58277 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1245,7 +1245,7 @@ internal_lisp_condition_case (volatile Lisp_Object var, Lisp_Object bodyform,
     for (i = 0; i < clausenb; i++)
       {
         Lisp_Object clause = clauses[i];
-        Lisp_Object condition = XCAR (clause);
+        Lisp_Object condition = CONSP (clause) ? XCAR (clause) : Qnil;
         if (!CONSP (condition))
           condition = Fcons (condition, Qnil);
         struct handler *c = push_handler (condition, CONDITION_CASE);
diff --git a/src/keyboard.c b/src/keyboard.c
index baca4b56fb5..3431cd8fbd2 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -3220,33 +3220,37 @@ record_char (Lisp_Object c)
   else
     store_kbd_macro_char (c);
 
-  if (!recorded)
-    {
-      total_keys += total_keys < NUM_RECENT_KEYS;
-      ASET (recent_keys, recent_keys_index, c);
-      if (++recent_keys_index >= NUM_RECENT_KEYS)
-        recent_keys_index = 0;
-    }
-  else if (recorded < 0)
+  /* recent_keys should not include events from keyboard macros.  */
+  if (NILP (Vexecuting_kbd_macro))
     {
-      /* We need to remove one or two events from recent_keys.
-         To do this, we simply put nil at those events and move the
-         recent_keys_index backwards over those events.  Usually,
-         users will never see those nil events, as they will be
-         overwritten by the command keys entered to see recent_keys
-         (e.g. C-h l).  */
-
-      while (recorded++ < 0 && total_keys > 0)
+      if (!recorded)
         {
-          if (total_keys < NUM_RECENT_KEYS)
-            total_keys--;
-          if (--recent_keys_index < 0)
-            recent_keys_index = NUM_RECENT_KEYS - 1;
-          ASET (recent_keys, recent_keys_index, Qnil);
+          total_keys += total_keys < NUM_RECENT_KEYS;
+          ASET (recent_keys, recent_keys_index, c);
+          if (++recent_keys_index >= NUM_RECENT_KEYS)
+            recent_keys_index = 0;
+        }
+      else if (recorded < 0)
+        {
+          /* We need to remove one or two events from recent_keys.
+             To do this, we simply put nil at those events and move the
+             recent_keys_index backwards over those events.  Usually,
+             users will never see those nil events, as they will be
+             overwritten by the command keys entered to see recent_keys
+             (e.g. C-h l).  */
+
+          while (recorded++ < 0 && total_keys > 0)
+            {
+              if (total_keys < NUM_RECENT_KEYS)
+                total_keys--;
+              if (--recent_keys_index < 0)
+                recent_keys_index = NUM_RECENT_KEYS - 1;
+              ASET (recent_keys, recent_keys_index, Qnil);
+            }
         }
-    }
 
-  num_nonmacro_input_events++;
+      num_nonmacro_input_events++;
+    }
 
   /* Write c to the dribble file.  If c is a lispy event, write
      the event's symbol to the dribble file, in <brackets>.  Bleaugh.
diff --git a/src/lisp.h b/src/lisp.h
index 2221acd5827..8aa286159d7 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -4526,6 +4526,12 @@ extern void *record_xmalloc (size_t) ATTRIBUTE_ALLOC_SIZE ((1));
    This feature is experimental and requires careful debugging.
    Build with CPPFLAGS='-DUSE_STACK_LISP_OBJECTS=0' to disable it.  */
 
+#if (!defined USE_STACK_LISP_OBJECTS \
+     && defined __GNUC__ && !defined __clang__ \
+     && !(4 < __GNUC__ + (3 < __GNUC_MINOR__ + (2 <= __GNUC_PATCHLEVEL__))))
+  /* Work around GCC bugs 36584 and 35271, which were fixed in GCC 4.3.2.  */
+# define USE_STACK_LISP_OBJECTS false
+#endif
 #ifndef USE_STACK_LISP_OBJECTS
 # define USE_STACK_LISP_OBJECTS true
 #endif
diff --git a/src/w32heap.c b/src/w32heap.c
index 00da86a9598..69706a3a57d 100644
--- a/src/w32heap.c
+++ b/src/w32heap.c
@@ -652,15 +652,19 @@ mmap_alloc (void **var, size_t nbytes)
     {
       /* Now, commit pages for NBYTES.  */
       *var = VirtualAlloc (p, nbytes, MEM_COMMIT, PAGE_READWRITE);
+      if (*var == NULL)
+        p = *var;
     }
 
   if (!p)
     {
-      if (GetLastError () == ERROR_NOT_ENOUGH_MEMORY)
+      DWORD e = GetLastError ();
+
+      if (e == ERROR_NOT_ENOUGH_MEMORY)
         errno = ENOMEM;
       else
         {
-          DebPrint (("mmap_alloc: error %ld\n", GetLastError ()));
+          DebPrint (("mmap_alloc: error %ld\n", e));
           errno = EINVAL;
         }
     }
@@ -683,6 +687,7 @@ void *
 mmap_realloc (void **var, size_t nbytes)
 {
   MEMORY_BASIC_INFORMATION memInfo, m2;
+  void *old_ptr;
 
   if (*var == NULL)
     return mmap_alloc (var, nbytes);
@@ -694,12 +699,14 @@ mmap_realloc (void **var, size_t nbytes)
       return mmap_alloc (var, nbytes);
     }
 
+  memset (&memInfo, 0, sizeof (memInfo));
   if (VirtualQuery (*var, &memInfo, sizeof (memInfo)) == 0)
     DebPrint (("mmap_realloc: VirtualQuery error = %ld\n", GetLastError ()));
 
   /* We need to enlarge the block.  */
   if (memInfo.RegionSize < nbytes)
     {
+      memset (&m2, 0, sizeof (m2));
       if (VirtualQuery (*var + memInfo.RegionSize, &m2, sizeof(m2)) == 0)
         DebPrint (("mmap_realloc: VirtualQuery error = %ld\n",
                    GetLastError ()));
@@ -715,31 +722,31 @@ mmap_realloc (void **var, size_t nbytes)
                             MEM_COMMIT, PAGE_READWRITE);
           if (!p /* && GetLastError() != ERROR_NOT_ENOUGH_MEMORY */)
             {
-              DebPrint (("realloc enlarge: VirtualAlloc error %ld\n",
+              DebPrint (("realloc enlarge: VirtualAlloc (%p + %I64x, %I64x) error %ld\n",
+                         *var, (uint64_t)memInfo.RegionSize,
+                         (uint64_t)(nbytes - memInfo.RegionSize),
                          GetLastError ()));
-              errno = ENOMEM;
+              DebPrint (("next region: %p %p %I64x %x\n", m2.BaseAddress,
+                         m2.AllocationBase, m2.RegionSize, m2.AllocationProtect));
             }
+          else
+            return *var;
+        }
+      /* Else we must actually enlarge the block by allocating a new
+         one and copying previous contents from the old to the new one.  */
+      old_ptr = *var;
+
+      if (mmap_alloc (var, nbytes))
+        {
+          CopyMemory (*var, old_ptr, memInfo.RegionSize);
+          mmap_free (&old_ptr);
           return *var;
         }
       else
         {
-          /* Else we must actually enlarge the block by allocating a
-             new one and copying previous contents from the old to the
-             new one.  */
-          void *old_ptr = *var;
-
-          if (mmap_alloc (var, nbytes))
-            {
-              CopyMemory (*var, old_ptr, memInfo.RegionSize);
-              mmap_free (&old_ptr);
-              return *var;
-            }
-          else
-            {
-              /* We failed to enlarge the buffer.  */
-              *var = old_ptr;
-              return NULL;
-            }
+          /* We failed to reallocate the buffer.  */
+          *var = old_ptr;
+          return NULL;
         }
     }
 
@@ -751,7 +758,7 @@ mmap_realloc (void **var, size_t nbytes)
         {
           /* Let's give some memory back to the system and release
              some pages.  */
-          void *old_ptr = *var;
+          old_ptr = *var;
 
           if (mmap_alloc (var, nbytes))
             {
diff --git a/src/xdisp.c b/src/xdisp.c
index 840699d00fb..fed58799eaa 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -16920,7 +16920,7 @@ redisplay_window (Lisp_Object window, bool just_this_one_p)
       if (scroll_conservatively > SCROLL_LIMIT)
         {
           int window_total_lines
-            = WINDOW_TOTAL_LINES (w) * FRAME_LINE_HEIGHT (f) * frame_line_height;
+            = WINDOW_TOTAL_LINES (w) * FRAME_LINE_HEIGHT (f) / frame_line_height;
           int margin =
             scroll_margin > 0
             ? min (scroll_margin, window_total_lines / 4)