X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=.emacs;h=6ff129a5be7e8c1e0606ad47256606ca2deb91dc;hb=c7e57579070d83fa58325ee36d15f07a6269efb4;hp=b2918c10c32b35335f64a8e702281242df3f2d5a;hpb=ede21c03cb12f8ed1777cfc5538c758b3309417c;p=emacs.git

diff --git a/.emacs b/.emacs
index b2918c1..6ff129a 100644
--- a/.emacs
+++ b/.emacs
@@ -27,7 +27,6 @@
  '(markdown-enable-math t)
  '(markdown-follow-wiki-link-on-enter nil)
  '(mutt-alias-file-list (quote ("~/.mutt/aliases" "~/.mail_aliases")))
- '(org-agenda-files (quote ("~/projects/debbugs/notes.org" "~/projects/notes/notes.org" "~/projects/origins_of_life/paper/figure_list.org" "~/projects/origins_of_life/ool.org" "~/projects/sysadmin/sndservers/sndservers.org" "~/projects/chaim/chaim.org" "~/projects/fh/fh.org" "~/projects/notes/library_books.org")))
  '(post-email-address "don@donarmstrong.com")
  '(post-kill-quoted-sig nil)
  '(post-mail-message "mutt\\(ng\\|\\)-[a-z0-9]+-[0-9]+-.*")
@@ -51,10 +50,19 @@
 (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/")
 
+; org mode agenda files
+(setq org-agenda-files (quote ("~/projects/debbugs/notes.org"
+                               "~/projects/notes/notes.org"
+                               "~/projects/origins_of_life/ool.org"
+                               "~/projects/sysadmin/sndservers/sndservers.org"
+                               "~/projects/chaim/chaim.org"
+                               "~/projects/fh/fh.org")))
+
 (setq tinyprocmail--procmail-version "v3.22")
 (add-hook 'tinyprocmail--load-hook 'tinyprocmail-install)
 (require 'tinyprocmail)
@@ -349,3 +357,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)