* lisp/progmodes/ruby-mode.el (auto-mode-alist): Add missing "or".

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 71bc7e48aef12cc55322f9f4735b5ca703fff40e..de4fe9160462c0a5f84d3f46359576469a9170e3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2014-02-21  Dmitry Gutov  <dgutov@yandex.ru>
 
+       * progmodes/ruby-mode.el (auto-mode-alist): Add missing "or".
+
        * electric.el (electric-indent-functions-without-reindent):
        Add `yaml-indent-line'.
 

diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 96835fc989222aac3ba140ded3ba3df270e4ba08..e2175fcc80b6d3be191d8337c48a3a5ab769696a 100644 (file)
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -2174,7 +2174,7 @@ See `font-lock-syntax-table'.")
                                      "\\|jbuilder\\|gemspec\\|podspec"
                                      "\\|/"
                                      "\\(?:Gem\\|Rake\\|Cap\\|Thor"
-                                     "Vagrant\\|Guard\\|Pod\\)file"
+                                     "\\|Vagrant\\|Guard\\|Pod\\)file"
                                      "\\)\\'")) 'ruby-mode))
 
 ;;;###autoload