|
|
|
@ -74,10 +74,10 @@
|
|
|
|
|
(<= (phpinspect-region-start reg) point)))
|
|
|
|
|
|
|
|
|
|
(defsubst phpinspect-region-overlaps (reg1 reg2)
|
|
|
|
|
(or (phpinspect-region-reg2s-point reg1 (phpinspect-region-start reg2))
|
|
|
|
|
(phpinspect-region-reg2s-point reg1 (- (phpinspect-region-end reg2) 1))
|
|
|
|
|
(phpinspect-region-reg2s-point reg2 (phpinspect-region-start reg1))
|
|
|
|
|
(phpinspect-region-reg2s-point reg2 (- (phpinspect-region-end reg1) 1))))
|
|
|
|
|
(or (phpinspect-region-overlaps-point reg1 (phpinspect-region-start reg2))
|
|
|
|
|
(phpinspect-region-overlaps-point reg1 (- (phpinspect-region-end reg2) 1))
|
|
|
|
|
(phpinspect-region-overlaps-point reg2 (phpinspect-region-start reg1))
|
|
|
|
|
(phpinspect-region-overlaps-point reg2 (- (phpinspect-region-end reg1) 1))))
|
|
|
|
|
|
|
|
|
|
(defsubst phpinspect-region-encloses (reg1 reg2)
|
|
|
|
|
(and (<= (phpinspect-region-start reg1) (phpinspect-region-start reg2))
|
|
|
|
@ -109,6 +109,7 @@
|
|
|
|
|
(region-start (gensym))
|
|
|
|
|
(region-end (gensym)))
|
|
|
|
|
`(let ((,bmap)
|
|
|
|
|
,(when (symbolp place) place)
|
|
|
|
|
(,bmap-stack (list ,(cadr place-and-bmap)))
|
|
|
|
|
(,region-start (car ,region))
|
|
|
|
|
(,region-end (cadr ,region)))
|
|
|
|
@ -124,10 +125,7 @@
|
|
|
|
|
(declare (indent defun))
|
|
|
|
|
(let ((place (car place-and-bmap))
|
|
|
|
|
(bmap (gensym))
|
|
|
|
|
(bmap-stack (gensym))
|
|
|
|
|
(_ignored (gensym))
|
|
|
|
|
(overlay-start (gensym))
|
|
|
|
|
(overlay-end (gensym)))
|
|
|
|
|
(_ignored (gensym)))
|
|
|
|
|
`(let ((,bmap ,(cadr place-and-bmap)))
|
|
|
|
|
(maphash (lambda (,_ignored ,place)
|
|
|
|
|
,@body
|
|
|
|
|