X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/c40c5499d5082b481d7b87160d313dc2bf22f728..9651a84b95a10e444cdb5d0fb0558c7cda1ac28b:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index 81db066..0ced3ca 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -127,7 +127,7 @@
 
 ;; ---- Some mail and news configuration ---
 
-(setq mail-from-style 'parens
+(setq mail-from-style 'angles
       mail-signature t
       mail-yank-prefix "> "
       mail-archive-file-name "~/Mail/sent"
@@ -480,9 +480,9 @@
 (add-hook 'org-agenda-mode-hook
 	  #'(lambda () (mdw-clobber-evil-keymap org-agenda-mode-map)))
 (or mdw-fast-startup
-    (progn
-      (org-remember-insinuate)
-      (global-set-key [?\C-c ?r] 'org-remember)))
+    (trap (progn
+	    (org-remember-insinuate)
+	    (global-set-key [?\C-c ?r] 'org-remember))))
 
 ;; Minor mode listing
 
@@ -508,6 +508,7 @@
 		;; ("/[ch]/" . c-mode)
 		(,(concat "/\\("
 			  "\\.stgit\\.msg" "\\|"
+			  "\\.topmsg" "\\|"
 			  "\\.git/COMMIT_EDITMSG" "\\|"
 			  "svn-commit\\.tmp" "\\|"
 			  "svk-commit[^/.]*\\.tmp"
@@ -535,7 +536,11 @@
 	      auto-mode-alist))
 
 (setq interpreter-mode-alist
-      (append `(("runlisp" . lisp-mode))
+      (append `(("runlisp" . lisp-mode)
+		("@PYTHON@" . python-mode)
+		("@PERL@" . perl-mode)
+		("@TCLSH@" . tcl-mode)
+		("@WISH@" . tcl-mode))
 	      interpreter-mode-alist))
 
 (setq completion-ignored-extensions
@@ -556,11 +561,11 @@
 	'(c-mode-hook c++-mode-hook objc-mode-hook java-mode-hook
 	  csharp-mode-hook perl-mode-hook cperl-mode-hook
 	  python-mode-hook pyrec-mode-hook icon-mode-hook awk-mode-hook
-	  tcl-mode-hook go-mode-hook
+	  tcl-mode-hook go-mode-hook js-mode-hook conf-mode-hook
 	  asm-mode-hook TeX-mode-hook LaTeX-mode-hook
 	  TeXinfo-mode-hook tex-mode-hook latex-mode-hook
 	  texinfo-mode-hook emacs-lisp-mode-hook scheme-mode-hook
-	  lisp-mode-hook lisp-interaction-mode-hook
+	  lisp-mode-hook lisp-interaction-mode-hook makefile-mode-hook
 	  inferior-lisp-mode-hook slime-repl-mode-hook
 	  sml-mode-hook haskell-mode-hook erlang-mode-hook
 	  smalltalk-mode-hook rexx-mode-hook
@@ -643,6 +648,7 @@
   (add-hook 'apcalc-mode-hook 'mdw-fontify-apcalc t)
 
   (add-hook 'java-mode-hook 'mdw-fontify-java t)
+  (add-hook 'js-mode-hook 'mdw-fontify-javascript t)
   (add-hook 'csharp-mode-hook 'mdw-fontify-csharp t)
 
   (add-hook 'awk-mode-hook 'mdw-fontify-awk t)
@@ -652,6 +658,7 @@
 
 (progn
   (setq-default py-indent-offset 2
+		python-indent 2
 		py-python-command-args
 		`("-i" "-colors" ,(if mdw-black-background
 				      "Linux" "LightBG")))