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

bindings: rename two bindable functions: copytext to copy, uncut to paste

Browse Source 
To match the common names used for these functions, for consistency,
and because 'uncut' sounds too much like "undo the cut".
This commit is contained in:
Benno Schulenberg 2018-06-01 12:47:04 +02:00
parent c2593c1c5a
commit eb84205426
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/nano.texi
View File

@ -1140,12 +1140,14 @@ Interactively replaces text within the current buffer.
@item cut
Cuts and stores the current line (or the marked region).
@item copytext
@item copy
Copies the current line (or the marked region) without deleting it.
(The old form 'copytext' is deprecated.)
@item uncut
Copies the currently stored text into the current buffer at the
@item paste
Pastes the currently stored text into the current buffer at the
current cursor position.
(The old form 'uncut' is deprecated.)
@item cutwordleft
Cuts from the cursor position to the beginning of the preceding word.

8
doc/nanorc.5
View File

@ -487,12 +487,14 @@ Interactively replaces text within the current buffer.
.B cut
Cuts and stores the current line (or the marked region).
.TP
.B copytext
.B copy
Copies the current line (or the marked region) without deleting it.
(The old form 'copytext' is deprecated.)
.TP
.B uncut
Copies the currently stored text into the current buffer at the
.B paste
Pastes the currently stored text into the current buffer at the
current cursor position.
(The old form 'uncut' is deprecated.)
.TP
.B cutwordleft
Cuts from the cursor position to the beginning of the preceding word.

6
src/global.c
View File

@ -1498,12 +1498,14 @@ sc *strtosc(const char *input)
s->func = do_replace;
else if (!strcasecmp(input, "cut"))
s->func = do_cut_text_void;
else if (!strcasecmp(input, "uncut"))
else if (!strcasecmp(input, "paste") ||
!strcasecmp(input, "uncut")) /* Deprecated. Remove end of 2018. */
s->func = do_uncut_text;
#ifndef NANO_TINY
else if (!strcasecmp(input, "cutrestoffile"))
s->func = do_cut_till_eof;
else if (!strcasecmp(input, "copytext"))
else if (!strcasecmp(input, "copy") ||
!strcasecmp(input, "copytext")) /* Deprecated. Remove end of 2018. */
s->func = do_copy_text;
else if (!strcasecmp(input, "mark"))
s->func = do_mark;