From 0939cfd690767fa895cea66d90354007b6047fc9 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 1 Feb 2015 04:26:02 -0500 Subject: [PATCH] Cleanup --- core/core-evil.el | 5 ----- core/core-ui.el | 2 +- init/init-scss.el | 1 - init/init-sh.el | 4 ++-- init/init-web.el | 2 +- init/my-settings.el | 14 ++++++-------- 6 files changed, 10 insertions(+), 18 deletions(-) diff --git a/core/core-evil.el b/core/core-evil.el index befea94bf..48c5952ba 100644 --- a/core/core-evil.el +++ b/core/core-evil.el @@ -207,7 +207,6 @@ file-name)) (progn ; ex-commands - (evil-ex-define-cmd "echo" 'my:echo) (evil-ex-define-cmd "cycle" 'cycle-font) (evil-ex-define-cmd "togglet[heme]" 'toggle-theme) (evil-ex-define-cmd "full[scr]" 'toggle-frame-fullscreen) @@ -228,10 +227,6 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - (evil-define-command my:echo (&optional output) - (interactive "") - (message "%s" output)) - (evil-define-command my:kill-buffers (&optional bang) :repeat nil (interactive "") diff --git a/core/core-ui.el b/core/core-ui.el index a9e874027..632ed85fb 100644 --- a/core/core-ui.el +++ b/core/core-ui.el @@ -13,7 +13,7 @@ ;;;; GUI Settings ;;;;;;;;;;;;;;;;;;;;;; (tooltip-mode -1) (blink-cursor-mode 1) ; blink cursor -(global-hl-line-mode 1) ; highlight line +;; (global-hl-line-mode 1) ; highlight line (setq linum-format " %3d") diff --git a/init/init-scss.el b/init/init-scss.el index 2a40b67a8..27003d4a7 100644 --- a/init/init-scss.el +++ b/init/init-scss.el @@ -4,7 +4,6 @@ (progn ;; Syntax coloring breaks on consecutive loads for some reason. This fixes that: (add-hook 'scss-mode-hook 'css-mode) - (add-hook 'scss-mode-hook 'enable-tab-width-2) (setq-default css-indent-offset 2) diff --git a/init/init-sh.el b/init/init-sh.el index f452d3f61..8f1081835 100644 --- a/init/init-sh.el +++ b/init/init-sh.el @@ -6,8 +6,8 @@ (my--cleanup-buffers-add "^\\*Shell Command Output\\*$") (my--cleanup-buffers-add "^\\*Async Shell Command\\*$") -;; Make shell scrips executable on save. Good! -(add-hook 'after-save-hook 'executable-make-buffer-file-executable-if-script-p) +;; Make shell scrips executable on save? +;; (add-hook 'after-save-hook 'executable-make-buffer-file-executable-if-script-p) ;; Color in *Shell Command Output* (require 'ansi-color) diff --git a/init/init-web.el b/init/init-web.el index 933a05fe1..b07ce7117 100644 --- a/init/init-web.el +++ b/init/init-web.el @@ -23,7 +23,7 @@ web-mode-block-padding 2) (after "web-beautify" - (add-hook! 'web-mode-hook (setenv "jsbeautify_indent_size" "4")) + (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) diff --git a/init/my-settings.el b/init/my-settings.el index 8f30b0d3e..fde10176e 100644 --- a/init/my-settings.el +++ b/init/my-settings.el @@ -46,13 +46,11 @@ (bind 'insert lisp-mode-map [remap my.dumb-indent] 'indent-for-tab-command) (bind 'insert emacs-lisp-mode-map [remap my.dumb-indent] 'indent-for-tab-command) -;; Highjacks backspace and space to: -;; a) expand spaces between delimiters intelligently: (|) -> ( | ) -;; b) the reverse of A: ( | ) -> (|) -;; c) allow backspace to delete indented blocks intelligently -;; d) and not do any of this magic when inside a string +;; Highjacks backspace to: +;; a) deletes spaces on either side of the cursor, if present ( | ) -> (|) +;; b) allow backspace to delete space-indented blocks intelligently +;; c) and not do any of this magic when inside a string (bind 'insert - (kbd "SPC") 'my.inflate-space-maybe [remap backward-delete-char-untabify] 'my.deflate-space-maybe [remap newline] 'my.newline-and-indent @@ -64,8 +62,9 @@ "\C-u" 'my.backward-kill-to-bol-and-indent ;; Fixes delete - (kbd "") 'delete-char + (kbd "") 'delete-char) +(bind '(insert normal) ;; Textmate-esque insert-line before/after (kbd "") 'evil-open-below (kbd "") 'evil-open-above) @@ -100,7 +99,6 @@ "\C-w" 'evil-delete-backward-word) (bind minibuffer-local-map "\C-u" 'evil-delete-whole-line) -;; Close help/compilation windows with escape ;; Redefine to get rid of that silly delete-other-windows nonsense (defun keyboard-escape-quit ()