[Emacs-diffs] master 587f122 4/4: Merge from origin/emacs-26

[Glenn Morris]

branch: master
commit 587f12281aeac6847fff55243572bad5b3828873
Merge: fbe04ad c267421
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    Merge from origin/emacs-26
    
    c267421 (tag: emacs-26.1-rc1, origin/emacs-26) ; * ChangeLog.3: Update.
    aa77415 * etc/AUTHORS: Regenerate.
    c8ffca5 * lisp/files.el (kept-new-versions): Improve documentation st...
    3a798f6 Fix a minor mistake in the ELisp manual
    6afa868 ; * src/dispextern.h (struct it): Fix a typo in a comment.
    5659b2f * lisp/files.el (find-file-literally): Doc fix.
    9b24a79 Fix typos in doc strings
---
 ChangeLog.3            | 33 ++++++++++++++++++++++++++++++++-
 doc/lispref/files.texi |  5 +++--
 etc/AUTHORS            |  6 +++---
 lisp/files.el          | 15 ++++++++++-----
 lisp/simple.el         |  4 ++--
 src/dispextern.h       |  2 +-
 6 files changed, 51 insertions(+), 14 deletions(-)

diff --git a/ChangeLog.3 b/ChangeLog.3
index 436f04b..2f0ccc8 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -1,3 +1,34 @@
+2018-04-09  Charles A. Roelli  <address@hidden>
+
+       * lisp/files.el (kept-new-versions): Improve documentation string.
+
+2018-04-09  Eli Zaretskii  <address@hidden>
+
+       Fix a minor mistake in the ELisp manual
+
+       * doc/lispref/files.texi (Reading from Files): Fix copy/paste
+       mistake.  (Bug#31107)
+
+2018-04-06  Eli Zaretskii  <address@hidden>
+
+       * lisp/files.el (find-file-literally): Doc fix.
+
+2018-04-05  Eli Zaretskii  <address@hidden>
+
+       Fix typos in doc strings
+
+       * lisp/simple.el (undo-auto--boundary-timer)
+       (undo-auto--boundary-ensure-timer): Fix typos in doc strings.
+
+2018-04-05  Nicolas Petton  <address@hidden>
+
+       Bump Emacs version to 26.1
+
+       * README:
+       * configure.ac:
+       * msdos/sed2v2.inp:
+       * nt/README.W32: Bump Emacs version to 26.1.
+
 2018-04-05  Stefan Monnier  <address@hidden>
 
        * lisp/emacs-lisp/inline.el: Clarify apparent typos
@@ -59180,7 +59211,7 @@
 
 This file records repository revisions from
 commit 9d56a21e6a696ad19ac65c4b405aeca44785884a (exclusive) to
-commit 80d868ed1cf3fb1bf62c9b53e65d1034f20be227 (inclusive).
+commit c8ffca525c60e4a17d9687d92e3304bb27a8d446 (inclusive).
 See ChangeLog.1 for earlier changes.
 
 ;; Local Variables:
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index 3a39826..71402cd 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -582,8 +582,9 @@ with @code{insert-file-contents}, as long as @var{replace} 
and
 
 @defun insert-file-contents-literally filename &optional visit beg end replace
 This function works like @code{insert-file-contents} except that it
-does not run @code{find-file-hook}, and does not do format decoding,
-character code conversion, automatic uncompression, and so on.
+does not run @code{after-insert-file-functions}, and does not do
+format decoding, character code conversion, automatic uncompression,
+and so on.
 @end defun
 
 If you want to pass a file name to another process so that another
diff --git a/etc/AUTHORS b/etc/AUTHORS
index 072072d..4552af9 100644
--- a/etc/AUTHORS
+++ b/etc/AUTHORS
@@ -670,8 +670,8 @@ Chao-Hong Liu: changed TUTORIAL.cn TUTORIAL.zh
 
 Charles A. Roelli: changed nsterm.m nsfns.m nsterm.h org-clock.el DEBUG
   INSTALL add-log.el anti.texi buffers.texi comint.el data.c diff-mode.el
-  display.texi eldoc.el fill.el find-func.el flymake.el frame.el
-  internals.texi macfont.m mouse-tests.el and 12 other files
+  display.texi eldoc.el files.el fill.el find-func.el flymake.el frame.el
+  internals.texi macfont.m and 13 other files
 
 Charles Hannum: changed aix3-1.h aix3-2.h configure ibmrs6000.h
   keyboard.c netbsd.h pop.c sysdep.c systime.h systty.h xrdb.c
@@ -3570,7 +3570,7 @@ Nicolas Graner: changed message.el
 Nicolas Petton: wrote map-tests.el map.el seq-tests.el seq.el
   thunk-tests.el thunk.el
 and co-wrote auth-source-pass.el auth-source-tests.el subr-tests.el
-and changed sequences.texi README authors.el configure.ac sed2v2.inp
+and changed sequences.texi README configure.ac sed2v2.inp authors.el
   emacs.png README.W32 emacs23.png arc-mode.el cl-extra.el emacs.svg
   manoj-dark-theme.el Emacs.icns Makefile.in auth-source.el emacs.ico
   fns.c make-tarball.txt obarray-tests.el obarray.el HISTORY
diff --git a/lisp/files.el b/lisp/files.el
index 83cba24..67a9abf 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -318,7 +318,7 @@ If nil, ask confirmation.  Any other value prevents any 
trimming."
 
 (defcustom kept-new-versions 2
   "Number of newest versions to keep when a new numbered backup is made.
-Includes the new backup.  Must be > 0"
+Includes the new backup.  Must be greater than 0."
   :type 'integer
   :group 'backup)
 (put 'kept-new-versions 'safe-local-variable 'integerp)
@@ -2350,10 +2350,15 @@ and local variable specifications in the file are 
ignored.
 Automatic uncompression and adding a newline at the end of the
 file due to `require-final-newline' is also disabled.
 
-You cannot absolutely rely on this function to result in
-visiting the file literally.  If Emacs already has a buffer
-which is visiting the file, you get the existing buffer,
-regardless of whether it was created literally or not.
+If Emacs already has a buffer which is visiting the file,
+this command asks you whether to visit it literally instead.
+
+In non-interactive use, the value is the buffer where the file is
+visited literally.  If the file was visited in a buffer before
+this command was invoked, it will reuse the existing buffer,
+regardless of whether it was created literally or not; however,
+the contents of that buffer will be the literal text of the file
+without any conversions.
 
 In a Lisp program, if you want to be sure of accessing a file's
 contents literally, you should create a temporary buffer and then read
diff --git a/lisp/simple.el b/lisp/simple.el
index 3d50e38..efe5406 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2997,12 +2997,12 @@ REASON describes the reason that the boundary is being 
added; see
   (setq undo-auto--undoably-changed-buffers nil))
 
 (defun undo-auto--boundary-timer ()
-  "Timer which will run `undo--auto-boundary-timer'."
+  "Timer function run by `undo-auto-current-boundary-timer'."
   (setq undo-auto-current-boundary-timer nil)
   (undo-auto--boundaries 'timer))
 
 (defun undo-auto--boundary-ensure-timer ()
-  "Ensure that the `undo-auto-boundary-timer' is set."
+  "Ensure that the `undo-auto-current-boundary-timer' is set."
   (unless undo-auto-current-boundary-timer
     (setq undo-auto-current-boundary-timer
           (run-at-time 10 nil #'undo-auto--boundary-timer))))
diff --git a/src/dispextern.h b/src/dispextern.h
index 25d51cd..bc2a76f 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -2420,7 +2420,7 @@ struct it
   /* Face to use.  */
   int face_id;
 
-  /* Setting of buffer-local variable selective-display-ellipsis.  */
+  /* Setting of buffer-local variable selective-display-ellipses.  */
   bool_bf selective_display_ellipsis_p : 1;
 
   /* True means control characters are translated into the form `^C'