diff options
author | Eli Zaretskii <eliz@gnu.org> | 2015-01-08 15:46:23 +0200 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2015-01-08 15:46:23 +0200 |
commit | daa18b5e85559ccea84bd9e8a5f8ac57cfa73189 (patch) | |
tree | ddf5b50283f72f4bcb96b65ffa7ecba4f6817fbe /src/dispextern.h | |
parent | 0002f31af9d3511b00eaa15590ba824acea99f25 (diff) | |
download | emacs-daa18b5e85559ccea84bd9e8a5f8ac57cfa73189.tar.gz |
Fix fallout from "Qnil is zero" change in the display engine. (Bug#19535)
src/xdisp.c (next_element_from_c_string): Use Lisp integer zero as
the object.
(set_cursor_from_row, try_cursor_movement, dump_glyph)
(insert_left_trunc_glyphs, append_space_for_newline)
(extend_face_to_end_of_line, highlight_trailing_whitespace)
(find_row_edges, ROW_GLYPH_NEWLINE_P, Fmove_point_visually)
(Fbidi_resolved_levels, produce_special_glyphs)
(rows_from_pos_range, mouse_face_from_buffer_pos)
(note_mouse_highlight): Use nil as the object for glyphs inserted
by the display engine, and test with NILP instead of INTEGERP.
src/w32fns.c (Fx_show_tip): Use NILP to test for glyphs inserted by
the display engine.
src/xfns.c (Fx_show_tip): Use NILP to test for glyphs inserted by
the display engine.
src/dispextern.h (struct glyph, struct it): Update comments for the
OBJECT members.
Diffstat (limited to 'src/dispextern.h')
-rw-r--r-- | src/dispextern.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/dispextern.h b/src/dispextern.h index d717473f8c2..1a9aef103bd 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -389,10 +389,9 @@ struct glyph /* Lisp object source of this glyph. Currently either a buffer or a string, if the glyph was produced from characters which came from - a buffer or a string; or Lisp integer zero (a.k.a. "null object") - if the glyph was inserted by redisplay for its own purposes, such - as padding or truncation/continuation glyphs, or the - overlay-arrow glyphs on TTYs. */ + a buffer or a string; or nil if the glyph was inserted by + redisplay for its own purposes, such as padding, truncation, or + continuation glyphs, or the overlay-arrow glyphs on TTYs. */ Lisp_Object object; /* Width in pixels. */ @@ -2525,11 +2524,11 @@ struct it Object is normally the buffer which is being rendered, but it can also be a Lisp string in case the current display element comes from an overlay string or from a display string (before- or - after-string). It may also be nil when a C string is being - rendered, e.g., during mode-line or header-line update. It can - also be a cons cell of the form `(space ...)', when we produce a - stretch glyph from a `display' specification. Finally, it can be - a zero-valued Lisp integer, but only temporarily, when we are + after-string). It may also be a zero-valued Lisp integer when a + C string is being rendered, e.g., during mode-line or header-line + update. It can also be a cons cell of the form `(space ...)', + when we produce a stretch glyph from a `display' specification. + Finally, it can be nil, but only temporarily, when we are producing special glyphs for display purposes, like truncation and continuation glyphs, or blanks that extend each line to the edge of the window on a TTY. |