X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=emacs-custom.el;h=b1147e1f59096caf3c2da5474baba7c781ceea32;hb=a13a166794e1e6f22407e13110fe83b9cb095ab8;hp=f69a122db4354db454663d6d5c285cddfaeae984;hpb=4212d6282f64bc9205daced456275854451c33c4;p=emacs-init.git

diff --git a/emacs-custom.el b/emacs-custom.el
index f69a122..b1147e1 100644
--- a/emacs-custom.el
+++ b/emacs-custom.el
@@ -34,14 +34,10 @@
  '(diff-mode-hook (quote ((lambda nil (diff-auto-refine-mode 1)))))
  '(diff-switches "-u")
  '(dtrt-indent-mode t nil (dtrt-indent))
+ '(ediff-window-setup-function (quote ediff-setup-windows-plain))
  '(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))
@@ -51,7 +47,6 @@
  '(global-subword-mode t)
  '(global-visual-line-mode nil)
  '(global-whitespace-mode t)
- '(highlight-changes-colors nil)
  '(highlight-changes-face-list nil)
  '(highlight-changes-global-changes-existing-buffers t)
  '(hippie-expand-dabbrev-as-symbol nil)
@@ -61,9 +56,9 @@
  '(hs-isearch-open nil)
  '(ido-mode (quote both) nil (ido))
  '(indent-tabs-mode nil)
- '(ispell-dictionary "deutsch8")
+ '(ispell-dictionary "american")
  '(ispell-extra-args (quote ("--sug-mode=ultra")))
- '(ispell-program-name "c:/cygwin/bin/aspell.exe")
+ '(ispell-program-name "aspell")
  '(line-move-visual nil)
  '(ls-lisp-dirs-first t)
  '(magit-default-tracking-name-function (quote magit-default-tracking-name-branch-only))
@@ -83,7 +78,9 @@
  '(rtags-use-helm nil t)
  '(safe-local-variable-values
    (quote
-    ((elisp-project-autoload-file-name . "cc-autoload.el")
+    ((ispell-local-dictionary . de_DE-neu)
+     (elisp-project-autoload-file-name . "sqi-autoload.el")
+     (elisp-project-autoload-file-name . "cc-autoload.el")
      (ccide-auto-format-tag . "auto-uncrustify")
      (ccide-uncrustify-config . "~/src/search.uncrustify")
      (ccide-auto-format-tag "auto-uncrustify")
@@ -118,16 +115,8 @@
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; 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"))))
- '(mode-line ((t (:background "gray" :foreground "black"))))
  '(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"))))
- '(whitespace-line ((t (:background "yellow")))))
+ '(textile-pre-face ((t (:foreground "dark green")))))
 (put 'narrow-to-region 'disabled nil)