diff options
| author | Eli Zaretskii | 2015-01-08 15:46:23 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2015-01-08 15:46:23 +0200 |
| commit | daa18b5e85559ccea84bd9e8a5f8ac57cfa73189 (patch) | |
| tree | ddf5b50283f72f4bcb96b65ffa7ecba4f6817fbe /src/dispextern.h | |
| parent | 0002f31af9d3511b00eaa15590ba824acea99f25 (diff) | |
| download | emacs-daa18b5e85559ccea84bd9e8a5f8ac57cfa73189.tar.gz emacs-daa18b5e85559ccea84bd9e8a5f8ac57cfa73189.zip | |
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 | |||
| 389 | 389 | ||
| 390 | /* Lisp object source of this glyph. Currently either a buffer or a | 390 | /* Lisp object source of this glyph. Currently either a buffer or a |
| 391 | string, if the glyph was produced from characters which came from | 391 | string, if the glyph was produced from characters which came from |
| 392 | a buffer or a string; or Lisp integer zero (a.k.a. "null object") | 392 | a buffer or a string; or nil if the glyph was inserted by |
| 393 | if the glyph was inserted by redisplay for its own purposes, such | 393 | redisplay for its own purposes, such as padding, truncation, or |
| 394 | as padding or truncation/continuation glyphs, or the | 394 | continuation glyphs, or the overlay-arrow glyphs on TTYs. */ |
| 395 | overlay-arrow glyphs on TTYs. */ | ||
| 396 | Lisp_Object object; | 395 | Lisp_Object object; |
| 397 | 396 | ||
| 398 | /* Width in pixels. */ | 397 | /* Width in pixels. */ |
| @@ -2525,11 +2524,11 @@ struct it | |||
| 2525 | Object is normally the buffer which is being rendered, but it can | 2524 | Object is normally the buffer which is being rendered, but it can |
| 2526 | also be a Lisp string in case the current display element comes | 2525 | also be a Lisp string in case the current display element comes |
| 2527 | from an overlay string or from a display string (before- or | 2526 | from an overlay string or from a display string (before- or |
| 2528 | after-string). It may also be nil when a C string is being | 2527 | after-string). It may also be a zero-valued Lisp integer when a |
| 2529 | rendered, e.g., during mode-line or header-line update. It can | 2528 | C string is being rendered, e.g., during mode-line or header-line |
| 2530 | also be a cons cell of the form `(space ...)', when we produce a | 2529 | update. It can also be a cons cell of the form `(space ...)', |
| 2531 | stretch glyph from a `display' specification. Finally, it can be | 2530 | when we produce a stretch glyph from a `display' specification. |
| 2532 | a zero-valued Lisp integer, but only temporarily, when we are | 2531 | Finally, it can be nil, but only temporarily, when we are |
| 2533 | producing special glyphs for display purposes, like truncation | 2532 | producing special glyphs for display purposes, like truncation |
| 2534 | and continuation glyphs, or blanks that extend each line to the | 2533 | and continuation glyphs, or blanks that extend each line to the |
| 2535 | edge of the window on a TTY. | 2534 | edge of the window on a TTY. |