From f72e2fdb68783ddebadca00a6af59e24d85769a2 Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Sat, 22 Jun 2013 04:11:24 +0400 Subject: [PATCH] * lisp/progmodes/ruby-mode.el (auto-mode-alist): Do not use `regexp-opt', it breaks the build during dumping. --- lisp/ChangeLog | 5 +++++ lisp/progmodes/ruby-mode.el | 9 ++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 966b70ea0bd..62e15d5c948 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-06-22 Dmitry Gutov + + * progmodes/ruby-mode.el (auto-mode-alist): Do not use + `regexp-opt', it breaks the build during dumping. + 2013-06-21 Dmitry Gutov * progmodes/ruby-mode.el (ruby-font-lock-keywords): Highlight diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el index f84f698d746..0755afc285f 100644 --- a/lisp/progmodes/ruby-mode.el +++ b/lisp/progmodes/ruby-mode.el @@ -1869,12 +1869,11 @@ The variable `ruby-indent-level' controls the amount of indentation. ;;;###autoload (add-to-list 'auto-mode-alist (cons (purecopy (concat "\\(?:\\." - (regexp-opt '("rb" "ru" "rake" "thor" - "jbuilder" "gemspec")) + "rb\\|ru\\|rake\\|thor" + "\\|jbuilder\\|gemspec" "\\|/" - (regexp-opt '("Gemfile" "Rakefile" - "Capfile" "Thorfile" - "Vagrantfile" "Guardfile")) + "\\(?:Gem\\|Rake\\|Cap\\|Thor" + "Vagrant\\|Guard\\)file" "\\)\\'")) 'ruby-mode)) ;;;###autoload -- 2.39.5