aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Gutov2012-12-26 23:52:56 +0400
committerDmitry Gutov2012-12-26 23:52:56 +0400
commit78269b95cfe64d3ab5fabf1c2a63fa6abc7e0978 (patch)
tree15e4832f75fc5bf13bc2ee7de8e0e779f3b34988
parentbd8c13f9facdcf997761cf232e7b34cd9ea94fee (diff)
downloademacs-78269b95cfe64d3ab5fabf1c2a63fa6abc7e0978.tar.gz
emacs-78269b95cfe64d3ab5fabf1c2a63fa6abc7e0978.zip
* lisp/progmodes/ruby-mode.el (auto-mode-alist): `purecopy' the
Rakefile regexp. (auto-mode-alist): Associate .gemspec files with ruby-mode (https://bugs.ruby-lang.org/issues/5453).
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/progmodes/ruby-mode.el4
2 files changed, 10 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5ff36e04614..4b43050ddf5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
12012-12-26 Dmitry Gutov <dgutov@yandex.ru>
2
3 * progmodes/ruby-mode.el (auto-mode-alist): `purecopy' the
4 Rakefile regexp.
5 (auto-mode-alist): Associate .gemspec files with ruby-mode
6 (https://bugs.ruby-lang.org/issues/5453).
7
12012-12-26 Jürgen Hötzel <juergen@archlinux.org> 82012-12-26 Jürgen Hötzel <juergen@archlinux.org>
2 9
3 * net/tramp-adb.el (tramp-adb-get-ls-command): New defun. Suppress 10 * net/tramp-adb.el (tramp-adb-get-ls-command): New defun. Suppress
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index bc53c1f9556..b223aece416 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -1682,7 +1682,9 @@ The variable `ruby-indent-level' controls the amount of indentation.
1682;;;###autoload 1682;;;###autoload
1683(add-to-list 'auto-mode-alist (cons (purecopy "\\.rb\\'") 'ruby-mode)) 1683(add-to-list 'auto-mode-alist (cons (purecopy "\\.rb\\'") 'ruby-mode))
1684;;;###autoload 1684;;;###autoload
1685(add-to-list 'auto-mode-alist '("Rakefile\\'" . ruby-mode)) 1685(add-to-list 'auto-mode-alist (cons (purecopy "Rakefile\\'") 'ruby-mode))
1686;;;###autoload
1687(add-to-list 'auto-mode-alist (cons (purecopy "\\.gemspec\\'") 'ruby-mode))
1686 1688
1687;;;###autoload 1689;;;###autoload
1688(dolist (name (list "ruby" "rbx" "jruby" "ruby1.9" "ruby1.8")) 1690(dolist (name (list "ruby" "rbx" "jruby" "ruby1.9" "ruby1.8"))