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/keyboard.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/keyboard.c')
| -rw-r--r-- | src/keyboard.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index 362bd663878..8fb6db987b5 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -737,7 +737,8 @@ void | |||
| 737 | force_auto_save_soon (void) | 737 | force_auto_save_soon (void) |
| 738 | { | 738 | { |
| 739 | last_auto_save = - auto_save_interval - 1; | 739 | last_auto_save = - auto_save_interval - 1; |
| 740 | 740 | /* FIXME: What's the relationship between forcing auto-save and adding | |
| 741 | a buffer-switch event? */ | ||
| 741 | record_asynch_buffer_change (); | 742 | record_asynch_buffer_change (); |
| 742 | } | 743 | } |
| 743 | #endif | 744 | #endif |
| @@ -6191,7 +6192,7 @@ parse_modifiers_uncached (Lisp_Object symbol, ptrdiff_t *modifier_end) | |||
| 6191 | static Lisp_Object | 6192 | static Lisp_Object |
| 6192 | apply_modifiers_uncached (int modifiers, char *base, int base_len, int base_len_byte) | 6193 | apply_modifiers_uncached (int modifiers, char *base, int base_len, int base_len_byte) |
| 6193 | { | 6194 | { |
| 6194 | /* Since BASE could contain nulls, we can't use intern here; we have | 6195 | /* Since BASE could contain NULs, we can't use intern here; we have |
| 6195 | to use Fintern, which expects a genuine Lisp_String, and keeps a | 6196 | to use Fintern, which expects a genuine Lisp_String, and keeps a |
| 6196 | reference to it. */ | 6197 | reference to it. */ |
| 6197 | char new_mods[sizeof "A-C-H-M-S-s-up-down-drag-double-triple-"]; | 6198 | char new_mods[sizeof "A-C-H-M-S-s-up-down-drag-double-triple-"]; |