From a96996130d28af1355656edc406c7197348c2917 Mon Sep 17 00:00:00 2001 From: teranisi Date: Tue, 28 Aug 2001 08:01:32 +0000 Subject: [PATCH] * acap.el (acap-parse-return-metadata-or-return-metalist): Fix for parsing NIL. (acap-parse-return-metadata): Ditto. --- elmo/ChangeLog | 4 ++++ elmo/acap.el | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/elmo/ChangeLog b/elmo/ChangeLog index 49ee3c8..80b804d 100644 --- a/elmo/ChangeLog +++ b/elmo/ChangeLog @@ -1,5 +1,9 @@ 2001-08-28 Yuuichi Teranishi + * 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 --- 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. )) -- 1.7.10.4