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

files: revert the previous commit, as the extra warning is annoying 

It also erroneously left the succeeding prompt on the screen.

This fixes https://savannah.gnu.org/bugs/?57593.
master
Benno Schulenberg 2020-01-13 21:42:44 +01:00
parent 5cf351913e
commit 8455251c35
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/files.c
View File

@ -305,11 +305,9 @@ int do_lockfile(const char *filename, bool ask_the_user)
snprintf(lockfilename, locknamesize, "%s/%s%s%s", dirname(namecopy), snprintf(lockfilename, locknamesize, "%s/%s%s%s", dirname(namecopy),
locking_prefix, basename(secondcopy), locking_suffix); locking_prefix, basename(secondcopy), locking_suffix);
if (!ask_the_user && stat(lockfilename, &fileinfo) != -1) { if (!ask_the_user && stat(lockfilename, &fileinfo) != -1)
blank_bottombars();
lastmessage = HUSH;
warn_and_shortly_pause(_("Someone else is also editing this file")); warn_and_shortly_pause(_("Someone else is also editing this file"));
} else if (stat(lockfilename, &fileinfo) != -1) { else if (stat(lockfilename, &fileinfo) != -1) {
size_t readtot = 0; size_t readtot = 0;
size_t readamt = 0; size_t readamt = 0;
char *lockbuf, *question, *pidstring, *postedname, *promptstr; char *lockbuf, *question, *pidstring, *postedname, *promptstr;
@ -2160,8 +2158,6 @@ int do_writeout(bool exiting, bool withprompt)
sprintf(message, question, name); sprintf(message, question, name);
blank_bottombars();
warn_and_shortly_pause(_("File already exists"));
choice = do_yesno_prompt(FALSE, message); choice = do_yesno_prompt(FALSE, message);
free(message); free(message);