diff options
| author | Paul Eggert | 2019-05-22 13:25:47 -0700 |
|---|---|---|
| committer | Paul Eggert | 2019-05-22 13:29:13 -0700 |
| commit | dfed333b312d06b3416ebfadff544eae38313391 (patch) | |
| tree | c4c013baf966e177418675b5ed08c9a08832396d /src/window.c | |
| parent | 5c21832ae866077874fb662e49c695a7850ec22c (diff) | |
| download | emacs-dfed333b312d06b3416ebfadff544eae38313391.tar.gz emacs-dfed333b312d06b3416ebfadff544eae38313391.zip | |
Remove fixnum restriction on some display vars
This is a minor patch to remove some fixnum restrictions.
Many more such patches are needed, but one thing at a time.
* doc/emacs/custom.texi (Examining): Update fill-column example.
* src/buffer.c (fill-column, left-margin, tab-width)
(buffer-saved-size, left-margin-width, right-margin-width)
(left-fringe-width, right-fringe-width, scroll-bar-width)
(scroll-bar-height, buffer-display-count):
Allow any integer; do not restrict to fixnums.
* src/character.h (SANE_TAB_WIDTH): Do not assume tab_width
is a nonnegative fixnum.
(sanitize_tab_width): Take a Lisp_Object integer, not an
EMACS_INT. Only use changed.
* src/data.c (store_symval_forwarding): Remove unnecessary
SYMBOLP since the predicate (e.g., Qintegerp) is always a
symbol (leave the test in as an eassert). Avoid assignments
inside if-conditions.
* src/fileio.c (Fdo_auto_save): Do not assume
buffer-saved-size is a fixnum. Avoid undefined behavior
on EMACS_INT overflow by multiplying a fixnum by at most 4,
not by at most 13.
* src/window.c (set_window_buffer): When buffer-display-count
is too large for a fixnum, make it a bignum.
* src/xdisp.c (FILL_COLUMN_INDICATOR_NEEDED): Remove macro, ...
(fill_column_indicator_column): ... replacing with this new function.
All uses changed. The function is a bit pickier, to prevent
problems with non-character fixnums and columns out of range
for int, and to remove the assumption that integers are in
fixnum range.
(append_space_for_newline, extend_face_to_end_of_line):
Avoid undefined behavior with signed integer overflow.
Simplify.
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/window.c b/src/window.c index ca7cf7a4a61..deeb4f63fe0 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -3947,8 +3947,8 @@ set_window_buffer (Lisp_Object window, Lisp_Object buffer, | |||
| 3947 | b->display_error_modiff = 0; | 3947 | b->display_error_modiff = 0; |
| 3948 | 3948 | ||
| 3949 | /* Update time stamps of buffer display. */ | 3949 | /* Update time stamps of buffer display. */ |
| 3950 | if (FIXNUMP (BVAR (b, display_count))) | 3950 | if (INTEGERP (BVAR (b, display_count))) |
| 3951 | bset_display_count (b, make_fixnum (XFIXNUM (BVAR (b, display_count)) + 1)); | 3951 | bset_display_count (b, Fadd1 (BVAR (b, display_count))); |
| 3952 | bset_display_time (b, Fcurrent_time ()); | 3952 | bset_display_time (b, Fcurrent_time ()); |
| 3953 | 3953 | ||
| 3954 | w->window_end_pos = 0; | 3954 | w->window_end_pos = 0; |