* fix up emacs deleting vc windows and follow symlink confirmation

[home-base.git] / .emacs

diff --git a/.emacs b/.emacs
index e16f95b0573e66472e944f4d87f76b219a54f000..3710e9d1f433b450374c576d000efbdc5305c440 100644 (file)
--- a/.emacs
+++ b/.emacs
@@ -43,7 +43,9 @@
  '(sentence-end-double-space nil)
  '(show-paren-mode t)
  '(tool-bar-mode nil nil (tool-bar))
- '(user-mail-address "don@donarmstrong.com"))
+ '(user-mail-address "don@donarmstrong.com")
+ '(vc-delete-logbuf-window nil)
+ '(vc-follow-symlinks t))
 (fset 'perl-mode 'cperl-mode)
 ;;(load-file "cperl-mode.el")
 (add-to-list 'load-path '"~/lib/emacs_el/")
@@ -161,6 +163,8 @@
 (font-latex-match-reference-make)
 (add-to-list 'font-latex-match-function-keywords "DLA")
 (add-to-list 'font-latex-match-function-keywords "RZ")
+(add-to-list 'font-latex-match-function-keywords "OM")
+(add-to-list 'font-latex-match-function-keywords "DL")
 (add-to-list 'font-latex-match-function-keywords "fixme")
 (add-to-list 'font-latex-match-function-keywords "acs")
 (add-to-list 'font-latex-match-function-keywords "acsp")
@@ -282,9 +286,9 @@
 
 ;;; outlining support for ess modes
 (add-hook 'ess-mode-hook
-            '(lambda ()
-               (outline-minor-mode)
-               (setq outline-regexp "\\(^#\\{4,5\\} \\)\\|\\(^[a-zA-Z0-9_\.]+ ?<- ?function(.*{\\)")
-               (defun outline-level
-                 (lambda () (interactive) (cond ((looking-at "^##### ") 1)((looking-at "^#### ") 2)((looking-at "^[a-zA-Z0-9_\.]+ ?<- ?function(.*{") 3) (t 1000)))
+         '(lambda ()
+            (outline-minor-mode)
+            (setq outline-regexp "\\(^#\\{4,5\\} \\)\\|\\(^[a-zA-Z0-9_\.]+ ?<- ?function(.*{\\)")
+            (defun outline-level
+              (lambda () (interactive) (cond ((looking-at "^##### ") 1)((looking-at "^#### ") 2)((looking-at "^[a-zA-Z0-9_\.]+ ?<- ?function(.*{") 3) (t 1000)))
                )))
\ No newline at end of file