emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove highlight-indentation; clean up

Browse source
This commit is contained in:
Henrik Lissner 2015-08-02 18:24:57 +02:00
parent b05d099886
commit 645229ce08
3 changed files with 6 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core/core-defuns.el
View file

@ -204,8 +204,7 @@ Examples:
(turn-on-auto-fill)) (turn-on-auto-fill))
(defun narf|enable-tab-width-2 () (defun narf|enable-tab-width-2 ()
(setq tab-width 2 evil-shift-width 2) (setq tab-width 2 evil-shift-width 2))
(highlight-indentation-set-offset 2))
(defun narf|enable-tab-width-4 () (defun narf|enable-tab-width-4 ()
(setq tab-width 4 evil-shift-width 4)) (setq tab-width 4 evil-shift-width 4))

20
core/core-editor.el
View file

@ -96,9 +96,6 @@
(global-auto-revert-mode 1) ; revert buffers for changed files (global-auto-revert-mode 1) ; revert buffers for changed files
(electric-indent-mode -1) (electric-indent-mode -1)
;; (add-hook! prog-mode 'whitespace-mode)
;; (add-hook! emacs-lisp-mode 'whitespace-mode)
;; window config undo/redo ;; window config undo/redo
(setq winner-dont-bind-my-keys t) (setq winner-dont-bind-my-keys t)
(winner-mode 1) (winner-mode 1)
@ -168,11 +165,6 @@
(use-package smartparens (use-package smartparens
:diminish smartparens-mode :diminish smartparens-mode
:functions sp-insert-pair :functions sp-insert-pair
:commands (smartparens-global-mode
sp-pair
sp-local-pair
sp-point-in-string-or-comment)
:init (add-hook! evil-insert-state-entry (unless smartparens-global-mode (smartparens-global-mode 1)))
:config :config
(setq blink-matching-paren t (setq blink-matching-paren t
sp-autowrap-region nil ; let evil-surround handle this sp-autowrap-region nil ; let evil-surround handle this
@ -180,15 +172,14 @@
sp-autoescape-string-quote nil sp-autoescape-string-quote nil
sp-show-pair-delay 0) sp-show-pair-delay 0)
(smartparens-global-mode 1)
(require 'smartparens-config) (require 'smartparens-config)
;; Handle newlines + spaces ;; Handle newlines + spaces
(sp-pair "{" "}" (sp-pair "{" "}" :post-handlers '(("||\n[i]" "RET") ("| " " "))
:post-handlers '(("||\n[i]" "RET") ("| " " ")) :unless '(sp-point-before-word-p sp-point-before-same-p))
:unless '(sp-point-before-word-p sp-point-before-same-p)) (sp-pair "(" ")" :post-handlers '(("||\n[i]" "RET") ("| " " "))
(sp-pair "(" ")" :unless '(sp-point-before-word-p sp-point-before-same-p))
:post-handlers '(("||\n[i]" "RET") ("| " " "))
:unless '(sp-point-before-word-p sp-point-before-same-p))
;; Auto-close more conservatively ;; Auto-close more conservatively
(sp-pair "[" nil :unless '(sp-point-before-word-p sp-point-before-same-p)) (sp-pair "[" nil :unless '(sp-point-before-word-p sp-point-before-same-p))
@ -216,7 +207,6 @@
:commands (smex smex-major-mode-commands smex-initialize smex-update) :commands (smex smex-major-mode-commands smex-initialize smex-update)
:init (setq smex-save-file (! (concat narf-temp-dir "smex-items"))) :init (setq smex-save-file (! (concat narf-temp-dir "smex-items")))
:config (smex-initialize) :config (smex-initialize)
;; Hook up smex to auto-update, rather than update on every run ;; Hook up smex to auto-update, rather than update on every run
(defun smex-update-after-load (unused) (defun smex-update-after-load (unused)
(when (boundp 'smex-cache) (smex-update))) (when (boundp 'smex-cache) (smex-update)))

7
core/core-ui.el
View file

@ -40,13 +40,6 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(use-package highlight-indentation
:diminish highlight-indentation-mode
:config
(add-hook! (prog-mode scss-mode)
(unless (eq major-mode 'emacs-lisp-mode)
(highlight-indentation-mode 1))))
(use-package nlinum ; line numbers (use-package nlinum ; line numbers
:defer t :defer t
:defines nlinum--width :defines nlinum--width