Mercurial > emacs
comparison src/xdisp.c @ 35474:1859c648801a
(build_desired_tool_bar_string): Make sure we have
a desired tool bar string, even if there are not tool bar
items.
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Mon, 22 Jan 2001 19:12:13 +0000 |
parents | 41e0d3d78491 |
children | 28fcaa2d37b0 |
comparison
equal
deleted
inserted
replaced
35473:6b9d1a2fb28b | 35474:1859c648801a |
---|---|
7159 | 7159 |
7160 /* We need one space in the string for each image. */ | 7160 /* We need one space in the string for each image. */ |
7161 size_needed = f->n_tool_bar_items; | 7161 size_needed = f->n_tool_bar_items; |
7162 | 7162 |
7163 /* Reuse f->desired_tool_bar_string, if possible. */ | 7163 /* Reuse f->desired_tool_bar_string, if possible. */ |
7164 if (size < size_needed) | 7164 if (size < size_needed || NILP (f->desired_tool_bar_string)) |
7165 f->desired_tool_bar_string = Fmake_string (make_number (size_needed), | 7165 f->desired_tool_bar_string = Fmake_string (make_number (size_needed), |
7166 make_number (' ')); | 7166 make_number (' ')); |
7167 else | 7167 else |
7168 { | 7168 { |
7169 props = list4 (Qdisplay, Qnil, Qmenu_item, Qnil); | 7169 props = list4 (Qdisplay, Qnil, Qmenu_item, Qnil); |