From dea7a0890a724c50bc5767039f45a2e3d071ee1c Mon Sep 17 00:00:00 2001
From: Khairul Azhar Kasmiran <kazarmy@gmail.com>
Date: Wed, 29 May 2019 00:29:42 +0800
Subject: Skip UTF-8 BOM when reading config file

---
 CHANGELOG.md            | 1 +
 alacritty/src/config.rs | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e0d9fdd..c98b0c7b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,6 +46,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - On macOS, automatic graphics switching has been enabled again
 - Text getting recognized as URLs without slashes separating the scheme
 - URL parser dropping trailing slashes from valid URLs
+- UTF-8 BOM skipped when reading config file
 
 ### Removed
 
diff --git a/alacritty/src/config.rs b/alacritty/src/config.rs
index ea487ecd..6d185fe7 100644
--- a/alacritty/src/config.rs
+++ b/alacritty/src/config.rs
@@ -179,6 +179,11 @@ fn read_config(path: &PathBuf) -> Result<Config> {
     let mut contents = String::new();
     File::open(path)?.read_to_string(&mut contents)?;
 
+    // Remove UTF-8 BOM
+    if contents.chars().nth(0) == Some('\u{FEFF}') {
+        contents = contents.split_off(3);
+    }
+
     // Prevent parsing error with empty string
     if contents.is_empty() {
         return Ok(Config::default());
-- 
cgit