Mercurial > emacs
comparison src/ChangeLog @ 32354:eaa80d9a03d4
Remove CVS merge cookie left in.
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Tue, 10 Oct 2000 02:32:57 +0000 |
| parents | 565db62c7ee1 |
| children | ff1b5b7a651c |
comparison
equal
deleted
inserted
replaced
| 32353:803ca8bc08b2 | 32354:eaa80d9a03d4 |
|---|---|
| 31 * msdos.c (top-level) <Qbackground_color, Qforeground_color>: Make | 31 * msdos.c (top-level) <Qbackground_color, Qforeground_color>: Make |
| 32 them extern (they are defined on xfaces.c). | 32 them extern (they are defined on xfaces.c). |
| 33 (syms_of_msdos): Don't intern and don't staticpro | 33 (syms_of_msdos): Don't intern and don't staticpro |
| 34 Qbackground_color and Qforeground_color. | 34 Qbackground_color and Qforeground_color. |
| 35 | 35 |
| 36 >>>>>>> 1.946 | |
| 37 2000-10-07 Eli Zaretskii <eliz@is.elta.co.il> | 36 2000-10-07 Eli Zaretskii <eliz@is.elta.co.il> |
| 38 | 37 |
| 39 * frame.c (Fframe_parameter): For non-windowed frames, if | 38 * frame.c (Fframe_parameter): For non-windowed frames, if |
| 40 f->param_alist says foreground or background color is unspecified, | 39 f->param_alist says foreground or background color is unspecified, |
| 41 call tty_color_name to return the color name computed from the | 40 call tty_color_name to return the color name computed from the |