html-mode is loaded as part of sgml-mode.el

JEG2 · Feb 27, 2012 · 8fc42c8 · 8fc42c8
1 parent 4ef90c6
commit 8fc42c8
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/expand-region.el b/expand-region.el
@@ -139,6 +139,9 @@
 (eval-after-load "css-mode"     '(require 'css-mode-expansions))
 (eval-after-load "erlang-mode"  '(require 'erlang-mode-expansions))
 (eval-after-load "feature-mode" '(require 'feature-mode-expansions))
+(eval-after-load "sgml-mode"    '(require 'html-mode-expansions)) ;; html-mode is defined in sgml-mode.el
+(eval-after-load "rhtml-mode"   '(require 'html-mode-expansions))
+(eval-after-load "nxhtml-mode"  '(require 'html-mode-expansions))
 (eval-after-load "js2-mode"     '(require 'js-mode-expansions))
 (eval-after-load "js3-mode"     '(require 'js-mode-expansions))
 (eval-after-load "LaTeX-mode"   '(require 'latex-mode-expansions))
@@ -148,8 +151,6 @@
 (eval-after-load "ruby-mode"    '(require 'ruby-mode-expansions))
 (eval-after-load "text-mode"    '(require 'text-mode-expansions))
 
-(require 'html-mode-expansions) ;; require directly because of trouble with (eval-after-load "html-mode")
-
 (provide 'expand-region)
 
 ;;; expand-region.el ends here