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

add minor cosmetic fixes, and do another int -> bool conversion 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1961 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2004-10-04 15:23:47 +00:00
parent f1c395da79
commit 951d7148d1
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/files.c
View File

@ -538,7 +538,9 @@ void do_insertfile(
#endif
"./");
if (i != -1) {
if (i < 0) {
statusbar(_("Cancelled"));
} else {
int old_current_x = current_x;
ans = mallocstrcpy(ans, answer);
@ -599,8 +601,7 @@ void do_insertfile(
/* Refresh the screen. */
edit_refresh();
} else
statusbar(_("Cancelled"));
}
free(ans);
}
@ -1395,10 +1396,8 @@ int write_file(const char *name, int tmp, int append, int nonamechange)
/* The temp file name we write to on prepend. */
assert(name != NULL);
if (name[0] == '\0') {
statusbar(_("Cancelled"));
if (name[0] == '\0')
return -1;
}
if (!tmp)
titlebar(NULL);
@ -1765,7 +1764,7 @@ int write_marked(const char *name, int tmp, int append)
}
#endif /* !NANO_SMALL */
int do_writeout(int exiting)
int do_writeout(bool exiting)
{
int i;
int append = 0;
@ -1844,7 +1843,7 @@ int do_writeout(int exiting)
free(ans);
#endif
if (i == -1) {
if (i < 0) {
statusbar(_("Cancelled"));
display_main_list();
return -1;

2
src/nano.c
View File

@ -173,7 +173,7 @@ void die_save_file(const char *die_filename)
ret = get_next_filename(die_filename);
if (ret[0] != '\0')
failed = -1 == write_file(ret, TRUE, FALSE, TRUE);
failed = (write_file(ret, TRUE, FALSE, TRUE) == -1);
if (!failed)
fprintf(stderr, _("\nBuffer written to %s\n"), ret);

2
src/proto.h
View File

@ -217,7 +217,7 @@ int write_file(const char *name, int tmp, int append, int nonamechange);
#ifndef NANO_SMALL
int write_marked(const char *name, int tmp, int append);
#endif
int do_writeout(int exiting);
int do_writeout(bool exiting);
void do_writeout_void(void);
char *real_dir_from_tilde(const char *buf);
#ifndef DISABLE_TABCOMP