aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien Danjou2012-11-08 17:37:34 +0100
committerJulien Danjou2012-11-08 17:37:34 +0100
commitcabc040aeaff1940409033a0c7c1c0ee27ab6107 (patch)
tree835ecad8eef03895a589225c2cea916c1822ee71
parenta81ad2255cff7df04b38be476f500bdc454e38f0 (diff)
downloademacs-cabc040aeaff1940409033a0c7c1c0ee27ab6107.tar.gz
emacs-cabc040aeaff1940409033a0c7c1c0ee27ab6107.zip
Add Rakefile in auto-mode-list for ruby-mode
* progmodes/ruby-mode.el (auto-mode-alist): Add Rakefile in `auto-mode-alist' (Bug#12835).
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/ruby-mode.el2
2 files changed, 7 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 10cfc97e41f..e820dd5ce7f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12012-11-08 Julien Danjou <julien@danjou.info>
2
3 * progmodes/ruby-mode.el (auto-mode-alist): Add Rakefile in
4 `auto-mode-alist' (Bug#12835).
5
12012-11-08 Stefan Monnier <monnier@iro.umontreal.ca> 62012-11-08 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * progmodes/perl-mode.el (perl-prettify-symbols): New defcustom. 8 * progmodes/perl-mode.el (perl-prettify-symbols): New defcustom.
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 84cf7308d75..c9bfcefb748 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -1638,6 +1638,8 @@ The variable `ruby-indent-level' controls the amount of indentation.
1638 1638
1639;;;###autoload 1639;;;###autoload
1640(add-to-list 'auto-mode-alist (cons (purecopy "\\.rb\\'") 'ruby-mode)) 1640(add-to-list 'auto-mode-alist (cons (purecopy "\\.rb\\'") 'ruby-mode))
1641;;;###autoload
1642(add-to-list 'auto-mode-alist '("Rakefile\\'" . ruby-mode))
1641 1643
1642;;;###autoload 1644;;;###autoload
1643(dolist (name (list "ruby" "rbx" "jruby" "ruby1.9" "ruby1.8")) 1645(dolist (name (list "ruby" "rbx" "jruby" "ruby1.9" "ruby1.8"))