diff options
| author | Dmitry Gutov | 2013-06-22 04:11:24 +0400 |
|---|---|---|
| committer | Dmitry Gutov | 2013-06-22 04:11:24 +0400 |
| commit | f72e2fdb68783ddebadca00a6af59e24d85769a2 (patch) | |
| tree | 61c616384fc84a0cddd7c54ad09e98b094ebe443 | |
| parent | 7bcf66280cc43eba100e9b7586d5274683746f87 (diff) | |
| download | emacs-f72e2fdb68783ddebadca00a6af59e24d85769a2.tar.gz emacs-f72e2fdb68783ddebadca00a6af59e24d85769a2.zip | |
* lisp/progmodes/ruby-mode.el (auto-mode-alist): Do not use
`regexp-opt', it breaks the build during dumping.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | 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 @@ | |||
| 1 | 2013-06-22 Dmitry Gutov <dgutov@yandex.ru> | ||
| 2 | |||
| 3 | * progmodes/ruby-mode.el (auto-mode-alist): Do not use | ||
| 4 | `regexp-opt', it breaks the build during dumping. | ||
| 5 | |||
| 1 | 2013-06-21 Dmitry Gutov <dgutov@yandex.ru> | 6 | 2013-06-21 Dmitry Gutov <dgutov@yandex.ru> |
| 2 | 7 | ||
| 3 | * progmodes/ruby-mode.el (ruby-font-lock-keywords): Highlight | 8 | * 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. | |||
| 1869 | ;;;###autoload | 1869 | ;;;###autoload |
| 1870 | (add-to-list 'auto-mode-alist | 1870 | (add-to-list 'auto-mode-alist |
| 1871 | (cons (purecopy (concat "\\(?:\\." | 1871 | (cons (purecopy (concat "\\(?:\\." |
| 1872 | (regexp-opt '("rb" "ru" "rake" "thor" | 1872 | "rb\\|ru\\|rake\\|thor" |
| 1873 | "jbuilder" "gemspec")) | 1873 | "\\|jbuilder\\|gemspec" |
| 1874 | "\\|/" | 1874 | "\\|/" |
| 1875 | (regexp-opt '("Gemfile" "Rakefile" | 1875 | "\\(?:Gem\\|Rake\\|Cap\\|Thor" |
| 1876 | "Capfile" "Thorfile" | 1876 | "Vagrant\\|Guard\\)file" |
| 1877 | "Vagrantfile" "Guardfile")) | ||
| 1878 | "\\)\\'")) 'ruby-mode)) | 1877 | "\\)\\'")) 'ruby-mode)) |
| 1879 | 1878 | ||
| 1880 | ;;;###autoload | 1879 | ;;;###autoload |