bug#1133: Tool-bar and multi-tty

[Chong Yidong <cyd@stupidchicken.com>]

Stefan Monnier <monnier@iro.umontreal.ca> writes:

>>  (image-exp `(tool-bar-find-image
>>    (if (display-color-p)
>>        ',(list xpm-lo-spec xpm-spec pbm-spec xbm-spec)
>>      ',(list pbm-spec xbm-spec xpm-lo-spec xpm-spec))))
>
>> Calling tool-bar-local-item-from-menu from the tty loads the lo-spec
>> images, whereas deferring this call until X is started up loads the
>> hi-spec images.  But deferring the call, as I suggested, doesn't seem to
>> be satisfactory either.
>
> Why?  The `if' is left unevaluated in the image-exp.  So IIUC it's only
> be evaluated later when the image is actually displayed.

Aha: the number of display colors is checked earlier in the function.
If we put that check into the image expression instead, everything
works.

I've just checked in a fix into CVS.  I think this should resolve the
problems between multi-tty and tool bars.