nano

commit b0555990c29a796b160929aa485661cd8512983e
parent 492e9f605b22fa1e08d346536cce941f21b860c3
Author: Benno Schulenberg <bensberg@justemail.net>
Date:   Fri, 20 Jun 2014 15:35:26 +0000

Fixing compilation with --enable-tiny --enable-browser.


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

Diffstat:
M
ChangeLog
 | 
1
+
M
src/files.c
 | 
16
++++++----------

2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -4,6 +4,7 @@
 	* src/files.c (check_dotnano): Wrap long lines and actually report
 	the name that is not a directory.
 	* src/*: Miscellaneous whitespace adjustments and comment tweaks.
+	* src/files.c: Fix compilation with --enable-tiny --enable-browser.
 
 2014-06-19  Benno Schulenberg  <bensberg@justemail.net>
 	* src/nano.c (window_init): Rename 'no_more_space()' to 'more_space()'
diff --git a/src/files.c b/src/files.c
@@ -1010,8 +1010,8 @@ void do_insertfile(
     size_t current_x_save = openfile->current_x;
     ssize_t current_y_save = openfile->current_y;
     bool edittop_inside = FALSE, meta_key = FALSE, func_key = FALSE;
-#ifndef NANO_TINY
     const sc *s;
+#ifndef NANO_TINY
     bool right_side_up = FALSE, single_line = FALSE;
 #endif
 
@@ -1026,17 +1026,16 @@ void do_insertfile(
 		_("Command to execute in new buffer [from %s] ") :
 #endif
 		_("Command to execute [from %s] ");
-	} else {
-#endif
+	} else
+#endif /* NANO_TINY */
+	{
 	    msg =
 #ifndef DISABLE_MULTIBUFFER
 		ISSET(MULTIBUFFER) ?
 		_("File to insert into new buffer [from %s] ") :
 #endif
 		_("File to insert [from %s] ");
-#ifndef NANO_TINY
 	}
-#endif
 
 	i = do_prompt(TRUE,
 #ifndef DISABLE_TABCOMP
@@ -1073,24 +1072,21 @@ void do_insertfile(
 
 	    ans = mallocstrcpy(ans, answer);
 
-#ifndef NANO_TINY
 	    s = get_shortcut(currmenu, &i, &meta_key);
 
+#ifndef NANO_TINY
 #ifndef DISABLE_MULTIBUFFER
 	    if (s && s->scfunc == new_buffer_void) {
 		/* Don't allow toggling if we're in view mode. */
 		if (!ISSET(VIEW_MODE))
 		    TOGGLE(MULTIBUFFER);
 		continue;
-	    } else
+	    }
 #endif
 	    if (s && s->scfunc == flip_execute_void) {
 		execute = !execute;
 		continue;
 	    }
-#ifndef DISABLE_BROWSER
-	    else
-#endif
 #endif /* !NANO_TINY */
 
 #ifndef DISABLE_BROWSER