X-Git-Url: http://gitweb.fperrin.net/?p=atom.el.git;a=blobdiff_plain;f=atom.el;h=c645cdabe08313b160472b6e32767c179dadd351;hp=875ef87f318f7b93e62dfa9c9e216a4eae3f6217;hb=2b75d2a99cd209df02c6ee21f69e7499e5dc4a52;hpb=3164c2d46402bcd550dbeacf0f9e85324ab1ad58 diff --git a/atom.el b/atom.el index 875ef87..c645cda 100644 --- a/atom.el +++ b/atom.el @@ -86,7 +86,7 @@ UPDATED is the date the feed was last updated. If not given, ID is a unique identifier for this feed. If not given, it defaults to LINK." (let ((atom-feed (list (list 'title nil title)))) - (atom-modify-entry atom-feed 'link (list (list (cons 'href link)))) + (atom-modify-entry atom-feed 'link `(((href . ,link)))) (atom-modify-entry atom-feed 'author (atom-massage-author author)) (if self (atom-modify-entry atom-feed 'link `(((href . ,self) (rel . "self") @@ -97,7 +97,7 @@ defaults to LINK." (defun atom-push-entry (atom entry) "Add the entry ENTRY to the feed ATOM." - (nconc atom (list `(entry nil . ,entry)))) + (nconc atom (list `(entry nil ,@entry)))) (defun atom-modify-entry (entry name val) "Set the NAME element of ENTRY to VAL. A true MULTIPLE means @@ -148,10 +148,8 @@ when the content of the entry ." be a string enconding a valid HTML fragment. See `atom-add-entry' for additional details." (atom-add-entry atom - title link - (atom-massage-html content) - (and summary (atom-massage-html summary)) - updated id)) + title link (atom-massage-html content) + updated id (and summary (atom-massage-html summary)))) (defun atom-add-xhtml-entry (atom title link content &optional updated id summary) @@ -159,10 +157,8 @@ for additional details." given either as a string, or as an XML tree, of a valid XHTML fragment. See `atom-add-entry' for additional details." (atom-add-entry atom - title link - (atom-massage-xhtml content) - (and summary (atom-massage-xhtml summary)) - updated id)) + title link (atom-massage-xhtml content) + updated id (and summary (atom-massage-xhtml summary)))) (defun atom-print (atom) "Print the Atom feed ATOM in the current buffer." @@ -189,17 +185,18 @@ Atom feed. CONTENT must be a string." (defun atom-string-to-xml (string) "Convert STRING into a Lisp structure as used by `xml.el'." (with-temp-buffer + (insert "