Merge branch 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile

* 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile:
  dot-emacs: Fix LOOP indentation under SLIME.
  gitignore: Add `semantic.cache' and Global droppings.

diff --git a/dot-emacs.el b/dot-emacs.el
index 9c9a2cb42910dc8531c424450217a35553da8ca0..01bed922c77e89abb7edd4ec31fa279cc271fa17 100644 (file)
--- a/dot-emacs.el
+++ b/dot-emacs.el
@@ -2052,6 +2052,10 @@ (defun mdw-common-lisp-indent ()
   (make-variable-buffer-local 'lisp-indent-function)
   (setq lisp-indent-function 'common-lisp-indent-function))
 
+(setq lisp-simple-loop-indentation 1
+      lisp-loop-keyword-indentation 6
+      lisp-loop-forms-indentation 6)
+
 (defun mdw-fontify-lispy ()
 
   ;; --- Set fill prefix ---

diff --git a/gitignore b/gitignore
index d17316dd713546b68f24290c773217107e09722e..8602ee40c99856bd2d8d74dfa8dac2854d47cc8f 100644 (file)
--- a/gitignore
+++ b/gitignore
@@ -5,11 +5,19 @@
 \#*
 .#*
 
+semantic.cache
+
 ## STG clutter.
 .stgit-edit.txt
 *.ancestor
 *.patched
 
+## Global clutter.
+GPATH
+GRTAGS
+GSYMS
+GTAGS
+
 ## Build and release directories.
 build
 build-*