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

3 files changed, 15 insertions, 10 deletions

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 88e8e811a65..2e7d769f93d 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -820,14 +820,15 @@ which in turn may have been changed in a mode hook.
 Here is a hypothetical example:
 
 @example
+(defvar hypertext-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map [down-mouse-3] 'do-hyper-link)
+    map))
+
 (define-derived-mode hypertext-mode
   text-mode "Hypertext"
-  "Major mode for hypertext.
-\\@{hypertext-mode-map@}"
-  (setq case-fold-search nil))
-
-(define-key hypertext-mode-map
-  [down-mouse-3] 'do-hyper-link)
+  "Major mode for hypertext."
+  (setq-local case-fold-search nil))
 @end example
 
 Do not write an @code{interactive} spec in the definition;
diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi
index ee4bef6e498..05c08c6dbe5 100644
--- a/doc/lispref/nonascii.texi
+++ b/doc/lispref/nonascii.texi
@@ -142,7 +142,7 @@ be one of the following:
 @table @code
 @item exact
 The result must be accurate.  The function may need to encode and
-decode a large part of the buffer.
+decode a large part of the buffer, which is expensive and can be slow.
 @item approximate
 The value can be an approximation.  The function may avoid expensive
 processing and return an inexact result.
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index affa28c9202..a4f8400170e 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -3532,9 +3532,13 @@ point and the buffer's point always move together; they remain equal.
 @end itemize
 
 @cindex cursor
-   As far as the user is concerned, point is where the cursor is, and
-when the user switches to another buffer, the cursor jumps to the
-position of point in that buffer.
+   Emacs displays the cursor, by default as a rectangular block, in
+each window at the position of that window's point.  When the user
+switches to another buffer in a window, Emacs moves that window's
+cursor to where point is in that buffer.  If the exact position of
+point is hidden behind some display element, such as a display string
+or an image, Emacs displays the cursor immediately before or after
+that display element.
 
 @defun window-point &optional window
 This function returns the current position of point in @var{window}.