X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=.emacs;h=edc138e5a82bb9124907957f95f7cd9a1912ad5c;hb=254c6a892ad58516873745e6ff8fd817b1d1a583;hp=b2918c10c32b35335f64a8e702281242df3f2d5a;hpb=ede21c03cb12f8ed1777cfc5538c758b3309417c;p=emacs.git

diff --git a/.emacs b/.emacs
index b2918c1..edc138e 100644
--- a/.emacs
+++ b/.emacs
@@ -51,8 +51,9 @@
 (fset 'perl-mode 'cperl-mode)
 ;;(load-file "cperl-mode.el")
 (add-to-list 'load-path '"~/lib/emacs_el/")
-(add-to-list 'load-path '"~/lib/emacs_el/tiny-tools/tiny")
-(add-to-list 'load-path '"~/lib/emacs_el/tiny-tools/other")
+;; this is the tiny-tools module from https://github.com/jaalto/project--emacs-tiny-tools.git
+(add-to-list 'load-path '"~/lib/emacs_el/tiny-tools/lisp/tiny")
+(add-to-list 'load-path '"~/lib/emacs_el/tiny-tools/lisp/other")
 ;;(add-to-list 'Tex-style-path '"~/lib/emacs_el/auctex/")
 
 (setq tinyprocmail--procmail-version "v3.22")
@@ -349,3 +350,11 @@
 ; use iedit
 (require 'iedit)
 (define-key global-map (kbd "C-;") 'iedit-mode)
+
+(require 'multi-web-mode)
+(setq mweb-default-major-mode 'html-mode)
+(setq mweb-tags '((php-mode "<\\?php\\|<\\? \\|<\\?=" "\\?>")
+                  (js-mode "<script +\\(type=\"text/javascript\"\\|language=\"javascript\"\\)[^>]*>" "</script>")
+                  (css-mode "<style +type=\"text/css\"[^>]*>" "</style>")))
+(setq mweb-filename-extensions '("php" "htm" "html" "ctp" "phtml" "php4" "php5"))
+(multi-web-global-mode 1)