Skip to content

Commit 55ee9af

Browse files
committed
Remove Colors.plist and fix CI
CI is currently failing since :highlight auto-complete relies on loading v:colornames, but MacVim has its own special thing and parses a bundled Colors.plist file instead, which bypasses the whole system. Colors.plist was added a long time ago as Vim did not have a good cross-platform way to specify colors by names, but this has been alleviated upstream a while ago via runtime/colors/lists/default.vim which gets sourced for default color values. To fix this, simply remove the file, as it serves no purpose anymore. Also remove custom hex color parsing logic which also should simply defer to Vim instead.
1 parent 597b39d commit 55ee9af

File tree

8 files changed

+26
-1395
lines changed

8 files changed

+26
-1395
lines changed

runtime/doc/gui_mac.txt

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -402,32 +402,23 @@ top of the screen, you can set |MMNonNativeFullScreenShowMenu| to `NO` and
402402
==============================================================================
403403
5. Special colors *macvim-colors*
404404

405-
The colors in MacVim are defined in two dictionaries inside the "Resources"
406-
folder of the application bundle (MacVim.app/Contents/Resources). It is
407-
possible to add more colors by modifying these files. Color names are case
408-
insensitive when accessed from Vim, but in the dictionary they must be
409-
lowercase.
405+
MacVim mostly uses standard Vim colors. See |gui-colors| and |v:colornames|
406+
for how to set and override them.
410407

411408
*SystemColors.plist*
412-
There are only a few system colors that can be accessed from Vim. These
413-
colors are defined in the dictionary "SystemColors.plist". This dictionary
414-
stores (key, value) pairs where the key is the name of the color and the
415-
value is an NSColor selector name.
416-
417-
The most useful system colors are: >
418-
MacSelectedTextBackgroundColor
419-
MacSecondarySelectedColor
420-
The former is the "Highlight Color" which can be changed in the "Appearance"
421-
section of the System Settings. The latter is the selection color used by
422-
a Cocoa application when it is not in focus.
423-
424-
*Colors.plist*
425-
Apart from the system colors, it is also possible to use the standard X11
426-
color names (see https://en.wikipedia.org/wiki/X11_color_names) which usually
427-
come in a file called "rgb.txt". MacVim does not have such a file, instead it
428-
keeps these colors in a dictionary called "Colors.plist". The key in this
429-
dictionary is the name of the color and the value is an RGB value on the form
430-
#rrggbb stored as an integer.
409+
There are a few additional system colors that can be used in the |:hi|
410+
command. These colors are defined in the dictionary "SystemColors.plist" in
411+
the MacVim.app bundle. These color values correspond to NSColor selectors in
412+
macOS. The available color names are:
413+
414+
KEY VALUE ~
415+
MacSecondarySelectedControlColor Selection color when app is not in
416+
focus.
417+
MacSelectedTextBackgroundColor "Highlight Color" which can be changed
418+
in the "Appearance" section of System
419+
Settings.
420+
MacTextBackgroundColor Normal text background color.
421+
MacTextColor Normal text color.
431422

432423
*macvim-colorscheme*
433424
MacVim ships with a custom color scheme that is used instead of the default

runtime/doc/tags

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4124,7 +4124,6 @@ CmdwinEnter autocmd.txt /*CmdwinEnter*
41244124
CmdwinLeave autocmd.txt /*CmdwinLeave*
41254125
ColorScheme autocmd.txt /*ColorScheme*
41264126
ColorSchemePre autocmd.txt /*ColorSchemePre*
4127-
Colors.plist gui_mac.txt /*Colors.plist*
41284127
Command-line cmdline.txt /*Command-line*
41294128
Command-line-mode cmdline.txt /*Command-line-mode*
41304129
CompleteChanged autocmd.txt /*CompleteChanged*

0 commit comments

Comments
 (0)