diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2023-03-27 17:16:59 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2023-03-27 17:16:59 -0400 |
| commit | eb166287f3de74ab918e66e5e394554fb7acb9af (patch) | |
| tree | 1929b53158cb313d4e45f5f04d2febfd33d2cb3c /lisp/subr.el | |
| parent | b0d5f5168c1f4c3a321de8186858ff806fc5d720 (diff) | |
| parent | edc460e3b6c38eee97dde847987b2c29dd134653 (diff) | |
| download | emacs-eb166287f3de74ab918e66e5e394554fb7acb9af.tar.gz | |
Merge from origin/emacs-29
edc460e3b6c Fix accidental backward-incompatible change (bug#62417)
cbef1422fe3 ruby-ts-mode: Fix/simplify Imenu index generation
a0d5fba74a6 (ruby-ts--align-chain): Use 'equal' to check for an exact...
Diffstat (limited to 'lisp/subr.el')
| -rw-r--r-- | lisp/subr.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/subr.el b/lisp/subr.el index 99ddd813867..39866dd7acb 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -7114,7 +7114,7 @@ CONDITION is either: - the symbol t, to always match, - the symbol nil, which never matches, - a regular expression, to match a buffer name, -- a predicate function that takes a buffer object and ARG as +- a predicate function that takes BUFFER-OR-NAME and ARG as arguments, and returns non-nil if the buffer matches, - a cons-cell, where the car describes how to interpret the cdr. The car can be one of the following: @@ -7140,8 +7140,8 @@ CONDITION is either: (string-match-p condition (buffer-name buffer))) ((pred functionp) (if (eq 1 (cdr (func-arity condition))) - (funcall condition buffer) - (funcall condition buffer arg))) + (funcall condition buffer-or-name) + (funcall condition buffer-or-name arg))) (`(major-mode . ,mode) (eq (buffer-local-value 'major-mode buffer) |