diff options
| author | Stefan Monnier | 2017-04-21 12:12:42 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2017-04-21 12:12:42 -0400 |
| commit | 89898e43c7ceef28bb3c2116b4d8a3ec96d9c8da (patch) | |
| tree | 9293d75b2a88d3744dcc2a7a3fc778157fdf3d62 /test | |
| parent | 72d7961d678f9c5f4cb812e0bb9b6dffafb47c68 (diff) | |
| download | emacs-89898e43c7ceef28bb3c2116b4d8a3ec96d9c8da.tar.gz emacs-89898e43c7ceef28bb3c2116b4d8a3ec96d9c8da.zip | |
* lisp/emacs-lisp/cl-macs.el: Fix symbol-macrolet
Revert 0d112c00ba0ec14bd3014efcd3430b9ddcfe1fc1 (to fix bug#26325)
and use a different fix for bug#26068.
(cl--symbol-macro-key): New function.
(cl--sm-macroexpand, cl-symbol-macrolet): Use it instead of `symbol-name`.
* test/lisp/emacs-lisp/cl-lib-tests.el (cl-lib-symbol-macrolet):
Failure is not expected any more.
Diffstat (limited to 'test')
| -rw-r--r-- | test/lisp/emacs-lisp/cl-lib-tests.el | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/test/lisp/emacs-lisp/cl-lib-tests.el b/test/lisp/emacs-lisp/cl-lib-tests.el index 564ddab67db..65bd97f3b2d 100644 --- a/test/lisp/emacs-lisp/cl-lib-tests.el +++ b/test/lisp/emacs-lisp/cl-lib-tests.el | |||
| @@ -495,7 +495,6 @@ | |||
| 495 | 495 | ||
| 496 | (ert-deftest cl-lib-symbol-macrolet () | 496 | (ert-deftest cl-lib-symbol-macrolet () |
| 497 | ;; bug#26325 | 497 | ;; bug#26325 |
| 498 | :expected-result :failed | ||
| 499 | (should (equal (cl-flet ((f (x) (+ x 5))) | 498 | (should (equal (cl-flet ((f (x) (+ x 5))) |
| 500 | (let ((x 5)) | 499 | (let ((x 5)) |
| 501 | (f (+ x 6)))) | 500 | (f (+ x 6)))) |