magit config updates

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

diff --git a/emacs-custom.el b/emacs-custom.el
index efd6e27..52ba306 100644 (file)
--- a/emacs-custom.el
+++ b/emacs-custom.el
@@ -13,8 +13,9 @@
  '(c-offsets-alist (quote ((arglist-intro . +))))
  '(column-number-mode t)
  '(comment-column 60)
- '(comment-fill-column 160)
+ '(comment-fill-column 98)
  '(compilation-ask-about-save nil)
+ '(compilation-scroll-output t)
  '(csv-align-padding 0)
  '(csv-comment-start-default "#")
  '(csv-field-quotes nil)
@@ -29,9 +30,11 @@
  '(edit-server-done-hook nil)
  '(edit-server-new-frame nil)
  '(fill-column 98)
+ '(flymake-allowed-file-name-masks (quote (("\\.java\\'" flymake-simple-make-java-init flymake-simple-java-cleanup) ("[0-9]+\\.tex\\'" flymake-master-tex-init flymake-master-cleanup) ("\\.tex\\'" flymake-simple-tex-init))))
  '(flyspell-delay 30)
  '(flyspell-delayed-commands nil)
  '(frame-background-mode (quote light))
+ '(git-commit-fill-column 158)
  '(global-auto-revert-mode nil)
  '(global-highlight-changes-mode nil)
  '(global-subword-mode t)
@@ -50,12 +53,14 @@
  '(ispell-program-name "c:/cygwin/bin/aspell.exe")
  '(line-move-visual nil)
  '(ls-lisp-dirs-first t)
+ '(magit-default-tracking-name-function (quote magit-default-tracking-name-branch-only))
  '(magit-process-popup-time 1)
  '(magit-server-window-for-rebase (quote pop-to-buffer))
  '(magit-status-buffer-switch-function (quote switch-to-buffer))
  '(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)
@@ -76,7 +81,8 @@
  '(which-func-modes (quote (nxml-mode emacs-lisp-mode c-mode c++-mode perl-mode cperl-mode python-mode makefile-mode sh-mode fortran-mode f90-mode ada-mode diff-mode)))
  '(which-function-mode nil)
  '(whitespace-action (quote (auto-cleanup warn-if-read-only)))
- '(whitespace-style (quote (face trailing space-before-tab newline indentation empty space-after-tab)))
+ '(whitespace-line-column 100)
+ '(whitespace-style (quote (face trailing space-before-tab newline indentation empty space-after-tab lines-tail)))
  '(x-select-enable-clipboard t))
 (custom-set-faces
   ;; custom-set-faces was added by Custom.
@@ -84,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"))))
@@ -91,5 +99,6 @@
  '(textile-acronym-face ((t (:foreground "medium blue"))))
  '(textile-blockquote-face ((t (:foreground "midnight blue"))))
  '(textile-code-face ((t (:foreground "firebrick4"))))
- '(textile-pre-face ((t (:foreground "dark green")))))
+ '(textile-pre-face ((t (:foreground "dark green"))))
+ '(whitespace-line ((t (:background "yellow")))))
 (put 'narrow-to-region 'disabled nil)