2 files changed, 5 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b4db657e1f3..f189db03478 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2001-01-22  Gerd Moellmann  <gerd@gnu.org>
 
+        * xdisp.c (build_desired_tool_bar_string): Make sure we have
+        a desired tool bar string, even if there are not tool bar
+        items.
+        
         * xdisp.c (Ftool_bar_lines_needed): New function.
         (syms_of_xdisp): Defsubr it.
 
diff --git a/src/xdisp.c b/src/xdisp.c
index 78515968823..beafebffe16 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -7161,7 +7161,7 @@ build_desired_tool_bar_string (f)
   size_needed = f->n_tool_bar_items;
   
   /* Reuse f->desired_tool_bar_string, if possible.  */
-  if (size < size_needed)
+  if (size < size_needed || NILP (f->desired_tool_bar_string))
     f->desired_tool_bar_string = Fmake_string (make_number (size_needed),
                                                make_number (' '));
   else