|
| From: | Glenn Morris |
| Subject: | bug#29165: 26.0.90; can't use some code byte-compiled under emacs 24 |
| Date: | Fri, 15 Dec 2017 11:48:47 -0500 |
| User-agent: | Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) |
Noam Postavsky wrote:
> Pushed to emacs-26.
>
> [1: e7b1111]: 2017-12-13 17:31:27 -0500
> Mention new strictness for &optional, &rest in arglists (Bug#29165)
>
> https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=e7b1111155b3116d0c7b137e0e1d312db0f1ca80
When attempting to merge emacs-26 to master, this conflicts with
commit cea0bca54f
Date: Mon Nov 27 12:45:16 2017 -0500
* lisp/emacs-lisp/cl-macs.el: Fix &key with no key arg
Please could someone indicate how this is to be resolved.
| [Prev in Thread] | Current Thread | [Next in Thread] |