diff options
| author | Dave Love | 2000-05-25 11:59:11 +0000 |
|---|---|---|
| committer | Dave Love | 2000-05-25 11:59:11 +0000 |
| commit | 02513cddf0ab030609c7aad78b82a66e083d5c0e (patch) | |
| tree | 0628af546cd0f47e16a6462cadf0892a53f7006d /src | |
| parent | c2f94ebcc55d33f94d7d88f1f623796b1a453271 (diff) | |
| download | emacs-02513cddf0ab030609c7aad78b82a66e083d5c0e.tar.gz emacs-02513cddf0ab030609c7aad78b82a66e083d5c0e.zip | |
(Fdump_glyph_matrix): Declare the arg.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/xdisp.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f631e1c3c2c..308e7ad2c43 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2000-05-25 Dave Love <fx@gnu.org> | 1 | 2000-05-25 Dave Love <fx@gnu.org> |
| 2 | 2 | ||
| 3 | * xdisp.c (Fdump_glyph_matrix): Declare the arg. | ||
| 4 | |||
| 3 | * coding.c (encode_eol): Add null statement after label. | 5 | * coding.c (encode_eol): Add null statement after label. |
| 4 | 6 | ||
| 5 | 2000-05-25 Eli Zaretskii <eliz@is.elta.co.il> | 7 | 2000-05-25 Eli Zaretskii <eliz@is.elta.co.il> |
diff --git a/src/xdisp.c b/src/xdisp.c index b441f5a2488..fef2b9429c8 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -2538,7 +2538,7 @@ handle_single_display_prop (it, prop, object, position) | |||
| 2538 | it->object = NILP (object) ? it->w->buffer : object; | 2538 | it->object = NILP (object) ? it->w->buffer : object; |
| 2539 | it->method = next_element_from_image; | 2539 | it->method = next_element_from_image; |
| 2540 | 2540 | ||
| 2541 | /* Say that we don't have consumed the characters with | 2541 | /* Say that we haven't consumed the characters with |
| 2542 | `display' property yet. The call to pop_it in | 2542 | `display' property yet. The call to pop_it in |
| 2543 | set_iterator_to_next will clean this up. */ | 2543 | set_iterator_to_next will clean this up. */ |
| 2544 | *position = start_pos; | 2544 | *position = start_pos; |
| @@ -10708,6 +10708,7 @@ DEFUN ("dump-glyph-matrix", Fdump_glyph_matrix, | |||
| 10708 | Shows contents of glyph row structures. With non-nil optional\n\ | 10708 | Shows contents of glyph row structures. With non-nil optional\n\ |
| 10709 | parameter WITH-GLYPHS-P, dump glyphs as well.") | 10709 | parameter WITH-GLYPHS-P, dump glyphs as well.") |
| 10710 | (with_glyphs_p) | 10710 | (with_glyphs_p) |
| 10711 | Lisp_Object with_glyphs_p; | ||
| 10711 | { | 10712 | { |
| 10712 | struct window *w = XWINDOW (selected_window); | 10713 | struct window *w = XWINDOW (selected_window); |
| 10713 | struct buffer *buffer = XBUFFER (w->buffer); | 10714 | struct buffer *buffer = XBUFFER (w->buffer); |