Merge updates from master

This commit is contained in:
Repository QA checks
2015-09-03 15:07:26 -04:00
2 changed files with 21 additions and 1 deletions
+20
View File
@@ -0,0 +1,20 @@
diff -r -U2 maxima-5.37.1.orig/src/db.lisp maxima-5.37.1/src/db.lisp
--- maxima-5.37.1.orig/src/db.lisp 2015-08-11 01:01:13.000000000 +0600
+++ maxima-5.37.1/src/db.lisp 2015-09-04 00:21:43.596685564 +0600
@@ -389,10 +389,14 @@
(defmfun isp (pat)
- (let ((isp 'unknown))
+ (let ((isp 'unknown) #+ccl (err t))
(ignore-errors
(setq isp
(cond ((truep pat))
((falsep pat) nil)
- (t 'unknown))))
+ (t 'unknown)))
+ (setq err nil))
+ #+ccl
+ (when err
+ (setq +labs nil))
isp))
@@ -101,7 +101,7 @@ pkg_setup() {
src_prepare() {
local n PATCHES v
PATCHES=( imaxima-0 rmaxima-0 wish-1 xdg-utils-0 )
PATCHES=( imaxima-0 rmaxima-0 wish-1 xdg-utils-0 db-0 )
n=${#PATCHES[*]}
for ((n--; n >= 0; n--)); do