X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/c17fdbffdfcc3dcf06224b85897b7dd84b93bb72..4458f45af648d888a88bc2b26948edcb8de80603:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index bf82887..657f7e5 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -221,7 +221,8 @@
 (setq scroll-step 5)			;Don't scroll too much at a time
 (setq-default fill-column 77)		;I use rather narrow windows
 (setq-default comment-column 40)	;Set a standard comment column
-(setq-default truncate-partial-width-windows nil)
+(setq-default truncate-partial-width-windows nil
+	      truncate-lines t)
 (setq default-indicate-empty-lines t)
 (setq whitespace-style
       '(trailing space-before-tab space-after-tab empty indentation))
@@ -480,9 +481,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 +509,7 @@
 		;; ("/[ch]/" . c-mode)
 		(,(concat "/\\("
 			  "\\.stgit\\.msg" "\\|"
+			  "\\.topmsg" "\\|"
 			  "\\.git/COMMIT_EDITMSG" "\\|"
 			  "svn-commit\\.tmp" "\\|"
 			  "svk-commit[^/.]*\\.tmp"
@@ -535,7 +537,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
@@ -552,19 +558,20 @@
 
 (make-variable-buffer-local 'mdw-auto-indent)
 
-(mapcar (lambda (hook) (add-hook hook 'mdw-misc-mode-config))
-	'(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
-	  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
-	  inferior-lisp-mode-hook slime-repl-mode-hook
-	  sml-mode-hook haskell-mode-hook erlang-mode-hook
-	  smalltalk-mode-hook rexx-mode-hook
-	  arm-assembler-mode-hook))
+(mapc (lambda (hook) (add-hook hook 'mdw-misc-mode-config))
+      '(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 js-mode-hook conf-mode-hook
+	m4-mode-hook autoconf-mode-hook autotest-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 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
+	arm-assembler-mode-hook))
 
 (global-font-lock-mode t)
 (defalias 'perl-mode 'cperl-mode)
@@ -643,6 +650,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 +660,7 @@
 
 (progn
   (setq-default py-indent-offset 2
+		python-indent 2
 		py-python-command-args
 		`("-i" "-colors" ,(if mdw-black-background
 				      "Linux" "LightBG")))
@@ -686,6 +695,7 @@
 
 (add-hook 'sh-mode-hook #'mdw-setup-sh-script-mode)
 (add-hook 'autoconf-mode-hook #'mdw-setup-m4)
+(add-hook 'autotest-mode-hook #'mdw-setup-m4)
 (add-hook 'm4-mode-hook #'mdw-setup-m4)
 
 (add-hook 'smalltalk-mode-hook 'mdw-fontify-smalltalk t)
@@ -731,6 +741,12 @@
 	("^pdf$" "." "evince %o")
 	("^html?$" "." "netscape %o")))
 
+(setq TeX-view-program-selection
+      '(((output-dvi style-pstricks) "dvips and gv")
+	(output-dvi "xdvi")
+	(output-pdf "Evince")
+	(output-html "xdg-open")))
+
 (setq TeX-open-quote "\""
       TeX-close-quote "\"")
 
@@ -743,7 +759,7 @@
 	("definition" ?D "def:" "~\\ref{%s}" t ("definitions?" "def\\.") -2)
 	("proposition" ?P "prop:" "~\\ref{%s}" t
 	 ("propositions?" "prop\\.") -2)
-	("lemma" ?P "lem:" "~\\ref{%s}" t ("lemmas?" "lem\\.") -2)
+	("lemma" ?L "lem:" "~\\ref{%s}" t ("lemmas?" "lem\\.") -2)
 	("example" ?X "eg:" "~\\ref{%s}" t ("examples?") -2)
 	("exercise" ?E "ex:" "~\\ref{%s}" t ("exercises?" "ex\\.") -2)
 	("enumerate" ?i "i:" "~\\ref{%s}" item ("items?"))))