[elpa] externals/objed 83d4968 09/16: Improves sexp object/movement

[Clemens Radermacher]

branch: externals/objed
commit 83d49686701c86c7799de7c374c7b81a7ac2d320
Author: Clemens Radermacher <address@hidden>
Commit: Clemens Radermacher <address@hidden>

    Improves sexp object/movement
---
 objed-objects.el | 13 ++++++++-----
 objed.el         | 12 ++++++++++--
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/objed-objects.el b/objed-objects.el
index 5a0c5bf..6f2184d 100644
--- a/objed-objects.el
+++ b/objed-objects.el
@@ -1500,9 +1500,7 @@ comments."
 
 
 (defun objed--at-sexp-p ()
-  "Return non-nil if point at strutured expression.
-
-Ignores simple structured expressions like words or symbols."
+  "Return sexp object if point at strutured expression."
   (let ((opos (point))
         (real-this-command 'forward-sexp))
     (save-excursion
@@ -1515,6 +1513,8 @@ Ignores simple structured expressions like words or 
symbols."
                        (forward-sexp (- arg)))))))
         (let ((zigp nil))
           (when (or (and (not (eobp))
+                         (or (eq (char-syntax (char-before)) ?\s)
+                             (not (eq (char-syntax (char-after)) ?\")))
                          (save-excursion
                            (eq (point) (progn (setq zigp (zigzag 1))
                                               (point)))))
@@ -1561,8 +1561,11 @@ Ignores simple structured expressions like words or 
symbols."
                     (cons beg (point)))))))
   :try-next
   (or (ignore-errors
-         (forward-sexp 1)
-         (forward-sexp -1) t)
+        (forward-sexp 1)
+        (forward-sexp -1) t)
+      (ignore-errors
+        (up-list 1)
+        t)
       (ignore-errors
         (forward-word 1)
         (forward-sexp -1)
diff --git a/objed.el b/objed.el
index 20e45d6..47647d7 100644
--- a/objed.el
+++ b/objed.el
@@ -910,14 +910,22 @@ Use `objed-define-dispatch' to define a dispatch 
command.")
 (defun objed--forward-sexp ()
   (interactive)
   (while (and (not (eobp))
-              (not (ignore-errors (call-interactively 'forward-sexp) t)))
+              (or  (and (not (bobp))
+                        (not (eq (char-syntax (char-before)) ?\s))
+                        (eq (char-syntax (char-after)) ?\"))
+                   (not (ignore-errors
+                          (call-interactively 'forward-sexp)
+                          t))))
     (forward-char 1)))
 
 
 (defun objed--backward-sexp ()
   (interactive)
   (while (and (not (bobp))
-              (not (ignore-errors (call-interactively 'backward-sexp) t)))
+              (or  (eq (char-syntax (char-before)) ?\")
+                   (not (ignore-errors
+                          (call-interactively 'backward-sexp)
+                          t))))
     (forward-char -1)))