* acap.el (acap-parse-return-metadata-or-return-metalist): Fix for parsing NIL.

(acap-parse-return-metadata): Ditto.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 49ee3c8..80b804d 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,5 +1,9 @@
 2001-08-28  Yuuichi Teranishi  <teranisi@gohome.org>
 
+       * acap.el (acap-parse-return-metadata-or-return-metalist): Fix for
+       parsing NIL.
+       (acap-parse-return-metadata): Ditto.
+
        * slp.el: New file.
        (toplevel): Fixed typo.
 

diff --git a/elmo/acap.el b/elmo/acap.el
index 55a02cb..0c8dcde 100644 (file)
--- a/elmo/acap.el
+++ b/elmo/acap.el
@@ -658,9 +658,9 @@ ENTRIES is a store-entry list."
     rlist))
 
 (defun acap-parse-return-metadata-or-return-metalist ()
-  (or (acap-parse-nil)
-      (acap-parse-string)
-      (acap-parse-value-or-return-metalist)))
+  (or (acap-parse-string)
+      (acap-parse-value-or-return-metalist)
+      (and (acap-parse-nil) nil)))
 
 (defun acap-parse-value-or-return-metalist ()
   (when (eq (char-after (point)) ?\()
@@ -687,9 +687,9 @@ ENTRIES is a store-entry list."
 
 ;;   return-metadata    = nil / string / value-list / acl
 (defun acap-parse-return-metadata ()
-  (or (acap-parse-nil)
-      (acap-parse-string)
+  (or (acap-parse-string)
       (acap-parse-value-list)
+      (and (acap-parse-nil) nil)
       ;; (acap-parse-acl) acl is same as value-list.
       ))