mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-04-27 08:43:40 -07:00
2010-07-19 Eric Schulte <schulte.eric@gmail.com> * ob-C.el: New file. * ob-R.el: New file. * ob-asymptote.el: New file. * ob-clojure.el: New file. * ob-comint.el: New file. * ob-css.el: New file. * ob-ditaa.el: New file. * ob-dot.el: New file. * ob-emacs-lisp.el: New file. * ob-eval.el: New file. * ob-exp.el: New file. * ob-gnuplot.el: New file. * ob-haskell.el: New file. * ob-keys.el: New file. * ob-latex.el: New file. * ob-lob.el: New file. * ob-matlab.el: New file. * ob-mscgen.el: New file. * ob-ocaml.el: New file. * ob-octave.el: New file. * ob-perl.el: New file. * ob-python.el: New file. * ob-ref.el: New file. * ob-ruby.el: New file. * ob-sass.el: New file. * ob-screen.el: New file. * ob-sh.el: New file. * ob-sql.el: New file. * ob-sqlite.el: New file. * ob-table.el: New file. * ob-tangle.el: New file. * ob.el: New file. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-mks.el: New file. * org-capture.el: New file. 2010-07-19 Christian Egli <christian.egli@sbszh.ch> * org-taskjuggler.el: New file. 2010-07-19 Matt Lundin <mdl@imapmail.org> * org-agenda.el (org-search-view): Fixed inclusion of agenda-archives in org-agenda-text-search-extra-files. 2010-07-19 David Maus <dmaus@ictsoc.de> * org-list.el (org-list-send-list): Locally bind variable `txt'. 2010-07-19 Eric Schulte <schulte.eric@gmail.com> * org.el (org-reload): now also reloading babel files 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-capture.el (org-capture-set-plist): Make sure txt is a string before calling `string-match'. (org-capture-templates): Fix customization type. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-latex.el (org-export-latex-preprocess): Make a special case for \nbsp. (org-latex-entities): Remove the entry for \nbsp. (org-latex-entities-exceptions): Variable removed. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-capture.el (org-capture-refile): Do not try to manipulate bookmark list. * org.el (org-refile): Use the correct bookmark here. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-list.el (org-list-send-list): Parse list from its true beginning. * org.el (org-ctrl-c-ctrl-c): Maybe send the list when at a list item. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-insert-link): Correctly determine if we should use a relative path. 2010-07-19 Nicolas Goaziou <n.goaziou@gmail.com> * org-list.el (org-list-radio-list-templates): Fix templates. 2010-07-19 Nicolas Goaziou <n.goaziou@gmail.com> * org-list.el (org-list-send-list): regexp defining the start of a radio list is now on par with the one used for radio tables. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-entities.el (org-entities-help): Add a headline for the user-defined entities. 2010-07-19 Dirk-Jan C. Binnema <djcb.bulk@gmail.com> (tiny change) * org-agenda.el (org-agenda-action): Document capture key and add it to the prompt. 2010-07-19 Eric Schulte <schulte.eric@gmail.com> * org-latex.el (org-export-latex-listings-langs): added (sqlite "SQL") 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-latex.el (org-export-latex-first-lines): Do not mark meta lines for removal. Do not remove BABEL config lines during export 2010-07-19 David Maus <dmaus@ictsoc.de> * org-capture.el (org-capture): Check if `org-capture-link-is-already-stored' is bound before evaluating. 2010-07-19 Eric Schulte <schulte.eric@gmail.com> * org.el: added autoload for org-babel-do-load-languages 2010-07-19 Eric Schulte <schulte.eric@gmail.com> * org-src.el (org-src-lang-modes): added sqlite to sql-mode 2010-07-19 David Maus <dmaus@ictsoc.de> * org-feed.el: Change indentation to match coding style guideline. 2010-07-19 David Maus <dmaus@ictsoc.de> * org-feed.el (org-feed-unescape, org-feed-parse-atom-feed): Load XML library if necessary. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-beamer.el (org-beamer-amend-header): Standardize the header cookie for the beamer extra stuff. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-beamer.el (org-beamer-amend-header): Put extra header last in header. 2010-07-19 David Maus <dmaus@ictsoc.de> * org-exp-blocks.el (org-export-blocks-format-ditaa) (org-export-blocks-format-dot): Remove text properties of body before calculating cache hash. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-latex.el (org-export-latex-tabular-environment): New option. (org-export-latex-tables): Use `org-export-latex-tabular-environment'. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-compat.el (org-version-check): New function. * org-indent.el (org-indent-mode): Check for exact emacs version. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-capture.el (org-capture-templates): Allow the template to come from a file or function call. (org-capture-place-entry): Get the template from file or function. 2010-07-19 David Maus <dmaus@ictsoc.de> * org-agenda.el (org-agenda-bulk-action): Don't create marker for position if target is entire file. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-autoload): Autoload a few more org-table functions. 2010-07-19 Eric Schulte <schulte.eric@gmail.com> * org.el (org-babel-load-languages): adding ob-mscgen 2010-07-19 Eric Schulte <schulte.eric@gmail.com> * org-latex.el (org-export-latex-tables): format string now matches options 2010-07-19 Eric Schulte <schulte.eric@gmail.com> * org.el (org-babel-load-languages): this variable controls which languages will be loaded by org-babel. It is customizable through the customize interface. 2010-07-19 Eric Schulte <schulte.eric@gmail.com> * org-latex.el (org-export-latex-format-image): updated number of arguments to allow for an optional short-name 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-indent.el (org-indent-mode): Refuse to turn on prior to Emacs 23.2 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-capture.el (org-capture-set-target-location): Store exact positions for file+regexp and file+function targets. (org-capture-place-entry, org-capture-place-item) (org-capture-place-table-line, org-capture-place-plain-text): Respect exact positions. (org-capture-finalize): Make sure we are at the beginning of a line when fixing the empty lines after the entry. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-entry-get-with-inheritance): New argument LITERAL-NIL. (org-entry-get): Pass `literal-nil' into `org-entry-get-with-inheritance'. (org-todo): React to nil values of the LOGGING property. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-default-notes-file): Update docstring 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-link-frame-setup): Use `org-gnus-no-new-news' as default. 2010-07-19 Eric Schulte <schulte.eric@gmail.com> * org-exp.el (org-export-attach-captions-and-attributes): adding a shortname attribute to caption strings under the symbol name org-caption-shortn. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-switchb): Renamed from `org-iswitchb'. Improve docstring. (org-iswitchb): New alias. (org-ido-switchb): Make alias point to `org-switchb'. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-capture.el (org-capture-fill-template): Respect time-of-day preference in template prompt. 2010-07-19 David Maus <dmaus@ictsoc.de> * org-feed.el (org-feed-unescape): Remove superfluous lambda. 2010-07-19 David Maus <dmaus@ictsoc.de> * org-wl.el (org-wl-disable-folder-check): New customization variable. (org-wl-open): Disable folder check depending on `org-wl-disable-folder-check'. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-capture.el (org-capture-set-target-location): Fix file+function interpretation. 2010-07-19 David Maus <dmaus@ictsoc.de> * org-feed.el (org-feed-parse-rss-entry): Unescape rss element content. 2010-07-19 David Maus <dmaus@ictsoc.de> * org-feed.el (xml-entity-alist): Declare variable `xml-entity-alist' for byte compiler. 2010-07-19 David Maus <dmaus@ictsoc.de> * org-feed.el (org-feed-unescape): New function. Unescape protected entities. (org-feed-parse-atom-entry): Use function for atom:content type text and html. 2010-07-19 David Maus <dmaus@ictsoc.de> * org-feed.el (org-feed-parse-rss-feed): Ignore case of rss element names. 2010-07-19 Bernt Hansen <bernt@norang.ca> * org.el (org-time-string-to-absolute): Ignore cyclic repeater when displaying items on todays agenda date. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-agenda.el (org-agenda-get-progress): Avoid reusing previous value of EXTRA. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-publish.el (org-publish-initialize-cache): Make timestamp directory, the entire path to it. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-exp.el (org-export-handle-comments): Make sure to check for protection in the comment line, and not in the line after it. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-html.el (org-export-html-preprocess): Call org-format-latex, possibly with a protect-only argument. * org.el (org-format-latex): New argument PROTECT-ONLY. 2010-07-19 Eric Schulte <schulte.eric@gmail.com> * org-exp.el (org-export-handle-table-metalines): this function removes table specific meta-lines, now that we aren't wiping everything that looks remotely like a comment at the end of the export process we have to be sure to catch all of the specific lines in org-exp.el 2010-07-19 Nicolas Goaziou <n.goaziou@gmail.com> * org-exp.el: (org-export-select-backend-specific-text) Properly get rid of #+Backend and #+ATTR_Backend specifics to backends not matching the one we're exporting to. 2010-07-19 Eric Schulte <schulte.eric@gmail.com> * Makefile (lisp/org-install.el): replacing babel files in construction of org-install.el 2010-07-19 Eric Schulte <schulte.eric@gmail.com> * org-table.el (orgtbl-to-generic): added the :remove-newlines option which will strip newline characters from the text of table cells and replace then with "\n" 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-confirm-shell-link-function): (org-confirm-elisp-link-function): Limit the values that can be set by file variables. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-compute-latex-and-specials-regexp): Deal with string elements by discarding them. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-iswitchb): Make sure to use at least iswitchb. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-capture.el (org-capture-position-for-last-stored): org-capture-bookmark-last-stored-position): New functions. (org-capture-place-table-line): Better error catching. (org-capture-place-item): (org-capture-place-entry): (org-capture-place-plain-text): Call `org-capture-position-for-last-stored'. (org-capture-finalize): Just call `org-capture-bookmark-last-stored-position'. 2010-07-19 Eric Schulte <schulte.eric@gmail.com> * org-exp.el (org-export-mark-blockquote-verse-center): fixed small bug, now grabbing match data before overwritten by looking-at this fixes a problem with remainders of #+end_quote lines appearing in exported output 2010-07-19 David Maus <dmaus@ictsoc.de> * org.el (org-link-frame-setup): Add customization option for Wanderlust. 2010-07-19 Eric Schulte <schulte.eric@gmail.com> * org-latex.el (org-export-latex-fixed-width): now checking org-example rather than org-protected on verbatim export, because by default all ": " prefixed lines are marked protected 2010-07-19 Eric Schulte <schulte.eric@gmail.com> * org-latex.el (org-export-latex-fixed-width): check for protection before wrapping ": " lines as verbatim 2010-07-19 Eric Schulte <schulte.eric@gmail.com> * org-exp.el (org-export-handle-comments): check for protection before removing comments 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-entities.el (org-entities): Restructure the list. (org-entities-help): Turn the help output into a buffer in Org-mode, so that it becomes easier to find a symbol in the structure. (org-entities-create-table): Deal with new structure. 2010-07-19 David Maus <dmaus@ictsoc.de> * org-agenda.el (org-write-agenda): Use backquotes to expand `flet' at compile time. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-entry-properties): Make sure that standard property names are used even if the user has customized time keywords. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-macs.el (org-not-nil): Return the value if not interpreted as nil. * org.el (org-entry-get): (org-entry-get-with-inheritance): Interpret the value "nil" as nil for properties. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-switch-to-buffer-other-window): Return the buffer. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-macs.el (org-not-nil): New function. * org.el (org-block-todo-from-children-or-siblings-or-parent): Use `org-not-nil' to interpret a property value of nil. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-truely-invisible-p): New function. (org-beginning-of-line): Use `org-truely-invisible-p'. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-agenda.el (org-agenda-get-timestamps): No errors while getting TODO state. (org-agenda-highlight-todo): No error when no keyword has been matched. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-timestamp-change): New optional argument UPDOWN. Use this to identify calls from org-timestamp-up/down, so that we can skip by rounding minutes in this case. (org-timestamp-up): (org-timestamp-down): (org-timestamp-up-day): (org-timestamp-down-day): Call org-timestamp-change with the updown argument. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-agenda.el (org-agenda-action): Make `c' key call org-capture. * org-capture.el: New file. * org-compat.el (org-get-x-clipboard): Function moved here from remember.el. * org-mks.el: New file * org.el (org-set-regexps-and-options): Allow statistic cookies as part of complex headlines. (org-find-olp): New argument THIS-BUFFER. When set, assume that the OLP does not contain a file name. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-mode): Set `comment-start' instead of changing the syntax of the `#' character. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-exp.el (org-export-format-source-code-or-example): Mark examples by a property. o * org-html.el (org-export-html-close-lists-maybe): Check if raw HTML stuff was actually made from an example 2010-07-19 Eric Schulte <schulte.eric@gmail.com> * Makefile (LISPF): let's not compile files that won't often be used. 2010-07-19 Bastien Guerry <bzg@altern.org> * org-latex.el: items are no longer skipped when their first line ends on a protected element. * org-list.el: protected environments looking like lists are not exported anymore. 2010-07-19 Eric Schulte <schulte.eric@gmail.com> * org-exp-blocks.el (org-export-blocks-preprocess): cleanup trailing newline after block 2010-07-19 Bastien Guerry <bzg@altern.org> * org-exp.el: comment regexp now matches documentation. No more protection check when deleting comments before export. 2010-07-19 Bastien Guerry <bzg@altern.org> * org-exp.el (org-export-preprocess-string): now using `org-export-handle-include-files-recurse' to resolve included files 2010-07-19 Bastien Guerry <bzg@altern.org> * org-agenda.el (org-agenda-get-deadlines): (org-agenda-get-scheduled): * org.el (org-time-string-to-seconds): For deadline and scheduled agenda display ignore the cyclic repeater when calculating how many days late the task is. If you have a weekly task and miss the date the agenda view will show more than a week late now instead of resetting on the cyclic repeating date. This makes it much more obvious when you missed a repeating task after the repeater. 2010-07-19 Bastien Guerry <bzg@altern.org> * org-exp.el (org-export-mark-blockquote-verse-center): Consider environments that end at eob. 2010-07-19 Mikael Fornius <mfo@abc.se> * org.el (org-raise-scripts): Do not fontify sub/superscripts of text with face `org-special-keyword'. Makes property keys as :LAST_REPEAT: display correctly. 2010-07-19 Mikael Fornius <mfo@abc.se> * org.el (org-at-property-p): Use save-match-data macro instead of let. 2010-07-19 Mikael Fornius <mfo@abc.se> * org.el (test): Removed unused test function. 2010-07-19 Eric Schulte <schulte.eric@gmail.com> * org-exp-blocks.el (org-export-blocks-preprocess): fixed typo 2010-07-19 Eric Schulte <schulte.eric@gmail.com> * org-exp-blocks.el (org-export-blocks-postblock-hook): adding documentation to and turning into a defcustom 2010-07-19 Eric Schulte <schulte.eric@gmail.com> * org-exp.el (org-get-file-contents): by un-setting prefix1 to "" instead of to nil we avoid errors when :prefix1 is defined, but prefix is not. 2010-07-19 Nicolas Goaziou <n.goaziou@gmail.com> * org-latex.el (org-export-latex-preprocess): Environments coming from latex backend specific instructions (#+LaTeX) are already protected and won't be treated as normal environments. 2010-07-19 Bastien Guerry <bzg@altern.org> * org-timer.el (org-timer-set-timer): Fix typo in the docstring. 2010-07-19 Bastien Guerry <bzg@altern.org> * org-timer.el (org-timer-set-timer): Use a prefix argument. See the docstring of the function. 2010-07-19 Bastien Guerry <bzg@altern.org> * org-timer.el (org-timer-set-timer): Fix bug about cancelling timers. 2010-07-19 David Maus <dmaus@ictsoc.de> * org-w3m.el (org-w3m-copy-for-org-mode) (org-w3m-get-next-link-start, org-w3m-get-prev-link-start): Get text property directly, not using macro `w3m-anchor'. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-emph-re): Document the match groups. 2010-07-19 Bernt Hansen <bernt@norang.ca> * org-clock.el (org-clock-in): Set `org-clock-clocking-in' to t before calling `org-clock-out', so that that function can know its call context. 2010-07-19 Bastien Guerry <bzg@altern.org> * org-timer.el (org-timer-default-timer): New variable. (org-timer-set-timer): Use the new variable. Also offer the possibility to replace the current timer by a new one. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-kill-note-or-show-branches): Hide subtree before exposing the headings. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-add-planning-info): Remove the empty line also if there is no whitespace at all in there. * org-table.el (org-table-align): Fix alignment of strings with invisible characters. 2010-07-19 David Maus <dmaus@ictsoc.de> * org.el (org-refile-cache-get): Return empty list of targets when cache was cleared. (org-clone-subtree-with-time-shift): Maybe create ID property in cloned subtrees. (org-clone-delete-id): New customization variable. (org-clone-subtree-with-time-shift): Use customization variable `org-clone-delete-id'. (org-clone-subtree-with-time-shift): Remove empty property drawer in cloned subtrees. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-refile-use-cache): New option. (org-refile-cache, org-refile-markers): New variable. (org-refile-marker, org-refile-cache-clear) (org-refile-cache-check-set, org-refile-cache-put) (org-refile-cache-get): New function. (org-get-refile-targets): Use the refile cache. * org-clock.el (org-clock-sum): Don't include running clock if the time block is wrong. 2010-07-19 John Wiegley <jwiegley@gmail.com> * org-clock.el (org-clock-clock-in, org-clock-in): Added parameter `start-time'. (org-clock-resolve-clock): Added parameter `clock-out-time'. If set, and resolve-to is a past time, then the clock out event occurs at `clock-out-time' rather than at `resolve-to'. In this case, `resolve-to' becomes the clock in time. (org-clock-jump-to-current-clock): Created new global command to reveal the current clock. (org-clock-resolve): Added new commands g/G and j/J, and a help window describing all commands and their meaning. (org-clock-resolve-expert): New customization variable. (org-find-open-clocks): Fixed a bug that caused discovered clocks not to match up with the currently active clock. (org-resolve-clocks): Changed the argument `also-non-dangling-p' to `only-dangling-p', since due to a bug this was the default behavior all along. 2010-07-19 David Maus <dmaus@ictsoc.de> * org-id.el (org-id-uuid): New function. Return string with random (version 4) UUID. (org-id-method): Make 'uuid the new default value. (org-id-new): Use `org-id-uuid' if call to uuidgen program does not return a UUID. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-latex.el (org-export-latex-format-image): Add support for multicolumn figures in LaTeX. 2010-07-19 David Maus <dmaus@ictsoc.de> * org.el (org-clone-subtree-with-time-shift): Remove ID property of original subtree in cloned subtrees. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-exp.el (org-export-format-source-code-or-example): XEmacs compatibility. * org-latex.el (org-export-latex-tables): Accept comma in align string. * org-docbook.el (org-export-docbook-xslt-stylesheet): New option. (org-export-docbook-xslt-proc-command): Fix docstring. (org-export-docbook-xsl-fo-proc-command): Fix docstring. (org-export-as-docbook-pdf): Improve formatting of the xslt command. * org-exp.el (org-infile-export-plist): Check for XSLT setting. * org.el (org-file-contents): Improve error message. (org-set-regexps-and-options): Remove spaces at both ends. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-docbook.el (org-export-as-docbook-pdf): Improve formatting of the xslt command. 2010-07-19 Sebastian Rose <sebastian_rose@gmx.de> * org-publish.el (org-publish-cache): Use one big hashmap for each project defined in `org-publish-project-alist'. (initialize-files-alist): Function removed. (org-publish-validate-link): Function removed. (org-publish-get-base-files): Add variable `sitemap-requested' to avoid sorting where possible. (org-publish-get-files): Function removed. (org-publish-get-project-from-filename): Make independent of file list. (org-publish-file): New argument NO-CACHE. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-beginning-of-defun, org-end-of-defun): New functions. (org-mode): Install the `org-beginning-of-defun' and `org-end-of-defun' functions. (org-pretty-entities): New option. (org-toggle-pretty-entities): New command. (org-fontify-entities): New function. (org-startup-options): New keywords for pretty entities. (org-set-font-lock-defaults): Call the pretty entities function. * org-latex.el (org-export-latex-keywords-maybe): Protect the TODO markup. 2010-07-19 Mikael Fornius <mfo@abc.se> * org-habit.el (org-habit-build-graph): Help-echo date when mouse is over stars. 2010-07-19 Jan Böker <jan.boecker@jboecker.de> * org.el (org-file-apps): Improve docstring to reflect grouping matches 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-set-startup-visibility): Fix empty line display. * org-latex.el (org-export-latex-links): Use the formatting function of the link type, if it is available. * org-table.el (org-table-get-remote-range): Return to original buffer when retrieving remote reference. * org.el (org-display-inline-images): Do the entire buffer, not just the narrowed region. Clear the cache. (org-display-inline-images): Match mode file paths. 2010-07-19 David Maus <dmaus@ictsoc.de> * org-wl.el (org-wl-store-link-folder): Don't throw error when called on WL folder group. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-replace-escapes): Make sure the cdr is not nil. (org-read-date): Make `M-v' and `C-v' scroll the popup calendar. (org-mode): Revert comment syntax changes. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-sparse-tree): Make `C-c / t' search for all TODO keywords, and `C-c / T' for a specific one. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-mode): Fix comment syntax settings. * org-src.el (org-edit-src-allow-write-back-p): Define variable. * org.el (org-inline-image-overlays): New variable. (org-toggle-inline-images, org-display-inline-images) (org-remove-inline-images): New commands. (org-mode-map): Define a key for `org-toggle-inline-images'. 2010-07-19 David Maus <dmaus@ictsoc.de> * org-wl.el (org-wl-message-field): New function. Return content of header field in message entity. (org-wl-store-link): Call `org-wl-store-link-folder' or `org-wl-store-link-message' depending on major-mode. (org-wl-store-link-folder): New function. Store link to Wanderlust folder. (org-wl-store-link-message): New function. Store link to Wanderlust message. (org-wl-store-link-message): Store link to message while visiting message. (org-wl-open): Don't try to jump to message when opening a folder link. 2010-07-19 David Maus <dmaus@ictsoc.de> * org.el (org-replace-escapes): Avoid infinite loop when replace string contains escape sequence it replaces. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-crypt.el (org-crypt-key-for-heading): Use symmetric encryption when now key is set. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-table.el (org-table-recalculate-buffer-tables) (org-table-iterate-buffer-tables): New commands. * org.el (org-check-for-hidden): When there is a region, skip the check. 2010-07-19 Dan Davison <davison@stats.ox.ac.uk> * org-src.el (org-edit-src-code): allow-write-back-p had erroneously been omitted from let binding 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-agenda.el (org-sorting-choice): New sorting type alpha. (org-cmp-alpha): New defsubst. (org-em): New defsubst. (org-entries-lessp): Only compute needed comparisons. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-html.el (org-format-org-table-html): Test all columns for number content. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-latex.el (org-export-latex-treat-sub-super-char): Make sure parenthesis matching is consistent. * org-table.el (org-table-colgroup-line-p) (org-table-cookie-line-p): New functions. * org-exp.el (org-table-clean-before-export): Better tests for colgroup and cookie lines. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-agenda.el (org-agenda-goto): Push a mark before changing the position. * org-footnote.el (org-footnote): New group. (org-footnote-section) (org-footnote-tag-for-non-org-mode-files): Fix typos. * org-list.el (org-end-of-item-text-before-children): Also do the right thing at the end of a file. * org.el (org-set-packages-alist, org-get-packages-alist): New function. (org-export-latex-default-packages-alist) (org-export-latex-packages-alist): Add extra flag to each package, indicating if it should be used for snippets. (org-create-formula-image): Add the snippet argument. (org-splice-latex-header): New argument SNIPPET-P, pass it through to `org-latex-packages-to-string'. (org-latex-packages-to-string): New argument SNIPPET-P. * org-latex.el (org-export-latex-make-header): Add the snippet argument. * org-docbook.el (org-export-as-docbook): Implement ordered lists starting at some offset. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-link-types, org-open-at-point): Add doi links. * org-ascii.el (org-export-ascii-preprocess): Remove list startcounter cookies. * org-list.el (org-renumber-ordered-list): Respect counter start values. * org-latex.el (org-export-latex-lists): Accept ordered list item offset cookie. * org-html.el (org-export-as-html): Accept ordered list item offset cookie. * org-indent.el (org-indent-mode): Turn off `indent-tabs-mode' which messes up alignment of tags. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-clock.el (org-clock-cancel, org-clock-out): Make sure the modeline display is removed. * org-exp.el (org-export-format-drawer-function): Fix docstring. * org-agenda.el (org-agenda-refile): New optional argument NO-UPDATE. (org-agenda-refile): Call `org-agenda-redo' unless NO-UPDATE is set. (org-agenda-bulk-action): Call the refile command with updates suppressed - but arrange for `org-agenda-redo' to be called at the end. * org.el (org-mode): Make table mapping quiet. (org-table-map-tables): New optional argument QUIETLY. * org-ascii.el (org-export-ascii-preprocess): Make table mapping quiet. * org-html.el (org-export-as-html, org-html-level-start): Change XHTML IDs to not use dots. * org-exp.el (org-export-define-heading-targets): Change XHTML IDs to not use dots. * org-docbook.el (org-export-docbook-level-start): Change XHTML IDs to not use dots. * org-latex.el (org-export-as-latex): Make sure that the result buffer is in latex-mode. * org.el (org-shiftup-final-hook, org-shiftdown-final-hook) (org-shiftleft-final-hook, org-shiftright-final-hook): New hooks. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-table.el (org-table-justify-field-maybe): Make sure that inserting a value does not turn a line into a hline. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-clock.el (org-clock-sum): New argument HEADLINE-FILTER. (org-clock-sum): Add property to selected headlines. (org-dblock-write:clocktable): Make tags matcher. * org.el (org-set-autofill-regexps): XEmacs compatibility. * org-latex.el (org-export-latex-set-initial-vars): Allow "-" in latex class definitions * org.el (org-shiftup-hook, org-shiftdown-hook) (org-shiftleft-hook, org-shiftright-hook): New hooks. * org-entities.el (org-entities): Use \land and \lor for logical operators. * org.el (org-shiftmetaleft, org-shiftmetaright): Call the subtree indentation commands. (org-hidden-tree-error): New defsubst. (org-metaleft, org-metaright): Check for hidden stuff and throw an error. (org-check-for-hidden): New function. * org-list.el (org-item-re): New function. (org-at-item-p): Use `org-item-re'. (org-end-of-item-text-before-children): New function. (org-outdent-item, org-indent-item): Arrange for leaving the subtree alone. (org-outdent-item-tree, org-indent-item-tree): New argument NO-SUBTREE. (org-indent-item-tree): Use `org-end-of-item-text-before-children' to find the end for processing while ignoring the subtree. * org-publish.el (org-publish-sitemap-sort-alphabetically) (org-publish-sitemap-sort-folders) (org-publish-sitemap-sort-ignore-case): New options. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-publish.el (org-publish-compare-directory-files): Fix sorting. * org-compat.el (org-get-x-clipboard-compat): Use (featurep 'xemacs). * org-publish.el (org-publish-project-alist): Update docstring. (org-publish-file-title-cache): New variable. (org-publish-initialize-files-alist): Initialize `org-publish-initialize-files-alist' to nil. (org-publish-sort-directory-files): New function. (org-publish-projects): Access the new properties. (org-publish-find-title): Use the file title cache. (org-publish-find-title): Build the file title cache. (org-publish-get-base-files-1): Sort files. (org-publish-aux-preprocess): Do not throw an error when before the first headline. Allow an empty target, meaning to link just to the file. (org-publish-index-generate-theindex.inc): Check if there is actually a target and only then add it to the link. (org-publish-projects): Fix a remaining issue with the last commit * org-html.el (org-export-as-html): Treat verse as open/close paragraph. (org-export-html-close-lists-maybe): Allow to splice raw HTML into and out of lists. 2010-07-19 Dan Davison <davison@stats.ox.ac.uk> * org-src.el (org-edit-src-code): Allow the org-src edit buffer to be used in a read-only mode. (org-edit-src-code): Different message in read-only mode 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-src.el (org-edit-src-find-region-and-lang): Test for table.el as late as possible. * org-colview-xemacs.el: Make sure this file is never loaded into Emacs. Remove all tests for XEmacs. * org-colview.el: Make sure this file is never loaded into XEmacs. * org-agenda.el (org-highlight, org-unhighlight): Use direct overlay calls. * org.el (org-key): Apply the translations defined in `org-xemacs-key-equivalents'. * org-mouse.el (org-mode-hook): Use `org-defkey'. * org-compat.el (org-xemacs-key-equivalents): New constant. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-inlinetask.el (org-inlinetask-defaut-state): New option. (org-inlinetask-insert-task): Use `org-inlinetask-defaut-state'. Obey `org-odd-levels-only'. * org-compat.el (org-find-overlays): Use overlays-in/at. * org.el (org-remove-empty-overlays-at) (org-outline-overlay-data, org-hide-block-toggle) (org-format-latex, org-context): Use overlays-in/at. * org-src.el (org-edit-src-exit): Use overlays-in/at. * org-agenda.el (org-agenda-mark-clocking-task) (org-agenda-fontify-priorities, org-agenda-dim-blocked-tasks) (org-agenda-entry-text-hide) (org-agenda-fix-tags-filter-overlays-at) (org-agenda-bulk-remove-overlays): Use overlays-in/at. * org-compat.el (org-overlays-at): Function removed. (org-overlays-in): Function removed. 2010-07-19 Bastien Guerry <bzg@altern.org> * org-clock.el (org-clock-set-current): Just return the headline itself, strip the TODO keyword, the priority cookie and the tags. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-compat.el (org-xemacs-without-invisibility): New macro. (org-xemacs-without-invisibility): New macro. (org-indent-to-column, org-indent-line-to, org-move-to-column): Redefine using the macro `org-xemacs-without-invisibility'. * org.el (org-mode, org-org-menu): Use `add-to-invisibility-spec'. * org-table.el (orgtbl-mode): Use `add-to-invisibility-spec'. * org-compat.el (org-make-overlay, org-delete-overlay) (org-overlay-start, org-overlay-end, org-overlay-put) (org-overlay-get, org-overlay-move, org-overlay-buffer): Functions removed. (org-add-to-invisibility-spec): Function removed. * org-html.el (org-export-as-html-and-open): Add argument to kill-buffer. * org-habit.el (require): `calendar' is now required already by org.el on top level. * org-clock.el (require): `calendar' is now required already by org.el on top level. * org-agenda.el (require, org-timeline, org-agenda-list) (org-todo-list, org-agenda-to-appt): `calendar' is now required already by org.el on top level. * org.el (org-export-latex-fix-inputenc): Declare function. * org-agenda.el (org-agenda-goto-calendar): Do not bind obsolete variables. * org.el (calendar): Require calendar now on top level in org.el and define aliases to new variables when needed. (org-read-date, org-goto-calendar): Do not bind obsolete variables. * org-clock.el (org-clock-out, org-clock-cancel): Get rid of compilation warning, add comment that this cannot be done with `with-current-buffer'. * org-wl.el (org-wl-open): Use `with-current-buffer'. * org.el (overlay, org-remove-empty-overlays-at) (org-outline-overlay-data, org-set-outline-overlay-data) (org-show-block-all, org-hide-block-toggle) (org-highlight-new-match, org-remove-occur-highlights) (org-tags-overlay, org-fast-tag-selection, org-date-ovl) (org-read-date, org-read-date-display, org-eval-in-calendar) (org-format-latex, org-context) (org-speedbar-restriction-lock-overlay) (org-speedbar-set-agenda-restriction): Use the normal overlay API. * org-table.el (org-table-add-rectangle-overlay) (org-table-remove-rectangle-highlight) (org-table-overlay-coordinates) (org-table-toggle-coordinate-overlays): Use the normal overlay API. * org-src.el (org-edit-src-code, org-edit-fixed-width-region) (org-edit-src-exit, org-src-mode-configure-edit-buffer): Use the normal overlay API. * org-colview.el (org-columns-new-overlay) (org-columns-display-here, org-columns-remove-overlays) (org-columns-edit-value, org-columns-next-allowed-value) (org-columns-update): Use the normal overlay API. * org-clock.el (org-clock-out, org-clock-cancel) (org-clock-put-overlay, org-clock-remove-overlays): Use the normal overlay API. * org-agenda.el (org-agenda-mark-filtered-text) (org-agenda-mark-clocking-task, org-agenda-fontify-priorities) (org-agenda-dim-blocked-tasks, org-agenda-entry-text-show-here) (org-agenda-entry-text-hide) (org-agenda-restriction-lock-overlay) (org-agenda-set-restriction-lock) (org-agenda-filter-by-tag-hide-line) (org-agenda-fix-tags-filter-overlays-at) (org-agenda-filter-by-tag-show-all, org-hl) (org-agenda-goto-calendar, org-agenda-bulk-mark) (org-agenda-bulk-remove-overlays): Use the normal overlay API. * org-freemind.el (org-freemind-from-org-mode-node) (org-freemind-from-org-mode, ) (org-freemind-from-org-sparse-tree, org-freemind-to-org-mode): Use interactive-p instead of called-interactively, because this is backward compatible with older Emacsen I still support.. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-exp.el (org-export-define-heading-targets): Fix bug in regexp finding ID and CUSTOM_ID properties. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-footnote.el (org-footnote-goto-previous-reference): Renamed from `org-footnote-goto-next-reference'. * org.el (org-auto-repeat-maybe): Only record LAST_REPEAT if org-log-repeat is non-nil, or if there is clocking data in the entry. * org-crypt.el (org-encrypt-entry): Improve mapping behavior. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-align-all-tags): New command. 2010-07-19 David Maus <dmaus@ictsoc.de> * org-wl.el (org-wl-link-remove-filter): New customizable variable. If non-nil, filter conditions are stripped when storing link to message in filter folder. (org-wl-shimbun-prefer-web-links): New customizable variable. If non-nil, links to shimbun messages are created as web links to message source. (org-wl-nntp-prefer-web-links): New customizable variable. If non-nil, links to nntp message are created as web links to gmane or googlegroups. (org-wl-namazu-default-index): New customizable variable. Directory of namazu search index that should be used as default when opening a link in a search folder. (org-wl-folder-types): New constant. Wanderlust folder type indicators. (org-wl-folder-type): New function. Return type of Wanderlust folder. (org-wl-store-link): Create web links for shimbun or nntp messages and strip filter conditions depending on customizable variables. (org-wl-open): Open namazu search folder for message when called with prefix. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-remove-if, org-remove-if-not): New functions. (org-open-file): Use internal remove-if functions. 2010-07-19 Jan Böcker <jan.boecker@jboecker.de> * org.el (org-file-apps-entry-match-against-dlink-p): new function. (org-file-apps-ex): remove variable. (org-open-file): Integrate org-file-apps-ex functionality back into org-file-apps, and decide whether to match a regexp against the link or the filename using org-file-apps-entry-uses-grouping-p. 2010-07-19 Jan Böcker <jan.boecker@jboecker.de> * org.el (org-file-apps-ex): new variable. (org-open-file): Before considering org-file-apps, first match the regexps from org-file-apps-ex against the whole link. See docstring of org-file-apps-ex. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-export-latex-default-packages-alist): Remove microtype package. (org-todo-repeat-to-state): New variable. (org-auto-repeat-maybe): Allow user-selected target states. (org-default-properties): Add the new property REPEAT_TO_STATE. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org-mobile.el (org-mobile-check-setup): Make sure that there is a binary to compute checksums. 2010-07-19 Carsten Dominik <carsten.dominik@gmail.com> * org.texi: Add macros to get plain quotes in PDF output. List additional contributors. (Capture): New section, replaces the section about remember. (Working With Source Code): New chapter, focused on documenting Org Babel. (Code evaluation security): New section. (MobileOrg): Document DropBox support. (TaskJuggler export): Document taskjuggler and Gantt chart support. (Special symbols): Show how to display UTF8 characters for entities. (Global TODO list): Clarify the use of the "M" key and the differences to the "m" key. (RSS Feeds): Mention Atom feeds as well. (Setting tags): Remove paragraph about `org-complete-tags-always-offer-all-agenda-tags'.
687 lines
25 KiB
EmacsLisp
687 lines
25 KiB
EmacsLisp
;;; org-feed.el --- Add RSS feed items to Org files
|
|
;;
|
|
;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
|
|
;;
|
|
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
|
;; Keywords: outlines, hypermedia, calendar, wp
|
|
;; Homepage: http://orgmode.org
|
|
;; Version: 7.01
|
|
;;
|
|
;; This file is part of GNU Emacs.
|
|
;;
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
;;
|
|
;;; Commentary:
|
|
;;
|
|
;; This module allows to create and change entries in an Org-mode
|
|
;; file triggered by items in an RSS feed. The basic functionality is
|
|
;; geared toward simply adding new items found in a feed as outline nodes
|
|
;; to an Org file. Using hooks, arbitrary actions can be triggered for
|
|
;; new or changed items.
|
|
;;
|
|
;; Selecting feeds and target locations
|
|
;; ------------------------------------
|
|
;;
|
|
;; This module is configured through a single variable, `org-feed-alist'.
|
|
;; Here is an example, using a notes/tasks feed from reQall.com.
|
|
;;
|
|
;; (setq org-feed-alist
|
|
;; '(("ReQall"
|
|
;; "http://www.reqall.com/user/feeds/rss/a1b2c3....."
|
|
;; "~/org/feeds.org" "ReQall Entries")
|
|
;;
|
|
;; With this setup, the command `M-x org-feed-update-all' will
|
|
;; collect new entries in the feed at the given URL and create
|
|
;; entries as subheadings under the "ReQall Entries" heading in the
|
|
;; file "~/org/feeds.org". Each feed should normally have its own
|
|
;; heading - however see the `:drawer' parameter.
|
|
;;
|
|
;; Besides these standard elements that need to be specified for each
|
|
;; feed, keyword-value pairs can set additional options. For example,
|
|
;; to de-select transitional entries with a title containing
|
|
;;
|
|
;; "reQall is typing what you said",
|
|
;;
|
|
;; you could use the `:filter' argument:
|
|
;;
|
|
;; (setq org-feed-alist
|
|
;; '(("ReQall"
|
|
;; "http://www.reqall.com/user/feeds/rss/a1b2c3....."
|
|
;; "~/org/feeds.org" "ReQall Entries"
|
|
;; :filter my-reqall-filter)))
|
|
;;
|
|
;; (defun my-reqall-filter (e)
|
|
;; (if (string-match "reQall is typing what you said"
|
|
;; (plist-get e :title))
|
|
;; nil
|
|
;; e))
|
|
;;
|
|
;; See the docstring for `org-feed-alist' for more details.
|
|
;;
|
|
;;
|
|
;; Keeping track of previously added entries
|
|
;; -----------------------------------------
|
|
;;
|
|
;; Since Org allows you to delete, archive, or move outline nodes,
|
|
;; org-feed.el needs to keep track of which feed items have been handled
|
|
;; before, so that they will not be handled again. For this, org-feed.el
|
|
;; stores information in a special drawer, FEEDSTATUS, under the heading
|
|
;; that received the input of the feed. You should add FEEDSTATUS
|
|
;; to your list of drawers in the files that receive feed input:
|
|
;;
|
|
;; #+DRAWERS: PROPERTIES LOGBOOK FEEDSTATUS
|
|
;;
|
|
;; Acknowledgments
|
|
;; ---------------
|
|
;;
|
|
;; org-feed.el is based on ideas by Brad Bozarth who implemented a
|
|
;; similar mechanism using shell and awk scripts.
|
|
|
|
;;; Code:
|
|
|
|
(require 'org)
|
|
(require 'sha1)
|
|
|
|
(declare-function url-retrieve-synchronously "url" (url))
|
|
(declare-function xml-node-children "xml" (node))
|
|
(declare-function xml-get-children "xml" (node child-name))
|
|
(declare-function xml-get-attribute "xml" (node attribute))
|
|
(declare-function xml-get-attribute-or-nil "xml" (node attribute))
|
|
(defvar xml-entity-alist)
|
|
|
|
(defgroup org-feed nil
|
|
"Options concerning RSS feeds as inputs for Org files."
|
|
:tag "Org ID"
|
|
:group 'org)
|
|
|
|
(defcustom org-feed-alist nil
|
|
"Alist specifying RSS feeds that should create inputs for Org.
|
|
Each entry in this list specified an RSS feed tat should be queried
|
|
to create inbox items in Org. Each entry is a list with the following items:
|
|
|
|
name a custom name for this feed
|
|
URL the Feed URL
|
|
file the target Org file where entries should be listed
|
|
headline the headline under which entries should be listed
|
|
|
|
Additional arguments can be given using keyword-value pairs. Many of these
|
|
specify functions that receive one or a list of \"entries\" as their single
|
|
argument. An entry is a property list that describes a feed item. The
|
|
property list has properties for each field in the item, for example `:title'
|
|
for the `<title>' field and `:pubDate' for the publication date. In addition,
|
|
it contains the following properties:
|
|
|
|
`:item-full-text' the full text in the <item> tag
|
|
`:guid-permalink' t when the guid property is a permalink
|
|
|
|
Here are the keyword-value pair allows in `org-feed-alist'.
|
|
|
|
:drawer drawer-name
|
|
The name of the drawer for storing feed information. The default is
|
|
\"FEEDSTATUS\". Using different drawers for different feeds allows
|
|
several feeds to target the same inbox heading.
|
|
|
|
:filter filter-function
|
|
A function to select interesting entries in the feed. It gets a single
|
|
entry as parameter. It should return the entry if it is relevant, or
|
|
nil if it is not.
|
|
|
|
:template template-string
|
|
The default action on new items in the feed is to add them as children
|
|
under the headline for the feed. The template describes how the entry
|
|
should be formatted. If not given, it defaults to
|
|
`org-feed-default-template'.
|
|
|
|
:formatter formatter-function
|
|
Instead of relying on a template, you may specify a function to format
|
|
the outline node to be inserted as a child. This function gets passed
|
|
a property list describing a single feed item, and it should return a
|
|
string that is a properly formatted Org outline node of level 1.
|
|
|
|
:new-handler function
|
|
If adding new items as children to the outline is not what you want
|
|
to do with new items, define a handler function that is called with
|
|
a list of all new items in the feed, each one represented as a property
|
|
list. The handler should do what needs to be done, and org-feed will
|
|
mark all items given to this handler as \"handled\", i.e. they will not
|
|
be passed to this handler again in future readings of the feed.
|
|
When the handler is called, point will be at the feed headline.
|
|
|
|
:changed-handler function
|
|
This function gets passed a list of all entries that have been
|
|
handled before, but are now still in the feed and have *changed*
|
|
since last handled (as evidenced by a different sha1 hash).
|
|
When the handler is called, point will be at the feed headline.
|
|
|
|
:parse-feed function
|
|
This function gets passed a buffer, and should return a list
|
|
of entries, each being a property list containing the
|
|
`:guid' and `:item-full-text' keys. The default is
|
|
`org-feed-parse-rss-feed'; `org-feed-parse-atom-feed' is an
|
|
alternative.
|
|
|
|
:parse-entry function
|
|
This function gets passed an entry as returned by the parse-feed
|
|
function, and should return the entry with interesting properties added.
|
|
The default is `org-feed-parse-rss-entry'; `org-feed-parse-atom-entry'
|
|
is an alternative."
|
|
:group 'org-feed
|
|
:type '(repeat
|
|
(list :value ("" "http://" "" "")
|
|
(string :tag "Name")
|
|
(string :tag "Feed URL")
|
|
(file :tag "File for inbox")
|
|
(string :tag "Headline for inbox")
|
|
(repeat :inline t
|
|
(choice
|
|
(list :inline t :tag "Filter"
|
|
(const :filter)
|
|
(symbol :tag "Filter Function"))
|
|
(list :inline t :tag "Template"
|
|
(const :template)
|
|
(string :tag "Template"))
|
|
(list :inline t :tag "Formatter"
|
|
(const :formatter)
|
|
(symbol :tag "Formatter Function"))
|
|
(list :inline t :tag "New items handler"
|
|
(const :new-handler)
|
|
(symbol :tag "Handler Function"))
|
|
(list :inline t :tag "Changed items"
|
|
(const :changed-handler)
|
|
(symbol :tag "Handler Function"))
|
|
(list :inline t :tag "Parse Feed"
|
|
(const :parse-feed)
|
|
(symbol :tag "Parse Feed Function"))
|
|
(list :inline t :tag "Parse Entry"
|
|
(const :parse-entry)
|
|
(symbol :tag "Parse Entry Function"))
|
|
)))))
|
|
|
|
(defcustom org-feed-drawer "FEEDSTATUS"
|
|
"The name of the drawer for feed status information.
|
|
Each feed may also specify its own drawer name using the `:drawer'
|
|
parameter in `org-feed-alist'.
|
|
Note that in order to make these drawers behave like drawers, they must
|
|
be added to the variable `org-drawers' or configured with a #+DRAWERS
|
|
line."
|
|
:group 'org-feed
|
|
:type '(string :tag "Drawer Name"))
|
|
|
|
(defcustom org-feed-default-template "\n* %h\n %U\n %description\n %a\n"
|
|
"Template for the Org node created from RSS feed items.
|
|
This is just the default, each feed can specify its own.
|
|
Any fields from the feed item can be interpolated into the template with
|
|
%name, for example %title, %description, %pubDate etc. In addition, the
|
|
following special escapes are valid as well:
|
|
|
|
%h the title, or the first line of the description
|
|
%t the date as a stamp, either from <pubDate> (if present), or
|
|
the current date.
|
|
%T date and time
|
|
%u,%U like %t,%T, but inactive time stamps
|
|
%a A link, from <guid> if that is a permalink, else from <link>"
|
|
:group 'org-feed
|
|
:type '(string :tag "Template"))
|
|
|
|
(defcustom org-feed-save-after-adding t
|
|
"Non-nil means save buffer after adding new feed items."
|
|
:group 'org-feed
|
|
:type 'boolean)
|
|
|
|
(defcustom org-feed-retrieve-method 'url-retrieve-synchronously
|
|
"The method to be used to retrieve a feed URL.
|
|
This can be `curl' or `wget' to call these external programs, or it can be
|
|
an Emacs Lisp function that will return a buffer containing the content
|
|
of the file pointed to by the URL."
|
|
:group 'org-feed
|
|
:type '(choice
|
|
(const :tag "Internally with url.el" url-retrieve-synchronously)
|
|
(const :tag "Externally with curl" curl)
|
|
(const :tag "Externally with wget" wget)
|
|
(function :tag "Function")))
|
|
|
|
(defcustom org-feed-before-adding-hook nil
|
|
"Hook that is run before adding new feed items to a file.
|
|
You might want to commit the file in its current state to version control,
|
|
for example."
|
|
:group 'org-feed
|
|
:type 'hook)
|
|
|
|
(defcustom org-feed-after-adding-hook nil
|
|
"Hook that is run after new items have been added to a file.
|
|
Depending on `org-feed-save-after-adding', the buffer will already
|
|
have been saved."
|
|
:group 'org-feed
|
|
:type 'hook)
|
|
|
|
(defvar org-feed-buffer "*Org feed*"
|
|
"The buffer used to retrieve a feed.")
|
|
|
|
(defun org-feed-unescape (s)
|
|
"Unescape protected entities in S."
|
|
(require 'xml)
|
|
(let ((re (concat "&\\("
|
|
(mapconcat 'car xml-entity-alist "\\|")
|
|
"\\);")))
|
|
(while (string-match re s)
|
|
(setq s (replace-match
|
|
(cdr (assoc (match-string 1 s) xml-entity-alist)) nil nil s)))
|
|
s))
|
|
|
|
;;;###autoload
|
|
(defun org-feed-update-all ()
|
|
"Get inbox items from all feeds in `org-feed-alist'."
|
|
(interactive)
|
|
(let ((nfeeds (length org-feed-alist))
|
|
(nnew (apply '+ (mapcar 'org-feed-update org-feed-alist))))
|
|
(message "%s from %d %s"
|
|
(cond ((= nnew 0) "No new entries")
|
|
((= nnew 1) "1 new entry")
|
|
(t (format "%d new entries" nnew)))
|
|
nfeeds
|
|
(if (= nfeeds 1) "feed" "feeds"))))
|
|
|
|
;;;###autoload
|
|
(defun org-feed-update (feed &optional retrieve-only)
|
|
"Get inbox items from FEED.
|
|
FEED can be a string with an association in `org-feed-alist', or
|
|
it can be a list structured like an entry in `org-feed-alist'."
|
|
(interactive (list (org-completing-read "Feed name: " org-feed-alist)))
|
|
(if (stringp feed) (setq feed (assoc feed org-feed-alist)))
|
|
(unless feed
|
|
(error "No such feed in `org-feed-alist"))
|
|
(catch 'exit
|
|
(let ((name (car feed))
|
|
(url (nth 1 feed))
|
|
(file (nth 2 feed))
|
|
(headline (nth 3 feed))
|
|
(filter (nth 1 (memq :filter feed)))
|
|
(formatter (nth 1 (memq :formatter feed)))
|
|
(new-handler (nth 1 (memq :new-handler feed)))
|
|
(changed-handler (nth 1 (memq :changed-handler feed)))
|
|
(template (or (nth 1 (memq :template feed))
|
|
org-feed-default-template))
|
|
(drawer (or (nth 1 (memq :drawer feed))
|
|
org-feed-drawer))
|
|
(parse-feed (or (nth 1 (memq :parse-feed feed))
|
|
'org-feed-parse-rss-feed))
|
|
(parse-entry (or (nth 1 (memq :parse-entry feed))
|
|
'org-feed-parse-rss-entry))
|
|
feed-buffer inbox-pos new-formatted
|
|
entries old-status status new changed guid-alist e guid olds)
|
|
(setq feed-buffer (org-feed-get-feed url))
|
|
(unless (and feed-buffer (bufferp (get-buffer feed-buffer)))
|
|
(error "Cannot get feed %s" name))
|
|
(when retrieve-only
|
|
(throw 'exit feed-buffer))
|
|
(setq entries (funcall parse-feed feed-buffer))
|
|
(ignore-errors (kill-buffer feed-buffer))
|
|
(save-excursion
|
|
(save-window-excursion
|
|
(setq inbox-pos (org-feed-goto-inbox-internal file headline))
|
|
(setq old-status (org-feed-read-previous-status inbox-pos drawer))
|
|
;; Add the "handled" status to the appropriate entries
|
|
(setq entries (mapcar (lambda (e)
|
|
(setq e
|
|
(plist-put e :handled
|
|
(nth 1 (assoc
|
|
(plist-get e :guid)
|
|
old-status)))))
|
|
entries))
|
|
;; Find out which entries are new and which are changed
|
|
(dolist (e entries)
|
|
(if (not (plist-get e :handled))
|
|
(push e new)
|
|
(setq olds (nth 2 (assoc (plist-get e :guid) old-status)))
|
|
(if (and olds
|
|
(not (string= (sha1
|
|
(plist-get e :item-full-text))
|
|
olds)))
|
|
(push e changed))))
|
|
|
|
;; Parse the relevant entries fully
|
|
(setq new (mapcar parse-entry new)
|
|
changed (mapcar parse-entry changed))
|
|
|
|
;; Run the filter
|
|
(when filter
|
|
(setq new (delq nil (mapcar filter new))
|
|
changed (delq nil (mapcar filter new))))
|
|
|
|
(when (not (or new changed))
|
|
(message "No new items in feed %s" name)
|
|
(throw 'exit 0))
|
|
|
|
;; Get alist based on guid, to look up entries
|
|
(setq guid-alist
|
|
(append
|
|
(mapcar (lambda (e) (list (plist-get e :guid) e)) new)
|
|
(mapcar (lambda (e) (list (plist-get e :guid) e)) changed)))
|
|
|
|
;; Construct the new status
|
|
(setq status
|
|
(mapcar
|
|
(lambda (e)
|
|
(setq guid (plist-get e :guid))
|
|
(list guid
|
|
;; things count as handled if we handle them now,
|
|
;; or if they were handled previously
|
|
(if (assoc guid guid-alist) t (plist-get e :handled))
|
|
;; A hash, to detect changes
|
|
(sha1 (plist-get e :item-full-text))))
|
|
entries))
|
|
|
|
;; Handle new items in the feed
|
|
(when new
|
|
(if new-handler
|
|
(progn
|
|
(goto-char inbox-pos)
|
|
(funcall new-handler new))
|
|
;; No custom handler, do the default adding
|
|
;; Format the new entries into an alist with GUIDs in the car
|
|
(setq new-formatted
|
|
(mapcar
|
|
(lambda (e) (org-feed-format-entry e template formatter))
|
|
new)))
|
|
|
|
;; Insert the new items
|
|
(org-feed-add-items inbox-pos new-formatted))
|
|
|
|
;; Handle changed items in the feed
|
|
(when (and changed-handler changed)
|
|
(goto-char inbox-pos)
|
|
(funcall changed-handler changed))
|
|
|
|
;; Write the new status
|
|
;; We do this only now, in case something goes wrong above, so
|
|
;; that would would end up with a status that does not reflect
|
|
;; which items truely have been handled
|
|
(org-feed-write-status inbox-pos drawer status)
|
|
|
|
;; Normalize the visibility of the inbox tree
|
|
(goto-char inbox-pos)
|
|
(hide-subtree)
|
|
(show-children)
|
|
(org-cycle-hide-drawers 'children)
|
|
|
|
;; Hooks and messages
|
|
(when org-feed-save-after-adding (save-buffer))
|
|
(message "Added %d new item%s from feed %s to file %s, heading %s"
|
|
(length new) (if (> (length new) 1) "s" "")
|
|
name
|
|
(file-name-nondirectory file) headline)
|
|
(run-hooks 'org-feed-after-adding-hook)
|
|
(length new))))))
|
|
|
|
;;;###autoload
|
|
(defun org-feed-goto-inbox (feed)
|
|
"Go to the inbox that captures the feed named FEED."
|
|
(interactive
|
|
(list (if (= (length org-feed-alist) 1)
|
|
(car org-feed-alist)
|
|
(org-completing-read "Feed name: " org-feed-alist))))
|
|
(if (stringp feed) (setq feed (assoc feed org-feed-alist)))
|
|
(unless feed
|
|
(error "No such feed in `org-feed-alist"))
|
|
(org-feed-goto-inbox-internal (nth 2 feed) (nth 3 feed)))
|
|
|
|
;;;###autoload
|
|
(defun org-feed-show-raw-feed (feed)
|
|
"Show the raw feed buffer of a feed."
|
|
(interactive
|
|
(list (if (= (length org-feed-alist) 1)
|
|
(car org-feed-alist)
|
|
(org-completing-read "Feed name: " org-feed-alist))))
|
|
(if (stringp feed) (setq feed (assoc feed org-feed-alist)))
|
|
(unless feed
|
|
(error "No such feed in `org-feed-alist"))
|
|
(switch-to-buffer
|
|
(org-feed-update feed 'retrieve-only))
|
|
(goto-char (point-min)))
|
|
|
|
(defun org-feed-goto-inbox-internal (file heading)
|
|
"Find or create HEADING in FILE.
|
|
Switch to that buffer, and return the position of that headline."
|
|
(find-file file)
|
|
(widen)
|
|
(goto-char (point-min))
|
|
(if (re-search-forward
|
|
(concat "^\\*+[ \t]+" heading "[ \t]*\\(:.*?:[ \t]*\\)?$")
|
|
nil t)
|
|
(goto-char (match-beginning 0))
|
|
(goto-char (point-max))
|
|
(insert "\n\n* " heading "\n\n")
|
|
(org-back-to-heading t))
|
|
(point))
|
|
|
|
(defun org-feed-read-previous-status (pos drawer)
|
|
"Get the alist of old GUIDs from the entry at POS.
|
|
This will find DRAWER and extract the alist."
|
|
(save-excursion
|
|
(goto-char pos)
|
|
(let ((end (save-excursion (org-end-of-subtree t t))))
|
|
(if (re-search-forward
|
|
(concat "^[ \t]*:" drawer ":[ \t]*\n\\([^\000]*?\\)\n[ \t]*:END:")
|
|
end t)
|
|
(read (match-string 1))
|
|
nil))))
|
|
|
|
(defun org-feed-write-status (pos drawer status)
|
|
"Write the feed STATUS to DRAWER in entry at POS."
|
|
(save-excursion
|
|
(goto-char pos)
|
|
(let ((end (save-excursion (org-end-of-subtree t t)))
|
|
guid)
|
|
(if (re-search-forward (concat "^[ \t]*:" drawer ":[ \t]*\n")
|
|
end t)
|
|
(progn
|
|
(goto-char (match-end 0))
|
|
(delete-region (point)
|
|
(save-excursion
|
|
(and (re-search-forward "^[ \t]*:END:" nil t)
|
|
(match-beginning 0)))))
|
|
(outline-next-heading)
|
|
(insert " :" drawer ":\n :END:\n")
|
|
(beginning-of-line 0))
|
|
(insert (pp-to-string status)))))
|
|
|
|
(defun org-feed-add-items (pos entries)
|
|
"Add the formatted items to the headline as POS."
|
|
(let (entry level)
|
|
(save-excursion
|
|
(goto-char pos)
|
|
(unless (looking-at org-complex-heading-regexp)
|
|
(error "Wrong position"))
|
|
(setq level (org-get-valid-level (length (match-string 1)) 1))
|
|
(org-end-of-subtree t t)
|
|
(skip-chars-backward " \t\n")
|
|
(beginning-of-line 2)
|
|
(setq pos (point))
|
|
(while (setq entry (pop entries))
|
|
(org-paste-subtree level entry 'yank))
|
|
(org-mark-ring-push pos))))
|
|
|
|
(defun org-feed-format-entry (entry template formatter)
|
|
"Format ENTRY so that it can be inserted into an Org file.
|
|
ENTRY is a property list. This function adds a `:formatted-for-org' property
|
|
and returns the full property list.
|
|
If that property is already present, nothing changes."
|
|
(if formatter
|
|
(funcall formatter entry)
|
|
(let (dlines fmt tmp indent time name
|
|
v-h v-t v-T v-u v-U v-a)
|
|
(setq dlines (org-split-string (or (plist-get entry :description) "???")
|
|
"\n")
|
|
v-h (or (plist-get entry :title) (car dlines) "???")
|
|
time (or (if (plist-get entry :pubDate)
|
|
(org-read-date t t (plist-get entry :pubDate)))
|
|
(current-time))
|
|
v-t (format-time-string (org-time-stamp-format nil nil) time)
|
|
v-T (format-time-string (org-time-stamp-format t nil) time)
|
|
v-u (format-time-string (org-time-stamp-format nil t) time)
|
|
v-U (format-time-string (org-time-stamp-format t t) time)
|
|
v-a (if (setq tmp (or (and (plist-get entry :guid-permalink)
|
|
(plist-get entry :guid))
|
|
(plist-get entry :link)))
|
|
(concat "[[" tmp "]]\n")
|
|
""))
|
|
(with-temp-buffer
|
|
(insert template)
|
|
(goto-char (point-min))
|
|
(while (re-search-forward "%\\([a-zA-Z]+\\)" nil t)
|
|
(setq name (match-string 1))
|
|
(cond
|
|
((member name '("h" "t" "T" "u" "U" "a"))
|
|
(replace-match (symbol-value (intern (concat "v-" name))) t t))
|
|
((setq tmp (plist-get entry (intern (concat ":" name))))
|
|
(save-excursion
|
|
(save-match-data
|
|
(beginning-of-line 1)
|
|
(when (looking-at (concat "^\\([ \t]*\\)%" name "[ \t]*$"))
|
|
(setq tmp (org-feed-make-indented-block
|
|
tmp (org-get-indentation))))))
|
|
(replace-match tmp t t))))
|
|
(buffer-string)))))
|
|
|
|
(defun org-feed-make-indented-block (s n)
|
|
"Add indentation of N spaces to a multiline string S."
|
|
(if (not (string-match "\n" s))
|
|
s
|
|
(mapconcat 'identity
|
|
(org-split-string s "\n")
|
|
(concat "\n" (make-string n ?\ )))))
|
|
|
|
(defun org-feed-skip-http-headers (buffer)
|
|
"Remove HTTP headers from BUFFER, and return it.
|
|
Assumes headers are indeed present!"
|
|
(with-current-buffer buffer
|
|
(widen)
|
|
(goto-char (point-min))
|
|
(search-forward "\n\n")
|
|
(delete-region (point-min) (point))
|
|
buffer))
|
|
|
|
(defun org-feed-get-feed (url)
|
|
"Get the RSS feed file at URL and return the buffer."
|
|
(cond
|
|
((eq org-feed-retrieve-method 'url-retrieve-synchronously)
|
|
(org-feed-skip-http-headers (url-retrieve-synchronously url)))
|
|
((eq org-feed-retrieve-method 'curl)
|
|
(ignore-errors (kill-buffer org-feed-buffer))
|
|
(call-process "curl" nil org-feed-buffer nil "--silent" url)
|
|
org-feed-buffer)
|
|
((eq org-feed-retrieve-method 'wget)
|
|
(ignore-errors (kill-buffer org-feed-buffer))
|
|
(call-process "wget" nil org-feed-buffer nil "-q" "-O" "-" url)
|
|
org-feed-buffer)
|
|
((functionp org-feed-retrieve-method)
|
|
(funcall org-feed-retrieve-method url))))
|
|
|
|
(defun org-feed-parse-rss-feed (buffer)
|
|
"Parse BUFFER for RSS feed entries.
|
|
Returns a list of entries, with each entry a property list,
|
|
containing the properties `:guid' and `:item-full-text'."
|
|
(let ((case-fold-search t)
|
|
entries beg end item guid entry)
|
|
(with-current-buffer buffer
|
|
(widen)
|
|
(goto-char (point-min))
|
|
(while (re-search-forward "<item\\>.*?>" nil t)
|
|
(setq beg (point)
|
|
end (and (re-search-forward "</item>" nil t)
|
|
(match-beginning 0)))
|
|
(setq item (buffer-substring beg end)
|
|
guid (if (string-match "<guid\\>.*?>\\(.*?\\)</guid>" item)
|
|
(org-match-string-no-properties 1 item)))
|
|
(setq entry (list :guid guid :item-full-text item))
|
|
(push entry entries)
|
|
(widen)
|
|
(goto-char end))
|
|
(nreverse entries))))
|
|
|
|
(defun org-feed-parse-rss-entry (entry)
|
|
"Parse the `:item-full-text' field for xml tags and create new properties."
|
|
(with-temp-buffer
|
|
(insert (plist-get entry :item-full-text))
|
|
(goto-char (point-min))
|
|
(while (re-search-forward "<\\([a-zA-Z]+\\>\\).*?>\\([^\000]*?\\)</\\1>"
|
|
nil t)
|
|
(setq entry (plist-put entry
|
|
(intern (concat ":" (match-string 1)))
|
|
(org-feed-unescape (match-string 2)))))
|
|
(goto-char (point-min))
|
|
(unless (re-search-forward "isPermaLink[ \t]*=[ \t]*\"false\"" nil t)
|
|
(setq entry (plist-put entry :guid-permalink t))))
|
|
entry)
|
|
|
|
(defun org-feed-parse-atom-feed (buffer)
|
|
"Parse BUFFER for Atom feed entries.
|
|
Returns a list of entries, with each entry a property list,
|
|
containing the properties `:guid' and `:item-full-text'.
|
|
|
|
The `:item-full-text' property actually contains the sexp
|
|
formatted as a string, not the original XML data."
|
|
(require 'xml)
|
|
(with-current-buffer buffer
|
|
(widen)
|
|
(let ((feed (car (xml-parse-region (point-min) (point-max)))))
|
|
(mapcar
|
|
(lambda (entry)
|
|
(list
|
|
:guid (car (xml-node-children (car (xml-get-children entry 'id))))
|
|
:item-full-text (prin1-to-string entry)))
|
|
(xml-get-children feed 'entry)))))
|
|
|
|
(defun org-feed-parse-atom-entry (entry)
|
|
"Parse the `:item-full-text' as a sexp and create new properties."
|
|
(let ((xml (car (read-from-string (plist-get entry :item-full-text)))))
|
|
;; Get first <link href='foo'/>.
|
|
(setq entry (plist-put entry :link
|
|
(xml-get-attribute
|
|
(car (xml-get-children xml 'link))
|
|
'href)))
|
|
;; Add <title/> as :title.
|
|
(setq entry (plist-put entry :title
|
|
(org-feed-unescape
|
|
(car (xml-node-children
|
|
(car (xml-get-children xml 'title)))))))
|
|
(let* ((content (car (xml-get-children xml 'content)))
|
|
(type (xml-get-attribute-or-nil content 'type)))
|
|
(when content
|
|
(cond
|
|
((string= type "text")
|
|
;; We like plain text.
|
|
(setq entry (plist-put entry :description
|
|
(org-feed-unescape
|
|
(car (xml-node-children content))))))
|
|
((string= type "html")
|
|
;; TODO: convert HTML to Org markup.
|
|
(setq entry (plist-put entry :description
|
|
(org-feed-unescape
|
|
(car (xml-node-children content))))))
|
|
((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))
|
|
|
|
(provide 'org-feed)
|
|
|
|
;; arch-tag: 0929b557-9bc4-47f4-9633-30a12dbb5ae2
|
|
;;; org-feed.el ends here
|