Merge from trunk.

102 files changed, 1145 insertions, 1213 deletions

diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 0822f313ac4..d63929d794e 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,44 @@
+2011-09-02  Chong Yidong  <cyd@stupidchicken.com>
+
+        * org-compat.el (org-pop-to-buffer-same-window): Deleted.
+
+        * ob-ref.el (org-babel-ref-goto-headline-id):
+        * org.el (org-get-location, org-tree-to-indirect-buffer)
+        (org-mark-ring-goto, org-refile, org-add-log-note)
+        (org-revert-all-org-buffers, org-switchb)
+        (org-cycle-agenda-files, org-submit-bug-report)
+        (org-goto-marker-or-bmk):
+        * org-agenda.el (org-prepare-agenda, org-agenda-switch-to):
+        * org-capture.el (org-capture-goto-target)
+        (org-capture-fill-template):
+        * org-clock.el (org-clock-goto):
+        * org-ctags.el (org-ctags-visit-buffer-or-file):
+        * org-exp.el (org-export-as-org):
+        * org-feed.el (org-feed-show-raw-feed):
+        * org-html.el (org-export-htmlize-generate-css):
+        * org-id.el (org-id-goto):
+        * org-irc.el (org-irc-visit-erc):
+        * org-mobile.el (org-mobile-apply):
+        * org-publish.el (org-publish-org-to, org-publish-find-date):
+        * org-remember.el (org-go-to-remember-target):
+        * org-src.el (org-src-switch-to-buffer)
+        (org-edit-fixed-width-region): Use switch-to-buffer.
+
+2011-08-31  Martin Rudalics  <rudalics@gmx.at>
+
+        * org-compat.el (org-pop-to-buffer-same-window): Remove LABEL
+        argument from pop-to-buffer-same-window call.
+
+2011-07-30  Carsten Dominik  <carsten.dominik@gmail.com>
+
+        * ob.el (org-babel-src-block-regexp): If a code block has a body,
+        its last character must be a newline.
+
+2011-07-28  Bastien Guerry  <bzg@gnu.org>
+
+        * org-pcomplete.el: New file.  Rename from org-complete.el.
+        * org-complete.el: Delete file.
+
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
         * org-publish.el (org-publish-index-generate-theindex): rename
@@ -21,15 +62,14 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-publish.el (org-publish-find-title): bugfix: kill buffers
+        * org-publish.el (org-publish-find-title): Bugfix: kill buffers
         unless they were already visited.
         (org-sitemap-sort-files, org-sitemap-sort-folders)
         (org-sitemap-ignore-case, org-sitemap-requested)
-        (org-sitemap-date-format, org-sitemap-file-entry-format): use
+        (org-sitemap-date-format, org-sitemap-file-entry-format): Use
         a correct prefix.
         (org-publish-projects): Make sure to delete .orgx files.
-        (org-publish-index-generate-theindex.inc): Small docstring
-        fix.
+        (org-publish-index-generate-theindex.inc): Small docstring fix.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
@@ -42,15 +82,15 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el: search blank lines down to the end of the item
+        * org-list.el: Search blank lines down to the end of the item
         instead of stopping at the item, in order to possibly match such
         lines within the item.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-latex.el (org-export-latex-href-format): docstring fix to
+        * org-latex.el (org-export-latex-href-format): Docstring fix to
         reflect the fact that you can use only one "%s".
-        (org-export-latex-links): allow `org-export-latex-href-format' to
+        (org-export-latex-links): Allow `org-export-latex-href-format' to
         have only one "%s".
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
@@ -63,7 +103,7 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-capture.el (org-capture-templates): docstring fix.
+        * org-capture.el (org-capture-templates): Docstring fix.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -71,7 +111,7 @@
         code blocks.
 
         * ob-keys.el (org-babel-key-bindings): Key bindings for
-        org-babel-view-src-block-info.
+        `org-babel-view-src-block-info'.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
@@ -88,7 +128,7 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-footnote.el (org-footnote-create-definition): when skipping
+        * org-footnote.el (org-footnote-create-definition): When skipping
         already written footnotes definition, the algorithme would assume
         each one was only one-line long.
 
@@ -96,22 +136,22 @@
 
         * org-table.el (org-table-eval-formula): Fix bug when a formula
         "range" is just one cell.
-        (org-table-time-string-to-seconds): don't check whether
-        we manipulate a string.
+        (org-table-time-string-to-seconds): Don't check whether we
+        manipulate a string.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
         * org-exp.el (org-export-mark-list-end)
-        (org-export-mark-list-properties): don't remove the ending regexp
+        (org-export-mark-list-properties): Don't remove the ending regexp
         when it consists in blank lines.
 
-        * org-list.el (org-list-parse-list): ditto, but remove it
+        * org-list.el (org-list-parse-list): Ditto, but remove it
         completely when it isn't made of blank lines (i.e. during export
         process).
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-table.el (org-table-time-string-to-seconds): match either
+        * org-table.el (org-table-time-string-to-seconds): Match either
         HH:MM:SS or HH:MM (instead of MM:SS).
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
@@ -127,12 +167,12 @@
         variables as of Org version 7.7 as you can already export the
         timestamp from the preamble or the postamble.
         (org-export-html-before-content-div): Delete variable.
-        (org-export-html-content-div): obsolete variable as of 7.7.
+        (org-export-html-content-div): Obsolete variable as of 7.7.
         (org-export-html-divs): New variable to define divs used in
         HTML export.
         (org-export-as-html): Now the preamble and the postamble are
-        surrounded by a <div ...>.  The name of the div is defined
-        through `org-export-html-divs'.
+        surrounded by a <div ...>.  The name of the div is defined through
+        `org-export-html-divs'.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
@@ -141,22 +181,21 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-macs.el (org-with-limited-levels): some functions, like
+        * org-macs.el (org-with-limited-levels): Some functions, like
         `org-back-to-heading', being deeply based on outline-mode, still
         refer to `outline-regexp' instead of `org-outline-regexp'.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org.el (org-refile-get-targets): new optional argument
+        * org.el (org-refile-get-targets): New optional argument
         `excluded-entries' to exclude entries from the targets.
         (org-refile-get-location): From an org-mode buffer, exclude
         current heading and subheadings from the list of targets when
-        org-refile-use-cache is nil.
+        `org-refile-use-cache' is nil.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-imenu-get-tree): note to self: headlines start at
-        bol.
+        * org.el (org-imenu-get-tree): Headlines start at bol.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -164,37 +203,38 @@
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
-        * ob.el (org-babel-sha1-hash): Only call copy-seq on proper lists.
+        * ob.el (org-babel-sha1-hash): Only call `copy-seq' on proper
+        lists.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-kill-is-subtree-p): matched string needs to start at
+        * org.el (org-kill-is-subtree-p): Matched string needs to start at
         bol.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
         * org.el (org-paste-subtree, org-kill-is-subtree-p)
-        (org-yank-folding-would-swallow-text, org-yank-generic): use
+        (org-yank-folding-would-swallow-text, org-yank-generic): Use
         `org-with-limited-levels' macro.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-macs.el (org-with-limited-levels): also modify, when
+        * org-macs.el (org-with-limited-levels): Also modify, when
         appropriate, `org-outline-regexp-at-bol'.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-timestamp-change): some locales don't use the same
-        length for date abbreviations. Set a marker at origin in case
+        * org.el (org-timestamp-change): Some locales don't use the same
+        length for date abbreviations.  Set a marker at origin in case
         length of new timestamp is different.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-imenu-get-tree): browse only true headlines.
+        * org.el (org-imenu-get-tree): Browse only true headlines.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-archive.el (org-archive-subtree): while it might be possible
+        * org-archive.el (org-archive-subtree): While it might be possible
         to archive an headline of a temporary buffer (i.e. not visiting a
         file), it wouldn't be really sensical.
 
@@ -202,13 +242,13 @@
 
         * org-archive.el (org-extract-archive-file)
         (org-extract-archive-heading, org-archive-subtree):
-        buffer-file-name is nil in an indirect buffer.  Thus, use
-        (buffer-file-name (buffer-base-buffer)), which will, in any case,
-        return the file-name.
+        `buffer-file-name' is nil in an indirect buffer.  Thus, use
+        `(buffer-file-name (buffer-base-buffer))', which will, in any
+        case, return the file name.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-capture.el (org-capture): if dired isn't loaded,
+        * org-capture.el (org-capture): If dired isn't loaded,
         `dired-buffers' isn't defined, and %F will fail.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
@@ -222,19 +262,19 @@
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
-        * ob.el (org-babel-execute-src-block): Replaced call to defunct
+        * ob.el (org-babel-execute-src-block): Replace call to defunct
         function `org-babel-result-hash'.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-footnote.el (org-footnote-in-valid-context-p): avoid cited
-        lines and headers in message-mode.
-        (org-footnote-at-reference-p): remove check for cited lines, this
+        * org-footnote.el (org-footnote-in-valid-context-p): Avoid cited
+        lines and headers in `message-mode'.
+        (org-footnote-at-reference-p): Remove check for cited lines, this
         is now handled by the previous function.  Refactor.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-capture.el (org-capture): if no file is associated to
+        * org-capture.el (org-capture): If no file is associated to
         current buffer, check dired buffer and try to retreive a possibly
         directory associated.
 
@@ -248,16 +288,16 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org.el (org-refile-get-location): exclude current heading from
+        * org.el (org-refile-get-location): Exclude current heading from
         the refile table.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-footnote.el (org-footnote-at-reference-p): test if match is
+        * org-footnote.el (org-footnote-at-reference-p): Test if match is
         in cited text, when replying to a message.
-        (org-footnote-new): do not create a new footnote at bol, as it might
-        be seen as a definition.
-        (org-footnote-at-definition-p): ignore definitions in forbidden
+        (org-footnote-new): Do not create a new footnote at bol, as it
+        might be seen as a definition.
+        (org-footnote-at-definition-p): Ignore definitions in forbidden
         blocks, as it is already the case for references.
 
 2011-07-28  Matt Lundin  <mdl@imapmail.org>
@@ -273,11 +313,11 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-insert-item): actualize code comments.
-        (org-insert-item): for consistency, point cannot be moved at
-        a surprising place when the user is being asked to choose a new
-        description term to insert in the list. Point should stay where the
-        user called the command.
+        * org-list.el (org-list-insert-item): Actualize code comments.
+        (org-insert-item): For consistency, point cannot be moved at a
+        surprising place when the user is being asked to choose a new
+        description term to insert in the list.  Point should stay where
+        the user called the command.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
@@ -308,20 +348,20 @@
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
         * org.el (org-update-parent-todo-statistics): COOKIE_DATA should
-        be checked for parent, not current headline. Also, this function
+        be checked for parent, not current headline.  Also, this function
         doesn't need to be interactive.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
         * org-list.el (org-list-send-item, org-list-struct-apply-struct)
-        (org-apply-on-list, org-toggle-checkbox): make markers point
+        (org-apply-on-list, org-toggle-checkbox): Make markers point
         nowhere when they have become useless.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-insert-item): when insertion point is in
+        * org-list.el (org-list-insert-item): When insertion point is in
         some white line after the end of the list, remove all unnecessary
-        white lines there before proceeding. Also refactor a snippet of
+        white lines there before proceeding.  Also refactor a snippet of
         code.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
@@ -331,15 +371,15 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-fontify-meta-lines-and-blocks-1): blocks cannot be
+        * org.el (org-fontify-meta-lines-and-blocks-1): Blocks cannot be
         correctly fontified when the buffer is missing a final newline.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
         * ob.el (org-babel-strip-protective-commas): Return `nil' instead
         of an error if no argument is given.
-        (org-babel-parse-src-block-match): Make sure body is defined
-        in the let construct.
+        (org-babel-parse-src-block-match): Make sure body is defined in
+        the let construct.
 
 2011-07-28  Jon Anders Skorpen  <jonas@ifi.uio.no>  (tiny change)
 
@@ -348,13 +388,13 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-footnote.el (org-footnote-normalize): footnote section
+        * org-footnote.el (org-footnote-normalize): Footnote section
         should be inserted only if there are footnotes to insert.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
         * org-footnote.el (org-footnote-at-definition-p)
-        (org-footnote-normalize): do not grab signature in the definition
+        (org-footnote-normalize): Do not grab signature in the definition
         of the last footnote.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
@@ -366,55 +406,55 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-exp.el (org-export-preprocess-string): add the possibility
-        to call recursively the function. Also change order of some
-        function calls. Comment export process for footnotes.
+        * org-exp.el (org-export-preprocess-string): Add the possibility
+        to call recursively the function.  Also change order of some
+        function calls.  Comment export process for footnotes.
 
-        * org-footnote.el (org-footnote-normalize): change the export
-        specific parameter to hold properties of export. Thus, the
+        * org-footnote.el (org-footnote-normalize): Change the export
+        specific parameter to hold properties of export.  Thus, the
         function can send every footnote definition in the buffer through
         `org-export-process-string'.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-latex.el (org-export-latex-preprocess): first insert
+        * org-latex.el (org-export-latex-preprocess): First insert
         footnotes in the temporary buffer so their contents can properly
         be protected from further transformations if required.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-indent-offset): new variable.
-        (org-list-struct-fix-ind): make use of the new variable.
+        * org-list.el (org-list-indent-offset): New variable.
+        (org-list-struct-fix-ind): Make use of the new variable.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-latex.el (org-export-latex-list-parameters): complete
+        * org-latex.el (org-export-latex-list-parameters): Complete
         default value with cbtrans option.
 
-        * org-list.el (org-list-to-latex): set a more consistent default
+        * org-list.el (org-list-to-latex): Set a more consistent default
         value.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-swap-items): move it to a meaningful
+        * org-list.el (org-list-swap-items): Move it to a meaningful
         position in source code (i.e. before any function using it), and
         rename it to an easier name.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-separating-blank-lines-number): if there
+        * org-list.el (org-list-separating-blank-lines-number): If there
         are blank lines already in the whole list, add a blank line.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-use-circular-move): new variable.
-        (org-previous-item, org-next-item): make use of the new variable.
-        (org-move-item-down, org-move-item-up): make use of the new
-        variable. Simplify code.
+        * org-list.el (org-list-use-circular-move): New variable.
+        (org-previous-item, org-next-item): Make use of the new variable.
+        (org-move-item-down, org-move-item-up): Make use of the new
+        variable.  Simplify code.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-delete-item, org-list-send-item): new
+        * org-list.el (org-list-delete-item, org-list-send-item): New
         functions.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
@@ -430,7 +470,7 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-capture.el (org-capture-finalize): bugfix about inserted
+        * org-capture.el (org-capture-finalize): Bugfix about inserted
         blank line when killing the capture buffer and
         `org-blank-before-new-entry' tells to not insert anything before a
         heading.
@@ -449,8 +489,8 @@
 
         * org.el (org-last-set-property): New variable.
         (org-read-property-name): Use the new variable: the prompt
-        defaults to the last property set, unless there is a property
-        in the line at point.
+        defaults to the last property set, unless there is a property in
+        the line at point.
 
 2011-07-28  David Maus  <dmaus@ictsoc.de>
 
@@ -495,15 +535,15 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-plain-list-ordered-item-terminator): remove
+        * org-list.el (org-plain-list-ordered-item-terminator): Remove
         incorrect assumption.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-footnote.el (org-footnote-forbidden-blocks): add missing
+        * org-footnote.el (org-footnote-forbidden-blocks): Add missing
         exporter specific blocks.
 
-        * org-list.el (org-list-forbidden-blocks): ditto.
+        * org-list.el (org-list-forbidden-blocks): Ditto.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
@@ -517,7 +557,7 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org.el (org-timestamp-up, org-timestamp-down): mention time
+        * org.el (org-timestamp-up, org-timestamp-down): Mention time
         changes in the docstring.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
@@ -528,15 +568,15 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-in-valid-context-p): use `org-in-block-p'.
+        * org-list.el (org-list-in-valid-context-p): Use `org-in-block-p'.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
         * org.el (org-in-block-p): new function.
 
-        * org-footnote.el (org-footnote-forbidden-blocks): new variable.
-        (org-footnote-in-valid-context-p): new function.
-        (org-footnote-at-reference-p): use new function. Allow inline
+        * org-footnote.el (org-footnote-forbidden-blocks): New variable.
+        (org-footnote-in-valid-context-p): New function.
+        (org-footnote-at-reference-p): Use new function.  Allow inline
         footnotes to start at bol.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
@@ -546,7 +586,7 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-ascii.el (org-export-as-utf8): fix call to
+        * org-ascii.el (org-export-as-utf8): Fix call to
         `org-called-interactively-p': it requires an argument.  Also fix
         the docstring.
 
@@ -565,13 +605,13 @@
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
         * org-publish.el
-        (org-publish-cache-file-needs-publishing): only check against .org
+        (org-publish-cache-file-needs-publishing): Only check against .org
         files.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org.el (org-mode): Use org-default as
-        the default face in org-mode.
+        * org.el (org-mode): Use `org-default' as the default face in
+        org-mode.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
@@ -582,30 +622,23 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-exp.el (org-export-preprocess-string): if the last subtree
-        is a task, footnotes may be removed along with the subtree. This
+        * org-exp.el (org-export-preprocess-string): If the last subtree
+        is a task, footnotes may be removed along with the subtree.  This
         patch ensures footnotes are put at the end of the buffer after the
         subtree has been removed.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-footnote.el (org-footnote-at-reference-p): verify that what
+        * org-footnote.el (org-footnote-at-reference-p): Verify that what
         looks like a footnote doesn't belong to a link.
-        (org-footnote-next-reference-or-definition): check more strictly
+        (org-footnote-next-reference-or-definition): Check more strictly
         footnote definitions.
 
-2011-07-28  Deech  <deech@deech-ThinkPad-X200.(none)>
+2011-07-28  Deech  <deech@deech-ThinkPad-X200.(none)>  (tiny change)
 
         * ob-tangle.el (org-babel-tangle): Ignore errors thrown by
         language modes.
 
-2011-07-28  Suvayu Ali  <fatkasuvayu+linux@gmail.com>
-
-        * Mention use of keywords like multicolumn and float
-
-        * Remove previous mention of hack with placement option as per
-        comments on the mailing list. The hack is better suited for Worg.
-
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
         * ob-python.el (org-babel-python-evaluate-session): Inhibit return
@@ -625,9 +658,8 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-table.el
-        (org-table-time-seconds-to-string): use `org-format-seconds'
-        instead of `format-seconds'.
+        * org-table.el (org-table-time-seconds-to-string): Use
+        `org-format-seconds' instead of `format-seconds'.
 
 2011-07-28  David Maus  <dmaus@ictsoc.de>
 
@@ -644,7 +676,7 @@
         * org-freemind.el (org-freemind-convert-links-helper)
         (org-freemind-convert-text-p, org-freemind-write-mm-buffer)
         (org-freemind-get-node-style): Use org-string-match-p for backward
-        compatibility with Emacs22.
+        compatibility with Emacs 22.
 
 2011-07-28  David Maus  <dmaus@ictsoc.de>
 
@@ -654,7 +686,7 @@
 2011-07-28  David Maus  <dmaus@ictsoc.de>
 
         * ob-haskell.el (org-babel-haskell-export-to-lhs): Call
-        kill-buffer with argument indiciating to kill current
+        `kill-buffer' with argument indiciating to kill current
         buffer. Emacs 22 compatibility.
 
 2011-07-28  David Maus  <dmaus@ictsoc.de>
@@ -664,13 +696,12 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org.el (org-add-planning-info): fix
-        issues with timestamps not being inserted at the same position.
+        * org.el (org-add-planning-info): Fix issues with timestamps not
+        being inserted at the same position.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-table.el
-        (org-table-time-string-to-seconds)
+        * org-table.el (org-table-time-string-to-seconds)
         (org-table-time-seconds-to-string): New functions.
         (org-table-eval-formula): Implement the "T" (time) flag for
         computing durations.
@@ -684,8 +715,8 @@
 
         * org.el (org-fontify-meta-lines-and-blocks-1): Include header
         lines.
-        (org-additional-option-like-keywords): Include data as a synonym for
-        results.
+        (org-additional-option-like-keywords): Include data as a synonym
+        for results.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -694,18 +725,18 @@
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
-        * ob-ref.el (org-babel-ref-goto-headline-id): Don't let org-id
+        * ob-ref.el (org-babel-ref-goto-headline-id): Don't let `org-id'
         rescan all IDs when trying to resolve a reference.
 
 2011-07-28  Julien Barnier  <julien@nozav.org>
 
         * org.el (org-fontify-meta-lines-and-blocks-1): Fix test for src
-        blocks lang attribute
+        blocks lang attribute.
 
 2011-07-28  Eric S Fraga  <e.fraga@ucl.ac.uk>
 
-        * Allow for a different markup for inactive time stamps on latex
-        export
+        * org-latex.el (org-export-latex-timestamp-inactive-markup): New
+        option to allow different markup for inactive timestamps.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -715,31 +746,31 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-full-item-re): allow counter and check-box
+        * org-list.el (org-list-full-item-re): Allow counter and check-box
         to be separated by white spaces.
-        (org-list-struct-apply-struct): reflect changes made to
+        (org-list-struct-apply-struct): Reflect changes made to
         `org-list-full-item-re'.
 
-        * org-html.el (org-html-export-list-line): recognize spaces
+        * org-html.el (org-html-export-list-line): Recognize spaces
         between counter and check-boxes as valid.
 
-        * org-docbook.el (org-export-docbook-list-line): ditto.
+        * org-docbook.el (org-export-docbook-list-line): Ditto.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-insert-item): make sure point is moved to
+        * org-list.el (org-list-insert-item): Make sure point is moved to
         the specified POS before starting the function.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-activate-footnote-links): properly fontify inline
+        * org.el (org-activate-footnote-links): Properly fontify inline
         footnotes.
-        (org-set-font-lock-defaults): apply changes to previous function.
+        (org-set-font-lock-defaults): Apply changes to previous function.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-footnote.el (org-footnote-at-reference-p): first check if
-        point is at the beginning of a footnote. Indeed `org-in-regexp'
+        * org-footnote.el (org-footnote-at-reference-p): First check if
+        point is at the beginning of a footnote.  Indeed `org-in-regexp'
         first checks backwards and might find an incorrect footnote if
         they are side-by-side.
 
@@ -748,7 +779,7 @@
         * org-agenda.el (org-agenda-compact-blocks): Improve docstring.
         (org-agenda-block-separator): Add nil to docstring and customization.
         (org-prepare-agenda): Skip agenda block separator additionally if
-        org-agenda-block-separator is nil.
+        `org-agenda-block-separator' is nil.
         (org-agenda-overriding-header): Improve docstring.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
@@ -773,65 +804,65 @@
 2011-07-28  Michael Markert  <markert.michael@googlemail.com>
 
         * ob.el (org-babel-sha1-hash): Adding optional argument KIND to
-        all org-called-interactively-p function invocations.
+        all `org-called-interactively-p' function invocations.
 
         * org-agenda.el (org-agenda-redo): Adding optional argument KIND
-        to all org-called-interactively-p function invocations.
+        to all `org-called-interactively-p' function invocations.
         (org-agenda-show-1): Adding optional argument KIND to all
-        org-called-interactively-p function invocations.
+        `org-called-interactively-p' function invocations.
         (org-agenda-set-tags): Adding optional argument KIND to all
-        org-called-interactively-p function invocations.
+        `org-called-interactively-p' function invocations.
 
         * org-ascii.el (org-export-as-latin1): Adding optional argument
-        KIND to all org-called-interactively-p function invocations.
+        KIND to all `org-called-interactively-p' function invocations.
         (org-export-as-latin1-to-buffer): Adding optional argument KIND to
-        all org-called-interactively-p function invocations.
+        all `org-called-interactively-p' function invocations.
         (org-export-as-utf8-to-buffer): Adding optional argument KIND to all
-        org-called-interactively-p function invocations.
+        `org-called-interactively-p' function invocations.
         (org-export-region-as-ascii): Adding optional argument KIND to all
-        org-called-interactively-p function invocations.
+        `org-called-interactively-p' function invocations.
 
         * org-docbook.el (org-export-region-as-docbook): Adding optional
-        argument KIND to all org-called-interactively-p function
+        argument KIND to all `org-called-interactively-p' function
         invocations.
 
         * org-html.el (org-export-region-as-html): Adding optional
-        argument KIND to all org-called-interactively-p function
+        argument KIND to all `org-called-interactively-p' function
         invocations.
 
         * org-latex.el (org-export-region-as-latex): Adding optional
-        argument KIND to all org-called-interactively-p function
+        argument KIND to all `org-called-interactively-p' function
         invocations.
 
         * org-table.el (org-table-blank-field): Adding optional argument
-        KIND to all org-called-interactively-p function invocations.
+        KIND to all `org-called-interactively-p' function invocations.
         (org-table-current-column): Adding optional argument KIND to all
-        org-called-interactively-p function invocations.
+        `org-called-interactively-p' function invocations.
         (org-table-current-dline): Adding optional argument KIND to all
-        org-called-interactively-p function invocations.
+        `org-called-interactively-p' function invocations.
         (org-table-sort-lines): Adding optional argument KIND to all
-        org-called-interactively-p function invocations.
+        `org-called-interactively-p' function invocations.
         (org-table-sum): Adding optional argument KIND to all
-        org-called-interactively-p function invocations.
+        `org-called-interactively-p' function invocations.
         (org-table-rotate-recalc-marks): Adding optional argument KIND to
-        all org-called-interactively-p function invocations.
+        all `org-called-interactively-p' function invocations.
         (org-table-eval-formula): Adding optional argument KIND to all
-        org-called-interactively-p function invocations.
+        `org-called-interactively-p' function invocations.
         (orgtbl-send-table): Adding optional argument KIND to all
-        org-called-interactively-p function invocations.
+        `org-called-interactively-p' function invocations.
 
         * org.el (org-mode): Adding optional argument KIND to all
-        org-called-interactively-p function invocations.
+        `org-called-interactively-p' function invocations.
         (org-copy-subtree): Adding optional argument KIND to all
-        org-called-interactively-p function invocations.
+        `org-called-interactively-p' function invocations.
         (org-paste-subtree): Adding optional argument KIND to all
-        org-called-interactively-p function invocations.
+        `org-called-interactively-p' function invocations.
         (org-store-link): Adding optional argument KIND to all
-        org-called-interactively-p function invocations.
+        `org-called-interactively-p' function invocations.
         (org-todo): Adding optional argument KIND to all
-        org-called-interactively-p function invocations.
+        `org-called-interactively-p' function invocations.
         (org-occur): Adding optional argument KIND to all
-        org-called-interactively-p function invocations.
+        `org-called-interactively-p' function invocations.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
@@ -900,7 +931,7 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-exp (org-export-preprocess-string): normalize footnotes
+        * org-exp.el (org-export-preprocess-string): normalize footnotes
         before marking lists ending.
 
         * org-latex.el (org-export-latex-preprocess): work with labels as
@@ -1047,21 +1078,21 @@
 
 2011-07-28  Achim Gratz  <stromeko@nexgo.de>
 
-        * org.el (defcustom org-log-into-drawer): correct typo
+        * org.el (org-log-into-drawer): Correct typo.
 
         * org-clock.el (org-clock-into-drawer): New function to change the
         location of clock events based on properties CLOCK_INTO_DRAWER or,
         as fallback, LOG_INTO_DRAWER, like it is already possible for
         state change logs.
 
-        * org-clock.el (org-clock-jump-to-current-clock): add statement to
-        let clause to bind org-clock-into-drawer to result of function
-        eval
+        * org-clock.el (org-clock-jump-to-current-clock): Add statement to
+        let clause to bind `org-clock-into-drawer' to result of function
+        eval.
 
