Mercurial > emacs
comparison src/xdisp.c @ 35444:753acaaa2840
(handle_single_display_prop): Remove references to
FRAME_W32_CONSOLE_P.
| author | Andrew Innes <andrewi@gnu.org> |
|---|---|
| date | Sat, 20 Jan 2001 13:55:02 +0000 |
| parents | acdbc148953f |
| children | 41e0d3d78491 |
comparison
equal
deleted
inserted
replaced
| 35443:2e9bfb04e84a | 35444:753acaaa2840 |
|---|---|
| 2684 | 2684 |
| 2685 if (CONSP (prop) | 2685 if (CONSP (prop) |
| 2686 && EQ (XCAR (prop), Qheight) | 2686 && EQ (XCAR (prop), Qheight) |
| 2687 && CONSP (XCDR (prop))) | 2687 && CONSP (XCDR (prop))) |
| 2688 { | 2688 { |
| 2689 if (FRAME_TERMCAP_P (it->f) | 2689 if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f)) |
| 2690 || FRAME_MSDOS_P (it->f) | |
| 2691 || FRAME_W32_CONSOLE_P (it->f)) | |
| 2692 return 0; | 2690 return 0; |
| 2693 | 2691 |
| 2694 /* `(height HEIGHT)'. */ | 2692 /* `(height HEIGHT)'. */ |
| 2695 it->font_height = XCAR (XCDR (prop)); | 2693 it->font_height = XCAR (XCDR (prop)); |
| 2696 if (!NILP (it->font_height)) | 2694 if (!NILP (it->font_height)) |
| 2751 else if (CONSP (prop) | 2749 else if (CONSP (prop) |
| 2752 && EQ (XCAR (prop), Qspace_width) | 2750 && EQ (XCAR (prop), Qspace_width) |
| 2753 && CONSP (XCDR (prop))) | 2751 && CONSP (XCDR (prop))) |
| 2754 { | 2752 { |
| 2755 /* `(space_width WIDTH)'. */ | 2753 /* `(space_width WIDTH)'. */ |
| 2756 if (FRAME_TERMCAP_P (it->f) | 2754 if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f)) |
| 2757 || FRAME_MSDOS_P (it->f) | |
| 2758 || FRAME_W32_CONSOLE_P (it->f)) | |
| 2759 return 0; | 2755 return 0; |
| 2760 | 2756 |
| 2761 value = XCAR (XCDR (prop)); | 2757 value = XCAR (XCDR (prop)); |
| 2762 if (NUMBERP (value) && XFLOATINT (value) > 0) | 2758 if (NUMBERP (value) && XFLOATINT (value) > 0) |
| 2763 it->space_width = value; | 2759 it->space_width = value; |
| 2765 else if (CONSP (prop) | 2761 else if (CONSP (prop) |
| 2766 && EQ (XCAR (prop), Qraise) | 2762 && EQ (XCAR (prop), Qraise) |
| 2767 && CONSP (XCDR (prop))) | 2763 && CONSP (XCDR (prop))) |
| 2768 { | 2764 { |
| 2769 /* `(raise FACTOR)'. */ | 2765 /* `(raise FACTOR)'. */ |
| 2770 if (FRAME_TERMCAP_P (it->f) | 2766 if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f)) |
| 2771 || FRAME_MSDOS_P (it->f) | |
| 2772 || FRAME_W32_CONSOLE_P (it->f)) | |
| 2773 return 0; | 2767 return 0; |
| 2774 | 2768 |
| 2775 #ifdef HAVE_WINDOW_SYSTEM | 2769 #ifdef HAVE_WINDOW_SYSTEM |
| 2776 value = XCAR (XCDR (prop)); | 2770 value = XCAR (XCDR (prop)); |
| 2777 if (NUMBERP (value)) | 2771 if (NUMBERP (value)) |