Mercurial > emacs
comparison src/msdos.c @ 32337:a9dbff7d4142
Fix last change.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Mon, 09 Oct 2000 16:16:54 +0000 |
parents | 442188fbf8b5 |
children | 9672c4db6bed |
comparison
equal
deleted
inserted
replaced
32336:2366f009e5e5 | 32337:a9dbff7d4142 |
---|---|
2300 int reverse = EQ (Fcdr (Fassq (Qreverse, f->param_alist)), Qt); | 2300 int reverse = EQ (Fcdr (Fassq (Qreverse, f->param_alist)), Qt); |
2301 int was_reverse = reverse; | 2301 int was_reverse = reverse; |
2302 int redraw = 0, fg_set = 0, bg_set = 0; | 2302 int redraw = 0, fg_set = 0, bg_set = 0; |
2303 unsigned long orig_fg; | 2303 unsigned long orig_fg; |
2304 unsigned long orig_bg; | 2304 unsigned long orig_bg; |
2305 extern Lisp_Object Qdefault, QCforeground, QCbackground; | |
2305 | 2306 |
2306 /* If we are creating a new frame, begin with the original screen colors | 2307 /* If we are creating a new frame, begin with the original screen colors |
2307 used for the initial frame. */ | 2308 used for the initial frame. */ |
2308 if (alist == Vdefault_frame_alist | 2309 if (alist == Vdefault_frame_alist |
2309 && initial_screen_colors[0] != -1 && initial_screen_colors[1] != -1) | 2310 && initial_screen_colors[0] != -1 && initial_screen_colors[1] != -1) |
2344 fprintf (termscript, "<INVERSE-VIDEO>\n"); | 2345 fprintf (termscript, "<INVERSE-VIDEO>\n"); |
2345 | 2346 |
2346 /* Now process the alist elements in reverse of specified order. */ | 2347 /* Now process the alist elements in reverse of specified order. */ |
2347 for (i--; i >= 0; i--) | 2348 for (i--; i >= 0; i--) |
2348 { | 2349 { |
2349 extern Lisp_Object Qdefault, QCforeground, QCbackground; | |
2350 Lisp_Object prop, val; | 2350 Lisp_Object prop, val; |
2351 Lisp_Object frame; | 2351 Lisp_Object frame; |
2352 | 2352 |
2353 prop = parms[i]; | 2353 prop = parms[i]; |
2354 val = values[i]; | 2354 val = values[i]; |
2439 if (!fg_set) | 2439 if (!fg_set) |
2440 { | 2440 { |
2441 FRAME_BACKGROUND_PIXEL (f) = orig_fg; | 2441 FRAME_BACKGROUND_PIXEL (f) = orig_fg; |
2442 XSETFRAME (frame, f); | 2442 XSETFRAME (frame, f); |
2443 Finternal_set_lisp_face_attribute (Qdefault, QCbackground, | 2443 Finternal_set_lisp_face_attribute (Qdefault, QCbackground, |
2444 tty_color_name (orig_fg), frame); | 2444 tty_color_name (f, orig_fg), |
2445 frame); | |
2445 redraw = 1; | 2446 redraw = 1; |
2446 } | 2447 } |
2447 if (!bg_set) | 2448 if (!bg_set) |
2448 { | 2449 { |
2449 FRAME_FOREGROUND_PIXEL (f) = orig_bg; | 2450 FRAME_FOREGROUND_PIXEL (f) = orig_bg; |
2450 XSETFRAME (frame, f); | 2451 XSETFRAME (frame, f); |
2451 Finternal_set_lisp_face_attribute (Qdefault, QCforeground, | 2452 Finternal_set_lisp_face_attribute (Qdefault, QCforeground, |
2452 tty_color_name (orig_bg), frame); | 2453 tty_color_name (f, orig_bg), |
2454 frame); | |
2453 redraw = 1; | 2455 redraw = 1; |
2454 } | 2456 } |
2455 } | 2457 } |
2456 | 2458 |
2457 if (redraw) | 2459 if (redraw) |