LineageOS/android_external_nano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

files: on second thought... keep the "[from ./]"

Browse Source 
The "./" is a shorthand for "current working directory".
It is better to specify it, because it differs from what
Pico does: reading always from the user's home directory
no matter where the editor was started.
This commit is contained in:
Benno Schulenberg
2017-03-24 12:19:30 +01:00
parent 261b5b28c4
commit 59412b572f
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/files.c
View File

@@ -1069,7 +1069,7 @@ void do_insertfile(void)
if (execute) {
#ifndef DISABLE_MULTIBUFFER
if (ISSET(MULTIBUFFER))
/* TRANSLATORS: The next six messages are prompts. */
/* TRANSLATORS: The next four messages are prompts. */
msg = _("Command to execute in new buffer");
else
#endif
@@ -1077,22 +1077,12 @@ void do_insertfile(void)
} else
#endif /* NANO_TINY */
{
#ifndef DISABLE_OPERATINGDIR
#ifndef DISABLE_MULTIBUFFER
if (operating_dir != NULL && ISSET(MULTIBUFFER))
if (ISSET(MULTIBUFFER))
msg = _("File to insert into new buffer [from %s]");
else
#endif
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, "./");
@@ -1109,7 +1099,7 @@ void do_insertfile(void)
#ifndef DISABLE_OPERATINGDIR
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. */