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

Normalizing the punctuation in some prompts: no space before a question mark, 

and a semicolon instead of a comma between phrases.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5750 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2016-03-20 10:57:14 +00:00
parent 311f0e8734
commit 1ef62490dd
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2016-03-20 Benno Schulenberg <bensberg@justemail.net>
* src/files.c (do_writeout), src/nano.c (do_exit): Normalize the
punctuation in some prompts: no space before a question mark, and
a semicolon instead of a comma between phrases.
2016-03-19 Benno Schulenberg <bensberg@justemail.net> 2016-03-19 Benno Schulenberg <bensberg@justemail.net>
* src/search.c (search_init): Always remember the last typed string, * src/search.c (search_init): Always remember the last typed string,
also when it's an invalid regex. This fixes Savannah bug #47440. also when it's an invalid regex. This fixes Savannah bug #47440.

10
src/files.c
View File

@ -2346,7 +2346,7 @@ int do_writeout(bool exiting)
if (func == discard_buffer) { if (func == discard_buffer) {
if (openfile->modified) if (openfile->modified)
i = do_yesno_prompt(FALSE, i = do_yesno_prompt(FALSE,
_("Save modified buffer anyway ? ")); _("Save modified buffer anyway? "));
else else
i = 0; i = 0;
@ -2454,7 +2454,7 @@ int do_writeout(bool exiting)
if (name_exists) { if (name_exists) {
i = do_yesno_prompt(FALSE, i = do_yesno_prompt(FALSE,
_("File exists, OVERWRITE ? ")); _("File exists; OVERWRITE? "));
if (i == 0 || i == -1) if (i == 0 || i == -1)
continue; continue;
} else } else
@ -2463,7 +2463,7 @@ int do_writeout(bool exiting)
#endif #endif
{ {
i = do_yesno_prompt(FALSE, i = do_yesno_prompt(FALSE,
_("Save file under DIFFERENT NAME ? ")); _("Save file under DIFFERENT NAME? "));
if (i == 0 || i == -1) if (i == 0 || i == -1)
continue; continue;
} }
@ -2477,12 +2477,12 @@ int do_writeout(bool exiting)
openfile->current_stat->st_dev != st.st_dev || openfile->current_stat->st_dev != st.st_dev ||
openfile->current_stat->st_ino != st.st_ino)) { openfile->current_stat->st_ino != st.st_ino)) {
i = do_yesno_prompt(FALSE, i = do_yesno_prompt(FALSE,
_("File was modified since you opened it, continue saving ? ")); _("File was modified since you opened it;"
" continue saving? "));
if (i == 0 || i == -1) if (i == 0 || i == -1)
continue; continue;
} }
#endif #endif
} }
/* Convert newlines to nulls, just before we save the file. */ /* Convert newlines to nulls, just before we save the file. */

3
src/nano.c
View File

@ -1105,7 +1105,8 @@ void do_exit(void)
no_current_file_name_warning(); no_current_file_name_warning();
i = do_yesno_prompt(FALSE, i = do_yesno_prompt(FALSE,
_("Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? ")); _("Save modified buffer? (Answering \"No\" will"
" DISCARD changes.) "));
} }
#ifdef DEBUG #ifdef DEBUG