From 2d1bdd0dd6c8696e56d93f533a7daec7a70ac4e0 Mon Sep 17 00:00:00 2001
From: Chris Allegretta <chrisa@asty.org>
Date: Wed, 28 Jan 2009 05:11:57 +0000
Subject: [PATCH] Fix regression bugs introduced with other recent bugs
 disguised as features.

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4354 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---
 src/global.c | 42 ++++++++++++++++++++++++------------------
 src/nano.c   |  4 +++-
 src/nano.h   |  3 ++-
 src/rcfile.c |  2 +-
 4 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/src/global.c b/src/global.c
index 95883b6d..99ea9693 100644
--- a/src/global.c
+++ b/src/global.c
@@ -1224,24 +1224,16 @@ void iso_me_harder_funcmap(short func)
 	do_tab();
     else if (func == DO_VERBATIM_INPUT)
 	do_verbatim_input();
+#ifdef ENABLE_MULTIBUFFER
     else if (func == SWITCH_TO_NEXT_BUFFER_VOID)
 	switch_to_next_buffer_void();
     else if (func == SWITCH_TO_PREV_BUFFER_VOID)
 	switch_to_prev_buffer_void();
+#endif
     else if (func == DO_END)
 	do_end();
     else if (func == DO_HOME)
 	do_home();
-    else if (func == DO_REDO)
-	do_redo();
-    else if (func == DO_UNDO)
-	do_undo();
-    else if (func == DO_WORDLINECHAR_COUNT)
-	do_wordlinechar_count();
-    else if (func == DO_FIND_BRACKET)
-	do_find_bracket();
-    else if (func == DO_PREV_WORD_VOID)
-	do_prev_word_void();
     else if (func == DO_SUSPEND_VOID)
 	do_suspend_void();
     else if (func == DO_WRITEOUT_VOID)
@@ -1258,6 +1250,25 @@ void iso_me_harder_funcmap(short func)
 	do_gotolinecolumn_void();
     else if (func == DO_REPLACE)
 	do_replace();
+    else if (func == XOFF_COMPLAINT)
+	xoff_complaint();
+    else if (func == XON_COMPLAINT)
+	xon_complaint();
+    else if (func == DO_CUT_TEXT)
+	do_cut_text_void();
+#ifndef NANO_TINY
+    else if (func == DO_CUT_TILL_END)
+	do_cut_till_end();
+    else if (func == DO_REDO)
+	do_redo();
+    else if (func == DO_UNDO)
+	do_undo();
+    else if (func == DO_WORDLINECHAR_COUNT)
+	do_wordlinechar_count();
+    else if (func == DO_FIND_BRACKET)
+	do_find_bracket();
+    else if (func == DO_PREV_WORD_VOID)
+	do_prev_word_void();
     else if (func == DO_JUSTIFY_VOID)
 	do_justify_void();
     else if (func == DO_PARA_BEGIN_VOID)
@@ -1282,20 +1293,15 @@ void iso_me_harder_funcmap(short func)
 	do_scroll_down();
     else if (func == DO_NEXT_WORD_VOID)
 	do_next_word_void();
-    else if (func == DO_CUT_TILL_END)
-	do_cut_till_end();
-    else if (func == XOFF_COMPLAINT)
-	xoff_complaint();
-    else if (func == XON_COMPLAINT)
-	xon_complaint();
+#ifndef DISABLE_SPELLER
     else if (func == DO_SPELL)
 	do_spell();
-    else if (func == DO_CUT_TEXT)
-	do_cut_text_void();
+#endif
     else if (func == DO_NEXT_WORD)
 	do_next_word_void();
     else if (func == DO_PREV_WORD)
 	do_prev_word_void();
+#endif
 }
 
 
diff --git a/src/nano.c b/src/nano.c
index 752b9662..e7a1978d 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -1528,8 +1528,10 @@ int do_input(bool *meta_key, bool *func_key, bool *s_or_t, bool
 				    edit_refresh();
 				}
 #endif
-			    }				
+			    }
+#ifndef NANO_TINY
 		    }
+#endif
 		    *finished = TRUE;
 		    break;
 	    }
diff --git a/src/nano.h b/src/nano.h
index 203cb402..5613db60 100644
--- a/src/nano.h
+++ b/src/nano.h
@@ -711,6 +711,8 @@ typedef struct subnfunc {
   can go cut my wrists after writing the big switch statement
   that will necessitate. */
 
+#endif /* !NANO_TINY */
+
 #define CASE_SENS_MSG 1
 #define BACKWARDS_MSG 2
 #define REGEXP_MSG 3
@@ -864,7 +866,6 @@ typedef struct subnfunc {
 
 
 
-#endif /* !NANO_TINY */
 
 #define VIEW TRUE
 #define NOVIEW FALSE
diff --git a/src/rcfile.c b/src/rcfile.c
index 582015c9..5bbaa0f3 100644
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -503,7 +503,7 @@ void parse_include(char *ptr)
     lineno = 0;
 
 #ifdef DEBUG
-    fprintf(stderr, "Parsing file \"%s\"\n", full_option);
+    fprintf(stderr, "Parsing file \"%s\"\n", option);
 #endif
 
     parse_rcfile(rcstream