diff options
Diffstat (limited to 'config/emacs/init.el')
| -rw-r--r-- | config/emacs/init.el | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/config/emacs/init.el b/config/emacs/init.el index e35d458..c4cab29 100644 --- a/config/emacs/init.el +++ b/config/emacs/init.el @@ -101,12 +101,14 @@ reverse. Delete trailing whitespace." (defun my/prog-buffer-setup () "Do setup in for code buffers." - (superword-mode 1) - (modify-syntax-entry ?_ "w") + ;; (superword-mode 1) + ;; (modify-syntax-entry ?_ "w") (hs-minor-mode 1) (display-fill-column-indicator-mode 1) - ;; (when (derived-mode-p '(c-mode c++-mode)) - ;; (c-guess)) + (smerge-mode 1) + (when (and (derived-mode-p '(c-mode c++-mode)) + (> (car (buffer-line-statistics)) 0)) + (c-guess)) (add-hook 'before-save-hook (lambda () (unless (member major-mode my/prog-cleanup-excluded-modes) @@ -441,6 +443,7 @@ With ARG, don't save the current layout." (require 'comint) (setq-default comint-scroll-to-bottom-on-input t) (setq-default comint-scroll-to-bottom-on-output t) + (setq-default comint-buffer-maximum-size 1048576) (add-to-list 'comint-output-filter-functions #'comint-truncate-buffer) (add-to-list 'comint-output-filter-functions #'ansi-color-process-output)) @@ -556,7 +559,8 @@ With ARG, don't save the current layout." ;; misc vars (setq delete-pair-blink-delay 0 enable-recursive-minibuffers t - frame-resize-pixelwise t) + frame-resize-pixelwise t + c-guess-region-max 5000) (electric-pair-mode 1) (electric-indent-mode 1) @@ -811,15 +815,18 @@ With ARG, don't save the current layout." ;; :custom ;; (sideline-backends-right '(sideline-flycheck sideline-flymake))) -;; (use-package flycheck -;; :config -;; ;; flymake stuff to be less annoying -;; ;; (face-spec-set 'flycheck-note '((t :underline nil))) -;; ;; (face-spec-set 'flycheck-info '((t :underline nil))) -;; ;; (face-spec-set 'flycheck-warning '((t :underline nil))) -;; ;; (face-spec-set 'flycheck-error '((t :underline nil))) -;; :hook -;; (prog-mode . flycheck-mode)) +(use-package flycheck + :config + ;; flymake stuff to be less annoying + ;; (face-spec-set 'flycheck-note '((t :underline nil))) + ;; (face-spec-set 'flycheck-info '((t :underline nil))) + ;; (face-spec-set 'flycheck-warning '((t :underline nil))) + ;; (face-spec-set 'flycheck-error '((t :underline nil))) + :custom + (flycheck-check-syntax-automatically '(save mode-enabled)) + ;; :hook + ;; (prog-mode . flycheck-mode) + ) (progn ; collected folding binds, hs + fold this (define-prefix-command 'my/fold-map) |