mirror of git://git.sv.gnu.org/nano.git
don't prompt if we're saving only a selection of a file under a
different name git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1590 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
parent
a5d8e54ab9
commit
bc503c80db
|
@ -1,8 +1,9 @@
|
|||
CVS code -
|
||||
- files.c:
|
||||
do_writeout()
|
||||
- Prompt the user if we're trying to save an existing file under
|
||||
a different name. (DLR; suggested by Jean-Philippe Guérard)
|
||||
- Prompt the user if we're trying to save an existing file (and
|
||||
not just a selection of it) under a different name. (DLR;
|
||||
suggested by Jean-Philippe Guérard)
|
||||
- global.c:
|
||||
shortcut_init()
|
||||
- Allow WHEREIS_NEXT_KEY to be used in view mode. (DLR)
|
||||
|
@ -16,7 +17,6 @@ CVS code -
|
|||
generated at the statusbar prompt sometimes on Linux. (DLR)
|
||||
- nano.spec.in:
|
||||
- Update for the 1.3 branch of nano. (DLR)
|
||||
|
||||
- THANKS:
|
||||
- Add Danilo Segan, for the Serbian translation.
|
||||
|
||||
|
|
16
src/files.c
16
src/files.c
|
@ -1834,15 +1834,19 @@ int do_writeout(const char *path, int exiting, int append)
|
|||
if (append == 0 && strcmp(answer, filename)) {
|
||||
struct stat st;
|
||||
|
||||
if (!stat(answer, &st))
|
||||
if (!stat(answer, &st)) {
|
||||
i = do_yesno(0, 0, _("File exists, OVERWRITE ?"));
|
||||
else if (filename[0] != '\0')
|
||||
i = do_yesno(0, 0, _("Save file under DIFFERENT NAME ?"));
|
||||
else
|
||||
i = 1;
|
||||
|
||||
if (i == 0 || i == -1)
|
||||
continue;
|
||||
} else if (filename[0] != '\0'
|
||||
#ifndef NANO_SMALL
|
||||
&& (!ISSET(MARK_ISSET) || exiting)
|
||||
#endif
|
||||
) {
|
||||
i = do_yesno(0, 0, _("Save file under DIFFERENT NAME ?"));
|
||||
if (i == 0 || i == -1)
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
#ifndef NANO_SMALL
|
||||
|
|
Loading…
Reference in New Issue