* lisp/emacs-lisp/lisp.el (forward-sexp-function): Set back to nil.

(forward-sexp): Revert back to checking 'forward-sexp-function'
for nil (bug#70426).

(cherry picked from commit ada429c375235c4d8bd3bf5e6bb2507fb44f63dd)

diff --git a/etc/NEWS b/etc/NEWS
index e2740996c8d1af57aa62f5014af50d28f7772096..5ff82c99a522645a4e40baa507f5eff45e9974d8 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2246,10 +2246,6 @@ All tree-sitter enabled modes that define 'sentence' in
 
 ** Functions and variables to move by program sexps
 
-*** New function 'forward-sexp-default-function'.
-The previous implementation of 'forward-sexp' is moved into its
-own function, to be bound by 'forward-sexp-function'.
-
 *** New function 'treesit-forward-sexp'.
 Tree-sitter conditionally sets 'forward-sexp-function' for major modes
 that have defined 'sexp' in 'treesit-thing-settings' to enable

diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el
index bd0b38db7eafb3b8e8413300d45418fe44129fea..7e6db51b1d5cfb482c30249594d395632a9ea9b9 100644 (file)
--- a/lisp/emacs-lisp/lisp.el
+++ b/lisp/emacs-lisp/lisp.el
@@ -50,7 +50,7 @@ This affects `insert-parentheses' and `insert-pair'."
   (goto-char (or (scan-sexps (point) arg) (buffer-end arg)))
   (if (< arg 0) (backward-prefix-chars)))
 
-(defvar forward-sexp-function #'forward-sexp-default-function
+(defvar forward-sexp-function nil
   ;; FIXME:
   ;; - for some uses, we may want a "sexp-only" version, which only
   ;;   jumps over a well-formed sexp, rather than some dwimish thing
@@ -79,9 +79,9 @@ report errors as appropriate for this kind of usage."
                                     "No next sexp"
                                   "No previous sexp"))))
     (or arg (setq arg 1))
-    (funcall (or forward-sexp-function
-                 #'forward-sexp-default-function)
-             arg)))
+    (if forward-sexp-function
+        (funcall forward-sexp-function arg)
+      (forward-sexp-default-function arg))))
 
 (defun backward-sexp (&optional arg interactive)
   "Move backward across one balanced expression (sexp).

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 2973aba771cd2514359e6a6c3714193548bafc26..2b899a841832394df2d4865a47afca8828ba578d 100644 (file)
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -2153,7 +2153,7 @@ by `text' and `sexp' in `treesit-thing-settings'."
   (let ((arg (or arg 1))
         (pred (or treesit-sexp-type-regexp 'sexp)))
     (or (when (treesit-node-match-p (treesit-node-at (point)) 'text t)
-          (funcall #'forward-sexp-default-function arg)
+          (forward-sexp-default-function arg)
           t)
         (if (> arg 0)
             (treesit-end-of-thing pred (abs arg) 'restricted)