diff options
| author | Andrea Corallo | 2020-05-30 11:52:27 +0100 |
|---|---|---|
| committer | Andrea Corallo | 2020-05-30 11:52:27 +0100 |
| commit | eeebbd5fcbdf2827689311b3751437670bfc2e22 (patch) | |
| tree | b0b6c946b5fc2743006a476d2df29025f2c57cc7 /src/coding.c | |
| parent | 15c121ee0b5cbe005548eeba09dd54b145b2e258 (diff) | |
| parent | f42db4b6e1598c12924cce4bbe4d67e6d86b7963 (diff) | |
| download | emacs-eeebbd5fcbdf2827689311b3751437670bfc2e22.tar.gz emacs-eeebbd5fcbdf2827689311b3751437670bfc2e22.zip | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/coding.c b/src/coding.c index 34f36d5a86a..071124b4ef1 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -10395,7 +10395,7 @@ representation of the decoded text. | |||
| 10395 | 10395 | ||
| 10396 | This function sets `last-coding-system-used' to the precise coding system | 10396 | This function sets `last-coding-system-used' to the precise coding system |
| 10397 | used (which may be different from CODING-SYSTEM if CODING-SYSTEM is | 10397 | used (which may be different from CODING-SYSTEM if CODING-SYSTEM is |
| 10398 | not fully specified.) */) | 10398 | not fully specified.) The function does not change the match data. */) |
| 10399 | (Lisp_Object string, Lisp_Object coding_system, Lisp_Object nocopy, Lisp_Object buffer) | 10399 | (Lisp_Object string, Lisp_Object coding_system, Lisp_Object nocopy, Lisp_Object buffer) |
| 10400 | { | 10400 | { |
| 10401 | return code_convert_string (string, coding_system, buffer, | 10401 | return code_convert_string (string, coding_system, buffer, |
| @@ -10415,7 +10415,7 @@ case, the return value is the length of the encoded text. | |||
| 10415 | 10415 | ||
| 10416 | This function sets `last-coding-system-used' to the precise coding system | 10416 | This function sets `last-coding-system-used' to the precise coding system |
| 10417 | used (which may be different from CODING-SYSTEM if CODING-SYSTEM is | 10417 | used (which may be different from CODING-SYSTEM if CODING-SYSTEM is |
| 10418 | not fully specified.) */) | 10418 | not fully specified.) The function does not change the match data. */) |
| 10419 | (Lisp_Object string, Lisp_Object coding_system, Lisp_Object nocopy, Lisp_Object buffer) | 10419 | (Lisp_Object string, Lisp_Object coding_system, Lisp_Object nocopy, Lisp_Object buffer) |
| 10420 | { | 10420 | { |
| 10421 | return code_convert_string (string, coding_system, buffer, | 10421 | return code_convert_string (string, coding_system, buffer, |