From: Dmitry Gutov Date: Fri, 21 Jun 2013 23:14:38 +0000 (+0400) Subject: * lisp/progmodes/ruby-mode.el (auto-mode-alist): Consolidate different X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2010 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5cf8176d5504a3d9152902a2877b5d76d0f27f1d;p=emacs.git * 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 64cb8574db3..966b70ea0bd 100644 --- 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 diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el index fe44647dcce..f827b447136 100644 --- 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"))