X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=emacs-custom.el;h=8e8e46559b140661196089900c63e33ce6393bb1;hb=adc1b50372f1512e8cd1488439327050947676ef;hp=9044c9c14a9532878781bb3bcd001b4fe04f7e40;hpb=fb90d49978d6f813ec82d1764dca038a116d2afc;p=emacs-init.git diff --git a/emacs-custom.el b/emacs-custom.el index 9044c9c..8e8e465 100644 --- a/emacs-custom.el +++ b/emacs-custom.el @@ -6,14 +6,18 @@ '(auto-install-install-confirm nil) '(auto-install-replace-confirm nil) '(auto-install-save-confirm nil) - '(auto-save-file-name-transforms (quote (("\\`.*\\([^/]*\\)\\'" "~/.emacs.d/autosave/\\1" t)))) + '(auto-save-file-name-transforms + (quote + (("\\`.*\\([^/]*\\)\\'" "~/.emacs.d/autosave/\\1" t)))) '(backup-directory-alist (quote (("." . "~/.emacs.d/backups")))) '(c-backslash-column 99) '(c-basic-offset 4) + '(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) @@ -22,21 +26,36 @@ '(dabbrev-abbrev-char-regexp "\\sw") '(debug-on-error nil) '(default-input-method "latin-1-prefix") + '(develock-max-column-plist + (quote + (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) + '(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 99) '(global-auto-revert-mode nil) - '(global-highlight-changes-mode t) + '(global-highlight-changes-mode nil) '(global-subword-mode t) '(global-visual-line-mode nil) - '(global-whitespace-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) - '(hippie-expand-try-functions-list (quote (try-complete-file-name-partially try-complete-file-name try-expand-dabbrev try-expand-dabbrev-all-buffers try-expand-dabbrev-from-kill try-expand-all-abbrevs try-expand-line try-expand-list))) + '(hippie-expand-try-functions-list + (quote + (try-complete-file-name-partially try-complete-file-name try-expand-dabbrev try-expand-dabbrev-all-buffers try-expand-dabbrev-from-kill try-expand-all-abbrevs try-expand-line try-expand-list))) '(hs-isearch-open nil) '(ido-mode (quote both) nil (ido)) '(indent-tabs-mode nil) @@ -45,36 +64,67 @@ '(ispell-program-name "c:/cygwin/bin/aspell.exe") '(line-move-visual nil) '(ls-lisp-dirs-first t) - '(nxml-child-indent 4) + '(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-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 2) '(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) '(rng-validate-quick-delay 1.5) + '(rtags-use-helm nil) + '(safe-local-variable-values + (quote + ((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)) - '(server-done-hook (quote (delete-frame))) + '(scroll-bar-mode nil) + '(server-done-hook nil) + '(server-kill-new-buffers t) '(server-mode t) + '(server-switch-hook nil) '(server-temp-file-regexp "^/tmp/Re\\|/draft\\|.*/itsalltext/.*$") - '(server-window (quote switch-to-buffer-other-frame)) + '(server-window nil) '(show-paren-mode t) - '(tab-width 4) + '(tab-width 8) '(tags-case-fold-search nil) '(tool-bar-mode nil) '(uniquify-buffer-name-style (quote forward) nil (uniquify)) '(visual-line-fringe-indicators (quote (left-curly-arrow right-curly-arrow))) - '(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)) + '(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-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. ;; 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 "SystemWindow" :foreground "SystemWindowText" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :height 90 :width normal :foundry "outline" :family "Courier New")))) + '(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"))))) + '(textile-pre-face ((t (:foreground "dark green")))) + '(whitespace-line ((t (:background "yellow"))))) (put 'narrow-to-region 'disabled nil)