commit 587f12281aeac6847fff55243572bad5b3828873 (HEAD, refs/remotes/origin/master) Merge: fbe04ad846 c267421647 Author: Glenn Morris Date: Tue Apr 10 07:50:48 2018 -0700 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 commit fbe04ad8462ca2eccc58e7a325f6aa42e44a8c6f Merge: 8f2935a49c 8dffaeabd7 Author: Glenn Morris Date: Tue Apr 10 07:50:48 2018 -0700 ; Merge from origin/emacs-26 The following commit was skipped: 8dffaea Bump Emacs version to 26.1 commit 8f2935a49c7030a03c865ad9890de8bf20148655 Merge: 8b94b8d89f f674c89f7c Author: Glenn Morris Date: Tue Apr 10 07:50:48 2018 -0700 Merge from origin/emacs-26 f674c89 ; * ChangeLog.3: Update. 80d868e * lisp/emacs-lisp/inline.el: Clarify apparent typos 9f54f28 ; * lisp/auth-source.el (auth-sources): Update the :version tag. commit 8b94b8d89fe333d00ec78d1d2d972f095603c3ed Merge: 83a6224d60 3573b4e2ae Author: Glenn Morris Date: Tue Apr 10 07:50:48 2018 -0700 ; Merge from origin/emacs-26 The following commit was skipped: 3573b4e Allow sexp customization type in auth-sources commit c267421647510319d2a70554e42f0d1c394dba0a (tag: refs/tags/emacs-26.1-rc1) Author: Nicolas Petton Date: Mon Apr 9 21:00:56 2018 +0200 ; * ChangeLog.3: Update. diff --git a/ChangeLog.3 b/ChangeLog.3 index 436f04b630..2f0ccc80ec 100644 --- a/ChangeLog.3 +++ b/ChangeLog.3 @@ -1,3 +1,34 @@ +2018-04-09 Charles A. Roelli + + * lisp/files.el (kept-new-versions): Improve documentation string. + +2018-04-09 Eli Zaretskii + + 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 + + * lisp/files.el (find-file-literally): Doc fix. + +2018-04-05 Eli Zaretskii + + 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 + + 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 * 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: commit aa77415774c7e51abb91b28d1e25acc799872db3 Author: Nicolas Petton Date: Mon Apr 9 21:00:47 2018 +0200 * etc/AUTHORS: Regenerate. diff --git a/etc/AUTHORS b/etc/AUTHORS index 072072d417..4552af915c 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 commit c8ffca525c60e4a17d9687d92e3304bb27a8d446 Author: Charles A. Roelli Date: Mon Apr 9 20:26:50 2018 +0200 * lisp/files.el (kept-new-versions): Improve documentation string. diff --git a/lisp/files.el b/lisp/files.el index 1e44f43be1..d0b7285fdb 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) commit 3a798f696b61f0d6e4117b61ddc389a9dd08eff0 Author: Eli Zaretskii Date: Mon Apr 9 17:53:37 2018 +0300 Fix a minor mistake in the ELisp manual * doc/lispref/files.texi (Reading from Files): Fix copy/paste mistake. (Bug#31107) diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi index e2eaa03f68..f62b670f47 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 commit 6afa8682e97b7f34476082d6067c1bb21a9cd0d6 Author: Eli Zaretskii Date: Sat Apr 7 17:24:01 2018 +0300 ; * src/dispextern.h (struct it): Fix a typo in a comment. diff --git a/src/dispextern.h b/src/dispextern.h index 25bd6b24f2..d3e068677f 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' commit 5659b2fe843627aa4b6d450758f71920143ac173 Author: Eli Zaretskii Date: Fri Apr 6 09:44:42 2018 +0300 * lisp/files.el (find-file-literally): Doc fix. diff --git a/lisp/files.el b/lisp/files.el index 974d39ceee..1e44f43be1 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -2342,10 +2342,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 commit 9b24a7937a6b47b6a51f0dba19651c4ba9ce11fe Author: Eli Zaretskii Date: Thu Apr 5 21:38:07 2018 +0300 Fix typos in doc strings * lisp/simple.el (undo-auto--boundary-timer) (undo-auto--boundary-ensure-timer): Fix typos in doc strings. diff --git a/lisp/simple.el b/lisp/simple.el index d8abeb3000..0113156fbe 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -2968,12 +2968,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)))) commit 8dffaeabd758edcbe4a60bc2576f4a7e3bbaacc0 Author: Nicolas Petton Date: Thu Apr 5 11:56:27 2018 +0200 Bump Emacs version to 26.1 * README: * configure.ac: * msdos/sed2v2.inp: * nt/README.W32: Bump Emacs version to 26.1. diff --git a/README b/README index 1ddd11f365..682caf01ca 100644 --- a/README +++ b/README @@ -2,7 +2,7 @@ Copyright (C) 2001-2018 Free Software Foundation, Inc. See the end of the file for license conditions. -This directory tree holds version 26.0.91 of GNU Emacs, the extensible, +This directory tree holds version 26.1 of GNU Emacs, the extensible, customizable, self-documenting real-time display editor. The file INSTALL in this directory says how to build and install GNU diff --git a/configure.ac b/configure.ac index f9c7bb76e5..256b954a89 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ dnl along with GNU Emacs. If not, see . AC_PREREQ(2.65) dnl Note this is parsed by (at least) make-dist and lisp/cedet/ede/emacs.el. -AC_INIT(GNU Emacs, 26.0.91, bug-gnu-emacs@gnu.org) +AC_INIT(GNU Emacs, 26.1, bug-gnu-emacs@gnu.org) dnl Set emacs_config_options to the options of 'configure', quoted for the shell, dnl and then quoted again for a C string. Separate options with spaces. diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp index ea75356f99..535aa7d898 100644 --- a/msdos/sed2v2.inp +++ b/msdos/sed2v2.inp @@ -66,7 +66,7 @@ /^#undef PACKAGE_NAME/s/^.*$/#define PACKAGE_NAME ""/ /^#undef PACKAGE_STRING/s/^.*$/#define PACKAGE_STRING ""/ /^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/ -/^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION "26.0.91"/ +/^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION "26.1"/ /^#undef SYSTEM_TYPE/s/^.*$/#define SYSTEM_TYPE "ms-dos"/ /^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/ /^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/ diff --git a/nt/README.W32 b/nt/README.W32 index 52dcd5df89..6a0ae9fc3b 100644 --- a/nt/README.W32 +++ b/nt/README.W32 @@ -1,7 +1,7 @@ Copyright (C) 2001-2018 Free Software Foundation, Inc. See the end of the file for license conditions. - Emacs version 26.0.91 for MS-Windows + Emacs version 26.1 for MS-Windows This README file describes how to set up and run a precompiled distribution of the latest version of GNU Emacs for MS-Windows. You commit f674c89f7ced2f317f6383e6e572ef636ed7ab7a Author: Nicolas Petton Date: Thu Apr 5 11:27:04 2018 +0200 ; * ChangeLog.3: Update. diff --git a/ChangeLog.3 b/ChangeLog.3 index abaed02b32..436f04b630 100644 --- a/ChangeLog.3 +++ b/ChangeLog.3 @@ -1,3 +1,24 @@ +2018-04-05 Stefan Monnier + + * lisp/emacs-lisp/inline.el: Clarify apparent typos + +2018-04-04 Ted Zlatanov + + Allow sexp customization type in auth-sources + + * lisp/auth-source.el (auth-sources): Allow sexp customization type. + Update the :version tag. + + (cherry picked from commit 447da5b0d49b7aa14fa5d6969015770fdf9b9f92) + +2018-04-03 Nicolas Petton + + * etc/NEWS: Remove temporary markup. + + * etc/AUTHORS: Update. + + * ChangeLog.3: Update. + 2018-04-03 Michael Albinus Fix Bug#31022 @@ -59159,7 +59180,7 @@ This file records repository revisions from commit 9d56a21e6a696ad19ac65c4b405aeca44785884a (exclusive) to -commit 56794ac6c7fb1ca1dd1fd8dfb0ac40e20901f2c0 (inclusive). +commit 80d868ed1cf3fb1bf62c9b53e65d1034f20be227 (inclusive). See ChangeLog.1 for earlier changes. ;; Local Variables: commit 80d868ed1cf3fb1bf62c9b53e65d1034f20be227 Author: Stefan Monnier Date: Wed Apr 4 21:15:36 2018 -0400 * lisp/emacs-lisp/inline.el: Clarify apparent typos diff --git a/lisp/emacs-lisp/inline.el b/lisp/emacs-lisp/inline.el index 02f9bf2ffc..865e17e3d7 100644 --- a/lisp/emacs-lisp/inline.el +++ b/lisp/emacs-lisp/inline.el @@ -91,9 +91,13 @@ (defmacro inline--leteval (_var-exp &rest _body) (declare (indent 1) (debug (sexp &rest body))) + ;; BEWARE: if we're here it's presumably via macro-expansion of + ;; inline-letevals, so signal the error in terms of the user's code. (error "inline-letevals can only be used within define-inline")) (defmacro inline--letlisteval (_list &rest _body) (declare (indent 1) (debug (sexp &rest body))) + ;; BEWARE: if we're here it's presumably via macro-expansion of + ;; inline-letevals, so signal the error in terms of the user's code. (error "inline-letevals can only be used within define-inline")) (defmacro inline-letevals (vars &rest body) commit 9f54f285c9637b8fc262e0994ea4c59f99a87065 Author: Eli Zaretskii Date: Wed Apr 4 22:16:09 2018 +0300 ; * lisp/auth-source.el (auth-sources): Update the :version tag. diff --git a/lisp/auth-source.el b/lisp/auth-source.el index 1bb79d11ff..b733054ae5 100644 --- a/lisp/auth-source.el +++ b/lisp/auth-source.el @@ -241,7 +241,7 @@ for details. It's best to customize this with `\\[customize-variable]' because the choices can get pretty complex." :group 'auth-source - :version "24.1" ;; No Gnus + :version "26.1" ;; No Gnus :type `(repeat :tag "Authentication Sources" (choice (string :tag "Just a file") commit 3573b4e2ae0d1e6e4337f9f71ce49cc0a7ff7bad Author: Ted Zlatanov Date: Wed Apr 4 14:14:27 2018 -0400 Allow sexp customization type in auth-sources * lisp/auth-source.el (auth-sources): Allow sexp customization type. Update the :version tag. (cherry picked from commit 447da5b0d49b7aa14fa5d6969015770fdf9b9f92) diff --git a/lisp/auth-source.el b/lisp/auth-source.el index c605c112a5..1bb79d11ff 100644 --- a/lisp/auth-source.el +++ b/lisp/auth-source.el @@ -304,7 +304,8 @@ can get pretty complex." :tag "Personality/Username" (const :tag "Any" t) (string - :tag "Name"))))))))) + :tag "Name")))))) + (sexp :tag "A data structure (external provider)")))) (defcustom auth-source-gpg-encrypt-to t "List of recipient keys that `authinfo.gpg' encrypted to.