From cb8f50a75c7192c54758e4563cf3386f80579e55 Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Fri, 21 Feb 2014 17:39:17 +0200 Subject: [PATCH] * lisp/progmodes/ruby-mode.el (auto-mode-alist): Add missing "or". --- lisp/ChangeLog | 2 ++ lisp/progmodes/ruby-mode.el | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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 + * 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 -- 2.39.2