Mercurial > vim

comparison src/globals.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 116b7394b8af
children ffdf2e4b5d9a
comparison
equal deleted inserted replaced
12715:279ec0abb4ac 12716:351cf7c67bbe
1423 EXTERN char_u e_exists[] INIT(= N_("E13: File exists (add ! to override)")); 1423 EXTERN char_u e_exists[] INIT(= N_("E13: File exists (add ! to override)"));
1424 EXTERN char_u e_failed[] INIT(= N_("E472: Command failed")); 1424 EXTERN char_u e_failed[] INIT(= N_("E472: Command failed"));
1425 #if defined(FEAT_GUI) && defined(FEAT_XFONTSET) 1425 #if defined(FEAT_GUI) && defined(FEAT_XFONTSET)
1426 EXTERN char_u e_fontset[] INIT(= N_("E234: Unknown fontset: %s")); 1426 EXTERN char_u e_fontset[] INIT(= N_("E234: Unknown fontset: %s"));
1427 #endif 1427 #endif
1428 #if defined(FEAT_GUI_X11) || defined(FEAT_GUI_GTK) || defined(MACOS) \ 1428 #if defined(FEAT_GUI_X11) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MAC) \
1429 || defined(FEAT_GUI_PHOTON) || defined(FEAT_GUI_MSWIN) 1429 || defined(FEAT_GUI_PHOTON) || defined(FEAT_GUI_MSWIN)
1430 EXTERN char_u e_font[] INIT(= N_("E235: Unknown font: %s")); 1430 EXTERN char_u e_font[] INIT(= N_("E235: Unknown font: %s"));
1431 #endif 1431 #endif
1432 #if defined(FEAT_GUI_X11) && !defined(FEAT_GUI_GTK) 1432 #if defined(FEAT_GUI_X11) && !defined(FEAT_GUI_GTK)
1433 EXTERN char_u e_fontwidth[] INIT(= N_("E236: Font \"%s\" is not fixed-width")); 1433 EXTERN char_u e_fontwidth[] INIT(= N_("E236: Font \"%s\" is not fixed-width"));
1543 #endif 1543 #endif
1544 #ifdef HAVE_SANDBOX 1544 #ifdef HAVE_SANDBOX
1545 EXTERN char_u e_sandbox[] INIT(= N_("E48: Not allowed in sandbox")); 1545 EXTERN char_u e_sandbox[] INIT(= N_("E48: Not allowed in sandbox"));
1546 #endif 1546 #endif
1547 EXTERN char_u e_secure[] INIT(= N_("E523: Not allowed here")); 1547 EXTERN char_u e_secure[] INIT(= N_("E523: Not allowed here"));
1548 #if defined(AMIGA) || defined(MACOS) || defined(MSWIN) \ 1548 #if defined(AMIGA) || defined(MACOS_X) || defined(MSWIN) \
1549 || defined(UNIX) || defined(VMS) 1549 || defined(UNIX) || defined(VMS)
1550 EXTERN char_u e_screenmode[] INIT(= N_("E359: Screen mode setting not supported")); 1550 EXTERN char_u e_screenmode[] INIT(= N_("E359: Screen mode setting not supported"));
1551 #endif 1551 #endif
1552 EXTERN char_u e_scroll[] INIT(= N_("E49: Invalid scroll size")); 1552 EXTERN char_u e_scroll[] INIT(= N_("E49: Invalid scroll size"));
1553 EXTERN char_u e_shellempty[] INIT(= N_("E91: 'shell' option is empty")); 1553 EXTERN char_u e_shellempty[] INIT(= N_("E91: 'shell' option is empty"));
1590 #ifndef FEAT_CLIPBOARD 1590 #ifndef FEAT_CLIPBOARD
1591 EXTERN char_u e_invalidreg[] INIT(= N_("E850: Invalid register name")); 1591 EXTERN char_u e_invalidreg[] INIT(= N_("E850: Invalid register name"));
1592 #endif 1592 #endif
1593 EXTERN char_u e_dirnotf[] INIT(= N_("E919: Directory not found in '%s': \"%s\"")); 1593 EXTERN char_u e_dirnotf[] INIT(= N_("E919: Directory not found in '%s': \"%s\""));
1594 1594
1595 #ifdef MACOS_X_UNIX 1595 #ifdef FEAT_GUI_MAC
1596 EXTERN short disallow_gui INIT(= FALSE); 1596 EXTERN short disallow_gui INIT(= FALSE);
1597 #endif 1597 #endif
1598 1598
1599 EXTERN char top_bot_msg[] INIT(= N_("search hit TOP, continuing at BOTTOM")); 1599 EXTERN char top_bot_msg[] INIT(= N_("search hit TOP, continuing at BOTTOM"));
1600 EXTERN char bot_top_msg[] INIT(= N_("search hit BOTTOM, continuing at TOP")); 1600 EXTERN char bot_top_msg[] INIT(= N_("search hit BOTTOM, continuing at TOP"));