oops; replace the previous tweak with a proper merge of DB's code with

the no_more_space() function

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

diff --git a/ChangeLog b/ChangeLog
index b9d2ab679c493f03629363f531e65e25e3688c59..999d90f31379437c294419070b289d1b25bdd43b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -133,9 +133,7 @@ CVS code -
          course the curses-imposed limit that it be greater than zero).
          New function resize_variables(); changes to die_too_small()
          (renamed check_die_too_small()), global_init(), window_init(),
-         and handle_sigwinch(). (David Benbennick)  DLR: Tweak the
-         coordinate formula in window_init() so that the statusbar
-         prompt is always visible.
+         and handle_sigwinch(). (David Benbennick)
        - Use void instead of RETSIGTYPE, as signal handlers are
          supposed to return void anyway.  Also, the value of RETSIGTYPE
          is sometimes misdetected as int, leading to compilation

diff --git a/src/nano.c b/src/nano.c
index 342e3af85aa2aa04ec9c8b939eb65c7aa855f933..48a9f38e18d8f73a1072fd2a735b0452361c13ef 100644 (file)
--- a/src/nano.c
+++ b/src/nano.c
@@ -240,7 +240,8 @@ void window_init(void)
     /* Set up the windows. */
     topwin = newwin(2 - no_more_space(), COLS, 0, 0);
     edit = newwin(editwinrows, COLS, 2 - no_more_space(), 0);
-    bottomwin = newwin(3 - no_help(), COLS, editwinrows + 1, 0);
+    bottomwin = newwin(3 - no_help(), COLS, editwinrows +
+       (2 - no_more_space()), 0);
 
     /* Turn the keypad back on. */
     keypad(edit, TRUE);