diff options
| author | Stefan Kangas | 2021-12-05 06:30:35 +0100 |
|---|---|---|
| committer | Stefan Kangas | 2021-12-05 06:30:35 +0100 |
| commit | 520a703fa7db07ba82661e68cf4eafe7ba61a8d0 (patch) | |
| tree | f0037702660118d199bd70a0fe644d9dbcaba761 /src | |
| parent | 8bdea767208257599f6ab727e51dd94f0c1872e1 (diff) | |
| parent | c086358574e3671787394c7b9f6069760e7c6b3c (diff) | |
| download | emacs-520a703fa7db07ba82661e68cf4eafe7ba61a8d0.tar.gz emacs-520a703fa7db07ba82661e68cf4eafe7ba61a8d0.zip | |
Merge from origin/emacs-28
c086358574 Update to Org 9.5.1-15-gdb4805
fef3e60061 * lisp/emacs-lisp/edebug.el (edebug-eval-defun): Minor doc...
a1e30e4106 ; Fix most remaining AUTHORS warnings
f3e6a432c5 ; * doc/misc/efaq.texi (New in Emacs 28): Add more news.
00236cc802 Fix the enumeration values returned by 'try_scrolling'
Diffstat (limited to 'src')
| -rw-r--r-- | src/xdisp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index 7ca3977200a..b2eeb1105b1 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -17706,9 +17706,9 @@ cursor_row_fully_visible_p (struct window *w, bool force_p, | |||
| 17706 | 17706 | ||
| 17707 | enum | 17707 | enum |
| 17708 | { | 17708 | { |
| 17709 | SCROLLING_SUCCESS, | 17709 | SCROLLING_SUCCESS = 1, |
| 17710 | SCROLLING_FAILED, | 17710 | SCROLLING_FAILED = 0, |
| 17711 | SCROLLING_NEED_LARGER_MATRICES | 17711 | SCROLLING_NEED_LARGER_MATRICES = -1 |
| 17712 | }; | 17712 | }; |
| 17713 | 17713 | ||
| 17714 | /* If scroll-conservatively is more than this, never recenter. | 17714 | /* If scroll-conservatively is more than this, never recenter. |