-        * org-clock.el (org-clock-find-position): add statement to let
-        clause to bind org-clock-into-drawer to result of function eval,
+        * org-clock.el (org-clock-find-position): Add statement to let
+        clause to bind `org-clock-into-drawer' to result of function eval,
         change let to let* since the binding is used later in the same
-        clause
+        clause.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -1168,7 +1199,7 @@
 2011-07-28  Jambunathan K  <kjambunathan@gmail.com>
 
         * org-exp.el (org-export-format-source-code-or-example):
-        Simplify. Also add `org-native-text' as a text property to the
+        Simplify.  Also add `org-native-text' as a text property to the
         formatted text and throw error for unknown backends.
 
 2011-07-28  Jambunathan K  <kjambunathan@gmail.com>
@@ -1182,16 +1213,15 @@
         * org-exp.el (org-export-backends): New variable.
         (org-export-select-backend-specific-text): Use above
         variable. Also mark text between #+BACKEND and
-        #+BEGIN_BACKEND...#+END_BACKEND with org-native-text
-        property. This text property is currently used only by the new
-        line-oriented generic exporter (which is not yet part of the
-        repo).
+        #+BEGIN_BACKEND...#+END_BACKEND with org-native-text property.
+        This text property is currently used only by the new line-oriented
+        generic exporter (which is not yet part of the repo).
 
 2011-07-28  Jambunathan K  <kjambunathan@gmail.com>
 
         * org-exp.el (org-export): Reserve keys 'o' and 'O' for
-        OpenDocumentText export and bind them to org-export-as-odt and
-        org-export-as-odt-and-open.
+        OpenDocumentText export and bind them to `org-export-as-odt' and
+        `org-export-as-odt-and-open'.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -1205,29 +1235,29 @@
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
-        * ob-C.el (ob-tangle): initialize variable from ob-tangle.
+        * ob-C.el (ob-tangle): initialize variable from `ob-tangle'.
 
-        * ob-asymptote.el (ob-tangle): initialize variable from ob-tangle.
+        * ob-asymptote.el (ob-tangle): initialize variable from `ob-tangle'.
 
-        * ob-awk.el (ob-tangle): initialize variable from ob-tangle.
+        * ob-awk.el (ob-tangle): initialize variable from `ob-tangle'.
 
-        * ob-clojure.el (ob-tangle): initialize variable from ob-tangle.
+        * ob-clojure.el (ob-tangle): initialize variable from `ob-tangle'.
 
-        * ob-haskell.el (ob-tangle): initialize variable from ob-tangle.
+        * ob-haskell.el (ob-tangle): initialize variable from `ob-tangle'.
 
-        * ob-latex.el (ob-tangle): initialize variable from ob-tangle.
+        * ob-latex.el (ob-tangle): initialize variable from `ob-tangle'.
 
-        * ob-lisp.el (ob-tangle): initialize variable from ob-tangle.
+        * ob-lisp.el (ob-tangle): initialize variable from `ob-tangle'.
 
-        * ob-ocaml.el (ob-tangle): initialize variable from ob-tangle.
+        * ob-ocaml.el (ob-tangle): initialize variable from `ob-tangle'.
 
-        * ob-perl.el (ob-tangle): initialize variable from ob-tangle.
+        * ob-perl.el (ob-tangle): initialize variable from `ob-tangle'.
 
-        * ob-python.el (ob-tangle): initialize variable from ob-tangle.
+        * ob-python.el (ob-tangle): initialize variable from `ob-tangle'.
 
-        * ob-ruby.el (ob-tangle): initialize variable from ob-tangle.
+        * ob-ruby.el (ob-tangle): initialize variable from `ob-tangle'.
 
-        * ob-tangle.el (ob-tangle): initialize variable from ob-tangle.
+        * ob-tangle.el (ob-tangle): initialize variable from `ob-tangle'.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -1307,9 +1337,8 @@
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>  (tiny change)
 
-        * org.el (org-find-dblock):
-        (org-clocktable-try-shift): Make regexp work also when #+begin
-        line is indentex.
+        * org.el (org-find-dblock, org-clocktable-try-shift): Make regexp
+        work also when #+begin line is indentex.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -1395,28 +1424,33 @@
         `interactive-p'.
         (org-export-as-utf8-to-buffer): Replacing call to now-defunct function
         `interactive-p'.
-        (org-export-region-as-ascii): Replacing call to now-defunct function
-        `interactive-p'.Replacing call to now-defunct function `interactive-p'.
+        (org-export-region-as-ascii): Replacing call to now-defunct
+        function `interactive-p'.Replacing call to now-defunct function
+        `interactive-p'.
 
         * org-docbook.el: Replacing call to now-defunct function
         `interactive-p'.
-        (org-export-region-as-docbook): Replacing call to now-defunct function
-        `interactive-p'.Replacing call to now-defunct function `interactive-p'.
+        (org-export-region-as-docbook): Replacing call to now-defunct
+        function `interactive-p'.Replacing call to now-defunct function
+        `interactive-p'.
 
         * org-html.el: Replacing call to now-defunct function
         `interactive-p'.
-        (org-export-region-as-html): Replacing call to now-defunct function
-        `interactive-p'.Replacing call to now-defunct function `interactive-p'.
+        (org-export-region-as-html): Replacing call to now-defunct
+        function `interactive-p'.Replacing call to now-defunct function
+        `interactive-p'.
 
         * org-latex.el: Replacing call to now-defunct function
         `interactive-p'.
-        (org-export-region-as-latex): Replacing call to now-defunct function
-        `interactive-p'.Replacing call to now-defunct function `interactive-p'.
+        (org-export-region-as-latex): Replacing call to now-defunct
+        function `interactive-p'.Replacing call to now-defunct function
+        `interactive-p'.
 
         * org-macs.el: Replacing call to now-defunct function
         `interactive-p'.
-        (org-called-interactively-p): Replacing call to now-defunct function
-        `interactive-p'.Replacing call to now-defunct function `interactive-p'.
+        (org-called-interactively-p): Replacing call to now-defunct
+        function `interactive-p'.Replacing call to now-defunct function
+        `interactive-p'.
 
         * org-table.el: Replacing call to now-defunct function
         `interactive-p'.
@@ -1439,7 +1473,8 @@
         (orgtbl-send-table): Replacing call to now-defunct function `interactive-p'.
 
         * org.el: Replacing call to now-defunct function `interactive-p'.
-        (org-mode): Replacing call to now-defunct function `interactive-p'.
+        (org-mode): Replacing call to now-defunct function
+        `interactive-p'.
         (org-copy-subtree): Replacing call to now-defunct function
         `interactive-p'.
         (org-paste-subtree): Replacing call to now-defunct function
@@ -1473,8 +1508,8 @@
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
-        * org-html.el (org-export-as-html):
-        (org-html-level-start): Only convert section number underscores to dashes.
+        * org-html.el (org-export-as-html, org-html-level-start): Only
+        convert section number underscores to dashes.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -1524,8 +1559,8 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>  (tiny change)
 
-        * org-list.el (org-list-to-latex): the enumerate environment in
-        latex increments the counter before using it. Therefore, org-mode
+        * org-list.el (org-list-to-latex): The enumerate environment in
+        latex increments the counter before using it.  Therefore, org-mode
         should set the enumeration counter to the desired value minus one.
 
 2011-07-28  Michael Brand  <michael.ch.brand@gmail.com>  (tiny change)
@@ -1535,17 +1570,17 @@
 
 2011-07-28  Christian Egli  <christian.egli@sbszh.ch>
 
-        * org-taskjuggler.el (org-taskjuggler-clean-effort): handle any
+        * org-taskjuggler.el (org-taskjuggler-clean-effort): Handle any
         effort that is accepted by `org-duration-string-to-minutes´.
 
 2011-07-28  Julien Barnier  <julien@nozav.org>
 
-        * ob-sh.el (org-babel-sh-evaluate) : when sending input to comint,
-        wait until previous line execution is finished
+        * ob-sh.el (org-babel-sh-evaluate): When sending input to comint,
+        wait until previous line execution is finished.
 
-        * ob-comint.el (org-babel-comint-with-output) : when looking for
+        * ob-comint.el (org-babel-comint-with-output): When looking for
         end-of-evaluation indicator, search forward for the indicator
-        before searching forward for the prompt
+        before searching forward for the prompt.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -1553,11 +1588,11 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-auto-align-tags): change docstring.
-        (org-update-parent-todo-statistics): keep tags aligned even when
+        * org.el (org-auto-align-tags): Change docstring.
+        (org-update-parent-todo-statistics): Keep tags aligned even when
         statistics cookies are shifting them.
 
-        * org-list.el (org-update-checkbox-count): keep tags aligned even
+        * org-list.el (org-update-checkbox-count): Keep tags aligned even
         when statistics cookies are shifting them.
 
 2011-07-28  Lawrence Mitchell  <wence@gmx.li>
@@ -1568,7 +1603,7 @@
 2011-07-28  Lawrence Mitchell  <wence@gmx.li>
 
         * ob.el (org-babel-result-regexp): Use non-shy group around
-        org-babel-data-names.
+        `org-babel-data-names'.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -1593,7 +1628,7 @@
         * ob-lisp.el (org-babel-execute:lisp): No real functional change,
         just aesthetic.
 
-2011-07-28  Sébastien Delafond  <sdelafond@gmail.com>
+2011-07-28  Sébastien Delafond  <sdelafond@gmail.com>  (tiny change)
 
         * org.el (org-mode-flyspell-verify): This is useful when using
         flyspell with a non-English dictionary, or if some of your
@@ -1605,7 +1640,7 @@
         `org-activate-mark'.
 
         * org-compat.el (org-activate-mark): New function. Provide
-        `activate-mark' if not present (e.g. Emacs22).
+        `activate-mark' if not present (e.g. Emacs 22).
 
 2011-07-28  David Maus  <dmaus@ictsoc.de>
 
@@ -1637,7 +1672,7 @@
         * org.el (org-self-insert-command): Use `delete-char' instead of
         `delete-backward-char'.
 
-        * org-table.el (orgtbl-self-insert-command): Dto.
+        * org-table.el (orgtbl-self-insert-command): Ditto.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -1650,7 +1685,7 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-latex.el (org-export-latex-preprocess): add
+        * org-latex.el (org-export-latex-preprocess): Add
         `original-indentation' property to footnotes so they cannot
         possibly end a list by being less indented than the item they
         belong to.
@@ -1680,33 +1715,33 @@
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org.el (org-self-insert-command): Catch the case of
-        buffer-undo-list eq t.
+        `buffer-undo-list' eq t.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-toggle-heading): region should be considered as made
+        * org.el (org-toggle-heading): Region should be considered as made
         of full lines, without the last one if region-end is at bol.
-        Removed unused variables. Refactored and commented code.
+        Removed unused variables.  Refactored and commented code.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-toggle-item): when region includes an headline less
+        * org.el (org-toggle-item): When region includes an headline less
         indented than first one, set it as the new reference.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-to-subtree): if the list is before first
+        * org-list.el (org-list-to-subtree): If the list is before first
         heading and `org-odd-levels-only' is non-nil, the first item gets
         two stars instead of one.
 
-        * org.el (org-reduced-level): a level of 0 was reduced to 1 with
+        * org.el (org-reduced-level): A level of 0 was reduced to 1 with
         `org-odd-levels-only' non-nil.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-toggle-item): converting an heading to an item would
+        * org.el (org-toggle-item): Converting an heading to an item would
         sometimes insert unnecessary spaces before it, and unwanted space
-        with `org-indent-mode' on. Changing some text into an item
+        with `org-indent-mode' on.  Changing some text into an item
         wouldn't always preserve indentation.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
@@ -1714,21 +1749,21 @@
         * org-capture.el (org-capture-current-plist): Improve docstring.
         (org-capture-put): Add docstring.
         (org-capture-get): Add docstring.
-        (org-capture-member): Add LOCAL argument. Add docstring.
-        (org-capture-set-target-location): Store the time received from a date
-        prompt into the :prompt-time property.
+        (org-capture-member): Add LOCAL argument.  Add docstring.
+        (org-capture-set-target-location): Store the time received from a
+        date prompt into the :prompt-time property.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-exp.el (org-export-mark-list-properties): even if context is
+        * org-exp.el (org-export-mark-list-properties): Even if context is
         invalid, mark list item with `list-context' property.
 
-        * org-list.el (org-list-forbidden-blocks): add exporters specific
+        * org-list.el (org-list-forbidden-blocks): Add exporters specific
         blocks to the list of forbidden blocks.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-sort-list): function tries to intern
+        * org-list.el (org-sort-list): Function tries to intern
         getkey-func before it is defined, so it's always nil.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
@@ -1747,7 +1782,7 @@
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
-        * ob-sh.el (ob-ref): Uses ob-ref to resolve the value of the
+        * ob-sh.el (ob-ref): Uses `ob-ref' to resolve the value of the
         :stdin header argument.
         (org-babel-execute:sh): Use the :stdin header argument.
         (org-babel-sh-var-to-sh): Split the bulk of this function off into a
@@ -1824,11 +1859,11 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-separating-blank-lines-number): fix
-        confusion between point and item beginning. Now, if no information
-        is avalaible, truly follow user preference when it inserts blank
-        lines manually.
-        (org-list-insert-item): send correct argument to the preceding
+        * org-list.el (org-list-separating-blank-lines-number): Fix
+        confusion between point and item beginning.  Now, if no
+        information is avalaible, truly follow user preference when it
+        inserts blank lines manually.
+        (org-list-insert-item): Send correct argument to the preceding
         function.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
@@ -1836,13 +1871,13 @@
         * ob.el (org-babel-src-block-regexp): Keep the now-mandatory
         newline inside of the code block body.
 
-2011-07-28  Sean O'Halpin  <sean.ohalpin@gmail.com>
+2011-07-28  Sean O'Halpin  <sean.ohalpin@gmail.com>  (tiny change)
 
         * ob.el: Avoid spurious matches to literal.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-indent-line-function): don't include #+include
+        * org.el (org-indent-line-function): Don't include #+include
         lines.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
@@ -1851,7 +1886,8 @@
         org-babel-check-src-block.
 
         * ob.el (org-babel-expand-src-block): Fit within 80 cols.
-        (org-babel-edit-distance): Returns the edit distance of two strings.
+        (org-babel-edit-distance): Returns the edit distance of two
+        strings.
         (org-babel-check-src-block): Check a code block for errors.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>  (tiny change)
@@ -1863,9 +1899,9 @@
 
         * org-table.el
         (org-table-exit-follow-field-mode-when-leaving-table): New option.
-        (org-table-check-inside-data-field): New optional argument `noerror'.
-        When set, the function will only return nil instead of throwing an
-        error.
+        (org-table-check-inside-data-field): New optional argument
+        `noerror'.  When set, the function will only return nil instead of
+        throwing an error.
         (org-table-edit-field): Interpret double prefix argument, and improve
         the properties of the editing window.
         (org-table-follow-field-mode): New minor mode.
@@ -1881,12 +1917,12 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-full-item-re): allow description term to
+        * org-list.el (org-list-full-item-re): Allow description term to
         have a newline character after the colons.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-sort-list): no longer ignore with-case
+        * org-list.el (org-sort-list): No longer ignore with-case
         argument: the function sorted case-sensitively, regardless of
         argument.
 
@@ -1903,7 +1939,7 @@
         * org.el (org-special-properties): Add CLOCKSUM to the special
         properties.
 
-2011-07-28  Robert P. Goldman  <rpgoldman@real-time.com>
+2011-07-28  Robert P. Goldman  <rpgoldman@real-time.com>  (tiny change)
 
         * ob-exp.el (org-babel-exp-in-export-file): Bind
         `org-link-search-inhibit-query' to t to inhibit prompts.
@@ -1924,19 +1960,19 @@
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org-latex.el (org-export-latex-preprocess): Pipe index entries
-        through org-export-latex-fontify-headline.
+        through `org-export-latex-fontify-headline'.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org-exp.el (org-export-add-options-to-plist): Fix the option
-        parser
+        parser.
 
-2011-07-28  Robert P. Goldman  <rpgoldman@real-time.com>
+2011-07-28  Robert P. Goldman  <rpgoldman@real-time.com>  (tiny change)
 
         * org-latex.el (org-export-latex-preprocess): Replace index
         entries.
 
-2011-07-28  Robert P. Goldman  <rpgoldman@real-time.com>
+2011-07-28  Robert P. Goldman  <rpgoldman@real-time.com>  (tiny change)
 
         * org.el (org-structure-template-alist): Add an easy template for
         index (i), and move include file to I from i.
@@ -1944,7 +1980,7 @@
 2011-07-28  Matt Lundin  <mdl@imapmail.org>
 
         * org-agenda.el (org-agenda-open-link): Pass entire text of agenda
-        line to org-offer-links-in-entry.
+        line to `org-offer-links-in-entry'.
 
 2011-07-28  Michael Markert  <markert.michael@googlemail.com>
 
@@ -1960,8 +1996,8 @@
         existing headline.
         (org-bibtex-export-arbitrary-fields)
         (org-bibtex-treat-headline-as-title): Fix typos
-        (org-bibtex-fleshout): Don't upcase optional field; remove ":" from
-        type completion.
+        (org-bibtex-fleshout): Don't upcase optional field; remove ":"
+        from type completion.
 
 2011-07-28  Matt Lundin  <mdl@imapmail.org>
 
@@ -1974,11 +2010,11 @@
 
 2011-07-28  Tom Dye  <tsd@tsdye.com>
 
-        * org-bibtex.el: Added crossref field to other fields
+        * org-bibtex.el: Added crossref field to other fields.
 
 2011-07-28  Tom Dye  <tsd@tsdye.com>
 
-        * org-bibtex.el: Add crossref option to incollection
+        * org-bibtex.el: Add crossref option to incollection.
 
 2011-07-28  Matt Lundin  <mdl@imapmail.org>
 
@@ -1992,15 +2028,16 @@
 
 2011-07-28  Matt Lundin  <mdl@imapmail.org>
 
-        * org-bibtex.el (org-bibtex-tags): New variable
-        (org-bibtex-tags-are-keywords): New variable
-        (org-bibtex-no-export-tags): New variable
-        (org-bibtex-headline): Export tags as comma-separated bibtex keywords
-        (org-bibtex-read): Import bibtex keywords field as tags
+        * org-bibtex.el (org-bibtex-tags): New variable.
+        (org-bibtex-tags-are-keywords): New variable.
+        (org-bibtex-no-export-tags): New variable.
+        (org-bibtex-headline): Export tags as comma-separated bibtex
+        keywords.
+        (org-bibtex-read): Import bibtex keywords field as tags.
 
 2011-07-28  Manuel Giraud  <manuel.giraud@univ-nantes.fr>
 
-        * org-publish.el (org-publish-find-date): optimization
+        * org-publish.el (org-publish-find-date): Optimization.
 
 2011-07-28  Tassilo Horn  <tassilo@member.fsf.org>
 
@@ -2011,12 +2048,13 @@
 
         * org-publish.el (org-publish-project-alist): Document new
         :sitemap-sans-extension property.
-        (org-publish-org-sitemap): Use new sitemap-sans-extension setting.
+        (org-publish-org-sitemap): Use new `sitemap-sans-extension'
+        setting.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org.el (org-remove-uninherited-tags): Renamed from
-        org-remove-iniherited-tags.
+        `org-remove-iniherited-tags'.
         (org-scan-tags): Fix typo in function call.
         (org-get-tags-at): Fix typo in function call.
 
@@ -2066,8 +2104,9 @@
 
         * org-bibtex.el (org-bibtex-export-arbitrary-fields): New option.
         (org-bibtex-key-property): New option.
-        (org-bibtex-put): Make use of new `org-bibtex-key-property' variable.
-        (org-bibtex-headline):  Make use of new
+        (org-bibtex-put): Make use of new `org-bibtex-key-property'
+        variable.
+        (org-bibtex-headline): Make use of new
         `org-bibtex-export-arbitrary-fields' and `org-bibtex-key-property'
         variables.
         (org-bibtex-autokey):  Make use of new `org-bibtex-key-property'
@@ -2130,20 +2169,20 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-exp.el (org-export-preprocess-string): mark list end before
-        expanding macros. Thus, a macro inside a list and containing blank
-        lines cannot break the list structure.
-        (org-export-preprocess-apply-macros): multi-lines macros get
-        indented with the same indentation as the first line. Thus, we are
-        sure that every line belongs to the same list as the first line, if
-        such list exists. Also add comments in code.
+        * org-exp.el (org-export-preprocess-string): Mark list end before
+        expanding macros.  Thus, a macro inside a list and containing
+        blank lines cannot break the list structure.
+        (org-export-preprocess-apply-macros): Multi-lines macros get
+        indented with the same indentation as the first line.  Thus, we
+        are sure that every line belongs to the same list as the first
+        line, if such list exists.  Also add comments in code.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org-agenda.el (org-agenda-clock-consistency-checks): New option.
         (org-agenda-list): Handle display change to clock check.
-        (org-agenda-get-progress): Show only clock entries if we are doing the
-        consistency check.
+        (org-agenda-get-progress): Show only clock entries if we are doing
+        the consistency check.
         (org-agenda-show-clocking-issues): New function.
         (org-agenda-check-clock-gap): New function.
         (org-agenda-view-mode-dispatch): Offer consistency check.
@@ -2155,7 +2194,7 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-struct): when walking down the list, the
+        * org-list.el (org-list-struct): When walking down the list, the
         function would not pay attention to drawers or blocks indentation.
         Thus, such constructs couldn't consistently end an item or a list.
         This patch ensures line indentation is stored (if applicable)
@@ -2164,7 +2203,7 @@
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org-exp.el (org-export): Add EXPORT_FILE_NAME to the enclosing
-        tree properties
+        tree properties.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -2175,36 +2214,35 @@
 
         * org-exp.el (org-export): Go to next heading before searching
         backward, so make this also work if we are on the headline of the
-        entry with the property...
+        entry with the property.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org.el (org-promote):
         (org-demote): Soften the previous change, by only removing the
-        flyspell function from after-change functions, because that was the
-        one causing the slowdown - at least much of it.
+        flyspell function from after-change functions, because that was
+        the one causing the slowdown - at least much of it.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
-        * org.el (org-promote):
-        (org-demote): Turn off after-change-functions to speed up the
-        reindentation of text.
+        * org.el (org-promote, org-demote): Turn off
+        after-change-functions to speed up the reindentation of text.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
-        * ob-ocaml.el (org-babel-ocaml-read-list): Using
+        * ob-ocaml.el (org-babel-ocaml-read-list): Use
         `org-babel-script-escape'.
-        (org-babel-ocaml-read-array): Using `org-babel-script-escape'.
+        (org-babel-ocaml-read-array): Use `org-babel-script-escape'.
 
 2011-07-28  Manuel Giraud  <manuel.giraud@univ-nantes.fr>
 
-        * org-html.el (org-html-handle-links): add an alternate for inline
+        * org-html.el (org-html-handle-links): Add an alternate for inline
         images
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org-agenda.el (org-agenda-bulk-action): Do not use the entries
-        variable before it is defined
+        variable before it is defined.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -2218,16 +2256,17 @@
 
 2011-07-28  Manuel Giraud  <manuel.giraud@univ-nantes.fr>
 
-        * org-html.el (org-html-make-link): correct a bug in coderef link.
+        * org-html.el (org-html-make-link): Correct a bug in coderef link.
 
 2011-07-28  Bernt Hansen  <bernt@norang.ca>
 
-        * org-agenda.el (org-agenda-filter-by-tag): Fix variable name typo
+        * org-agenda.el (org-agenda-filter-by-tag): Fix variable name
+        typo.
 
 2011-07-28  Bernt Hansen  <bernt@norang.ca>
 
         * org-agenda.el (org-agenda-get-timestamps): Fix agenda display
-        when headlines are missing
+        when headlines are missing.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
@@ -2260,30 +2299,24 @@
 
 2011-07-28  Julien Danjou  <julien@danjou.info>
 
-        * org.el (org-entry-get):
-        (org-entry-delete):
-        (org-entry-put):
-        (org-property-values):
-        (org-delete-property-globally): Use org-re-property.
-        (org-re-property): New function allowing to build a regexp to match a
-        property.
+        * org.el (org-entry-get, org-entry-delete, org-entry-put)
+        (org-property-values, org-delete-property-globally): Use
+        `org-re-property'.
+        (org-re-property): New function allowing to build a regexp to
+        match a property.
 
 2011-07-28  Julien Danjou  <julien@danjou.info>
 
         * org.el (org-property-values): Enhance docstring.
 
-2011-07-28  Ethan Ligon  <ligon@are.berkeley.edu>
+2011-07-28  Ethan Ligon  <ligon@are.berkeley.edu>  (tiny change)
 
-        * Illustration of bug in html export - This has a space after the
-        colons :: so will work in latex and html - This doesn't have a
-        space after the colons ::so is an invalid description item
-        according to the org manual.  Won't work in html or docbook.  Will
-        nevertheless work in latex, provided /first/ description item is
-        valid.  - Has a terminating space :: - So it works in both html
-        and latex export!  - Even though it's difficult to distinguish
-        from the next example.  - Lacks a terminating space :: - At
-        present, *doesn't* work in html or docbook export, does in latex.
-        This is the case that the following patch fixes.
+        * org-html.el (org-html-export-list-line): Fix regexp for
+        detecting description lists to allow "::" marker to be last
+        visible element at end of line.
+        * org-docbook.el (org-docbook-export-list-line): Fix regexp for
+        detecting description lists to allow "::" marker to be last
+        visible element at end of line.
 
 2011-07-28  Julien Danjou  <julien@danjou.info>
 
@@ -2292,9 +2325,9 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-in-valid-context-p): renamed from
-        org-list-in-valid-block-p.
-        (org-at-item-p,org-list-search-generic): use renamed function.
+        * org-list.el (org-list-in-valid-context-p): Renamed from
+        `org-list-in-valid-block-p'.
+        (org-at-item-p,org-list-search-generic): Use renamed function.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
@@ -2304,21 +2337,21 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-latex.el: pay attention to end of footnote.  Before closing
+        * org-latex.el: Pay attention to end of footnote.  Before closing
         the command, ensure that list is properly closed or that last link
         is separated from the curly brace.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-indent-line-function): footnote definition must stay
-        at column 0 to be recognized as such. Body below can have normal
+        * org.el (org-indent-line-function): Footnote definition must stay
+        at column 0 to be recognized as such.  Body below can have normal
         indentation, so it should ignore its definition when computing
         indentation.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-protocol.el (org-protocol-remember)
-        (org-protocol-capture): More appropriate message.
+        * org-protocol.el (org-protocol-remember, org-protocol-capture):
+        More appropriate message.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
@@ -2334,14 +2367,14 @@
 2011-07-28  Bernt Hansen  <bernt@norang.ca>
 
         * org-agenda.el: Remove obsolete code for adding todo list in
-        front of the agenda
+        front of the agenda.
 
 2011-07-28  Lawrence Mitchell  <wence@gmx.li>
 
         * org-latex.el (org-export-latex-convert-table.el-table): Fix
         format-string for insertion of captions.
 
-2011-07-28  Nick Dokos  <nicholas.dokos@hp.com>
+2011-07-28  Nick Dokos  <nicholas.dokos@hp.com>  (tiny change)
 
         * org-exp.el (org-export-remove-comment-blocks-and-subtrees): Fix
         regexp.
@@ -2358,7 +2391,7 @@
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
         * ob-lisp.el (org-babel-execute:lisp): Turn vectors into lists
-        before reading by elisp
+        before reading by elisp.
         (org-bable-lisp-vector-to-list): Stub of a vector->list function,
         should be replaced with a cl-vector->el-vector function.
 
@@ -2377,7 +2410,7 @@
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
-        * org-beamer.el (org-beamer-environments-extra): Fix docstring
+        * org-beamer.el (org-beamer-environments-extra): Fix docstring.
 
 2011-07-28  Lawrence Mitchell  <wence@gmx.li>
 
@@ -2386,7 +2419,7 @@
 
 2011-07-28  Lawrence Mitchell  <wence@gmx.li>
 
-        * org-html.el (org-export-as-html) (org-html-level-start): Fix
+        * org-html.el (org-export-as-html, org-html-level-start): Fix
         logic for section number printing when NUM is an integer.
 
 2011-07-28  Lawrence Mitchell  <wence@gmx.li>
@@ -2397,7 +2430,7 @@
 2011-07-28  Lawrence Mitchell  <wence@gmx.li>
 
         * org.el (org-point-at-end-of-empty-headline): Bind
-        case-fold-search to nil.
+        `case-fold-search' to nil.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -2414,10 +2447,10 @@
 
         * org.el (org-ts-regexp-both): Add "]" to class of characters that
         should not be matched.
-        (org-ts-regexp0):
-        (org-ts-regexp1): Do not start a class with "^]-+", because that tries
-        to (not) match characters between "]" and "+".  Instead, move the "-"
-        to the end of the class where it causes no harm.
+        (org-ts-regexp0, org-ts-regexp1): Do not start a class with
+        "^]-+", because that tries to (not) match characters between "]"
+        and "+".  Instead, move the "-" to the end of the class where it
+        causes no harm.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -2428,7 +2461,7 @@
 
         * ob-tangle.el (org-babel-tangle-collect-blocks): Brought the link
         extraction code into line with a newer version of the
-        org-store-link function.
+        `org-store-link' function.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -2440,8 +2473,8 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el: move org-update-checkbox-count-maybe call outside
-        of save-excursion to get back to original position.
+        * org-list.el: Move `org-update-checkbox-count-maybe' call outside
+        of ̀save-excursion' to get back to original position.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -2456,11 +2489,14 @@
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
-        * org-ascii.el (org-export-as-ascii):
+        * org-ascii.el (org-export-as-ascii): Pass the :done-tasks
+        property to the export preprocessor.
 
-        * org-docbook.el (org-export-as-docbook):
+        * org-docbook.el (org-export-as-docbook): Pass the :done-tasks
+        property to the export preprocessor.
 
-        * org-html.el (org-export-as-html):
+        * org-html.el (org-export-as-html): Pass the :done-tasks property
+        to the export preprocessor.
 
         * org-latex.el (org-export-as-latex): Pass the :done-tasks
         property to the export preprocessor.
@@ -2482,14 +2518,14 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-toggle-checkbox): build value of
+        * org-list.el (org-toggle-checkbox): Build value of
         org-keyword-time-regexp instead of using it directly, as it's
         buffer-local, and function might be called outside Org.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-struct,org-in-item-p): don't assume end of
-        blocks or drawers necessarily start somewhere. It it isn't the
+        * org-list.el (org-list-struct,org-in-item-p): Don't assume end of
+        blocks or drawers necessarily start somewhere.  It it isn't the
         case, treat them as normal text.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
@@ -2505,14 +2541,14 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-checkbox): when called from an headline,
+        * org-list.el (org-list-checkbox): When called from an headline,
         function would normally skip drawers, but not if a SCHEDULED or
-        DEADLINE keyword is standing before the drawer. Also avoid
+        DEADLINE keyword is standing before the drawer.  Also avoid
         problems if function is called in buffers not is Org mode.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-clock.el (org-clock-report): change the scope of the
+        * org-clock.el (org-clock-report): Change the scope of the
         inserted clock report depending on whether the point is within a
         subtree (:scope subtree) or not (:scope file).
 
@@ -2542,7 +2578,7 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-protocol.el (org-protocol-do-capture): allow template keys
+        * org-protocol.el (org-protocol-do-capture): Allow template keys
         of two characters.
         (org-protocol-default-template-key): Update the docstring to
         reflect the change in `org-protocol-do-capture'.
@@ -2583,21 +2619,21 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-in-item-p): re-build org-drawer-regexp,
+        * org-list.el (org-in-item-p): Re-build `org-drawer-regexp',
         whatever the major mode is.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-inlinetask.el (org-inlinetask-export-templates): fix default
+        * org-inlinetask.el (org-inlinetask-export-templates): Fix default
         templates.
-        (org-inlinetask-export-handler): Ensure contents of inline task, if
-        any, starts and ends with a newline character. Refactor and comment
-        code.
+        (org-inlinetask-export-handler): Ensure contents of inline task,
+        if any, starts and ends with a newline character.  Refactor and
+        comment code.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org-capture.el (org-datetree-find-date-create): Lower-case for
-        variable names in define-function form.
+        variable names in `define-function' form.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -2611,7 +2647,7 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-latex.el (org-export-latex-preprocess): last brace shouldn't
+        * org-latex.el (org-export-latex-preprocess): Last brace shouldn't
         be on the same line as a list end marker.
 
 2011-07-28  Julien Danjou  <julien@danjou.info>
@@ -2634,10 +2670,10 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-to-generic): set a default term for
-        ill-formed description lists. Do not insert newline characters
+        * org-list.el (org-list-to-generic): Set a default term for
+        ill-formed description lists.  Do not insert newline characters
         unless told to.
-        (org-list-to-texinfo,org-list-to-html): apply changes to
+        (org-list-to-texinfo,org-list-to-html): Apply changes to
         `org-list-parse-liste'.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
@@ -2662,16 +2698,16 @@
 
         * org-taskjuggler.el (org-taskjuggler-compute-task-leafiness):
         Compute the leafiness of a node.
-        (org-taskjuggler-open-task, org-export-as-taskjuggler): Mark a node as
-        a milestone if it is a leaf and has no effort.
+        (org-taskjuggler-open-task, org-export-as-taskjuggler): Mark a
+        node as a milestone if it is a leaf and has no effort.
 
 2011-07-28  Christian Egli  <christian.egli@alumni.ethz.ch>
 
         * org-taskjuggler.el (org-export-taskjuggler-target-version):
-        (org-taskjuggler-targeting-tj3-p): Add some minimal infrastructure to
-        handle export to both tj2 and tj3.
-        (org-taskjuggler-open-task): Use a different way to purge allocations
-        for tj2 and tj3.
+        (org-taskjuggler-targeting-tj3-p): Add some minimal infrastructure
+        to handle export to both tj2 and tj3.
+        (org-taskjuggler-open-task): Use a different way to purge
+        allocations for tj2 and tj3.
 
 2011-07-28  Matt Lundin  <mdl@imapmail.org>
 
@@ -2800,7 +2836,7 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-parse-list): fixed regexp.
+        * org-list.el (org-list-parse-list): Fixed regexp.
 
 2011-07-28  David Maus  <dmaus@ictsoc.de>
 
@@ -2833,8 +2869,8 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-fill-paragraph): fill-forward-paragraph function has
-        been introduced with emacs 23.1.
+        * org.el (org-fill-paragraph): `fill-forward-paragraph' function
+        has been introduced with emacs 23.1.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
@@ -2857,18 +2893,18 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-adaptive-fill-function): when a region is specified
+        * org.el (org-adaptive-fill-function): When a region is specified
         first line of paragraph isn't skipped, so fill-paragraph have to
         be computed even if point is at an item.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-in-valid-block-p): new function.
-        (org-at-item-p,org-list-search-generic): use new function.
+        * org-list.el (org-list-in-valid-block-p): New function.
+        (org-at-item-p,org-list-search-generic): Use new function.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-indent-line-function): text in both a list and a
+        * org.el (org-indent-line-function): Text in both a list and a
         valid block is indented with regards to current item, not to block
         boundaries.
 
@@ -2894,7 +2930,7 @@
         * org-html.el (org-export-as-html): Bugfix: don't insert closing
         HTML tags when exporting body only.
 
-2011-07-28  Jason Dunsmore  <emacs-orgmode@deathroller.dunsmor.com>
+2011-07-28  Jason Dunsmore  <emacs-orgmode@deathroller.dunsmor.com>  (tiny change)
 
         * org.el (org-back-over-empty-lines): Bugfix.  Honor
         `org-blank-before-new-entry' correctly in various contexts.
@@ -2906,7 +2942,7 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-timer.el (org-timer-item): save-excursion prevents
+        * org-timer.el (org-timer-item): `save-excursion' prevents
         `org-list-struct' to get the list structure when point isn't on
         the first line of the item.
 
@@ -2919,7 +2955,7 @@
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
         * org-list.el (org-update-checkbox-count): Ensure cookies on an
-        heading are correctly updated when checkboxes are hidden. It
+        heading are correctly updated when checkboxes are hidden.  It
         allows, for example, to use C-c C-x C-b on a collapsed tree and
         still get the update.
 
@@ -2975,19 +3011,19 @@
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
         * org-inlinetask.el (org-inlinetask-promote)
-        (org-inlinetask-demote): new functions.
+        (org-inlinetask-demote): New functions.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-demote-subtree,org-promote-subtree): wrap
-        org-map-tree into org-with-limited-levels macro, so it avoids
+        * org.el (org-demote-subtree,org-promote-subtree): Wrap
+        `org-map-tree' into `org-with-limited-levels' macro, so it avoids
         operating on inline tasks.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
         * org.el (org-narrow-to-subtree): ensure `org-back-to-heading'
         will move point to a real heading and not an inline task by
-        wraping function into a org-with-limited-levels macro.
+        wraping function into a `org-with-limited-levels' macro.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
@@ -3212,17 +3248,17 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-exp.el (org-export-mark-list-end): change end marker
+        * org-exp.el (org-export-mark-list-end): Change end marker.
 
-        * org-docbook.el (org-export-docbook-list-line): use new marker.
+        * org-docbook.el (org-export-docbook-list-line): Use new marker.
 
-        * org-html.el (org-html-export-list-line): use new marker
+        * org-html.el (org-html-export-list-line): Use new marker.
 
-        * org-latex.el (org-export-latex-lists): use new marker
+        * org-latex.el (org-export-latex-lists): Use new marker.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-latex.el (org-export-latex-lists): make sure markers used
+        * org-latex.el (org-export-latex-lists): Make sure markers used
         for export are taken into account by temporarily setting an
         appropriate value for `org-list-ending-method'.
 
@@ -3271,14 +3307,14 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-open-at-point): if a link to a radio target is the
+        * org.el (org-open-at-point): If a link to a radio target is the
         first, (resp. the last), element of a buffer, function cannot find
         the property change required to get its boundaries, and
         `buffer-substring' is called with an invalid nil argument.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-table.el (org-table-copy-down): fix docstring.
+        * org-table.el (org-table-copy-down): Fix docstring.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -3305,19 +3341,19 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-insert-item): when computing size of item
+        * org-list.el (org-list-insert-item): When computing size of item
         being inserted, function has to take into account that indentation
         may not only be made of spaces.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-clock.el (org-clock-find-position): if a list was adjacent
+        * org-clock.el (org-clock-find-position): If a list was adjacent
         to some clocks and a drawer was going to be created, only the
         first element of the list would make it into the drawer.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-toggle-checkbox): fix bug where top item in
+        * org-list.el (org-toggle-checkbox): Fix bug where top item in
         list was omitted when checking boxes.
 
 2011-07-28  Dan Davison  <dandavison7@gmail.com>
@@ -3354,8 +3390,8 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list (org-cycle-item-indentation): do not break an
-        indentation cycle because visibility cycling is requested. This
+        * org-list.el (org-cycle-item-indentation): Do not break an
+        indentation cycle because visibility cycling is requested.  This
         happens when an item becomes a parent, due to indentation change.
         Not considered empty anymore, the function cannot change its
         indentation again.
@@ -3379,11 +3415,11 @@
         (org-babel-insert-result): Writing code block results to lists has
         been updated to reflect the new list structure.
         (org-babel-result-end): Remove a previous change to end-of-list
-        marker detection
+        marker detection.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-cycle-item-indentation): each time the function
+        * org-list.el (org-cycle-item-indentation): Each time the function
         moves item back to child position, a white space is added to the
         line.
 
@@ -3399,9 +3435,9 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-ctrl-c-ctrl-c): call `org-list-send-list' only when
+        * org.el (org-ctrl-c-ctrl-c): Call `org-list-send-list' only when
         cursor it at very first item of the list, as specified in the
-        manual. Also refactored the list part of the function a bit.
+        manual.  Also refactored the list part of the function a bit.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
@@ -3419,606 +3455,609 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-toggle-checkbox, org-update-checkbox-count): no
-        need to wrap org-entry-get in ignore-errors since commit
-        7dd425cc5d42fb297f547f713edfdc936f9271f0
+        * org-list.el (org-toggle-checkbox, org-update-checkbox-count): No
+        need to wrap `org-entry-get' in `ignore-errors'.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-toggle-item, org-toggle-heading): make sure every
+        * org.el (org-toggle-item, org-toggle-heading): Make sure every
         sub-item in a list is changed into a sub-heading and sub-headings
-        are translated into sub-items. Also ignore inline tasks in the
+        are translated into sub-items.  Also ignore inline tasks in the
         process.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-exp.el (org-export-select-backend-specific-text): add
+        * org-exp.el (org-export-select-backend-specific-text): Add
         `original-indentation' property when replacing #+begin_backend and
-        #+backend blocks with their content. This is needed for lists, as
+        #+backend blocks with their content.  This is needed for lists, as
         they must know if the block belonged to them.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-html.el (org-html-export-list-line): insert a newline
+        * org-html.el (org-html-export-list-line): Insert a newline
         character before ending an item, as anchor could be on a line
         going to be deleted, like a drawer ending string.
 
-        * org-list.el (org-list-to-html): same.
+        * org-list.el (org-list-to-html): Same.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-set-autofill-regexps): use `org-item-re' in
+        * org.el (org-set-autofill-regexps): Use `org-item-re' in
         `paragraph-start' to recognize alphabetical lists.
-        (org-fill-paragraph): enforce a pre-computed fill-prefix before
-        calling fill-paragraph when point in in an item. Also prevent
+        (org-fill-paragraph): Enforce a pre-computed fill-prefix before
+        calling `fill-paragraph' when point in in an item.  Also prevent
         paragraphs getting merged into an adjacent list upon filling.
-        (org-adaptive-fill-function): make sure to determine real fill-prefix
-        for auto-fill.
-        (org-auto-fill-function): use a pre-computed fill-prefix before
-        calling do-auto-fill.
+        (org-adaptive-fill-function): Make sure to determine real
+        fill-prefix for auto-fill.
+        (org-auto-fill-function): Use a pre-computed fill-prefix before
+        calling `do-auto-fill'.
 
-        * org-list.el (org-list-item-body-column): new function
+        * org-list.el (org-list-item-body-column): New function.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
         * org-inlinetask.el (org-inlinetask-at-task-p)
-        (org-inlinetask-toggle-visibility): new functions.
+        (org-inlinetask-toggle-visibility): New functions.
 
-        * org-list.el (org-list-set-item-visibility): new function.
+        * org-list.el (org-list-set-item-visibility): New function.
 
-        * org.el (org-cycle, org-cycle-internal-local): separate lists and
+        * org.el (org-cycle, org-cycle-internal-local): Separate lists and
         inline tasks from headlines.
-        (org-outline-level): do not consider lists as headlines.
-        Cycling visibility is using different tools.
+        (org-outline-level): Do not consider lists as headlines.  Cycling
+        visibility is using different tools.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-struct): mark items less indented than top
+        * org-list.el (org-list-struct): Mark items less indented than top
         item of the list, so that they will be modified.
-        (org-list-struct-apply-struct): compare struct's indentation with
-        line's indentation instead of old-struct's. This is needed because
-        `org-list-struct' automatically fixes indentation so changes might not
-        be seen otherwise.
+        (org-list-struct-apply-struct): Compare struct's indentation with
+        line's indentation instead of old-struct's.  This is needed
+        because `org-list-struct' automatically fixes indentation so
+        changes might not be seen otherwise.
 
-        * org.el (org-ctrl-c-ctrl-c): small refactoring.
+        * org.el (org-ctrl-c-ctrl-c): Small refactoring.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-update-checkbox-count): when a part of the
+        * org-list.el (org-update-checkbox-count): When a part of the
         buffer is processed to count checkboxes, lists are read from top
         to bottom, but inside lists (in drawers, blocks, or inline tasks)
-        are skipped. Thus, cookies cannot be updated. This patch enforces
-        reading of such lists if counter is itself in a special context.
+        are skipped.  Thus, cookies cannot be updated.  This patch
+        enforces reading of such lists if counter is itself in a special
+        context.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-struct-apply-struct): inline tasks along
+        * org-list.el (org-list-struct-apply-struct): Inline tasks along
         with their content must stay at column 0 even if the item is
-        gaining indentation. Moreover, fix indentation of text in an
+        gaining indentation.  Moreover, fix indentation of text in an
         inline task, now it can be in such a task within a list.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-at-item-p): also verify context is valid.
-        Otherwise it would recognize valid items where org-in-item-p
+        * org-list.el (org-at-item-p): Also verify context is valid.
+        Otherwise it would recognize valid items where `org-in-item-p'
         wouldn't.
-        (org-in-item-p, org-list-struct-apply-struct): use shorter version of
-        org-at-item-p.
-        (org-cycle-list-bullet): fix typo.
-        (org-list-parse-list): avoid calling org-at-item-p two times by using
-        an appropriate regexp
+        (org-in-item-p, org-list-struct-apply-struct): Use shorter version
+        of org-at-item-p.
+        (org-cycle-list-bullet): Fix typo.
+        (org-list-parse-list): Avoid calling `org-at-item-p' two times by
+        using an appropriate regexp.
 
-        * org.el (org-indent-line-function): use an appropriate regexp
-        instead of calling org-at-item-p two times.
+        * org.el (org-indent-line-function): Use an appropriate regexp
+        instead of calling `org-at-item-p' two times.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
         * org-list.el (org-in-item-p): When point was just after
-        org-list-end-re, check wouldn't be done for starting line. So, if
+        org-list-end-re, check wouldn't be done for starting line.  So, if
         the first line was an item, it wouln't be noticed and function
-        would return nil. Simplify and comment code.
+        would return nil.  Simplify and comment code.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-toggle-item): when used on normal text, ensure every
+        * org.el (org-toggle-item): When used on normal text, ensure every
         line in region is included in the new item, regardless of its
         original indentation.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-struct-apply-struct): if end of list was
+        * org-list.el (org-list-struct-apply-struct): If end of list was
         at eol, for example, with list inside a block, the last list
-        wouldn't be shifted. Thus, the patch ensures no blank lines is
+        wouldn't be shifted.  Thus, the patch ensures no blank lines is
         skipped.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
         * org.el (org-toggle-item): Now accepts a prefix argument. When
         used without argument on normal text, it will make the whole
-        region one item. With an argument, it defaults to old behavior:
+        region one item.  With an argument, it defaults to old behavior:
         change each line in region into an item.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-return): when called from inside an item with the
-        indent flag, function should keep text moved inside the item. This
-        allows to use C-j to separate lines in an item: cursor won't go
-        back to column 0.
+        * org.el (org-return): When called from inside an item with the
+        indent flag, function should keep text moved inside the item.
+        This allows to use C-j to separate lines in an item: cursor won't
+        go back to column 0.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
         * org-list.el (org-list-struct): when a line has org-example
-        property, skip the entire block. This is needed during export, for
-        example when src blocks in org markup contain lists, and are
+        property, skip the entire block.  This is needed during export,
+        for example when src blocks in org markup contain lists, and are
         returned verbatim because org isn't in the list of interpreted
         languages.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-in-item-p): handle special cases when function
+        * org-list.el (org-in-item-p): Handle special cases when function
         is called with cursor amidst `org-list-end-re' or at an inline
         task.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * ob.el (org-babel-result-end): apply renaming.
+        * ob.el (org-babel-result-end): Apply renaming.
 
-        * org-exp.el (org-export-mark-list-properties): apply renaming.
+        * org-exp.el (org-export-mark-list-properties): Apply renaming.
 
-        * org-list.el (org-list-prevs-alist): renamed from
-        org-list-struct-prev-alist.
-        (org-list-parents-alist): renamed from org-list-struct-parent-alist.
-        (org-list-write-struct): renamed from org-list-struct-fix-struct.
-        (org-list-parse-list, org-sort-list, org-list-indent-item-generic,
-        org-toggle-checkbox, org-update-checkbox-count, org-cycle-list-bullet,
-        org-list-repair, org-insert-item, org-move-item-up, org-move-item-up,
-        org-move-item-down, org-next-item, org-previous-item,
-        org-end-of-item-list, org-beginning-of-item-list, org-apply-on-list):
-        apply renaming.
-        (org-get-bullet): removed function, as it is not needed anymore.
+        * org-list.el (org-list-prevs-alist): Renamed from
+        `org-list-struct-prev-alist'.
+        (org-list-parents-alist): Renamed from `org-list-struct-parent-alist'.
+        (org-list-write-struct): Renamed from `org-list-struct-fix-struct'.
+        (org-list-parse-list, org-sort-list, org-list-indent-item-generic)
+        (org-toggle-checkbox, org-update-checkbox-count)
+        (org-cycle-list-bullet, org-list-repair, org-insert-item)
+        (org-move-item-up, org-move-item-up, org-move-item-down)
+        (org-next-item, org-previous-item, org-end-of-item-list)
+        (org-beginning-of-item-list, org-apply-on-list): Apply renaming.
+        (org-get-bullet): Removed function, as it is not needed anymore.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-insert-item-generic): change arguments.
-        The function now accepts structure and previous items alist. This
-        allow to insert an item programmatically more easily.
-        (org-insert-item): Apply changes to org-list-insert-item-generic. The
-        function now takes care about repairing structure and updating
-        checkboxes.
+        * org-list.el (org-list-insert-item-generic): Change arguments.
+        The function now accepts structure and previous items alist.  This
+        allows to insert an item programmatically more easily.
+        (org-insert-item): Apply changes to
+        `org-list-insert-item-generic'.  The function now takes care about
+        repairing structure and updating checkboxes.
 
         * org-timer.el (org-timer-item): Apply changes to
-        org-list-insert-item-generic. The function now takes care about
+        `org-list-insert-item-generic'.  The function now takes care about
         repairing structure.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-make-subtree): function now uses
-        org-list-parse-list mechanism.
-        (org-list-make-subtrees): removed function.
-        (org-list-to-generic): added a parameter and every parameter can be a
-        sexp returning a string, for finer control.
-        (org-list-to-html, org-list-to-latex, org-list-to-texinfo): slight
-        modifications to apply changes to org-list-to-generic.
-        (org-list-to-subtree): new function.
+        * org-list.el (org-list-make-subtree): Function now uses
+        `org-list-parse-list mechanism'.
+        (org-list-make-subtrees): Removed function.
+        (org-list-to-generic): Added a parameter and every parameter can
+        be a sexp returning a string, for finer control.
+        (org-list-to-html, org-list-to-latex, org-list-to-texinfo): Slight
+        modifications to apply changes to `org-list-to-generic'.
+        (org-list-to-subtree): New function.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-beginning-of-line): apply changes to
+        * org.el (org-beginning-of-line): Apply changes to
         `org-item-beginning-re' to correct sub-expression reference.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-docbook.el (org-export-docbook-list-line): even with
+        * org-docbook.el (org-export-docbook-list-line): Even with
         alphabetical lists, Org shouldn't enforce a particular list type
-        to exporters. This is a job for style files.
+        to exporters.  This is a job for style files.
 
-        * org-html.el (org-html-export-list-line): ib idem.
+        * org-html.el (org-html-export-list-line): Ib idem.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-at-item-counter-p): new function.
-        (org-list-parse-list): handle counters and list depth.
-        (org-list-to-generic): a special string is used when an item has a
+        * org-list.el (org-at-item-counter-p): New function.
+        (org-list-parse-list): Handle counters and list depth.
+        (org-list-to-generic): A special string is used when an item has a
         counter.
-        (org-list-to-latex): use new special string for counters. This fixes
-        the counter bug in LaTeX export, as the enumi counter was the only one
-        modified.
+        (org-list-to-latex): Use new special string for counters.  This
+        fixes the counter bug in LaTeX export, as the enumi counter was
+        the only one modified.
 
-        * org-latex.el (org-export-latex-lists): use new
+        * org-latex.el (org-export-latex-lists): Use new
         `org-list-parse-list' output.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-get-list-type): new function.
-        (org-list-parse-list): use new function.
+        * org-list.el (org-list-get-list-type): New function.
+        (org-list-parse-list): Use new function.
 
-        * org-html.el (org-html-export-list-line): use new function.
+        * org-html.el (org-html-export-list-line): Use new function.
 
-        * org-docbook.el (org-export-docbook-list-line): use new function.
+        * org-docbook.el (org-export-docbook-list-line): Use new function.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-alphabetical-lists): new variable
-        (org-item-re, org-list-full-item, org-cycle-list-bullet,
-        org-list-struct-fix-bul, org-list-inc-bullet-maybe): reflect
+        * org-list.el (org-alphabetical-lists): New variable
+        (org-item-re, org-list-full-item, org-cycle-list-bullet)
+        (org-list-struct-fix-bul, org-list-inc-bullet-maybe): Reflect
         introduction of the new variable.
-        (org-item-beginning-re): changed into a function, so any modification
-        of `org-alphabetical-lists' will not require reloading Org.
-        (org-at-item-p, org-toggle-checkbox, org-update-checkbox-count,
-        org-list-parse-list, org-list-send-list): reflect changes to
+        (org-item-beginning-re): Changed into a function, so any
+        modification of `org-alphabetical-lists' will not require
+        reloading Org.
+        (org-at-item-p, org-toggle-checkbox, org-update-checkbox-count)
+        (org-list-parse-list, org-list-send-list): Reflect changes to
         `org-item-beginning-re'.
-        (org-list-use-alpha-bul-p): new function.
+        (org-list-use-alpha-bul-p): New function.
 
-        * org.el (org-check-for-hidden): reflect changes to
+        * org.el (org-check-for-hidden): Reflect changes to
         `org-item-beginning-re'.
 
-        * org-capture.el (org-capture-place-item): reflect changes to
+        * org-capture.el (org-capture-place-item): Reflect changes to
         `org-item-beginning-re'.
 
-        * org-docbook.el (org-export-docbook-list-line): handle new type
+        * org-docbook.el (org-export-docbook-list-line): handle New type
         of items.
 
         * org-exp.el (org-export-mark-list-end)
-        (org-export-mark-list-properties): reflect changes to
+        (org-export-mark-list-properties): Reflect changes to
         `org-item-beginning-re'.
 
-        * org-html.el (org-html-export-list-line): handle new type of
+        * org-html.el (org-html-export-list-line): Handle new type of
         items.
 
-        * org-latex.el (org-export-latex-lists): handle new type of items
+        * org-latex.el (org-export-latex-lists): Handle new type of items
         and reflect changes to `org-item-beginning-re'.
 
-        * org-ascii.el (org-export-ascii-preprocess): handle new counters.
+        * org-ascii.el (org-export-ascii-preprocess): Handle new counters.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-end-re): removed function and made it a
-        variable. There's no need for the overhead of calling the function
-        every at every line in a list. User will have to reload Org if he
-        change value of either `org-list-end-regexp' or
+        * org-list.el (org-list-end-re): Removed function and made it a
+        variable.  There's no need for the overhead of calling the
+        function every at every line in a list.  User will have to reload
+        Org if he change value of either `org-list-end-regexp' or
         `org-empty-line-terminates-plain-lists'.
-        (org-in-item-p,org-list-struct,org-list-parse-list): apply change.
+        (org-in-item-p,org-list-struct,org-list-parse-list): Apply change.
 
         * org-exp.el (org-export-mark-list-end)
-        (org-export-mark-list-properties): apply change
+        (org-export-mark-list-properties): Apply change
 
-        * org-latex.el (org-export-latex-lists): apply change. Also
+        * org-latex.el (org-export-latex-lists): Apply change.  Also
         prevent items with org-example property to be considered as real
         items.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-inlinetask.el (org-inlinetask-export-templates): slightly
+        * org-inlinetask.el (org-inlinetask-export-templates): Slightly
         modify templates so environment boundaries don't interfere with
-        content of task. Unprotect content of task so it might benefit
+        content of task.  Unprotect content of task so it might benefit
         from further transformations. Set original-indentation property to
         a high value to ensure that task is always in the last item of the
         list.  Also, apply templates later in export process.
 
-        * org-list.el (org-list-struct): fix inline task skipping.
+        * org-list.el (org-list-struct): Fix inline task skipping.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
         * org-latex.el (org-export-latex-lists): Search for unprotected
-        items only, and redefine `org-at-item'. This change is required
+        items only, and redefine `org-at-item'.  This change is required
         when verbatim lists are inserted during export, usually by Babel.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * ob.el (org-babel-result-end): end position is end of current
+        * ob.el (org-babel-result-end): End position is end of current
         sublist instead of bottom point, as results might be inserted in a
         list themselves.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-automatic-rules): removed insert rule.
-        (org-list-insert-item-generic): removed code preventing user to insert
-        another item in a block within a list. It is because new list context
-        make it impossible to see if a point in a block is also in a list.
+        * org-list.el (org-list-automatic-rules): Removed insert rule.
+        (org-list-insert-item-generic): Removed code preventing user to
+        insert another item in a block within a list.  It is because new
+        list context make it impossible to see if a point in a block is
+        also in a list.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-exp.el (org-export-preprocess-string): mark list endings
+        * org-exp.el (org-export-preprocess-string): Mark list endings
         before babel blocks preprocessing starts, so blank lines that may
-        be inserted do not break list's structure. Then, mark list with
+        be inserted do not break list's structure.  Then, mark list with
         special properties required by exporters. Thus output from babel
         can easily be included in lists.
-        (org-export-mark-list-end): new function
-        (org-export-mark-list-properties): new function
-        (org-export-mark-lists): removed function. It was split into the two
-        preceding functions.
+        (org-export-mark-list-end): New function.
+        (org-export-mark-list-properties): New function.
+        (org-export-mark-lists): Removed function.  It was split into the
+        two preceding functions.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-update-checkbox-count): do not recompute every
+        * org-list.el (org-update-checkbox-count): Do not recompute every
         list before next heading when there are more than one cookie in an
-        headline. Moreover, ignore the case where cookie is inserted
+        headline.  Moreover, ignore the case where cookie is inserted
         neither at an heading nor at an item.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-sort-list): fix number of arguments to
-        `org-list-repair', plus make end-record go to end of item before
+        * org-list.el (org-sort-list): Fix number of arguments to
+        `org-list-repair', plus make `end-record' go to end of item before
         any blank line to keep them from being swallowed in the sorting.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-forbidden-blocks): variable renamed from
-        org-list-blocks.
-        (org-list-export-context): new variable
+        * org-list.el (org-list-forbidden-blocks): Renamed from
+        `org-list-blocks'.
+        (org-list-export-context): New variable.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-search-generic): renamed form
-        org-search-unenclosed-generic to reflect now behavior. Now, match
-        can only be in a valid context for lists, as determined by
+        * org-list.el (org-list-search-generic): Renamed form
+        `org-search-unenclosed-generic' to reflect the new behavior.  Now,
+        match can only be in a valid context for lists, as determined by
         `org-list-context'.
-        (org-list-search-backward): renamed from
-        org-search-backward-unenclosed.
-        (org-list-search-forward): renamed from org-search-forward-unenclosed.
-        (org-toggle-checkbox,org-update-checkbox-count): use new functions.
-        (org-sort-list): using default regexp search functions as context is
-        not required in this case.
+        (org-list-search-backward): Renamed from
+        `org-search-backward-unenclosed'.
+        (org-list-search-forward): Renamed from
+        `org-search-forward-unenclosed'.
+        (org-toggle-checkbox,org-update-checkbox-count): Use new
+        functions.
+        (org-sort-list): Using default regexp search functions as context
+        is not required in this case.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-exp.el (org-export-mark-lists): new function, replacing
-        org-export-mark-list-ending. It adds information as text
+        * org-exp.el (org-export-mark-lists): New function, replacing
+        org-export-mark-list-ending.  It adds information as text
         properties to every list, before changes done by exporter destruct
         them.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-get-first-item): new alias for
-        org-list-get-list-begin
-        (org-list-get-last-item): new function
-        (org-list-get-list-end): use org-list-get-last-item
+        * org-list.el (org-list-get-first-item): New alias for
+        `org-list-get-list-begin'.
+        (org-list-get-last-item): New function.
+        (org-list-get-list-end): Use `org-list-get-last-item'.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-get-string-indentation): moved in generally useful
+        * org.el (org-get-string-indentation): Moved in generally useful
         functions section, as it wasn't specific to plain lists and that
         no code was using it in org-list.el.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-skip-over-state-notes,org-store-log-note): use new
+        * org.el (org-skip-over-state-notes,org-store-log-note): Use new
         accessors.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-indent-item-generic): remove error
-        messages happening before process. This belongs to interactive
+        * org-list.el (org-list-indent-item-generic): Remove error
+        messages happening before process.  This belongs to interactive
         functions.
         (org-indent-item,org-indent-item-tree)
-        (org-outdent-item,org-outdent-item-tree): ensure point or region
-        is correct before computing list structure. Return an error
+        (org-outdent-item,org-outdent-item-tree): Ensure point or region
+        is correct before computing list structure.  Return an error
         message otherwise.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-apply-on-list): use new structures. Function is
-        now applied in reverse order so modifications do not change
+        * org-list.el (org-apply-on-list): Use new structures.  Function
+        is now applied in reverse order so modifications do not change
         positions of items in buffer.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-parse-list): rewrite of function to allow
-        text following a sub-list in the same item. See docstring for an
+        * org-list.el (org-list-parse-list): Rewrite of function to allow
+        text following a sub-list in the same item.  See docstring for an
         example of output.
-        (org-list-to-generic): use new parsing function.
-        (org-list-to-latex,org-list-to-html): minor change for clearer
+        (org-list-to-generic): Use new parsing function.
+        (org-list-to-latex,org-list-to-html): Minor change for clearer
         export.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-has-child-p): renamed from
-        org-list-get-child.  Returning first child is only useful as a
-        predicate, as we're allowing an item to have more than one
+        * org-list.el (org-list-has-child-p): Renamed from
+        `org-list-get-child'.  Returning first child is only useful as a
+        predicate, as we are allowing an item to have more than one
         sub-list.
-        (org-list-indent-item-generic): use `org-list-has-child-p' instead of
-        org-list-get-child.
-        (org-in-item-p): also return item beginning when list starts at
+        (org-list-indent-item-generic): Use `org-list-has-child-p' instead
+        of org-list-get-child.
+        (org-in-item-p): Also return item beginning when list starts at
         context beginning.
-        (org-list-get-parent): use of `org-list-struct-parent-alist' helper
-        function is not optional anymore.
-        (org-list-get-all-items): shorten code with the help of cl.el.
-        (org-list-get-children): now returns all children of item, even if
+        (org-list-get-parent): Use of `org-list-struct-parent-alist'
+        helper function is not optional anymore.
+        (org-list-get-all-items): Shorten code with the help of cl.el.
+        (org-list-get-children): Now returns all children of item, even if
         they do not belong to the same list. Renamed from
-        org-list-get-all-children.
-        (org-list-get-list-begin): function wasn't return value when item was
-        already the first item of the list at point.
-        (org-list-get-list-end): function wasn't return value when item was
-        already the last item of the list at point.
-        (org-list-struct-fix-box,org-update-checkbox-count): now uses
+        `org-list-get-all-children'.
+        (org-list-get-list-begin): Function wasn't return value when item
+        was already the first item of the list at point.
+        (org-list-get-list-end): Function wasn't return value when item
+        was already the last item of the list at point.
+        (org-list-struct-fix-box,org-update-checkbox-count): Now uses
         `org-list-get-children'.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
         * org.el (org-indent-line-function): Indentation of item's body
-        starts just after the bullet, not after a checkbox. Moreover, As
+        starts just after the bullet, not after a checkbox.  Moreover, As
         `org-in-item-p' also returns item beginning position when point is
         in a list, do not compute it a second time.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-ctrl-c-ctrl-c): when called at a list item, replace
+        * org.el (org-ctrl-c-ctrl-c): When called at a list item, replace
         usage `org-repair-list', forcing another reading of the list, with
         only needed subroutines.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-separating-blank-lines-number): use new
+        * org-list.el (org-list-separating-blank-lines-number): Use new
         accessors.
-        (org-list-insert-item-generic): use list structures to insert a new
-        item.
-        (org-list-exchange-items): refactor and comment code. Now return new
-        struct instead of modifying it, as list sorting would sometimes eat
-        first item.
-        (org-move-item-down,org-move-item-up): reflect changes to
+        (org-list-insert-item-generic): Use list structures to insert a
+        new item.
+        (org-list-exchange-items): Refactor and comment code.  Now return
+        new struct instead of modifying it, as list sorting would
+        sometimes eat first item.
+        (org-move-item-down,org-move-item-up): Reflect changes to
         `org-list-exchange-items'.
-        (org-insert-item): as `org-in-item-p' also computes item beginning
+        (org-insert-item): As `org-in-item-p' also computes item beginning
         when applicable, reuse the result.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-in-item-p): unify methods for this
+        * org-list.el (org-list-in-item-p): Unify methods for this
         predicate.
-        (org-list-in-item-p-with-indent): removed function
-        (org-list-ending-between): removed function
-        (org-list-maybe-skip-block): removed function
-        (org-list-in-item-p-with-regexp): removed function
-        (org-list-top-point-with-regexp): removed function
-        (org-list-top-point-with-indent): removed function
-        (org-list-bottom-point-with-indent): removed function
-        (org-list-bottom-point-with-regexp): removed function
-        (org-list-get-item-same-level): removed function
-        (org-list-top-point): removed function
-        (org-list-bottom-point): removed function
-        (org-get-item-beginning): renamed to org-list-get-item-begin to be
-        consistent with naming policy of non-interactive functions.
-        (org-get-beginning-of-list): removed function
-        (org-beginning-of-item-list): use new accessors
-        (org-get-end-of-list): removed function
-        (org-end-of-list): use new accessors
-        (org-get-end-of-item): removed function
-        (org-end-of-item): use new accessors
-        (org-get-previous-item): removed function
-        (org-previous-item): use new accessors
-        (org-get-next-item): removed function
-        (org-next-item): use new accessors
-        (org-end-of-item-before-blank): renamed to
+        (org-list-in-item-p-with-indent): Removed function.
+        (org-list-ending-between): Removed function.
+        (org-list-maybe-skip-block): Removed function.
+        (org-list-in-item-p-with-regexp): Removed function.
+        (org-list-top-point-with-regexp): Removed function.
+        (org-list-top-point-with-indent): Removed function.
+        (org-list-bottom-point-with-indent): Removed function.
+        (org-list-bottom-point-with-regexp): Removed function.
+        (org-list-get-item-same-level): Removed function.
+        (org-list-top-point): Removed function.
+        (org-list-bottom-point): Removed function.
+        (org-get-item-beginning): Renamed to `org-list-get-item-begin' to
+        be consistent with naming policy of non-interactive functions.
+        (org-get-beginning-of-list): Removed function.
+        (org-beginning-of-item-list): Use new accessors.
+        (org-get-end-of-list): Removed function.
+        (org-end-of-list): Use new accessors.
+        (org-get-end-of-item): Removed function.
+        (org-end-of-item): Use new accessors.
+        (org-get-previous-item): Removed function.
+        (org-previous-item): Use new accessors.
+        (org-get-next-item): Removed function.
+        (org-next-item): Use new accessors.
         (org-list-get-item-end-before-blank): Use new accessors.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-repair): removed optional argument
-        FORCE-BULLET. The job of this interactive function is to
-        completely fix a list at point. Changing bullets is a separate
-        task. Also removed others optional arguments TOP and BOTTOM to
+        * org-list.el (org-list-repair): Removed optional argument
+        FORCE-BULLET.  The job of this interactive function is to
+        completely fix a list at point.  Changing bullets is a separate
+        task.  Also removed others optional arguments TOP and BOTTOM to
         follow the new structures.
-        (org-list-indent-item-generic): remove need for TOP and BOTTOM. STRUCT
-        is a new required argument. This avoids computing a list structure
-        many times when function is called more than once in a row, for
-        example in org-cycle-item-indentation. Use new accessors. Now, also
-        call `org-update-checkbox-count-maybe'.
-        (org-outdent-item,org-indent-item,org-outdent-item-tree,org-indent-item-tree):
-        remove need for TOP and BOTTOM.
-        (org-list-insert-item-generic): reflect changes to `org-list-repair'.
-        (org-list-exchange-items): use new accessors. Now modify struct to
-        avoid re-reading it later.
-        (org-move-item-down): reflect changes to `org-list-repair'. Use new
-        accessors.
-        (org-move-item-up): reflect changes to `org-list-repair'. Use new
+        (org-list-indent-item-generic): Remove need for TOP and BOTTOM.
+        STRUCT is a new required argument.  This avoids computing a list
+        structure many times when function is called more than once in a
+        row, for example in `org-cycle-item-indentation'.  Use new
+        accessors.  Now, also call `org-update-checkbox-count-maybe'.
+        (org-outdent-item, org-indent-item, org-outdent-item-tree)
+        (org-indent-item-tree): Remove need for TOP and BOTTOM.
+        (org-list-insert-item-generic): Reflect changes to `org-list-repair'.
+        (org-list-exchange-items): Use new accessors.  Now modify struct
+        to avoid re-reading it later.
+        (org-move-item-down): Reflect changes to `org-list-repair'.  Use
+        new accessors.
+        (org-move-item-up): Reflect changes to `org-list-repair'.  Use new
         accessors.
-        (org-cycle-list-bullet): use new structures. Also use a shortcut to
-        `org-list-struct-fix-struct' in order to avoid unnecessary fixes, like
-        `org-list-struct-fix-box'
-        (org-sort-list): use of new structures. Renamed an internal function
-        for a little more clarity.
-        (org-cycle-item-indentation): remove dependency on org-list-repair.
-        Use new accessors.
-        (org-list-get-child): correct bug when asking for the child of the
-        last item
-        (org-list-exchange-items): use new accessors.
+        (org-cycle-list-bullet): Use new structures.  Also use a shortcut
+        to `org-list-struct-fix-struct' in order to avoid unnecessary
+        fixes, like `org-list-struct-fix-box'
+        (org-sort-list): Use of new structures.  Renamed an internal
+        function for a little more clarity.
+        (org-cycle-item-indentation): Remove dependency on
+        `org-list-repair'.  Use new accessors.
+        (org-list-get-child): Correct bug when asking for the child of the
+        last item.
+        (org-list-exchange-items): Use new accessors.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-blocks): new variable
-        (org-list-context): new function
-        (org-list-full-item-re): new variable
-        (org-list-struct-assoc-at-point): use new varible
-        (org-list-struct): rewrite of function. Now, list data is collected by
-        looking at the list line after line. It reads the whole list each time
-        because reading only a subtree was not enough for some operations,
-        like fixing checkboxes. It also removes the need to get
-        `org-list-top-point' and `org-list-bottom-point' first. An added data
-        is the position of item ending. This aims to be able to have list
-        followed by text inside an item.
-        (org-list-struct-assoc-end): new function
-        (org-list-struct-parent-alist): new function
-        (org-list-get-parent): new function
-        (org-list-get-child): new function
-        (org-list-get-next-item): new function
-        (org-list-get-prev-item): new function
-        (org-list-get-subtree): use helper function `org-list-struct-prev-alist'.
-        (org-list-get-all-items): new function
-        (org-list-get-all-children): new function
-        (org-list-get-top-point): new function
-        (org-list-get-bottom-point): new function
-        (org-list-get-counter): new function
-        (org-list-get-item-end): new function
-        (org-list-struct-fix-bul): rewrite for cleaner code. Make use of new
-        accessors.
-        (org-list-struct-fix-ind): make use of new accessors.
-        (org-list-struct-fix-box): new function
-        (org-list-struct-fix-checkboxes): removed function
-        (org-list-struct-outdent): use new accessors. Use the fact that there
-        is no longer a virtual item at beginning of structure.
-        (org-list-struct-indent): use helper functions
-        `org-list-struct-prev-alist' and `org-list-struct-parent-alist'. Also
-        use new accessors.
-        (org-list-struct-fix-struct): comment function. Call directly
+        * org-list.el (org-list-blocks): New variable.
+        (org-list-context): New function.
+        (org-list-full-item-re): New variable.
+        (org-list-struct-assoc-at-point): Use new varible.
+        (org-list-struct): Rewrite of function.  Now, list data is
+        collected by looking at the list line after line.  It reads the
+        whole list each time because reading only a subtree was not enough
+        for some operations, like fixing checkboxes.  It also removes the
+        need to get `org-list-top-point' and `org-list-bottom-point'
+        first.  An added data is the position of item ending.  This aims
+        to be able to have list followed by text inside an item.
+        (org-list-struct-assoc-end): New function.
+        (org-list-struct-parent-alist): New function.
+        (org-list-get-parent): New function.
+        (org-list-get-child): New function.
+        (org-list-get-next-item): New function.
+        (org-list-get-prev-item): New function.
+        (org-list-get-subtree): Use helper function `org-list-struct-prev-alist'.
+        (org-list-get-all-items): New function.
+        (org-list-get-all-children): New function.
+        (org-list-get-top-point): New function.
+        (org-list-get-bottom-point): New function.
+        (org-list-get-counter): New function.
+        (org-list-get-item-end): New function.
+        (org-list-struct-fix-bul): Rewrite for cleaner code.  Make use of
+        new accessors.
+        (org-list-struct-fix-ind): Make use of new accessors.
+        (org-list-struct-fix-box): New function.
+        (org-list-struct-fix-checkboxes): Removed function.
+        (org-list-struct-outdent): Use new accessors.  Use the fact that
+        there is no longer a virtual item at beginning of structure.
+        (org-list-struct-indent): Use helper functions
+        `org-list-struct-prev-alist' and `org-list-struct-parent-alist'.
+        Also use new accessors.
+        (org-list-struct-fix-struct): Comment function.  Call directly
         `org-list-struct-apply-struct', without removing unchanged items
         first.
-        (org-list-struct-apply-struct): comment function. Rewrite using new
-        accessors. Use new variable `org-list-full-item-re'.
-        (org-list-shift-item-indentation): removed function, now included in
-        `org-list-struct-apply-struct' because it is too specific.
+        (org-list-struct-apply-struct): Comment function.  Rewrite using
+        new accessors.  Use new variable `org-list-full-item-re'.
+        (org-list-shift-item-indentation): Removed function, now included
+        in `org-list-struct-apply-struct' because it is too specific.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-toggle-checkbox): use structures to fix
-        checkboxes of a list
-        (org-update-checkbox-count): use structures to update cookies
+        * org-list.el (org-toggle-checkbox): Use structures to fix
+        checkboxes of a list.
+        (org-update-checkbox-count): Use structures to update cookies.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-struct-fix-checkboxes): new function
-        (org-checkbox-blocked-p): removed function
+        * org-list.el (org-list-struct-fix-checkboxes): New function.
+        (org-checkbox-blocked-p): Removed function.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-get-all-items): new function
-        (org-list-get-all-children): new function
-        (org-list-get-nth): new function
-        (org-list-set-nth): new function
-        (org-list-get-ind): new function
-        (org-list-set-ind): new function
-        (org-list-get-bullet): new function
-        (org-list-set-bullet): new function
-        (org-list-get-checkbox): new function
-        (org-list-set-checkbox): new function
-        (org-list-struct-fix-bul): use new accessors
-        (org-list-repair): use new accessors
-        (org-list-indent-item-generic): make use of accessors
-        (org-list-get-parent): renamed from org-list-struct-get-parent
-        (org-list-get-child): renamed from org-list-struct-get-child
-        (org-list-struct-fix-ind): make use of accessors
-        (org-list-get-next-item): new function
-        (org-list-get-subtree): new function
+        * org-list.el (org-list-get-all-items): New function.
+        (org-list-get-all-children): New function.
+        (org-list-get-nth): New function.
+        (org-list-set-nth): New function.
+        (org-list-get-ind): New function.
+        (org-list-set-ind): New function.
+        (org-list-get-bullet): New function.
+        (org-list-set-bullet): New function.
+        (org-list-get-checkbox): New function.
+        (org-list-set-checkbox): New function.
+        (org-list-struct-fix-bul): Use new accessors.
+        (org-list-repair): Use new accessors.
+        (org-list-indent-item-generic): Make use of accessors.
+        (org-list-get-parent): Renamed from `org-list-struct-get-parent'.
+        (org-list-get-child): Renamed from `org-list-struct-get-child'.
+        (org-list-struct-fix-ind): Make use of accessors.
+        (org-list-get-next-item): New function.
+        (org-list-get-subtree): New function.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-struct-assoc-at-point): add checkbox to
-        list structure
+        * org-list.el (org-list-struct-assoc-at-point): Add checkbox to
+        list structure.
 
-        * org-list.el (org-list-struct-assoc-at-point): add checkbox as
-        value in structure
+        * org-list.el (org-list-struct-assoc-at-point): Add checkbox as
+        value in structure.
 
-        * org-list.el (org-list-struct-apply-struct): also apply
-        checkboxes
+        * org-list.el (org-list-struct-apply-struct): Also apply
+        checkboxes.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-latex.el (org-export-latex-content): bind local variables
+        * org-latex.el (org-export-latex-content): Bind local variables
         for export in the temporary export buffer.
 
 2011-07-28  David Maus  <dmaus@ictsoc.de>
 
         * org-protocol.el (org-protocol-unhex-single-byte-sequence)
-        (org-protocol-unhex-string, org-protocol-unhex-compound): Change date
-        of obsolete declaration to 2011-02-17.
+        (org-protocol-unhex-string, org-protocol-unhex-compound): Change
+        date of obsolete declaration to 2011-02-17.
 
 2011-07-28  David Maus  <dmaus@ictsoc.de>
 
@@ -4116,10 +4155,10 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-publish.el (org-publish-cache-ctime-of-src): improve
+        * org-publish.el (org-publish-cache-ctime-of-src): Improve
         docstring.
-        (org-publish-find-title): New option to explicitly reset the
-        title in the cache.
+        (org-publish-find-title): New option to explicitly reset the title
+        in the cache.
         (org-publish-format-file-entry): Use this new option.
 
 2011-07-28  Dan Davison  <dandavison7@gmail.com>
@@ -4131,19 +4170,20 @@
 2011-07-28  Dan Davison  <dandavison7@gmail.com>
 
         * org-exp.el (org-export-format-source-code-or-example): Allow
-        empty string as second element in minted/listings options
+        empty string as second element in minted/listings options.
 
 2011-07-28  Dan Davison  <dandavison7@gmail.com>
 
         * org-exp.el (org-export-format-source-code-or-example): Support
-        new user-customizable options
-        (org-export-latex-custom-lang-environments): Ensure new variable is defined
-        (org-export-latex-listings-options): Ensure new variable is defined
-        (org-export-latex-minted-options): Ensure new variable is defined
+        new user-customizable options.
+        (org-export-latex-custom-lang-environments): Ensure new variable
+        is defined.
+        (org-export-latex-listings-options): Ensure new variable is defined.
+        (org-export-latex-minted-options): Ensure new variable is defined.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-html.el (org-export-as-html): handle the case when
+        * org-html.el (org-export-as-html): Handle the case when
         `org-export-html-validation-link' is nil to keep backward
         compatible with the old default value of this variable.
 
@@ -4152,28 +4192,22 @@
         * ob.el (org-babel-insert-result): Don't choke if indent is not a
         number.
 
-2011-07-28  Bastien Guerry  <bzg@gnu.org>
-
-        * 2011
-        ** 2011-02 monthname
-        *** 2011-02-13 dayname
-
 2011-07-28  Christian Moe  <mail@christianmoe.com>  (tiny change)
 
         * org-bbdb.el (org-bbdb-export): When a link description has been
-        added by org-export-normalize-links, use path instead (remove the
-        `bbdb:' prefix).
+        added by `org-export-normalize-links', use path instead (remove
+        the `bbdb:' prefix).
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
         * org-ascii.el (org-export-ascii-underline): Put the level's
         characters in the right order, as documented by the docstring.
-        (org-ascii-level-start): select the right char for underlining
+        (org-ascii-level-start): Select the right char for underlining
         headlines.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-src.el (org-edit-src-code): allow to edit source code from
+        * org-src.el (org-edit-src-code): Allow to edit source code from
         modes derived from Org.
 
 2011-07-28  Niels Giesen  <niels.giesen@gmail.com>
@@ -4194,8 +4228,7 @@
         Send a message when no entry is marked.
         (org-agenda-bulk-action): Fix bug about scattering deadlines.
         Send an error when trying to scatter outside an agenda or a
-        timeline view.  Silently fail when trying to scatter sexp
-        entries.
+        timeline view.  Silently fail when trying to scatter sexp entries.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
@@ -4226,11 +4259,12 @@
 
         * org-src.el (org-edit-src-code): When generating the code edit
         buffer, it is necessary for several variables to inherit their
-        values from the parent org buffer. These changes collect all such
+        values from the parent org buffer.  These changes collect all such
         variables together into a single association list of
-        (variable-name value) pairs. In addition, a new variable is added
-        to the list: `org-edit-src-content-indentation'. This has the
-        effect that a buffer local value can be used for that variable.
+        `(variable-name value)' pairs.  In addition, a new variable is
+        added to the list: `org-edit-src-content-indentation'.  This has
+        the effect that a buffer local value can be used for that
+        variable.
 
 2011-07-28  Dan Davison  <dandavison7@gmail.com>
 
@@ -4253,12 +4287,12 @@
 2011-07-28  Dan Davison  <dandavison7@gmail.com>
 
         * org.el (org-open-at-point): Fix bug when using prefix arg to
-        construct `org-link-search' call. Rename prefix arg with a more
+        construct `org-link-search' call.  Rename prefix arg with a more
         generic name, to reflect its diverse uses in this function.
 
 2011-07-28  Rémi Vanicat  <vanicat@debian.org>
 
-        * org-icalendar.el (org-icalendar-use-UTC-date-time): remove.
+        * org-icalendar.el (org-icalendar-use-UTC-date-time): Remove.
         (org-icalendar-date-time-format): New custom variable.
         (org-icalendar-use-UTC-date-timep): New function.
         (org-ical-ts-to-string): Use the new variable.
@@ -4275,25 +4309,25 @@
 
 2011-07-28  Bastien  <bastien.guerry@wikimedia.fr>
 
-        * org-capture.el (org-capture-templates): document currentfile for
-        capture template.
+        * org-capture.el (org-capture-templates): Document "currentfile"
+        for capture template.
         (org-capture-templates): Allow to use currentfile for capture
         templates.
-        (org-capture-set-target-location): Handle currentfile as a way
-        to setting the capture buffer.
+        (org-capture-set-target-location): Handle currentfile as a way to
+        setting the capture buffer.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * ob.el (org-babel-params-from-properties): don't wrap
-        org-entry-get into condition-case.
+        * ob.el (org-babel-params-from-properties): Don't wrap
+        `org-entry-get' into `condition-case'.
 
 2011-07-28  Dan Davison  <dandavison7@gmail.com>
 
         * org.el (org-entry-get): Don't look for a property drawer if we
         are before the first heading in the file.
-        (org-entry-get-with-inheritance): Don't attempt to move up the tree if
-        we are before the first heading in the file. Also, enclose less of the
-        function in the save-excursion.
+        (org-entry-get-with-inheritance): Don't attempt to move up the
+        tree if we are before the first heading in the file.  Also,
+        enclose less of the function in the `save-excursion'.
 
 2011-07-28  Dan Davison  <dandavison7@gmail.com>
 
@@ -4313,37 +4347,37 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-info.el (org-info-store-link): use "#" to separate the info
+        * org-info.el (org-info-store-link): Use "#" to separate the info
         file and the node.
-        (org-info-follow-link): use both "#" to separate the info file
-        and the node.  Continue to use ":" for backward compatibility.
+        (org-info-follow-link): Use both "#" to separate the info file and
+        the node.  Continue to use ":" for backward compatibility.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
         * org-icalendar.el (org-icalendar-honor-noexport-tag): New custom
         variable.
-        (org-print-icalendar-entries): Use this new variable to
-        prevent export of entries with a :noexport: tag.
+        (org-print-icalendar-entries): Use this new variable to prevent
+        export of entries with a :noexport: tag.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-exp.el (org-export-initial-scope): new custom variable.
+        * org-exp.el (org-export-initial-scope): New custom variable.
         (org-export): Use this new variable.  If there is an active
         region, tell it when prompting the user for an export command.
-        Also change the way the function handles selection of buffer
-        and subtree export.
+        Also change the way the function handles selection of buffer and
+        subtree export.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
         * org-html.el (org-export-html-auto-preamble)
         (org-export-html-auto-postamble): Remove.
-        (org-export-html-preamble, org-export-html-postamble): Turn
-        into custom variables.  Update the docstrings.
+        (org-export-html-preamble, org-export-html-postamble): Turn into
+        custom variables.  Update the docstrings.
         (org-export-html-preamble-format)
         (org-export-html-postamble-format): New custom variables.
-        (org-export-as-html): Use org-export-html-postamble-format and
-        org-export-html-preamble-format.
-        (org-export-html-title-format): delete.
+        (org-export-as-html): Use `org-export-html-postamble-format' and
+        `org-export-html-preamble-format'.
+        (org-export-html-title-format): Delete.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -4360,14 +4394,14 @@
 2011-07-28  Manuel Giraud  <manuel.giraud@univ-nantes.fr>
 
         * org-publish.el (org-publish-sitemap-date-format)
-        (org-publish-sitemap-file-entry-format): new custom variables.
-        (org-publish-projects): use these variables to format the sitemap
+        (org-publish-sitemap-file-entry-format): New custom variables.
+        (org-publish-projects): Use these variables to format the sitemap
         entries.
 
 2011-07-28  Ulf Stegemann  <ulf-news@zeitform.de>
 
-        * org-gnus.el (org-gnus-store-link): Allow org-link creation from
-        message-mode.
+        * org-gnus.el (org-gnus-store-link): Allow `org-link' creation
+        from `message-mode'.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -4377,21 +4411,21 @@
 
 2011-07-28  Julien Danjou  <julien@danjou.info>
 
-        * org-agenda.el (org-agenda): Kill all local variables. This
+        * org-agenda.el (org-agenda): Kill all local variables.  This
         assures we are not keeping buffer variable from an old agenda view
         when switching to a new custom agenda.
 
 2011-07-28  Julien Danjou  <julien@danjou.info>
 
         * org-crypt.el (org-encrypt-string): New function.
-        (org-encrypt-entry): Use org-encrypt-string to encrypt, so we use cached
-        crypted values.
+        (org-encrypt-entry): Use org-encrypt-string to encrypt, so we use
+        cached crypted values.
         (org-decrypt-entry): Store crypted text in decrypted text.
 
 2011-07-28  Dan Davison  <dandavison7@gmail.com>
 
         * ob-exp.el (org-babel-exp-lob-one-liners): Only replace the match
-        if a non-nil result is returned
+        if a non-nil result is returned.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -4400,7 +4434,7 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org.el (org-update-parent-todo-statistics): fix bug when
+        * org.el (org-update-parent-todo-statistics): Fix bug when
         updating statistics from the column view.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
@@ -4419,11 +4453,12 @@
 2011-07-28  Julien Danjou  <julien@danjou.info>
 
         * org-faces.el (org-special-keyword): Make it inherited from
-        font-lock-keyword-face.
+        `font-lock-keyword-face'.
 
 2011-07-28  Julien Danjou  <julien@danjou.info>
 
-        * org-faces.el (org-link): Make org-link inherits from link face.
+        * org-faces.el (org-link): Make `org-link' inherits from `link'
+        face.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
@@ -4450,10 +4485,10 @@
         * org-latex.el (org-export-latex-emph-format): Don't use
         `org-export-latex-use-verb'.  Remove this variable.
 
-2011-07-28  Jason Dunsmore  <emacs-orgmode@dunsmor.com>
+2011-07-28  Jason Dunsmore  <emacs-orgmode@dunsmor.com>  (tiny change)
 
-        * org-html.el (org-html-handle-time-stamps): fix bug when exporing
-        inactive timestamps.
+        * org-html.el (org-html-handle-time-stamps): Fix bug when
+        exporting inactive timestamps.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
@@ -4466,8 +4501,7 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-archive.el (org-archive-save-context-info): Fix docstring
-        typo.
+        * org-archive.el (org-archive-save-context-info): Fix docstring.
 
 2011-07-28  Julien Danjou  <julien@danjou.info>
 
@@ -4478,8 +4512,8 @@
 
 2011-07-28  Julien Danjou  <julien@danjou.info>
 
-        * org-agenda.el (org-agenda-list): Use org-agenda-current-span as
-        a possible default span if it is set.
+        * org-agenda.el (org-agenda-list): Use `org-agenda-current-span'
+        as a possible default span if it is set.
 
 2011-07-28  Dan Davison  <dandavison7@gmail.com>
 
@@ -4487,29 +4521,17 @@
         (org-edit-src-code): Get rid of help message in echo area.
 
         * ob.el (org-babel-do-in-edit-buffer): Do not pass 'quietly
-        argument to org-edit-src-code as this has been removed
+        argument to org-edit-src-code as this has been removed.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-latex.el (org-export-latex-emphasis-alist): use
+        * org-latex.el (org-export-latex-emphasis-alist): Use
         \protectedtexttt for the =...= emphasis and \verb for the ~...~
         emphasis.
-        (org-export-latex-use-verb): now defaults to t.
-        (org-export-latex-emph-format): distinguish between =...= and
+        (org-export-latex-use-verb): Now defaults to t.
+        (org-export-latex-emph-format): Distinguish between =...= and
         ~...~ emphasis.
 
-2011-07-28  David Maus  <dmaus@ictsoc.de>
-
-        * test-org-html.el (test-org-html/export-link-alist): New
-        variable. Abstract link export test definition.
-        (test-org-html/export-link-factory): New function. Create tests for
-        link export.
-
-2011-07-28  David Maus  <dmaus@ictsoc.de>
-
-        * org-test.el (org-test-strip-text-props): New function. Strip
-        text properties.
-
 2011-07-28  Julien Danjou  <julien@danjou.info>
 
         * org.el (org-link-expand-abbrev): Allow any type of character in
@@ -4521,12 +4543,12 @@
 
 2011-07-28  Dan Davison  <dandavison7@gmail.com>
 
-        * ob-ref.el (org-babel-ref-resolve): save-window-excursion when
+        * ob-ref.el (org-babel-ref-resolve): `save-window-excursion' when
         resolving references.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-html.el (org-export-html-html-helper-timestamp): use <hr/>
+        * org-html.el (org-export-html-html-helper-timestamp): Use <hr/>
         instead of <hr> to keep w3c validator happy.
 
 2011-07-28  Dan Davison  <dandavison7@gmail.com>
@@ -4542,8 +4564,8 @@
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
-        * ob.el (org-babel-result-end): Replace call to org-in-item-p to
-        the more specific org-at-item-p.
+        * ob.el (org-babel-result-end): Replace call to `org-in-item-p' to
+        the more specific `org-at-item-p'.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -4595,17 +4617,18 @@
 2011-07-28  Dan Davison  <dandavison7@gmail.com>
 
         * org-latex.el (org-export-as-latex): Process export property list
-        with `org-export-process-option-filters' early in latex export
+        with `org-export-process-option-filters' early in latex export.
 
 2011-07-28  Julien Danjou  <julien@danjou.info>
 
-        * org.el: Remove org-invisible-p: outline-invisible-p is available
-        in Emacs 22 and in recent XEmacs 21. Replace in various files.
+        * org.el: Remove `org-invisible-p': `outline-invisible-p' is
+        available in Emacs 22 and in recent XEmacs 21.  Replace in various
+        files.
 
 2011-07-28  Julien Danjou  <julien@danjou.info>
 
         * org-agenda.el (org-agenda-get-progress): Fix regexp for statep:
-        it must has \\ at the end of the line. This avoid matching the
+        it must has \\ at the end of the line.  This avoid matching the
         following heading when there's no newline between the logged state
         and the next heading.
 
@@ -4615,11 +4638,10 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-current-level):
-        (org-store-link):
-        (org-mark-subtree): Use `org-with-limited-levels'.
+        * org.el (org-current-level, org-store-link, org-mark-subtree):
+        Use `org-with-limited-levels'.
 
-2011-07-28  Jan Seeger  <jan.seeger@thenybble.de>
+2011-07-28  Jan Seeger  <jan.seeger@thenybble.de>  (tiny change)
 
         * org-publish.el (org-publish-get-base-files): Add sitemap file.
 
@@ -4657,7 +4679,7 @@
 2011-07-28  Julien Danjou  <julien@danjou.info>
 
         * org-agenda.el (org-agenda-get-blocks): Fix time of start/end of
-        events with range. This display things like: <2011-01-22 Sat
+        events with range.  This display things like: <2011-01-22 Sat
         14:00>--<2011-01-23 Sun 20:00> correctly, with the event starting
         at 14:00 and ending at 20:00.
 
@@ -4669,7 +4691,7 @@
 
 2011-07-28  Dan Davison  <dandavison7@gmail.com>
 
-        * ob.el (org-babel-merge-params): docstring typo.
+        * ob.el (org-babel-merge-params): Docstring typo.
 
 2011-07-28  Dan Davison  <dandavison7@gmail.com>
 
@@ -4679,11 +4701,11 @@
 2011-07-28  Dan Davison  <dandavison7@gmail.com>
 
         * ob.el (org-babel-get-src-block-info): Alter order of merge
-        arguments
+        arguments.
 
 2011-07-28  Dan Davison  <dandavison7@gmail.com>
 
-        * ob-python.el: Test whether non-nil buffer is #<killed buffer>
+        * ob-python.el: Test whether non-nil buffer is #<killed buffer>.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -4715,12 +4737,12 @@
 
         * org-exp.el (org-export-handle-include-files): Support :lines
         property.
-        (org-get-file-contents): New argument lines to include specify a range
-        of lines to include.
+        (org-get-file-contents): New argument lines to include specify a
+        range of lines to include.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org.el (org-fast-tag-selection): Fix bug when assigning keys
+        * org.el (org-fast-tag-selection): Fix bug when assigning keys.
 
 2011-07-28  Lawrence Mitchell  <wence@gmx.li>
 
@@ -4733,9 +4755,9 @@
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
-        * org-complete.el (pcomplete/org-mode/link):
-        (pcomplete/org-mode/todo):
-        (pcomplete/org-mode/prop): Copy list before uniquifying.
+        * org-complete.el (pcomplete/org-mode/link)
+        (pcomplete/org-mode/todo, pcomplete/org-mode/prop): Copy list
+        before uniquifying.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -4746,15 +4768,15 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org.el (org-refile-check-position): send a more explicit message
+        * org.el (org-refile-check-position): Send a more explicit message
         on how to clear the cache before refiling again.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org-agenda.el (org-agenda-skip-function-global): New option.
         (org-agenda-skip-eval): New function.
-        (org-agenda-skip): Use `org-agenda-skip-eval' and also check for the
-        global skipping condition.
+        (org-agenda-skip): Use `org-agenda-skip-eval' and also check for
+        the global skipping condition.
 
 2011-07-28  David Maus  <dmaus@ictsoc.de>
 
@@ -4772,10 +4794,6 @@
         * ob.el (org-babel-update-block-body): Literal argument to
         `replace-match' to allow insertion of text containing '\'.
 
-2011-07-28  Tassilo Horn  <tassilo@member.fsf.org>
-
-        * org-gnus.el (org-gnus-store-link):
-
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
         * ob-ref.el (org-babel-ref-parse): Allow passing empty strings
@@ -4795,7 +4813,7 @@
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org.el (org-sort-entries): Fix sorting with a bold emphasis at
-        bol
+        bol.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -4810,8 +4828,8 @@
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
         * ob.el (org-babel-temp-file): Ensure that
-        org-babel-temporary-directory is bound before using.
-        (org-babel-remove-temporary-directory):  Safer error throwing.
+        `org-babel-temporary-directory' is bound before using.
+        (org-babel-remove-temporary-directory): Safer error throwing.
 
 2011-07-28  niels giesen  <niels.giesen@gmail.com>
 
@@ -4838,16 +4856,12 @@
 
         * org.el (org-occur-next-match): New function.
         (org-mode): Set the variable `next-error-function'.
-        (org-highlight-new-match): Add an `org-type' property to the overlays.
+        (org-highlight-new-match): Add an `org-type' property to the
+        overlays.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
-        * ob-calc.el: No longer require `calc-trail' on XEmacs
-
-2011-07-28  Bastien Guerry  <bzg@gnu.org>
-
-        * simple.el (mail-user-agent): Default to the
-        upwardly-UI-compatible and more featureful message-mode.
+        * ob-calc.el: No longer require `calc-trail' on XEmacs.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -4855,11 +4869,10 @@
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
-        * org-special-blocks.el (htmlp):
-        (latexp):
-        (line): Add defvars for dynamically scoped variables.
+        * org-special-blocks.el (htmlp, latexp, line): Add defvars for
+        dynamically scoped variables.
 
-        * org.el (org-modules): Move org-special-blocks into the core
+        * org.el (org-modules): Move `org-special-blocks' into the core
         modules section.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
@@ -4872,10 +4885,10 @@
 
 2011-07-28  Bernt Hansen  <bernt@norang.ca>
 
-        * org-agenda.el (org-agenda-goto): Display invisible entry text
+        * org-agenda.el (org-agenda-goto): Display invisible entry text.
 
         * org-agenda.el (org-agenda-switch-to): Display invisible entry
-        text
+        text.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -4989,8 +5002,8 @@
         send graphical output to file by means of the ":results graphics"
         directive.
         (org-babel-expand-body:R): Use `org-babel-R-graphical-output-file'
-        when constructing the R code to evaluate, which may be augmented with
-        code implementing the writing of graohical output to file.
+        when constructing the R code to evaluate, which may be augmented
+        with code implementing the writing of graohical output to file.
         (org-babel-execute:R): Use `org-babel-R-graphical-output-file' to
         determine whether R is taking responsibility for writing output to
         file; if so, this is signalled to ob.el by returning a nil result.
@@ -5001,8 +5014,9 @@
         of src block execution.
         (org-babel-execute-src-block): Use `org-babel-format-result' when
         writing to file.
-        (org-babel-open-src-block-result): Use `org-babel-format-result' when
-        displaying results in a buffer; name results buffer differently.
+        (org-babel-open-src-block-result): Use `org-babel-format-result'
+        when displaying results in a buffer.  Name results buffer
+        differently.
 
 2011-07-28  Dan Davison  <dandavison7@gmail.com>
 
@@ -5023,10 +5037,12 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-inlinetask.el (org-inlinetask-in-task-p): small refactoring,
+        * org-inlinetask.el (org-inlinetask-in-task-p): Small refactoring,
         do not modify match data either.
-        (org-inlinetask-goto-end): small refactoring, remove case-sensitivity.
-        (org-inlinetask-goto-beginning): small refactoring, remove case-sensitivity.
+        (org-inlinetask-goto-end): Small refactoring, remove
+        case-sensitivity.
+        (org-inlinetask-goto-beginning): Small refactoring, remove
+        case-sensitivity.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -5109,8 +5125,8 @@
 
 2011-07-28  Lawrence Mitchell  <wence@gmx.li>
 
-        * org.el (org-make-target-link-regexp): regexp-quote target before
-        replacing whitespace.
+        * org.el (org-make-target-link-regexp): `regexp-quote' target
+        before replacing whitespace.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -5125,7 +5141,7 @@
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org-latex.el (org-export-latex-first-lines): Anchor outline
-        regexp during LaTeX tree export
+        regexp during LaTeX tree export.
 
 2011-07-28  Konrad Hinsen  <konrad.hinsen@fastmail.net>
 
@@ -5147,7 +5163,7 @@
 
         * org.el (org-entry-properties): Stop scanning for timestamps if a
         specific timestamp property (e.g., DEADLINE, SCHEDULED, etc.) is
-        requested and a match is found. Also, if a specific timestamp
+        requested and a match is found.  Also, if a specific timestamp
         property is requested, do not push non-relevant timestamps onto
         property list.
 
@@ -5164,9 +5180,9 @@
 
 2011-07-28  Achim Gratz  <Stromeko@nexgo.de>
 
-        * org.el: remove spurious linebreak introduced by earlier patch.
+        * org.el: Remove spurious linebreak introduced by earlier patch.
 
-        * ob.el, ob-ref.el: remove double fix of the same problem.
+        * ob.el, ob-ref.el: Remove double fix of the same problem.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -5174,7 +5190,7 @@
 
 2011-07-28  Łukasz Stelmach  <lukasz.stelmach@iem.pw.edu.pl>
 
-        * org-html.el (org-export-html-mathjax-template): displaymath
+        * org-html.el (org-export-html-mathjax-template): Displaymath
         environment and MathJax.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
