[uim] r7223 committed - * Merge r7222 from trunk.

[codesite-noreply]

Revision: 7223
Author:   deton.kih
Date:     Tue Jul 19 03:45:31 2011
Log:      * Merge r7222 from trunk.
http://code.google.com/p/uim/source/detail?r=7223
Modified:
 /branches/1.7/scm/tutcode.scm

=======================================
--- /branches/1.7/scm/tutcode.scm       Tue Jul 12 04:01:49 2011
+++ /branches/1.7/scm/tutcode.scm       Tue Jul 19 03:45:31 2011
@@ -3962,9 +3962,8 @@
                     c b1 b2 seq1 rule elem)))
               ;; Éô¼ó2¤Ç¤Ï¹çÀ®ÉÔǽ¢ªÉô¼ó2¤ò¤µ¤é¤Ëʬ²ò
               (let ((b2dec (tutcode-auto-help-bushu-decompose b2 rule  
stime)))
-                (if b2dec
-                  (list seq1 b2dec)
-                  #f))))
+                (and b2dec
+                  (list seq1 b2dec)))))
           ;; Éô¼ó2¤¬Ä¾ÀÜÆþÎϲÄǽ
           ;; ¢ª(Éô¼ó2)¤È(Éô¼ó1¤òÉôÉʤȤ·¤Æ»ý¤Ä´Á»ú)¤Ë¤è¤ë¹çÀ®¤¬²Äǽ¤«?
           (and seq2 b1
@@ -3976,17 +3975,15 @@
                     c b1 b2 seq2 rule elem)))
               ;; Éô¼ó1¤Ç¤Ï¹çÀ®ÉÔǽ¢ªÉô¼ó1¤ò¤µ¤é¤Ëʬ²ò
               (let ((b1dec (tutcode-auto-help-bushu-decompose b1 rule  
stime)))
-                (if b1dec
-                  (list b1dec seq2)
-                  #f))))
+                (and b1dec
+                  (list b1dec seq2)))))
           ;; Éô¼ó1¤âÉô¼ó2¤âľÀÜÆþÎÏÉԲĢª¤µ¤é¤Ëʬ²ò
           (and b1 b2
             (let
               ((b1dec (tutcode-auto-help-bushu-decompose b1 rule stime))
                (b2dec (tutcode-auto-help-bushu-decompose b2 rule stime)))
-              (if (and b1dec b2dec)
-                (list b1dec b2dec)
-                #f)))
+              (and b1dec b2dec
+                (list b1dec b2dec))))
           ;; XXX: ÉôÉʤɤ¦¤·¤Î¹çÀ®¤Ï̤Âбþ
           )))))