ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tweaks: reshuffle some ifdefs, for less fragmentation

master
Benno Schulenberg 2016-09-13 22:06:11 +02:00
parent bc8bb7e942
commit 77a1a5c3e4
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/move.c
View File

@ -501,26 +501,23 @@ void do_down(bool scroll_only)
* smooth scrolling mode, or down half a page if we're not. If * smooth scrolling mode, or down half a page if we're not. If
* scroll_only is TRUE, scroll the edit window down one line * scroll_only is TRUE, scroll the edit window down one line
* unconditionally. */ * unconditionally. */
if (openfile->current_y == editwinrows - 1
#ifndef NANO_TINY
|| amount > 0 || scroll_only
#endif
) {
#ifndef NANO_TINY #ifndef NANO_TINY
if (openfile->current_y == editwinrows - 1 || amount > 0 || scroll_only) {
if (amount < 1 || scroll_only) if (amount < 1 || scroll_only)
amount = 1; amount = 1;
#endif
edit_scroll(DOWNWARD, edit_scroll(DOWNWARD, (ISSET(SMOOTH_SCROLL) || scroll_only) ?
#ifndef NANO_TINY amount : editwinrows / 2 + 1);
(ISSET(SMOOTH_SCROLL) || scroll_only) ? amount :
#endif
editwinrows / 2 + 1);
if (ISSET(SOFTWRAP)) { if (ISSET(SOFTWRAP)) {
refresh_needed = TRUE; refresh_needed = TRUE;
return; return;
} }
} #else
if (openfile->current_y == editwinrows - 1)
edit_scroll(DOWNWARD, editwinrows / 2 + 1);
#endif
}
/* If the lines weren't already redrawn, see if they need to be. */ /* If the lines weren't already redrawn, see if they need to be. */
if (openfile->current_y < editwinrows - 1) { if (openfile->current_y < editwinrows - 1) {