aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorBozhidar Batsov2014-12-09 19:05:13 +0200
committerBozhidar Batsov2014-12-09 19:05:13 +0200
commitfda355b5bd8330762cb7894fc038492c6c9720a1 (patch)
tree5a368bc29ac4f30815284daef29bec967b547ed0 /lisp
parentbaab20d73e2a3ee6a06dc83fe97d0b781870e29f (diff)
downloademacs-fda355b5bd8330762cb7894fc038492c6c9720a1.tar.gz
emacs-fda355b5bd8330762cb7894fc038492c6c9720a1.zip
Associate more files with ruby-mode
* progmodes/ruby-mode.el (auto-mode-alist): Add .rabl, Berksfile and Puppetfile.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/ruby-mode.el3
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bf139d6e445..5ed3e47c7d9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-12-09 Bozhidar Batsov <bozhidar@batsov.com>
2
3 * progmodes/ruby-mode.el (auto-mode-alist): Add .rabl, Berksfile
4 and Puppetfile.
5
12014-12-09 Eric S. Raymond <esr@snark.thyrsus.com> 62014-12-09 Eric S. Raymond <esr@snark.thyrsus.com>
2 7
3 * vc/vc-src.el (vc-src-do-comand): Prepend -- to file argument 8 * vc/vc-src.el (vc-src-do-comand): Prepend -- to file argument
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 2f23e338f81..803bf579da3 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -2206,9 +2206,10 @@ See `font-lock-syntax-table'.")
2206(add-to-list 'auto-mode-alist 2206(add-to-list 'auto-mode-alist
2207 (cons (purecopy (concat "\\(?:\\." 2207 (cons (purecopy (concat "\\(?:\\."
2208 "rb\\|ru\\|rake\\|thor" 2208 "rb\\|ru\\|rake\\|thor"
2209 "\\|jbuilder\\|gemspec\\|podspec" 2209 "\\|jbuilder\\|rabl\\|gemspec\\|podspec"
2210 "\\|/" 2210 "\\|/"
2211 "\\(?:Gem\\|Rake\\|Cap\\|Thor" 2211 "\\(?:Gem\\|Rake\\|Cap\\|Thor"
2212 "\\|Puppet\\|Berks"
2212 "\\|Vagrant\\|Guard\\|Pod\\)file" 2213 "\\|Vagrant\\|Guard\\|Pod\\)file"
2213 "\\)\\'")) 'ruby-mode)) 2214 "\\)\\'")) 'ruby-mode))
2214 2215