[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/objed a16418c 040/166: Refactor object-toggle-state
From: |
Clemens Radermacher |
Subject: |
[elpa] externals/objed a16418c 040/166: Refactor object-toggle-state |
Date: |
Sun, 29 Dec 2019 08:20:57 -0500 (EST) |
branch: externals/objed
commit a16418c47b7afc0d21ffeb069e480c351dd03a50
Author: Clemens Radermacher <address@hidden>
Commit: Clemens Radermacher <address@hidden>
Refactor object-toggle-state
---
objed.el | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/objed.el b/objed.el
index 9e17e7d..0e73751 100644
--- a/objed.el
+++ b/objed.el
@@ -1773,24 +1773,10 @@ to an object containing the current one."
"Toggle state of object.
Shrinks to inner objects on repeat if possible."
- (interactive)
(when (eq objed--object 'sexp)
(save-excursion
(objed-context-object)))
- (let ((boo (eq (point) (objed--beg)))
- (eoo (eq (point) (objed--end))))
- (objed--reverse)
- (cond (boo
- (goto-char (objed--beg)))
- ((and eoo
- (not (eq objed--object 'line)))
- (goto-char (objed--end)))
- ((< (point) (objed--beg))
- (goto-char (objed--beg)))
- ((and
- (> (point) (objed--beg))
- (> (point) (objed--end)))
- (goto-char (objed--end))))))
+ (objed--reverse))
(defun objed-backward-until-context (arg)
"Goto object inner beginning and activate part moved over.
@@ -1924,7 +1910,20 @@ Default to sexp at point."
Switches between inner and whole object state."
(interactive)
- (objed--toggle-state))
+ (let ((boo (eq (point) (objed--beg)))
+ (eoo (eq (point) (objed--end))))
+ (objed--toggle-state)
+ (cond (boo
+ (goto-char (objed--beg)))
+ ((and eoo
+ (not (eq objed--object 'line)))
+ (goto-char (objed--end)))
+ ((< (point) (objed--beg))
+ (goto-char (objed--beg)))
+ ((and
+ (> (point) (objed--beg))
+ (> (point) (objed--end)))
+ (goto-char (objed--end))))))
(defun objed-expand-context ()
@@ -1950,6 +1949,7 @@ On expand move to start of object."
(if (objed--inner-p)
(let ((curr (objed--current)))
(objed--toggle-state)
+ (goto-char (objed--beg))
(when (equal curr (objed--current))
(objed-context-object)
(goto-char (objed--beg))))
- [elpa] externals/objed 25111a3 010/166: Dont check buffer whe objed--buffer is gone, (continued)
- [elpa] externals/objed 25111a3 010/166: Dont check buffer whe objed--buffer is gone, Clemens Radermacher, 2019/12/29
- [elpa] externals/objed 333b58c 014/166: Change indentation object to include leading ws, Clemens Radermacher, 2019/12/29
- [elpa] externals/objed 89e1e18 016/166: Also activate mc if only one fake cursor, Clemens Radermacher, 2019/12/29
- [elpa] externals/objed 0cb2593 017/166: Tweak sexp object, Clemens Radermacher, 2019/12/29
- [elpa] externals/objed dc673b8 022/166: Fix for mc counting non fake cursor as cursor, Clemens Radermacher, 2019/12/29
- [elpa] externals/objed 252a1d3 021/166: For brackets, strings and comments switch to sexp on continuation, Clemens Radermacher, 2019/12/29
- [elpa] externals/objed 0fa1ea3 024/166: Default to sexp for continuation object, Clemens Radermacher, 2019/12/29
- [elpa] externals/objed be2c78c 027/166: Fix word object for subword-mode, Clemens Radermacher, 2019/12/29
- [elpa] externals/objed 0956db5 029/166: Don't add additional undo bounds for numeric repeats, Clemens Radermacher, 2019/12/29
- [elpa] externals/objed 781f0ee 031/166: Make word object behave correctly with superword/subword-mode, Clemens Radermacher, 2019/12/29
- [elpa] externals/objed a16418c 040/166: Refactor object-toggle-state,
Clemens Radermacher <=
- [elpa] externals/objed f9c3819 020/166: Tweak sexp object again, Clemens Radermacher, 2019/12/29
- [elpa] externals/objed 2701f73 026/166: Fix backward kill for continuation, Clemens Radermacher, 2019/12/29
- [elpa] externals/objed bddcb432 032/166: Fix dosctring, Clemens Radermacher, 2019/12/29
- [elpa] externals/objed 8babcfc 030/166: Make obj state buffer local and keep it on movement, Clemens Radermacher, 2019/12/29
- [elpa] externals/objed e6d306b 033/166: Don't exclude current object for objed-ace, Clemens Radermacher, 2019/12/29
- [elpa] externals/objed 32221a6 041/166: Remember object type for marked object, Clemens Radermacher, 2019/12/29
- [elpa] externals/objed 74204af 037/166: Add ability to jump to objects inside current one, Clemens Radermacher, 2019/12/29
- [elpa] externals/objed 87cdeee 039/166: Improve toggle state, Clemens Radermacher, 2019/12/29
- [elpa] externals/objed 6ae9bff 042/166: When repeating backward/forward until proceed to object boundary, Clemens Radermacher, 2019/12/29
- [elpa] externals/objed 1b50645 048/166: Update docstring, Clemens Radermacher, 2019/12/29