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/window.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/window.el')
| -rw-r--r-- | lisp/window.el | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/lisp/window.el b/lisp/window.el index 08ce8498655..d53136d406b 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -7510,8 +7510,8 @@ Its value takes effect before processing the ACTION argument of If non-nil, this is an alist of elements (CONDITION . ACTION), where: - CONDITION is passed to `buffer-match-p', along with the buffer - that is to be displayed and the ACTION argument of + CONDITION is passed to `buffer-match-p', along with the name of + the buffer that is to be displayed and the ACTION argument of `display-buffer', to check if ACTION should be used. ACTION is a cons cell (FUNCTIONS . ALIST), where FUNCTIONS is an @@ -7568,12 +7568,16 @@ all fail. It should never be set by programs or users. See (defun display-buffer-assq-regexp (buffer-or-name alist action) "Retrieve ALIST entry corresponding to buffer specified by BUFFER-OR-NAME. This returns the cdr of the alist entry ALIST if the entry's -key (its car) and BUFFER-OR-NAME satisfy `buffer-match-p', using -the key as CONDITION argument of `buffer-match-p'. ACTION should -have the form of the action argument passed to `display-buffer'." +key (its car) and the name of the buffer designated by +BUFFER-OR-NAME satisfy `buffer-match-p', using the key as +CONDITION argument of `buffer-match-p'. ACTION should have the +form of the action argument passed to `display-buffer'." (catch 'match (dolist (entry alist) - (when (buffer-match-p (car entry) buffer-or-name action) + (when (buffer-match-p (car entry) (if (stringp buffer-or-name) + buffer-or-name + (buffer-name buffer-or-name)) + action) (throw 'match (cdr entry)))))) (defvar display-buffer--same-window-action |