procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-28

Browse source 
c4daff9cf8 * Makefile.in (PREFERRED_BRANCH): Now emacs-28.
bca57086be ; Remove an obsolete comment
455b64c336 * src/coding.c (Fdecode_coding_region, Fencode_coding_regi...
This commit is contained in:
Stefan Kangas 2021-11-29 07:00:25 +01:00
commit d648874110
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/coding.c
View file

@ -9454,8 +9454,9 @@ code_convert_region (Lisp_Object start, Lisp_Object end,
DEFUN ("decode-coding-region", Fdecode_coding_region, Sdecode_coding_region,
3, 4, "r\nzCoding system: ",
doc: /* Decode the current region from the specified coding system.
Interactively, prompt for the coding system to decode the region.
doc: /* Decode the current region using the specified coding system.
Interactively, prompt for the coding system to decode the region, and
replace the region with the decoded text.
\"Decoding\" means transforming bytes into readable text (characters).
If, for instance, you have a region that contains data that represents
@ -9485,7 +9486,9 @@ not fully specified.) */)
DEFUN ("encode-coding-region", Fencode_coding_region, Sencode_coding_region,
3, 4, "r\nzCoding system: ",
doc: /* Encode the current region by specified coding system.
doc: /* Encode the current region using th specified coding system.
Interactively, prompt for the coding system to encode the region, and
replace the region with the bytes that are the result of the encoding.
What's meant by \"encoding\" is transforming textual data (characters)
into bytes. If, for instance, you have a region that contains the

3
src/editfns.c
View file

@ -4265,9 +4265,6 @@ ring. */)
enough to use as the temporary storage? That would avoid an
allocation... interesting. Later, don't fool with it now. */
/* Working without memmove, for portability (sigh), so must be
careful of overlapping subsections of the array... */
if (end1 == start2) /* adjacent regions */
{
modify_text (start1, end2);