Merge from origin/emacs-26

0589de5 (origin/emacs-26) Fix markup of fake keys in the ELisp manual
82d4b98 Avoid errors in Auto Revert mode
a3b1935 Mention empty strings in file name expansion, emacs lisp refe...
a38da0d cc-mode.texi: Work around makeinfo alignment bug.  Fix proble...
464ee80 Warn against recursive invocations of 'buffer-list-update-hoo...
60b5c10 Provide more details in doc-string of 'delete-windows-on' (Bu...
f0be0f1 Improve documentation of 'delete-windows-on'
f1bddc7 * lisp/frame.el (make-frame-command): Doc fix.  (Bug#34715)
2848623 Avoid undefined behavior in gdb-mi.el
dbf1837 * lisp/window.el (fit-frame-to-buffer): Make doc-string more ...
099ef44 Minor spelling and grammar fixes (bug#34756)
52fd400 Minor improvement of documentation of '(when CONDITION . SPEC)'
f872b65 Improve documentation of 'auto-coding-functions'
04cad5e Fix visiting XML files with non-Unix EOL format
a89fabe Update example major mode code in Elisp manual

# Conflicts:
#	lisp/autorevert.el
#	lisp/window.el

diff --cc doc/emacs/windows.texi
Simple merge

diff --cc doc/lispintro/emacs-lisp-intro.texi
Simple merge

diff --cc doc/lispref/buffers.texi
Simple merge

diff --cc doc/lispref/display.texi
Simple merge

diff --cc doc/lispref/files.texi
Simple merge

diff --cc doc/lispref/keymaps.texi
Simple merge

diff --cc doc/lispref/modes.texi
Simple merge

diff --cc doc/lispref/nonascii.texi
Simple merge

diff --cc doc/misc/ede.texi
Simple merge

diff --cc doc/misc/gnus-faq.texi
Simple merge

diff --cc doc/misc/gnus.texi
Simple merge

diff --cc lisp/autorevert.el
Simple merge

diff --cc lisp/frame.el
Simple merge

diff --cc lisp/gnus/gnus-art.el
Simple merge

diff --cc lisp/gnus/message.el
Simple merge

diff --cc lisp/international/mule.el
Simple merge

diff --cc lisp/progmodes/gdb-mi.el
Simple merge

diff --cc lisp/window.el
index 39f4fa139bb63995ee908915635224b719a92659,58e22a2306af4ace79279ec30bd5637dfc9916ab..a8b65657a49e0a47fe11e13a5a72379436b668f1
--- 1/lisp/window.el
--- 2/lisp/window.el
+++ b/lisp/window.el
@@@ -4713,10 -4702,26 +4715,26 @@@ have special meanings
  Any other value of FRAME means consider all windows on all
  frames.
  
- When a window showing BUFFER-OR-NAME is dedicated and the only
- window of its frame, that frame is deleted when there are other
- frames left."
+ Interactively, FRAME is the prefix argument, so you can
+ use \\[universal-argument] 0 to specify all windows only on
+ the current terminal's frames.
+ 
+ If a frame's root window shows the buffer specified by
+ BUFFER-OR-NAME and is dedicated to that buffer and that frame
+ does not host the active minibuffer window and there is at least
+ one other frame on that frame's terminal, delete that frame.
+ Otherwise, do not delete a frame's root window if it shows the
+ buffer specified by BUFFER-OR-NAME and do not delete any frame's
+ main window showing that buffer either.  Rather, in any such
+ case, call `switch-to-prev-buffer' to show another buffer in that
+ window and make sure the window is no more dedicated to its
+ buffer.
+ 
+ If the buffer specified by BUFFER-OR-NAME is shown in a
+ minibuffer window, do nothing for that window.  For any window
+ that does not show that buffer, remove the buffer from that
+ window's lists of previous and next buffers."
 -  (interactive "BDelete windows on (buffer):\nP")
 +  (interactive "bDelete windows on (buffer):\nP")
    (let ((buffer (window-normalize-buffer buffer-or-name))
        ;; Handle the "inverted" meaning of the FRAME argument wrt other
        ;; `window-list-1' based function.

diff --cc src/buffer.c
Simple merge