Merge branch 'detect-prolog' of https://github.com/tautologico/linguist into tautologico-detect-prolog

Conflicts:
	lib/linguist/blob_helper.rb
	test/test_blob.rb

test/fixtures/test-perl.pl

@@ -0,0 +1,2 @@
+#!/usr/bin/perl
+print "Hello, world!\n";

test/fixtures/test-perl2.pl

@@ -0,0 +1,3 @@
+
+# Perl file without shebang
+print "Hello, world!\n";

test/fixtures/test-prolog.pl

@@ -0,0 +1,12 @@
+/* Prolog test file */
+male(john).
+male(peter).
+
+female(vick).
+female(christie).
+
+parents(john, peter, christie).
+parents(vick, peter, christie).
+
+/* X is a brother of Y */
+brother(X, Y) :- male(X), parents(X, F, M), parents(Y, F, M).

test/test_blob.rb

@@ -230,9 +230,10 @@ class TestBlob < Test::Unit::TestCase
     assert_equal Language['Ruby'],        blob("wrong_shebang.rb").language
     assert_nil blob("octocat.png").language
 
-    # .r disambiguation
-    assert_equal Language['R'],           blob("hello-r.R").language
-    assert_equal Language['Rebol'],       blob("hello-rebol.r").language
+    # .pl disambiguation
+    assert_equal Language['Prolog'],      blob("test-prolog.pl").language
+    assert_equal Language['Perl'],        blob("test-perl.pl").language
+    assert_equal Language['Perl'],        blob("test-perl2.pl").language
 
     # .m disambiguation
     assert_equal Language['Objective-C'], blob("Foo.m").language
@@ -240,6 +241,10 @@ class TestBlob < Test::Unit::TestCase
     assert_equal Language['Matlab'], blob("matlab_function.m").language
     assert_equal Language['Matlab'], blob("matlab_script.m").language
 
+    # .r disambiguation
+    assert_equal Language['R'],           blob("hello-r.R").language
+    assert_equal Language['Rebol'],       blob("hello-rebol.r").language
+
     # ML
     assert_equal Language['OCaml'],       blob("Foo.ml").language
     assert_equal Language['Standard ML'], blob("Foo.sig").language

test/test_language.rb

@@ -81,6 +81,7 @@ class TestLanguage < Test::Unit::TestCase
     assert_equal Lexer['Ooc'], Language['ooc'].lexer
     assert_equal Lexer['PHP'], Language['PHP'].lexer
     assert_equal Lexer['Perl'], Language['Perl'].lexer
+    assert_equal Lexer['Prolog'], Language['Prolog'].lexer
     assert_equal Lexer['Python Traceback'], Language['Python traceback'].lexer
     assert_equal Lexer['Python'], Language['Python'].lexer
     assert_equal Lexer['REBOL'], Language['Rebol'].lexer
@@ -310,6 +311,7 @@ class TestLanguage < Test::Unit::TestCase
     assert Language['Objective-J'].major?
     assert Language['PHP'].major?
     assert Language['Perl'].major?
+    assert Language['Prolog'].major?
     assert Language['Pure Data'].major?
     assert Language['Python'].major?
     assert Language['R'].major?