aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorJoakim Verona2015-01-22 08:27:13 +0100
committerJoakim Verona2015-01-22 08:27:13 +0100
commit5c1d2b0f06ddb1f6b520b2446ce9e207e5bfc315 (patch)
treec9e3511c8164d2154c91820e0d90521762dc7bdf /test
parentd6ada5ae0fad7a5c85eb28b102bc460e9fe0aceb (diff)
parent7f4e7dd378c456b498c270b47b46aaae365a72ab (diff)
downloademacs-5c1d2b0f06ddb1f6b520b2446ce9e207e5bfc315.tar.gz
emacs-5c1d2b0f06ddb1f6b520b2446ce9e207e5bfc315.zip
merge master
Diffstat (limited to 'test')
-rw-r--r--test/automated/eieio-tests.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/automated/eieio-tests.el b/test/automated/eieio-tests.el
index e0120b4b5b8..847aefd63fc 100644
--- a/test/automated/eieio-tests.el
+++ b/test/automated/eieio-tests.el
@@ -655,7 +655,7 @@ Do not override for `prot-2'."
655 (oref eitest-p1 slot-1) 655 (oref eitest-p1 slot-1)
656 (oref eitest-p2 slot-1) 656 (oref eitest-p2 slot-1)
657 ;; Accessing protected slot out of context used to fail, but we dropped this 657 ;; Accessing protected slot out of context used to fail, but we dropped this
658 ;; feature, since it was underused and noone noticed that the check was 658 ;; feature, since it was underused and no one noticed that the check was
659 ;; incorrect (much too loose). 659 ;; incorrect (much too loose).
660 ;;PROTECTED (should-error (oref eitest-p1 slot-2) :type 'invalid-slot-name) 660 ;;PROTECTED (should-error (oref eitest-p1 slot-2) :type 'invalid-slot-name)
661 ;; Access protected slot in method 661 ;; Access protected slot in method