Merge from origin/emacs-25

ec4226d * lisp/woman.el (woman): Fix docstring prefix arg description.
2b774fa Mention "editor" in Emacs man page header
ae60d0c Document problems with nerd-fonts
2fdb5a9 ; Details about pinning Emacs to w32 task bar
5c3105e * doc/lispref/modes.texi (Derived Modes): Make example more i...
4c51ef4 Clarify what is the "cursor"
8303c32 ; * etc/NEWS: Copyedits.
3f7493e ; Fix a typo in comment
c54cf8d Improve commentary in lisp.h
8b92f86 ; * admin/make-tarball.txt: Cross-reference admin/release-pro...
0ba9932 Disable native completion for ipython (Bug#25067)
38fc456 Fix a typo in ada-mode manual
00e75ba ; * src/coding.c (Fencode_coding_region): Fix a typo in the d...
a541c21 Clarify documentation of 'bufferpos-to-filepos' and 'filepos-...

# Conflicts:
#	etc/NEWS
#	etc/PROBLEMS

1 files changed, 1 insertions, 1 deletions

diff --git a/lisp/vc/ediff-wind.el b/lisp/vc/ediff-wind.el
index 8516c11d136..9b3d53fca76 100644
--- a/lisp/vc/ediff-wind.el
+++ b/lisp/vc/ediff-wind.el
@@ -579,7 +579,7 @@ into icons, regardless of the window manager."
     (if (and (window-live-p wind-A)
              (null use-same-frame) ; implies wind-A is suitable
              (null use-same-frame-for-AB))
-        (progn ; bug A on its own
+        (progn ; buf A on its own
           ;; buffer buf-A is seen in live wind-A
           (select-window wind-A)
           (delete-other-windows)