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/fileio.c | |
| 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/fileio.c')
| -rw-r--r-- | src/fileio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/fileio.c b/src/fileio.c index 7b9446c7e12..4ee125d7de2 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -1639,7 +1639,7 @@ file_name_absolute_p (const char *filename) | |||
| 1639 | } | 1639 | } |
| 1640 | 1640 | ||
| 1641 | /* Put into BUF the concatenation of DIR and FILE, with an intervening | 1641 | /* Put into BUF the concatenation of DIR and FILE, with an intervening |
| 1642 | directory separator if needed. Return a pointer to the null byte | 1642 | directory separator if needed. Return a pointer to the NUL byte |
| 1643 | at the end of the concatenated string. */ | 1643 | at the end of the concatenated string. */ |
| 1644 | char * | 1644 | char * |
| 1645 | splice_dir_file (char *buf, char const *dir, char const *file) | 1645 | splice_dir_file (char *buf, char const *dir, char const *file) |