X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/ad21c20c3050216dc03e7ba59154abd1e8eb5545..2d6b9d95b0a120762a27ab4e4efb93cea5d2b36d:/emacs?ds=sidebyside

diff --git a/emacs b/emacs
index 6a457ba..ba6c442 100644
--- a/emacs
+++ b/emacs
@@ -40,6 +40,17 @@
 (maybe-autoload 'nc-timesheet-prepare "nc-timesheet" nil t nil)
 (maybe-autoload 'nc-timesheet-submit "nc-timesheet" nil t nil)
 
+(and (library-exists-p "debian-changelog-mode")
+     (add-to-list 'auto-mode-alist
+		  `(,(concat "/debian/"
+			       "\\("
+			         "[" "[:lower:][:digit:]]"
+				     "[[:lower:][:digit:].+-" "]+"
+				 "\\."
+			       "\\)?"
+			       "changelog\\'")
+		    . debian-changelog-mode)))
+
 (and (library-exists-p "vc-git")
      (not (memq 'GIT vc-handled-backends))
      (setq vc-handled-backends (cons 'GIT vc-handled-backends)))
@@ -49,6 +60,8 @@
 
 (trap (or mdw-fast-startup (require 'tex-site)))
 
+(trap (or mdw-fast-startup (semantic-load-enable-excessive-code-helpers)))
+
 ;; --- Skeleton stuff ---
 
 (trap (or mdw-fast-startup (require 'skel-init)))
@@ -105,6 +118,18 @@
 (setq rmail-display-summary t)
 (setq rmail-file-name "~/Mail/rmail")
 
+(setq sendmail-program "~/bin/sendmail-hack")
+
+(setq mail-user-agent 'message-user-agent)
+
+(and (fboundp 'turn-on-gnus-dired-mode)
+     (not mdw-fast-startup)
+     (add-hook 'dired-mode-hook 'turn-on-gnus-dired-mode))
+
+(or mdw-fast-startup
+    (trap (bbdb-initialize 'gnus 'sendmail 'vm 'message)))
+(setq bbdb-north-american-phone-numbers-p nil)
+
 ;; --- Customization ---
 
 (setq custom-file "~/.emacs-custom")
@@ -154,6 +179,7 @@
       iswitchb-default-method 'samewindow) ;in other random frames
 (setq dired-deletion-confirmer		;Make deletion easier in dired
       (symbol-function 'y-or-n-p))
+(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...)
@@ -263,6 +289,10 @@
 (setq appt-display-interval 3)
 (setq appt-message-warning-time 10)
 
+;; --- Org-mode agenda ---
+
+(setq org-agenda-include-diary t)
+
 ;; --- Cosmetic stuff ---
 
 (setq display-time-24hr-format t)
@@ -349,6 +379,7 @@
 (global-set-key [?\C-x ?w ?l] 'windmove-right)
 (global-set-key [?\C-x ?g ?l] 'org-store-link)
 (global-set-key [?\C-x ?g ?a] 'org-agenda)
+(global-set-key [?\C-x ?g ?b] 'org-iswitchb)
 (global-set-key [?\C-x ?t ?i] 'timeclock-in)
 (global-set-key [?\C-x ?t ?c] 'timeclock-change)
 (global-set-key [?\C-x ?t ?o] 'timeclock-out)
@@ -361,7 +392,6 @@
 (global-set-key [?\C-x ?/] 'auto-fill-mode)
 (global-set-key [?\C-x ?w ?d] 'mdw-divvy-window)
 (global-set-key [insertchar] 'overwrite-mode)
-(global-set-key [?\C-x ?m] 'vm-mail)
 (global-set-key [?\C-x ?\C-n] 'skel-create-file)
 (global-set-key [?\C-x ?4 ?n] 'skel-create-file-other-window)
 (global-set-key [?\C-x ?5 ?n] 'skel-create-file-other-frame)
@@ -374,6 +404,13 @@
 		'mouse-drag-vertical-line)
 (global-set-key [vertical-scroll-bar C-mouse-1]
 		#'(lambda () (interactive)))
+(and (not mdw-fast-startup) (fboundp 'hippie-expand)
+     (global-set-key [?\M-/] 'hippie-expand))
+
+(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)))
 
 ;; --- Recognising types of files ---
 
@@ -654,6 +691,7 @@
 ;; --- Notice passwords, and make C-a work right ---
 
 (add-hook 'shell-mode-hook #'mdw-sh-mode-setup)
+(add-hook 'shell-mode-hook #'ansi-color-for-comint-mode-on)
 (setq shell-font-lock-keywords nil)
 
 (add-hook 'term-mode-hook #'mdw-term-mode-setup)