From: Chris Allegretta Date: Sun, 16 Mar 2008 14:24:28 +0000 (+0000) Subject: Fix problems with inserting files using --disable-tabcomp and probably X-Git-Tag: v2.1.0~7 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=cfb45f82144a8dee633ad385141d38d57afda5fb;p=nano.git Fix problems with inserting files using --disable-tabcomp and probably other --disable type options. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4231 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- diff --git a/src/files.c b/src/files.c index 74ce1725..fd3e14dc 100644 --- a/src/files.c +++ b/src/files.c @@ -738,11 +738,9 @@ void do_insertfile( #endif MINSERTFILE, ans, &meta_key, &func_key, -#ifndef DISABLE_OPERATINGDIR -#ifndef NANO_TINY NULL, -#endif edit_refresh, msg, +#ifndef DISABLE_OPERATINGDIR operating_dir != NULL && strcmp(operating_dir, ".") != 0 ? operating_dir : #endif @@ -764,9 +762,10 @@ void do_insertfile( ans = mallocstrcpy(ans, answer); + s = get_shortcut(currmenu, &i, &meta_key, &func_key); + #ifndef NANO_TINY #ifdef ENABLE_MULTIBUFFER - s = get_shortcut(currmenu, &i, &meta_key, &func_key); if (s && s->scfunc == (void *) new_buffer_msg) { /* Don't allow toggling if we're in view mode. */