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

tweaks: rename a function, to be more correct

master
Benno Schulenberg 2020-05-28 16:59:50 +02:00
parent 90772ad05b
commit 6d00e75dc2
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/files.c
View File

@ -225,7 +225,7 @@ char *do_lockfile(const char *filename, bool ask_the_user)
free(namecopy); free(namecopy);
if (!ask_the_user && stat(lockfilename, &fileinfo) != -1) if (!ask_the_user && stat(lockfilename, &fileinfo) != -1)
warn_and_shortly_pause(_("Someone else is also editing this file")); warn_and_briefly_pause(_("Someone else is also editing this file"));
else if (stat(lockfilename, &fileinfo) != -1) { else if (stat(lockfilename, &fileinfo) != -1) {
char *lockbuf, *question, *pidstring, *postedname, *promptstr; char *lockbuf, *question, *pidstring, *postedname, *promptstr;
static char lockprog[11], lockuser[17]; static char lockprog[11], lockuser[17];
@ -2142,7 +2142,7 @@ int do_writeout(bool exiting, bool withprompt)
* the name of the current file if it already has one. */ * the name of the current file if it already has one. */
if (ISSET(RESTRICTED)) { if (ISSET(RESTRICTED)) {
/* TRANSLATORS: Restricted mode forbids overwriting. */ /* TRANSLATORS: Restricted mode forbids overwriting. */
warn_and_shortly_pause(_("File exists -- " warn_and_briefly_pause(_("File exists -- "
"cannot overwrite")); "cannot overwrite"));
continue; continue;
} }
@ -2186,7 +2186,7 @@ int do_writeout(bool exiting, bool withprompt)
openfile->statinfo->st_dev != st.st_dev || openfile->statinfo->st_dev != st.st_dev ||
openfile->statinfo->st_ino != st.st_ino)) { openfile->statinfo->st_ino != st.st_ino)) {
warn_and_shortly_pause(_("File on disk has changed")); warn_and_briefly_pause(_("File on disk has changed"));
choice = do_yesno_prompt(FALSE, _("File was modified " choice = do_yesno_prompt(FALSE, _("File was modified "
"since you opened it; continue saving? ")); "since you opened it; continue saving? "));

2
src/nano.c
View File

@ -734,7 +734,7 @@ void do_exit(void)
/* If the SAVE_ON_EXIT flag is set, and the current file doesn't /* If the SAVE_ON_EXIT flag is set, and the current file doesn't
* have a name, warn the user before prompting for a name. */ * have a name, warn the user before prompting for a name. */
if (ISSET(SAVE_ON_EXIT)) if (ISSET(SAVE_ON_EXIT))
warn_and_shortly_pause(_("No file name")); warn_and_briefly_pause(_("No file name"));
choice = do_yesno_prompt(FALSE, _("Save modified buffer? ")); choice = do_yesno_prompt(FALSE, _("Save modified buffer? "));
} }

2
src/proto.h
View File

@ -608,7 +608,7 @@ char *display_string(const char *buf, size_t column, size_t span,
void titlebar(const char *path); void titlebar(const char *path);
void statusline(message_type importance, const char *msg, ...); void statusline(message_type importance, const char *msg, ...);
void statusbar(const char *msg); void statusbar(const char *msg);
void warn_and_shortly_pause(const char *msg); void warn_and_briefly_pause(const char *msg);
void bottombars(int menu); void bottombars(int menu);
void post_one_key(const char *keystroke, const char *tag, int width); void post_one_key(const char *keystroke, const char *tag, int width);
void place_the_cursor(void); void place_the_cursor(void);

2
src/winio.c
View File

@ -2250,7 +2250,7 @@ void statusbar(const char *msg)
/* Warn the user on the status bar and pause for a moment, so that the /* Warn the user on the status bar and pause for a moment, so that the
* message can be noticed and read. */ * message can be noticed and read. */
void warn_and_shortly_pause(const char *msg) void warn_and_briefly_pause(const char *msg)
{ {
blank_bottombars(); blank_bottombars();
statusline(ALERT, msg); statusline(ALERT, msg);