procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-26

Browse source 
f674c89 ; * ChangeLog.3: Update.
80d868e * lisp/emacs-lisp/inline.el: Clarify apparent typos
9f54f28 ; * lisp/auth-source.el (auth-sources): Update the :version tag.
This commit is contained in:
Glenn Morris 2018-04-10 07:50:48 -07:00
commit 8f2935a49c
3 changed files with 27 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

23
ChangeLog.3
View file

@ -1,3 +1,24 @@
2018-04-05 Stefan Monnier <monnier@iro.umontreal.ca>
* lisp/emacs-lisp/inline.el: Clarify apparent typos
2018-04-04 Ted Zlatanov <tzz@lifelogs.com>
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 <nicolas@petton.fr>
* etc/NEWS: Remove temporary markup.
* etc/AUTHORS: Update.
* ChangeLog.3: Update.
2018-04-03 Michael Albinus <michael.albinus@gmx.de>
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:

2
lisp/auth-source.el
View file

@ -242,7 +242,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")

4
lisp/emacs-lisp/inline.el
View file

@ -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)