diff options
| author | Stefan Monnier | 2019-03-21 23:55:28 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2019-03-21 23:55:28 -0400 |
| commit | 76fea1eba1332440eab2e3daecce053daccd3782 (patch) | |
| tree | 944ea8279b8a52cb715fe3493d909bc581776430 /src/coding.h | |
| parent | 57a60db2b88dfa5dea41a3a05b736cd7cd17a953 (diff) | |
| download | emacs-76fea1eba1332440eab2e3daecce053daccd3782.tar.gz emacs-76fea1eba1332440eab2e3daecce053daccd3782.zip | |
Fix misuses of NULL when talking about the NUL character
* lisp/subr.el (inhibit-null-byte-detection): Make it an obsolete alias.
* src/coding.c (setup_coding_system): Use new name.
(detect_coding): Rename null_byte_found => nul_byte_found.
(detect_coding_system): Use new name.
Rename null_byte_found => nul_byte_found.
(Fdefine_coding_system_internal): Use new name.
(syms_of_coding): Rename inhibit-null-byte-detection to
inhibit-nul-byte-detection.
* src/w16select.c (get_clipboard_data): null_char => nul_char.
* src/json.c (check_string_without_embedded_nuls): Rename from
check_string_without_embedded_nulls.
(Fjson_parse_string): Adjust accordingly.
* src/coding.h (enum define_coding_undecided_arg_index)
(enum coding_attr_index): ...null_byte... => ...nul_byte....
* lisp/info.el (info-insert-file-contents, Info-insert-dir):
* lisp/international/mule.el (define-coding-system):
* lisp/vc/vc-git.el (vc-git--call):
* doc/lispref/nonascii.texi (Lisp and Coding Systems): Use the new name.
Diffstat (limited to 'src/coding.h')
| -rw-r--r-- | src/coding.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/coding.h b/src/coding.h index 58e12d6176a..e38c0ee3968 100644 --- a/src/coding.h +++ b/src/coding.h | |||
| @@ -82,7 +82,7 @@ enum define_coding_ccl_arg_index | |||
| 82 | 82 | ||
| 83 | enum define_coding_undecided_arg_index | 83 | enum define_coding_undecided_arg_index |
| 84 | { | 84 | { |
| 85 | coding_arg_undecided_inhibit_null_byte_detection = coding_arg_max, | 85 | coding_arg_undecided_inhibit_nul_byte_detection = coding_arg_max, |
| 86 | coding_arg_undecided_inhibit_iso_escape_detection, | 86 | coding_arg_undecided_inhibit_iso_escape_detection, |
| 87 | coding_arg_undecided_prefer_utf_8, | 87 | coding_arg_undecided_prefer_utf_8, |
| 88 | coding_arg_undecided_max | 88 | coding_arg_undecided_max |
| @@ -137,7 +137,7 @@ enum coding_attr_index | |||
| 137 | 137 | ||
| 138 | coding_attr_emacs_mule_full, | 138 | coding_attr_emacs_mule_full, |
| 139 | 139 | ||
| 140 | coding_attr_undecided_inhibit_null_byte_detection, | 140 | coding_attr_undecided_inhibit_nul_byte_detection, |
| 141 | coding_attr_undecided_inhibit_iso_escape_detection, | 141 | coding_attr_undecided_inhibit_iso_escape_detection, |
| 142 | coding_attr_undecided_prefer_utf_8, | 142 | coding_attr_undecided_prefer_utf_8, |
| 143 | 143 | ||
| @@ -351,7 +351,7 @@ struct emacs_mule_spec | |||
| 351 | 351 | ||
| 352 | struct undecided_spec | 352 | struct undecided_spec |
| 353 | { | 353 | { |
| 354 | /* Inhibit null byte detection. 1 means always inhibit, | 354 | /* Inhibit NUL byte detection. 1 means always inhibit, |
| 355 | -1 means do not inhibit, 0 means rely on user variable. */ | 355 | -1 means do not inhibit, 0 means rely on user variable. */ |
| 356 | int inhibit_nbd; | 356 | int inhibit_nbd; |
| 357 | 357 | ||