bug#12647: 24.2.50; emacs --daemon broken in tty

[Glenn Morris]

Stefan Monnier wrote:

>> In the past, frame.el set x-display-name, but it does not do
>> that any more.
>
> Where did it do it?

In make-frame-on-display, right before calling
x-initialize-window-system. (Look at emacs-24.)

>> The following example frame.el change makes it work again, but someone
>> should check this area.
>
> To a large extent x-display-name should disappear

But not during a feature freeze.

> So this part of the code is pretty ugly.  Your patch is probably OK in
> the sense that it doesn't seem to make things significantly worse.

It was only an example change showing what the problem seems to be.
I'm not saying it is the right fix.