[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master d648874: Merge from origin/emacs-28
From: |
Stefan Kangas |
Subject: |
master d648874: Merge from origin/emacs-28 |
Date: |
Mon, 29 Nov 2021 01:17:31 -0500 (EST) |
branch: master
commit d648874110bdfe54d6f35f1748e27d96495ccfa3
Merge: 390361c c4daff9
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>
Merge from origin/emacs-28
c4daff9cf8 * Makefile.in (PREFERRED_BRANCH): Now emacs-28.
bca57086be ; Remove an obsolete comment
455b64c336 * src/coding.c (Fdecode_coding_region, Fencode_coding_regi...
---
src/coding.c | 9 ++++++---
src/editfns.c | 3 ---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/coding.c b/src/coding.c
index 02dccf5..f8004d2 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -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
diff --git a/src/editfns.c b/src/editfns.c
index c8219de..5c9c34d 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -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);