v1.1.3 bump

+ sp: be quiet
+ popup: load *eval* rule earlier
+ evil-anzu: defer, due to long load time
+ Update makefile
+ Clean up core.el
+ line-spacing = 1, less rpadding on nlinum-format
+ Add *esup* popup rule
+ Refactor doom macro
+ Refactor doom-byte-compile
+ :big [SIZE] + use inconsolata in big-mode
+ :v TAB -> doom/yas-insert-snippet
+ eval: use pop-to-buffer instead of doom/popup-buffer
+ Refactor backspace fn; handle pair deletion issue with sp better
+ \#bringbackwindowsystem
+ db: remove unused var
+ Update init.el
This commit is contained in:
Henrik Lissner 2016-05-28 21:51:21 -04:00
parent df13257ce8
commit fc78d46f30
19 changed files with 86 additions and 76 deletions

View file

@ -54,24 +54,22 @@ already there, move it to the true bol."
possible, or just one char if that's not possible."
(interactive)
(let* ((context (sp--get-pair-list-context 'navigate))
(open-pair (sp--get-opening-regexp context))
(close-pair (sp--get-closing-regexp context))
(open-pair-re (sp--get-opening-regexp context))
(close-pair-re (sp--get-closing-regexp context))
open-len close-len)
(cond ;; When in strings (sp acts weird with quotes; this is the fix)
;; Also, skip closing delimiters
((and (and (sp--looking-back open-pair)
((and (and (sp--looking-back open-pair-re)
(setq open-len (- (match-beginning 0) (match-end 0))))
(and (looking-at close-pair)
(setq close-len (- (match-beginning 0) (match-end 0)))))
(and (looking-at close-pair-re)
(setq close-len (- (match-beginning 0) (match-end 0))))
(string= (plist-get (sp-get-thing t) :op)
(plist-get (sp-get-thing) :cl)))
(delete-backward-char open-len)
(delete-char close-len))
;; If using tabs (or at bol), just delete normally
((or indent-tabs-mode
(= (point-at-bol) (point)))
(call-interactively 'backward-delete-char-untabify))
;; Delete up to the nearest tab column IF only whitespace between
;; point and bol.
((sp--looking-back-p "^[\\t ]*" (point-at-bol))
((sp--looking-back-p "^[\\t ]*" (line-beginning-position))
(let ((movement (% (current-column) tab-width))
(p (point)))
(when (= movement 0)