From 75e3ff8511b09519c08cb73d7af84bc57e670339 Mon Sep 17 00:00:00 2001
From: hmurata <hmurata>
Date: Wed, 28 Jan 2004 13:23:14 +0000
Subject: [PATCH] * elmo-util.el (elmo-get-hash-val): Check symbol is bound if
 unintern is unbound.

* wl-folder.el (wl-folder-clear-entity-info): Use
elmo-clear-hash-val.

* wl-fldmgr.el (wl-fldmgr-rename): Set
wl-folder-info-alist-modified as t.
---
 elmo/ChangeLog    |    5 +++++
 elmo/elmo-util.el |    6 +++++-
 wl/ChangeLog      |    8 ++++++++
 wl/wl-fldmgr.el   |    1 +
 wl/wl-folder.el   |    5 +----
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index f66aed0..fe6a321 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-28  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+	* elmo-util.el (elmo-get-hash-val): Check symbol is bound if
+	unintern is unbound.
+
 2004-01-25  Yoichi NAKAYAMA  <yoichi@geiin.org>
 
 	* elsp-bogofilter.el (elmo-spam-bogofilter-register-messages):
diff --git a/elmo/elmo-util.el b/elmo/elmo-util.el
index 24dca71..3cb5140 100644
--- a/elmo/elmo-util.el
+++ b/elmo/elmo-util.el
@@ -954,7 +954,11 @@ the directory becomes empty after deletion."
 	 file (nth 2 condition) number number-list)))))
 
 (defmacro elmo-get-hash-val (string hashtable)
-  `(symbol-value (intern-soft ,string ,hashtable)))
+  (static-if (fboundp 'unintern)
+      `(symbol-value (intern-soft ,string ,hashtable))
+    `(let ((sym (intern-soft ,string ,hashtable)))
+       (and (boundp sym)
+	    (symbol-value sym)))))
 
 (defmacro elmo-set-hash-val (string value hashtable)
   `(set (intern ,string ,hashtable) ,value))
diff --git a/wl/ChangeLog b/wl/ChangeLog
index 51aeae2..b9e02f4 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,11 @@
+2004-01-28  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+	* wl-folder.el (wl-folder-clear-entity-info): Use
+	elmo-clear-hash-val.
+
+	* wl-fldmgr.el (wl-fldmgr-rename): Set
+	wl-folder-info-alist-modified as t.
+
 2004-01-25  Yoichi NAKAYAMA  <yoichi@geiin.org>
 
 	* wl-fldmgr.el (wl-fldmgr-unsubscribe): Avoid compile warning.
diff --git a/wl/wl-fldmgr.el b/wl/wl-fldmgr.el
index 3a3ab0f..fb5b135 100644
--- a/wl/wl-fldmgr.el
+++ b/wl/wl-fldmgr.el
@@ -920,6 +920,7 @@ return value is diffs '(-new -unread -all)."
 	   new-folder
 	   (wl-folder-get-entity-info old-folder))
 	  (wl-folder-clear-entity-info old-folder)
+	  (setq wl-folder-info-alist-modified t)
 	  (if (eq (cdr (nth 2 tmp)) 'access)
 
 	      ;; force update access group
diff --git a/wl/wl-folder.el b/wl/wl-folder.el
index 89babbf..f0db0ba 100644
--- a/wl/wl-folder.el
+++ b/wl/wl-folder.el
@@ -279,10 +279,7 @@
        (and sym (boundp sym)))))
 
 (defmacro wl-folder-clear-entity-info (entity &optional hashtb)
-  (` (let ((sym (intern-soft (, entity)
-			     (or (, hashtb) wl-folder-entity-hashtb))))
-       (if (boundp sym)
-	   (makunbound sym)))))
+  (` (elmo-clear-hash-val (, entity) (or (, hashtb) wl-folder-entity-hashtb))))
 
 (defmacro wl-folder-get-entity-info (entity &optional hashtb)
   (` (elmo-get-hash-val (, entity) (or (, hashtb) wl-folder-entity-hashtb))))
-- 
1.7.10.4