[elpa] externals/objed 0cb2593 017/166: Tweak sexp object

[Clemens Radermacher]

branch: externals/objed
commit 0cb259346a461182a41100cf653eff0d348c9505
Author: Clemens Radermacher <address@hidden>
Commit: Clemens Radermacher <address@hidden>

    Tweak sexp object
---
 objed-objects.el | 55 +++++++++++++++++++++++++++----------------------------
 1 file changed, 27 insertions(+), 28 deletions(-)

diff --git a/objed-objects.el b/objed-objects.el
index 756501b..db2df7d 100644
--- a/objed-objects.el
+++ b/objed-objects.el
@@ -1568,33 +1568,29 @@ comments."
   (objed--prev-symbol))
 
 
-
 (defun objed--at-sexp-p ()
   "Return sexp object if point at strutured expression."
-  (let ((opos (point))
-        (real-this-command 'forward-sexp))
-    (save-excursion
-      (cl-flet ((zigzag
-                 (arg)
-                 (ignore-errors
-                   (forward-sexp arg)
-                   (unless (eq opos (point))
-                     (prog1 (point)
-                       (forward-sexp (- arg)))))))
-        (let ((zigp nil))
-          (when (or (and (not (eobp))
-                         (or (memq (char-syntax (char-before)) (list ?\s ?>))
-                             (not (eq (char-syntax (char-after)) ?\")))
-                         (save-excursion
-                           (eq (point) (progn (setq zigp (zigzag 1))
-                                              (point)))))
-                    (and (not (bobp))
-                         (save-excursion
-                           (eq (point) (progn (setq zigp (zigzag -1))
-                                              (point))))))
-            (and zigp
-                 (cons (min (point) zigp)
-                       (max (point) zigp)))))))))
+  (let* ((opos (point))
+         (objed--block-p t)
+         (real-this-command 'forward-sexp)
+         (other nil)
+         (atp (or (save-excursion
+                    (ignore-errors
+                      (forward-sexp 1)
+                      (setq other (point))
+                      (forward-sexp -1)
+                      (= (point) opos)))
+                  (save-excursion
+                    (ignore-errors
+                      (forward-sexp -1)
+                      (setq other (point))
+                      (forward-sexp 1)
+                      (= (point) opos))))))
+
+    (when atp
+      (cons (min opos other)
+            (max opos other)))))
+
 
 (objed-define-object nil sexp
   :atp
@@ -1613,9 +1609,12 @@ comments."
       'identifier))
   :get-obj
   (let ((bounds (or (objed--at-sexp-p)
-                    (ignore-errors
-                      (forward-sexp -1)
-                      (objed--at-sexp-p)))))
+                    (save-excursion
+                      (ignore-errors
+                        (forward-sexp 1)
+                        (forward-sexp -1)
+                        (objed--at-sexp-p))))))
+
     (when bounds
       (objed-make-object
        :obounds bounds