QUICK_BLANK and CONST_UPDATE shouldn't be working at the same time, as

they make the statusbar blank and redraw itself far too many times, and
it makes no sense to use them together anyway; also, clean up
check_statusblank() a little


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

ChangeLog

@@ -108,10 +108,11 @@ CVS code -
 	  disable_cursorpos(). (DLR)
 	- Add -U/--quickblank option, a Meta-U toggle, and a
 	  "quickblank" rcfile option to blank the statusbar after 1
-	  keystroke instead of 25.  Note that this is disabled when
+	  keystroke instead of 25.  Note that this obviously has no
-	  NANO_SMALL is defined.  Changes to toggle_init(), usage(),
+	  effect when constant cursor position display is turned on, and
-	  main(), statusbar(), nanorc.sample, nano.1, and nanorc.5.
+	  that this is disabled when NANO_SMALL is defined.  Changes to
-	  (DLR, suggested by CHAO Wei-Lun)
+	  toggle_init(), usage(), main(), statusbar(), nanorc.sample,
+	  nano.1, and nanorc.5. (DLR, suggested by CHAO Wei-Lun)
 - chars.c:
   make_mbstring()
 	- Change erroneous ENABLE_EXTRA #ifdef to NANO_EXTRA to fix a

src/winio.c

@@ -2208,10 +2208,10 @@ void blank_bottombars(void)
 
 void check_statusblank(void)
 {
-    if (statusblank > 1)
+    if (statusblank > 0)
 	statusblank--;
-    else if (statusblank == 1 && !ISSET(CONST_UPDATE)) {
+
-	statusblank = 0;
+    if (statusblank == 0 && !ISSET(CONST_UPDATE)) {
 	blank_statusbar();
 	wnoutrefresh(bottomwin);
 	reset_cursor();
@@ -2895,7 +2895,7 @@ void statusbar(const char *msg, ...)
     disable_cursorpos = TRUE;
     statusblank =
 #ifndef NANO_SMALL
-	ISSET(QUICK_BLANK) ? 1 :
+	ISSET(QUICK_BLANK) && !ISSET(CONST_UPDATE) ? 1 :
 #endif
 	25;
 }