[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/objed 95503ca 046/216: Fix syntax object
From: |
Stefan Monnier |
Subject: |
[elpa] externals/objed 95503ca 046/216: Fix syntax object |
Date: |
Tue, 8 Jan 2019 12:29:09 -0500 (EST) |
branch: externals/objed
commit 95503ca4014354aabf7473df58af1367cf304ca1
Author: Clemera <address@hidden>
Commit: Clemera <address@hidden>
Fix syntax object
---
objed-objects.el | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/objed-objects.el b/objed-objects.el
index 8c72b40..b0c69e8 100644
--- a/objed-objects.el
+++ b/objed-objects.el
@@ -1903,10 +1903,11 @@ non-nil the indentation block can contain empty lines."
(search-backward ">" nil t))
-(defun objed--what-face (pos)
- (let ((face (or (get-char-property (pos) 'read-face-name)
- (get-char-property (pos) 'face))))
- (unless (keywordp (car-safe face)) (list face))))
+(defun objed--what-face (&optional pos)
+ (let* ((pos (or pos (point)))
+ (face (or (get-text-property pos 'face))))
+ (unless (keywordp (car-safe face)) (list face))))
+
;; from `evil-textobj-syntax'
(defun objed--get-syntax-range (&optional inclusive arg)
@@ -1938,7 +1939,7 @@ non-nil the indentation block can contain empty lines."
(let ((continue t))
(while (and continue (< (+ (point) 1) (point-max)))
(forward-char)
- (let ((forward-point-face (objed---what-face)))
+ (let ((forward-point-face (objed--what-face)))
(if (= 32 (char-syntax (char-after)))
(setq forward-point (point))
(if (equal point-face forward-point-face)
@@ -1953,6 +1954,7 @@ non-nil the indentation block can contain empty lines."
(objed-define-object nil syntax
:get-obj (objed--get-syntax-range)
+ ;; TODO: search for next same face as current...
:try-next
(re-search-forward "\\<" nil t)
:try-prev
- [elpa] externals/objed 9c9797b 039/216: Add melpa badge, (continued)
- [elpa] externals/objed 9c9797b 039/216: Add melpa badge, Stefan Monnier, 2019/01/08
- [elpa] externals/objed ae9f965 041/216: Fixes #9, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 630d2de 028/216: Improve/add indentation commands, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 61bb3eb 031/216: Fixup bindings and docs, Stefan Monnier, 2019/01/08
- [elpa] externals/objed ca32294 038/216: Ensure value for cursor color, #5, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 430d858 037/216: Add more command to move objects around and change bindings for them, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 64dc38b 035/216: More on indent/move commands, Stefan Monnier, 2019/01/08
- [elpa] externals/objed d5dd1d0 045/216: Fix function name, Stefan Monnier, 2019/01/08
- [elpa] externals/objed f33147d 043/216: Add syntax object adjusted from laishulu/evil-textobj-syntax, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 8c3ba86 040/216: Add note about changing bindings, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 95503ca 046/216: Fix syntax object,
Stefan Monnier <=
- [elpa] externals/objed 7ad08e2 052/216: Set C-h to work as usual, Stefan Monnier, 2019/01/08
- [elpa] externals/objed dc8c569 033/216: Improve surround op, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 1f09072 064/216: Improve file object, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 96c6b8f 065/216: Add DEL key for in buffer replacement, fixes #6, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 41be963 054/216: Adjust textblock and block object order, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 843d843 059/216: Remove textblock from context objects, Stefan Monnier, 2019/01/08
- [elpa] externals/objed de241e3 048/216: Start to support mc, Stefan Monnier, 2019/01/08
- [elpa] externals/objed ebad1ac 061/216: Fix face object, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 042c3bb 051/216: Change some bindings, Stefan Monnier, 2019/01/08
- [elpa] externals/objed f605604 057/216: Rename syntax object to face object, Stefan Monnier, 2019/01/08