From: Mark Wooding <mdw@distorted.org.uk>
Date: Tue, 3 Mar 2009 00:45:15 +0000 (+0000)
Subject: Merge branch 'master' of metalzone:etc/profile
X-Git-Url: https://git.distorted.org.uk/~mdw/profile/commitdiff_plain/feff53b4914dbb8b4eca4d25e589933923c65622?hp=-c

Merge branch 'master' of metalzone:etc/profile

* 'master' of metalzone:etc/profile:
  dot-emacs: Fix LOOP indentation under SLIME.
  gitignore: Add `semantic.cache' and Global droppings.
  The great Gnus switchover!
  dot-emacs: Fixes to the messages mode.
  dot-emacs: Turn on gtags mode in general.
---

feff53b4914dbb8b4eca4d25e589933923c65622
diff --combined emacs
index 97277d1,e803bdc..73cb422
--- a/emacs
+++ b/emacs
@@@ -116,6 -116,18 +116,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")
@@@ -373,7 -385,6 +385,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)
@@@ -387,21 -398,6 +398,21 @@@
  (global-set-key [vertical-scroll-bar C-mouse-1]
  		#'(lambda () (interactive)))
  
 +(defun mdw-clobber-org-mode-map ()
 +  (dolist (key '([S-up] [S-down] [S-left] [S-right]
 +		 [?\e left] [?\e right]
 +		 [M-left] [M-right]))
 +    (define-key org-mode-map key nil))
 +  (define-key org-mode-map [?\C-c left] 'org-shiftleft)
 +  (define-key org-mode-map [?\C-c right] 'org-shiftright)
 +  (define-key org-mode-map [?\C-c up] 'org-shiftup)
 +  (define-key org-mode-map [?\C-c down] 'org-shiftdown)
 +  (define-key org-mode-map [C-left] 'org-metaleft)
 +  (define-key org-mode-map [C-right] 'org-metaright)
 +  (define-key org-mode-map [C-up] 'org-metaup)
 +  (define-key org-mode-map [C-down] 'org-metadown))
 +(add-hook 'org-mode-hook 'mdw-clobber-org-mode-map)
 +
  ;; --- Recognising types of files ---
  
  (setq auto-mode-alist
diff --combined gitignore
index 5461890,8602ee4..a769a54
--- a/gitignore
+++ b/gitignore
@@@ -5,21 -5,21 +5,29 @@@
  \#*
  .#*
  
+ semantic.cache
+ 
  ## STG clutter.
  .stgit-edit.txt
  *.ancestor
  *.patched
  
+ ## Global clutter.
+ GPATH
+ GRTAGS
+ GSYMS
+ GTAGS
+ 
  ## Build and release directories.
  build
  build-*
  dist-*
  deb-build
 +
 +## Semantic clutter and tags stuff
 +semantic.cache
 +TAGS
 +GPATH
 +GRTAGS
 +GSYMS
 +GTAGS