do_insertfile(): - Added call to real_name_from tilde, oops.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@319 35c25a1d-7b9e-4130-9fde-d3aeb78583b8master
parent
d819a4cf06
commit
25f4e58ff4
|
@ -11,6 +11,8 @@ CVS code -
|
||||||
- files.c:
|
- files.c:
|
||||||
write_file()
|
write_file()
|
||||||
- Unsetting modified on temp files bug fixed (Rocco Corsi).
|
- Unsetting modified on temp files bug fixed (Rocco Corsi).
|
||||||
|
do_insertfile()
|
||||||
|
- Added call to real_name_from tilde, oops.
|
||||||
- es.po:
|
- es.po:
|
||||||
- Traditional Spanish strings updates.
|
- Traditional Spanish strings updates.
|
||||||
|
|
||||||
|
|
6
files.c
6
files.c
|
@ -245,6 +245,7 @@ int open_file(char *filename, int insert, int quiet)
|
||||||
int do_insertfile(void)
|
int do_insertfile(void)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
char *realname = NULL;
|
||||||
|
|
||||||
wrap_reset();
|
wrap_reset();
|
||||||
i = statusq(1, writefile_list, WRITEFILE_LIST_LEN, "",
|
i = statusq(1, writefile_list, WRITEFILE_LIST_LEN, "",
|
||||||
|
@ -255,7 +256,10 @@ int do_insertfile(void)
|
||||||
fprintf(stderr, "filename is %s", answer);
|
fprintf(stderr, "filename is %s", answer);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
i = open_file(answer, 1, 0);
|
realname = real_dir_from_tilde(answer);
|
||||||
|
|
||||||
|
i = open_file(realname, 1, 0);
|
||||||
|
free(realname);
|
||||||
|
|
||||||
dump_buffer(fileage);
|
dump_buffer(fileage);
|
||||||
set_modified();
|
set_modified();
|
||||||
|
|
28
po/nano.pot
28
po/nano.pot
|
@ -6,7 +6,7 @@
|
||||||
msgid ""
|
msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: PACKAGE VERSION\n"
|
"Project-Id-Version: PACKAGE VERSION\n"
|
||||||
"POT-Creation-Date: 2000-11-24 23:43-0500\n"
|
"POT-Creation-Date: 2000-11-25 00:01-0500\n"
|
||||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||||
|
@ -51,63 +51,63 @@ msgstr ""
|
||||||
msgid "Reading File"
|
msgid "Reading File"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: files.c:251
|
#: files.c:252
|
||||||
msgid "File to insert [from ./] "
|
msgid "File to insert [from ./] "
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: files.c:276 files.c:301 files.c:509 nano.c:1373
|
#: files.c:280 files.c:305 files.c:513 nano.c:1373
|
||||||
msgid "Cancelled"
|
msgid "Cancelled"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: files.c:331 files.c:352 files.c:366 files.c:383 files.c:389
|
#: files.c:335 files.c:356 files.c:370 files.c:387 files.c:393
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Could not open file for writing: %s"
|
msgid "Could not open file for writing: %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: files.c:340
|
#: files.c:344
|
||||||
msgid "Could not open file: Path length exceeded."
|
msgid "Could not open file: Path length exceeded."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: files.c:371
|
#: files.c:375
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Wrote >%s\n"
|
msgid "Wrote >%s\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: files.c:398
|
#: files.c:402
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Could not close %s: %s"
|
msgid "Could not close %s: %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. Try a rename??
|
#. Try a rename??
|
||||||
#: files.c:419 files.c:430 files.c:435
|
#: files.c:423 files.c:434 files.c:439
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Could not open %s for writing: %s"
|
msgid "Could not open %s for writing: %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: files.c:441
|
#: files.c:445
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Could not set permissions %o on %s: %s"
|
msgid "Could not set permissions %o on %s: %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: files.c:448
|
#: files.c:452
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Wrote %d lines"
|
msgid "Wrote %d lines"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: files.c:480
|
#: files.c:484
|
||||||
msgid "File Name to write"
|
msgid "File Name to write"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: files.c:485
|
#: files.c:489
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "filename is %s"
|
msgid "filename is %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: files.c:498
|
#: files.c:502
|
||||||
msgid "File exists, OVERWRITE ?"
|
msgid "File exists, OVERWRITE ?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: files.c:986
|
#: files.c:990
|
||||||
msgid "(more)"
|
msgid "(more)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue