Release 6.25frelease_6.25f

43 files changed, 47 insertions, 45 deletions

diff --git a/Makefile b/Makefile
index 254e0c8d9..d33645388 100644
--- a/Makefile
+++ b/Makefile
@@ -74,6 +74,7 @@ LISPF      = 	org.el			\
 		org-export-latex.el	\
 		org-docbook.el		\
 		org-faces.el		\
+		org-feed.el		\
 		org-footnote.el		\
 		org-gnus.el		\
 		org-id.el		\
@@ -328,6 +329,7 @@ lisp/org-exp.elc:          lisp/org.el lisp/org-agenda.el
 lisp/org-export-latex.elc: lisp/org.el lisp/org-exp.el
 lisp/org-docbook.elc:      lisp/org.el lisp/org-exp.el
 lisp/org-faces.elc:        lisp/org-macs.el lisp/org-compat.el
+lisp/org-feed.elc:         lisp/org.el
 lisp/org-footnotes.elc:    lisp/org-macs.el lisp/org-compat.el
 lisp/org-gnus.elc:         lisp/org.el
 lisp/org-id.elc:           lisp/org.el
diff --git a/ORGWEBPAGE/index.org b/ORGWEBPAGE/index.org
index 6dad53172..6a60ee1bb 100644
--- a/ORGWEBPAGE/index.org
+++ b/ORGWEBPAGE/index.org
@@ -56,9 +56,9 @@ a look at our [[http://orgmode.org/worg/org-quotes.php][collected quotes about O
 - <2009-02-10 Tue>: Release 6.22
 - <2009-02-02 Mon>: Release 6.21
 
-* Current Version (6.25e)
+* Current Version (6.25f)
 
-The current version is 6.25e.  To see what has changed in recent
+The current version is 6.25f.  To see what has changed in recent
 releases, check this detailed list of [[file:Changes.html][user-visible changes]].
 
 This package works on Emacs 23 and 22, and (with minor restrictions)
@@ -71,7 +71,7 @@ a bit behind the website release.
 
 ** The standard distribution
 
-Download as [[file:org-6.25e.zip][zip file]] or [[file:org-6.25e.tar.gz][gzipped tar archive]].  These archives contain
+Download as [[file:org-6.25f.zip][zip file]] or [[file:org-6.25f.tar.gz][gzipped tar archive]].  These archives contain
 both the Lisp file org.el and the documentation in PDF and (TeX)Info
 formats.  Follow the instructions for [[http://orgmode.org/manual/Installation.html#Installation][Installation]] and [[http://orgmode.org/manual/Activation.html#Activation][Activation]].
 
diff --git a/README_DIST b/README_DIST
index b0de11093..8c6973332 100644
--- a/README_DIST
+++ b/README_DIST
@@ -1,7 +1,7 @@
 The is a distribution of Org, a plain text notes and project planning
 tool for Emacs.
 
-The version of this release is: 6.25e
+The version of this release is: 6.25f
 
 The homepage of Org is at http://orgmode.org
 
diff --git a/doc/org.texi b/doc/org.texi
index 524b2ae3d..58b044b8d 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -3,7 +3,7 @@
 @setfilename ../../info/org
 @settitle The Org Manual
 
-@set VERSION 6.25e
+@set VERSION 6.25f
 @set DATE April 2009
 
 @c Version and Contact Info
diff --git a/doc/orgcard.tex b/doc/orgcard.tex
index 98b4dbef3..afe1ec7a4 100644
--- a/doc/orgcard.tex
+++ b/doc/orgcard.tex
@@ -1,5 +1,5 @@
 % Reference Card for Org Mode
-\def\orgversionnumber{6.25e}
+\def\orgversionnumber{6.25f}
 \def\versionyear{2009}          % latest update
 \def\year{2009}                 % latest copyright year
 
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 60e71ac80..9e00ed320 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.25e
+;; Version: 6.25f
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-archive.el b/lisp/org-archive.el
index c4df55bbf..881f7a993 100644
--- a/lisp/org-archive.el
+++ b/lisp/org-archive.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.25e
+;; Version: 6.25f
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-attach.el b/lisp/org-attach.el
index fadf8c7f9..7e8d69463 100644
--- a/lisp/org-attach.el
+++ b/lisp/org-attach.el
@@ -4,7 +4,7 @@
 
 ;; Author: John Wiegley <johnw@newartisans.com>
 ;; Keywords: org data task
-;; Version: 6.25e
+;; Version: 6.25f
 
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-bbdb.el b/lisp/org-bbdb.el
index 50c456ccb..03c1a666c 100644
--- a/lisp/org-bbdb.el
+++ b/lisp/org-bbdb.el
@@ -7,7 +7,7 @@
 ;;         Thomas Baumann <thomas dot baumann at ch dot tum dot de>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.25e
+;; Version: 6.25f
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-bibtex.el b/lisp/org-bibtex.el
index 27e915cd2..335f77ee0 100644
--- a/lisp/org-bibtex.el
+++ b/lisp/org-bibtex.el
@@ -5,7 +5,7 @@
 ;; Author: Bastien Guerry <bzg at altern dot org>
 ;;         Carsten Dominik <carsten dot dominik at gmail dot com>
 ;; Keywords: org, wp, remember
-;; Version: 6.25e
+;; Version: 6.25f
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 84575bc2e..0b53bcb72 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.25e
+;; Version: 6.25f
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-colview-xemacs.el b/lisp/org-colview-xemacs.el
index 34cc162ec..6bb608c65 100644
--- a/lisp/org-colview-xemacs.el
+++ b/lisp/org-colview-xemacs.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.25e
+;; Version: 6.25f
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-colview.el b/lisp/org-colview.el
index 1c00539d3..8106ac9e9 100644
--- a/lisp/org-colview.el
+++ b/lisp/org-colview.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.25e
+;; Version: 6.25f
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index b51cb76d6..1176e68e4 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.25e
+;; Version: 6.25f
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-docbook.el b/lisp/org-docbook.el
index 13c3edbf9..0a8f74ec2 100644
--- a/lisp/org-docbook.el
+++ b/lisp/org-docbook.el
@@ -4,7 +4,7 @@
 ;;
 ;; Emacs Lisp Archive Entry
 ;; Filename: org-docbook.el
-;; Version: 6.25e
+;; Version: 6.25f
 ;; Author: Baoqiu Cui <cbaoqiu AT yahoo DOT com>
 ;; Maintainer: Baoqiu Cui <cbaoqiu AT yahoo DOT com>
 ;; Keywords: org, wp, docbook
diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index afaebdc1d..ff9d85421 100644
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.25e
+;; Version: 6.25f
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-export-latex.el b/lisp/org-export-latex.el
index ba31a65ca..5e05c6f42 100644
--- a/lisp/org-export-latex.el
+++ b/lisp/org-export-latex.el
@@ -4,7 +4,7 @@
 ;;
 ;; Emacs Lisp Archive Entry
 ;; Filename: org-export-latex.el
-;; Version: 6.25e
+;; Version: 6.25f
 ;; Author: Bastien Guerry <bzg AT altern DOT org>
 ;; Maintainer: Carsten Dominik <carsten.dominik AT gmail DOT com>
 ;; Keywords: org, wp, tex
diff --git a/lisp/org-faces.el b/lisp/org-faces.el
index 8700c6996..8aa3a00b7 100644
--- a/lisp/org-faces.el
+++ b/lisp/org-faces.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.25e
+;; Version: 6.25f
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-feed.el b/lisp/org-feed.el
index 3e951c3d6..0eeb86ce0 100644
--- a/lisp/org-feed.el
+++ b/lisp/org-feed.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.25e
+;; Version: 6.25f
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-footnote.el b/lisp/org-footnote.el
index 36be7dfff..99aa772f8 100644
--- a/lisp/org-footnote.el
+++ b/lisp/org-footnote.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.25e
+;; Version: 6.25f
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-gnus.el b/lisp/org-gnus.el
index 4f537f784..78201d330 100644
--- a/lisp/org-gnus.el
+++ b/lisp/org-gnus.el
@@ -7,7 +7,7 @@
 ;;         Tassilo Horn <tassilo at member dot fsf dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.25e
+;; Version: 6.25f
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-id.el b/lisp/org-id.el
index be7faf0bc..db1ac4234 100644
--- a/lisp/org-id.el
+++ b/lisp/org-id.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.25e
+;; Version: 6.25f
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-info.el b/lisp/org-info.el
index bb4102f39..4dcc10713 100644
--- a/lisp/org-info.el
+++ b/lisp/org-info.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.25e
+;; Version: 6.25f
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-inlinetask.el b/lisp/org-inlinetask.el
index 5f7827917..a2ddbb3b0 100644
--- a/lisp/org-inlinetask.el
+++ b/lisp/org-inlinetask.el
@@ -4,7 +4,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.25e
+;; Version: 6.25f
 ;;
 ;; This file is not yet part of GNU Emacs.
 ;;
diff --git a/lisp/org-irc.el b/lisp/org-irc.el
index 51cb1f2df..0d88204ad 100644
--- a/lisp/org-irc.el
+++ b/lisp/org-irc.el
@@ -4,7 +4,7 @@
 ;;
 ;; Author: Philip Jackson <emacs@shellarchive.co.uk>
 ;; Keywords: erc, irc, link, org
-;; Version: 6.25e
+;; Version: 6.25f
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-jsinfo.el b/lisp/org-jsinfo.el
index 37a412fce..7a7352719 100644
--- a/lisp/org-jsinfo.el
+++ b/lisp/org-jsinfo.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.25e
+;; Version: 6.25f
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-list.el b/lisp/org-list.el
index f0623a4cb..b10caf7e5 100644
--- a/lisp/org-list.el
+++ b/lisp/org-list.el
@@ -7,7 +7,7 @@
 ;;	   Bastien Guerry <bzg AT altern DOT org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.25e
+;; Version: 6.25f
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-mac-message.el b/lisp/org-mac-message.el
index 405badd3e..173ed8270 100644
--- a/lisp/org-mac-message.el
+++ b/lisp/org-mac-message.el
@@ -5,7 +5,7 @@
 ;; Author: John Wiegley <johnw@gnu.org>
 ;;         Christopher Suckling <suckling at gmail dot com>
 
-;; Version: 6.25e
+;; Version: 6.25f
 ;; Keywords: outlines, hypermedia, calendar, wp
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/org-macs.el b/lisp/org-macs.el
index 86faed0c4..e98668e47 100644
--- a/lisp/org-macs.el
+++ b/lisp/org-macs.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.25e
+;; Version: 6.25f
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-mew.el b/lisp/org-mew.el
index 02ef56996..b01b9263e 100644
--- a/lisp/org-mew.el
+++ b/lisp/org-mew.el
@@ -5,7 +5,7 @@
 ;; Author: Tokuya Kameshima <kames at fa2 dot so-net dot ne dot jp>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.25e
+;; Version: 6.25f
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/org-mhe.el b/lisp/org-mhe.el
index e23b31b22..4303ca8bb 100644
--- a/lisp/org-mhe.el
+++ b/lisp/org-mhe.el
@@ -6,7 +6,7 @@
 ;; Author: Thomas Baumann <thomas dot baumann at ch dot tum dot de>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.25e
+;; Version: 6.25f
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-mouse.el b/lisp/org-mouse.el
index edc85eb84..8d95ca5bf 100644
--- a/lisp/org-mouse.el
+++ b/lisp/org-mouse.el
@@ -4,7 +4,7 @@
 ;;
 ;; Author: Piotr Zielinski <piotr dot zielinski at gmail dot com>
 ;; Maintainer: Carsten Dominik <carsten at orgmode dot org>
-;; Version: 6.25e
+;; Version: 6.25f
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-plot.el b/lisp/org-plot.el
index 5a4eb0593..e7e179acd 100644
--- a/lisp/org-plot.el
+++ b/lisp/org-plot.el
@@ -5,7 +5,7 @@
 ;; Author: Eric Schulte <schulte dot eric at gmail dot com>
 ;; Keywords: tables, plotting
 ;; Homepage: http://orgmode.org
-;; Version: 6.25e
+;; Version: 6.25f
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el
index 7ec9d3891..dbb8005ac 100644
--- a/lisp/org-protocol.el
+++ b/lisp/org-protocol.el
@@ -10,7 +10,7 @@
 ;;
 ;;
 ;; Filename: org-protocol.el
-;; Version: 6.25e
+;; Version: 6.25f
 ;; Author: Bastien Guerry <bzg AT altern DOT org>
 ;; Author: Daniel M German <dmg AT uvic DOT org>
 ;; Author: Sebastian Rose <sebastian_rose AT gmx DOT de>
diff --git a/lisp/org-publish.el b/lisp/org-publish.el
index f76f508a6..916100473 100644
--- a/lisp/org-publish.el
+++ b/lisp/org-publish.el
@@ -4,7 +4,7 @@
 ;; Author: David O'Toole <dto@gnu.org>
 ;; Maintainer: Carsten Dominik <carsten DOT dominik AT gmail DOT com>
 ;; Keywords: hypermedia, outlines, wp
-;; Version: 6.25e
+;; Version: 6.25f
 
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-remember.el b/lisp/org-remember.el
index efe1af5ec..2f5bda6e4 100644
--- a/lisp/org-remember.el
+++ b/lisp/org-remember.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.25e
+;; Version: 6.25f
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-rmail.el b/lisp/org-rmail.el
index d8ba16899..9246d74df 100644
--- a/lisp/org-rmail.el
+++ b/lisp/org-rmail.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.25e
+;; Version: 6.25f
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-table.el b/lisp/org-table.el
index 1f500a836..92bb96e64 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.25e
+;; Version: 6.25f
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-timer.el b/lisp/org-timer.el
index 07a506f89..14e838234 100644
--- a/lisp/org-timer.el
+++ b/lisp/org-timer.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.25e
+;; Version: 6.25f
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-vm.el b/lisp/org-vm.el
index 2d7e0036b..3f211f79b 100644
--- a/lisp/org-vm.el
+++ b/lisp/org-vm.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.25e
+;; Version: 6.25f
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-w3m.el b/lisp/org-w3m.el
index 3b99faf91..d13d7dc46 100644
--- a/lisp/org-w3m.el
+++ b/lisp/org-w3m.el
@@ -5,7 +5,7 @@
 ;; Author: Andy Stewart <lazycat dot manatee at gmail dot com>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.25e
+;; Version: 6.25f
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-wl.el b/lisp/org-wl.el
index be199ef48..c8a6987b8 100644
--- a/lisp/org-wl.el
+++ b/lisp/org-wl.el
@@ -6,7 +6,7 @@
 ;; Author: Tokuya Kameshima <kames at fa2 dot so-net dot ne dot jp>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.25e
+;; Version: 6.25f
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org.el b/lisp/org.el
index b5fa8c172..c92da5455 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.25e
+;; Version: 6.25f
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -94,7 +94,7 @@
 
 ;;; Version
 
-(defconst org-version "6.25e"
+(defconst org-version "6.25f"
   "The version number of the file org.el.")
 
 (defun org-version (&optional here)