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

files: drop the pointless "[from ./]" from the insert-file prompt 

Only use the "from" thing when an operating directory is in effect,
because /only/ then the indicated directory can be something other
than "./".

Also, make it so that there is no space before the colon.
master
Benno Schulenberg 2017-03-23 22:03:21 +01:00
parent 19b7021076
commit f987508891
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/files.c
View File

@ -1069,7 +1069,7 @@ void do_insertfile(void)
if (execute) {
#ifndef DISABLE_MULTIBUFFER
if (ISSET(MULTIBUFFER))
/* TRANSLATORS: The next four messages are prompts. */
/* TRANSLATORS: The next six messages are prompts. */
msg = _("Command to execute in new buffer");
else
#endif
@ -1077,12 +1077,22 @@ void do_insertfile(void)
} else
#endif /* NANO_TINY */
{
#ifndef DISABLE_OPERATINGDIR
#ifndef DISABLE_MULTIBUFFER
if (ISSET(MULTIBUFFER))
msg = _("File to insert into new buffer [from %s] ");
if (operating_dir != NULL && ISSET(MULTIBUFFER))
msg = _("File to insert into new buffer [from %s]");
else
#endif
msg = _("File to insert [from %s] ");
if (operating_dir != NULL)
msg = _("File to insert [from %s]");
else
#endif
#ifndef DISABLE_MULTIBUFFER
if (ISSET(MULTIBUFFER))
msg = _("File to insert into new buffer");
else
#endif
msg = _("File to insert");
}
present_path = mallocstrcpy(present_path, "./");
@ -1097,10 +1107,9 @@ void do_insertfile(void)
#endif
edit_refresh, msg,
#ifndef DISABLE_OPERATINGDIR
operating_dir != NULL && strcmp(operating_dir, ".") != 0 ?
operating_dir :
operating_dir != NULL ? operating_dir :
#endif
"./");
"xxx");
/* If we're in multibuffer mode and the filename or command is
* blank, open a new buffer instead of canceling. */