@@ -7352,7 +7368,7 @@
         (org-export-latex-keywords-maybe):
         Use `org-export-latex-tag-markup'.
 
-2010-11-11  Rémi Vanicat  <vanicat@debian.org>
+2010-11-11  Rémi Vanicat  <vanicat@debian.org>  (tiny change)
 
         * org-icalendar.el (org-icalendar-use-UTC-date-time): New option.
         (org-ical-ts-to-string): Use UTC time when requested.
diff --git a/lisp/org/ob-C.el b/lisp/org/ob-C.el
index cc44ece4ea8..4f8106cd66f 100644
--- a/lisp/org/ob-C.el
+++ b/lisp/org/ob-C.el
@@ -1,6 +1,6 @@
 ;;; ob-C.el --- org-babel functions for C and similar languages
 
-;; Copyright (C) 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2010-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -191,6 +191,6 @@ of the same value."
 
 (provide 'ob-C)
 
-;; arch-tag: 8f49e462-54e3-417b-9a8d-423864893b37
+
 
 ;;; ob-C.el ends here
diff --git a/lisp/org/ob-R.el b/lisp/org/ob-R.el
index 35cdcb90926..2b0e6d5e16a 100644
--- a/lisp/org/ob-R.el
+++ b/lisp/org/ob-R.el
@@ -1,8 +1,9 @@
 ;;; ob-R.el --- org-babel functions for R code evaluation
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
-;; Author: Eric Schulte, Dan Davison
+;; Author: Eric Schulte
+;;      Dan Davison
 ;; Keywords: literate programming, reproducible research, R, statistics
 ;; Homepage: http://orgmode.org
 ;; Version: 7.7
@@ -312,6 +313,6 @@ Insert hline if column names in output have been requested."
 
 (provide 'ob-R)
 
-;; arch-tag: cd4c7298-503b-450f-a3c2-f3e74b630237
+
 
 ;;; ob-R.el ends here
diff --git a/lisp/org/ob-asymptote.el b/lisp/org/ob-asymptote.el
index d360cfc2274..6bae3581cf4 100644
--- a/lisp/org/ob-asymptote.el
+++ b/lisp/org/ob-asymptote.el
@@ -1,6 +1,6 @@
 ;;; ob-asymptote.el --- org-babel functions for asymptote evaluation
 
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -160,6 +160,6 @@ of int, where every cell must be of int type."
 
 (provide 'ob-asymptote)
 
-;; arch-tag: f2f5bd0d-78e8-412b-8e6c-6dadc94cc06b
+
 
 ;;; ob-asymptote.el ends here
diff --git a/lisp/org/ob-awk.el b/lisp/org/ob-awk.el
index 368957c2f9b..66e07bf175c 100644
--- a/lisp/org/ob-awk.el
+++ b/lisp/org/ob-awk.el
@@ -24,8 +24,6 @@
 
 ;;; Commentary:
 
-;;; Commentary:
-
 ;; Babel's awk can use special header argument:
 ;; 
 ;; - :in-file takes a path to a file of data to be processed by awk
@@ -114,6 +112,6 @@ Emacs-lisp table, otherwise return the results as a string."
 
 (provide 'ob-awk)
 
-;; arch-tag: 844e2c88-6aad-4018-868d-a2df6bcdf68f
+
 
 ;;; ob-awk.el ends here
diff --git a/lisp/org/ob-calc.el b/lisp/org/ob-calc.el
index 0f88ccf4dae..68694786729 100644
--- a/lisp/org/ob-calc.el
+++ b/lisp/org/ob-calc.el
@@ -1,6 +1,6 @@
 ;;; ob-calc.el --- org-babel functions for calc code evaluation
 
-;; Copyright (C) 2010  Free Software Foundation, Inc
+;; Copyright (C) 2010-2011  Free Software Foundation, Inc
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -99,6 +99,6 @@
 
 (provide 'ob-calc)
 
-;; arch-tag: 5c57a3b7-5818-4c6c-acda-7a94831a6449
+
 
 ;;; ob-calc.el ends here
diff --git a/lisp/org/ob-clojure.el b/lisp/org/ob-clojure.el
index d9bc213dfa2..090b60662f8 100644
--- a/lisp/org/ob-clojure.el
+++ b/lisp/org/ob-clojure.el
@@ -1,8 +1,9 @@
 ;;; ob-clojure.el --- org-babel functions for clojure evaluation
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
-;; Author: Joel Boehland, Eric Schulte
+;; Author: Joel Boehland
+;;      Eric Schulte
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
 ;; Version: 7.7
@@ -92,6 +93,6 @@
 
 (provide 'ob-clojure)
 
-;; arch-tag: a43b33f2-653e-46b1-ac56-2805cf05b7d1
+
 
 ;;; ob-clojure.el ends here
diff --git a/lisp/org/ob-comint.el b/lisp/org/ob-comint.el
index 4e238880ec2..efdac4d3818 100644
--- a/lisp/org/ob-comint.el
+++ b/lisp/org/ob-comint.el
@@ -1,6 +1,6 @@
 ;;; ob-comint.el --- org-babel functions for interaction with comint buffers
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research, comint
@@ -158,6 +158,6 @@ FILE exists at end of evaluation."
 
 (provide 'ob-comint)
 
-;; arch-tag: 9adddce6-0864-4be3-b0b5-6c5157dc7889
+
 
 ;;; ob-comint.el ends here
diff --git a/lisp/org/ob-css.el b/lisp/org/ob-css.el
index 25d75ccf80a..7bc97f82909 100644
--- a/lisp/org/ob-css.el
+++ b/lisp/org/ob-css.el
@@ -1,6 +1,6 @@
 ;;; ob-css.el --- org-babel functions for css evaluation
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -44,6 +44,6 @@ CSS does not support sessions."
 
 (provide 'ob-css)
 
-;; arch-tag: f4447e8c-50ab-41f9-b322-b7b9574d9fbe
+
 
 ;;; ob-css.el ends here
diff --git a/lisp/org/ob-ditaa.el b/lisp/org/ob-ditaa.el
index 810af9411f4..db638f6ef98 100644
--- a/lisp/org/ob-ditaa.el
+++ b/lisp/org/ob-ditaa.el
@@ -1,6 +1,6 @@
 ;;; ob-ditaa.el --- org-babel functions for ditaa evaluation
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -74,6 +74,6 @@ This function is called by `org-babel-execute-src-block'."
 
 (provide 'ob-ditaa)
 
-;; arch-tag: 492cd006-07d9-4fac-bef6-5bb60b48842e
+
 
 ;;; ob-ditaa.el ends here
diff --git a/lisp/org/ob-dot.el b/lisp/org/ob-dot.el
index 4bb4d532a43..cc78ac5bf95 100644
--- a/lisp/org/ob-dot.el
+++ b/lisp/org/ob-dot.el
@@ -1,6 +1,6 @@
 ;;; ob-dot.el --- org-babel functions for dot evaluation
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -85,6 +85,6 @@ This function is called by `org-babel-execute-src-block'."
 
 (provide 'ob-dot)
 
-;; arch-tag: 817d0516-7b47-4f77-a8b2-2aadd8e4d0e2
+
 
 ;;; ob-dot.el ends here
diff --git a/lisp/org/ob-emacs-lisp.el b/lisp/org/ob-emacs-lisp.el
index 5892aa5dc7a..2eccf19b6d1 100644
--- a/lisp/org/ob-emacs-lisp.el
+++ b/lisp/org/ob-emacs-lisp.el
@@ -1,6 +1,6 @@
 ;;; ob-emacs-lisp.el --- org-babel functions for emacs-lisp code evaluation
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -76,6 +76,6 @@
 
 (provide 'ob-emacs-lisp)
 
-;; arch-tag: e9a3acca-dc84-472a-9f5a-23c35befbcd6
+
 
 ;;; ob-emacs-lisp.el ends here
diff --git a/lisp/org/ob-eval.el b/lisp/org/ob-eval.el
index cc089cbaa32..e74be0b6e02 100644
--- a/lisp/org/ob-eval.el
+++ b/lisp/org/ob-eval.el
@@ -1,6 +1,6 @@
 ;;; ob-eval.el --- org-babel functions for external code evaluation
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research, comint
@@ -257,6 +257,6 @@ This buffer is named by `org-babel-error-buffer-name'."
 
 (provide 'ob-eval)
 
-;; arch-tag: 5328b17f-957d-42d9-94da-a2952682d04d
+
 
 ;;; ob-eval.el ends here
diff --git a/lisp/org/ob-exp.el b/lisp/org/ob-exp.el
index d65441e95c5..0fceb184c5e 100644
--- a/lisp/org/ob-exp.el
+++ b/lisp/org/ob-exp.el
@@ -1,8 +1,9 @@
 ;;; ob-exp.el --- Exportation of org-babel source blocks
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
-;; Author: Eric Schulte, Dan Davison
+;; Author: Eric Schulte
+;;      Dan Davison
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
 ;; Version: 7.7
@@ -266,6 +267,6 @@ inhibit insertion of results into the buffer."
 
 (provide 'ob-exp)
 
-;; arch-tag: 523abf4c-76d1-44ed-9f27-e3bddf34bf0f
+
 
 ;;; ob-exp.el ends here
diff --git a/lisp/org/ob-gnuplot.el b/lisp/org/ob-gnuplot.el
index 8259cf839e5..9bf0433f9fc 100644
--- a/lisp/org/ob-gnuplot.el
+++ b/lisp/org/ob-gnuplot.el
@@ -1,6 +1,6 @@
 ;;; ob-gnuplot.el --- org-babel functions for gnuplot evaluation
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -230,6 +230,6 @@ Pass PARAMS through to `orgtbl-to-generic' when exporting TABLE."
 
 (provide 'ob-gnuplot)
 
-;; arch-tag: 50490ace-a9e1-4b29-a6e5-0db9f16c610b
+
 
 ;;; ob-gnuplot.el ends here
diff --git a/lisp/org/ob-haskell.el b/lisp/org/ob-haskell.el
index 63e76f6f139..cae07036c57 100644
--- a/lisp/org/ob-haskell.el
+++ b/lisp/org/ob-haskell.el
@@ -1,6 +1,6 @@
 ;;; ob-haskell.el --- org-babel functions for haskell evaluation
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -213,6 +213,6 @@ constructs (header arguments, no-web syntax etc...) are ignored."
 
 (provide 'ob-haskell)
 
-;; arch-tag: b53f75f3-ba1a-4b05-82d9-a2a0d4e70804
+
 
 ;;; ob-haskell.el ends here
diff --git a/lisp/org/ob-java.el b/lisp/org/ob-java.el
index 3f349fea271..20824d4cb30 100644
--- a/lisp/org/ob-java.el
+++ b/lisp/org/ob-java.el
@@ -69,6 +69,6 @@
 
 (provide 'ob-java)
 
-;; arch-tag: dd1cfb00-7f76-4ecf-922c-f7031b68b85e
+
 
 ;;; ob-java.el ends here
diff --git a/lisp/org/ob-js.el b/lisp/org/ob-js.el
index f9c1722eb65..9e6751c9525 100644
--- a/lisp/org/ob-js.el
+++ b/lisp/org/ob-js.el
@@ -1,28 +1,26 @@
 ;;; ob-js.el --- org-babel functions for Javascript
 
-;; Copyright (C) 2010 Free Software Foundation
+;; Copyright (C) 2010-2011 Free Software Foundation
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research, js
 ;; Homepage: http://orgmode.org
 ;; Version: 7.7
 
-;;; License:
+;; This file is part of GNU Emacs.
 
-;; This program is free software; you can redistribute it and/or modify
+;; 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, or (at your option)
-;; any later version.
-;;
-;; This program is distributed in the hope that it will be useful,
+;; 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; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -35,7 +33,7 @@
 
 ;; - a non-browser javascript engine such as node.js http://nodejs.org/
 ;;   or mozrepl http://wiki.github.com/bard/mozrepl/
-;; 
+;;
 ;; - for session based evaluation mozrepl and moz.el are required see
 ;;   http://wiki.github.com/bard/mozrepl/emacs-integration for
 ;;   configuration instructions
@@ -160,6 +158,6 @@ then create.  Return the initialized session."
 
 (provide 'ob-js)
 
-;; arch-tag: 84401fb3-b8d9-4bb6-9a90-cbe2d103d494
+
 
 ;;; ob-js.el ends here
diff --git a/lisp/org/ob-keys.el b/lisp/org/ob-keys.el
index b55913599cc..b56ba5cf01a 100644
--- a/lisp/org/ob-keys.el
+++ b/lisp/org/ob-keys.el
@@ -1,6 +1,6 @@
 ;;; ob-keys.el --- key bindings for org-babel
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -97,6 +97,6 @@ a-list placed behind the generic `org-babel-key-prefix'.")
 
 (provide 'ob-keys)
 
-;; arch-tag: 01e348ee-4906-46fa-839a-6b7b6f989048
+
 
 ;;; ob-keys.el ends here
diff --git a/lisp/org/ob-latex.el b/lisp/org/ob-latex.el
index 2121a8e5296..c27ca33080a 100644
--- a/lisp/org/ob-latex.el
+++ b/lisp/org/ob-latex.el
@@ -1,6 +1,6 @@
 ;;; ob-latex.el --- org-babel functions for latex "evaluation"
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -176,6 +176,6 @@ Extracted from `org-export-as-pdf' in org-latex.el."
 
 (provide 'ob-latex)
 
-;; arch-tag: 1f13f7e2-26de-4c24-9274-9f331d4c6ff3
+
 
 ;;; ob-latex.el ends here
diff --git a/lisp/org/ob-ledger.el b/lisp/org/ob-ledger.el
index 425a3458685..a5bdcbf2f73 100644
--- a/lisp/org/ob-ledger.el
+++ b/lisp/org/ob-ledger.el
@@ -1,6 +1,6 @@
 ;;; ob-ledger.el --- org-babel functions for ledger evaluation
 
-;; Copyright (C) 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2010-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric S Fraga
 ;; Keywords: literate programming, reproducible research, accounting
@@ -67,6 +67,6 @@ called by `org-babel-execute-src-block'."
 
 (provide 'ob-ledger)
 
-;; arch-tag: 7bbb529e-95a1-4236-9d29-b0000b918c7c
+
 
 ;;; ob-ledger.el ends here
diff --git a/lisp/org/ob-lilypond.el b/lisp/org/ob-lilypond.el
index 23f5d511d34..23fc8f04c34 100644
--- a/lisp/org/ob-lilypond.el
+++ b/lisp/org/ob-lilypond.el
@@ -1,6 +1,6 @@
 ;;; ob-lilypond.el --- org-babel functions for lilypond evaluation
 
-;; Copyright (C) 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2010-2011  Free Software Foundation, Inc.
 
 ;; Author: Martyn Jago
 ;; Keywords: babel language, literate programming
@@ -442,6 +442,6 @@ dependent on LY-ARRANGE-MODE"
 
 (provide 'ob-lilypond)
 
-;; arch-tag: ac449eea-2cf2-4dc5-ae33-426f57ba4894
+
 
 ;;; ob-lilypond.el ends here
diff --git a/lisp/org/ob-lisp.el b/lisp/org/ob-lisp.el
index 97e8a97b24b..4ff9c4076ec 100644
--- a/lisp/org/ob-lisp.el
+++ b/lisp/org/ob-lisp.el
@@ -1,8 +1,10 @@
 ;;; ob-lisp.el --- org-babel functions for common lisp evaluation
 
-;; Copyright (C) 2009, 2010, 2011  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
-;; Author: Joel Boehland, Eric Schulte, David T. O'Toole <dto@gnu.org>
+;; Author: Joel Boehland
+;;      Eric Schulte
+;;      David T. O'Toole <dto@gnu.org>
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
 ;; Version: 7.7
@@ -101,6 +103,6 @@ current directory string."
 
 (provide 'ob-lisp)
 
-;; arch-tag: 18086168-009f-4947-bbb5-3532375d851d
+
 
 ;;; ob-lisp.el ends here
diff --git a/lisp/org/ob-lob.el b/lisp/org/ob-lob.el
index 5c4894d4510..5cb40a057f3 100644
--- a/lisp/org/ob-lob.el
+++ b/lisp/org/ob-lob.el
@@ -1,8 +1,9 @@
 ;;; ob-lob.el --- functions supporting the Library of Babel
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
-;; Author: Eric Schulte, Dan Davison
+;; Author: Eric Schulte
+;;      Dan Davison
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
 ;; Version: 7.7
@@ -136,6 +137,6 @@ if so then run the appropriate source block from the Library."
 
 (provide 'ob-lob)
 
-;; arch-tag: ce0712c9-2147-4019-ba3f-42341b8b474b
+
 
 ;;; ob-lob.el ends here
diff --git a/lisp/org/ob-matlab.el b/lisp/org/ob-matlab.el
index 3ddb3065fc7..bb32c5a29f5 100644
--- a/lisp/org/ob-matlab.el
+++ b/lisp/org/ob-matlab.el
@@ -1,6 +1,6 @@
 ;;; ob-matlab.el --- org-babel support for matlab evaluation
 
-;; Copyright (C) 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2010-2011  Free Software Foundation, Inc.
 
 ;; Author: Dan Davison
 ;; Keywords: literate programming, reproducible research
@@ -43,6 +43,6 @@
 
 (provide 'ob-matlab)
 
-;; arch-tag: 6b234299-c1f7-4eb1-ace8-7b93344065ac
+
 
 ;;; ob-matlab.el ends here
diff --git a/lisp/org/ob-maxima.el b/lisp/org/ob-maxima.el
index 7534065f1f7..279ba6b928b 100644
--- a/lisp/org/ob-maxima.el
+++ b/lisp/org/ob-maxima.el
@@ -1,28 +1,27 @@
 ;;; ob-maxima.el --- org-babel functions for maxima evaluation
 
-;; Copyright (c) 2009, 2010, 2011 Eric S Fraga, Eric Schulte
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
-;; Author: Eric S Fraga, Eric Schulte
+;; Author: Eric S Fraga
+;;         Eric Schulte
 ;; Keywords: literate programming, reproducible research, maxima
 ;; Homepage: http://orgmode.org
 ;; Version: 7.7
 
-;;; License:
+;; This file is part of GNU Emacs.
 
-;; This program is free software; you can redistribute it and/or modify
+;; 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, or (at your option)
-;; any later version.
-;;
-;; This program is distributed in the hope that it will be useful,
+;; 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; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -75,6 +74,6 @@ called by `org-babel-execute-src-block'."
 
 (provide 'ob-maxima)
 
-;; arch-tag: d86c97ac-7eab-4349-8d8b-302dd09779a8
+
 
 ;;; ob-maxima.el ends here
diff --git a/lisp/org/ob-mscgen.el b/lisp/org/ob-mscgen.el
index f96ba9a600b..dc800a875c6 100644
--- a/lisp/org/ob-mscgen.el
+++ b/lisp/org/ob-mscgen.el
@@ -1,6 +1,6 @@
 ;;; ob-msc.el --- org-babel functions for mscgen evaluation
 
-;; Copyright (C) 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2010-2011  Free Software Foundation, Inc.
 
 ;; Author: Juan Pechiar
 ;; Keywords: literate programming, reproducible research
@@ -81,6 +81,6 @@ ERROR: no output file specified. Add \":file name.png\" to the src header"))
 
 (provide 'ob-mscgen)
 
-;; arch-tag: 74695b1e-715f-4b5a-a3a9-d78ee39ba5c8
+
 
 ;;; ob-msc.el ends here
diff --git a/lisp/org/ob-ocaml.el b/lisp/org/ob-ocaml.el
index c4b40c46cb8..ee7a7cc212c 100644
--- a/lisp/org/ob-ocaml.el
+++ b/lisp/org/ob-ocaml.el
@@ -1,6 +1,6 @@
 ;;; ob-ocaml.el --- org-babel functions for ocaml evaluation
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -140,6 +140,6 @@ Emacs-lisp table, otherwise return the results as a string."
 
 (provide 'ob-ocaml)
 
-;; arch-tag: 2e815f4d-365e-4d69-b1df-dd17fdd7b7b7
+
 
 ;;; ob-ocaml.el ends here
diff --git a/lisp/org/ob-octave.el b/lisp/org/ob-octave.el
index ac434b4abb6..2003a6f18f7 100644
--- a/lisp/org/ob-octave.el
+++ b/lisp/org/ob-octave.el
@@ -1,6 +1,6 @@
 ;;; ob-octave.el --- org-babel functions for octave and matlab evaluation
 
-;; Copyright (C) 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2010-2011  Free Software Foundation, Inc.
 
 ;; Author: Dan Davison
 ;; Keywords: literate programming, reproducible research
@@ -258,6 +258,6 @@ This removes initial blank and comment lines and then calls
 
 (provide 'ob-octave)
 
-;; arch-tag: d8e5f68b-ba13-440a-a495-b653e989e704
+
 
 ;;; ob-octave.el ends here
diff --git a/lisp/org/ob-org.el b/lisp/org/ob-org.el
index 74071363747..37256d015c7 100644
--- a/lisp/org/ob-org.el
+++ b/lisp/org/ob-org.el
@@ -1,6 +1,6 @@
 ;;; ob-org.el --- org-babel functions for org code block evaluation
 
-;; Copyright (C) 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2010-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -66,6 +66,6 @@ This function is called by `org-babel-execute-src-block'."
 
 (provide 'ob-org)
 
-;; arch-tag: 130af5fe-cc56-46bd-9508-fa0ebd94cb1f
+
 
 ;;; ob-org.el ends here
diff --git a/lisp/org/ob-perl.el b/lisp/org/ob-perl.el
index ec93c729e7b..13d71413731 100644
--- a/lisp/org/ob-perl.el
+++ b/lisp/org/ob-perl.el
@@ -1,8 +1,9 @@
 ;;; ob-perl.el --- org-babel functions for perl evaluation
 
-;; Copyright (C) 2009, 2010  Free Software Foundation
+;; Copyright (C) 2009-2011  Free Software Foundation
 
-;; Author: Dan Davison, Eric Schulte
+;; Author: Dan Davison
+;;      Eric Schulte
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
 ;; Version: 7.7
@@ -113,6 +114,6 @@ return the value of the last statement in BODY, as elisp."
 
 (provide 'ob-perl)
 
-;; arch-tag: 88ef9396-d857-4dc3-8946-5a72bdfa2337
+
 
 ;;; ob-perl.el ends here
diff --git a/lisp/org/ob-plantuml.el b/lisp/org/ob-plantuml.el
index b226a5342ff..9fa55727592 100644
--- a/lisp/org/ob-plantuml.el
+++ b/lisp/org/ob-plantuml.el
@@ -1,6 +1,6 @@
 ;;; ob-plantuml.el --- org-babel functions for plantuml evaluation
 
-;; Copyright (C) 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2010-2011  Free Software Foundation, Inc.
 
 ;; Author: Zhang Weize
 ;; Keywords: literate programming, reproducible research
@@ -80,6 +80,6 @@ This function is called by `org-babel-execute-src-block'."
 
 (provide 'ob-plantuml)
 
-;; arch-tag: 451f50c5-e779-407e-ad64-70e0e8f161d1
+
 
 ;;; ob-plantuml.el ends here
diff --git a/lisp/org/ob-python.el b/lisp/org/ob-python.el
index 0fe0b4fefd8..5234d83ecee 100644
--- a/lisp/org/ob-python.el
+++ b/lisp/org/ob-python.el
@@ -1,8 +1,9 @@
 ;;; ob-python.el --- org-babel functions for python evaluation
 
-;; Copyright (C) 2009, 2010  Free Software Foundation
+;; Copyright (C) 2009-2011  Free Software Foundation
 
-;; Author: Eric Schulte, Dan Davison
+;; Author: Eric Schulte
+;;      Dan Davison
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
 ;; Version: 7.7
@@ -294,6 +295,6 @@ last statement in BODY, as elisp."
 
 (provide 'ob-python)
 
-;; arch-tag: f19b6c3d-dfcb-4a1a-9ce0-45ade1ebc212
+
 
 ;;; ob-python.el ends here
diff --git a/lisp/org/ob-ref.el b/lisp/org/ob-ref.el
index d6ad39ed073..d0a2c14bee9 100644
--- a/lisp/org/ob-ref.el
+++ b/lisp/org/ob-ref.el
@@ -1,8 +1,9 @@
 ;;; ob-ref.el --- org-babel functions for referencing external data
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
-;; Author: Eric Schulte, Dan Davison
+;; Author: Eric Schulte
+;;      Dan Davison
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
 ;; Version: 7.7
@@ -60,8 +61,6 @@
 (declare-function org-narrow-to-subtree "org" ())
 (declare-function org-id-find-id-in-file "org-id" (id file &optional markerp))
 (declare-function org-show-context "org" (&optional key))
-(declare-function org-pop-to-buffer-same-window 
-                  "org-compat" (&optional buffer-or-name norecord label))
 
 (defvar org-babel-ref-split-regexp
   "[ \f\t\n\r\v]*\\(.+?\\)[ \f\t\n\r\v]*=[ \f\t\n\r\v]*\\(.+\\)[ \f\t\n\r\v]*")
@@ -95,7 +94,7 @@ the variable."
                (m (when file (org-id-find-id-in-file id file 'marker))))
           (when (and file m)
             (message "file:%S" file)
-            (org-pop-to-buffer-same-window (marker-buffer m))
+            (switch-to-buffer (marker-buffer m))
             (goto-char m)
             (move-marker m nil)
             (org-show-context)
@@ -263,6 +262,6 @@ Supported reference types are tables and source blocks."
 
 (provide 'ob-ref)
 
-;; arch-tag: ace4a4f4-ea38-4dac-8fe6-6f52fcc43b6d
+
 
 ;;; ob-ref.el ends here
diff --git a/lisp/org/ob-ruby.el b/lisp/org/ob-ruby.el
index f0ed1a16676..02089b4a214 100644
--- a/lisp/org/ob-ruby.el
+++ b/lisp/org/ob-ruby.el
@@ -1,6 +1,6 @@
 ;;; ob-ruby.el --- org-babel functions for ruby evaluation
 
-;; Copyright (C) 2009, 2010  Free Software Foundation
+;; Copyright (C) 2009-2011  Free Software Foundation
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -241,6 +241,6 @@ return the value of the last statement in BODY, as elisp."
 
 (provide 'ob-ruby)
 
-;; arch-tag: 3e9726db-4520-49e2-b263-e8f571ac88f5
+
 
 ;;; ob-ruby.el ends here
diff --git a/lisp/org/ob-sass.el b/lisp/org/ob-sass.el
index c51a4433426..162113ea5a8 100644
--- a/lisp/org/ob-sass.el
+++ b/lisp/org/ob-sass.el
@@ -1,6 +1,6 @@
 ;;; ob-sass.el --- org-babel functions for the sass css generation language
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -68,6 +68,6 @@ This function is called by `org-babel-execute-src-block'."
 
 (provide 'ob-sass)
 
-;; arch-tag: 2954b169-eef4-45ce-a8e5-3e619f0f07ac
+
 
 ;;; ob-sass.el ends here
diff --git a/lisp/org/ob-scheme.el b/lisp/org/ob-scheme.el
index a772151aee4..3e93a3a74f7 100644
--- a/lisp/org/ob-scheme.el
+++ b/lisp/org/ob-scheme.el
@@ -1,28 +1,26 @@
 ;;; ob-scheme.el --- org-babel functions for Scheme
 
-;; Copyright (C) 2010 Free Software Foundation
+;; Copyright (C) 2010-2011 Free Software Foundation
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research, scheme
 ;; Homepage: http://orgmode.org
 ;; Version: 7.7
 
-;;; License:
+;; This file is part of GNU Emacs.
 
-;; This program is free software; you can redistribute it and/or modify
+;; 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, or (at your option)
-;; any later version.
-;;
-;; This program is distributed in the hope that it will be useful,
+;; 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; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -35,7 +33,7 @@
 
 ;; - a working scheme implementation
 ;;   (e.g. guile http://www.gnu.org/software/guile/guile.html)
-;;   
+;;
 ;; - for session based evaluation cmuscheme.el is required which is
 ;;   included in Emacs
 
@@ -134,6 +132,6 @@ then create.  Return the initialized session."
 
 (provide 'ob-scheme)
 
-;; arch-tag: 6b2fe76f-4b25-4e87-ad1c-225b2f282a71
+
 
 ;;; ob-scheme.el ends here
diff --git a/lisp/org/ob-screen.el b/lisp/org/ob-screen.el
index a9a3c5c794a..084beffd229 100644
--- a/lisp/org/ob-screen.el
+++ b/lisp/org/ob-screen.el
@@ -1,6 +1,6 @@
 ;;; ob-screen.el --- org-babel support for interactive terminal
 
-;; Copyright (C) 2009, 2010  Free Software Foundation
+;; Copyright (C) 2009-2011  Free Software Foundation
 
 ;; Author: Benjamin Andresen
 ;; Keywords: literate programming, interactive shell
@@ -142,6 +142,6 @@ The terminal should shortly flicker."
 
 (provide 'ob-screen)
 
-;; arch-tag: 908e5afe-89a0-4f27-b982-23f1f2e3bac9
+
 
 ;;; ob-screen.el ends here
diff --git a/lisp/org/ob-sh.el b/lisp/org/ob-sh.el
index 9349a842a60..f46ba45770a 100644
--- a/lisp/org/ob-sh.el
+++ b/lisp/org/ob-sh.el
@@ -1,6 +1,6 @@
 ;;; ob-sh.el --- org-babel functions for shell evaluation
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -193,6 +193,6 @@ return the value of the last statement in BODY."
 
 (provide 'ob-sh)
 
-;; arch-tag: 416dd531-c230-4b0a-a5bf-8d948f990f2d
+
 
 ;;; ob-sh.el ends here
diff --git a/lisp/org/ob-sql.el b/lisp/org/ob-sql.el
index 8fc7d3b4f84..9274438c18e 100644
--- a/lisp/org/ob-sql.el
+++ b/lisp/org/ob-sql.el
@@ -1,6 +1,6 @@
 ;;; ob-sql.el --- org-babel functions for sql evaluation
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -140,6 +140,6 @@ This function is called by `org-babel-execute-src-block'."
 
 (provide 'ob-sql)
 
-;; arch-tag: a43ff944-6de1-4566-a83c-626814e3dad2
+
 
 ;;; ob-sql.el ends here
diff --git a/lisp/org/ob-sqlite.el b/lisp/org/ob-sqlite.el
index 3162fcca81f..c08c7f38e8a 100644
--- a/lisp/org/ob-sqlite.el
+++ b/lisp/org/ob-sqlite.el
@@ -1,6 +1,6 @@
 ;;; ob-sqlite.el --- org-babel functions for sqlite database interaction
 
-;; Copyright (C) 2010  Free Software Foundation
+;; Copyright (C) 2010-2011  Free Software Foundation
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -145,6 +145,6 @@ Prepare SESSION according to the header arguments specified in PARAMS."
 
 (provide 'ob-sqlite)
 
-;; arch-tag: 5c03d7f2-0f72-48b8-bbd1-35aafea248ac
+
 
 ;;; ob-sqlite.el ends here
diff --git a/lisp/org/ob-table.el b/lisp/org/ob-table.el
index 91e238f254b..ea253b2f048 100644
--- a/lisp/org/ob-table.el
+++ b/lisp/org/ob-table.el
@@ -1,6 +1,6 @@
 ;;; ob-table.el --- support for calling org-babel functions from tables
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -121,6 +121,6 @@ example above."
 
 (provide 'ob-table)
 
-;; arch-tag: 4234cc7c-4fc8-4e92-abb0-2892de1a493b
+
 
 ;;; ob-table.el ends here
diff --git a/lisp/org/ob-tangle.el b/lisp/org/ob-tangle.el
index d4fb60618be..26549126009 100644
--- a/lisp/org/ob-tangle.el
+++ b/lisp/org/ob-tangle.el
@@ -1,6 +1,6 @@
 ;;; ob-tangle.el --- extract source code from org-mode files
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -494,6 +494,6 @@ which enable the original code blocks to be found."
 
 (provide 'ob-tangle)
 
-;; arch-tag: 413ced93-48f5-4216-86e4-3fc5df8c8f24
+
 
 ;;; ob-tangle.el ends here
diff --git a/lisp/org/ob.el b/lisp/org/ob.el
index 0de0aa661c5..728c6c5cb5e 100644
--- a/lisp/org/ob.el
+++ b/lisp/org/ob.el
@@ -1,8 +1,9 @@
 ;;; ob.el --- working with code blocks in org-mode
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
-;; Author: Eric Schulte, Dan Davison
+;; Author: Eric Schulte
+;;      Dan Davison
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
 ;; Version: 7.7
@@ -137,7 +138,7 @@ remove code block execution from the C-c C-c keybinding."
    ;; (4) header arguments
    "\\([^\n]*\\)\n"
    ;; (5) body
-   "\\([^\000]*?\\)[ \t]*#\\+end_src")
+   "\\([^\000]*?\n\\)?[ \t]*#\\+end_src")
   "Regexp used to identify code blocks.")
 
 (defvar org-babel-inline-src-block-regexp
@@ -2198,6 +2199,6 @@ of `org-babel-temporary-directory'."
 
 (provide 'ob)
 
-;; arch-tag: 01a7ebee-06c5-4ee4-a709-e660d28c0af1
+
 
 ;;; ob.el ends here
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index d47013b76f1..aea284fe72c 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -1,7 +1,6 @@
 ;;; org-agenda.el --- Dynamic task and appointment lists for Org
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -61,8 +60,6 @@
 (declare-function org-is-habit-p "org-habit" (&optional pom))
 (declare-function org-habit-parse-todo "org-habit" (&optional pom))
 (declare-function org-habit-get-priority "org-habit" (habit &optional moment))
-(declare-function org-pop-to-buffer-same-window "org-compat" 
-                  (&optional buffer-or-name norecord label))
 
 (defvar calendar-mode-map)
 (defvar org-clock-current-task) ; defined in org-clock.el
@@ -3068,7 +3065,7 @@ the global options and expect it to be applied to the entire view.")
        (awin (select-window awin))
        ((not (setq org-pre-agenda-window-conf (current-window-configuration))))
        ((equal org-agenda-window-setup 'current-window)
-        (org-pop-to-buffer-same-window abuf))
+        (switch-to-buffer abuf))
        ((equal org-agenda-window-setup 'other-window)
         (org-switch-to-buffer-other-window abuf))
        ((equal org-agenda-window-setup 'other-frame)
@@ -3079,7 +3076,7 @@ the global options and expect it to be applied to the entire view.")
       ;; additional test in case agenda is invoked from within agenda
       ;; buffer via elisp link
       (unless (equal (current-buffer) abuf)
-        (org-pop-to-buffer-same-window abuf)))
+        (switch-to-buffer abuf)))
     (setq buffer-read-only nil)
     (let ((inhibit-read-only t)) (erase-buffer))
     (org-agenda-mode)
@@ -6973,7 +6970,7 @@ at the text of the entry itself."
                        (org-agenda-error)))
            (buffer (marker-buffer marker))
            (pos (marker-position marker)))
-      (org-pop-to-buffer-same-window buffer)
+      (switch-to-buffer buffer)
       (and delete-other-windows (delete-other-windows))
       (widen)
       (goto-char pos)
@@ -8446,6 +8443,6 @@ belonging to the \"Work\" category."
 
 (provide 'org-agenda)
 
-;; arch-tag: 77f7565d-7c4b-44af-a2df-9f6f7070cff1
+
 
 ;;; org-agenda.el ends here
diff --git a/lisp/org/org-archive.el b/lisp/org/org-archive.el
index 6c46b511786..7436696433c 100644
--- a/lisp/org/org-archive.el
+++ b/lisp/org/org-archive.el
@@ -1,7 +1,6 @@
 ;;; org-archive.el --- Archiving for Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -483,6 +482,6 @@ This command is set with the variable `org-archive-default-command'."
 
 (provide 'org-archive)
 
-;; arch-tag: 0837f601-9699-43c3-8b90-631572ae6c85
+
 
 ;;; org-archive.el ends here
diff --git a/lisp/org/org-ascii.el b/lisp/org/org-ascii.el
index 8c37f9c08df..d6a4e30714b 100644
--- a/lisp/org/org-ascii.el
+++ b/lisp/org/org-ascii.el
@@ -1,7 +1,6 @@
 ;;; org-ascii.el --- ASCII export for Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -726,5 +725,5 @@ publishing directory."
 
 (provide 'org-ascii)
 
-;; arch-tag: aa96f882-f477-4e13-86f5-70d43e7adf3c
+
 ;;; org-ascii.el ends here
diff --git a/lisp/org/org-attach.el b/lisp/org/org-attach.el
index 809ec159496..aa8c476e89b 100644
--- a/lisp/org/org-attach.el
+++ b/lisp/org/org-attach.el
@@ -1,6 +1,6 @@
 ;;; org-attach.el --- Manage file attachments to org-mode tasks
 
-;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@newartisans.com>
 ;; Keywords: org data task
@@ -437,5 +437,5 @@ prefix."
 
 (provide 'org-attach)
 
-;; arch-tag: fce93c2e-fe07-4fa3-a905-e10dcc7a6248
+
 ;;; org-attach.el ends here
diff --git a/lisp/org/org-bbdb.el b/lisp/org/org-bbdb.el
index b405718a49a..a7b6efae836 100644
--- a/lisp/org/org-bbdb.el
+++ b/lisp/org/org-bbdb.el
@@ -1,7 +1,6 @@
 ;;; org-bbdb.el --- Support for links to BBDB entries from within Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>,
 ;;         Thomas Baumann <thomas dot baumann at ch dot tum dot de>
@@ -392,6 +391,6 @@ END:VEVENT\n"
 
 (provide 'org-bbdb)
 
-;; arch-tag: 9e4f275d-d080-48c1-b040-62247f66b5c2
+
 
 ;;; org-bbdb.el ends here
diff --git a/lisp/org/org-beamer.el b/lisp/org/org-beamer.el
index 97f17c043af..5cebe50efd1 100644
--- a/lisp/org/org-beamer.el
+++ b/lisp/org/org-beamer.el
@@ -1,6 +1,6 @@
 ;;; org-beamer.el --- Beamer-specific LaTeX export for org-mode
 ;;
-;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2011 Free Software Foundation, Inc.
 ;;
 ;; Version: 7.7
 ;; Author: Carsten Dominik <carsten.dominik AT gmail DOT com>
@@ -632,6 +632,6 @@ include square brackets."
 
 (provide 'org-beamer)
 
-;; arch-tag: 68bac91a-a946-43a3-8173-a9269306f67c
+
 
 ;;; org-beamer.el ends here
diff --git a/lisp/org/org-bibtex.el b/lisp/org/org-bibtex.el
index da6c1fec58c..5c9b37b2341 100644
--- a/lisp/org/org-bibtex.el
+++ b/lisp/org/org-bibtex.el
@@ -1,6 +1,6 @@
 ;;; org-bibtex.el --- Org links to BibTeX entries
 ;;
-;; Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2011 Free Software Foundation, Inc.
 ;;
 ;; Author: Bastien Guerry <bzg at altern dot org>
 ;;         Carsten Dominik <carsten dot dominik at gmail dot com>
@@ -642,6 +642,6 @@ This function relies `org-search-view' to locate results."
 
 (provide 'org-bibtex)
 
-;; arch-tag: 83987d5a-01b8-41c7-85bc-77700f1285f5
+
 
 ;;; org-bibtex.el ends here
diff --git a/lisp/org/org-capture.el b/lisp/org/org-capture.el
index d2a011249c9..05cca0e311e 100644
--- a/lisp/org/org-capture.el
+++ b/lisp/org/org-capture.el
@@ -1,6 +1,6 @@
 ;;; org-capture.el --- Fast note taking in Org-mode
 
-;; Copyright (C) 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2010-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -57,8 +57,6 @@
                   (date &optional keep-restriction))
 (declare-function org-table-get-specials "org-table" ())
 (declare-function org-table-goto-line "org-table" (N))
-(declare-function org-pop-to-buffer-same-window "org-compat" 
-                  (&optional buffer-or-name norecord label))
 
 (defvar org-remember-default-headline)
 (defvar org-remember-templates)
@@ -1201,7 +1199,7 @@ The user is queried for the template."
       (error "No capture template selected"))
     (org-capture-set-plist entry)
     (org-capture-set-target-location)
-    (org-pop-to-buffer-same-window (org-capture-get :buffer))
+    (switch-to-buffer (org-capture-get :buffer))
     (goto-char (org-capture-get :pos))))
 
 (defun org-capture-get-indirect-buffer (&optional buffer prefix)
@@ -1311,7 +1309,7 @@ The template may still contain \"%?\" for cursor positioning."
             (sit-for 1))
     (save-window-excursion
       (delete-other-windows)
-      (org-pop-to-buffer-same-window (get-buffer-create "*Capture*"))
+      (switch-to-buffer (get-buffer-create "*Capture*"))
       (erase-buffer)
       (insert template)
       (goto-char (point-min))
@@ -1505,6 +1503,6 @@ The template may still contain \"%?\" for cursor positioning."
 
 (provide 'org-capture)
 
-;; arch-tag: 986bf41b-8ada-4e28-bf20-e8388a7205a0
+
 
 ;;; org-capture.el ends here
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el
index 91d4ef11193..de5087e163c 100644
--- a/lisp/org/org-clock.el
+++ b/lisp/org/org-clock.el
@@ -1,7 +1,6 @@
 ;;; org-clock.el --- The time clocking code for Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -37,7 +36,6 @@
 
 (declare-function calendar-absolute-from-iso "cal-iso" (&optional date))
 (declare-function notifications-notify "notifications" (&rest params))
-(declare-function org-pop-to-buffer-same-window "org-compat" (&optional buffer-or-name norecord label))
 (defvar org-time-stamp-formats)
 (defvar org-ts-what)
 
@@ -1499,7 +1497,7 @@ With prefix arg SELECT, offer recently clocked tasks for selection."
               (setq recent t)
               (car org-clock-history))
              (t (error "No active or recent clock task")))))
-    (org-pop-to-buffer-same-window (marker-buffer m))
+    (switch-to-buffer (marker-buffer m))
     (if (or (< m (point-min)) (> m (point-max))) (widen))
     (goto-char m)
     (org-show-entry)
@@ -2640,7 +2638,7 @@ The details of what will be saved are regulated by the variable
 
 (provide 'org-clock)
 
-;; arch-tag: 7b42c5d4-9b36-48be-97c0-66a869daed4c
+
 
 ;;; org-clock.el ends here
 
diff --git a/lisp/org/org-colview.el b/lisp/org/org-colview.el
index debc92a101d..05df6bb7524 100644
--- a/lisp/org/org-colview.el
+++ b/lisp/org/org-colview.el
@@ -1,7 +1,6 @@
 ;;; org-colview.el --- Column View in Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -1526,6 +1525,6 @@ The string should be two numbers joined with a \"-\"."
 
 (provide 'org-colview)
 
-;; arch-tag: 61f5128d-747c-4983-9479-e3871fa3d73c
+
 
 ;;; org-colview.el ends here
diff --git a/lisp/org/org-compat.el b/lisp/org/org-compat.el
index e96918cbcb5..896acc5aeae 100644
--- a/lisp/org/org-compat.el
+++ b/lisp/org/org-compat.el
@@ -1,7 +1,6 @@
 ;;; org-compat.el --- Compatibility code for Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -433,17 +432,8 @@ With two arguments, return floor and remainder of their quotient."
   (let ((q (floor x y)))
     (list q (- x (if y (* y q) q)))))
 
-;; `pop-to-buffer-same-window' has been introduced with Emacs 24.1.
-(defun org-pop-to-buffer-same-window
-  (&optional buffer-or-name norecord label)
-  "Pop to buffer specified by BUFFER-OR-NAME in the selected window."
-  (if (fboundp 'pop-to-buffer-same-window)
-      (funcall
-       'pop-to-buffer-same-window buffer-or-name norecord label)
-    (funcall 'switch-to-buffer buffer-or-name norecord)))
-
 (provide 'org-compat)
 
-;; arch-tag: a0a0579f-e68c-4bdf-9e55-93768b846bbe
+
 
 ;;; org-compat.el ends here
diff --git a/lisp/org/org-crypt.el b/lisp/org/org-crypt.el
index 28d92cc63f7..b260391a0da 100644
--- a/lisp/org/org-crypt.el
+++ b/lisp/org/org-crypt.el
@@ -1,6 +1,6 @@
 ;;; org-crypt.el --- Public key encryption for org-mode entries
 
-;; Copyright (C) 2007, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2007, 2009-2011  Free Software Foundation, Inc.
 
 ;; Emacs Lisp Archive Entry
 ;; Filename: org-crypt.el
@@ -252,6 +252,6 @@ nil      : Leave auto-save-mode enabled.
 
 (provide 'org-crypt)
 
-;; arch-tag: 8202ed2c-221e-4001-9e4b-54674a7e846e
+
 
 ;;; org-crypt.el ends here
diff --git a/lisp/org/org-ctags.el b/lisp/org/org-ctags.el
index f28823f30e9..48eced9ea08 100644
--- a/lisp/org/org-ctags.el
+++ b/lisp/org/org-ctags.el
@@ -1,6 +1,6 @@
 ;;; org-ctags.el - Integrate Emacs "tags" facility with org mode.
 ;;
-;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2011 Free Software Foundation, Inc.
 
 ;; Author: Paul Sexton <eeeickythump@gmail.com>
 ;; Version: 7.7
@@ -140,8 +140,6 @@
 
 (require 'org)
 
-(declare-function org-pop-to-buffer-same-window "org-compat" (&optional buffer-or-name norecord label))
-
 (defgroup org-ctags nil
   "Options concerning use of ctags within org mode."
   :tag "Org-Ctags"
@@ -387,7 +385,7 @@ the new file."
     (cond
      ((get-buffer (concat name ".org"))
       ;; Buffer is already open
-      (org-pop-to-buffer-same-window (get-buffer (concat name ".org"))))
+      (switch-to-buffer (get-buffer (concat name ".org"))))
      ((file-exists-p filename)
       ;; File exists but is not open --> open it
       (message "Opening existing org file `%S'..."
@@ -539,5 +537,5 @@ a new topic."
 
 (provide 'org-ctags)
 
-;; arch-tag: 4b1ddd5a-8529-4b17-bcde-96a922d26343
+
 ;;; org-ctags.el ends here
diff --git a/lisp/org/org-datetree.el b/lisp/org/org-datetree.el
index 11e81a8a155..f02f3789823 100644
--- a/lisp/org/org-datetree.el
+++ b/lisp/org/org-datetree.el
@@ -1,6 +1,6 @@
 ;;; org-datetree.el --- Create date entries in a tree
 
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -195,6 +195,6 @@ before running this command, even though the command tries to be smart."
 
 (provide 'org-datetree)
 
-;; arch-tag: 1daea962-fd08-448b-9f98-6e8b511b3601
+
 
 ;;; org-datetree.el ends here
diff --git a/lisp/org/org-docbook.el b/lisp/org/org-docbook.el
index bb17a4dcde2..f964a93fa1c 100644
--- a/lisp/org/org-docbook.el
+++ b/lisp/org/org-docbook.el
@@ -1,6 +1,6 @@
 ;;; org-docbook.el --- DocBook exporter for org-mode
 ;;
-;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2011 Free Software Foundation, Inc.
 ;;
 ;; Emacs Lisp Archive Entry
 ;; Filename: org-docbook.el
@@ -1445,5 +1445,5 @@ the alist of previous items."
 
 (provide 'org-docbook)
 
-;; arch-tag: a24a127c-d365-4c2a-9e9b-f7dcb0ebfdc3
+
 ;;; org-docbook.el ends here
diff --git a/lisp/org/org-docview.el b/lisp/org/org-docview.el
index e13cdfd666a..201567251d7 100644
--- a/lisp/org/org-docview.el
+++ b/lisp/org/org-docview.el
@@ -1,6 +1,6 @@
 ;;; org-docview.el --- support for links to doc-view-mode buffers
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 ;; Author: Jan Böcker <jan.boecker at jboecker dot de>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -88,6 +88,6 @@ and append it."
 
 (provide 'org-docview)
 
-;; arch-tag: dd147a78-cce1-481b-b40a-15869417debe
+
 
 ;;; org-docview.el ends here
diff --git a/lisp/org/org-entities.el b/lisp/org/org-entities.el
index 0146abb07cf..1e7fd627a17 100644
--- a/lisp/org/org-entities.el
+++ b/lisp/org/org-entities.el
@@ -1,6 +1,6 @@
 ;;; org-entities.el --- Support for special entities in Org-mode
 
-;; Copyright (C) 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2011 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>,
 ;;         Ulf Stegemann <ulf at zeitform dot de>
@@ -568,6 +568,6 @@ Kind can be any of `latex', `html', `ascii', `latin1', or `utf8'."
 ;; coding: utf-8
 ;; End:
 
-;; arch-tag: e6bd163f-7419-4009-9c93-a74623016424
+
 
 ;;; org-entities.el ends here
diff --git a/lisp/org/org-exp-blocks.el b/lisp/org/org-exp-blocks.el
index 43cb9d10f03..398da3859d0 100644
--- a/lisp/org/org-exp-blocks.el
+++ b/lisp/org/org-exp-blocks.el
@@ -1,7 +1,6 @@
 ;;; org-exp-blocks.el --- pre-process blocks when exporting org files
 
-;; Copyright (C) 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Version: 7.7
@@ -377,5 +376,5 @@ other backends, it converts the comment into an EXAMPLE segment."
 
 (provide 'org-exp-blocks)
 
-;; arch-tag: 1c365fe9-8808-4f72-bb15-0b00f36d8024
+
 ;;; org-exp-blocks.el ends here
diff --git a/lisp/org/org-exp.el b/lisp/org/org-exp.el
index b00e86dabf6..ee8e6027706 100644
--- a/lisp/org/org-exp.el
+++ b/lisp/org/org-exp.el
@@ -1,7 +1,6 @@
 ;;; org-exp.el --- ASCII, HTML, XOXO and iCalendar export for Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -48,8 +47,6 @@
 (declare-function org-inlinetask-remove-END-maybe "org-inlinetask" ())
 (declare-function org-table-cookie-line-p "org-table" (line))
 (declare-function org-table-colgroup-line-p "org-table" (line))
-(declare-function org-pop-to-buffer-same-window "org-compat" 
-                  (&optional buffer-or-name norecord label))
 
 (autoload 'org-export-generic "org-export-generic" "Export using the generic exporter" t)
 
@@ -2975,7 +2972,7 @@ directory."
          (region (buffer-string))
          str-ret)
     (save-excursion
-      (org-pop-to-buffer-same-window buffer)
+      (switch-to-buffer buffer)
       (erase-buffer)
       (insert region)
       (let ((org-inhibit-startup t)) (org-mode))
@@ -3231,6 +3228,6 @@ The depends on the variable `org-export-copy-to-kill'."
 
 (provide 'org-exp)
 
-;; arch-tag: 65985fe9-095c-49c7-a7b6-cb4ee15c0a95
+
 
 ;;; org-exp.el ends here
diff --git a/lisp/org/org-faces.el b/lisp/org/org-faces.el
index 960eb615450..af9632eec44 100644
--- a/lisp/org/org-faces.el
+++ b/lisp/org/org-faces.el
@@ -1,7 +1,6 @@
 ;;; org-faces.el --- Face definitions for Org-mode.
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -736,6 +735,6 @@ level org-n-level-faces"
 
 (provide 'org-faces)
 
-;; arch-tag: 9dab5f91-c4b9-4d6f-bac3-1f6211ad0a04
+
 
 ;;; org-faces.el ends here
diff --git a/lisp/org/org-feed.el b/lisp/org/org-feed.el
index a05463a2875..d1b31f11b4a 100644
--- a/lisp/org/org-feed.el
+++ b/lisp/org/org-feed.el
@@ -1,6 +1,6 @@
 ;;; org-feed.el --- Add RSS feed items to Org files
 ;;
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -436,7 +436,7 @@ it can be a list structured like an entry in `org-feed-alist'."
   (if (stringp feed) (setq feed (assoc feed org-feed-alist)))
   (unless feed
     (error "No such feed in `org-feed-alist"))
-  (org-pop-to-buffer-same-window
+  (switch-to-buffer
    (org-feed-update feed 'retrieve-only))
   (goto-char (point-min)))
 
@@ -674,5 +674,5 @@ formatted as a string, not the original XML data."
 
 (provide 'org-feed)
 
-;; arch-tag: 0929b557-9bc4-47f4-9633-30a12dbb5ae2
+
 ;;; org-feed.el ends here
diff --git a/lisp/org/org-footnote.el b/lisp/org/org-footnote.el
index 9a92bd5db1d..223d2573fdb 100644
--- a/lisp/org/org-footnote.el
+++ b/lisp/org/org-footnote.el
@@ -1,6 +1,6 @@
 ;;; org-footnote.el --- Footnote support in Org and elsewhere
 ;;
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -862,6 +862,6 @@ If LABEL is non-nil, delete that footnote instead."
 
 (provide 'org-footnote)
 
-;; arch-tag: 1b5954df-fb5d-4da5-8709-78d944dbfc37
+
 
 ;;; org-footnote.el ends here
diff --git a/lisp/org/org-freemind.el b/lisp/org/org-freemind.el
index 6664bf1f4f2..91a1e5e59cb 100644
--- a/lisp/org/org-freemind.el
+++ b/lisp/org/org-freemind.el
@@ -1,6 +1,6 @@
 ;;; org-freemind.el --- Export Org files to freemind
 
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
 
 ;; Author: Lennart Borgman (lennart O borgman A gmail O com)
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -57,26 +57,6 @@
 ;;             Added y/n question before showing in FreeMind.
 ;; 2009-11-04: Added support for #+BEGIN_HTML.
 ;;
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; This program 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 2, or
-;; (at your option) any later version.
-;;
-;; This program 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 this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
-;; Floor, Boston, MA 02110-1301, USA.
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
 ;;; Code:
 
 (require 'xml)
@@ -1237,7 +1217,7 @@ PATH should be a list of steps, where each step has the form
 
 (provide 'org-freemind)
 
-;; arch-tag: e7b0d776-94fd-404a-b35e-0f855fae3627
+
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; org-freemind.el ends here
diff --git a/lisp/org/org-gnus.el b/lisp/org/org-gnus.el
index da0712b9249..0ccb66ca497 100644
--- a/lisp/org/org-gnus.el
+++ b/lisp/org/org-gnus.el
@@ -1,7 +1,6 @@
 ;;; org-gnus.el --- Support for links to Gnus groups and messages from within Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;;         Tassilo Horn <tassilo at member dot fsf dot org>
@@ -291,6 +290,6 @@ If `org-store-link' was called with a prefix arg the meaning of
 
 (provide 'org-gnus)
 
-;; arch-tag: 512e0840-58fa-45b3-b456-71e10fa2376d
+
 
 ;;; org-gnus.el ends here
diff --git a/lisp/org/org-habit.el b/lisp/org/org-habit.el
index ebdfa0c773c..c146a5bebbd 100644
--- a/lisp/org/org-habit.el
+++ b/lisp/org/org-habit.el
@@ -1,6 +1,6 @@
 ;;; org-habit.el --- The habit tracking code for Org-mode
 
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw at gnu dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -358,6 +358,6 @@ current time."
 
 (provide 'org-habit)
 
-;; arch-tag: 64e070d9-bd09-4917-bd44-44465f5ed348
+
 
 ;;; org-habit.el ends here
diff --git a/lisp/org/org-html.el b/lisp/org/org-html.el
index c150b3d8dd2..46126ce2573 100644
--- a/lisp/org/org-html.el
+++ b/lisp/org/org-html.el
@@ -1,7 +1,6 @@
 ;;; org-html.el --- HTML export for Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -35,8 +34,6 @@
 
 (declare-function org-id-find-id-file "org-id" (id))
 (declare-function htmlize-region "ext:htmlize" (beg end))
-(declare-function org-pop-to-buffer-same-window 
-                  "org-compat" (&optional buffer-or-name norecord label))
 
 (defgroup org-export-html nil
   "Options specific for HTML export of Org-mode files."
@@ -2266,7 +2263,7 @@ that uses these same face definitions."
         (when (and (symbolp f) (or (not i) (not (listp i))))
           (insert (org-add-props (copy-sequence "1") nil 'face f))))
       (htmlize-region (point-min) (point-max))))
-  (org-pop-to-buffer-same-window "*html*")
+  (switch-to-buffer "*html*")
   (goto-char (point-min))
   (if (re-search-forward "<style" nil t)
       (delete-region (point-min) (match-beginning 0)))
@@ -2607,5 +2604,5 @@ the alist of previous items."
 
 (provide 'org-html)
 
-;; arch-tag: 8109d84d-eb8f-460b-b1a8-f45f3a6c7ea1
+
 ;;; org-html.el ends here
diff --git a/lisp/org/org-icalendar.el b/lisp/org/org-icalendar.el
index bc0efce6a81..dd64fc2f783 100644
--- a/lisp/org/org-icalendar.el
+++ b/lisp/org/org-icalendar.el
@@ -1,7 +1,6 @@
 ;;; org-icalendar.el --- iCalendar export for Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -685,5 +684,5 @@ a time), or the day by one (if it does not contain a time)."
 
 (provide 'org-icalendar)
 
-;; arch-tag: 2dee2b6e-9211-4aee-8a47-a3c7e5bc30cf
+
 ;;; org-icalendar.el ends here
diff --git a/lisp/org/org-id.el b/lisp/org/org-id.el
index d724dff3060..c2d5cf0f25b 100644
--- a/lisp/org/org-id.el
+++ b/lisp/org/org-id.el
@@ -1,6 +1,6 @@
 ;;; org-id.el --- Global identifiers for Org-mode entries
 ;;
-;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -74,8 +74,6 @@
 (require 'org)
 
 (declare-function message-make-fqdn "message" ())
-(declare-function org-pop-to-buffer-same-window 
-                  "org-compat" (&optional buffer-or-name norecord label))
 
 ;;; Customization
 
@@ -255,7 +253,7 @@ Move the cursor to that entry in that buffer."
   (let ((m (org-id-find id 'marker)))
     (unless m
       (error "Cannot find entry with ID \"%s\"" id))
-    (org-pop-to-buffer-same-window (marker-buffer m))
+    (switch-to-buffer (marker-buffer m))
     (goto-char m)
     (move-marker m nil)
     (org-show-context)))
@@ -643,6 +641,6 @@ optional argument MARKERP, return the position as a new marker."
 
 ;;; org-id.el ends here
 
-;; arch-tag: e5abaca4-e16f-4b25-832a-540cfb63a712
+
 
 
diff --git a/lisp/org/org-indent.el b/lisp/org/org-indent.el
index 68821a4f772..a2099a4bde3 100644
--- a/lisp/org/org-indent.el
+++ b/lisp/org/org-indent.el
@@ -1,5 +1,5 @@
 ;;; org-indent.el --- Dynamic indentation for  Org-mode
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -322,5 +322,5 @@ Point is assumed to be at the beginning of a headline."
 
 (provide 'org-indent)
 
-;; arch-tag: b76736bc-9f4a-43cd-977c-ecfd6689846a
+
 ;;; org-indent.el ends here
diff --git a/lisp/org/org-info.el b/lisp/org/org-info.el
index d1bfc53e5e3..4f44045f9bf 100644
--- a/lisp/org/org-info.el
+++ b/lisp/org/org-info.el
@@ -1,7 +1,6 @@
 ;;; org-info.el --- Support for links to Info nodes from within Org-Mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -78,6 +77,6 @@
 
 (provide 'org-info)
 
-;; arch-tag: 1e289f54-7176-487f-b575-dd4854bab15e
+
 
 ;;; org-info.el ends here
diff --git a/lisp/org/org-inlinetask.el b/lisp/org/org-inlinetask.el
index 7a52d6b6b40..72c19062983 100644
--- a/lisp/org/org-inlinetask.el
+++ b/lisp/org/org-inlinetask.el
@@ -1,6 +1,6 @@
 ;;; org-inlinetask.el --- Tasks independent of outline hierarchy
 
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/lisp/org/org-irc.el b/lisp/org/org-irc.el
index bc0e94450b7..7a84d2053ad 100644
--- a/lisp/org/org-irc.el
+++ b/lisp/org/org-irc.el
@@ -1,6 +1,6 @@
 ;;; org-irc.el --- Store links to IRC sessions
 ;;
-;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
 ;;
 ;; Author: Philip Jackson <emacs@shellarchive.co.uk>
 ;; Keywords: erc, irc, link, org
@@ -60,8 +60,6 @@
 (declare-function erc-server-buffer "erc" ())
 (declare-function erc-get-server-nickname-list "erc" ())
 (declare-function erc-cmd-JOIN "erc" (channel &optional key))
-(declare-function org-pop-to-buffer-same-window 
-                  "org-compat" (&optional buffer-or-name norecord label))
 
 (defvar org-irc-client 'erc
   "The IRC client to act on.")
@@ -234,7 +232,7 @@ default."
                                       (throw 'found x))))))
                 (if chan-buf
                     (progn
-                      (org-pop-to-buffer-same-window chan-buf)
+                      (switch-to-buffer chan-buf)
                       ;; if we got a nick, and they're in the chan,
                       ;; then start a chat with them
                       (let ((nick (pop link)))
@@ -245,14 +243,14 @@ default."
                                 (insert (concat nick ": ")))
                               (error "%s not found in %s" nick chan-name)))))
                     (progn
-                      (org-pop-to-buffer-same-window server-buffer)
+                      (switch-to-buffer server-buffer)
                       (erc-cmd-JOIN chan-name))))
-              (org-pop-to-buffer-same-window server-buffer)))
+              (switch-to-buffer server-buffer)))
         ;; no server match, make new connection
         (erc-select :server server :port port))))
 
 (provide 'org-irc)
 
-;; arch-tag: 018d7dda-53b8-4a35-ba92-6670939e525a
+
 
 ;;; org-irc.el ends here
diff --git a/lisp/org/org-jsinfo.el b/lisp/org/org-jsinfo.el
index cdefef8428c..3ef8c4c809c 100644
--- a/lisp/org/org-jsinfo.el
+++ b/lisp/org/org-jsinfo.el
@@ -1,7 +1,6 @@
 ;;; org-jsinfo.el --- Support for org-info.js Javascript in Org HTML export
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -205,6 +204,6 @@ Option settings will replace the %MANAGER-OPTIONS cookie."
 (provide 'org-infojs)
 (provide 'org-jsinfo)
 
-;; arch-tag: c71d1d85-3337-4817-a066-725e74ac9eac
+
 
 ;;; org-jsinfo.el ends here
diff --git a/lisp/org/org-latex.el b/lisp/org/org-latex.el
index bd9c1138c7f..0402b2da964 100644
--- a/lisp/org/org-latex.el
+++ b/lisp/org/org-latex.el
@@ -1,6 +1,6 @@
 ;;; org-latex.el --- LaTeX exporter for org-mode
 ;;
-;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2011 Free Software Foundation, Inc.
 ;;
 ;; Emacs Lisp Archive Entry
 ;; Filename: org-latex.el
@@ -2769,6 +2769,6 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
 (provide 'org-export-latex)
 (provide 'org-latex)
 
-;; arch-tag: 23c2b87d-da04-4c2d-ad2d-1eb6487bc3ad
+
 
 ;;; org-latex.el ends here
diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el
index 2339c4d1bc1..d3c5dd99aa6 100644
--- a/lisp/org/org-list.el
+++ b/lisp/org/org-list.el
@@ -1,7 +1,6 @@
 ;;; org-list.el --- Plain lists for Org-mode
 ;;
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;;         Bastien Guerry <bzg AT altern DOT org>
@@ -3201,5 +3200,5 @@ with overruling parameters for `org-list-to-generic'."
 
 (provide 'org-list)
 
-;; arch-tag: 73cf50c1-200f-4d1d-8a53-4e842a5b11c8
+
 ;;; org-list.el ends here
diff --git a/lisp/org/org-mac-message.el b/lisp/org/org-mac-message.el
index 9c1089994ba..fc52b92a21d 100644
--- a/lisp/org/org-mac-message.el
+++ b/lisp/org/org-mac-message.el
@@ -1,6 +1,6 @@
 ;;; org-mac-message.el --- Links to Apple Mail.app messages from within Org-mode
 
-;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 ;;         Christopher Suckling <suckling at gmail dot com>
@@ -214,6 +214,6 @@ list of message:// links to flagged mail after heading."
 
 (provide 'org-mac-message)
 
-;; arch-tag: 3806d0c1-abe1-4db6-9c31-f3ed7d4a9b32
+
 
 ;;; org-mac-message.el ends here
diff --git a/lisp/org/org-macs.el b/lisp/org/org-macs.el
index 906be613a9c..dc413f4d993 100644
--- a/lisp/org/org-macs.el
+++ b/lisp/org/org-macs.el
@@ -1,7 +1,6 @@
 ;;; org-macs.el --- Top-level definitions for Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -372,6 +371,6 @@ The number of levels is controlled by `org-inlinetask-min-level'"
 
 (provide 'org-macs)
 
-;; arch-tag: 7e6a73ce-aac9-4fc0-9b30-ce6f89dc6668
+
 
 ;;; org-macs.el ends here
diff --git a/lisp/org/org-mew.el b/lisp/org/org-mew.el
index 2f095949858..97cad1ae316 100644
--- a/lisp/org/org-mew.el
+++ b/lisp/org/org-mew.el
@@ -1,6 +1,6 @@
 ;;; org-mew.el --- Support for links to Mew messages from within Org-mode
 
-;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
 
 ;; Author: Tokuya Kameshima <kames at fa2 dot so-net dot ne dot jp>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -135,6 +135,6 @@
 
 (provide 'org-mew)
 
-;; arch-tag: 07ccdca7-6020-4941-a593-588a1e51b870
+
 
 ;;; org-mew.el ends here
diff --git a/lisp/org/org-mhe.el b/lisp/org/org-mhe.el
index c75bed37b8c..7075018894f 100644
--- a/lisp/org/org-mhe.el
+++ b/lisp/org/org-mhe.el
@@ -1,7 +1,6 @@
 ;;; org-mhe.el --- Support for links to MH-E messages from within Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Thomas Baumann <thomas dot baumann at ch dot tum dot de>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -226,6 +225,6 @@ folders."
 
 (provide 'org-mhe)
 
-;; arch-tag: dcb05484-8627-491d-a8c1-01dbd2bde4ae
+
 
 ;;; org-mhe.el ends here
diff --git a/lisp/org/org-mks.el b/lisp/org/org-mks.el
index c71db81b52f..5f3ebbb6c81 100644
--- a/lisp/org/org-mks.el
+++ b/lisp/org/org-mks.el
@@ -1,6 +1,6 @@
 ;;; org-mks.el --- Multi-key-selection for Org-mode
 
-;; Copyright (C) 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2010-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -132,6 +132,6 @@ only the bare key is returned."
 
 (provide 'org-mks)
 
-;; arch-tag: 4ea90d0e-c6e4-4684-bd61-baf878712f9f
+
 
 ;;; org-mks.el ends here
diff --git a/lisp/org/org-mobile.el b/lisp/org/org-mobile.el
index 40fe7031c6f..f270419877e 100644
--- a/lisp/org/org-mobile.el
+++ b/lisp/org/org-mobile.el
@@ -1,5 +1,5 @@
 ;;; org-mobile.el --- Code for asymmetric sync with a mobile device
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -38,9 +38,6 @@
 
 (eval-when-compile (require 'cl))
 
-(declare-function org-pop-to-buffer-same-window 
-                  "org-compat" (&optional buffer-or-name norecord label))
-
 (defgroup org-mobile nil
   "Options concerning support for a viewer/editor on a mobile device."
   :tag "Org Mobile"
@@ -912,7 +909,7 @@ If BEG and END are given, only do this in that region."
                                    (buffer-file-name (current-buffer))))))
                 (error (setq org-mobile-error msg))))
             (when org-mobile-error
-              (org-pop-to-buffer-same-window (marker-buffer marker))
+              (switch-to-buffer (marker-buffer marker))
               (goto-char marker)
               (incf cnt-error)
               (insert (if (stringp (nth 1 org-mobile-error))
@@ -1099,7 +1096,7 @@ A and B must be strings or nil."
 
 (provide 'org-mobile)
 
-;; arch-tag: ace0e26c-58f2-4309-8a61-05ec1535f658
+
 
 ;;; org-mobile.el ends here
 
diff --git a/lisp/org/org-mouse.el b/lisp/org/org-mouse.el
index 8d59073ce40..8f1e7735693 100644
--- a/lisp/org/org-mouse.el
+++ b/lisp/org/org-mouse.el
@@ -1,6 +1,6 @@
 ;;; org-mouse.el --- Better mouse support for org-mode
 
-;; Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation
+;; Copyright (C) 2006-2011 Free Software Foundation
 ;;
 ;; Author: Piotr Zielinski <piotr dot zielinski at gmail dot com>
 ;; Maintainer: Carsten Dominik <carsten at orgmode dot org>
@@ -1146,6 +1146,6 @@ This means, between the beginning of line and the point."
 
 (provide 'org-mouse)
 
-;; arch-tag: ff1ae557-3529-41a3-95c6-baaebdcc280f
+
 
 ;;; org-mouse.el ends here
diff --git a/lisp/org/org-pcomplete.el b/lisp/org/org-pcomplete.el
index e34ab38e4e5..cede736d929 100644
--- a/lisp/org/org-pcomplete.el
+++ b/lisp/org/org-pcomplete.el
@@ -1,7 +1,6 @@
 ;;; org-pcomplete.el --- In-buffer completion code
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;;         John Wiegley <johnw at gnu dot org>
@@ -277,6 +276,6 @@ Complete a language in the first field, the header arguments and switches."
 
 (provide 'org-pcomplete)
 
-;; arch-tag: 
+
 
 ;;; org-pcomplete.el ends here
diff --git a/lisp/org/org-plot.el b/lisp/org/org-plot.el
index 7f1bbac06b6..b90c248eb6d 100644
--- a/lisp/org/org-plot.el
+++ b/lisp/org/org-plot.el
@@ -1,6 +1,6 @@
 ;;; org-plot.el --- Support for plotting from Org-mode
 
-;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
 ;;
 ;; Author: Eric Schulte <schulte dot eric at gmail dot com>
 ;; Keywords: tables, plotting
@@ -350,5 +350,5 @@ line directly before or after the table."
 
 (provide 'org-plot)
 
-;; arch-tag: 5763f7c6-0c75-416d-b070-398ee4ec0eca
+
 ;;; org-plot.el ends here
diff --git a/lisp/org/org-protocol.el b/lisp/org/org-protocol.el
index 42a71224aea..655123cafa9 100644
--- a/lisp/org/org-protocol.el
+++ b/lisp/org/org-protocol.el
@@ -1,7 +1,6 @@
 ;;; org-protocol.el --- Intercept calls from emacsclient to trigger custom actions.
 ;;
-;; Copyright (C) 2008, 2009, 2010
-;;          Free Software Foundation, Inc.
+;; Copyright (C) 2008-2011  Free Software Foundation, Inc.
 ;;
 ;; Author: Bastien Guerry <bzg AT altern DOT org>
 ;; Author: Daniel M German <dmg AT uvic DOT org>
@@ -645,5 +644,5 @@ project-plist is the CDR of an element in `org-publish-project-alist', reuse
 
 (provide 'org-protocol)
 
-;; arch-tag: b5c5c2ac-77cf-4a94-a649-2163dff95846
+
 ;;; org-protocol.el ends here
diff --git a/lisp/org/org-publish.el b/lisp/org/org-publish.el
index 67bccae15a2..ddb3cf7b63a 100644
--- a/lisp/org/org-publish.el
+++ b/lisp/org/org-publish.el
@@ -1,6 +1,5 @@
 ;;; org-publish.el --- publish related org-mode files as a website
-;; Copyright (C) 2006, 2007, 2008, 2009, 2010
-;;          Free Software Foundation, Inc.
+;; Copyright (C) 2006-2011  Free Software Foundation, Inc.
 
 ;; Author: David O'Toole <dto@gnu.org>
 ;; Maintainer: Carsten Dominik <carsten DOT dominik AT gmail DOT com>
@@ -370,8 +369,6 @@ This is a compatibility function for Emacsen without `delete-dups'."
 
 (declare-function org-publish-delete-dups "org-publish" (list))
 (declare-function find-lisp-find-files "find-lisp" (directory regexp))
-(declare-function org-pop-to-buffer-same-window 
-                  "org-compat" (&optional buffer-or-name norecord label))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Getting project information out of org-publish-project-alist
@@ -562,7 +559,7 @@ PUB-DIR is the publishing directory."
     (make-directory pub-dir t))
   (let ((visiting (find-buffer-visiting filename)))
     (save-excursion
-      (org-pop-to-buffer-same-window (or visiting (find-file filename)))
+      (switch-to-buffer (or visiting (find-file filename)))
       (let* ((plist (cons :buffer-will-be-killed (cons t plist)))
              (init-buf (current-buffer))
              (init-point (point))
@@ -863,7 +860,7 @@ system's modification time.
 It returns time in `current-time' format."
   (let ((visiting (find-buffer-visiting file)))
     (save-excursion
-      (org-pop-to-buffer-same-window (or visiting (find-file-noselect file nil t)))
+      (switch-to-buffer (or visiting (find-file-noselect file nil t)))
       (let* ((plist (org-infile-export-plist))
              (date (plist-get plist :date)))
         (unless visiting
@@ -1183,6 +1180,6 @@ Returns value on success, else nil."
 
 (provide 'org-publish)
 
-;; arch-tag: 72807f3c-8af0-4a6b-8dca-c3376eb25adb
+
 
 ;;; org-publish.el ends here
diff --git a/lisp/org/org-remember.el b/lisp/org/org-remember.el
index 40bf6888dff..2bc5ef92ae7 100644
--- a/lisp/org/org-remember.el
+++ b/lisp/org/org-remember.el
@@ -1,7 +1,6 @@
 ;;; org-remember.el --- Fast note taking in Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -41,8 +40,6 @@
 (declare-function remember "remember" (&optional initial))
 (declare-function remember-buffer-desc "remember" ())
 (declare-function remember-finalize "remember" ())
-(declare-function org-pop-to-buffer-same-window 
-                  "org-compat" (&optional buffer-or-name norecord label))
 
 (defvar remember-save-after-remembering)
 (defvar remember-register)
@@ -789,7 +786,7 @@ The user is queried for the template."
       (setq heading org-remember-default-headline))
     (setq visiting (org-find-base-buffer-visiting file))
     (if (not visiting) (find-file-noselect file))
-    (org-pop-to-buffer-same-window (or visiting (get-file-buffer file)))
+    (switch-to-buffer (or visiting (get-file-buffer file)))
     (widen)
     (goto-char (point-min))
     (if (re-search-forward
@@ -1153,7 +1150,7 @@ See also the variable `org-reverse-note-order'."
 
 (provide 'org-remember)
 
-;; arch-tag: 497f30d0-4bc3-4097-8622-2d27ac5f2698
+
 
 ;;; org-remember.el ends here
 
diff --git a/lisp/org/org-rmail.el b/lisp/org/org-rmail.el
index cbb63365985..1169c206981 100644
--- a/lisp/org/org-rmail.el
+++ b/lisp/org/org-rmail.el
@@ -1,7 +1,6 @@
 ;;; org-rmail.el --- Support for links to Rmail messages from within Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -115,6 +114,6 @@
 
 (provide 'org-rmail)
 
-;; arch-tag: c6cf4a8b-6639-4b7f-821f-bdf10746b173
+
 
 ;;; org-rmail.el ends here
diff --git a/lisp/org/org-special-blocks.el b/lisp/org/org-special-blocks.el
index 4f4d5e8e561..c09b27de895 100644
--- a/lisp/org/org-special-blocks.el
+++ b/lisp/org/org-special-blocks.el
@@ -1,25 +1,23 @@
 ;;; org-special-blocks.el --- Turn blocks into LaTeX envs and HTML divs
 
-;; Copyright (C) 2009 Chris Gray
+;; Copyright (C) 2009, 2011  Free Software Foundation, Inc.
 
 ;; Author: Chris Gray <chrismgray@gmail.com>
 
 ;; This file is part of GNU Emacs.
 
-;; This program 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 2, or (at
-;; your option) any later version.
+;; 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.
 
-;; This program 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.
+;; 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 this program ; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/org/org-src.el b/lisp/org/org-src.el
index 30ffc34a6eb..5de55fa455f 100644
--- a/lisp/org/org-src.el
+++ b/lisp/org/org-src.el
@@ -1,7 +1,6 @@
 ;;; org-src.el --- Source code examples in Org
 ;;
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;;         Bastien Guerry <bzg AT altern DOT org>
@@ -43,8 +42,6 @@
 (declare-function org-at-table.el-p "org" ())
 (declare-function org-get-indentation "org" (&optional line))
 (declare-function org-switch-to-buffer-other-window "org" (&rest args))
-(declare-function org-pop-to-buffer-same-window 
-                  "org-compat" (&optional buffer-or-name norecord label))
 
 (defcustom org-edit-src-region-extra nil
   "Additional regexps to identify regions for editing with `org-edit-src-code'.
@@ -342,7 +339,7 @@ buffer."
 (defun org-src-switch-to-buffer (buffer context)
   (case org-src-window-setup
     ('current-window
-     (org-pop-to-buffer-same-window buffer))
+     (switch-to-buffer buffer))
     ('other-window
      (switch-to-buffer-other-window buffer))
     ('other-frame
@@ -353,7 +350,7 @@ buffer."
           (delete-frame frame)))
        ('save
         (kill-buffer (current-buffer))
-        (org-pop-to-buffer-same-window buffer))
+        (switch-to-buffer buffer))
        (t
         (switch-to-buffer-other-frame buffer))))
     ('reorganize-frame
@@ -365,7 +362,7 @@ buffer."
     (t
      (message "Invalid value %s for org-src-window-setup"
               (symbol-name org-src-window-setup))
-     (org-pop-to-buffer-same-window buffer))))
+     (switch-to-buffer buffer))))
 
 (defun org-src-construct-edit-buffer-name (org-buffer-name lang)
   "Construct the buffer name for a source editing buffer."
@@ -425,7 +422,7 @@ the fragment in the Org-mode buffer."
             begline (save-excursion (goto-char beg) (org-current-line)))
       (if (and (setq buffer (org-edit-src-find-buffer beg end))
                (y-or-n-p "Return to existing edit buffer? [n] will revert changes: "))
-          (org-pop-to-buffer-same-window buffer)
+          (switch-to-buffer buffer)
         (when buffer
           (with-current-buffer buffer
             (if (boundp 'org-edit-src-overlay)
@@ -445,7 +442,7 @@ the fragment in the Org-mode buffer."
                            (define-key map [mouse-1] 'org-edit-src-continue)
                            map))
         (overlay-put ovl :read-only "Leave me alone")
-        (org-pop-to-buffer-same-window buffer)
+        (switch-to-buffer buffer)
         (insert code)
         (remove-text-properties (point-min) (point-max)
                                 '(display nil invisible nil intangible nil))
@@ -814,5 +811,5 @@ LANG is a string, and the returned major mode is a symbol."
 
 (provide 'org-src)
 
-;; arch-tag: 6a1fc84f-dec7-47be-a416-64be56bea5d8
+
 ;;; org-src.el ends here
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index 82d1e1309b1..7f49b3236ee 100644
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -1,7 +1,6 @@
 ;;; org-table.el --- The table editor for Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -4721,7 +4720,7 @@ list of the fields in the rectangle ."
 
 (provide 'org-table)
 
-;; arch-tag: 4d21cfdd-0268-440a-84b0-09237a0fe0ef
+
 
 ;;; org-table.el ends here
 
diff --git a/lisp/org/org-taskjuggler.el b/lisp/org/org-taskjuggler.el
index 8a2ccc8dd83..0d9516a389e 100644
--- a/lisp/org/org-taskjuggler.el
+++ b/lisp/org/org-taskjuggler.el
@@ -1,6 +1,6 @@
 ;;; org-taskjuggler.el --- TaskJuggler exporter for org-mode
 ;;
-;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2011 Free Software Foundation, Inc.
 ;;
 ;; Emacs Lisp Archive Entry
 ;; Filename: org-taskjuggler.el
diff --git a/lisp/org/org-timer.el b/lisp/org/org-timer.el
index e612d45b145..b8fbc4ff388 100644
--- a/lisp/org/org-timer.el
+++ b/lisp/org/org-timer.el
@@ -1,6 +1,6 @@
 ;;; org-timer.el --- The relative timer code for Org-mode
 
-;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -403,6 +403,6 @@ replace any running timer."
 
 (provide 'org-timer)
 
-;; arch-tag: 97538f8c-3871-4509-8f23-1e7b3ff3d107
+
 
 ;;; org-timer.el ends here
diff --git a/lisp/org/org-vm.el b/lisp/org/org-vm.el
index d7e69e35092..d0991b81116 100644
--- a/lisp/org/org-vm.el
+++ b/lisp/org/org-vm.el
@@ -1,7 +1,6 @@
 ;;; org-vm.el --- Support for links to VM messages from within Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -140,6 +139,6 @@
 
 (provide 'org-vm)
 
-;; arch-tag: cbc3047b-935e-4d2a-96e7-c5b0117aaa6d
+
 
 ;;; org-vm.el ends here
diff --git a/lisp/org/org-w3m.el b/lisp/org/org-w3m.el
index dcdd02230d8..bce90092e6e 100644
--- a/lisp/org/org-w3m.el
+++ b/lisp/org/org-w3m.el
@@ -1,6 +1,6 @@
 ;;; org-w3m.el --- Support from copy and paste from w3m to Org-mode
 
-;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
 
 ;; Author: Andy Stewart <lazycat dot manatee at gmail dot com>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -168,6 +168,6 @@ Return t if there is no previous link; otherwise, return nil."
 
 (provide 'org-w3m)
 
-;; arch-tag: 851d7447-488d-49f0-a14d-46c092e84352
+
 
 ;;; org-w3m.el ends here
diff --git a/lisp/org/org-wl.el b/lisp/org/org-wl.el
index 1a0a357d4fd..9bc49c8b91a 100644
--- a/lisp/org/org-wl.el
+++ b/lisp/org/org-wl.el
@@ -1,7 +1,6 @@
 ;;; org-wl.el --- Support for links to Wanderlust messages from within Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Tokuya Kameshima <kames at fa2 dot so-net dot ne dot jp>
 ;;         David Maus <dmaus at ictsoc dot de>
@@ -310,6 +309,6 @@ for namazu index."
 
 (provide 'org-wl)
 
-;; arch-tag: 29b75a0f-ef2e-430b-8abc-acff75bde54a
+
 
 ;;; org-wl.el ends here
diff --git a/lisp/org/org-xoxo.el b/lisp/org/org-xoxo.el
index e81e4e74381..02f351fe724 100644
--- a/lisp/org/org-xoxo.el
+++ b/lisp/org/org-xoxo.el
@@ -1,7 +1,6 @@
 ;;; org-xoxo.el --- XOXO export for Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -124,5 +123,5 @@ The XOXO buffer is named *xoxo-<source buffer name>*"
 
 (provide 'org-xoxo)
 
-;; arch-tag: 16e6a31f-f4f5-46f1-af18-48dc89faa702
+
 ;;; org-xoxo.el ends here
diff --git a/lisp/org/org.el b/lisp/org/org.el
index c29ef115400..d494bdb28fa 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -1,7 +1,6 @@
 ;;; org.el --- Outline-based notes management and organizer
 ;; Carstens outline-mode for keeping track of everything.
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -106,7 +105,6 @@
 (declare-function org-inlinetask-at-task-p "org-inlinetask" ())
 (declare-function org-inlinetask-outline-regexp "org-inlinetask" ())
 (declare-function org-inlinetask-toggle-visibility "org-inlinetask" ())
-(declare-function org-pop-to-buffer-same-window "org-compat" (&optional buffer-or-name norecord label))
 (declare-function org-at-clock-log-p "org-clock" ())
 (declare-function org-clock-timestamps-up "org-clock" ())
 (declare-function org-clock-timestamps-down "org-clock" ())
@@ -6652,7 +6650,7 @@ or nil."
       (save-window-excursion
         (delete-other-windows)
         (and (get-buffer "*org-goto*") (kill-buffer "*org-goto*"))
-        (org-pop-to-buffer-same-window
+        (switch-to-buffer
          (condition-case nil
              (make-indirect-buffer (current-buffer) "*org-goto*")
            (error (make-indirect-buffer (current-buffer) "*org-goto*"))))
@@ -6790,7 +6788,7 @@ frame is not changed."
           (and arg (eq org-indirect-buffer-display 'dedicated-frame)))
       (select-frame (make-frame))
       (delete-other-windows)
-      (org-pop-to-buffer-same-window ibuf)
+      (switch-to-buffer ibuf)
       (org-set-frame-title heading))
      ((eq org-indirect-buffer-display 'dedicated-frame)
       (raise-frame
@@ -6799,10 +6797,10 @@ frame is not changed."
                               org-indirect-dedicated-frame)
                          (setq org-indirect-dedicated-frame (make-frame)))))
       (delete-other-windows)
-      (org-pop-to-buffer-same-window ibuf)
+      (switch-to-buffer ibuf)
       (org-set-frame-title (concat "Indirect: " heading)))
      ((eq org-indirect-buffer-display 'current-window)
-      (org-pop-to-buffer-same-window ibuf))
+      (switch-to-buffer ibuf))
      ((eq org-indirect-buffer-display 'other-window)
       (pop-to-buffer ibuf))
      (t (error "Invalid value")))
@@ -9834,7 +9832,7 @@ onto the ring."
       (setq p org-mark-ring))
     (setq org-mark-ring-last-goto p)
     (setq m (car p))
-    (org-pop-to-buffer-same-window (marker-buffer m))
+    (switch-to-buffer (marker-buffer m))
     (goto-char m)
     (if (or (outline-invisible-p) (org-invisible-p2)) (org-show-context 'mark-goto))))
 
@@ -10430,7 +10428,7 @@ prefix argument (`C-u C-u C-u C-c C-w')."
                          (find-file-noselect file)))
           (if goto
               (progn
-                (org-pop-to-buffer-same-window nbuf)
+                (switch-to-buffer nbuf)
                 (goto-char pos)
                 (org-show-context 'org-goto))
             (if regionp
@@ -12042,7 +12040,7 @@ EXTRA is additional text that will be inserted into the notes buffer."
   (setq org-log-note-window-configuration (current-window-configuration))
   (delete-other-windows)
   (move-marker org-log-note-return-to (point))
-  (org-pop-to-buffer-same-window (marker-buffer org-log-note-marker))
+  (switch-to-buffer (marker-buffer org-log-note-marker))
   (goto-char org-log-note-marker)
   (org-switch-to-buffer-other-window "*Org Note*")
   (erase-buffer)
@@ -15884,7 +15882,7 @@ changes from another.  I believe the procedure must be like this:
        (lambda (b)
          (when (and (with-current-buffer b (org-mode-p))
                     (with-current-buffer b buffer-file-name))
-           (org-pop-to-buffer-same-window b)
+           (switch-to-buffer b)
            (revert-buffer t 'no-confirm)))
        (buffer-list))
       (when (and (featurep 'org-id) org-id-track-globally)
@@ -15908,7 +15906,7 @@ Set `org-completion-use-ido' to make it use ido instead."
         (org-completion-use-ido org-completion-use-ido))
     (unless (or org-completion-use-ido org-completion-use-iswitchb)
       (setq org-completion-use-iswitchb t))
-    (org-pop-to-buffer-same-window
+    (switch-to-buffer
      (org-icompleting-read "Org buffer: "
                            (mapcar 'list (mapcar 'buffer-name blist))
                            nil t))))
@@ -16075,7 +16073,7 @@ If the current buffer does not, find the first agenda file."
               (find-file (car files))
               (throw 'exit t))))
       (find-file (car fs)))
-    (if (buffer-base-buffer) (org-pop-to-buffer-same-window (buffer-base-buffer)))))
+    (if (buffer-base-buffer) (switch-to-buffer (buffer-base-buffer)))))
 
 (defun org-agenda-file-to-front (&optional to-end)
   "Move/add the current file to the top of the agenda file list.
@@ -18512,7 +18510,7 @@ information about your Org-mode version and configuration."
      (org-version)
      (let (list)
        (save-window-excursion
-         (org-pop-to-buffer-same-window (get-buffer-create "*Warn about privacy*"))
+         (switch-to-buffer (get-buffer-create "*Warn about privacy*"))
          (delete-other-windows)
          (erase-buffer)
          (insert "You are about to submit a bug report to the Org-mode mailing list.
@@ -18709,7 +18707,7 @@ With prefix arg UNCOMPILED, load the uncompiled versions."
   (if (and marker (marker-buffer marker)
            (buffer-live-p (marker-buffer marker)))
       (progn
-        (org-pop-to-buffer-same-window (marker-buffer marker))
+        (switch-to-buffer (marker-buffer marker))
         (if (or (> marker (point-max)) (< marker (point-min)))
             (widen))
         (goto-char marker)
@@ -20537,6 +20535,6 @@ Still experimental, may disappear in the future."
 
 (run-hooks 'org-load-hook)
 
-;; arch-tag: e77da1a7-acc7-4336-b19e-efa25af3f9fd
+
 
 ;;; org.el ends here