mirrors
/
nano
mirror of git://git.sv.gnu.org/nano.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

The user does the editing, not the editor. So rephrasing. 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5118 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
Benno Schulenberg 2015-02-15 16:28:08 +00:00
parent 35cd49ec50
commit 1b65b19abd
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,6 +1,7 @@
2015-02-15 Benno Schulenberg <bensberg@justemail.net>
* src/file.c (do_lockfile): Also show the name of the affected file
when finding a lock file, for when many files are opened at once.
* src/file.c (do_lockfile): The user does the editing, not the editor.
2015-02-09 Chris Allegretta <chrisa@asty.org>
* nano.spec.in: Add dependency on texinfo, docdir files for

5
src/files.c
View File

@ -293,8 +293,9 @@ int do_lockfile(const char *filename)
fprintf(stderr, "user which created this lock file should be %s\n",
lockuser);
#endif
sprintf(promptstr, _("File %s is being edited (by %s, PID %d, user %s); continue?"),
filename, lockprog, lockpid, lockuser);
/* TRANSLATORS: The second %s is the name of the user, the third that of the editor. */
sprintf(promptstr, _("File %s is being edited (by %s with %s, PID %d); continue?"),
filename, lockuser, lockprog, lockpid);
ans = do_yesno_prompt(FALSE, promptstr);
if (ans < 1) {
blank_statusbar();