X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=.emacs;h=6ff129a5be7e8c1e0606ad47256606ca2deb91dc;hb=c7e57579070d83fa58325ee36d15f07a6269efb4;hp=97abbe2ab791db88b65c7a32c0aa67b44f35b7bf;hpb=78991927ad7c4e52533e39b003d92805c0ab4754;p=emacs.git

diff --git a/.emacs b/.emacs
index 97abbe2..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,11 +50,21 @@
 (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/")
 
-(require 'tiny-setup)
+; 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)
 
 (require 'tex-site)
@@ -68,12 +77,12 @@
 ;;(require 'fixme)
 (require 'google-weather)
 (require 'org-google-weather)
-(setq org-google-weather-format "%i %c, [%l,%h] %s %C")
+(setq-default org-google-weather-format "%i %c, [%l,%h] %s %C")
 
 
 (global-set-key "\C-xp" 'server-edit)
 
-(setq auto-mode-alist (cons '("\.wml$" . 
+(setq-default auto-mode-alist (cons '("\.wml$" . 
 			      (lambda () (html-mode) (auto-fill-mode)))
 			    auto-mode-alist))
 
@@ -107,7 +116,7 @@
 ;;   which really should be,
 ;;   if (-!-) {
 ;;   }
-(setq cperl-hairy t
+(setq-default cperl-hairy t
       cperl-indent-level 4
 ;;      cperl-auto-newline t
 ;;      cperl-auto-newline-after-colon t
@@ -123,14 +132,15 @@
 
 ;(load-library "php-mode")
 
-(setq c-indent-level 8)
-(setq c-brace-imaginary-offset 0)
-(setq c-brace-offset -8)
-(setq c-argdecl-indent 8)
-(setq c-label-offset -8)
-(setq c-continued-statement-offset 8)
-(setq indent-tabs-mode nil)
-(setq tab-width 8)
+(setq-default c-indent-level 8)
+(setq-default c-brace-imaginary-offset 0)
+(setq-default c-brace-offset -8)
+(setq-default c-argdecl-indent 8)
+(setq-default c-label-offset -8)
+(setq-default c-continued-statement-offset 8)
+; tabs are annoying
+(setq-default indent-tabs-mode nil)
+(setq-default tab-width 8)
 
 
 ;; (autoload 'php-mode "php-mode" "PHP editing mode" t)
@@ -183,8 +193,8 @@
 (add-to-list 'font-latex-match-function-keywords "aclu")
 (add-to-list 'font-latex-match-function-keywords "acused")
 (font-latex-match-function-make)
-(setq TeX-parse-self t)
-(setq TeX-auto-save t)
+(setq-default TeX-parse-self t)
+(setq-default TeX-auto-save t)
 (setq-default TeX-master nil)
 
 (defun insert-date ()
@@ -203,13 +213,13 @@
 ;(iswitchb-default-keybindings)
 
 (column-number-mode t)
-(setq reftex-plug-into-AUCTeX t)
+(setq-default reftex-plug-into-AUCTeX t)
 
 (server-start)
 
 (require 'mode-compile)
 
-(setq reftex-default-bibliography
+(setq-default reftex-default-bibliography
       '("references.bib"))
 
 (defadvice server-process-filter (after post-mode-message first activate)
@@ -221,7 +231,7 @@
 					; This is also needed to see the magic message.  Set to a higher
 					; number if you have a faster computer or read slower than me.
 '(font-lock-verbose 1000)
-;(setq server-temp-file-regexp "mutt\(-\|ng-\)")
+;(setq-default server-temp-file-regexp "mutt\(-\|ng-\)")
 ; (add-hook 'server-switch-hook 
 ; 	  (function (lambda()
 ; 		      (cond ((string-match "Post" mode-name)
@@ -274,9 +284,8 @@
 (global-set-key "\C-cl" 'org-store-link)
 (global-set-key "\C-ca" 'org-agenda)
 (global-set-key "\C-cb" 'org-iswitchb)
-(setq org-log-done 'time)
-(setq org-log-done 'note)
-(setq org-agenda-ndays 5)
+(setq-default org-log-done 'time)
+(setq-default org-agenda-ndays 5)
 
 
 (autoload 'flyspell-mode "flyspell" "On-the-fly spelling checker." t)
@@ -337,6 +346,22 @@
 )
 (add-hook 'org-mode-hook 'my-org-mode-setup)
 
-(setq org-mobile-directory "/rzlab.ucr.edu:/sites/dav.donarmstrong.com/root/org/")
-(setq org-directory "/home/don/org-mode/")
-(setq org-mobile-inbox-for-pull "/home/don/org-mode/from-mobile.org")
+(setq-default org-mobile-directory "/rzlab.ucr.edu:/sites/dav.donarmstrong.com/root/org/")
+(setq-default org-directory "/home/don/org-mode/")
+(setq-default org-mobile-inbox-for-pull "/home/don/org-mode/from-mobile.org")
+
+; debian stuff
+(setq-default debian-changelog-mailing-address "don@debian.org")
+(setq-default debian-changelog-full-name "Don Armstrong")
+
+; 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)