diff options
| author | Michael R. Mauger | 2017-07-24 22:15:04 -0400 |
|---|---|---|
| committer | Michael R. Mauger | 2017-07-24 22:15:04 -0400 |
| commit | df1a71272e5cdd10b511e2ffd702ca50ddd8a773 (patch) | |
| tree | 9b9ac725394ee80891e2bff57b6407d0e491e71a /lisp/window.el | |
| parent | eb27fc4d49e8c914cd0e6a8a2d02159601542141 (diff) | |
| parent | 32daa3cb54523006c88717cbeac87964cd687a1b (diff) | |
| download | emacs-df1a71272e5cdd10b511e2ffd702ca50ddd8a773.tar.gz emacs-df1a71272e5cdd10b511e2ffd702ca50ddd8a773.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'lisp/window.el')
| -rw-r--r-- | lisp/window.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/window.el b/lisp/window.el index 43e9e995953..2b979f46636 100644 --- a/lisp/window.el +++ b/lisp/window.el | |||
| @@ -7192,9 +7192,9 @@ See `display-buffer' for the format of display actions." | |||
| 7192 | (let ((pars (special-display-p (buffer-name buffer)))) | 7192 | (let ((pars (special-display-p (buffer-name buffer)))) |
| 7193 | (when pars | 7193 | (when pars |
| 7194 | (list (list #'display-buffer-reuse-window | 7194 | (list (list #'display-buffer-reuse-window |
| 7195 | `(lambda (buffer _alist) | 7195 | (lambda (buffer _alist) |
| 7196 | (funcall special-display-function | 7196 | (funcall special-display-function |
| 7197 | buffer ',(if (listp pars) pars))))))))) | 7197 | buffer (if (listp pars) pars))))))))) |
| 7198 | 7198 | ||
| 7199 | (defun display-buffer-pop-up-frame (buffer alist) | 7199 | (defun display-buffer-pop-up-frame (buffer alist) |
| 7200 | "Display BUFFER in a new frame. | 7200 | "Display BUFFER in a new frame. |