From 1e57e68e57cc1c17775d2566fd8d0448339bccaa Mon Sep 17 00:00:00 2001 From: Chris Allegretta Date: Mon, 3 Jul 2000 04:24:39 +0000 Subject: [PATCH] Fixed a bug in page_down() and moved page_up() to move.c where it belongs git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@62 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 6 ++++++ move.c | 19 +++++++++++++++++++ nano.c | 18 ------------------ po/nano.pot | 42 +++++++++++++++++++++--------------------- winio.c | 2 +- 5 files changed, 47 insertions(+), 40 deletions(-) diff --git a/ChangeLog b/ChangeLog index 898695e9..fe4c4206 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,10 +7,16 @@ CVS code changes since last release - do_search() in search.c, globals in nano.h and shortcut_init() in global.c. - changed 'sprintf' calls to safer 'snprintf' +- move.c: + page_down(): + - Fixed a bug that caused nano to not update when + current->next == NULL (e.g. paging down to the very bottom of + ABOUT NLS wouldn't work). - nano.c: - Removed dual alt_speller variables, oops! (Rocco Corsi) - Removed unnecessary do_oldspell function (Rocco Corsi). Added SMALL_NANO #ifdef around actual spell function. + - Moved page_up() to move.c where is belongs. - de.po: - Revised translations by floki@bigfoot.com. - fi.po: diff --git a/move.c b/move.c index 9db208ae..1db5be1b 100644 --- a/move.c +++ b/move.c @@ -134,6 +134,25 @@ void page_up_center(void) } +int page_up(void) +{ + wrap_reset(); + current_x = 0; + placewewant = 0; + + if (current == fileage) + return 0; + + current_y = 0; + edit_update_bot(edittop); + update_cursor(); + + UNSET(KEEP_CUTBUFFER); + check_statblank(); + return 1; +} + + int do_up(void) { wrap_reset(); diff --git a/nano.c b/nano.c index 82dd0aaa..2acb52e3 100644 --- a/nano.c +++ b/nano.c @@ -886,24 +886,6 @@ void do_early_abort(void) blank_statusbar_refresh(); } -int page_up(void) -{ - wrap_reset(); - current_x = 0; - placewewant = 0; - - if (current == fileage) - return 0; - - current_y = 0; - edit_update_bot(edittop); - update_cursor(); - - UNSET(KEEP_CUTBUFFER); - check_statblank(); - return 1; -} - void delete_buffer(filestruct * inptr) { if (inptr != NULL) { diff --git a/po/nano.pot b/po/nano.pot index 41f3c8d7..58fe3558 100644 --- a/po/nano.pot +++ b/po/nano.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-07-02 23:21-0400\n" +"POT-Creation-Date: 2000-07-03 00:27-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -55,7 +55,7 @@ msgstr "" msgid "File to insert [from ./] " msgstr "" -#: files.c:270 files.c:294 files.c:458 nano.c:1123 +#: files.c:270 files.c:294 files.c:458 nano.c:1105 msgid "Cancelled" msgstr "" @@ -560,85 +560,85 @@ msgstr "" msgid "check_wrap called with inptr->data=\"%s\"\n" msgstr "" -#: nano.c:925 +#: nano.c:907 #, c-format msgid "current->data now = \"%s\"\n" msgstr "" -#: nano.c:969 +#: nano.c:951 #, c-format msgid "After, data = \"%s\"\n" msgstr "" -#: nano.c:1032 +#: nano.c:1014 msgid "Error deleting tempfile, ack!" msgstr "" -#: nano.c:1050 +#: nano.c:1032 #, c-format msgid "Could not create a temporary filename: %s" msgstr "" -#: nano.c:1074 +#: nano.c:1056 #, c-format msgid "Could not invoke spell program \"%s\"" msgstr "" #. Why 32512? I dont know! -#: nano.c:1080 +#: nano.c:1062 msgid "Could not invoke \"ispell\"" msgstr "" -#: nano.c:1092 +#: nano.c:1074 msgid "Finished checking spelling" msgstr "" -#: nano.c:1110 +#: nano.c:1092 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? " msgstr "" -#: nano.c:1233 +#: nano.c:1215 msgid "Cannot resize top win" msgstr "" -#: nano.c:1235 +#: nano.c:1217 msgid "Cannot move top win" msgstr "" -#: nano.c:1237 +#: nano.c:1219 msgid "Cannot resize edit win" msgstr "" -#: nano.c:1239 +#: nano.c:1221 msgid "Cannot move edit win" msgstr "" -#: nano.c:1241 +#: nano.c:1223 msgid "Cannot resize bottom win" msgstr "" -#: nano.c:1243 +#: nano.c:1225 msgid "Cannot move bottom win" msgstr "" -#: nano.c:1707 +#: nano.c:1689 msgid "Main: set up windows\n" msgstr "" -#: nano.c:1729 +#: nano.c:1711 msgid "Main: bottom win\n" msgstr "" -#: nano.c:1735 +#: nano.c:1717 msgid "Main: open file\n" msgstr "" -#: nano.c:1808 +#: nano.c:1790 #, c-format msgid "I got Alt-[-%c! (%d)\n" msgstr "" -#: nano.c:1824 +#: nano.c:1806 #, c-format msgid "I got Alt-%c! (%d)\n" msgstr "" diff --git a/winio.c b/winio.c index 274f20b3..0e981c82 100644 --- a/winio.c +++ b/winio.c @@ -850,7 +850,7 @@ void edit_update_top(filestruct * fileptr) int i; filestruct *temp = fileptr; - if (fileptr->next == NULL || fileptr == NULL) + if (fileptr == NULL) return; i = 0; -- 2.39.5