diff options
| author | K. Handa | 2015-09-27 17:06:12 +0900 |
|---|---|---|
| committer | K. Handa | 2015-09-27 17:06:12 +0900 |
| commit | 52beda922d2cb523a03661bf74b8678c8b45e440 (patch) | |
| tree | 04617b37298746a61d5324a5b35c9b71f439d762 /src/coding.c | |
| parent | 94ed5167557112fb00eeca05e62589db744206de (diff) | |
| parent | 1ac5a9c20cb22efb398fa18781c6b932dd4e54df (diff) | |
| download | emacs-52beda922d2cb523a03661bf74b8678c8b45e440.tar.gz emacs-52beda922d2cb523a03661bf74b8678c8b45e440.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/coding.c b/src/coding.c index 1544f319b00..3fc6fb684c6 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -4295,6 +4295,9 @@ encode_invocation_designation (struct charset *charset, | |||
| 4295 | else | 4295 | else |
| 4296 | ENCODE_LOCKING_SHIFT_3; | 4296 | ENCODE_LOCKING_SHIFT_3; |
| 4297 | break; | 4297 | break; |
| 4298 | |||
| 4299 | default: | ||
| 4300 | break; | ||
| 4298 | } | 4301 | } |
| 4299 | } | 4302 | } |
| 4300 | 4303 | ||
| @@ -7292,6 +7295,8 @@ produce_annotation (struct coding_system *coding, ptrdiff_t pos) | |||
| 7292 | case CODING_ANNOTATE_CHARSET_MASK: | 7295 | case CODING_ANNOTATE_CHARSET_MASK: |
| 7293 | produce_charset (coding, charbuf, pos); | 7296 | produce_charset (coding, charbuf, pos); |
| 7294 | break; | 7297 | break; |
| 7298 | default: | ||
| 7299 | break; | ||
| 7295 | } | 7300 | } |
| 7296 | charbuf += len; | 7301 | charbuf += len; |
| 7297 | } | 7302 | } |
| @@ -9795,7 +9800,7 @@ DEFUN ("find-operation-coding-system", Ffind_operation_coding_system, | |||
| 9795 | doc: /* Choose a coding system for an operation based on the target name. | 9800 | doc: /* Choose a coding system for an operation based on the target name. |
| 9796 | The value names a pair of coding systems: (DECODING-SYSTEM . ENCODING-SYSTEM). | 9801 | The value names a pair of coding systems: (DECODING-SYSTEM . ENCODING-SYSTEM). |
| 9797 | DECODING-SYSTEM is the coding system to use for decoding | 9802 | DECODING-SYSTEM is the coding system to use for decoding |
| 9798 | \(in case OPERATION does decoding), and ENCODING-SYSTEM is the coding system | 9803 | (in case OPERATION does decoding), and ENCODING-SYSTEM is the coding system |
| 9799 | for encoding (in case OPERATION does encoding). | 9804 | for encoding (in case OPERATION does encoding). |
| 9800 | 9805 | ||
| 9801 | The first argument OPERATION specifies an I/O primitive: | 9806 | The first argument OPERATION specifies an I/O primitive: |
| @@ -11170,7 +11175,7 @@ the cdr part is used for encoding a text to be sent to a process. */); | |||
| 11170 | Table of extra Latin codes in the range 128..159 (inclusive). | 11175 | Table of extra Latin codes in the range 128..159 (inclusive). |
| 11171 | This is a vector of length 256. | 11176 | This is a vector of length 256. |
| 11172 | If Nth element is non-nil, the existence of code N in a file | 11177 | If Nth element is non-nil, the existence of code N in a file |
| 11173 | \(or output of subprocess) doesn't prevent it to be detected as | 11178 | (or output of subprocess) doesn't prevent it to be detected as |
| 11174 | a coding system of ISO 2022 variant which has a flag | 11179 | a coding system of ISO 2022 variant which has a flag |
| 11175 | `accept-latin-extra-code' t (e.g. iso-latin-1) on reading a file | 11180 | `accept-latin-extra-code' t (e.g. iso-latin-1) on reading a file |
| 11176 | or reading output of a subprocess. | 11181 | or reading output of a subprocess. |