From: rocky <rocky@gnu.org>
Date: Thu, 3 Mar 2016 07:39:18 +0000 (-0500)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs/elpa
X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/5f9c47b477664ac7e056cb2a3b65e16fcc48776d?hp=b0aeb9e30b6f14544e74d6c2b8f6bd030705f886

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 a1c318c21..abf9c3203 100644
--- 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 e7e4164cb..bd576e171 100644
--- 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)