[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/objed b7fbf71 106/216: Fixes #12, collect no-skipping o
From: |
Stefan Monnier |
Subject: |
[elpa] externals/objed b7fbf71 106/216: Fixes #12, collect no-skipping objects correctly |
Date: |
Tue, 8 Jan 2019 12:29:21 -0500 (EST) |
branch: externals/objed
commit b7fbf71edeaf198adfdd1776978e138329523440
Author: Clemera <address@hidden>
Commit: Clemera <address@hidden>
Fixes #12, collect no-skipping objects correctly
---
objed-objects.el | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/objed-objects.el b/objed-objects.el
index 9a9f508..54515d8 100644
--- a/objed-objects.el
+++ b/objed-objects.el
@@ -482,12 +482,18 @@ and the current window."
(setq obj (objed--get-next (point)))
(not (equal obj sobj)))
(setq sobj obj)
- (goto-char (setq pos (objed--end obj)))
+ (if (objed--no-skipper-p)
+ (goto-char (setq pos (objed--beg obj)))
+ (goto-char (setq pos (objed--end obj))))
(push (cons (objed--skip-forward (objed--beg obj) 'ws)
cw)
posns)))
(setq posns (nreverse posns))))
+(defun objed--no-skipper-p ()
+ (get (objed--name2func objed--object)
+ 'objed-no-skip))
+
(defun objed--collect-object-positions (beg end &optional fromp)
"Collect object positions.
@@ -502,7 +508,8 @@ the objects and the current window."
(or fromp (objed--min))
beg)
(objed--collect-forward
- (or fromp (objed--max))
+ (or fromp (if (objed--no-skipper-p)
+ (objed--min) (objed--max)))
end)))
@@ -696,9 +703,7 @@ If FROM is a position search from there otherwise search
starts
from end of object FROM."
(let ((obj (or from objed--current-obj)))
(save-excursion
- (when (and obj
- (not (get (objed--name2func objed--object)
- 'objed-no-skip)))
+ (when (and obj (not (objed--no-skipper-p)))
(if (integer-or-marker-p obj)
(goto-char obj)
(goto-char (objed--max obj))))
- [elpa] externals/objed 49082c7 167/216: Accept 1 as universal arg, (continued)
- [elpa] externals/objed 49082c7 167/216: Accept 1 as universal arg, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 185fe41 111/216: Remove unused lexical var, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 8a74424 125/216: Optimize init/reset procedure, avoid unnecessary re-initialization, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 9c1b350 067/216: Update link, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 7abf5b3 091/216: Fixes #3, switch to remote object with '#', Stefan Monnier, 2019/01/08
- [elpa] externals/objed 7ba5cb2 088/216: New until beg/end of buffer behavior, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 22392cf 099/216: Add whitepsace objects, fixes #2, Stefan Monnier, 2019/01/08
- [elpa] externals/objed f3efa0e 121/216: Don't let sentence object jump over to next comments/string, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 192217a 066/216: Add no-skip option and block object, Stefan Monnier, 2019/01/08
- [elpa] externals/objed a2df7ab 075/216: Stay active when using describe key in modal state, Stefan Monnier, 2019/01/08
- [elpa] externals/objed b7fbf71 106/216: Fixes #12, collect no-skipping objects correctly,
Stefan Monnier <=
- [elpa] externals/objed 29bccb0 042/216: Whitespace cleanup, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 2e1e5c1 110/216: Run compilation as part of make test, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 433e92d 104/216: Block objed advices in object body codes, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 79ec8af 116/216: Fix boundary error, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 5a1c9f7 122/216: Improve char switching with objec-ace, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 38887bb 107/216: Adjust textblock object, Stefan Monnier, 2019/01/08
- [elpa] externals/objed fc11d2b 119/216: Fix skipping ws if point is after the object, Stefan Monnier, 2019/01/08
- [elpa] externals/objed d50117d 114/216: Fix kill-op error, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 49e36fd 123/216: Change back to indentation behavior, Stefan Monnier, 2019/01/08
- [elpa] externals/objed ce608d8 115/216: Add symbol object back, Stefan Monnier, 2019/01/08