|
|
|
@ -49,7 +49,7 @@
|
|
|
|
|
(setq Inhibit-Splash-Screen t) |
|
|
|
|
|
|
|
|
|
;;-------------------------------------------------------------------------------------- |
|
|
|
|
;; Prefer Utf-8 For Buffers |
|
|
|
|
;; Prefer UTF-8 For Buffers |
|
|
|
|
;;-------------------------------------------------------------------------------------- |
|
|
|
|
|
|
|
|
|
(prefer-coding-system 'utf-8) |
|
|
|
@ -241,17 +241,6 @@ setq org-log-done t)
|
|
|
|
|
(require 'expand-region) |
|
|
|
|
(pending-delete-mode t) ; Selected region contents are replaced on typing |
|
|
|
|
|
|
|
|
|
;;-------------------------------------------------------------------------------------- |
|
|
|
|
;; CC-Mode Settings |
|
|
|
|
;;------------------------------------------------------------------------------------- |
|
|
|
|
|
|
|
|
|
;; Keep character limit to 80 |
|
|
|
|
(eval-after-load "c" |
|
|
|
|
'(progn |
|
|
|
|
(setq fci-rule-column 80))) |
|
|
|
|
|
|
|
|
|
(setq-default c-basic-offset 4) ;; NASA Style Guide says 4 spaces is optimal |
|
|
|
|
(setq-default c-default-style "linux") ;; Use Linux code style |
|
|
|
|
|
|
|
|
|
;;-------------------------------------------------------------------------------------- |
|
|
|
|
;; Line Numbering - Note: Might not look good with files with 10,000 or more lines |
|
|
|
@ -320,6 +309,12 @@ setq org-log-done t)
|
|
|
|
|
(sh-set-shell "zsh")))) |
|
|
|
|
|
|
|
|
|
;;------------------------------------------------------------------------------------- |
|
|
|
|
;; Enable and Configure `company-mode` |
|
|
|
|
;;------------------------------------------------------------------------------------ |
|
|
|
|
|
|
|
|
|
(add-hook 'after-init-hook 'global-company-mode) |
|
|
|
|
|
|
|
|
|
;;------------------------------------------------------------------------------------- |
|
|
|
|
;; Alignment |
|
|
|
|
;;------------------------------------------------------------------------------------- |
|
|
|
|
|
|
|
|
@ -374,6 +369,31 @@ setq org-log-done t)
|
|
|
|
|
(setq deactivate-mark nil)) |
|
|
|
|
(self-insert-command N))) |
|
|
|
|
|
|
|
|
|
;;-------------------------------------------------------------------------------------- |
|
|
|
|
;; CC-Mode Settings |
|
|
|
|
;;------------------------------------------------------------------------------------- |
|
|
|
|
|
|
|
|
|
;; Keep character limit to 80 |
|
|
|
|
(eval-after-load "c-mode" |
|
|
|
|
'(progn |
|
|
|
|
(setq fci-rule-column 80))) |
|
|
|
|
|
|
|
|
|
(setq-default c-basic-offset 4) ;; NASA Style Guide says 4 spaces is optimal |
|
|
|
|
(setq-default c-default-style "linux") ;; Use Linux code style |
|
|
|
|
|
|
|
|
|
;;-------------------------------------------------------------------------------------- |
|
|
|
|
;; Java Mode Setup |
|
|
|
|
;;------------------------------------------------------------------------------------- |
|
|
|
|
|
|
|
|
|
(defun my-java-mode-hook () |
|
|
|
|
(require 'eclim) |
|
|
|
|
(eclim-mode t) |
|
|
|
|
(require 'company-emacs-eclim) |
|
|
|
|
(company-emacs-eclim-setup) |
|
|
|
|
) |
|
|
|
|
|
|
|
|
|
(add-hook 'java-mode-hook 'my-java-mode-hook) |
|
|
|
|
|
|
|
|
|
;;------------------------------------------------------------------------------------- |
|
|
|
|
;; Key Bindings |
|
|
|
|
;;------------------------------------------------------------------------------------- |
|
|
|
|