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

3 files changed, 18 insertions, 6 deletions

diff --git a/src/nsterm.m b/src/nsterm.m
index 8c72bb25df1..78089906752 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -1624,7 +1624,7 @@ ns_free_frame_resources (struct frame *f)
     [f->output_data.ns->miniimage release];
 
   [[view window] close];
-  [view release];
+  [view removeFromSuperview];
 
   xfree (f->output_data.ns);
   f->output_data.ns = NULL;
diff --git a/src/pgtkfns.c b/src/pgtkfns.c
index 9cec7243515..c154d37f47f 100644
--- a/src/pgtkfns.c
+++ b/src/pgtkfns.c
@@ -3451,7 +3451,6 @@ frame_geometry (Lisp_Object frame, Lisp_Object attribute)
   tab_bar_height = FRAME_TAB_BAR_HEIGHT (f);
   tab_bar_width = (tab_bar_height
                    ? native_width - 2 * internal_border_width : 0);
-  inner_top += tab_bar_height;
 
   /* Construct list.  */
   if (EQ (attribute, Qouter_edges))
@@ -3464,10 +3463,12 @@ frame_geometry (Lisp_Object frame, Lisp_Object attribute)
   else if (EQ (attribute, Qinner_edges))
     return list4 (make_fixnum (native_left + internal_border_width),
                   make_fixnum (native_top
-                               + tool_bar_height
+                               + tab_bar_height
+                               + FRAME_TOOL_BAR_TOP_HEIGHT (f)
                                + internal_border_width),
                   make_fixnum (native_right - internal_border_width),
-                  make_fixnum (native_bottom - internal_border_width));
+                  make_fixnum (native_bottom - internal_border_width
+                               - FRAME_TOOL_BAR_BOTTOM_HEIGHT (f)));
   else
     return
       list (Fcons (Qouter_position,
diff --git a/src/regex-emacs.c b/src/regex-emacs.c
index fea34df991b..9e298b81ebb 100644
--- a/src/regex-emacs.c
+++ b/src/regex-emacs.c
@@ -1716,7 +1716,8 @@ regex_compile (re_char *pattern, ptrdiff_t size,
 
   /* Address of start of the most recently finished expression.
      This tells, e.g., postfix * where to find the start of its
-     operand.  Reset at the beginning of groups and alternatives.  */
+     operand.  Reset at the beginning of groups and alternatives,
+     and after ^ and \` for dusty-deck compatibility.  */
   unsigned char *laststart = 0;
 
   /* Address of beginning of regexp, or inside of last group.  */
@@ -1847,12 +1848,16 @@ regex_compile (re_char *pattern, ptrdiff_t size,
         case '^':
           if (! (p == pattern + 1 || at_begline_loc_p (pattern, p)))
             goto normal_char;
+          /* Special case for compatibility: postfix ops after ^ become
+             literals.  */
+          laststart = 0;
           BUF_PUSH (begline);
           break;
 
         case '$':
           if (! (p == pend || at_endline_loc_p (p, pend)))
             goto normal_char;
+          laststart = b;
           BUF_PUSH (endline);
           break;
 
@@ -1892,7 +1897,7 @@ regex_compile (re_char *pattern, ptrdiff_t size,
 
             /* Star, etc. applied to an empty pattern is equivalent
                to an empty pattern.  */
-            if (!laststart || laststart == b)
+            if (laststart == b)
               break;
 
             /* Now we know whether or not zero matches is allowed
@@ -2544,18 +2549,24 @@ regex_compile (re_char *pattern, ptrdiff_t size,
               break;
 
             case 'b':
+              laststart = b;
               BUF_PUSH (wordbound);
               break;
 
             case 'B':
+              laststart = b;
               BUF_PUSH (notwordbound);
               break;
 
             case '`':
+              /* Special case for compatibility: postfix ops after \` become
+                 literals, as for ^ (see above).  */
+              laststart = 0;
               BUF_PUSH (begbuf);
               break;
 
             case '\'':
+              laststart = b;
               BUF_PUSH (endbuf);
               break;