diff options
| -rw-r--r-- | emacs.el | 2 | ||||
| -rw-r--r-- | hoersten-c-style.el | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -3,7 +3,6 @@ ;; general (setq-default load-path (cons "~/.emacs.d/" load-path)) ; set default emacs load path -(setq-default user-mail-address "[email protected]") (setq-default ediff-split-window-function 'split-window-horizontally) ; diff horizontally (setq-default x-select-enable-clipboard t) ; paste from X buffer @@ -30,6 +29,7 @@ (setq-default whitespace-style '(tab-mark trailing tabs empty)) ; what whitespace elements to show (add-hook 'before-save-hook 'whitespace-cleanup) ; cleanup whitespace on exit (global-set-key (kbd "C-c c") 'compile) ; compile +(global-set-key (kbd "C-c r") 'recompile) ; recompile (require 'hoersten-pastebin-region) ; send selected text to pastebin (require 'mercurial) ; load mercurial mode diff --git a/hoersten-c-style.el b/hoersten-c-style.el index c89168a..cddb2a1 100644 --- a/hoersten-c-style.el +++ b/hoersten-c-style.el @@ -27,7 +27,7 @@ (cpp-macro . -)))) ;; c-like language settings (c, c++, java, etc.) -(require 'doxymacs) +;;(require 'doxymacs) (setq-default c-hungry-delete-key t) ; enable hungry delete (setq-default c-default-style "hoersten") ; load c-style (add-hook 'c-mode-common-hook @@ -40,8 +40,8 @@ (c-toggle-auto-newline t) ; auto newline (c-subword-mode t) - (doxymacs-mode t) - (doxymacs-font-lock) + ;;(doxymacs-mode t) + ;;(doxymacs-font-lock) ;; custom keys (local-set-key (kbd "C-c f") 'ff-find-other-file) ; toggle header/source file @@ -54,7 +54,7 @@ (hs-minor-mode t) ; enable hide-show mode ;; auto-close bracing - (dolist (key '("(" "[" "{")) (define-key (current-local-map) key 'insert-pair)) + (dolist (key '("(" "[")) (define-key (current-local-map) key 'insert-pair)) )) (provide 'hoersten-c-style)
\ No newline at end of file |