diff --git a/init/init-git.el b/init/init-git.el index 7e7697e6f..a53ed8c6b 100644 --- a/init/init-git.el +++ b/init/init-git.el @@ -11,7 +11,7 @@ (use-package gitconfig-mode :mode (("/\\.?git/?config\\'" . gitconfig-mode) ("/\\.gitmodules\\'" . gitconfig-mode)) - :config (add-hook 'gitconfig-mode-hook 'flyspell-mode)) + :init (add-hook 'gitconfig-mode-hook 'flyspell-mode)) (use-package gitignore-mode :mode (("/\\.gitignore\\'" . gitignore-mode) @@ -19,44 +19,49 @@ ("/git/ignore\\'" . gitignore-mode))) ;; (use-package git-gutter-fringe+ - :init (global-git-gutter+-mode +1) :config (progn + (global-git-gutter+-mode +1) + + ;; Fixes "git-gutter+-process-diff: Wrong number of arguments: nil" error + (defadvice git-gutter+-process-diff (before git-gutter+-process-diff-advice activate) + (ad-set-arg 0 (file-truename (ad-get-arg 0)))) + (evil-ex-define-cmd "gstage" 'git-gutter+-stage-hunks) (evil-ex-define-cmd "grevert" 'git-gutter+-revert-hunks) (evil-ex-define-cmd "gdiff" 'git-gutter+-show-hunk) (fringe-helper-define 'git-gutter-fr+-added nil - "X......." - "X......." - "X......." - "X......." - "X......." - "X......." - "X......." - "X......." - "X......." - "X......." - "X......." - "X......." - "X......." - "X......." - "X......." - "X......." - "X......." - "X......." - "X......." - "X......." - "X......." - "X......." - "X......." - "X......." - "X.......") + "XX......" + "XX......" + "XX......" + "XX......" + "XX......" + "XX......" + "XX......" + "XX......" + "XX......" + "XX......" + "XX......" + "XX......" + "XX......" + "XX......" + "XX......" + "XX......" + "XX......" + "XX......" + "XX......" + "XX......" + "XX......" + "XX......" + "XX......" + "XX......" + "XX......") (fringe-helper-define 'git-gutter-fr+-deleted nil - "X......." + "XX......" "XXXXXXXX" - "X......." + "XX......" "........" "........" "........" @@ -81,31 +86,31 @@ "........") (fringe-helper-define 'git-gutter-fr+-modified nil - "X......." - "X......." - "X......." - "X......." - "X......." - "X......." - "X......." - "X......." - "X......." - "X......." - "X......." - "X......." - "X......." - "X......." - "X......." - "X......." - "X......." - "X......." - "X......." - "X......." - "X......." - "X......." - "X......." - "X......." - "X......."))) + "XX......" + "XX......" + "XX......" + "XX......" + "XX......" + "XX......" + "XX......" + "XX......" + "XX......" + "XX......" + "XX......" + "XX......" + "XX......" + "XX......" + "XX......" + "XX......" + "XX......" + "XX......" + "XX......" + "XX......" + "XX......" + "XX......" + "XX......" + "XX......" + "XX......"))) (evil-set-initial-state 'git-commit-mode 'insert) (evil-set-initial-state 'git-rebase-mode 'insert) diff --git a/init/init-text.el b/init/init-text.el index 227e1f60b..79230268a 100644 --- a/init/init-text.el +++ b/init/init-text.el @@ -10,18 +10,18 @@ :config (progn (defun markdown-insert-del () - (interactive) - (let ((delim "~~")) - (if (markdown-use-region-p) - ;; Active region - (let ((bounds (markdown-unwrap-things-in-region - (region-beginning) (region-end) - markdown-regex-del 2 4))) - (markdown-wrap-or-insert delim delim nil (car bounds) (cdr bounds))) - ;; Bold markup removal, bold word at point, or empty markup insertion - (if (thing-at-point-looking-at markdown-regex-del) - (markdown-unwrap-thing-at-point nil 2 4) - (markdown-wrap-or-insert delim delim 'word nil nil))))) + (interactive) + (let ((delim "~~")) + (if (markdown-use-region-p) + ;; Active region + (let ((bounds (markdown-unwrap-things-in-region + (region-beginning) (region-end) + markdown-regex-del 2 4))) + (markdown-wrap-or-insert delim delim nil (car bounds) (cdr bounds))) + ;; Bold markup removal, bold word at point, or empty markup insertion + (if (thing-at-point-looking-at markdown-regex-del) + (markdown-unwrap-thing-at-point nil 2 4) + (markdown-wrap-or-insert delim delim 'word nil nil))))) (sp-local-pair 'markdown-mode "*" "*" :unless '(sp-point-after-bol-p sp-point-before-same-p sp-point-after-same-p)) (let ((map markdown-mode-map)) @@ -43,10 +43,10 @@ (kbd "") nil (kbd "") nil - (kbd "s-*") 'markdown-insert-list-item - (kbd "s-b") 'markdown-insert-bold - (kbd "s-i") 'markdown-insert-italic - (kbd "s-`") 'markdown-insert-del)))) + (kbd "M-*") 'markdown-insert-list-item + (kbd "M-b") 'markdown-insert-bold + (kbd "M-i") 'markdown-insert-italic + (kbd "M-`") 'markdown-insert-del)))) (provide 'init-text) diff --git a/init/init-web.el b/init/init-web.el index 2ca512772..e398840d7 100644 --- a/init/init-web.el +++ b/init/init-web.el @@ -37,7 +37,7 @@ (add-hook! 'web-mode-hook (setenv "jsbeautify_indent_size" "4")) (bind 'motion web-mode-map "gQ" 'web-beautify-html)) - (bind web-mode-map (kbd "s-/") 'web-mode-comment-or-uncomment) + (bind web-mode-map (kbd "M-/") 'web-mode-comment-or-uncomment) (bind 'normal web-mode-map "zf" 'web-mode-fold-or-unfold ",t" 'web-mode-element-rename) @@ -52,7 +52,6 @@ :defer t :init (progn - (add-hook 'css-mode-hook 'emmet-mode) (add-hook 'scss-mode-hook 'emmet-mode) (add-hook 'web-mode-hook 'emmet-mode) (add-hook 'html-mode-hook 'emmet-mode) @@ -63,8 +62,8 @@ (setq emmet-move-cursor-between-quotes t) (bind 'insert emmet-mode-keymap - (kbd "s-e") 'emmet-expand-yas - (kbd "s-E") 'emmet-expand-line))) + (kbd "M-e") 'emmet-expand-yas + (kbd "M-E") 'emmet-expand-line))) (provide 'init-web) diff --git a/init/my-bindings.el b/init/my-bindings.el index 5e86ffbe5..4f51a3394 100644 --- a/init/my-bindings.el +++ b/init/my-bindings.el @@ -127,7 +127,7 @@ ;; Textmate-esque indent shift left/right "M-[" (kbd "C-o m l C-o I DEL C-o ` l") "M-]" (λ (evil-shift-right (point-at-bol) (point-at-eol))) - "" (kbd "s-[")) + "" (kbd "M-[")) ;; Enable TAB to do matchit (bind '(normal visual) evil-matchit-mode-map [tab] 'evilmi-jump-items) @@ -206,12 +206,12 @@ (use-package smart-forward :config (bind 'insert - (kbd "") 'smart-backward - (kbd "") 'smart-forward + (kbd "") 'my.move-to-bol + (kbd "") 'my.move-to-eol + (kbd "") 'my.backward-kill-to-bol-and-indent ;; (kbd "") 'beginning-of-buffer (kbd "") 'smart-up - (kbd "") 'smart-down - (kbd "") 'my.backward-kill-to-bol-and-indent)) + (kbd "") 'smart-down))