TakeV/spacemacs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix define and bind evil-object macro with latest changes in evil-mode

Browse source
This commit is contained in:
Rich Alesi 2015-01-01 15:26:30 -07:00 committed by syl20bnr
parent 14329a9e9b
commit c99ceea61e
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
spacemacs/packages.el
View file

@ -585,22 +585,27 @@ determine the state to enable when escaping from the insert state.")
(evil-scroll-line-to-center nil)))
(evil-leader/set-key "re" 'evil-show-registers)
;; define text objects
(defmacro define-and-bind-text-object (key start-regex end-regex)
(let ((inner-name (make-symbol "inner-name"))
(outer-name (make-symbol "outer-name")))
(defmacro spacemacs|define-and-bind-text-object (key name start-regex end-regex)
(let ((inner-name (make-symbol (concat "evil-inner-" name)))
(outer-name (make-symbol (concat "evil-outer-" name))))
`(progn
(evil-define-text-object ,inner-name (count &optional beg end type)
(evil-regexp-range count beg end type ,start-regex ,end-regex t))
(evil-select-paren ,start-regex ,end-regex beg end type count nil))
(evil-define-text-object ,outer-name (count &optional beg end type)
(evil-regexp-range count beg end type ,start-regex ,end-regex nil))
(evil-select-paren ,start-regex ,end-regex beg end type count t))
(define-key evil-inner-text-objects-map ,key (quote ,inner-name))
(define-key evil-outer-text-objects-map ,key (quote ,outer-name)))))
;; between dollars sign:
(define-and-bind-text-object "$" "\\$" "\\$")
(spacemacs|define-and-bind-text-object "$" "dollar" "\\$" "\\$")
;; between pipe characters:
(define-and-bind-text-object "|" "|" "|")
(spacemacs|define-and-bind-text-object "|" "bar" "|" "|")
;; between percent signs:
(define-and-bind-text-object "%" "%" "%")
(spacemacs|define-and-bind-text-object "%" "percent" "%" "%")
;; add star block
(spacemacs|define-and-bind-text-object "*" "star-block" "/*" "*/")
;; add slash block
(spacemacs|define-and-bind-text-object "/" "slash-block" "//" "//")
;; support smart 1parens-strict-mode
(if (ht-contains? configuration-layer-all-packages 'smartparens)