diff options
| author | Andrew Innes | 2001-01-20 13:55:02 +0000 |
|---|---|---|
| committer | Andrew Innes | 2001-01-20 13:55:02 +0000 |
| commit | e4093f387b4d9f6bb2c7005d22e5a2bea02be5e9 (patch) | |
| tree | f3db95f69a0318b918b0ce9406f00e6ab23e9aaf /src | |
| parent | e689ec067a71bfce286f230b478c98f914db14de (diff) | |
| download | emacs-e4093f387b4d9f6bb2c7005d22e5a2bea02be5e9.tar.gz emacs-e4093f387b4d9f6bb2c7005d22e5a2bea02be5e9.zip | |
(handle_single_display_prop): Remove references to
FRAME_W32_CONSOLE_P.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xdisp.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index c17489eaedf..0e6e6d32484 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -2686,9 +2686,7 @@ handle_single_display_prop (it, prop, object, position) | |||
| 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)'. */ |
| @@ -2753,9 +2751,7 @@ handle_single_display_prop (it, prop, object, position) | |||
| 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)); |
| @@ -2767,9 +2763,7 @@ handle_single_display_prop (it, prop, object, position) | |||
| 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 |