tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode

This commit is contained in:
Eric Schulte 2010-07-07 15:46:35 -07:00
parent fabf73b060 b9aee58af3
commit 10600c55ee
2 changed files with 62 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
lisp/org-feed.el
View File

@ -166,10 +166,11 @@ Here are the keyword-value pair allows in `org-feed-alist'.
When the handler is called, point will be at the feed headline. When the handler is called, point will be at the feed headline.
:parse-feed function :parse-feed function
This function gets passed a buffer, and should return a list of entries, This function gets passed a buffer, and should return a list
each being a property list containing the `:guid' and `:item-full-text' of entries, each being a property list containing the
keys. The default is `org-feed-parse-rss-feed'; `org-feed-parse-atom-feed' `:guid' and `:item-full-text' keys. The default is
is an alternative. `org-feed-parse-rss-feed'; `org-feed-parse-atom-feed' is an
alternative.
:parse-entry function :parse-entry function
This function gets passed an entry as returned by the parse-feed This function gets passed an entry as returned by the parse-feed
@ -200,12 +201,12 @@ Here are the keyword-value pair allows in `org-feed-alist'.
(list :inline t :tag "Changed items" (list :inline t :tag "Changed items"
(const :changed-handler) (const :changed-handler)
(symbol :tag "Handler Function")) (symbol :tag "Handler Function"))
(list :inline t :tag "Parse Feed" (list :inline t :tag "Parse Feed"
(const :parse-feed) (const :parse-feed)
(symbol :tag "Parse Feed Function")) (symbol :tag "Parse Feed Function"))
(list :inline t :tag "Parse Entry" (list :inline t :tag "Parse Entry"
(const :parse-entry) (const :parse-entry)
(symbol :tag "Parse Entry Function")) (symbol :tag "Parse Entry Function"))
))))) )))))
(defcustom org-feed-drawer "FEEDSTATUS" (defcustom org-feed-drawer "FEEDSTATUS"
@ -270,6 +271,7 @@ have been saved."
(defun org-feed-unescape (s) (defun org-feed-unescape (s)
"Unescape protected entities in S." "Unescape protected entities in S."
(require 'xml)
(let ((re (concat "&\\(" (let ((re (concat "&\\("
(mapconcat 'car xml-entity-alist "\\|") (mapconcat 'car xml-entity-alist "\\|")
"\\);"))) "\\);")))
@ -313,10 +315,10 @@ it can be a list structured like an entry in `org-feed-alist'."
org-feed-default-template)) org-feed-default-template))
(drawer (or (nth 1 (memq :drawer feed)) (drawer (or (nth 1 (memq :drawer feed))
org-feed-drawer)) org-feed-drawer))
(parse-feed (or (nth 1 (memq :parse-feed feed)) (parse-feed (or (nth 1 (memq :parse-feed feed))
'org-feed-parse-rss-feed)) 'org-feed-parse-rss-feed))
(parse-entry (or (nth 1 (memq :parse-entry feed)) (parse-entry (or (nth 1 (memq :parse-entry feed))
'org-feed-parse-rss-entry)) 'org-feed-parse-rss-entry))
feed-buffer inbox-pos new-formatted feed-buffer inbox-pos new-formatted
entries old-status status new changed guid-alist e guid olds) entries old-status status new changed guid-alist e guid olds)
(setq feed-buffer (org-feed-get-feed url)) (setq feed-buffer (org-feed-get-feed url))
@ -332,10 +334,11 @@ it can be a list structured like an entry in `org-feed-alist'."
(setq old-status (org-feed-read-previous-status inbox-pos drawer)) (setq old-status (org-feed-read-previous-status inbox-pos drawer))
;; Add the "handled" status to the appropriate entries ;; Add the "handled" status to the appropriate entries
(setq entries (mapcar (lambda (e) (setq entries (mapcar (lambda (e)
(setq e (plist-put e :handled (setq e
(nth 1 (assoc (plist-put e :handled
(plist-get e :guid) (nth 1 (assoc
old-status))))) (plist-get e :guid)
old-status)))))
entries)) entries))
;; Find out which entries are new and which are changed ;; Find out which entries are new and which are changed
(dolist (e entries) (dolist (e entries)
@ -630,14 +633,15 @@ containing the properties `:guid' and `:item-full-text'.
The `:item-full-text' property actually contains the sexp The `:item-full-text' property actually contains the sexp
formatted as a string, not the original XML data." formatted as a string, not the original XML data."
(require 'xml)
(with-current-buffer buffer (with-current-buffer buffer
(widen) (widen)
(let ((feed (car (xml-parse-region (point-min) (point-max))))) (let ((feed (car (xml-parse-region (point-min) (point-max)))))
(mapcar (mapcar
(lambda (entry) (lambda (entry)
(list (list
:guid (car (xml-node-children (car (xml-get-children entry 'id)))) :guid (car (xml-node-children (car (xml-get-children entry 'id))))
:item-full-text (prin1-to-string entry))) :item-full-text (prin1-to-string entry)))
(xml-get-children feed 'entry))))) (xml-get-children feed 'entry)))))
(defun org-feed-parse-atom-entry (entry) (defun org-feed-parse-atom-entry (entry)
@ -645,28 +649,36 @@ formatted as a string, not the original XML data."
(let ((xml (car (read-from-string (plist-get entry :item-full-text))))) (let ((xml (car (read-from-string (plist-get entry :item-full-text)))))
;; Get first <link href='foo'/>. ;; Get first <link href='foo'/>.
(setq entry (plist-put entry :link (setq entry (plist-put entry :link
(xml-get-attribute (xml-get-attribute
(car (xml-get-children xml 'link)) (car (xml-get-children xml 'link))
'href))) 'href)))
;; Add <title/> as :title. ;; Add <title/> as :title.
(setq entry (plist-put entry :title (setq entry (plist-put entry :title
(org-feed-unescape (car (xml-node-children (org-feed-unescape
(car (xml-get-children xml 'title))))))) (car (xml-node-children
(car (xml-get-children xml 'title)))))))
(let* ((content (car (xml-get-children xml 'content))) (let* ((content (car (xml-get-children xml 'content)))
(type (xml-get-attribute-or-nil content 'type))) (type (xml-get-attribute-or-nil content 'type)))
(when content (when content
(cond (cond
((string= type "text") ((string= type "text")
;; We like plain text. ;; We like plain text.
(setq entry (plist-put entry :description (org-feed-unescape (car (xml-node-children content)))))) (setq entry (plist-put entry :description
((string= type "html") (org-feed-unescape
;; TODO: convert HTML to Org markup. (car (xml-node-children content))))))
(setq entry (plist-put entry :description (org-feed-unescape (car (xml-node-children content)))))) ((string= type "html")
((string= type "xhtml") ;; TODO: convert HTML to Org markup.
;; TODO: convert XHTML to Org markup. (setq entry (plist-put entry :description
(setq entry (plist-put entry :description (prin1-to-string (xml-node-children content))))) (org-feed-unescape
(t (car (xml-node-children content))))))
(setq entry (plist-put entry :description (format "Unknown '%s' content." type))))))) ((string= type "xhtml")
;; TODO: convert XHTML to Org markup.
(setq entry (plist-put entry :description
(prin1-to-string
(xml-node-children content)))))
(t
(setq entry (plist-put entry :description
(format "Unknown '%s' content." type)))))))
entry)) entry))
(provide 'org-feed) (provide 'org-feed)

20
lisp/org.el
View File

@ -76,14 +76,15 @@
(require 'calendar) (require 'calendar)
;; Emacs 22 calendar compatibility: Make sure the new variables are available ;; Emacs 22 calendar compatibility: Make sure the new variables are available
(unless (boundp 'calendar-view-holidays-initially-flag) (when (fboundp 'defvaralias)
(defvaralias 'calendar-view-holidays-initially-flag (unless (boundp 'calendar-view-holidays-initially-flag)
'view-calendar-holidays-initially)) (defvaralias 'calendar-view-holidays-initially-flag
(unless (boundp 'calendar-view-diary-initially-flag) 'view-calendar-holidays-initially))
(defvaralias 'calendar-view-diary-initially-flag (unless (boundp 'calendar-view-diary-initially-flag)
'view-diary-entries-initially)) (defvaralias 'calendar-view-diary-initially-flag
(unless (boundp 'diary-fancy-buffer) 'view-diary-entries-initially))
(defvaralias 'diary-fancy-buffer 'fancy-diary-buffer)) (unless (boundp 'diary-fancy-buffer)
(defvaralias 'diary-fancy-buffer 'fancy-diary-buffer)))
;; For XEmacs, noutline is not yet provided by outline.el, so arrange for ;; For XEmacs, noutline is not yet provided by outline.el, so arrange for
;; the file noutline.el being loaded. ;; the file noutline.el being loaded.
@ -448,7 +449,8 @@ This option can also be set with the +OPTIONS line, e.g. \"^:nil\"."
(const :tag "Only with braces" {}) (const :tag "Only with braces" {})
(const :tag "Never interpret" nil))) (const :tag "Never interpret" nil)))
(defvaralias 'org-export-with-sub-superscripts 'org-use-sub-superscripts) (if (fboundp 'defvaralias)
(defvaralias 'org-export-with-sub-superscripts 'org-use-sub-superscripts))
(defcustom org-startup-with-beamer-mode nil (defcustom org-startup-with-beamer-mode nil