Skip to content

Commit d9ec600

Browse files
committed
Allow to use ruby 2.5.5, closes #558
1 parent 33f0964 commit d9ec600

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

scripts/build

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ def rule_to_code(rule)
290290

291291
if rule.has_key?("rules")
292292
return rule["rules"].map do |r|
293-
indent(rule_to_code({ "extensions" => rule["extensions"], **r }), 0)
293+
indent(rule_to_code({ "extensions" => rule["extensions"] }.merge(r)), 0)
294294
end.join("\n")
295295
end
296296

@@ -508,7 +508,7 @@ def generate_ftdetect(packages, heuristics)
508508

509509
for filename in filenames.sort
510510
if filename[0] == "."
511-
filename = "{.,}" + filename[1..]
511+
filename = "{.,}" + filename[1..-1]
512512
end
513513
if filename[-1] == "*"
514514
autocommands << " au BufNewFile,BufRead #{filename} call s:StarSetf('#{name}')\n"
@@ -729,7 +729,7 @@ def detect_filetypes(glob)
729729
end.group_by { |a, b| a }.map { |a, b| [a, b.map { |c, d| d }] }.map { |a, b|
730730
{
731731
"name" => a,
732-
"extensions" => b.select { |x| x.match(/^\*\.[^\/]+$/) }.map { |a| a.strip[2..] },
732+
"extensions" => b.select { |x| x.match(/^\*\.[^\/]+$/) }.map { |a| a.strip[2..-1] },
733733
"filenames" => expand_all(b.select { |x| !x.match(/^\*\.[^\/]+$/) })
734734
}
735735
}

0 commit comments

Comments
 (0)