diff --git a/books/bookvol5.pamphlet b/books/bookvol5.pamphlet
index 596a1d4..8070e57 100644
--- a/books/bookvol5.pamphlet
+++ b/books/bookvol5.pamphlet
@@ -5620,6 +5620,12 @@ information is initialized.
\end{chunk}
+\defvar{localVars}
+\begin{chunk}{initvars}
+(defvar |$localVars| ()) ;checked by isType
+
+\end{chunk}
+
\defun{restart0}{Non-interactive restarts}
\calls{restart0}{interpopen}
\calls{restart0}{operationopen}
@@ -8536,7 +8542,7 @@ and constructs a call to \bfref{Delay}.
\defun{theid}{theid}
\begin{chunk}{defun theid 0}
-(defun |theid| (a) (list identity a))
+(defun |theid| (a) (list #'identity a))
\end{chunk}
@@ -18403,8 +18409,7 @@ org prints out the word noposition or console
\calls{setMsgCatlessAttr}{ncAlist}
\begin{chunk}{defun setMsgCatlessAttr}
(defun |setMsgCatlessAttr| (msg attr)
- (|ncPutQ| msg '|catless|
- (cons attr (ifcdr (qassq |catless| (|ncAlist| msg))))))
+ (|ncPutQ| msg catless (cons attr (ifcdr (qassq catless (|ncAlist| msg))))))
\end{chunk}
@@ -52690,6 +52695,7 @@ identical. We no longer care so we just call {\tt bcGen}.
Given \verb|("one" "two" "three")| generate \verb|"(one,two,three)"|
\begin{chunk}{defun stringList2String}
(defun |stringList2String| (x)
+ (let (str)
(cond
((null x) "()")
(t
@@ -52699,7 +52705,7 @@ Given \verb|("one" "two" "three")| generate \verb|"(one,two,three)"|
(dolist (i (cdr x) result)
(setq result (concatenate 'string result
(concatenate 'string "," i)))))))
- (concatenate 'string "(" str ")"))))
+ (concatenate 'string "(" str ")")))))
\end{chunk}
@@ -57886,13 +57892,11 @@ There are 8 parts of an htPage:
\begin{chunk}{defun kcuPage}
(defun |kcuPage| (htPage junk)
(declare (ignore junk))
- (let (lt1 kind name args conname constring conform pakname domlist cAlist
- conname)
+ (let (lt1 kind name args constring conform pakname domlist cAlist)
(setq lt1 (|htpProperty| htPage '|parts|))
(setq kind (first lt1))
(setq name (second lt1))
(setq args (sixth lt1))
- (setq conname (intern name))
(setq constring (concat name args))
(setq conform
(if (nequal kind "default package")
@@ -57943,10 +57947,12 @@ There are 8 parts of an htPage:
\begin{chunk}{defun kcnPage}
(defun |kcnPage| (htPage junk)
(declare (ignore junk))
- (let (lt1 kind name nargs domname heading conform pakname domlist cAlist)
+ (let (lt1 kind name nargs domname heading conform pakname domlist cAlist
+ conname)
(setq lt1 (|htpProperty| htPage '|parts|))
(setq kind (first lt1))
(setq name (second lt1))
+ (setq conname (intern name))
(setq nargs (third lt1))
(setq domname (|kDomainName| htPage kind name nargs))
(cond
@@ -58011,7 +58017,7 @@ There are 8 parts of an htPage:
evaluatedTypeForm)
(|htpSetProperty| htPage '|domname| nil)
(setq inputAreaList
- (loop for i from 1 to nargs for var in |$PatternVariableList| do
+ (loop for i from 1 to nargs for var in |$PatternVariableList|
collect (|htpLabelInputString| htPage var)))
(|htpSetProperty| htPage '|inputAreaList| inputAreaList)
(setq conname (intern name))
@@ -59431,6 +59437,7 @@ There are 8 parts of an htPage:
\begin{chunk}{defun mkConArgSublis}
(defun |mkConArgSublis| (args)
(loop for arg in args
+ with s = nil
when
(and
(setq s (pname arg))
diff --git a/changelog b/changelog
index baa4a2c..ba77b4f 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+20150103 tpd src/axiom-website/patches.html 20150103.01.tpd.patch
+20150103 tpd books/bookvol5 merge, rewrite and remove some browser functions
+20150103 tpd src/interp/cattable.lisp merge, rewrite, remove functions
+20150103 tpd src/interp/g-util.lisp merge, rewrite, remove functions
+20150103 tpd src/interp/lisplib.lisp merge, rewrite, remove functions
+20150103 tpd src/interp/patches.lisp merge, rewrite, remove functions
20150102 tpd src/axiom-website/patches.html 20150102.01.tpd.patch
20150102 tpd books/bookvol5 merge, rewrite and remove some browser functions
20150102 tpd src/interp/br-con.lisp remove and rewrite functions
diff --git a/patch b/patch
index f5a4944..312e54c 100644
--- a/patch
+++ b/patch
@@ -1,10 +1,10 @@
books/bookvol5 merge, rewrite and remove some browser functions
# modified: books/bookvol5.pamphlet
-# modified: src/interp/br-con.lisp.pamphlet
-# modified: src/interp/interp-proclaims.lisp
+# modified: src/interp/cattable.lisp.pamphlet
+# modified: src/interp/g-util.lisp.pamphlet
# modified: src/interp/lisplib.lisp.pamphlet
-# modified: src/interp/nrunfast.lisp.pamphlet
-# modified: src/interp/util.lisp.pamphlet
+# modified: src/interp/patches.lisp.pamphlet
+
diff --git a/src/axiom-website/patches.html b/src/axiom-website/patches.html
index 8a2d305..406593c 100644
--- a/src/axiom-website/patches.html
+++ b/src/axiom-website/patches.html
@@ -4888,6 +4888,8 @@ src/input/wester.input absorbed and removed
src/input/wester.input absorbed and removed, yet again
20150102.01.tpd.patch
books/bookvol5 merge, rewrite and remove some browser functions
+20150103.01.tpd.patch
+books/bookvol5 merge, rewrite and remove some browser functions