X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/ac667d0466f3c297b09b51ce1b7f168ffbe1c774..85e430d4108f3b0505f3fb9f4dedb90627087b1d:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index d9b1035..d4df5fb 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -127,10 +127,11 @@
 
 ;; ---- Some mail and news configuration ---
 
-(setq mail-from-style 'parens)
-(setq mail-signature t)
-(setq mail-yank-prefix "> ")
-(setq mail-archive-file-name "~/Mail/sent")
+(setq mail-from-style 'angles
+      mail-signature t
+      mail-yank-prefix "> "
+      mail-archive-file-name "~/Mail/sent"
+      compose-mail-user-agent-warnings nil)
 
 (setq rmail-display-summary t)
 (setq rmail-file-name "~/Mail/rmail")
@@ -358,10 +359,7 @@
 (setq display-time-24hr-format t)
 (display-time)
 (column-number-mode 1)
-(trap
-  (if window-system
-      (let ((view-diary-entries-initially t))
-	(calendar))))
+(trap (if window-system (calendar)))
 
 ;;;--------------------------------------------------------------------------
 ;;; MailCrypt.
@@ -482,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
 
@@ -558,7 +556,7 @@
 	'(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
 	  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
@@ -645,6 +643,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)
@@ -654,6 +653,7 @@
 
 (progn
   (setq-default py-indent-offset 2
+		python-indent 2
 		py-python-command-args
 		`("-i" "-colors" ,(if mdw-black-background
 				      "Linux" "LightBG")))