Merge from origin/emacs-26

d382d2bfc5 * etc/DEBUG (Getting control to the debugger): Fix grammar.
687af4c8e8 * lisp/vc/vc.el (vc-region-history): log-view-vc-fileset h...
43e2aafae3 Don't bind dframe events on load (Bug#29599)
ab31bf3c5f * lisp/textmodes/picture.el (picture-mode-exit): Doc fix. ...
ed44d92fa6 * lisp/textmodes/picture.el (picture-open-line): Doc fix. ...
b87a772612 Fix description of 'emacs-internal'
a5256da588 Update PROBLEMS with selection-related issues
c59ecb005e New customization variable for python-mode indentation (Bu...
4e20c8f220 Fix menu keyboard shortcuts on macOS (Bug#29595)

# Conflicts:
#	etc/NEWS

1 files changed, 3 insertions, 1 deletions

diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi
index 9d6fc6ca72a..2fd2bbc1ce5 100644
--- a/doc/lispref/nonascii.texi
+++ b/doc/lispref/nonascii.texi
@@ -1112,7 +1112,9 @@ represented in the internal Emacs encoding (@pxref{Text
 Representations}).  This is like @code{raw-text} in that no code
 conversion happens, but different in that the result is multibyte
 data.  The name @code{emacs-internal} is an alias for
-@code{utf-8-emacs}.
+@code{utf-8-emacs-unix} (so it forces no conversion of end-of-line,
+unlike @code{utf-8-emacs}, which can decode all 3 kinds of
+end-of-line conventions).
 
 @defun coding-system-get coding-system property
 This function returns the specified property of the coding system