mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-23 04:53:12 -08:00
Code Issues Projects Releases Wiki Activity

(forward-sexp-function): Give it a default value

Browse source 
* lisp/emacs-lisp/lisp.el (forward-sexp-function): Give it a default value.
(forward-sexp): Simplify a bit.
(up-list-default-function): Fix for `forward-sexp-default-function`.
This commit is contained in:
Stefan Monnier 2026-01-13 09:26:20 -05:00
parent b456ffc994
commit cffc4278eb
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lisp/emacs-lisp/lisp.el
View file

@ -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 nil
(defvar forward-sexp-function #'forward-sexp-default-function
;; 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))
(if forward-sexp-function
(funcall forward-sexp-function arg)
(forward-sexp-default-function arg))))
(funcall (or forward-sexp-function
#'forward-sexp-default-function)
arg)))
(defun backward-sexp (&optional arg interactive)
"Move backward across one balanced expression (sexp).
@ -289,7 +289,9 @@ On error, location of point is unspecified."
(scan-error (point-max)))
(forward-comment 1)
(point)))))))
(if (null forward-sexp-function)
;; FIXME: Comparing functions is a code smell.
(if (memq forward-sexp-function
'(nil forward-sexp-default-function))
(goto-char (or (scan-lists (point) inc 1)
(buffer-end arg)))
(condition-case err