Merge from savannah/emacs-30

b585826a65e ; * lisp/files.el (require-with-check): Fix doc string an...
6d55e94996e macOS: Wrong frame rectangle after wake (bug#71912)
c49724b9649 ; Grammar fixes
5c3d340e001 Fix format 2 cmap handling in sfnt.c

2 files changed, 6 insertions, 5 deletions

diff --git a/src/nsterm.m b/src/nsterm.m
index 473a5e705e9..8c405738467 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -7968,6 +7968,7 @@ ns_in_echo_area (void)
     dpyinfo->ns_focus_frame = emacsframe;
 
   ns_frame_rehighlight (emacsframe);
+  [self adjustEmacsFrameRect];
 
   event.kind = FOCUS_IN_EVENT;
   XSETFRAME (event.frame_or_window, emacsframe);
diff --git a/src/sfnt.c b/src/sfnt.c
index b235c795ef7..1ed492b7506 100644
--- a/src/sfnt.c
+++ b/src/sfnt.c
@@ -1093,10 +1093,10 @@ sfnt_lookup_glyph_2 (sfnt_char character,
   unsigned char *slice;
   uint16_t glyph;
 
-  if (character > 65335)
+  if (character > 65535)
     return 0;
 
-  i = character >> 16;
+  i = character >> 8;
   j = character & 0xff;
   k = format2->sub_header_keys[i] / 8;
 
@@ -1129,9 +1129,9 @@ sfnt_lookup_glyph_2 (sfnt_char character,
         return 0;
     }
 
-  /* k is 0, so glyph_index_array[i] is the glyph.  */
-  return (i < format2->num_glyphs
-          ? format2->glyph_index_array[i]
+  /* k is 0, so glyph_index_array[j] is the glyph.  */
+  return (j < format2->num_glyphs
+          ? format2->glyph_index_array[j]
           : 0);
 }