summaryrefslogtreecommitdiff
path: root/src/coding.h
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2013-06-29 08:52:20 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2013-06-29 08:52:20 -0700
commit9c90cc06dd36f217422973ea41663a1f2105296f (patch)
treea48e62dc276027cd616f1c5a76155ce1e5255144 /src/coding.h
parent79007321264153e8b4e6bfb9974ae6a99babe8c1 (diff)
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.h12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/coding.h b/src/coding.h
index 453805e233..7b7078e06f 100644
--- a/src/coding.h
+++ b/src/coding.h
@@ -382,9 +382,15 @@ struct ccl_spec;
struct undecided_spec
{
- int inhibit_nbd; /* nbd: null byte detection */
- int inhibit_ied; /* ied: iso escape detection */
- int prefer_utf_8;
+ /* Inhibit null byte detection. 1 means always inhibit,
+ -1 means do not inhibit, 0 means rely on user variable. */
+ int inhibit_nbd;
+
+ /* Inhibit ISO escape detection. -1, 0, 1 as above. */
+ int inhibit_ied;
+
+ /* Prefer UTF-8 when the input could be other encodings. */
+ bool prefer_utf_8;
};
enum utf_bom_type