Changeset 71 for lang/elisp/pdicv-mode/trunk/nt-english.el

Timestamp:

01/30/09 23:52:02 (16 years ago)

Author:

naoya_t

Message:

 

Files:

• lang/elisp/pdicv-mode/trunk/nt-english.el (modified) (4 diffs)

lang/elisp/pdicv-mode/trunk/nt-english.el

@@ -1 +1 @@
 ;;; nt-english.el --- English
 ;;
-;; Copyright (C) 2005 Naoya TOZUKA. All Rights Reserved.
+;; Copyright (C) 2005-2009 naoya_t. All Rights Reserved.
 ;;
-;; Author: Naoya TOZUKA <pdicviewer@gmail.com>
-;; Maintainer: Naoya TOZUKA <pdicviewer@gmail.com>
-;; Primary distribution site: http://pdicviewer.naochan.com/el/
+;; Author: naoya_t <naoya.t@aqua.plala.or.jp>
+;; Maintainer: naoya_t <naoya.t@aqua.plala.or.jp>
+;; Primary distribution site:
+;;   http://lambdarepos.svnrepository.com/svn/share/lang/elisp/pdicv-mode/trunk
 ;;
 ;; Created: 23 Dec 2005
@@ -261 +262 @@
      ((null word) (throw 'block nil))
      ((string= word "") (throw 'block nil))
-     (t nil)
-     )
+         (t nil))
     
     (let* ((word-len (length word))
@@ -273 +273 @@
       (setq suffix-1 (substring word -1 nil))
 
-      (if (>= word-len 2)
-          (progn
-           (setq body-2 (substring word 0 -2))
-           (setq suffix-2 (substring word -2 nil))
-           
-           (if (>= word-len 3)
-               (progn
-                (setq body-3 (substring word 0 -3))
-                (setq suffix-3 (substring word -3 nil))
-                
-                (if (>= word-len 4)
-                    (progn
-                     (setq body-4 (substring word 0 -4))
-                     (setq suffix-4 (substring word -4 nil))
-                     ))
-                ))
-           ))
+      (when (>= word-len 2)
+                (setq body-2 (substring word 0 -2))
+                (setq suffix-2 (substring word -2 nil))
+                (when (>= word-len 3)
+                  (setq body-3 (substring word 0 -3))
+                  (setq suffix-3 (substring word -3 nil))
+                  (when (>= word-len 4)
+                        (setq body-4 (substring word 0 -4))
+                        (setq suffix-4 (substring word -4 nil)))))
       
       ;; irregular verbs/nouns first.
       (setq tmp (cdr (assoc word nt-english-irreg-verbs-list)))
-      (if tmp (throw 'block (list tmp)))
+      (when tmp (throw 'block (list tmp)))
       (setq tmp (cdr (assoc word nt-english-irreg-nouns-list)))
-      (if tmp (throw 'block (list tmp)))
+      (when tmp (throw 'block (list tmp)))
       
       (cond
@@ -328 +320 @@
        ((string= suffix-2 "'s") (list body-2))
       
-       (t nil) ;; ������ʤ���������������
-       ) ;cond
-      ) ;let
-    );caught
-  )
+       (t nil))))) ;; ������ʤ���������������
 
 (defmacro nt:skipit-p (word)