emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/poke-mode 3f36f071c0 3/3: Go back to modify forward-sex


From: ELPA Syncer
Subject: [elpa] externals/poke-mode 3f36f071c0 3/3: Go back to modify forward-sexp-function when calling backward-sexp
Date: Sun, 10 Apr 2022 16:57:50 -0400 (EDT)

branch: externals/poke-mode
commit 3f36f071c0cc154e4da2cdfdfa6666d3d98a4b24
Author: Jose E. Marchesi <jose.marchesi@oracle.com>
Commit: Jose E. Marchesi <jose.marchesi@oracle.com>

    Go back to modify forward-sexp-function when calling backward-sexp
---
 poke-mode.el | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/poke-mode.el b/poke-mode.el
index 8e9daee303..cd08b4a97c 100644
--- a/poke-mode.el
+++ b/poke-mode.el
@@ -289,8 +289,6 @@
     '((assoc ";") (assoc ",")
       (assoc "+") (assoc "-")))))
 
-(defvar poke--smie-in-if-op nil)
-
 (defun poke--smie-forward-token ()
   (let ((case-fold-search nil)
         (token (smie-default-forward-token)))
@@ -301,19 +299,16 @@
         (forward-char 1)
         "if-("))
      ;; Handle if-)
-     ((and (or (equal token "") (not token))
-           (not poke--smie-in-if-op) (looking-at ")"))
+     ((and (or (equal token "") (not token)) (looking-at ")"))
       (condition-case nil
           (when (save-excursion
                   (forward-char 1)
-                  (setq poke--smie-in-if-op t)
-                  (backward-sexp)
-                  (setq poke--smie-in-if-op nil)
+                  (let ((forward-sexp-function nil))
+                    (backward-sexp))
                   (looking-back "if[ \t\n]*"))
             (forward-char 1)
             "if-)")
         (scan-error
-         (setq poke--smie-in-if-op nil)
          nil)))
      (t
       token))))
@@ -331,22 +326,18 @@
       (cond
        ;; Handle if-(
        ((and (or (equal token "") (not token)) (looking-back "if[ \t\n]*("))
-        (setq poke--smie-if-op (point))
         (forward-char -1)
         "if-(")
        ;; Handle if-)
-       ((and (or (equal token "") (not token))
-             (not poke--smie-in-if-op) (looking-back ")"))
+       ((and (or (equal token "") (not token)) (looking-back ")"))
         (condition-case nil
             (when (save-excursion
-                    (setq poke--smie-in-if-op t)
-                    (backward-sexp)
-                    (setq poke--smie-in-if-op nil)
+                    (let ((forward-sexp-function nil))
+                      (backward-sexp))
                     (looking-back "if[ \t\n]*"))
               (forward-char -1)
               "if-)")
           (scan-error
-           (setq poke--smie-in-if-op nil)
            nil)))
        (t
         token))))))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]