diff options
| author | Glenn Morris <rgm@gnu.org> | 2021-05-13 08:11:03 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2021-05-13 08:11:03 -0700 |
| commit | 3061409de2fae233e5e5f56893efe94519410921 (patch) | |
| tree | c79e3b5454c282caaac68937e9189f560248e652 /src/w32term.c | |
| parent | ff8bf8c8dfff2e4fc0fae50e3fcfcf3022bd0bb8 (diff) | |
| parent | bcd92b5708083a6c10d4f0aa785cbd69fd8f7035 (diff) | |
| download | emacs-3061409de2fae233e5e5f56893efe94519410921.tar.gz | |
Merge from origin/emacs-27
bcd92b5708 (origin/emacs-27) Improve documentation of Hexl mode
c233f4eccd ; * etc/NEWS: Fix decoded-time-set-defaults typo.
4c3abb3dd1 Fix compilation errors with latest w32 API headers
127f1f330b Improve doc strings in log-edit.el
e36183ff46 ; * etc/TODO (etc/DOC): Update the todo entries.
# Conflicts:
# etc/NEWS
Diffstat (limited to 'src/w32term.c')
| -rw-r--r-- | src/w32term.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/w32term.c b/src/w32term.c index 4f910296ecc..ad4d1a32829 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -1916,7 +1916,7 @@ w32_draw_image_foreground (struct glyph_string *s) /* HALFTONE produces better results, especially when scaling to a larger size, but Windows 9X doesn't support HALFTONE. */ - if (os_subtype == OS_NT + if (os_subtype == OS_SUBTYPE_NT && (pmode = SetStretchBltMode (s->hdc, HALFTONE)) != 0) SetBrushOrgEx (s->hdc, 0, 0, NULL); StretchBlt (s->hdc, x, y, s->slice.width, s->slice.height, @@ -1952,7 +1952,7 @@ w32_draw_image_foreground (struct glyph_string *s) { int pmode = 0; /* Windows 9X doesn't support HALFTONE. */ - if (os_subtype == OS_NT + if (os_subtype == OS_SUBTYPE_NT && (pmode = SetStretchBltMode (s->hdc, HALFTONE)) != 0) SetBrushOrgEx (s->hdc, 0, 0, NULL); StretchBlt (s->hdc, x, y, s->slice.width, s->slice.height, @@ -6644,7 +6644,7 @@ frame_set_mouse_pixel_position (struct frame *f, int pix_x, int pix_y) /* When "mouse trails" are in effect, moving the mouse cursor sometimes leaves behind an annoying "ghost" of the pointer. Avoid that by momentarily switching off mouse trails. */ - if (os_subtype == OS_NT + if (os_subtype == OS_SUBTYPE_NT && w32_major_version + w32_minor_version >= 6) ret = SystemParametersInfo (SPI_GETMOUSETRAILS, 0, &trail_num, 0); SetCursorPos (pt.x, pt.y); @@ -7638,7 +7638,7 @@ specified by `file-name-coding-system'. This variable is set to non-nil by default when Emacs runs on Windows systems of the NT family, including W2K, XP, Vista, Windows 7 and Windows 8. It is set to nil on Windows 9X. */); - if (os_subtype == OS_9X) + if (os_subtype == OS_SUBTYPE_9X) w32_unicode_filenames = 0; else w32_unicode_filenames = 1; |