diff options
| author |  Tom Willemsen | 2012-10-26 01:46:09 +0200 |
|---|---|---|
| committer | Tom Willemsen | 2012-10-26 01:46:09 +0200 |
| commit | cbdfa4cac317cbde73da1bbbc4bae37c6617f5d9 (patch) | |
| tree | 5c0040ca1c8e8ea10f0c8b4d647d579d72c4bc18 /.emacs.d/init.el | |
| parent | d6be1ae80fb59495c6bb72b5b6248b5c9a08b4c7 (diff) | |
| parent | 2e70340b951f485d45b95684e7910d1a78917d03 (diff) | |
| download | dotfiles-cbdfa4cac317cbde73da1bbbc4bae37c6617f5d9.tar.gz dotfiles-cbdfa4cac317cbde73da1bbbc4bae37c6617f5d9.zip | |
Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
.emacs.d/site-lisp/oni.el
Diffstat (limited to '.emacs.d/init.el')
| -rw-r--r-- | .emacs.d/init.el | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el index d52d405..d1c7355 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -144,6 +144,18 @@ `((".*" . ,temporary-file-directory))) (setq browse-url-browser-function 'browse-url-generic) (setq browse-url-generic-program (getenv "BROWSER")) +(setq c-offsets-alist '((statement-block-intro . +) + (knr-argdecl-intro . 5) + (substatement-open . +) + (substatement-label . 0) + (label . 0) + (statement-case-open . +) + (statement-cont . +) + (arglist-intro . +) + (arglist-close . 0) + (inline-open . 0) + (brace-list-open . +) + (topmost-intro-cont first c-lineup-topmost-intro-cont c-lineup-gnu-DEFUN-intro-cont))) (setq comment-auto-fill-only-comments t) (setq custom-file "~/.emacs.d/custom.el") (setq custom-theme-directory "~/.emacs.d/themes") @@ -184,6 +196,8 @@ "whitespace before ':'" "whitespace after '('" "whitespace before ')'" + "whitespace after '['" + "whitespace before ']'" "the backslash is redundant between brackets" "continuation line over-indented for visual indent" "continuation line under-indented for visual indent" |