Skip to content

Commit 26de876

Browse files
committed
Revert "Add Edit > Color Scheme > Find More Color Schemes."
This reverts commit 04d045a. It will cause merge conflict.
1 parent 9b7d8cd commit 26de876

1 file changed

Lines changed: 5 additions & 33 deletions

File tree

runtime/menu.vim

Lines changed: 5 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -397,41 +397,13 @@ let s:n = globpath(&runtimepath, "colors/*.vim")
397397
let s:names = sort(map(split(s:n, "\n"), 'substitute(v:val, "\\c.*[/\\\\:\\]]\\([^/\\\\:]*\\)\\.vim", "\\1", "")'), 1)
398398

399399
" define all the submenu entries
400-
let s:cs_idx = 100
400+
let s:idx = 100
401401
for s:name in s:names
402-
exe "an 20.450." . s:cs_idx . ' &Edit.C&olor\ Scheme.' . s:name . " :colors " . s:name . "<CR>"
403-
let s:cs_idx = s:cs_idx + 10
402+
exe "an 20.450." . s:idx . ' &Edit.C&olor\ Scheme.' . s:name . " :colors " . s:name . "<CR>"
403+
let s:idx = s:idx + 10
404404
endfor
405-
exe "an 20.450." . s:cs_idx . ' &Edit.C&olor\ Scheme.-SEP- <Nop>'
406-
let s:cs_idx = s:cs_idx + 10
407-
exe "an <silent> 20.450." . s:cs_idx '&Edit.C&olor\ Scheme.Find\ More\ Color\ Schemes' ":call <SID>Colorschemes()<CR>"
408-
let s:cs_idx = s:cs_idx + 10
409-
unlet s:name s:names s:n
410-
411-
let s:undo_colorschemes = ['aun &Edit.C&olor\ Scheme.Find\ More\ Color\ Schemes']
412-
func! s:Colorschemes()
413-
for cmd in s:undo_colorschemes
414-
exe "silent! " . cmd
415-
endfor
416-
let s:undo_colorschemes = []
417-
418-
let s = globpath(&packpath, "pack/*/{opt,start}/*/colors/*.vim")
419-
let names = sort(map(split(s, "\n"), 'substitute(v:val, "\\c.*[/\\\\:\\]]\\([^/\\\\:]*\\)\\.vim", "\\1", "")'), 1)
420-
let n = s:cs_idx
421-
for name in names
422-
let menuname = '&Edit.C&olor\ Scheme.' . name
423-
exe 'an 20.450.' . n . ' ' . menuname . " :colors " . name . "<CR>"
424-
let s:undo_colorschemes += ['aun ' . menuname]
425-
let n += 10
426-
endfor
427-
if empty(names)
428-
echomsg "Could not find other color schemes"
429-
elseif len(names) == 1
430-
echomsg "Found color scheme " . names[0]
431-
else
432-
echomsg "Found " . len(names) . " more color schemes"
433-
endif
434-
endfun
405+
unlet s:name s:names s:n s:idx
406+
435407

436408
" Setup the Edit.Keymap submenu
437409
if has("keymap")

0 commit comments

Comments
 (0)