ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
master
Chris Allegretta 2008-03-16 14:24:28 +00:00
parent c656e9d737
commit cfb45f8214
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/files.c
View File

@ -738,11 +738,9 @@ void do_insertfile(
#endif #endif
MINSERTFILE, ans, MINSERTFILE, ans,
&meta_key, &func_key, &meta_key, &func_key,
#ifndef DISABLE_OPERATINGDIR
#ifndef NANO_TINY
NULL, NULL,
#endif
edit_refresh, msg, edit_refresh, msg,
#ifndef DISABLE_OPERATINGDIR
operating_dir != NULL && strcmp(operating_dir, operating_dir != NULL && strcmp(operating_dir,
".") != 0 ? operating_dir : ".") != 0 ? operating_dir :
#endif #endif
@ -764,9 +762,10 @@ void do_insertfile(
ans = mallocstrcpy(ans, answer); ans = mallocstrcpy(ans, answer);
s = get_shortcut(currmenu, &i, &meta_key, &func_key);
#ifndef NANO_TINY #ifndef NANO_TINY
#ifdef ENABLE_MULTIBUFFER #ifdef ENABLE_MULTIBUFFER
s = get_shortcut(currmenu, &i, &meta_key, &func_key);
if (s && s->scfunc == (void *) new_buffer_msg) { if (s && s->scfunc == (void *) new_buffer_msg) {
/* Don't allow toggling if we're in view mode. */ /* Don't allow toggling if we're in view mode. */