Merge from origin/emacs-27

4e6104ea0b ; * src/xdisp.c (display_string): Fix a typo in a comment.
7162228815 Improve indexing of check-declare
d218b28ab5 ; * lisp/autoinsert.el (auto-insert-alist): Fix texinfo URL.
This commit is contained in:
Glenn Morris 2020-11-02 09:27:40 -08:00
commit c1565cc3b9
3 changed files with 4 additions and 2 deletions

View file

@ -2368,6 +2368,8 @@ argument @var{fileonly} non-@code{nil} means check only that
@var{file} exists, not that it actually defines @var{function}.
@end defmac
@findex check-declare-file
@findex check-declare-directory
To verify that these functions really are declared where
@code{declare-function} says they are, use @code{check-declare-file}
to check all @code{declare-function} calls in one source file, or use

View file

@ -264,7 +264,7 @@ Foundation Web site at @url{https://www.gnu.org/licenses/fdl.html}.
@end quotation
The document was typeset with
@uref{http://www.texinfo.org/, GNU Texinfo}.
@uref{https://www.gnu.org/software/texinfo/, GNU Texinfo}.
@end copying

View file

@ -27065,7 +27065,7 @@ display_string (const char *string, Lisp_Object lisp_string, Lisp_Object face_st
else
max_x = min (max_x, it->last_visible_x);
/* Skip over display elements that are not visible. because IT->w is
/* Skip over display elements that are not visible because IT->w is
hscrolled. */
if (it->current_x < it->first_visible_x)
move_it_in_display_line_to (it, 100000, it->first_visible_x,