X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/955a327c5712eebdf99b9cf64733e90fed540088..5694bdf24c167150fc0cc475f230e20ad2c74fbb:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index ea038b8..6d873dd 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.
@@ -62,7 +63,7 @@
 
 (trap (or mdw-fast-startup (require 'tex-site)))
 
-(trap (or mdw-fast-startup (semantic-load-enable-excessive-code-helpers)))
+(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
@@ -237,9 +238,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)
@@ -275,6 +279,7 @@
 (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)
@@ -346,6 +351,9 @@
 
 ;; Cosmetic stuff.
 
+(setq calendar-view-diary-initially-flag t
+      calendar-view-holidays-initially-flag t)
+
 (setq display-time-24hr-format t)
 (display-time)
 (column-number-mode 1)
@@ -439,6 +447,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)
@@ -476,6 +485,18 @@
       (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.
 
 (setq auto-mode-alist
@@ -769,7 +790,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.