diff options
| author | Paul Eggert | 2013-06-29 08:52:20 -0700 |
|---|---|---|
| committer | Paul Eggert | 2013-06-29 08:52:20 -0700 |
| commit | 9c90cc06dd36f217422973ea41663a1f2105296f (patch) | |
| tree | a48e62dc276027cd616f1c5a76155ce1e5255144 /src/coding.h | |
| parent | 79007321264153e8b4e6bfb9974ae6a99babe8c1 (diff) | |
| download | emacs-9c90cc06dd36f217422973ea41663a1f2105296f.tar.gz emacs-9c90cc06dd36f217422973ea41663a1f2105296f.zip | |
Fix minor problems found by static checking.
* coding.c (encode_inhibit_flag, inhibit_flag): New functions.
Redo the latter's body to sidestep GCC parenthesization warnings.
(setup_coding_system, detect_coding, detect_coding_system): Use them.
* coding.c (detect_coding, detect_coding_system):
* coding.h (struct undecided_spec):
Use bool for boolean.
* image.c (QCmax_width, QCmax_height): Now static.
* xdisp.c (Fmove_point_visually): Remove unused local.
Diffstat (limited to 'src/coding.h')
| -rw-r--r-- | src/coding.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/coding.h b/src/coding.h index 453805e233a..7b7078e06fa 100644 --- a/src/coding.h +++ b/src/coding.h | |||
| @@ -382,9 +382,15 @@ struct ccl_spec; | |||
| 382 | 382 | ||
| 383 | struct undecided_spec | 383 | struct undecided_spec |
| 384 | { | 384 | { |
| 385 | int inhibit_nbd; /* nbd: null byte detection */ | 385 | /* Inhibit null byte detection. 1 means always inhibit, |
| 386 | int inhibit_ied; /* ied: iso escape detection */ | 386 | -1 means do not inhibit, 0 means rely on user variable. */ |
| 387 | int prefer_utf_8; | 387 | int inhibit_nbd; |
| 388 | |||
| 389 | /* Inhibit ISO escape detection. -1, 0, 1 as above. */ | ||
| 390 | int inhibit_ied; | ||
| 391 | |||
| 392 | /* Prefer UTF-8 when the input could be other encodings. */ | ||
| 393 | bool prefer_utf_8; | ||
| 388 | }; | 394 | }; |
| 389 | 395 | ||
| 390 | enum utf_bom_type | 396 | enum utf_bom_type |