Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs/elpa

diff --git a/packages/test-simple/Makefile.am b/packages/test-simple/Makefile.am
index a1c318c2165de1ae5292cc07c6e2d0671fcd43b8..abf9c3203f7eae42951e89d7865109f7f031372a 100644 (file)
--- a/packages/test-simple/Makefile.am
+++ b/packages/test-simple/Makefile.am
@@ -9,7 +9,7 @@ lisp_files := $(wildcard *.el)
 lisp_LISP = $(lisp_files)
 test_files := $(wildcard test/*.el)
 
-EXTRA_DIST = $(lisp_files) $(test_files) README THANKS README.md COPYING
+EXTRA_DIST = $(lisp_files) $(test_files) README THANKS README.md
 
 CHECK_FILES = $(notdir $(test_files:.el=.run))
 

diff --git a/packages/test-simple/test-simple.el b/packages/test-simple/test-simple.el
index e7e4164cb60ec3992629735288f174c39a8c8a25..bd576e171fa842e625fae99a04e57c20ff8f46e1 100644 (file)
--- a/packages/test-simple/test-simple.el
+++ b/packages/test-simple/test-simple.el
@@ -162,7 +162,7 @@ clears out information from the previous run."
                                  error-condition))))
     (list 'condition-case nil
          (list 'progn body
-               (list 'assert-t nil fail-message test-info))
+               (list 'assert-t nil fail-message))
          (list error-condition '(assert-t t)))))
 
 (defun assert-op (op expected actual &optional fail-message test-info)