mirrors/nano
1
0
Fork 0
mirror of git://git.sv.gnu.org/nano.git synced 2024-11-22 04:41:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

Renaming 'no_replace_void()' to 'flip_replace_void()',

Browse Source 
to show what it actually does.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5014 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
Benno Schulenberg 2014-06-23 18:30:35 +00:00
parent ce0ea44596
commit a0f66c0691
6 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,6 +1,9 @@
2014-06-23 Benno Schulenberg <bensberg@justemail.net>
* src/nano.h, src/move.c (do_up, do_down), src/winio.c (edit_scrol):
Rename UP_DIR and DOWN_DIR to UPWARD and DOWNWARD, for clarity.
* src/proto.h, src/global.c, src/search.c: Rename 'no_replace_void()'
to 'flip_replace_void()', to show what it actually does.
* doc/man/nanorc.5, doc/texinfo/nano.texi: Update the docs for that.
2014-06-22 Benno Schulenberg <bensberg@justemail.net>
* src/browser.c (parse_browser_input), src/help.c (parse_help_input):

4
doc/man/nanorc.5
View File

@ -514,8 +514,8 @@ Shows the previous history entry in the prompt menus (e.g. search).
.B nexthistory
Shows the next history entry in the prompt menus (e.g. search).
.TP
.B dontreplace
Switches back to searching instead of replacing.
.B flipreplace
Toggles between searching for something and replacing something.
.TP
.B flipexecute
Toggles between inserting a file and executing a command.

4
doc/texinfo/nano.texi
View File

@ -1040,8 +1040,8 @@ Shows the previous history entry in the prompt menus (e.g. search).
@item nexthistory
Shows the next history entry in the prompt menus (e.g. search).
@item dontreplace
Switches back to searching instead of replacing.
@item flipreplace
Toggles between searching for something and replacing something.
@item flipexecute
Toggles between inserting a file and executing a command.

14
src/global.c
View File

@ -267,7 +267,7 @@ void backup_file_void(void)
void new_buffer_void(void)
{
}
void no_replace_void(void)
void flip_replace_void(void)
{
}
void flip_execute_void(void)
@ -741,10 +741,10 @@ void shortcut_init(void)
N_("Backwards"), IFSCHELP(nano_reverse_msg), FALSE, VIEW);
#endif
add_to_funcs(do_replace, MWHEREIS,
add_to_funcs(flip_replace_void, MWHEREIS,
replace_tag, IFSCHELP(nano_replace_msg), FALSE, VIEW);
add_to_funcs(no_replace_void, MREPLACE,
add_to_funcs(flip_replace_void, MREPLACE,
N_("No Replace"), IFSCHELP(nano_whereis_msg), FALSE, VIEW);
#ifndef DISABLE_JUSTIFY
@ -1115,8 +1115,7 @@ void shortcut_init(void)
add_to_sclist(MWHEREIS|MREPLACE, "M-C", case_sens_void, 0, FALSE);
#endif
add_to_sclist(MWHEREIS|MREPLACE, "M-R", regexp_void, 0, FALSE);
add_to_sclist(MWHEREIS, "^R", do_replace, 0, FALSE);
add_to_sclist(MREPLACE, "^R", no_replace_void, 0, FALSE);
add_to_sclist(MWHEREIS|MREPLACE, "^R", flip_replace_void, 0, FALSE);
add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH|MGOTOLINE, "^Y", do_first_line, 0, TRUE);
add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH|MGOTOLINE, "^V", do_last_line, 0, TRUE);
#ifndef DISABLE_JUSTIFY
@ -1474,8 +1473,9 @@ sc *strtosc(char *input)
s->scfunc = backwards_void;
s->execute = FALSE;
#endif
} else if (!strcasecmp(input, "dontreplace")) {
s->scfunc = no_replace_void;
} else if (!strcasecmp(input, "flipreplace") ||
!strcasecmp(input, "dontreplace")) {
s->scfunc = flip_replace_void;
s->execute = FALSE;
} else if (!strcasecmp(input, "gototext")) {
s->scfunc = gototext_void;

2
src/proto.h
View File

@ -831,7 +831,7 @@ void backup_file_void(void);
void new_buffer_void(void);
void backwards_void(void);
void goto_dir_void(void);
void no_replace_void(void);
void flip_replace_void(void);
void flip_execute_void(void);
#endif /* !PROTO_H */

2
src/search.c
View File

@ -249,7 +249,7 @@ int search_init(bool replacing, bool use_answer)
backupstring = mallocstrcpy(backupstring, answer);
return 1;
#endif
} else if (func == do_replace || func == no_replace_void) {
} else if (func == do_replace || func == flip_replace_void) {
backupstring = mallocstrcpy(backupstring, answer);
return -2; /* Call the opposite search function. */
} else if (func == do_gotolinecolumn_void) {