* lisp/progmodes/ruby-mode.el (auto-mode-alist): Consolidate different

entries into one regexp and add more *file-s.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 64cb8574db36a1457998bc4a9dd413fb707d54fd..966b70ea0bd98c4b08227e6dce8cfff3d9ed6fb9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,8 @@
        * progmodes/ruby-mode.el (ruby-font-lock-keywords): Highlight
        keyword-like methods on Kernel and Module with
        font-lock-builtin-face.
+       (auto-mode-alist): Consolidate different entries into one regexp
+       and add more *file-s.
 
 2013-06-21  Stephen Berman  <stephen.berman@gmx.net>
 

diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index fe44647dcce13932ae9fbd5d2f5763f2b5b393e4..f827b4471362c9b1d833fd1315a679d6bf4279a1 100644 (file)
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -1867,11 +1867,15 @@ The variable `ruby-indent-level' controls the amount of indentation.
 ;;; Invoke ruby-mode when appropriate
 
 ;;;###autoload
-(add-to-list 'auto-mode-alist (cons (purecopy "\\.rb\\'") 'ruby-mode))
-;;;###autoload
-(add-to-list 'auto-mode-alist (cons (purecopy "Rakefile\\'") 'ruby-mode))
-;;;###autoload
-(add-to-list 'auto-mode-alist (cons (purecopy "\\.gemspec\\'") 'ruby-mode))
+(add-to-list 'auto-mode-alist
+             (cons (purecopy (concat "\\(?:\\."
+                                     (regexp-opt '("rb" "ru" "rake" "thor"
+                                                   "jbuilder" "gemspec"))
+                                     "\\|/"
+                                     (regexp-opt '("Gemfile" "Rakefile"
+                                                   "Capfile" "Thorfile"
+                                                   "Vagrantfile"))
+                                     "\\)\\'")) 'ruby-mode))
 
 ;;;###autoload
 (dolist (name (list "ruby" "rbx" "jruby" "ruby1.9" "ruby1.8"))