diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-04-10 07:50:48 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-04-10 07:50:48 -0700 |
| commit | 8f2935a49c7030a03c865ad9890de8bf20148655 (patch) | |
| tree | cffc125adcf808476e84e6a98c50aa5585414e33 | |
| parent | 8b94b8d89fe333d00ec78d1d2d972f095603c3ed (diff) | |
| parent | f674c89f7ced2f317f6383e6e572ef636ed7ab7a (diff) | |
| download | emacs-8f2935a49c7030a03c865ad9890de8bf20148655.tar.gz | |
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.
| -rw-r--r-- | ChangeLog.3 | 23 | ||||
| -rw-r--r-- | lisp/auth-source.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/inline.el | 4 |
3 files changed, 27 insertions, 2 deletions
diff --git a/ChangeLog.3 b/ChangeLog.3 index abaed02b32e..436f04b630b 100644 --- a/ChangeLog.3 +++ b/ChangeLog.3 @@ -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: diff --git a/lisp/auth-source.el b/lisp/auth-source.el index 56122d1d1a2..355c11fbf3a 100644 --- a/lisp/auth-source.el +++ b/lisp/auth-source.el @@ -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") diff --git a/lisp/emacs-lisp/inline.el b/lisp/emacs-lisp/inline.el index 02f9bf2ffc7..865e17e3d7d 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) |