org mode, more window stuff

[emacs-init.git] / emacs-custom.el

diff --git a/emacs-custom.el b/emacs-custom.el
index e088a29..52ba306 100644 (file)
--- a/emacs-custom.el
+++ b/emacs-custom.el
@@ -60,6 +60,7 @@
  '(nxml-child-indent 4)
  '(nxml-where-global-mode nil)
  '(nxml-where-header nil)
+ '(org-startup-indented t)
  '(pop-up-windows nil)
  '(rng-validate-chunk-size 2000)
  '(rng-validate-delay 3)
@@ -89,6 +90,8 @@
   ;; Your init file should contain only one such instance.
   ;; If there is more than one, they won't work right.
  '(default ((t (:inherit nil :stipple nil :background "#ffffff" :foreground "black" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :height 97 :width semi-condensed :foundry "misc" :family "6x13"))))
+ '(ediff-even-diff-B ((t (:background "yellow"))))
+ '(ediff-odd-diff-A ((t (:background "yellow"))))
  '(font-lock-keyword-face ((((class color) (min-colors 8)) (:foreground "Purple"))))
  '(highlight-changes ((t (:background "alice blue"))))
  '(highlight-changes-delete ((t (:background "bisque1"))))