summaryrefslogtreecommitdiff
path: root/src/os_win32.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2006-03-23 22:47:08 +0000
committerBram Moolenaar <Bram@vim.org>2006-03-23 22:47:08 +0000
commit7b5f8325ee8ecb93de52128303db5ecc4ffd430e (patch)
tree006f0afd7e3cf8226b4e78f2ce4bfd55ba1e61cd /src/os_win32.c
parent8ab561d31e7b8492d942db8e1ce7379ecfbce4c0 (diff)
downloadvim-git-7b5f8325ee8ecb93de52128303db5ecc4ffd430e.tar.gz
updated for version 7.0232
Diffstat (limited to 'src/os_win32.c')
-rw-r--r--src/os_win32.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/os_win32.c b/src/os_win32.c
index 330ce5a57..a2b2c5059 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -548,6 +548,8 @@ static const struct
#ifdef _MSC_VER
// The ToAscii bug destroys several registers. Need to turn off optimization
// or the GetConsoleKeyboardLayoutName hack will fail in non-debug versions
+# pragma warning(push)
+# pragma warning(disable: 4748)
# pragma optimize("", off)
#endif
@@ -619,6 +621,7 @@ win32_kbd_patch_key(
/* MUST switch optimization on again here, otherwise a call to
* decode_key_event() may crash (e.g. when hitting caps-lock) */
# pragma optimize("", on)
+# pragma warning(pop)
# if (_MSC_VER < 1100)
/* MUST turn off global optimisation for this next function, or