Merge branch 'master' into heuristics

github-linguist.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name    = 'github-linguist'
-  s.version = '2.10.4'
+  s.version = '2.10.5'
   s.summary = "GitHub Language detection"
 
   s.authors  = "GitHub"

lib/linguist/languages.yml

@@ -782,6 +782,7 @@ JSON:
   - .sublime-settings
   - .sublime-workspace
   filenames:
+  - .jshintrc
   - composer.lock
 
 Jade:
@@ -1222,8 +1223,6 @@ Pod:
   ace_mode: perl
   wrap: true
   primary_extension: .pod
-  interpreters:
-  - perl
 
 PogoScript:
   type: programming
@@ -1340,6 +1339,15 @@ RHTML:
   group: HTML
   primary_extension: .rhtml
 
+RMarkdown:
+  type: markup
+  lexer: Text only
+  wrap: true
+  ace_mode: markdown
+  primary_extension: .rmd
+  extensions:
+  - .Rmd
+
 Racket:
   type: programming
   lexer: Racket

lib/linguist/samples.json

@@ -333,6 +333,9 @@
     "Rebol": [
       ".r"
     ],
+    "RMarkdown": [
+      ".rmd"
+    ],
     "RobotFramework": [
       ".robot"
     ],
@@ -506,8 +509,8 @@
       ".gemrc"
     ]
   },
-  "tokens_total": 426850,
+  "tokens_total": 426869,
-  "languages_total": 498,
+  "languages_total": 499,
   "tokens": {
     "ABAP": {
       "*/**": 1,
@@ -38524,6 +38527,23 @@
       "func": 1,
       "print": 1
     },
+    "RMarkdown": {
+      "Some": 1,
+      "text.": 1,
+      "##": 1,
+      "A": 1,
+      "graphic": 1,
+      "in": 1,
+      "R": 1,
+      "{": 1,
+      "r": 1,
+      "}": 1,
+      "plot": 1,
+      "(": 3,
+      ")": 3,
+      "hist": 1,
+      "rnorm": 1
+    },
     "RobotFramework": {
       "***": 16,
       "Settings": 3,
@@ -44856,6 +44876,7 @@
     "Ragel in Ruby Host": 593,
     "RDoc": 279,
     "Rebol": 11,
+    "RMarkdown": 19,
     "RobotFramework": 483,
     "Ruby": 3862,
     "Rust": 3566,
@@ -44990,6 +45011,7 @@
     "Ragel in Ruby Host": 3,
     "RDoc": 1,
     "Rebol": 1,
+    "RMarkdown": 1,
     "RobotFramework": 3,
     "Ruby": 17,
     "Rust": 1,
@@ -45025,5 +45047,5 @@
     "Xtend": 2,
     "YAML": 1
   },
-  "md5": "47fe2f821dd0c55027348132eab3a3b8"
+  "md5": "8d40049b60f9c3a47eafac12ac2e9f8f"
 }

samples/RMarkdown/example.rmd

@@ -0,0 +1,10 @@
+# An example RMarkdown
+
+Some text.
+
+## A graphic in R
+
+```{r}
+plot(1:10)
+hist(rnorm(10000))
+```