commit b61a87292671c917a4c6c1c146a016f5f544ae36 (HEAD, refs/remotes/origin/master) Author: Stefan Monnier Date: Thu Feb 15 00:41:52 2018 -0500 * lisp/calendar/diary-lib.el (diary-remind): Fix bug#30455. (diary-remind): Bind `days' as documented for diary-remind-message. diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index 181b1172fa..acf4b20d77 100644 --- a/lisp/calendar/diary-lib.el +++ b/lisp/calendar/diary-lib.el @@ -2049,7 +2049,8 @@ calendar." (when (setq diary-entry (eval sexp)) ;; Discard any mark portion from diary-anniversary, etc. (if (consp diary-entry) (setq diary-entry (cdr diary-entry))) - (mapconcat #'eval diary-remind-message "")))) + (calendar-dlet* ((days days)) + (mapconcat #'eval diary-remind-message ""))))) ;; Diary entry may apply to one of a list of days before date. ((and (listp days) days) (or (diary-remind sexp (car days) marking) commit 82379efaaf92e964875c0648b45bcae27b54d213 Author: Noam Postavsky Date: Wed Feb 14 21:31:06 2018 -0500 ; Add test for iter-lambda variable shadowing (Bug#26073) * test/lisp/emacs-lisp/generator-tests.el (iter-lambda-variable-shadowing): New test. diff --git a/test/lisp/emacs-lisp/generator-tests.el b/test/lisp/emacs-lisp/generator-tests.el index 9bf8413e15..bca3efa550 100644 --- a/test/lisp/emacs-lisp/generator-tests.el +++ b/test/lisp/emacs-lisp/generator-tests.el @@ -292,3 +292,13 @@ identical output. (i 0) (j (setq i (1+ i)))) (iter-yield i)))))))) + +(ert-deftest iter-lambda-variable-shadowing () + "`iter-lambda' forms which have local variable shadowing (Bug#26073)." + (should (equal (iter-next + (funcall (iter-lambda () + (let ((it 1)) + (iter-yield (funcall + (lambda (it) (- it)) + (1+ it))))))) + -2)))