diff options
| author | Dmitry Gutov <dgutov@yandex.ru> | 2014-02-21 17:39:17 +0200 |
|---|---|---|
| committer | Dmitry Gutov <dgutov@yandex.ru> | 2014-02-21 17:39:17 +0200 |
| commit | cb8f50a75c7192c54758e4563cf3386f80579e55 (patch) | |
| tree | b9eb51ba0170f21926e0da35e28775a2619ecb3b | |
| parent | c8481b1b2c4157c7b30edee3d335daae028bd88d (diff) | |
| download | emacs-cb8f50a75c7192c54758e4563cf3386f80579e55.tar.gz | |
* lisp/progmodes/ruby-mode.el (auto-mode-alist): Add missing "or".
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/progmodes/ruby-mode.el | 2 |
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 @@ 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 |