Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

2 files changed, 27 insertions, 22 deletions

diff --git a/src/comp.c b/src/comp.c
index a2b6a959c2a..bd5e637afe3 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -1972,27 +1972,32 @@ emit_mvar_rval (Lisp_Object mvar)
   if (!NILP (const_vld))
     {
       Lisp_Object value = CALLNI (comp-cstr-imm, mvar);
-      if (comp.debug > 1)
+      if (NILP (Fgethash (value,
+                          CALLNI (comp-ctxt-non-materializable-objs-h, Vcomp_ctxt),
+                          Qnil)))
         {
-          Lisp_Object func =
-            Fgethash (value,
-                      CALLNI (comp-ctxt-byte-func-to-func-h, Vcomp_ctxt),
-                      Qnil);
-
-          emit_comment (
-            SSDATA (
-              Fprin1_to_string (
-                NILP (func) ? value : CALLNI (comp-func-c-name, func),
-                Qnil, Qnil)));
-        }
-      if (FIXNUMP (value))
-        {
-          /* We can still emit directly objects that are self-contained in a
-             word (read fixnums).  */
-          return emit_rvalue_from_lisp_obj (value);
+          if (comp.debug > 1)
+            {
+              Lisp_Object func =
+                Fgethash (value,
+                          CALLNI (comp-ctxt-byte-func-to-func-h, Vcomp_ctxt),
+                          Qnil);
+
+              emit_comment (
+                SSDATA (
+                  Fprin1_to_string (
+                    NILP (func) ? value : CALLNI (comp-func-c-name, func),
+                    Qnil, Qnil)));
+            }
+          if (FIXNUMP (value))
+            {
+              /* We can still emit directly objects that are self-contained in a
+                 word (read fixnums).  */
+              return emit_rvalue_from_lisp_obj (value);
+            }
+          /* Other const objects are fetched from the reloc array.  */
+          return emit_lisp_obj_rval (value);
         }
-      /* Other const objects are fetched from the reloc array.  */
-      return emit_lisp_obj_rval (value);
     }
 
   return gcc_jit_lvalue_as_rvalue (emit_mvar_lval (mvar));
diff --git a/src/frame.c b/src/frame.c
index 70e200d9219..36ce36436f3 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -364,8 +364,8 @@ frame_redisplay_p (struct frame *f)
 {
   if (is_tty_frame (f))
     {
-      struct frame *p = FRAME_PARENT_FRAME (f);
-      struct frame *q = NULL;
+      struct frame *p = f;
+      struct frame *q = f;
 
       while (p)
         {
@@ -387,7 +387,7 @@ frame_redisplay_p (struct frame *f)
          frame of its terminal.  Any other tty frame can be redisplayed
          iff it is the top frame of its terminal itself which must be
          always visible.  */
-      return (q ? q == r : f == r);
+      return q == r;
     }
   else
 #ifndef HAVE_X_WINDOWS