Mercurial > vim

comparison src/proto.h @ 12716:351cf7c67bbe v8.0.1236

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.1236: Mac features are confusing commit https://github.com/vim/vim/commit/d057301b1f28736f094affa17b190244ad56e8d9 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Oct 28 21:11:06 2017 +0200 patch 8.0.1236: Mac features are confusing Problem: Mac features are confusing. Solution: Make feature names more consistent, add "osxdarwin". Rename feature flags, cleanup Mac code. (Kazunobu Kuriyama, closes #2178)
author Christian Brabandt <cb@256bit.org>
date Sat, 28 Oct 2017 21:15:35 +0200
parents 7791a15353dc
children 0ebade0c0ab2
comparison
equal deleted inserted replaced
12715:279ec0abb4ac 12716:351cf7c67bbe
211 # ifdef FEAT_JOB_CHANNEL 211 # ifdef FEAT_JOB_CHANNEL
212 # include "channel.pro" 212 # include "channel.pro"
213 # endif 213 # endif
214 214
215 # if defined(FEAT_GUI) || defined(FEAT_JOB_CHANNEL) 215 # if defined(FEAT_GUI) || defined(FEAT_JOB_CHANNEL)
216 # if defined(UNIX) || defined(MACOS) 216 # if defined(UNIX) || defined(MACOS_X)
217 # include "pty.pro" 217 # include "pty.pro"
218 # endif 218 # endif
219 # endif 219 # endif
220 220
221 # ifdef FEAT_GUI 221 # ifdef FEAT_GUI
284 #endif 284 #endif
285 285
286 #ifdef MACOS_CONVERT 286 #ifdef MACOS_CONVERT
287 # include "os_mac_conv.pro" 287 # include "os_mac_conv.pro"
288 #endif 288 #endif
289 #if defined(MACOS_X_UNIX) && defined(FEAT_CLIPBOARD) && !defined(FEAT_GUI) 289 #if defined(MACOS_X_DARWIN) && defined(FEAT_CLIPBOARD) && !defined(FEAT_GUI)
290 /* functions in os_macosx.m */ 290 /* functions in os_macosx.m */
291 void clip_mch_lose_selection(VimClipboard *cbd); 291 void clip_mch_lose_selection(VimClipboard *cbd);
292 int clip_mch_own_selection(VimClipboard *cbd); 292 int clip_mch_own_selection(VimClipboard *cbd);
293 void clip_mch_request_selection(VimClipboard *cbd); 293 void clip_mch_request_selection(VimClipboard *cbd);
294 void clip_mch_set_selection(VimClipboard *cbd); 294 void clip_mch_set_selection(VimClipboard *cbd);