Bug fixes for do_enter and do_backspace

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@151 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/BUGS b/BUGS
index e10a34d62f5d4babbe5dde0c1ee0a77556a09b88..fd1762d40523677f2f5a11344cb91e867729a872 100644 (file)
--- a/BUGS
+++ b/BUGS
@@ -62,3 +62,22 @@
   written out to disk when saved..... (37).
 - Page up and page down do not work the same way as Pico (# of lines). (38)
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

diff --git a/ChangeLog b/ChangeLog
index d19f0976d80e1bb7006a86fe05ada032d3856ce7..7c6d2fea811a224578368206603639d23f8f2e6b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,11 @@ CVS code
        - New function, nulls a string at a given index and realigns it.
   delete_buffer()
        - Removed, same as free_filestruct().
+  do_backspace()
+       - Now calls page_up_center instead of page_up (as it should?)
+  do_enter()
+       - Fixed typo (?) in check for inptr->next.  Caused lots of
+         grief for editing lines at filebot.
 - search.c:
   replace_abort()
        - redundant, now just calls search abort until it does something

diff --git a/nano.c b/nano.c
index af2bef766a3b5fd2ad2128d82b7594ca0b52c73d..f24186ba3b9cf085994b58e9836563e0f252a2c5 100644 (file)
--- a/nano.c
+++ b/nano.c
@@ -527,7 +527,7 @@ int do_enter(filestruct * inptr)
     }
     *tmp = 0;
 
-    if (inptr->next != NULL) {
+    if (inptr->next == NULL) {
        filebot = new;
        editbot = new;
     }
@@ -956,7 +956,7 @@ int do_backspace(void)
                current = previous->next;
            else
                current = previous;
-           page_up();
+           page_up_center();
        } else {
            if (previous->next)
                current = previous->next;

diff --git a/po/nano.pot b/po/nano.pot
index 3343a27c42a3bc9640df30d75c216711b8caaada..eea666c03913a0e14e8418078ad2ef4fd67c8699 100644 (file)
--- 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-29 00:38-0400\n"
+"POT-Creation-Date: 2000-07-30 21:30-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/proto.h b/proto.h
index 203dddf7b6bb63347dc62b9cc4830a920362e8b7..39eb39bae8d80d67dee7fe1abc1a8a0e1904eea9 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -110,7 +110,7 @@ void null_at(char *data, int index);
 
 int do_writeout_void(void), do_exit(void), do_gotoline_void(void);
 int do_insertfile(void), do_search(void), page_up(void), page_down(void);
-int do_cursorpos(void), do_spell(void);
+int do_cursorpos(void), do_spell(void), page_up_center(void);
 int do_up(void), do_down (void), do_right(void), do_left (void);
 int do_home(void), do_end(void), total_refresh(void), do_mark(void);
 int do_delete(void), do_backspace(void), do_tab(void), do_justify(void);

diff --git a/winio.c b/winio.c
index 1270733e78ea51d39139d0cf179689b37e0c082f..1a2c0e40a86b508caa6cf13740765d398c21abc9 100644 (file)
--- a/winio.c
+++ b/winio.c
@@ -840,7 +840,7 @@ void edit_refresh(void)
        lines++;
     }
     if (!currentcheck) /* Then current has run off the screen... */ 
-       edit_update(current, CENTER);   
+       edit_update(current, CENTER);
 
     if (lines <= editwinrows - 1)
        while (lines <= editwinrows - 1) {