aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa1998-06-13 01:41:23 +0000
committerKenichi Handa1998-06-13 01:41:23 +0000
commit80e803b4e7effee79be93b328df1372a4959cbbb (patch)
treea2b4b15dd616047e37fd83354677d8e52fa2633e /src
parentfde4581d31747d165b404620351a3fc0bbb71f39 (diff)
downloademacs-80e803b4e7effee79be93b328df1372a4959cbbb.tar.gz
emacs-80e803b4e7effee79be93b328df1372a4959cbbb.zip
(detect_coding_system): Always return a list of HIGHEST is zero.
(Fdetect_coding_region): Doc-string adjusted for the above change. (Fdetect_coding_string): Likewise.
Diffstat (limited to 'src')
-rw-r--r--src/coding.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/coding.c b/src/coding.c
index 8ea518d3708..36376b83ede 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -4528,7 +4528,7 @@ detect_coding_system (src, src_bytes, highest)
4528 if (VECTORP (val2)) 4528 if (VECTORP (val2))
4529 val = XVECTOR (val2)->contents[eol_type]; 4529 val = XVECTOR (val2)->contents[eol_type];
4530 } 4530 }
4531 return val; 4531 return (highest ? val : Fcons (val, Qnil));
4532 } 4532 }
4533 4533
4534 /* At first, gather possible coding systems in VAL. */ 4534 /* At first, gather possible coding systems in VAL. */
@@ -4567,8 +4567,9 @@ DEFUN ("detect-coding-region", Fdetect_coding_region, Sdetect_coding_region,
4567 "Detect coding system of the text in the region between START and END.\n\ 4567 "Detect coding system of the text in the region between START and END.\n\
4568Return a list of possible coding systems ordered by priority.\n\ 4568Return a list of possible coding systems ordered by priority.\n\
4569\n\ 4569\n\
4570If only ASCII characters are found, it returns `undecided'\n\ 4570If only ASCII characters are found, it returns a list of single element\n\
4571or its subsidiary coding system according to a detected end-of-line format.\n\ 4571`undecided' or its subsidiary coding system according to a detected\n\
4572end-of-line format.\n\
4572\n\ 4573\n\
4573If optional argument HIGHEST is non-nil, return the coding system of\n\ 4574If optional argument HIGHEST is non-nil, return the coding system of\n\
4574highest priority.") 4575highest priority.")
@@ -4599,8 +4600,9 @@ DEFUN ("detect-coding-string", Fdetect_coding_string, Sdetect_coding_string,
4599 "Detect coding system of the text in STRING.\n\ 4600 "Detect coding system of the text in STRING.\n\
4600Return a list of possible coding systems ordered by priority.\n\ 4601Return a list of possible coding systems ordered by priority.\n\
4601\n\ 4602\n\
4602If only ASCII characters are found, it returns `undecided'\n\ 4603If only ASCII characters are found, it returns a list of single element\n\
4603or its subsidiary coding system according to a detected end-of-line format.\n\ 4604`undecided' or its subsidiary coding system according to a detected\n\
4605end-of-line format.\n\
4604\n\ 4606\n\
4605If optional argument HIGHEST is non-nil, return the coding system of\n\ 4607If optional argument HIGHEST is non-nil, return the coding system of\n\
4606highest priority.") 4608highest priority.")