picolisp

commit 4374c1824b6add74665a8bc06660399e7da55e23
parent 887a6a3395457c6b339d78d45a8f9662a2ff300f
Author: Alexander Burger <abu@software-lab.de>
Date:   Mon, 28 Feb 2011 16:03:18 +0100

Changed GUI function 'err' to 'error'
Diffstat:
M
ReleaseNotes
 | 
6
+++++-
M
app/gui.l
 | 
4
++--
M
ersatz/picolisp.jar
 | 
0

M
lib.css
 | 
4
++--
M
lib/form.l
 | 
12
++++++------
M
lib/scrape.l
 | 
6
+++---
M
src64/version.l
 | 
4
++--

7 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/ReleaseNotes b/ReleaseNotes
@@ -1,4 +1,4 @@
-25jan11abu
+28feb11abu
 (c) Software Lab. Alexander Burger
 
 
@@ -36,3 +36,7 @@
    (destructively) spliced into the result. As before, if 'fill' is passed a
    second argument (a symbol or a list of symbols), then only those symbols are
    replaced in the pattern without any further treatment.
+
+5. The name of the GUI function 'err' in "lib/form.l" was changed to 'error'
+   (and also that of the corresponding default CSS type in "lib.css"). This was
+   done to reserve the name "err" for future standard error redirection.
diff --git a/app/gui.l b/app/gui.l
@@ -1,4 +1,4 @@
-# 20apr10abu
+# 28feb11abu
 # (c) Software Lab. Alexander Burger
 
 ### GUI ###
@@ -50,7 +50,7 @@
                (*Login (logout))
                ((login (val> (: home nm)) (val> (: home pw)))
                   (clr> (: home pw)) )
-               (T (err ,"Permission denied")) ) )
+               (T (error ,"Permission denied")) ) )
          (when *Login
             (<nbsp> 4)
             (<span> "bold green"
diff --git a/ersatz/picolisp.jar b/ersatz/picolisp.jar
Binary files differ.
diff --git a/lib.css b/lib.css
@@ -1,4 +1,4 @@
-/* 18nov10abu
+/* 28feb11abu
  * (c) Software Lab. Alexander Burger
  */
 
@@ -167,7 +167,7 @@ a:hover {
 }
 
 /* Errors */
-.err {
+.error {
    color: red;
    background-color: yellow;
 }
diff --git a/lib/form.l b/lib/form.l
@@ -1,4 +1,4 @@
-# 18feb11abu
+# 28feb11abu
 # (c) Software Lab. Alexander Burger
 
 # *PRG *Top *Gui *Btn *Get *Got *Form *Evt *Lock *Spans
@@ -52,7 +52,7 @@
                      (with (get "*App" 'gui (inc '"*Ix"))
                         (for E "*Err"
                            (when (== This (car E))
-                              (<div> 'err
+                              (<div> 'error
                                  (if (atom (cdr E))
                                     (ht:Prin (eval (cdr E) 1))
                                     (eval (cdr E) 1) ) ) ) )
@@ -216,13 +216,13 @@
             (for This (: gui)
                (cond
                   ((not (: id)) (setq "*Chart" This))
-                  ((chk> This) (err @))
+                  ((chk> This) (error @))
                   ((or (: rid) (: home able))
                      (set> This (val> This) T) ) ) )
             (for This (: gui)
                (cond
                   ((: id))
-                  ((chk> (setq "*Chart" This)) (err @))
+                  ((chk> (setq "*Chart" This)) (error @))
                   ((or (: rid) (: home able))
                      (set> This (val> This)) ) ) )
             (if (pair "*Err")
@@ -245,7 +245,7 @@
                   (or (: id) (setq "*Chart" This))
                   (upd> This) ) ) ) ) ) )
 
-(de err (Exe)
+(de error (Exe)
    (cond
       ((=T Exe) (on "*Err"))
       ((nT "*Err") (queue '"*Err" (cons This Exe))) ) )
@@ -1764,7 +1764,7 @@
 
 (de tryLock (Obj)
    (if (lock Obj)
-      (err (text ,"Currently edited by '@2' (@1)" @  (cdr (lup *Users @))))
+      (error (text ,"Currently edited by '@2' (@1)" @  (cdr (lup *Users @))))
       (sync)
       (tell)
       (setq *Lock Obj) ) )
diff --git a/lib/scrape.l b/lib/scrape.l
@@ -1,4 +1,4 @@
-# 16may10abu
+# 28feb11abu
 # (c) Software Lab. Alexander Burger
 
 # *ScrHost *ScrPort *ScrGate *Title *Expect *Found
@@ -23,7 +23,7 @@
             "<option selected=\"selected\">"
             "<textarea name=\""
             "<span id=\""
-            "<div class=\"err\">"
+            "<div class=\"error\">"
             *Expect )
          (case @
             ("303 See Other"
@@ -94,7 +94,7 @@
             ("<span id=\""
                (from ">")
                (queue '*Fields (ht:Pack (till "<"))) )
-            ("<div class=\"err\">"
+            ("<div class=\"error\">"
                (queue '*Errors (ht:Pack (till "<"))) )
             (T  (on *Found)) ) )
       (or *Errors *Title) ) )
diff --git a/src64/version.l b/src64/version.l
@@ -1,6 +1,6 @@
-# 25feb11abu
+# 28feb11abu
 # (c) Software Lab. Alexander Burger
 
-(de *Version 3 0 5 17)
+(de *Version 3 0 5 18)
 
 # vi:et:ts=3:sw=3