Merge from origin/emacs-25

acae275 ; Spelling fixes
d8fac73 Update README for precompiled windows Emacs.
23570fd Clarify documentation of 'vc-responsible-backend' wrt symlinks
f708cb2 Clarify doc string of 'transpose-sexps'
cd05b1d Fix docstring of 'browse-url-firefox-new-window-is-tab'
bdc89eb Improve documentation of 'font-lock-remove-keywords'
4a0c590 Fix documentation of the command summary key
0221b7a Mark relocation workarounds with REL_ALLOC

3 files changed, 13 insertions, 6 deletions

diff --git a/src/emacs.c b/src/emacs.c
index 13378c4c3b0..b74df21196a 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1193,7 +1193,7 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
 
       /* Called before syms_of_fileio, because it sets up Qerror_condition.  */
       syms_of_data ();
-      syms_of_fns ();      /* Before syms_of_charset which uses hashtables.  */
+      syms_of_fns ();  /* Before syms_of_charset which uses hash tables.  */
       syms_of_fileio ();
       /* Before syms_of_coding to initialize Vgc_cons_threshold.  */
       syms_of_alloc ();
diff --git a/src/lread.c b/src/lread.c
index 58d518ce40b..eab9b8bea08 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -2574,7 +2574,7 @@ read1 (Lisp_Object readcharfun, int *pch, bool first_in_list)
           c = READCHAR;
           if (c == '(')
             {
-              /* Accept extended format for hashtables (extensible to
+              /* Accept extended format for hash tables (extensible to
                  other types), e.g.
                  #s(hash-table size 2 test equal data (k1 v1 k2 v2))  */
               Lisp_Object tmp = read_list (0, readcharfun);
@@ -2620,10 +2620,10 @@ read1 (Lisp_Object readcharfun, int *pch, bool first_in_list)
               if (!NILP (params[param_count + 1]))
                 param_count += 2;
 
-              /* This is the hashtable data.  */
+              /* This is the hash table data.  */
               data = Fplist_get (tmp, Qdata);
 
-              /* Now use params to make a new hashtable and fill it.  */
+              /* Now use params to make a new hash table and fill it.  */
               ht = Fmake_hash_table (param_count, params);
 
               while (CONSP (data))
@@ -2631,7 +2631,7 @@ read1 (Lisp_Object readcharfun, int *pch, bool first_in_list)
                   key = XCAR (data);
                   data = XCDR (data);
                   if (!CONSP (data))
-                    error ("Odd number of elements in hashtable data");
+                    error ("Odd number of elements in hash table data");
                   val = XCAR (data);
                   data = XCDR (data);
                   Fputhash (key, val, ht);
diff --git a/src/search.c b/src/search.c
index 25d81f2baf6..e597c33a0fb 100644
--- a/src/search.c
+++ b/src/search.c
@@ -2022,20 +2022,27 @@ boyer_moore (EMACS_INT n, unsigned char *base_pat,
               cursor += dirlen - i - direction; /* fix cursor */
               if (i + direction == 0)
                 {
-                  ptrdiff_t position, start, end, cursor_off;
+                  ptrdiff_t position, start, end;
+#ifdef REL_ALLOC
+                  ptrdiff_t cursor_off;
+#endif
 
                   cursor -= direction;
 
                   position = pos_byte + cursor - p2 + ((direction > 0)
                                                        ? 1 - len_byte : 0);
+#ifdef REL_ALLOC
                   /* set_search_regs might call malloc, which could
                      cause ralloc.c relocate buffer text.  We need to
                      update pointers into buffer text due to that.  */
                   cursor_off = cursor - p2;
+#endif
                   set_search_regs (position, len_byte);
+#ifdef REL_ALLOC
                   p_limit = BYTE_POS_ADDR (limit);
                   p2 = BYTE_POS_ADDR (pos_byte);
                   cursor = p2 + cursor_off;
+#endif
 
                   if (NILP (Vinhibit_changing_match_data))
                     {