Sync with semi21.

diff --git a/ChangeLog b/ChangeLog
index 322bced..1622ece 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-12-28  Kenichi Handa     <handa@etl.go.jp>
+
+       * static.el: Doc-string fixed.
+

 2000-12-28  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
        * mcharset.el (default-mime-charset-for-write): Don't require
 2000-12-28  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
        * mcharset.el (default-mime-charset-for-write): Don't require

diff --git a/static.el b/static.el
index b64440d..a42d816 100644 (file)
--- a/static.el
+++ b/static.el
@@ -26,27 +26,27 @@
 
 (put 'static-if 'lisp-indent-function 2)
 (defmacro static-if (cond then &rest else)
 
 (put 'static-if 'lisp-indent-function 2)
 (defmacro static-if (cond then &rest else)

-  "`if' expression but COND is evaluated at compile-time."
+  "Like `if', but evaluate COND at compile time."

   (if (eval cond)
       then
     (` (progn  (,@ else)))))
 
 (put 'static-when 'lisp-indent-function 1)
 (defmacro static-when (cond &rest body)
   (if (eval cond)
       then
     (` (progn  (,@ else)))))
 
 (put 'static-when 'lisp-indent-function 1)
 (defmacro static-when (cond &rest body)

-  "`when' expression but COND is evaluated at compile-time."
+  "Like `when', but evaluate COND at compile time."

   (if (eval cond)
       (` (progn (,@ body)))))
 
 (put 'static-unless 'lisp-indent-function 1)
 (defmacro static-unless (cond &rest body)
   (if (eval cond)
       (` (progn (,@ body)))))
 
 (put 'static-unless 'lisp-indent-function 1)
 (defmacro static-unless (cond &rest body)

-  "`unless' expression but COND is evaluated at compile-time."
+  "Like `unless', but evaluate COND at compile time."

   (if (eval cond)
       nil
     (` (progn (,@ body)))))
 
 (put 'static-condition-case 'lisp-indent-function 2)
 (defmacro static-condition-case (var bodyform &rest handlers)
   (if (eval cond)
       nil
     (` (progn (,@ body)))))
 
 (put 'static-condition-case 'lisp-indent-function 2)
 (defmacro static-condition-case (var bodyform &rest handlers)

-  "`condition-case' expression but BODYFORM is evaluated at compile-time."
+  "Like `condition-case', but evaluate BODYFORM at compile time."

   (eval (` (condition-case (, var)
               (list (quote quote) (, bodyform))
             (,@ (mapcar
   (eval (` (condition-case (, var)
               (list (quote quote) (, bodyform))
             (,@ (mapcar

@@ -64,15 +64,15 @@
 
 (put 'static-defconst 'lisp-indent-function 'defun)
 (defmacro static-defconst (symbol initvalue &optional docstring)
 
 (put 'static-defconst 'lisp-indent-function 'defun)
 (defmacro static-defconst (symbol initvalue &optional docstring)

-  "`defconst' expression but INITVALUE is evaluated at compile-time.
+  "Like `defconst', but evaluate INITVALUE at compile time.

 
 

-The variable SYMBOL can be referenced at either compile-time or run-time."
+The variable SYMBOL can be referred at both compile time and run time."

   (let ((value (eval initvalue)))
     (eval (` (defconst (, symbol) (quote (, value)) (, docstring))))
     (` (defconst (, symbol) (quote (, value)) (, docstring)))))
 
 (defmacro static-cond (&rest clauses)
   (let ((value (eval initvalue)))
     (eval (` (defconst (, symbol) (quote (, value)) (, docstring))))
     (` (defconst (, symbol) (quote (, value)) (, docstring)))))
 
 (defmacro static-cond (&rest clauses)

-  "`cond' expression but the car of each clause is evaluated at compile-time."
+  "Like `cond', but evaluate CONDITION part of each clause at compile time."

   (while (and clauses
              (not (eval (car (car clauses)))))
     (setq clauses (cdr clauses)))
   (while (and clauses
              (not (eval (car (car clauses)))))
     (setq clauses (cdr clauses)))