nano

commit 891e0ec2813b94ec4d7749a4edda103351ba41a4
parent 40e057210063a3b4e609c7a1d8bafa0824a425ec
Author: David Lawrence Ramsey <pooka109@gmail.com>
Date:   Sun, 23 Apr 2006 19:32:50 +0000

in get_prompt_string(), include the handling of the help key even when
help is disabled, so that we aren't erroneously kicked out of the
statusbar prompt under any circumstances


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

Diffstat:
M
ChangeLog
 | 
6
++++++
M
src/prompt.c
 | 
10
+++++-----

2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -114,6 +114,12 @@ CVS code -
 - nano.h:
 	- Reorder the toggle #defines to match their corresponding order
 	  in toggle_init(). (DLR)
+- prompt.c:
+  get_prompt_string()
+	- Include the handling of the help key even when help is
+	  disabled, so that we aren't erroneously kicked out of the
+	  statusbar prompt under any circumstances. (DLR, found by Benno
+	  Schulenberg)
 - rcfile.c:
   parse_argument()
 	- Rename variable ptr_bak to ptr_save, for consistency. (DLR)
diff --git a/src/prompt.c b/src/prompt.c
@@ -1050,17 +1050,17 @@ int get_prompt_string(bool allow_tabs,
 		}
 		break;
 #endif /* !NANO_TINY */
-#ifndef DISABLE_HELP
 	    case NANO_HELP_KEY:
 		update_statusbar_line(answer, statusbar_x);
 
 		/* This key has a shortcut list entry when it's used to
-		 * to go to the help browser, which means that finished
-		 * has been set to TRUE.  Set it back to FALSE here, so
-		 * that we aren't kicked out of the statusbar prompt. */
+		 * go to the help browser or display a message
+		 * indicating that help is disabled, which means that
+		 * finished has been set to TRUE.  Set it back to FALSE
+		 * here, so that we aren't kicked out of the statusbar
+		 * prompt. */
 		finished = FALSE;
 		break;
-#endif /* !DISABLE_HELP */
 	}
 
 	/* If we have a shortcut with an associated function, break out