diff --git a/src/ChangeLog b/src/ChangeLog
index bfdc4916e..752b8d63d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2001-09-15  Pavel Roskin  <proski@gnu.org>
 
+	* textconf.h: Remove status_using_ncurses - it's useless now.
+	Adjust all users.  Call do_exit_ca_mode() and do_enter_ca_mode()
+	even with ncurses.
+
 	* main.c (init_xterm_support): Don't enable xterm_flag just
 	because of "kmous" in terminfo.  Setiing this flag means much
 	more than just mouse support.  Recognize terminals beginning
diff --git a/src/cmd.c b/src/cmd.c
index 418b425fe..a2696ae49 100644
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -942,8 +942,7 @@ view_other_cmd (void)
 #endif /* HAVE_SLANG */
 	keypad(stdscr, FALSE);
 	endwin ();
-	if (!status_using_ncurses)
-	    do_exit_ca_mode ();
+	do_exit_ca_mode ();
 	mc_raw_mode ();
 	if (console_flag)
 	    restore_console ();
@@ -968,8 +967,7 @@ view_other_cmd (void)
 	if (console_flag)
 	    handle_console (CONSOLE_SAVE);
 
-	if (!status_using_ncurses)
-	    do_enter_ca_mode ();
+	do_enter_ca_mode ();
 
 	reset_prog_mode ();
 	keypad(stdscr, TRUE);
diff --git a/src/layout.c b/src/layout.c
index a9d7146b5..4b26766e8 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -578,9 +578,8 @@ void init_curses (void)
      * or you'll have to press Esc three times to dismiss a dialog box.
      */
     ESCDELAY = 0;
-#endif
-    if (!status_using_ncurses)
-	do_enter_ca_mode ();
+#endif /* HAVE_ESCDELAY */
+    do_enter_ca_mode ();
     mc_raw_mode ();
     noecho ();
     keypad (stdscr, TRUE);
diff --git a/src/text.c b/src/text.c
index 953adcc7b..2f0b2f210 100644
--- a/src/text.c
+++ b/src/text.c
@@ -91,11 +91,9 @@ edition_pre_exec (void)
      * screen page: do it now.
      *
      * Do not move this before endwin: in some systems rmcup includes
-     * a call to clear screen, so it will end up clearing the sheel screen.
+     * a call to clear screen, so it will end up clearing the shell screen.
      */
-    if (!status_using_ncurses){
-	do_exit_ca_mode ();
-    }
+    do_exit_ca_mode ();
 }
 
 void
diff --git a/src/textconf.h b/src/textconf.h
index eeedece32..93bac090c 100644
--- a/src/textconf.h
+++ b/src/textconf.h
@@ -9,12 +9,6 @@
 #define x_flush_events()
 #define port_shutdown_extra_fds()
 
-#ifdef USE_NCURSES
-#define status_using_ncurses (1)
-#else
-#define status_using_ncurses (0)
-#endif
-
 extern void version (int verbose);
 
 #endif /* __TEXTCONF_H */