From: David Lawrence Ramsey <pooka109@gmail.com>
Date: Fri, 30 Jul 2004 17:30:17 +0000 (+0000)
Subject: add a consistency fix for do_enter() and a few minor cosmetic fixes
X-Git-Tag: v1.3.4~32
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=9ef3adbc1d22a945b19999ba331264b131d1218a;p=nano.git

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 809b7514..b4e7a20b 100644
--- 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 fb8b5e59..d2251ae3 100644
--- 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 5823dcef..04515409 100644
--- 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 ee3a5d78..49316117 100644
--- 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 e5dd08ee..46854562 100644
--- 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++;