aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Kangas2021-11-13 07:00:30 +0100
committerStefan Kangas2021-11-13 07:00:30 +0100
commitb4c6ab8cb67be4d5b3e0041981968c6cce4afe89 (patch)
tree1a18482f77d5efe9d7287faad0d1a52215011a0a /src
parenta5008352c43cda13b0a35547ee91f0c889d71d06 (diff)
parent42d4e24ff3f13ccbd401d93d70ecdee99b88a26d (diff)
downloademacs-b4c6ab8cb67be4d5b3e0041981968c6cce4afe89.tar.gz
emacs-b4c6ab8cb67be4d5b3e0041981968c6cce4afe89.zip
Merge from origin/emacs-28
42d4e24ff3 ; Fix typos 0d0125daae Improve documentation of 'decode-coding-region'
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog.114
-rw-r--r--src/coding.c9
2 files changed, 7 insertions, 6 deletions
diff --git a/src/ChangeLog.11 b/src/ChangeLog.11
index 41c35babda0..cf5e7b7a2a2 100644
--- a/src/ChangeLog.11
+++ b/src/ChangeLog.11
@@ -22399,7 +22399,7 @@
22399 * Makefile.in (${lispsource}international/charprop.el): 22399 * Makefile.in (${lispsource}international/charprop.el):
22400 Delete this target. 22400 Delete this target.
22401 22401
22402 * search.c (boyer_moore): Fix incorrect synching of the trunk and 22402 * search.c (boyer_moore): Fix incorrect syncing of the trunk and
22403 emacs-unicode-2. 22403 emacs-unicode-2.
22404 22404
224052008-02-11 Stefan Monnier <monnier@iro.umontreal.ca> 224052008-02-11 Stefan Monnier <monnier@iro.umontreal.ca>
@@ -23177,7 +23177,7 @@
231772008-02-01 Kenichi Handa <handa@ni.aist.go.jp> 231772008-02-01 Kenichi Handa <handa@ni.aist.go.jp>
23178 23178
23179 * xfaces.c (face_for_overlay_string): Call lookup_face with 23179 * xfaces.c (face_for_overlay_string): Call lookup_face with
23180 correct arguments (fix of synching with the trunk). 23180 correct arguments (fix of syncing with the trunk).
23181 23181
231822008-02-01 Kenichi Handa <handa@m17n.org> 231822008-02-01 Kenichi Handa <handa@m17n.org>
23183 23183
diff --git a/src/coding.c b/src/coding.c
index 7030a53869a..02dccf5bdb0 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -9455,11 +9455,12 @@ code_convert_region (Lisp_Object start, Lisp_Object end,
9455DEFUN ("decode-coding-region", Fdecode_coding_region, Sdecode_coding_region, 9455DEFUN ("decode-coding-region", Fdecode_coding_region, Sdecode_coding_region,
9456 3, 4, "r\nzCoding system: ", 9456 3, 4, "r\nzCoding system: ",
9457 doc: /* Decode the current region from the specified coding system. 9457 doc: /* Decode the current region from the specified coding system.
9458Interactively, prompt for the coding system to decode the region.
9458 9459
9459What's meant by \"decoding\" is transforming bytes into text 9460\"Decoding\" means transforming bytes into readable text (characters).
9460(characters). If, for instance, you have a region that contains data 9461If, for instance, you have a region that contains data that represents
9461that represents the two bytes #xc2 #xa9, after calling this function 9462the two bytes #xc2 #xa9, after calling this function with the utf-8
9462with the utf-8 coding system, the region will contain the single 9463coding system, the region will contain the single
9463character ?\\N{COPYRIGHT SIGN}. 9464character ?\\N{COPYRIGHT SIGN}.
9464 9465
9465When called from a program, takes four arguments: 9466When called from a program, takes four arguments: