summaryrefslogtreecommitdiff
path: root/src/xdisp.c
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2020-11-02 09:27:40 -0800
committerGlenn Morris <rgm@gnu.org>2020-11-02 09:27:40 -0800
commitc1565cc3b9193c322f0001ab4d58a93c4761f341 (patch)
treeb21672de03a2c209b63c806582fb033d31a46dbd /src/xdisp.c
parent997116f3dd1e2c7c7826c74714117d5d972b90be (diff)
parent4e6104ea0b7f1eb1725e81800e584b337e2da447 (diff)
downloademacs-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.
Diffstat (limited to 'src/xdisp.c')
-rw-r--r--src/xdisp.c2
1 files changed, 1 insertions, 1 deletions
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,