aboutsummaryrefslogtreecommitdiffstats
path: root/src/font.c
diff options
context:
space:
mode:
authorStefan Monnier2019-03-21 23:55:28 -0400
committerStefan Monnier2019-03-21 23:55:28 -0400
commit76fea1eba1332440eab2e3daecce053daccd3782 (patch)
tree944ea8279b8a52cb715fe3493d909bc581776430 /src/font.c
parent57a60db2b88dfa5dea41a3a05b736cd7cd17a953 (diff)
downloademacs-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/font.c')
-rw-r--r--src/font.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/font.c b/src/font.c
index 9220fb1cd24..5ca89c97dcf 100644
--- a/src/font.c
+++ b/src/font.c
@@ -1007,7 +1007,7 @@ font_expand_wildcards (Lisp_Object *field, int n)
1007} 1007}
1008 1008
1009 1009
1010/* Parse NAME (null terminated) as XLFD and store information in FONT 1010/* Parse NAME (NUL terminated) as XLFD and store information in FONT
1011 (font-spec or font-entity). Size property of FONT is set as 1011 (font-spec or font-entity). Size property of FONT is set as
1012 follows: 1012 follows:
1013 specified XLFD fields FONT property 1013 specified XLFD fields FONT property
@@ -1353,7 +1353,7 @@ font_unparse_xlfd (Lisp_Object font, int pixel_size, char *name, int nbytes)
1353 return len < nbytes ? len : -1; 1353 return len < nbytes ? len : -1;
1354} 1354}
1355 1355
1356/* Parse NAME (null terminated) and store information in FONT 1356/* Parse NAME (NUL terminated) and store information in FONT
1357 (font-spec or font-entity). NAME is supplied in either the 1357 (font-spec or font-entity). NAME is supplied in either the
1358 Fontconfig or GTK font name format. If NAME is successfully 1358 Fontconfig or GTK font name format. If NAME is successfully
1359 parsed, return 0. Otherwise return -1. 1359 parsed, return 0. Otherwise return -1.
@@ -1725,7 +1725,7 @@ font_unparse_fcname (Lisp_Object font, int pixel_size, char *name, int nbytes)
1725 1725
1726#endif 1726#endif
1727 1727
1728/* Parse NAME (null terminated) and store information in FONT 1728/* Parse NAME (NUL terminated) and store information in FONT
1729 (font-spec or font-entity). If NAME is successfully parsed, return 1729 (font-spec or font-entity). If NAME is successfully parsed, return
1730 0. Otherwise return -1. */ 1730 0. Otherwise return -1. */
1731 1731