From 40887930f997abea03b0958969d535415793a9df Mon Sep 17 00:00:00 2001
From: Paul Chaignon <paul.chaignon@gmail.com>
Date: Mon, 17 Nov 2014 09:41:35 -0500
Subject: [PATCH 1/4] Lexer for Inform 7

---
 grammars.yml               | 4 +++-
 lib/linguist/languages.yml | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/grammars.yml b/grammars.yml
index bddbdf31..d15f9d7c 100644
--- a/grammars.yml
+++ b/grammars.yml
@@ -278,7 +278,9 @@ https://github.com/textmate/haskell.tmbundle:
 https://github.com/textmate/html.tmbundle:
 - text.html.basic
 https://github.com/textmate/inform.tmbundle:
-- source.inform
+- source.inform6
+https://github.com/PogiNate/Sublime-Inform/blob/master/Inform7/inform7.tmLanguage
+- source.inform7
 https://github.com/textmate/ini.tmbundle:
 - source.ini
 https://github.com/textmate/io.tmbundle:
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 34c8f5e3..93916bf6 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1135,7 +1135,7 @@ Inform 7:
   extensions:
   - .ni
   - .i7x
-  tm_scope: source.inform
+  tm_scope: source.inform7
   aliases:
   - i7
   - inform7

From e9c559825474ae71fbf9f5395b25127c5ec77e21 Mon Sep 17 00:00:00 2001
From: Paul Chaignon <paul.chaignon@gmail.com>
Date: Mon, 17 Nov 2014 10:50:03 -0500
Subject: [PATCH 2/4] Add lexer for Inform 7 using download-grammars script

---
 grammars.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/grammars.yml b/grammars.yml
index d15f9d7c..fb78a523 100644
--- a/grammars.yml
+++ b/grammars.yml
@@ -44,6 +44,8 @@ https://github.com/MarioRicalde/SCSS.tmbundle:
 - source.scss
 https://github.com/Oldes/Sublime-REBOL:
 - source.rebol
+https://github.com/PogiNate/Sublime-Inform:
+- source.Inform7
 https://github.com/Red-Nova-Technologies/autoitv3-tmbundle:
 - source.autoit.3
 https://github.com/SalGnt/Sublime-VimL:
@@ -278,9 +280,7 @@ https://github.com/textmate/haskell.tmbundle:
 https://github.com/textmate/html.tmbundle:
 - text.html.basic
 https://github.com/textmate/inform.tmbundle:
-- source.inform6
-https://github.com/PogiNate/Sublime-Inform/blob/master/Inform7/inform7.tmLanguage
-- source.inform7
+- source.inform
 https://github.com/textmate/ini.tmbundle:
 - source.ini
 https://github.com/textmate/io.tmbundle:

From 6f0c24b90b14897e0934df8f15af99b0201dc4c4 Mon Sep 17 00:00:00 2001
From: Paul Chaignon <paul.chaignon@gmail.com>
Date: Mon, 17 Nov 2014 10:56:38 -0500
Subject: [PATCH 3/4] Remove grammar for Inform 6

---
 grammars.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/grammars.yml b/grammars.yml
index fb78a523..0d19928b 100644
--- a/grammars.yml
+++ b/grammars.yml
@@ -279,8 +279,6 @@ https://github.com/textmate/haskell.tmbundle:
 - text.tex.latex.haskell
 https://github.com/textmate/html.tmbundle:
 - text.html.basic
-https://github.com/textmate/inform.tmbundle:
-- source.inform
 https://github.com/textmate/ini.tmbundle:
 - source.ini
 https://github.com/textmate/io.tmbundle:

From 1d381233e05635ed325e39a63f87ae1829391de7 Mon Sep 17 00:00:00 2001
From: Paul Chaignon <paul.chaignon@gmail.com>
Date: Mon, 17 Nov 2014 11:19:23 -0500
Subject: [PATCH 4/4] Update tm_scope to match case used in Sublime-Inform

---
 lib/linguist/languages.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 93916bf6..022918e6 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1135,7 +1135,7 @@ Inform 7:
   extensions:
   - .ni
   - .i7x
-  tm_scope: source.inform7
+  tm_scope: source.Inform7
   aliases:
   - i7
   - inform7