I think I have a problem..

This commit is contained in:
Henrik Lissner 2014-12-12 15:26:34 -05:00
parent 5aa3c282be
commit 7ddb52699d
55 changed files with 745 additions and 318 deletions

View file

@ -1,7 +1,4 @@
;; Global editor behavior (+ evil)
(provide 'core-editor)
;;;; Editing plugins ;;;;;;;;;;;;;;;;;;;
(use-package expand-region
:commands (er/expand-region er/contract-region))
@ -18,7 +15,7 @@
(setq sp-autowrap-region nil ; let evil-surround handle this
sp-highlight-pair-overlay nil
sp-show-pair-delay 0
sp-autoescape-string-quote nil)
sp-autoescape-string-quote t)
;; Handle newlines
(sp-pair "{" nil :post-handlers '(("||\n[i]" "RET")))
@ -36,3 +33,7 @@
(after "yasnippet"
(defadvice yas-expand (before advice-for-yas-expand activate)
(sp-remove-active-pair-overlay)))))
(provide 'core-editor)
;;; core-editor.el ends here

View file

@ -211,10 +211,11 @@
file-name))
(progn ; ex-commands
(evil-ex-define-cmd "pres[ent]" 'toggle-theme)
(evil-ex-define-cmd "pres[ent]" 'toggle-presentation-mode)
(evil-ex-define-cmd "togglet[heme]" 'toggle-theme)
(evil-ex-define-cmd "full[scr]" 'toggle-frame-fullscreen)
(evil-ex-define-cmd "k[ill]" 'kill-this-buffer) ; Kill current buffer
(evil-ex-define-cmd "k[ill]o" 'cleanup-buffers) ; Kill current project buffers
(evil-ex-define-cmd "k[ill]o" 'my-cleanup-buffers) ; Kill current project buffers
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -232,6 +233,13 @@
(mapc 'kill-buffer (buffer-list)))
(delete-other-windows))
(evil-ex-define-cmd "k[ill]buried" 'my:kill-buried-buffers) ; Kill all buffers (bang = project buffers only)
(evil-define-command my:kill-buried-buffers (&optional bang)
:repeat nil
(interactive "<!>")
(mapc 'kill-buffer
(my-living-buffer-list (if bang (projectile-project-buffers) (buffer-list)))))
(evil-ex-define-cmd "ini" 'my:init-files)
(evil-define-command my:init-files (&optional bang)
:repeat nil
@ -254,12 +262,6 @@
(byte-recompile-directory (concat my-dir ".cask") 0 t)
(byte-recompile-directory my-dir 0 t)))
(evil-ex-define-cmd "build" 'my:build)
(evil-define-command my:build (arguments &optional bang)
:repeat t
(interactive "<a><!>")
(my-build arguments))
(evil-ex-define-cmd "cd" 'my:cd)
(evil-define-command my:cd (dir)
:repeat nil
@ -369,4 +371,4 @@ provided."
:repeat nil
(interactive "<r>")
(evil-normal-state)
(narrow-to-region-indirect beg end)))))
(my-narrow-to-region-indirect beg end)))))

View file

@ -22,6 +22,8 @@
(blink-cursor-mode 1) ; blink cursor
;; (global-hl-line-mode 1) ; highlight line
(setq linum-format " %3d")
;; Multiple cursors across buffers cause a strange redraw delay for
;; some things, like auto-complete or evil-mode's cursor color
;; switching.

View file

@ -1,5 +1,3 @@
(provide 'core)
(cd "~") ; instead of /
(require 'cask)
@ -18,10 +16,10 @@
(make-directory my-tmp-dir-autosave t))
(setq load-prefer-newer t)
(setq debug-on-quit *debug-mode)
(setq debug-on-quit DEBUG-MODE)
(require 'shut-up)
(setq shut-up-ignore *debug-mode)
(setq shut-up-ignore DEBUG-MODE)
(when noninteractive (shut-up-silence-emacs)) ; http://youtu.be/Z6woIRLnbmE
(shut-up
@ -48,7 +46,7 @@
;;; Show tab characters
;; (global-whitespace-mode 1)
(setq whitespace-style '(face tabs tab-mark) ; needs to be re-set in every buffer
(setq whitespace-style '(trailing face tabs tab-mark) ; needs to be re-set in every buffer
whitespace-display-mappings
'((tab-mark ?\t [?| ?\t] [?\\ ?\t])
(newline-mark 10 [36 10]))) ; for whitespace-newline-mode
@ -147,7 +145,6 @@
(setq-default tab-width 4)
(setq delete-trailing-lines nil)
(add-hook 'before-save-hook 'delete-trailing-whitespace)
(add-hook 'makefile-mode-hook 'indent-tabs-mode) ; Use normal tabs in makefiles
;; Make sure scratch buffer is always "in a project"
(add-hook 'find-file-hook
@ -217,7 +214,8 @@ the checking happens for all pairs in auto-minor-mode-alist"
;;;; Utility plugins ;;;;;;;;;;;;;;;;;;
(require 'defuns) ; all the defuns
(require 'use-package) ; Package management bootstrap
(setq use-package-verbose *debug-mode)
(setq use-package-verbose DEBUG-MODE)
;;(require 'hide-mode-line)
;; Generate autoloads if necessary
(defun my-update-autoloads (&optional forcep)
@ -225,7 +223,7 @@ the checking happens for all pairs in auto-minor-mode-alist"
(setq generated-autoload-file (concat my-core-dir "autoloads.el"))
(when (or forcep (not (file-exists-p generated-autoload-file)))
(if forcep (delete-file generated-autoload-file))
(update-directory-autoloads my-core-dir my-modules-dir my-personal-dir my-elisp-dir))
(update-directory-autoloads my-core-dir my-modules-dir my-elisp-dir))
(require 'autoloads))
(my-update-autoloads)
@ -258,6 +256,7 @@ the checking happens for all pairs in auto-minor-mode-alist"
(push '("*Compile-Log*" :height 0.3 :position bottom :noselect t) popwin:special-display-config)
(push '(" *undo-tree*" :width 0.3 :position right) popwin:special-display-config)
(push '("^\\*scratch\\*.*" :regexp t :stick t) popwin:special-display-config)
(push '(image-mode) popwin:special-display-config)
(after "evil"
(evil-ex-define-cmd "l[ast]" 'popwin:popup-last-buffer)
@ -279,3 +278,7 @@ the checking happens for all pairs in auto-minor-mode-alist"
(require 'server)
(unless (server-running-p)
(server-start)))
(provide 'core)
;;; core.el ends here

View file

@ -9,6 +9,25 @@
(narrow-to-region start end))
(switch-to-buffer buf)))
;;;###autoload
(defun my--set-region-read-only (begin end)
"See http://stackoverflow.com/questions/7410125"
(let ((modified (buffer-modified-p)))
(add-text-properties begin end '(read-only t))
(set-buffer-modified-p modified)))
;;;###autoload
(defun my--set-region-writeable (begin end)
"See http://stackoverflow.com/questions/7410125"
(let ((modified (buffer-modified-p))
(inhibit-read-only t))
(remove-text-properties begin end '(read-only t))
(set-buffer-modified-p modified)))
;;;###autoload
(defun my-living-buffer-list (&optional buffer-list)
(-remove 'get-buffer-window (or buffer-list (buffer-list))))
;; Killing Buffers ;;;;;;;;;;;;;;;;;;;;;
;; Buffer defuns
@ -18,6 +37,7 @@
"^\\*Compile-Log\\*$"
"^\\*Ediff.*\\*$"
help-mode
image-mode
dired-mode
reb-mode)
"A list of buffer name regexps or major-mode symbols. If buried buffers

View file

@ -66,7 +66,7 @@ whitespace as possible, or just one char if that's not possible."
(if (string-match "\\w*\\(\\s-+\\)$"
(buffer-substring-no-properties (- p movement) p))
(backward-delete-char (- (match-end 1) (match-beginning 1)))
(call-interactively 'backward-delete-char-untabify)))))))
(backward-delete-char-untabify 1)))))))
;;;###autoload
(defun my.dumb-indent ()