Commit: c0c8c7f0c18093d31e8bda431725f883fb9aee13 - uim (git)

A multilingual input method framework

Commit MetaInfo

• Revision: c0c8c7f0c18093d31e8bda431725f883fb9aee13 (tree)
• Time: 2006-12-27 12:06:06
• Author: yamaken <yamaken@ff9a...>
• Commiter: yamaken

Log Message

* scm/uim-sh.scm

- (uim-sh-loop, uim-sh): Fix error handling

Change Summary

• modified: scm/uim-sh.scm

Incremental Difference

--- a/scm/uim-sh.scm
+++ b/scm/uim-sh.scm
@@ -47,15 +47,10 @@
 	   (eof  (eof-object? expr)))
       (if (not eof)
 	  (begin
-	    (guard (err
-		    (else
-                     (display err)
-		     (%%backtrace)
-		     #f))
-	      ((if uim-sh-opt-strict-batch
-		   (lambda (obj) #f)
-		   print)
-	       (eval expr (interaction-environment))))
+	    ((if  uim-sh-opt-strict-batch
+		  (lambda () #f)
+		  print)
+	     (eval expr (interaction-environment)))
 	    (uim-sh-loop))
 	  #f))))
 
@@ -96,11 +91,15 @@
 	  (if (and uim-editline-enabled
 		   (symbol-bound? 'uim-editline-readline))
 	      (activate-editline))
-;	  (if (*catch
-;	       'all
-;	       (uim-sh-loop))
-;	      (uim-sh args))))))
-	       (uim-sh-loop)))))
+	  (if (guard (err
+		      (else
+		       (display err)
+		       (newline)
+		       (if (>= (verbose) 2)
+			   (%%backtrace))
+		       #t))
+		(uim-sh-loop))
+	      (uim-sh args))))))
 
 (if (symbol-bound? 'uim-editline-readline)
     (begin