diff options
| author | Glenn Morris <rgm@gnu.org> | 2020-11-02 09:27:40 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2020-11-02 09:27:40 -0800 |
| commit | c1565cc3b9193c322f0001ab4d58a93c4761f341 (patch) | |
| tree | b21672de03a2c209b63c806582fb033d31a46dbd | |
| parent | 997116f3dd1e2c7c7826c74714117d5d972b90be (diff) | |
| parent | 4e6104ea0b7f1eb1725e81800e584b337e2da447 (diff) | |
| download | emacs-c1565cc3b9193c322f0001ab4d58a93c4761f341.tar.gz | |
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.
| -rw-r--r-- | doc/lispref/functions.texi | 2 | ||||
| -rw-r--r-- | lisp/autoinsert.el | 2 | ||||
| -rw-r--r-- | src/xdisp.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi index e8e22078d9b..222a17fad4c 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 97986683256..9bb485f55dc 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 cc499f33261..618ec688e89 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, |