master c1565cc 3/4: Merge from origin/emacs-27

[Glenn Morris]

branch: master
commit c1565cc3b9193c322f0001ab4d58a93c4761f341
Merge: 997116f 4e6104e
Author: Glenn Morris <rgm@gnu.org>
Commit: Glenn Morris <rgm@gnu.org>

    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.
---
 doc/lispref/functions.texi | 2 ++
 lisp/autoinsert.el         | 2 +-
 src/xdisp.c                | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi
index e8e2207..222a17f 100644
--- a/doc/lispref/functions.texi
+++ b/doc/lispref/functions.texi
@@ -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
diff --git a/lisp/autoinsert.el b/lisp/autoinsert.el
index 9798668..9bb485f 100644
--- a/lisp/autoinsert.el
+++ b/lisp/autoinsert.el
@@ -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
 
diff --git a/src/xdisp.c b/src/xdisp.c
index cc499f3..618ec68 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -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,