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

5 files changed, 22 insertions, 21 deletions

diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index c7822793a20..9cfb12c9231 100644
--- a/doc/misc/erc.texi
+++ b/doc/misc/erc.texi
@@ -867,8 +867,8 @@ ERC's auth-source integration}.
 @defun erc-compute-server &optional server
 Return an IRC server name.
 
-This tries a number of increasingly more default methods until a non-@code{nil}
-value is found.
+This tries a progressively greater number of default methods until a
+non-@code{nil} value is found.
 
 @itemize @bullet
 @item @var{server} (the argument passed to this function)
@@ -888,8 +888,8 @@ IRC server to use if one is not provided.
 @defun erc-compute-port &optional port
 Return a port for an IRC server.
 
-This tries a number of increasingly more default methods until a non-@code{nil}
-value is found.
+This tries a progressively greater number of default methods until a
+non-@code{nil} value is found.
 
 @itemize @bullet
 @item @var{port} (the argument passed to this function)
@@ -910,7 +910,7 @@ This can be either a string or a number.
 @defun erc-compute-nick &optional nick
 Return user's IRC nick.
 
-This tries a number of increasingly more default methods until a
+This tries a progressively greater number of default methods until a
 non-@code{nil} value is found.
 
 @itemize
@@ -1010,7 +1010,7 @@ auth-source facility to retrieve a server password, although hitting
 @defun erc-compute-full-name &optional full-name
 Return user's full name.
 
-This tries a number of increasingly more default methods until a
+This tries a progressively greater number of default methods until a
 non-@code{nil} value is found.
 
 @itemize @bullet
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 118adb803c9..5e8fa3051c7 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -8794,7 +8794,7 @@ Sets the buffer local variables:
 (defun erc-compute-server (&optional server)
   "Return an IRC server name.
 
-This tries a number of increasingly more default methods until a
+This tries a progressively greater number of default methods until a
 non-nil value is found.
 
 - SERVER (the argument passed to this function)
@@ -8813,7 +8813,7 @@ non-nil value is found.
 (defun erc-compute-nick (&optional nick)
   "Return user's IRC nick.
 
-This tries a number of increasingly more default methods until a
+This tries a progressively greater number of default methods until a
 non-nil value is found.
 
 - NICK (the argument passed to this function)
@@ -8837,7 +8837,7 @@ the user field and use whatever it returns as the server password."
 (defun erc-compute-full-name (&optional full-name)
   "Return user's full name.
 
-This tries a number of increasingly more default methods until a
+This tries a progressively greater number of default methods until a
 non-nil value is found.
 
 - FULL-NAME (the argument passed to this function)
@@ -8853,7 +8853,7 @@ non-nil value is found.
 (defun erc-compute-port (&optional port)
   "Return a port for an IRC server.
 
-This tries a number of increasingly more default methods until a
+This tries a progressively greater number of default methods until a
 non-nil value is found.
 
 - PORT (the argument passed to this function)
diff --git a/lisp/files.el b/lisp/files.el
index 73ad85ce854..dc796fffaa1 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1258,11 +1258,11 @@ See `load-file' for a different interface to `load'."
 (defun require-with-check (feature &optional filename noerror)
   "If FEATURE is not already loaded, load it from FILENAME.
 This is like `require' except if FEATURE is already a member of the list
-`features’, then we check if this was provided by a different file than the
-one that we would load now (presumably because `load-path' has been
-changed since the file was loaded).
-If it's the case, we either signal an error (the default), or forcibly reload
-the new file (if NOERROR is equal to `reload'), or otherwise emit a warning."
+`features’, then check if it was provided by a different file than the
+one that is about to be loaded now (presumably because `load-path' has
+been changed since FILENAME was loaded).  If that is the case, either
+signal an error (the default), or forcibly reload the new file (if
+NOERROR is equal to `reload'), or otherwise emit a warning."
   (let ((lh load-history)
         (res (require feature filename (if (eq noerror 'reload) nil noerror))))
     ;; If the `feature' was not yet provided, `require' just loaded the right
@@ -1275,7 +1275,7 @@ the new file (if NOERROR is equal to `reload'), or otherwise emit a warning."
          ((assoc fn load-history) nil)  ;We loaded the right file.
          ((eq noerror 'reload) (load fn nil 'nomessage))
          (t (funcall (if noerror #'warn #'error)
-                     "Feature provided by other file: %S" feature)))))
+                     "Feature `%S' is now provided by a different file %s" fn)))))
     res))
 
 (defun file-remote-p (file &optional identification connected)
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);
 }