From 59412b572f9f8f67ad8509441699454fc9888f8f Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@justemail.net>
Date: Fri, 24 Mar 2017 12:19:30 +0100
Subject: [PATCH] files: on second thought... keep the "[from ./]"
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.
---
src/files.c | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/src/files.c b/src/files.c
index ca5375b4..033b963b 100644
--- a/src/files.c
+++ b/src/files.c
@@ -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. */
--
GitLab