X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/cb1389c00e0b2589bd02bf6a4f4900f810e13f32..0f2aab7bf3c99841ef3090480a0cbde310782a30:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index ef0feac..1a69858 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -23,6 +23,7 @@
 
 (setq load-path (nconc load-path (list "~/lib/emacs")))
 (require 'dot-emacs)
+(require 'cl)
 
 ;;;--------------------------------------------------------------------------
 ;;; Some random initialisation.
@@ -58,12 +59,19 @@
      (not (memq 'git vc-handled-backends))
      (setq vc-handled-backends (cons 'GIT vc-handled-backends)))
 
+(setq magit-log-cutoff-length 512)
+
 (trap (or mdw-fast-startup (require 'p4)))
 
 (trap (or mdw-fast-startup (require 'tex-site)))
 
-(trap (or mdw-fast-startup (semantic-load-enable-minimum-features)))
+(trap (or mdw-fast-startup t (semantic-load-enable-code-helpers)))
 (setq semanticdb-default-save-directory "~/.emacs.d/semanticdb/")
+(eval-after-load "senator"
+  '(setq isearch-mode-hook
+	 (remq 'senator-isearch-mode-hook isearch-mode-hook)
+	 isearch-mode-end-hook
+	 (remq 'senator-isearch-mode-hook isearch-mode-end-hook)))
 
 ;; Skeleton stuff.
 
@@ -89,8 +97,15 @@
 
 (and (or window-system (>= emacs-major-version 23))
      (progn (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$")
+		  edit-server-new-frame nil
 		  gnuserv-frame t)
-	    (trap (server-start))))
+	    (trap (server-start))
+	    (trap (progn
+		    (require 'edit-server)
+		    (edit-server-start)
+		    (let ((edit (get-process "edit-server")))
+		      (and edit
+			   (set-process-query-on-exit-flag edit nil)))))))
 
 ;; Control backup behaviour.
 
@@ -114,10 +129,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")
@@ -129,6 +145,8 @@
 (setq message-signature-separator "^-- \\(\\|\\[mdw\\]\\)$"
       message-yank-prefix "> "
       message-yank-cited-prefix "> "
+      message-send-mail-function 'message-send-mail-with-sendmail
+      message-sendmail-envelope-from 'header
       message-indent-citation-function '(message-indent-citation
 					 mdw-trim-spaces-after-citing))
 
@@ -198,18 +216,19 @@
 (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
-      (symbol-function 'y-or-n-p))
+      (symbol-function 'y-or-n-p)
+      dired-listing-switches "-alF"	;Do `ls -F' things in dired windows
+      wdired-allow-to-change-permissions 'advanced)
 (setq read-quoted-char-radix 16)	;C-q HEX-STUFF [RET]
-(setq dired-listing-switches "-alF")	;Do `ls -F' things in dired windows
-(setq wdired-allow-to-change-permissions t)
 (setq case-fold-file-names nil)		;Don't translate file names (grr...)
 (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
@@ -225,9 +244,12 @@
 (setq password-cache-expiry nil)
 (setq-default proced-filter 'all
 	      proced-sort 'user)
-(setq ispell-program-name "aspell"
+(setq ispell-program-name "aspell-hack"
       ispell-local-dictionary "en_GB-ize-w_accents"
       flyspell-default-dictionary "en_GB-ize-w_accents"
+      ispell-local-dictionary-alist
+      '(("en_GB-ize-w_accents" "[[:alpha:]]" "[^[:alpha:]]" "'" t
+	 ("-d" "en_GB-ize-w_accents") nil utf-8))
       ispell-silently-savep t)
 (trap
   (require 'uniquify)
@@ -249,6 +271,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))
 
@@ -263,10 +289,19 @@
 (setq url-cookie-untrusted-urls '("."))
 
 (setq browse-url-browser-function (mdw-good-url-browser)
+      browse-url-generic-program "mdw-chrome"
       browse-url-mozilla-program "firefox")
 
 (setq w3m-default-display-inline-images t)
 
+(eval-after-load "w3m"
+  '(let ((entries '(("application/pdf" "\\.pdf\\'" ("evince" file) nil)
+		    ("application/x-pdf" "\\.pdf\\'" ("evince" file) nil))))
+     (dolist (e entries)
+       (setq w3m-content-type-alist
+	     (cons e (remove* (car e) w3m-content-type-alist
+			      :key #'car :test #'string=))))))
+
 (setq w3-do-incremental-display t
       w3-use-menus '(file edit view go bookmark options
 		     buffers style search emacs nil help)
@@ -326,12 +361,13 @@
 
 ;; Cosmetic stuff.
 
+(setq calendar-view-diary-initially-flag t
+      calendar-view-holidays-initially-flag t)
+
 (setq display-time-24hr-format t)
 (display-time)
-(trap
-  (if window-system
-      (let ((view-diary-entries-initially t))
-	(calendar))))
+(column-number-mode 1)
+(trap (if window-system (calendar)))
 
 ;;;--------------------------------------------------------------------------
 ;;; MailCrypt.
@@ -381,12 +417,12 @@
 	 (cursor-color . "red"))
        (if mdw-black-background
 	   '((background-mode . dark))
-	 '((background-mode . light)))
-       (and (eq window-system 'pm)
-	    '((font . "-os2-System VIO-medium-r-normal--*-40-*-*-m-*-cp850")
-	      (menu-font . "8.Helv")
-	      (background-color . "lightgrey")))
-       default-frame-alist))
+	 '((background-mode . light)))))
+(setq window-system-default-frame-alist
+      '((pm (font . "-os2-System VIO-medium-r-normal--*-40-*-*-m-*-cp850")
+	    (menu-font . "8.Helv")
+	    (background-color . "lightgrey"))
+	(nil (menu-bar-lines . 0))))
 
 ;; Other frame fiddling.
 
@@ -418,6 +454,7 @@
   (global-set-key [?\C-x ?t ?s] 'timeclock-status-string)
   (global-set-key [?\C-x ?t ?p] 'nc-timesheet-prepare)
   (global-set-key [?\C-x ?t ?\C-m] 'nc-timesheet-submit)
+  (global-set-key [?\C-x ?3] 'mdw-split-window-horizontally)
   (global-set-key [?\M-#] 'calc-dispatch)
   (global-set-key [?\C-x ?/] 'auto-fill-mode)
   (global-set-key [?\C-x ?w ?d] 'mdw-divvy-window)
@@ -434,23 +471,39 @@
 		  '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)))
 
 (eval-after-load "dired"
   '(progn
-     (define-key dired-mode-map [?\C-x ?\C-q]
-       'wdired-change-to-wdired-mode)))
+     (or (lookup-key dired-mode-map  [?\C-x ?\C-q])
+	 (define-key dired-mode-map [?\C-x ?\C-q]
+	   'wdired-change-to-wdired-mode))
+     (and (fboundp 'dired-do-relsymlink)
+	  (define-key dired-mode-map [?\C-c ?\C-s] 'dired-do-relsymlink))))
 
 (add-hook 'org-mode-hook
 	  #'(lambda () (mdw-clobber-evil-keymap org-mode-map)))
 (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
+
+(setq minor-mode-alist
+      (mdw-uniquify-alist '((reveal-mode (hs-minor-mode
+					  " hs/r"
+					  (global-reveal-mode
+					   "" " Reveal")))
+			    (hs-minor-mode (reveal-mode "" " hs"))
+			    (abbrev-mode "")
+			    (gtags-mode ""))
+			  minor-mode-alist))
 
 ;; Recognising types of files.
 
@@ -464,6 +517,7 @@
 		;; ("/[ch]/" . c-mode)
 		(,(concat "/\\("
 			  "\\.stgit\\.msg" "\\|"
+			  "\\.topmsg" "\\|"
 			  "\\.git/COMMIT_EDITMSG" "\\|"
 			  "svn-commit\\.tmp" "\\|"
 			  "svk-commit[^/.]*\\.tmp"
@@ -491,29 +545,42 @@
 	      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))
 	      interpreter-mode-alist))
 
 (setq completion-ignored-extensions
       (append `(".hc" ".hi") completion-ignored-extensions))
+(dolist (dir (remove-if-not (lambda (ext)
+			      (= (aref ext (- (length ext) 1)) ?/))
+			    completion-ignored-extensions))
+  (if (/= (aref dir 0) ?/)
+      (setq completion-ignored-extensions
+	    (cons (concat "/" dir)
+		  (remove dir completion-ignored-extensions)))))
 
 ;; Some common local definitions.
 
 (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)
@@ -547,11 +614,21 @@
 	       (tramp-remote-sh "/bin/sh"))
 	      ,@tramp-methods)))
      (setq tramp-default-method "ssh")
-     (setq tramp-default-method-alist
-	   `(("\\`\\(localhost\\|\\)\\'" ""
-	      ,(cond ((executable-find "become") "become")
-		     ((executable-find "really") "really")
-		     (t "su")))))))
+     (let ((rootlyness (cond ((executable-find "really") "really")
+			     ((executable-find "become") "become")
+			     ((executable-find "sudo") "sudo")
+			     (t "su")))
+	   (this-host (concat "\\`\\(localhost\\|"
+			      (system-name) "\\|\\)\\'"))
+	   (this-user (concat "\\`\\(" (user-login-name) "\\|"
+			      (user-real-login-name) "\\|\\)\\'")))
+       (setq tramp-default-method-alist
+	     `((,this-host nil ,rootlyness)
+	       (nil ,this-user "ssh")
+	       (nil "." ,rootlyness)))
+       (setq tramp-default-proxies-alist
+	     `((,this-host nil nil)
+	       (nil "." "/ssh:%h:"))))))
 
 ;;;--------------------------------------------------------------------------
 ;;; General fontification.
@@ -582,6 +659,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)
@@ -591,6 +669,7 @@
 
 (progn
   (setq-default py-indent-offset 2
+		python-indent 2
 		py-python-command-args
 		`("-i" "-colors" ,(if mdw-black-background
 				      "Linux" "LightBG")))
@@ -625,6 +704,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)
@@ -670,6 +750,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 "\"")
 
@@ -682,7 +768,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?"))))
@@ -738,7 +824,9 @@
 (setq shell-prompt-pattern "^[^]#$%>»}\n]*\\([]#$%»}]\\|>>?\\) *")
 (setq comint-password-prompt-regexp
       (concat "\\(\\([Ee]nter \\|[Oo]ld \\|[Nn]ew \\|[a-zA-Z0-9_]*'s \\|^\\)"
-	      "[Pp]assword\\|pass phrase\\):"))
+	      "[Pp]assword\\|[Pp]ass ?phrase\\(\\| [-a-zA-Z0-9._]+\\)\\):")
+      comint-file-name-chars "~/A-Za-z0-9+@:_.$#%,={}-"
+      shell-file-name-chars comint-file-name-chars)
 
 ;; Notice passwords, and make C-a work right.