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

diff --git a/dot/emacs b/dot/emacs
index bf82887..c0f4022 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -46,8 +46,8 @@
      (add-to-list 'auto-mode-alist
 		  `(,(concat "/debian/"
 			       "\\("
-				 "[" "[:lower:][:digit:]]"
-				     "[[:lower:][:digit:].+-" "]+"
+				 "[" "[:lower:]" "[:digit:]" "]"
+				 "[" "[:lower:]" "[:digit:]" ".+-" "]+"
 				 "\\."
 			       "\\)?"
 			       "changelog\\'")
@@ -59,6 +59,11 @@
      (not (memq 'git vc-handled-backends))
      (setq vc-handled-backends (cons 'GIT vc-handled-backends)))
 
+(setq magit-log-cutoff-length 512)
+(defun mdw-magit-try-load-config-extensions ()
+  (trap (magit-load-config-extensions)))
+(add-hook 'magit-mode-hook 'mdw-magit-try-load-config-extensions)
+
 (trap (or mdw-fast-startup (require 'p4)))
 
 (trap (or mdw-fast-startup (require 'tex-site)))
@@ -81,6 +86,13 @@
 (trap (show-paren-mode t))
 (or window-system (menu-bar-mode -1))
 
+;; Multiple cursors.
+
+(setq load-path (nconc load-path (list "~/lib/emacs/multiple-cursors/")))
+(global-set-key [?\C-c ?r] 'mdw-multiple-cursors-keymap)
+(autoload 'mdw-multiple-cursors-keymap "mdw-multiple-cursors.el"
+  "A keymap for Magnar Sveen's awesome multiple-cursors." nil 'keymap)
+
 ;; Temporary directory handling.
 
 (defun mdw-check-dir-exists (dir)
@@ -136,7 +148,10 @@
 (setq rmail-display-summary t)
 (setq rmail-file-name "~/Mail/rmail")
 
-(setq sendmail-program "~/bin/sendmail-hack")
+(setq sendmail-program "~/bin/sendmail-hack"
+      send-mail-function 'sendmail-send-it
+      mail-interactive t
+      sendmail-error-reporting-interactive '("-odb" "-oee"))
 
 (setq mail-user-agent 'message-user-agent
       read-mail-command 'gnus)
@@ -144,6 +159,9 @@
       message-yank-prefix "> "
       message-yank-cited-prefix "> "
       message-send-mail-function 'message-send-mail-with-sendmail
+      message-interactive t
+      message-sendmail-extra-arguments '("-odb" "-oee")
+      message-sendmail-envelope-from 'header
       message-indent-citation-function '(message-indent-citation
 					 mdw-trim-spaces-after-citing))
 
@@ -209,7 +227,7 @@
 (setq dabbrev-case-replace nil)		;Retain case when completing
 (setq linum-format "%7d ")
 (setq next-line-add-newlines nil)	;Don't add weird newlines
-(setq split-height-threshold 45)	;Reuse windows where sensible
+(setq split-height-threshold nil)	;Reuse windows where sensible
 (setq display-buffer-reuse-frames nil	;Don't confuse me by showing buffers
       iswitchb-default-method 'samewindow) ;in other random frames
 (setq dired-deletion-confirmer		;Make deletion easier in dired
@@ -221,10 +239,11 @@
 (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))
+      '(trailing space-before-tab space-after-tab empty indentation face))
 (setq woman-use-own-frame nil		;Keep man pages somewhere sensible
       woman-fill-column 72)		;Right margin position.
 (setq diff-switches "-u"		;I like reading unified diffs
@@ -267,6 +286,10 @@
      (define-key outline-mode-prefix-map [?\C-r] 'reveal-mode)
      (define-key outline-mode-prefix-map [?\C--] 'mdw-outline-collapse-all)))
 
+(setq imenu-auto-rescan t
+      imenu-auto-rescan-maxout (* 128 1024)
+      imenu-max-items 60)
+
 (setq cltl2-root-url (mdw-config 'cltl-url))
 (setq common-lisp-hyperspec-root (mdw-config 'hyperspec-url))
 
@@ -284,7 +307,8 @@
       browse-url-generic-program "mdw-chrome"
       browse-url-mozilla-program "firefox")
 
-(setq w3m-default-display-inline-images t)
+(setq w3m-default-display-inline-images t
+      w3m-use-cookies t)
 
 (eval-after-load "w3m"
   '(let ((entries '(("application/pdf" "\\.pdf\\'" ("evince" file) nil)
@@ -398,7 +422,7 @@
 
 (setq default-frame-alist
       (mdw-uniquify-alist
-       '((width . 78)
+       `((width . ,(if (>= emacs-major-version 21) 77 78))
 	 (height . 33)
 	 (vertical-scroll-bars . right)
 	 (cursor-type . bar)
@@ -406,10 +430,8 @@
 	 (left-fringe . 5)
 	 (right-fringe . 5)
 	 (scroll-bar-width . 15)
-	 (cursor-color . "red"))
-       (if mdw-black-background
-	   '((background-mode . dark))
-	 '((background-mode . light)))))
+	 (cursor-color . "red")
+	 (background-mode . ,(if mdw-black-background 'dark 'light)))))
 (setq window-system-default-frame-alist
       '((pm (font . "-os2-System VIO-medium-r-normal--*-40-*-*-m-*-cp850")
 	    (menu-font . "8.Helv")
@@ -463,6 +485,7 @@
 		  'mouse-drag-vertical-line)
   (global-set-key [vertical-scroll-bar C-mouse-1]
 		  #'(lambda () (interactive)))
+  (global-set-key [M-S-mouse-3] 'imenu)
   (global-set-key [XF86WakeUp] "")
   (and (not mdw-fast-startup) (fboundp 'hippie-expand)
        (global-set-key [?\M-/] 'hippie-expand)))
@@ -472,6 +495,7 @@
      (or (lookup-key dired-mode-map  [?\C-x ?\C-q])
 	 (define-key dired-mode-map [?\C-x ?\C-q]
 	   'wdired-change-to-wdired-mode))
+     (trap (require 'dired-x))
      (and (fboundp 'dired-do-relsymlink)
 	  (define-key dired-mode-map [?\C-c ?\C-s] 'dired-do-relsymlink))))
 
@@ -480,9 +504,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 ?o ?r] 'org-remember))))
 
 ;; Minor mode listing
 
@@ -505,9 +529,12 @@
 		("\\.cs$" . csharp-mode)
 		("\\.go$" . go-mode)
 		("\\.org$" . org-mode)
+		("\\.make$" . makefile-mode)
+		("\\.mk?d$" . markdown-mode)
 		;; ("/[ch]/" . c-mode)
 		(,(concat "/\\("
 			  "\\.stgit\\.msg" "\\|"
+			  "\\.topmsg" "\\|"
 			  "\\.git/COMMIT_EDITMSG" "\\|"
 			  "svn-commit\\.tmp" "\\|"
 			  "svk-commit[^/.]*\\.tmp"
@@ -535,7 +562,14 @@
 	      auto-mode-alist))
 
 (setq interpreter-mode-alist
-      (append `(("runlisp" . lisp-mode))
+      (append `(("runlisp" . lisp-mode)
+		("@BASH@" . sh-mode)
+		("@PYTHON@" . python-mode)
+		("@PERL@" . perl-mode)
+		("@TCLSH@" . tcl-mode)
+		("@WISH@" . tcl-mode)
+		("/tclsh" . tcl-mode)
+		("/wish" . tcl-mode))
 	      interpreter-mode-alist))
 
 (setq completion-ignored-extensions
@@ -552,19 +586,21 @@
 
 (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 dylan-mode-hook
+	python-mode-hook pyrec-mode-hook icon-mode-hook awk-mode-hook
+	tcl-mode-hook go-mode-hook js-mode-hook javascript-mode-hook
+	conf-mode-hook m4-mode-hook autoconf-mode-hook autotest-mode-hook
+	a68-mode-hook a68-mode-hooks asm-mode-hook fsharp-mode-hook
+	scala-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,7 +679,11 @@
   (add-hook 'apcalc-mode-hook 'mdw-fontify-apcalc t)
 
   (add-hook 'java-mode-hook 'mdw-fontify-java t)
+  (add-hook 'scala-mode-hook 'mdw-fontify-scala t)
+  (add-hook 'js-mode-hook 'mdw-fontify-javascript t)
   (add-hook 'csharp-mode-hook 'mdw-fontify-csharp t)
+  (add-hook 'fsharp-mode-hook 'mdw-fontify-fsharp t)
+  (add-hook 'inferior-fsharp-mode-hooks 'mdw-fontify-inferior-fsharp t)
 
   (add-hook 'awk-mode-hook 'mdw-fontify-awk t)
 
@@ -652,6 +692,7 @@
 
 (progn
   (setq-default py-indent-offset 2
+		python-indent 2
 		py-python-command-args
 		`("-i" "-colors" ,(if mdw-black-background
 				      "Linux" "LightBG")))
@@ -686,11 +727,16 @@
 
 (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)
 (add-hook 'smalltalk-mode-hook 'mdw-setup-smalltalk t)
 
+(add-hook 'a68-mode-hook 'mdw-fontify-algol-68 t)
+(add-hook 'a68-mode-hooks 'mdw-fontify-algol-68 t)
+(add-hook 'dylan-mode-hook 'mdw-fontify-dylan t)
+
 (progn
   (add-hook 'emacs-lisp-mode-hook 'mdw-fontify-lispy t)
   (add-hook 'scheme-mode-hook 'mdw-fontify-lispy t)
@@ -731,6 +777,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 +795,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?"))))