merge from trunk; clean up some issues

1 files changed, 11 insertions, 11 deletions

diff --git a/src/search.c b/src/search.c
index 4dd3260b735..b4e3cca8269 100644
--- a/src/search.c
+++ b/src/search.c
@@ -326,20 +326,20 @@ looking_at_1 (Lisp_Object string, bool posix)
   if (i == -2)
     matcher_overflow ();
 
-  val = (0 <= i ? Qt : Qnil);
+  val = (i >= 0 ? Qt : Qnil);
   if (NILP (Vinhibit_changing_match_data) && i >= 0)
+  {
     for (i = 0; i < search_regs.num_regs; i++)
       if (search_regs.start[i] >= 0)
         {
           search_regs.start[i]
             = BYTE_TO_CHAR (search_regs.start[i] + BEGV_BYTE);
-          search_regs.end[i]
-            = BYTE_TO_CHAR (search_regs.end[i] + BEGV_BYTE);
-        }
-
-  /* Set last_thing_searched only when match data is changed.  */
-  if (NILP (Vinhibit_changing_match_data))
+         search_regs.end[i]
+           = BYTE_TO_CHAR (search_regs.end[i] + BEGV_BYTE);
+       }
+    /* Set last_thing_searched only when match data is changed.  */
     XSETBUFFER (last_thing_searched, current_buffer);
+  }
 
   return val;
 }
@@ -2450,7 +2450,7 @@ since only regular expressions have distinguished subexpressions.  */)
                   else if (c >= '1' && c <= '9')
                     {
                       if (c - '0' < search_regs.num_regs
-                          && 0 <= search_regs.start[c - '0'])
+                          && search_regs.start[c - '0'] >= 0)
                         {
                           substart = search_regs.start[c - '0'];
                           subend = search_regs.end[c - '0'];
@@ -2533,9 +2533,9 @@ since only regular expressions have distinguished subexpressions.  */)
       bool str_multibyte = STRING_MULTIBYTE (newtext);
       bool really_changed = 0;
 
-      substed_alloc_size = ((STRING_BYTES_BOUND - 100) / 2 < length
-                            ? STRING_BYTES_BOUND
-                            : length * 2 + 100);
+      substed_alloc_size = (length <= (STRING_BYTES_BOUND - 100) / 2
+                            ? length * 2 + 100
+                            : STRING_BYTES_BOUND);
       substed = xmalloc (substed_alloc_size);
       substed_len = 0;