aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Gutov2014-02-21 17:39:17 +0200
committerDmitry Gutov2014-02-21 17:39:17 +0200
commitcb8f50a75c7192c54758e4563cf3386f80579e55 (patch)
treeb9eb51ba0170f21926e0da35e28775a2619ecb3b
parentc8481b1b2c4157c7b30edee3d335daae028bd88d (diff)
downloademacs-cb8f50a75c7192c54758e4563cf3386f80579e55.tar.gz
emacs-cb8f50a75c7192c54758e4563cf3386f80579e55.zip
* lisp/progmodes/ruby-mode.el (auto-mode-alist): Add missing "or".
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/progmodes/ruby-mode.el2
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 71bc7e48aef..de4fe916046 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12014-02-21 Dmitry Gutov <dgutov@yandex.ru> 12014-02-21 Dmitry Gutov <dgutov@yandex.ru>
2 2
3 * progmodes/ruby-mode.el (auto-mode-alist): Add missing "or".
4
3 * electric.el (electric-indent-functions-without-reindent): 5 * electric.el (electric-indent-functions-without-reindent):
4 Add `yaml-indent-line'. 6 Add `yaml-indent-line'.
5 7
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'.")
2174 "\\|jbuilder\\|gemspec\\|podspec" 2174 "\\|jbuilder\\|gemspec\\|podspec"
2175 "\\|/" 2175 "\\|/"
2176 "\\(?:Gem\\|Rake\\|Cap\\|Thor" 2176 "\\(?:Gem\\|Rake\\|Cap\\|Thor"
2177 "Vagrant\\|Guard\\|Pod\\)file" 2177 "\\|Vagrant\\|Guard\\|Pod\\)file"
2178 "\\)\\'")) 'ruby-mode)) 2178 "\\)\\'")) 'ruby-mode))
2179 2179
2180;;;###autoload 2180;;;###autoload