From 6edf4498ce53bcb057191d02c5df92731b311da2 Mon Sep 17 00:00:00 2001
From: Brandon Keepers <brandon@opensoul.org>
Date: Mon, 29 Sep 2014 14:12:36 -0400
Subject: [PATCH] Move overridden_language to just #language

---
 lib/linguist/lazy_blob.rb | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/lib/linguist/lazy_blob.rb b/lib/linguist/lazy_blob.rb
index 3ece29f2..6b2e5e47 100644
--- a/lib/linguist/lazy_blob.rb
+++ b/lib/linguist/lazy_blob.rb
@@ -53,15 +53,14 @@ module Linguist
         return true
       end
     end
-
-    def overriden_language
-      if lang = git_attributes['linguist-language']
-        Language.find_by_name(lang)
-      end
-    end
-
     def language
-      @language ||= (overriden_language || Language.detect(self))
+      return @language if defined?(@language)
+
+      @language = if lang = git_attributes['linguist-language']
+        Language.find_by_name(lang)
+      else
+        super
+      end
     end
 
     def data