Mercurial > vim
comparison src/ex_docmd.c @ 15868:7fad90423bd2 v8.1.0941
patch 8.1.0941: macros for MS-Windows are inconsistent
commit https://github.com/vim/vim/commit/4f97475d326c2773a78561fb874e4f23c25cbcd9
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Feb 17 17:44:42 2019 +0100
patch 8.1.0941: macros for MS-Windows are inconsistent
Problem: Macros for MS-Windows are inconsistent, using "32", "3264 and
others.
Solution: Use MSWIN for all MS-Windows builds. Use FEAT_GUI_MSWIN for the
GUI build. (Hirohito Higashi, closes #3932)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sun, 17 Feb 2019 17:45:08 +0100 |
parents | 6ddcd10aa7af |
children | 393a9a3a2da2 |
comparison
equal
deleted
inserted
replaced
15867:4a3823e692d3 | 15868:7fad90423bd2 |
---|---|
175 static void ex_edit(exarg_T *eap); | 175 static void ex_edit(exarg_T *eap); |
176 #ifndef FEAT_GUI | 176 #ifndef FEAT_GUI |
177 # define ex_gui ex_nogui | 177 # define ex_gui ex_nogui |
178 static void ex_nogui(exarg_T *eap); | 178 static void ex_nogui(exarg_T *eap); |
179 #endif | 179 #endif |
180 #if defined(FEAT_GUI_W32) && defined(FEAT_MENU) && defined(FEAT_TEAROFF) | 180 #if defined(FEAT_GUI_MSWIN) && defined(FEAT_MENU) && defined(FEAT_TEAROFF) |
181 static void ex_tearoff(exarg_T *eap); | 181 static void ex_tearoff(exarg_T *eap); |
182 #else | 182 #else |
183 # define ex_tearoff ex_ni | 183 # define ex_tearoff ex_ni |
184 #endif | 184 #endif |
185 #if (defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_GTK) \ | 185 #if (defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_GTK) \ |
8864 { | 8864 { |
8865 eap->errmsg = e_nogvim; | 8865 eap->errmsg = e_nogvim; |
8866 } | 8866 } |
8867 #endif | 8867 #endif |
8868 | 8868 |
8869 #if defined(FEAT_GUI_W32) && defined(FEAT_MENU) && defined(FEAT_TEAROFF) | 8869 #if defined(FEAT_GUI_MSWIN) && defined(FEAT_MENU) && defined(FEAT_TEAROFF) |
8870 static void | 8870 static void |
8871 ex_tearoff(exarg_T *eap) | 8871 ex_tearoff(exarg_T *eap) |
8872 { | 8872 { |
8873 gui_make_tearoff(eap->arg); | 8873 gui_make_tearoff(eap->arg); |
8874 } | 8874 } |
9851 update_screen(eap->forceit ? CLEAR : VIsual_active ? INVERTED : 0); | 9851 update_screen(eap->forceit ? CLEAR : VIsual_active ? INVERTED : 0); |
9852 #ifdef FEAT_TITLE | 9852 #ifdef FEAT_TITLE |
9853 if (need_maketitle) | 9853 if (need_maketitle) |
9854 maketitle(); | 9854 maketitle(); |
9855 #endif | 9855 #endif |
9856 #if defined(WIN3264) && !defined(FEAT_GUI_W32) | 9856 #if defined(MSWIN) && !defined(FEAT_GUI_MSWIN) |
9857 resize_console_buf(); | 9857 resize_console_buf(); |
9858 #endif | 9858 #endif |
9859 RedrawingDisabled = r; | 9859 RedrawingDisabled = r; |
9860 p_lz = p; | 9860 p_lz = p; |
9861 | 9861 |