diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2013-09-28 11:19:33 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2013-09-28 11:19:33 +0300 |
| commit | 0d2647e645d9965e0707d25e39e4152abfda99bf (patch) | |
| tree | 656a3cba51a16d54c216111ce526c97dbb218603 | |
| parent | 4d2e94d172aa4a4f49b716c5c1c14293d6efa1f8 (diff) | |
| download | emacs-0d2647e645d9965e0707d25e39e4152abfda99bf.tar.gz emacs-0d2647e645d9965e0707d25e39e4152abfda99bf.tar.bz2 emacs-0d2647e645d9965e0707d25e39e4152abfda99bf.zip | |
Fix compilation under GLYPH_DEBUG, broken by conditional tool_bar_window.
src/xdisp.c (Fdump_tool_bar_row): Ifdef away the body if 'struct
frame' does not have the tool_bar_window member.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xdisp.c | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a6774e30b0c..ec36db90dfa 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2013-09-28 Eli Zaretskii <eliz@gnu.org> + + * xdisp.c (Fdump_tool_bar_row): Ifdef away the body if 'struct + frame' does not have the tool_bar_window member. + 2013-09-26 Barry O'Reilly <gundaetiapo@gmail.com> Signal error when reading an empty byte-code object (Bug#15405) diff --git a/src/xdisp.c b/src/xdisp.c index 0dc34dfbab0..22ada204954 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -18109,9 +18109,13 @@ DEFUN ("dump-tool-bar-row", Fdump_tool_bar_row, Sdump_tool_bar_row, 1, 2, "", doc: /* Dump glyph row ROW of the tool-bar of the current frame to stderr. GLYPH 0 means don't dump glyphs. GLYPH 1 means dump glyphs in short form. -GLYPH > 1 or omitted means dump glyphs in long form. */) +GLYPH > 1 or omitted means dump glyphs in long form. + +If there's no tool-bar, or if the tool-bar is not drawn by Emacs, +do nothing. */) (Lisp_Object row, Lisp_Object glyphs) { +#if defined (HAVE_WINDOW_SYSTEM) && ! defined (USE_GTK) && ! defined (HAVE_NS) struct frame *sf = SELECTED_FRAME (); struct glyph_matrix *m = XWINDOW (sf->tool_bar_window)->current_matrix; EMACS_INT vpos; @@ -18121,6 +18125,7 @@ GLYPH > 1 or omitted means dump glyphs in long form. */) if (vpos >= 0 && vpos < m->nrows) dump_glyph_row (MATRIX_ROW (m, vpos), vpos, TYPE_RANGED_INTEGERP (int, glyphs) ? XINT (glyphs) : 2); +#endif return Qnil; } |