Mercurial > emacs
comparison src/xdisp.c @ 27118:2efb49dc860b
(handle_single_display_prop) [HAVE_WINDOW_SYSTEM]: No
need to test for MSDOS frames.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Mon, 03 Jan 2000 17:02:31 +0000 |
parents | 0f307c7f49ba |
children | d26783d86d5f |
comparison
equal
deleted
inserted
replaced
27117:6838a53d4992 | 27118:2efb49dc860b |
---|---|
2419 } | 2419 } |
2420 else if (CONSP (prop) | 2420 else if (CONSP (prop) |
2421 && EQ (XCAR (prop), Qraise) | 2421 && EQ (XCAR (prop), Qraise) |
2422 && CONSP (XCDR (prop))) | 2422 && CONSP (XCDR (prop))) |
2423 { | 2423 { |
2424 #ifdef HAVE_WINDOW_SYSTEM | |
2425 /* `(raise FACTOR)'. */ | 2424 /* `(raise FACTOR)'. */ |
2426 if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f)) | 2425 if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f)) |
2427 return 0; | 2426 return 0; |
2428 | 2427 |
2428 #ifdef HAVE_WINDOW_SYSTEM | |
2429 value = XCAR (XCDR (prop)); | 2429 value = XCAR (XCDR (prop)); |
2430 if (NUMBERP (value)) | 2430 if (NUMBERP (value)) |
2431 { | 2431 { |
2432 struct face *face = FACE_FROM_ID (it->f, it->face_id); | 2432 struct face *face = FACE_FROM_ID (it->f, it->face_id); |
2433 it->voffset = - (XFLOATINT (value) | 2433 it->voffset = - (XFLOATINT (value) |
2477 location = Qnil; | 2477 location = Qnil; |
2478 value = prop; | 2478 value = prop; |
2479 } | 2479 } |
2480 | 2480 |
2481 #ifdef HAVE_WINDOW_SYSTEM | 2481 #ifdef HAVE_WINDOW_SYSTEM |
2482 if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f)) | 2482 if (FRAME_TERMCAP_P (it->f)) |
2483 valid_p = STRINGP (value); | 2483 valid_p = STRINGP (value); |
2484 else | 2484 else |
2485 valid_p = (STRINGP (value) | 2485 valid_p = (STRINGP (value) |
2486 || (CONSP (value) && EQ (XCAR (value), Qspace)) | 2486 || (CONSP (value) && EQ (XCAR (value), Qspace)) |
2487 || valid_image_p (value)); | 2487 || valid_image_p (value)); |