MirroredRepos/bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat.git synced 2025-02-22 21:08:40 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into doc_fix

Browse Source
This commit is contained in:
John Higgins 2023-08-02 09:00:29 -07:00
commit 7826e506f8
No known key found for this signature in database
GPG Key ID: 192DF5D301BD714C
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -13,6 +13,7 @@
- Associate `os-release` with `bash` syntax, see #2587 (@cyqsimon) - Associate `os-release` with `bash` syntax, see #2587 (@cyqsimon)
- Associate `Containerfile` with `Dockerfile` syntax, see #2606 (@einfachIrgendwer0815) - Associate `Containerfile` with `Dockerfile` syntax, see #2606 (@einfachIrgendwer0815)
- Replaced quotes with double quotes so fzf integration example script works on windows and linux. see #2095 (@johnmatthiggins) - Replaced quotes with double quotes so fzf integration example script works on windows and linux. see #2095 (@johnmatthiggins)
- Associate `ksh` files with `bash` syntax, see #2633 (@johnmatthiggins)
## Themes ## Themes

4
src/syntax_mapping.rs
View File

@ -90,6 +90,10 @@ impl<'a> SyntaxMapping<'a> {
.insert("Containerfile", MappingTarget::MapTo("Dockerfile")) .insert("Containerfile", MappingTarget::MapTo("Dockerfile"))
.unwrap(); .unwrap();
mapping
.insert("*.ksh", MappingTarget::MapTo("Bourne Again Shell (bash)"))
.unwrap();
// Nginx and Apache syntax files both want to style all ".conf" files // Nginx and Apache syntax files both want to style all ".conf" files
// see #1131 and #1137 // see #1131 and #1137
mapping mapping