Merge remote-tracking branch 'origin/master' into feature/android

3 files changed, 10 insertions, 7 deletions

diff --git a/src/regex-emacs.c b/src/regex-emacs.c
index 9e298b81ebb..51fc2b0558d 100644
--- a/src/regex-emacs.c
+++ b/src/regex-emacs.c
@@ -554,7 +554,7 @@ print_partial_compiled_pattern (re_char *start, re_char *end)
             fprintf (stderr, "/charset [%s",
                      (re_opcode_t) *(p - 1) == charset_not ? "^" : "");
 
-            if (p + *p >= pend)
+            if (p + (*p & 0x7f) >= pend)
               fputs (" !extends past end of pattern! ", stderr);
 
             for (c = 0; c < 256; c++)
diff --git a/src/search.c b/src/search.c
index 122d6166637..3edfc0bc1a8 100644
--- a/src/search.c
+++ b/src/search.c
@@ -162,7 +162,7 @@ clear_regexp_cache (void)
     /* It's tempting to compare with the syntax-table we've actually changed,
        but it's not sufficient because char-table inheritance means that
        modifying one syntax-table can change others at the same time.  */
-    if (!searchbufs[i].busy && !EQ (searchbufs[i].syntax_table, Qt))
+    if (!searchbufs[i].busy && !BASE_EQ (searchbufs[i].syntax_table, Qt))
       searchbufs[i].regexp = Qnil;
 }
 
@@ -214,10 +214,11 @@ compile_pattern (Lisp_Object pattern, struct re_registers *regp,
           && !cp->busy
           && STRING_MULTIBYTE (cp->regexp) == STRING_MULTIBYTE (pattern)
           && !NILP (Fstring_equal (cp->regexp, pattern))
-          && EQ (cp->buf.translate, translate)
+          && BASE_EQ (cp->buf.translate, translate)
           && cp->posix == posix
-          && (EQ (cp->syntax_table, Qt)
-              || EQ (cp->syntax_table, BVAR (current_buffer, syntax_table)))
+          && (BASE_EQ (cp->syntax_table, Qt)
+              || BASE_EQ (cp->syntax_table,
+                          BVAR (current_buffer, syntax_table)))
           && !NILP (Fequal (cp->f_whitespace_regexp, Vsearch_spaces_regexp))
           && cp->buf.charset_unibyte == charset_unibyte)
         break;
@@ -2892,7 +2893,7 @@ Return value is undefined if the last search failed.  */)
       ptrdiff_t start = search_regs.start[i];
       if (start >= 0)
         {
-          if (EQ (last_thing_searched, Qt)
+          if (BASE_EQ (last_thing_searched, Qt)
               || ! NILP (integers))
             {
               XSETFASTINT (data[2 * i], start);
diff --git a/src/xdisp.c b/src/xdisp.c
index 4e9c5f49e58..5e471cad61e 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -29268,7 +29268,9 @@ calc_pixel_width_or_height (double *res, struct it *it, Lisp_Object prop,
       /* 'width': the width of FONT.  */
       if (EQ (prop, Qwidth))
         return OK_PIXELS (font
-                          ? FONT_WIDTH (font)
+                          ? (font->average_width
+                             ? font->average_width
+                             : font->space_width)
                           : FRAME_COLUMN_WIDTH (it->f));
 #else
       if (EQ (prop, Qheight) || EQ (prop, Qwidth))