diff options
| author | Stefan Kangas | 2021-12-14 06:31:37 +0100 |
|---|---|---|
| committer | Stefan Kangas | 2021-12-14 06:31:37 +0100 |
| commit | b8e6beaab01e9c7eaf5cdc12a34987402fb9b72f (patch) | |
| tree | 403ed1a65e649f3b3280d093ef6cfdf9c95db4af /src | |
| parent | 855f1bd17667781761e62ed439ecc99fe972cf1a (diff) | |
| parent | 3607508f3ffa3c32bc913a8be08f3d00bcde8027 (diff) | |
| download | emacs-b8e6beaab01e9c7eaf5cdc12a34987402fb9b72f.tar.gz emacs-b8e6beaab01e9c7eaf5cdc12a34987402fb9b72f.zip | |
Merge from origin/emacs-28
3607508f3f Set calc-make-windows-dedicated to nil by default
9de8eec3bc * make-dist: Don't run "make --question info". (Bug#52322)
cea8deea72 ; * src/xdisp.c (move_it_vertically_backward): Clarify com...
6170c5036e Fix regression in help-mode prompt
# Conflicts:
# etc/NEWS
Diffstat (limited to 'src')
| -rw-r--r-- | src/xdisp.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index 89b295932ed..5e549c9c63f 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -10423,11 +10423,12 @@ move_it_to (struct it *it, ptrdiff_t to_charpos, int to_x, int to_y, int to_vpos | |||
| 10423 | 10423 | ||
| 10424 | /* Move iterator IT backward by a specified y-distance DY, DY >= 0. | 10424 | /* Move iterator IT backward by a specified y-distance DY, DY >= 0. |
| 10425 | 10425 | ||
| 10426 | If DY > 0, move IT backward at least that many pixels. DY = 0 | 10426 | If DY > 0, move IT backward that many pixels. |
| 10427 | means move IT backward to the preceding line start or BEGV. This | 10427 | DY = 0 means move IT backward to the preceding line start or to BEGV. |
| 10428 | function may move over more than DY pixels if IT->current_y - DY | 10428 | This function may move over less or more than DY pixels if |
| 10429 | ends up in the middle of a line; in this case IT->current_y will be | 10429 | IT->current_y - DY ends up in the middle of a line; in this case |
| 10430 | set to the top of the line moved to. */ | 10430 | IT->current_y will be set to the top of the line either before or |
| 10431 | after the exact pixel coordinate. */ | ||
| 10431 | 10432 | ||
| 10432 | void | 10433 | void |
| 10433 | move_it_vertically_backward (struct it *it, int dy) | 10434 | move_it_vertically_backward (struct it *it, int dy) |