diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2022-04-16 13:58:31 -0400 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2022-04-16 13:58:31 -0400 |
| commit | 44ba0270b7ea8d193ceb7d9ad10937b03f6b5244 (patch) | |
| tree | d611de6910b04cbc64f1d78f9a2c0b5f070c45eb /src/indent.c | |
| parent | 1cc32c6c193c935b7640a16e195bbf04156726c2 (diff) | |
| parent | d53c999b4ad7bc1f730875ae3d1af9d11895807c (diff) | |
| download | emacs-44ba0270b7ea8d193ceb7d9ad10937b03f6b5244.tar.gz emacs-44ba0270b7ea8d193ceb7d9ad10937b03f6b5244.tar.bz2 emacs-44ba0270b7ea8d193ceb7d9ad10937b03f6b5244.zip | |
Merge from origin/emacs-28
d53c999b4a Further vcs-cvs/rcs-responsible-p updates from master
dc3d1628ec ; * src/sysdep.c: Fix mistake in previous commit
855e15dbf1 Fix builds on older versions of macOS
9da744e450 Fix documentation of Outline minor mode options
a8bb12ab05 Improve discoverability of 'insert-directory-program'
3f166bdf44 ; * etc/PROBLEMS: Describe MS-Windows issues with fonts. ...
803ac857ee Fix cursor motion under truncate-lines with Flymake fringe...
# Conflicts:
# etc/PROBLEMS
# lisp/outline.el
# src/sysdep.c
Diffstat (limited to 'src/indent.c')
| -rw-r--r-- | src/indent.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/indent.c b/src/indent.c index d5ad02ae3af..acbb9dc9723 100644 --- a/src/indent.c +++ b/src/indent.c @@ -2209,7 +2209,10 @@ whether or not it is currently displayed in some window. */) } else it_overshoot_count = - !(it.method == GET_FROM_IMAGE || it.method == GET_FROM_STRETCH); + /* If image_id is negative, it's a fringe bitmap, which by + definition doesn't affect display in the text area. */ + !((it.method == GET_FROM_IMAGE && it.image_id >= 0) + || it.method == GET_FROM_STRETCH); if (start_x_given) { |