Merge remote-tracking branch 'savannah/master' into HEAD

1 files changed, 3 insertions, 3 deletions

diff --git a/src/coding.h b/src/coding.h
index c2a7b2a00ff..4973cf89eb1 100644
--- a/src/coding.h
+++ b/src/coding.h
@@ -82,7 +82,7 @@ enum define_coding_ccl_arg_index
 
 enum define_coding_undecided_arg_index
   {
-    coding_arg_undecided_inhibit_nul_byte_detection = coding_arg_max,
+    coding_arg_undecided_inhibit_null_byte_detection = coding_arg_max,
     coding_arg_undecided_inhibit_iso_escape_detection,
     coding_arg_undecided_prefer_utf_8,
     coding_arg_undecided_max
@@ -139,7 +139,7 @@ enum coding_attr_index
 
     coding_attr_emacs_mule_full,
 
-    coding_attr_undecided_inhibit_nul_byte_detection,
+    coding_attr_undecided_inhibit_null_byte_detection,
     coding_attr_undecided_inhibit_iso_escape_detection,
     coding_attr_undecided_prefer_utf_8,
 
@@ -353,7 +353,7 @@ struct emacs_mule_spec
 
 struct undecided_spec
 {
-  /* Inhibit NUL byte detection.  1 means always inhibit,
+  /* Inhibit null byte detection.  1 means always inhibit,
      -1 means do not inhibit, 0 means rely on user variable.  */
   int inhibit_nbd;