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

*Another* cleanup

Browse source
This commit is contained in:
Henrik Lissner 2015-11-24 03:46:02 -05:00
parent 5d350a7542
commit f7c9bc65a0
5 changed files with 6 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/core-evil.el
View file

@ -59,8 +59,9 @@
(evil-set-initial-state `,(car mode-map) `,(cdr mode-map))) (evil-set-initial-state `,(car mode-map) `,(cdr mode-map)))
;; Switch to normal mode before switching windows ;; Switch to normal mode before switching windows
(defun narf*evil-back-to-normal () (evil-normal-state)) (defun narf|evil-back-to-normal (&rest _)
(advice-add 'select-window :before 'narf*evil-back-to-normal) (when (eq evil-state 'insert) (evil-normal-state)))
(add-hook! narf.window-switch 'narf|evil-back-to-normal)
(progn ; evil hacks (progn ; evil hacks
(defadvice evil-force-normal-state (after evil-esc-quit activate) (defadvice evil-force-normal-state (after evil-esc-quit activate)

2
core/core-helm.el
View file

@ -149,7 +149,5 @@
(use-package helm-command :commands helm-M-x) (use-package helm-command :commands helm-M-x)
(use-package helm-descbinds :commands helm-descbinds) (use-package helm-descbinds :commands helm-descbinds)
(use-package helm-deft :defer t)
(provide 'core-helm) (provide 'core-helm)
;;; core-helm.el ends here ;;; core-helm.el ends here

2
core/core-ui.el
View file

@ -146,7 +146,7 @@
:preface :preface
(defvar narf--hl-nlinum-overlay nil) (defvar narf--hl-nlinum-overlay nil)
(defvar narf--hl-nlinum-line nil) (defvar narf--hl-nlinum-line nil)
(defvar nlinum-format " %4d ") (defvar nlinum-format " %4d ")
(defface linum-highlight-face '((t (:inherit linum))) "Face for line highlights") (defface linum-highlight-face '((t (:inherit linum))) "Face for line highlights")
(setq linum-format "%3d ") (setq linum-format "%3d ")
:init :init

2
modules/module-org.el
View file

@ -209,8 +209,6 @@ will function properly."
(defface org-headline-todo '((t ())) "Face for todo headlines") (defface org-headline-todo '((t ())) "Face for todo headlines")
(defface org-todo-high '((t ())) "Face for high-priority todo") (defface org-todo-high '((t ())) "Face for high-priority todo")
(defface org-todo-vhigh '((t ())) "Face for very high-priority todo") (defface org-todo-vhigh '((t ())) "Face for very high-priority todo")
;; (defface org-item-checkbox '((t ())) "Face for checkbox list lines")
;; (defface org-item-checkbox-checked '((t ())) "Face for checked checkbox list lines")
(defface org-whitespace '((t ())) "Face for spaces") (defface org-whitespace '((t ())) "Face for spaces")
(defface org-list-bullet '((t ())) "Face for list bullets") (defface org-list-bullet '((t ())) "Face for list bullets")
(font-lock-add-keywords (font-lock-add-keywords

8
private/my-bindings.el
View file

@ -74,17 +74,13 @@
:ni "M-d" 'dash-at-point :ni "M-d" 'dash-at-point
;; Add animated transitions to OSX emacs ;; Add animated transitions to OSX emacs
"M-w" (λ (if window-system "M-w" 'evil-window-delete
(mac-start-animation (get-buffer-window) :type 'fade-out :duration 0.25))
(call-interactively 'evil-window-delete))
"M-W" (λ (let ((data (assq (selected-frame) narf-wg-frames))) "M-W" (λ (let ((data (assq (selected-frame) narf-wg-frames)))
(if data (if data
(progn (wg-delete-workgroup (wg-get-workgroup (cdr data))) (progn (wg-delete-workgroup (wg-get-workgroup (cdr data)))
(delete-frame (car data))) (delete-frame (car data)))
(delete-frame)))) (delete-frame))))
"M-n" (λ (if window-system "M-n" (λ (switch-to-buffer (generate-new-buffer "*new*")))
(mac-start-animation (get-buffer-window) :type 'fade-out :duration 0.25))
(switch-to-buffer (generate-new-buffer "*new*")))
;; Textmate-esque indent shift left/right ;; Textmate-esque indent shift left/right
:i "M-[" (kbd "C-o m l C-o I DEL C-o ` l") :i "M-[" (kbd "C-o m l C-o I DEL C-o ` l")