[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/objed 5a1c9f7 122/216: Improve char switching with obje
From: |
Stefan Monnier |
Subject: |
[elpa] externals/objed 5a1c9f7 122/216: Improve char switching with objec-ace |
Date: |
Tue, 8 Jan 2019 12:29:24 -0500 (EST) |
branch: externals/objed
commit 5a1c9f73eefb7c57bc64c03e06a323a2329e7129
Author: Clemera <address@hidden>
Commit: Clemera <address@hidden>
Improve char switching with objec-ace
---
objed.el | 36 ++++++++++++++++++++----------------
1 file changed, 20 insertions(+), 16 deletions(-)
diff --git a/objed.el b/objed.el
index 28fdaf2..884af42 100644
--- a/objed.el
+++ b/objed.el
@@ -458,6 +458,7 @@ To avoid loading `avy' set this var before activating
`objed-mode.'"
(declare-function which-key--create-buffer-and-show "ext:which-key")
(declare-function avy--process "ext:avy")
(declare-function avy--style-fn "ext:avy")
+(declare-function avy-goto-char "ext:avy")
(declare-function edit-indirect-region "ext:edit-indirect")
(declare-function electric-pair-syntax-info "ext:elec-pair")
@@ -1768,22 +1769,25 @@ textual content of an object via the content object."
(defun objed-ace ()
"Jump to an object with `avy'."
(interactive)
- (unless (and objed--avy-avail-p
- objed-use-avy-if-available-p)
- (user-error objed--avy-err-msg))
- (let* ((avy-action #'goto-char)
- (avy-style 'at-full)
- (avy-all-windows t)
- (posns (objed--collect-object-positions
- (window-start) (window-end))))
- (cond (posns
- (if (> (length posns) 1)
- (avy--process
- posns (avy--style-fn avy-style))
- (goto-char (caar posns)))
- (objed--update-current-object))
- (t
- (message "No objects found.")))))
+ (if (eq objed--object 'char)
+ (progn (call-interactively #'avy-goto-char)
+ (objed--update-current-object))
+ (unless (and objed--avy-avail-p
+ objed-use-avy-if-available-p)
+ (user-error objed--avy-err-msg))
+ (let* ((avy-action #'goto-char)
+ (avy-style 'at-full)
+ (avy-all-windows t)
+ (posns (objed--collect-object-positions
+ (window-start) (window-end))))
+ (cond (posns
+ (if (> (length posns) 1)
+ (avy--process
+ posns (avy--style-fn avy-style))
+ (goto-char (caar posns)))
+ (objed--update-current-object))
+ (t
+ (message "No objects found."))))))
(defun objed-occur ()
"Complete initial lines and jump to object."
- [elpa] externals/objed 7ba5cb2 088/216: New until beg/end of buffer behavior, (continued)
- [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, 2019/01/08
- [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 <=
- [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
- [elpa] externals/objed 051028c 129/216: Fix init for entry commands which use after-init-alist, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 4b21416 112/216: Fix endless textblock search, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 703d634 131/216: Move some op bindings to more emacsy bindings, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 92fd6e7 135/216: Fix marking instances in objects not surrounding point, Stefan Monnier, 2019/01/08
- [elpa] externals/objed b9866d6 101/216: Fix undo op behavior, Stefan Monnier, 2019/01/08