summaryrefslogtreecommitdiffstats
path: root/emacs
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2012-04-25 00:18:43 +0200
committerAlexander Sulfrian <alexander@sulfrian.net>2012-04-25 00:23:26 +0200
commit3de999875e706f25d939f9d8322ca967a43dcb90 (patch)
tree641be1ba6042c3122d6a0e5c5f10e793d1e81388 /emacs
parent088681cfcdc2b6a7b845873f6a0881510b4508f4 (diff)
downloaddotfiles-3de999875e706f25d939f9d8322ca967a43dcb90.tar.gz
dotfiles-3de999875e706f25d939f9d8322ca967a43dcb90.tar.xz
dotfiles-3de999875e706f25d939f9d8322ca967a43dcb90.zip
emacs: reformatted c-mode settings
Diffstat (limited to '')
-rw-r--r--emacs21
1 files changed, 12 insertions, 9 deletions
diff --git a/emacs b/emacs
index a653a60..cfb6c13 100644
--- a/emacs
+++ b/emacs
@@ -104,15 +104,18 @@
(c-set-offset 'arglist-cont-nonempty '(c-lineup-arglist-tabs-only c-lineup-gcc-asm-reg))
(add-hook 'c-mode-common-hook
- '(lambda ()
- (turn-on-auto-fill)
- (setq fill-column 80)
- (setq comment-column 60)
- (modify-syntax-entry ?_ "w") ; now '_' is not considered a word-delimiter
- (c-set-style "linux") ; set indentation style
- (define-key c-mode-base-map (kbd "M-o") 'eassist-switch-h-cpp)
- (define-key c-mode-base-map (kbd "M-m") 'eassist-list-methods)
- (define-key c-mode-base-map (kbd "C-o") 'semantic-complete-jump-local)))
+ (lambda ()
+ (setq fill-column 80)
+ (turn-on-auto-fill)
+
+ ;; now '_' is not considered a word-delimiter
+ (modify-syntax-entry ?_ "w")
+
+ ;; set indentation style
+ (c-set-style "linux")
+ (local-set-key (kbd "M-m") 'eassist-list-methods)
+ (local-set-key (kbd "C-o") 'semantic-complete-jump-local)
+ (local-set-key (kbd "C-c o") 'ff-find-other-file)))
(global-set-key [C-return] 'dabbrev-expand)
(define-key esc-map [C-return] 'dabbrev-completion)