From: Dmitry Gutov <dgutov@yandex.ru>
Date: Fri, 21 Feb 2014 15:39:17 +0000 (+0200)
Subject: * lisp/progmodes/ruby-mode.el (auto-mode-alist): Add missing "or".
X-Git-Tag: emacs-24.3.90~173^2^2~27
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cb8f50a75c7192c54758e4563cf3386f80579e55;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 71bc7e48aef..de4fe916046 100644
--- 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 96835fc9892..e2175fcc80b 100644
--- 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