* elmo-util.el (elmo-get-hash-val): Simplify.

(elmo-set-hash-val): Rewrite.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index eaa5627..2643632 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-05  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * elmo-util.el (elmo-get-hash-val): Simplify.
+       (elmo-set-hash-val): Rewrite.
+
 2003-09-27  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
        * elmo.el (elmo-folder-list-messages): Append killed messages into

diff --git a/elmo/elmo-util.el b/elmo/elmo-util.el
index 9dffada..c8d7b8a 100644 (file)
--- a/elmo/elmo-util.el
+++ b/elmo/elmo-util.el
@@ -953,14 +953,10 @@ the directory becomes empty after deletion."
         file (nth 2 condition) number number-list)))))
 
 (defmacro elmo-get-hash-val (string hashtable)
-  `(and (stringp ,string)
-       ,hashtable
-       (let ((sym (intern-soft ,string ,hashtable)))
-         (if (boundp sym)
-             (symbol-value sym)))))
+  `(symbol-value (intern-soft ,string ,hashtable)))
 
 (defmacro elmo-set-hash-val (string value hashtable)
-  (list 'set (list 'intern string hashtable) value))
+  `(set (intern ,string ,hashtable) ,value))
 
 (defmacro elmo-clear-hash-val (string hashtable)
   (static-if (fboundp 'unintern)