From: Art Cancro <ajc@citadel.org>
Date: Thu, 2 Sep 2010 20:01:35 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
X-Git-Tag: v8.01~767
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=1132bd1cb61e706eb941ed23328bf0ae4a00f26e;hp=30bea7153d95a46cf9303d016bbdfdf4ca4c09d2;p=citadel.git

Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
---

diff --git a/citadel/textclient/screen.c b/citadel/textclient/screen.c
index b05b05447..8229c63d3 100644
--- a/citadel/textclient/screen.c
+++ b/citadel/textclient/screen.c
@@ -28,6 +28,7 @@ int lines_printed = 0;
 int cols_printed = 0;
 
 extern int rc_ansi_color;
+extern int rc_prompt_control;
 extern void check_screen_dims(void);
 
 void do_keepalive(void);
@@ -114,7 +115,7 @@ void hit_any_key(void) {
 	scr_printf("        ");
 	scr_putc(13);
 	stty_ctdl(1);
-/*
+
 	if ( (rc_prompt_control == 1)
 	   || ((rc_prompt_control == 3) && (userflags & US_PROMPTCTL)) ) {
 		if (b == 'q' || b == 'Q' || b == 's' || b == 'S')
@@ -122,7 +123,7 @@ void hit_any_key(void) {
 		if (b == 'n' || b == 'N')
 			b = NEXT_KEY;
 	}
-*/
+
 	if (b==NEXT_KEY) sigcaught = SIGINT;
 	if (b==STOP_KEY) sigcaught = SIGQUIT;
 }