add a consistency fix for do_enter() and a few minor cosmetic fixes

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

diff --git a/ChangeLog b/ChangeLog
index 809b751464586c9c72571ec3e9329f7541ac6406..b4e7a20b2d3f7743661294fbe1184b58578187e2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -84,6 +84,10 @@ CVS code -
   thanks_for_all_the_fish()
        - Delete topwin, edit, and bottomwin. (David Benbennick)
 - nano.c:
+  do_enter()
+       - Don't treat it as a special case when the user presses Enter
+         on the last line of the screen and smooth scrolling is on, for
+         consistency. (DLR)
   do_alt_speller()
        - When reloading the newly spell-checked temporary file, call
          terminal_init() to make sure that all the original terminal

diff --git a/doc/texinfo/Makefile.am b/doc/texinfo/Makefile.am
index fb8b5e5924e80491c37b4b289cac8dd38da7162f..d2251ae3d1817d0bc9b50631e13869184a3b41d0 100644 (file)
--- a/doc/texinfo/Makefile.am
+++ b/doc/texinfo/Makefile.am
@@ -1,4 +1,3 @@
-
 info_TEXINFOS = nano.texi
 MAKEINFO = makeinfo --no-split
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 5823dcefb7fcc0b89cc45c53fb409d61f504b249..045154092b25c3b721ca7f3fd82d97c4a885a5c2 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,3 @@
-
 DEFS= -DSYSCONFDIR=\"$(sysconfdir)\"
 localedir = $(datadir)/locale
 INCLUDES = -Iintl -DLOCALEDIR=\"$(localedir)\" -I@includedir@

diff --git a/src/files.c b/src/files.c
index ee3a5d789dc3bbbafe78aec2933cf93eb5af0f49..493161171d685ab9c78d5157b2d0bddd4b6ffe8f 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -530,7 +530,7 @@ void do_insertfile(int loading_file)
 #endif
                check_operating_dir(answer, FALSE) != 0) {
            statusbar(_("Can't insert file from outside of %s"),
-                       operating_dir);
+               operating_dir);
            return;
        }
 #endif

diff --git a/src/nano.c b/src/nano.c
index e5dd08ee95f6957151c8d9eedfbd67666a69da1b..4685456238833969d8289c9613f38fd1c59b52c8 100644 (file)
--- a/src/nano.c
+++ b/src/nano.c
@@ -1140,14 +1140,6 @@ void do_enter(void)
     renumber(current);
     current = newnode;
 
-#ifndef NANO_SMALL
-    /* If we're in smooth scrolling mode and we're on the last line of
-     * the edit window, move edittop down one line so that current is
-     * onscreen.  This prevents edit_refresh() from centering the
-     * screen. */
-    if (ISSET(SMOOTHSCROLL) && current_y == editwinrows - 1)
-       edittop = edittop->next;
-#endif
     edit_refresh();
 
     totlines++;