From 455b64c33657f05f614007947cc9028621ba21d7 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 28 Nov 2021 20:18:16 +0200 Subject: [PATCH 1/3] * src/coding.c (Fdecode_coding_region, Fencode_coding_region): Doc fix. --- src/coding.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/coding.c b/src/coding.c index 02dccf5bdb0..f8004d202e5 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 From bca57086bef276cdd918edfa9f6e133899bbbbbb Mon Sep 17 00:00:00 2001 From: Karl Fogel Date: Sun, 28 Nov 2021 13:34:57 -0600 Subject: [PATCH 2/3] ; Remove an obsolete comment * src/editfns.c (Ftranspose_regions): Remove an obsolete comment about memmove, following up to commit 72af86bd8cf of 8 Jul 2010 by Andreas Schwab and commit 354f9f0fc6cc of 23 Feb 2016 by Fredrik Bergroth, both of which added calls to memmove. --- src/editfns.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/editfns.c b/src/editfns.c index c8219decb06..5c9c34dc352 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); From c4daff9cf844ec85930bdcd2064787c92c260861 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Mon, 29 Nov 2021 05:57:13 +0100 Subject: [PATCH 3/3] * Makefile.in (PREFERRED_BRANCH): Now emacs-28. --- Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index 5fc1edc7a39..c36882d5bea 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1164,7 +1164,7 @@ ChangeLog: ./$(emacslog) -o $(CHANGELOG) -n $(CHANGELOG_HISTORY_INDEX_MAX) # Check that we are in a good state for changing history. -PREFERRED_BRANCH = emacs-27 +PREFERRED_BRANCH = emacs-28 preferred-branch-is-current: git branch | grep -q '^\* $(PREFERRED_BRANCH)$$' unchanged-history-files: