X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=emacs-custom.el;h=b4b4465be3910daaf6ad98774fe77e42cf947c9d;hb=a3cc80e69cdad940bd67c706e40f7f749291496a;hp=01a5e6705824a687fcadded0434c643d911db38a;hpb=f81363fb8f1d2956fe94b381ba66e8514f1c08cc;p=emacs-init.git

diff --git a/emacs-custom.el b/emacs-custom.el
index 01a5e67..b4b4465 100644
--- a/emacs-custom.el
+++ b/emacs-custom.el
@@ -16,6 +16,8 @@
  '(column-number-mode t)
  '(comment-column 60)
  '(comment-fill-column 98)
+ '(company-idle-delay 600)
+ '(company-tooltip-idle-delay 10)
  '(compilation-ask-about-save nil)
  '(compilation-scroll-output t)
  '(csv-align-padding 0)
@@ -31,6 +33,7 @@
     (emacs-lisp-mode 99 lisp-interaction-mode w change-log-mode t texinfo-mode t c-mode 99 c++-mode 99 java-mode 99 jde-mode 99 html-mode 99 html-helper-mode 99 cperl-mode 99 perl-mode 99 mail-mode t message-mode t cmail-mail-mode t tcl-mode 99 ruby-mode 99)))
  '(diff-mode-hook (quote ((lambda nil (diff-auto-refine-mode 1)))))
  '(diff-switches "-u")
+ '(dtrt-indent-mode t nil (dtrt-indent))
  '(edit-server-done-hook nil)
  '(edit-server-new-frame nil)
  '(fill-column 98)
@@ -48,7 +51,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)
@@ -65,6 +67,7 @@
  '(ls-lisp-dirs-first t)
  '(magit-default-tracking-name-function (quote magit-default-tracking-name-branch-only))
  '(magit-display-buffer-function (quote magit-display-buffer-same-window-except-diff-v1))
+ '(magit-log-arguments (quote ("-n256" "--graph" "--decorate")))
  '(magit-process-popup-time 1)
  '(magit-server-window-for-rebase (quote pop-to-buffer))
  '(magit-status-buffer-switch-function (quote switch-to-buffer))
@@ -76,6 +79,16 @@
  '(rng-validate-chunk-size 2000)
  '(rng-validate-delay 3)
  '(rng-validate-quick-delay 1.5)
+ '(rtags-use-helm nil t)
+ '(safe-local-variable-values
+   (quote
+    ((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")
+     (ccide-uncrustify-config "~/src/search.uncrustify")
+     (whitespace-mode))))
  '(save-place t nil (saveplace))
  '(scroll-bar-mode nil)
  '(server-done-hook nil)
@@ -105,16 +118,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)