[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master c1997e1 313/433: Revert unintended check-in of mmm-erb cha
From: |
Dmitry Gutov |
Subject: |
[elpa] master c1997e1 313/433: Revert unintended check-in of mmm-erb changes |
Date: |
Thu, 15 Mar 2018 19:44:26 -0400 (EDT) |
branch: master
commit c1997e1a5f04f4c226e3a5c5ff0e38cf2dd2f1eb
Author: Steve Purcell <address@hidden>
Commit: Steve Purcell <address@hidden>
Revert unintended check-in of mmm-erb changes
---
mmm-erb.el | 22 ++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)
diff --git a/mmm-erb.el b/mmm-erb.el
index 75eba51..10d8e79 100644
--- a/mmm-erb.el
+++ b/mmm-erb.el
@@ -112,20 +112,12 @@
(pushnew '(indent-line-function buffer) mmm-save-local-variables)
;;;###autoload
-(define-minor-mode mmm-html-minor-mode
- "Minor mode which provides context and set-up for HTML-related mmm-mode
classes."
- nil " ERB" nil
- (setq sgml-unclosed-tags nil) ; Simplifies indentation logic.
- (dolist (hook '(mmm-html-erb-mode-hook
- mmm-nxml-web-mode-hook
- mmm-ruby-mode-submode-hook
- mmm-css-mode-submode-hook
- mmm-js-mode-submode-hook))
- (add-hook hook 'mmm-erb-process-submode nil t)))
-
-;;;###autoload
(define-derived-mode html-erb-mode html-mode "ERB-HTML"
- (mmm-html-minor-mode t))
+ (setq sgml-unclosed-tags nil) ; Simplifies indentation logic.
+ (add-hook 'mmm-html-erb-mode-hook 'mmm-erb-process-submode nil t)
+ (add-hook 'mmm-ruby-mode-submode-hook 'mmm-erb-process-submode nil t)
+ (add-hook 'mmm-css-mode-submode-hook 'mmm-erb-process-submode nil t)
+ (add-hook 'mmm-js-mode-submode-hook 'mmm-erb-process-submode nil t))
(defun mmm-erb-process-submode ()
"Hook function to run after primary or submode major mode function."
@@ -265,7 +257,9 @@
;;;###autoload
(define-derived-mode nxml-web-mode nxml-mode "nXML-Web"
- (mmm-html-minor-mode t))
+ (add-hook 'mmm-nxml-web-mode-hook 'mmm-erb-process-submode nil t)
+ (add-hook 'mmm-css-mode-submode-hook 'mmm-erb-process-submode nil t)
+ (add-hook 'mmm-js-mode-submode-hook 'mmm-erb-process-submode nil t))
(provide 'mmm-erb)
- [elpa] master ea97875 231/433: Added C indentation style variables., (continued)
- [elpa] master ea97875 231/433: Added C indentation style variables., Dmitry Gutov, 2018/03/15
- [elpa] master 80134a4 237/433: * mmm-sample.el (jsp): Added jsp-comment submode type., Dmitry Gutov, 2018/03/15
- [elpa] master b571d27 236/433: * FAQ: Don't quote argument to `setq'. :-), Dmitry Gutov, 2018/03/15
- [elpa] master cb27602 221/433: Corrected reference to `javascript' class to `html-js'., Dmitry Gutov, 2018/03/15
- [elpa] master 3c2f878 243/433: # Updated, Dmitry Gutov, 2018/03/15
- [elpa] master d6dc934 203/433: (mmm-here-doc-get-mode): Try each word individually first., Dmitry Gutov, 2018/03/15
- [elpa] master 9b857f5 255/433: Added Noweb documentation (Joe Kelsey), Dmitry Gutov, 2018/03/15
- [elpa] master 6485ce3 259/433: Fixed stupid bug, so autoloading will actually work, Dmitry Gutov, 2018/03/15
- [elpa] master d242111 258/433: *** empty log message ***, Dmitry Gutov, 2018/03/15
- [elpa] master c75f330 317/433: Merge pull request #15 from dgutov/master, Dmitry Gutov, 2018/03/15
- [elpa] master c1997e1 313/433: Revert unintended check-in of mmm-erb changes,
Dmitry Gutov <=
- [elpa] master c42fcb2 286/433: Compatibility fix for mode line format of Emacs 23, Dmitry Gutov, 2018/03/15
- [elpa] master b171ba0 324/433: Merge pull request #17 from dgutov/retro, Dmitry Gutov, 2018/03/15
- [elpa] master 53bd8b4 319/433: Remove duplicate entries, Dmitry Gutov, 2018/03/15
- [elpa] master 5f276a1 307/433: Update instructions and docstrings, Dmitry Gutov, 2018/03/15
- [elpa] master a0b1ecc 320/433: Merge pull request #16 from dgutov/c++-mode, Dmitry Gutov, 2018/03/15
- [elpa] master a5a24df 322/433: Fix the timer error: "Selecting deleted buffer", Dmitry Gutov, 2018/03/15
- [elpa] master 0b30852 244/433: * mmm-vars.el (mmm-c-derived-modes): Added php-mode., Dmitry Gutov, 2018/03/15
- [elpa] master 34c3a19 212/433: Updated mode preferences to check fboundp when regions are created., Dmitry Gutov, 2018/03/15
- [elpa] master 46185e0 232/433: Made C indentation style variables buffer-local., Dmitry Gutov, 2018/03/15
- [elpa] master fee1b52 211/433: Added file with Emacs-related macros from Alan Shutko., Dmitry Gutov, 2018/03/15