Merge Org (commit c8c217). Fix mistake about updating the wrong ChangeLog.

6 files changed, 436 insertions, 409 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 08e8cc3614a..8d88336183d 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -9,6 +9,9 @@
 	(Advanced features): Add missing argument for @item.
 	(Storing searches): Add index entries and a note about
 	*-tree agenda views.
+	(Structure editing): Document `org-mark-element' and
+	`org-mark-subtree'.
+	(Tag inheritance): Document `org-agenda-use-tag-inheritance'.
 
 2013-01-06  Andreas Schwab  <schwab@linux-m68k.org>
 
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index 3540ac8592a..39577a33131 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -2,7 +2,8 @@
 @c %**start of header
 @setfilename ../../info/org
 @settitle The Org Manual
-@set VERSION 7.9.3 (GNU Emacs 24.3)
+
+@include org-version.inc
 
 @c Use proper quote and backtick for code sections in PDF output
 @c Cf. Texinfo manual 14.2
@@ -262,7 +263,7 @@
 @copying
 This manual is for Org version @value{VERSION}.
 
-Copyright @copyright{} 2004--2013 Free Software Foundation, Inc.
+Copyright @copyright{} 2004--2012 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -1470,6 +1471,13 @@ Move subtree up (swap with previous subtree of same
 level).
 @orgcmd{M-S-@key{down},org-move-subtree-down}
 Move subtree down (swap with next subtree of same level).
+@orgcmd{M-h,org-mark-element}
+Mark the element at point.  Hitting repeatedly will mark subsequent elements
+of the one just marked.  E.g. hitting @key{M-h} on a paragraph will mark it,
+hitting @key{M-h} immediately again will mark the next one.
+@orgcmd{C-c @@,org-mark-subtree}
+Mark the subtree at point.  Hitting repeatedly will mark subsequent subtrees
+of the same level than the marked subtree.
 @orgcmd{C-c C-x C-w,org-cut-subtree}
 Kill subtree, i.e., remove it from buffer but save in kill ring.
 With a numeric prefix argument N, kill N sequential subtrees.
@@ -4624,9 +4632,8 @@ changes in the line.}:
 @noindent
 @vindex org-use-tag-inheritance
 @vindex org-tags-exclude-from-inheritance
-To limit tag inheritance to specific tags, or to turn it off entirely, use
-the variables @code{org-use-tag-inheritance} and
-@code{org-tags-exclude-from-inheritance}.
+To limit tag inheritance to specific tags, use @code{org-tags-exclude-from-inheritance}.
+To turn it off entirely, use @code{org-use-tag-inheritance}.
 
 @vindex org-tags-match-list-sublevels
 When a headline matches during a tags search while tag inheritance is turned
@@ -4637,6 +4644,15 @@ of matches may then become very long.  If you only want to see the first tags
 match in a subtree, configure the variable
 @code{org-tags-match-list-sublevels} (not recommended).
 
+@vindex org-agenda-use-tag-inheritance
+Tag inheritance is relevant when the agenda search tries to match a tag,
+either in the @code{tags} or @code{tags-todo} agenda types.  In other agenda
+types, @code{org-use-tag-inheritance} has no effect.  Still, you may want to
+have your tags correctly set in the agenda, so that tag filtering works fine,
+with inherited tags.  Set @code{org-agenda-use-tag-inheritance} to control
+this: the default value includes all agenda types, but setting this to nil
+can really speed up agenda generation.
+
 @node Setting tags, Tag searches, Tag inheritance, Tags
 @section Setting tags
 @cindex setting tags
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 24fae0dcabe..1d045425720 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,405 +1,3 @@
-2013-01-08  Achim Gratz  <Stromeko@Stromeko.de>
-
-	* org-compat.el (org-define-obsolete-function-alias)
-	(org-define-obsolete-variable-alias): Introduce new compatibility
-	macros to obsolete functions and variables.
-
-	* org-agenda.el, org-clock.el, org-id.el, org-lparse.el,
-	org-protocol.el org.el: Use
-	`org-define-obsolete-{function,variable}-alias' instead of
-	`define-obsolate{function,variable}-alias'.
-
-	* org-faces.el: Define face alias mode-line for XEmacs (it's
-	called modeline there).
-
-	* org-compat.el (org-condition-case-unless-debug): Do not use
-	defalias for special forms, the Emacs 22 byte-compiler does not
-	recognize them correctly when compiling macros.  Use a macro
-	instead and rely on macro expansion.  That however makes the
-	decision at compile time, which should be acceptable in this case
-	since it only affects debugging.
-
-	* org-compat.el (org-no-popups): New wrapper macro which let-binds
-	the correct variables to suppress popup windows depending on the
-	Emacs version in use.  This is a compile-time decision when
-	byte-compiling.
-
-	* org.el (org-get-location, org-switch-to-buffer-other-window):
-	Use the wrapper `org-no-popups´ to let-bind the correct variables
-	for suppression of popup windows.
-
-	* org-compat.el (user-error): Defalias to `error´ for Emacsen that
-	don't have it.
-
-	* org-agenda.el (org-agenda-write): Use org-called-interactively-p
-	instead of called-interactively-p.
-
-	* org.el (org-find-invisible-foreground): Do not use the value of
-	variables `default-frame-alist´, `initial-frame-alist´ and
-	`window-system-default-frame-alist´ when their symbol is not
-	bound.
-
-2013-01-08  Bastien Guerry  <bzg@gnu.org>
-
-	* org-agenda.el (org-agenda-finalize): Don't remove tag alignment
-	depending on `org-prefix-has-tag', this should depend on
-	`org-agenda-remove-tags'.
-
-	* org-agenda.el (org-agenda-finalize): Downcase tags when readding
-	them after agenda generation.
-
-	* org.el (org-setup-filling): Set `auto-fill-inhibit-regexp' from
-	`org-outline-regexp'.
-
-	* org-agenda.el (org-agenda-use-tag-inheritance): Fix custom
-	definition.
-
-	* org.el (org-entry-get): Speed up by let-binding some variables
-	only if needed.  Also fix a bug: consider an empty drawer as no
-	drawer.
-
-	* org-agenda.el (org-search-view, org-agenda-get-todos)
-	(org-agenda-get-timestamps, org-agenda-get-sexps)
-	(org-agenda-get-progress, org-agenda-get-deadlines)
-	(org-agenda-get-scheduled, org-agenda-get-blocks)
-	(org-agenda-change-all-lines): Get local tags only.
-	(org-agenda-use-tag-inheritance): New option.
-	(org-agenda-finalize): When `org-agenda-use-tag-inheritance'
-	is non-nil, possibly reset tags in the agenda buffer.
-	(org-agenda-check-type): Enhance docstring.
-
-	* org.el (org-use-tag-inheritance): Fix typo in docstring.
-
-	* org-agenda.el (org-float): Don't alias `org-float'.
-
-	* org.el (org-scan-tags): The skipper already checks for archived
-	entries.
-
-	* org.el (org-refresh-properties): Rename from
-	`org-refresh-effort-properties' and use two new parameters.
-	(org-agenda-prepare-buffers): Use `org-refresh-properties'.
-	Also refresh the 'org-appt-warntime text property.
-
-	* org-clock.el (org-clock-in): Use the renamed defun.
-
-	* org-icalendar.el (org-icalendar-print-entries): Refresh the
-	'org-appt-warntime property.
-	(org-icalendar-print-entries): Do not use `org-entry-get' to get
-	the "APPT_WARNTIME" property value.
-
-	* org-agenda.el (org-agenda-get-timestamps)
-	(org-agenda-get-sexps, org-agenda-get-deadlines)
-	(org-agenda-get-scheduled): Ditto.
-
-	* org.el (org-adaptive-fill-function): Fix checking of
-	post-affiliated.
-	(org-id-link-to-org-use-id): Fix compiler warning.
-
-	* org-agenda.el (org-agenda-format-item): Do not use
-	org-get-effort to get the effort text property.
-	(org-agenda-get-sexps): Use `org-back-to-heading' when setting
-	the tags.
-
-	* org-clock.el (org-clock-in): Refresh effort properties.
-
-	* org.el (org-refresh-effort-properties): New defun.
-	(org-get-effort): Delete.
-	(org-set-effort): Set the 'org-effort text property.
-	(org-property-next-allowed-value): Ditto.
-	(org-agenda-prepare-buffers): Refresh effort properties.
-
-	* org.el (org-read-date): Let-bind `mouse-autoselect-window' to
-	nil so that the mouse doesn't jump when the option is set to t
-	globally.
-
-	* org-agenda.el (org-agenda-dim-blocked-tasks): Default to nil.
-	(org-agenda-dim-blocked-tasks): Make interactive and allow an
-	optional parameter 'invisible to hide blocked tasks instead of
-	just dimming them.
-	(org-agenda-mode-map): Bind `org-agenda-dim-blocked-tasks' to
-	"#".
-
-	* org-agenda.el (org-agenda-finalize): Don't try to align tags
-	when there are no tags.  Only try to draw the habit consistency
-	graph when there is a habit in the buffer.  Only mark clocking
-	task when there is one.
-
-	* org.el (org-adaptive-fill-function): DTRT in `message-mode'.
-
-	* org.el (org-get-priority): Save match data even when using
-	`org-get-priority-function'.
-
-	* org-mobile.el (org-mobile-create-index-file): Possibly
-	normalize `org-todo-keywords'.
-
-	* org-mobile.el (org-mobile-push): Use the correct agenda
-	buffer names.
-
-	* org.el (org-store-link): Use `org-id-link-to-org-use-id' instead
-	of the obsolete variable name.
-
-	* org.el (org-fontify-meta-lines-and-blocks-1): Fix bug when
-	fontifying keywords with no value.
-
-	* org.el (org-goto-auto-isearch): Enhance docstring.
-	(org-goto-map): Make a defun, so that the customized value of
-	org-goto-auto-isearch is correctly initialized.
-	(org-goto): Initialize the keymap with `org-goto-map'.
-	(org-get-location): Use *Org Help* as a temporary buffer.
-	Tell whether auto-isearch is on or off.
-
-	* org-exp.el (org-export-as-org): Remove useless argument.
-
-	* org-docbook.el (org-export-as-docbook-batch)
-	(org-export-region-as-docbook, org-export-as-docbook-pdf): Fix
-	the number of arguments.
-	(org-export-as-docbook): Remove useless argument.
-
-	* org.el (org-speed-commands-default): Use ":" instead of ";" for
-	`org-set-tags-command', which is consistent with ":" in agenda
-	view.  Use "=" for `org-columns".
-
-	* org.el (org-sparse-tree): Fix redundant information in prompt.
-
-	* org-exp.el (org-export-string): Fix number of arguments passed
-	to the org-export-as-* functions.
-
-	* org-latex.el (org-export-as-latex): Fix typo in docstring.
-
-	* org-list.el (org-cycle-include-plain-lists): Docstring
-	enhancement.
-
-	* org.el (org-fontify-meta-lines-and-blocks-1): Fix fontification
-	bug when fontifying a keyword with no associated value.
-	(org-cycle-internal-local): Don't run hooks when cycling a plain
-	list before first headline.
-	(org-ctrl-c-ctrl-c): Throw a user error when trying to toggle a
-	blocked checkbox.
-	(org-indent-line): Fix table formulas indenting.
-
-	* org-agenda.el (org-agenda-open-link): Fix bug when no link is
-	matched.  Return a message instead of an error.
-
-	* org-agenda.el (org-agenda-priority): Remove useless parameter
-	and fix showing priority in agenda buffers.
-
-	* org-macs.el (org-with-buffer-modified-unmodified): New macro.
-
-	* org.el (org-entry-blocked-p): Use the new macro.
-
-	* org-src.el (org-edit-src-exit): Don't comma-escape the content
-	of a fixed width region.
-
-	* org.el (org-blocker-hook): Update the docstring to mention that
-	functions in this hook should not modify the buffer.
-	(org-trigger-hook): Small docstring fix.
-	(org-entry-blocked-p): Use `with-buffer-modified-unmodified'
-	so that the function never modifies the buffer.
-
-	* org-agenda.el (org-agenda-open-link): Allow to open an internal
-	link by using the new `org-offer-links-in-entry' function.
-
-	* org.el (org-offer-links-in-entry): Do not open the link directly
-	through `org-open-link-from-string', only offer to select a link
-	and return a cons with the link (as a string) and the end of
-	entry.
-	(org-open-at-point): Use `org-offer-links-in-entry' correctly.
-
-	* org.el (org-cycle-internal-local): Fix bug: allow headings with
-	leading blank characters.
-
-	* org-clock.el (org-clock-persist): Docstring fix: document the
-	'history value.
-
-	* org.el (org-insert-link): Fix bug when inserting links to
-	headlines containing the ">" character.
-
-	* org-crypt.el (org-at-encrypted-entry-p): Fix search boundary.
-
-	* org-compat.el (org-delete-directory): New compatibility function
-	for Emacs 22, where `delete-directory' does not support recursive
-	deletion.
-
-	* org-odt.el (org-odt-cleanup-xml-buffers): Use the new
-	compatibility function.
-
-	* org.el (org-table-map-tables): Fix allowed blocks.
-	(org-edit-special): Fix regression: allow editing HTML and
-	LaTeX source blocks again.
-
-	* org-src.el (org-edit-src-code): Ditto.
-
-	* org.el (org-nonsticky-props): Add `htmlize-link'.
-
-	* org.el (org-nonsticky-props): Add `htmlize-link'.
-
-	* org.el (org-edit-special): Don't edit in verbatim blocks.
-
-	* org-src.el (org-edit-src-code): Ditto.
-
-	* org-table.el (org-table-fedit-lisp-indent)
-	(orgtbl-self-insert-command): Use `org-delete-backward-char'
-	instead of `backward-delete-char'.
-
-	* org.el (org-delete-backward-char, org-delete-char): Save match
-	data.
-
-	* org-src.el (org-edit-src-code): Fix another bug about editing
-	special blocks "example" and "verbatim".
-
-	* org.el (org-structure-template-alist): Add verbatim.
-	(org-edit-special): Fix bug about editing special blocks
-	"example" and "verbatim".
-
-	* org.el (org-delete-backward-char, org-delete-char): Save match
-	data (`delete-backward-char' and `delete-char' don't.)
-	(org-enable-table-editor, org-insert-heading)
-	(org-remove-timestamp-with-keyword, org-self-insert-command):
-	Use `delete-backward-char' instead of `backward-delete-char'.
-
-	* org-table.el (org-table-fedit-lisp-indent)
-	(orgtbl-self-insert-command): Ditto.
-
-	* org-latex.el (org-export-latex-subcontent): Ditto.
-
-	* org-clock.el (org-clocktable-write-default): Ditto.
-
-	* org-ascii.el (org-export-ascii-preprocess): Ditto.
-
-	* org.el (org-todo): Ignore the comment string when changing the
-	TODO state of a headline.
-
-	* org.el (org-edit-special): Fix docstring.
-	(org-in-src-block-p): Small enhancement.
-
-	* org-publish.el (org-publish-org-to): Call `org-export-as-*'
-	functions with the correct list of arguments.
-
-	* org-html.el (org-export-as-html): Delete obsolete arg `hidden'.
-	(org-export-as-html-and-open, org-export-as-html-batch)
-	(org-export-region-as-html): Don't use obsolete arg.
-
-	* org-ascii.el (org-export-as-ascii): Delete obsolete arg
-	`hidden'.
-	(org-export-as-ascii-to-buffer): Don't use obsolete arg.
-
-	* org.el (org-in-fixed-width-region-p): Save match data.
-	(org-in-src-block-p): Use case-folding for searching the block
-	boundaries.
-	(org-activate-plain-links, org-activate-angle-links)
-	(org-activate-bracket-links): Prevent link activation in
-	source code blocks.
-
-	* org-odt.el (org-odt-cleanup-xml-buffers): Fix Emacs Bug#13197 by
-	setting the correct buffer before marking it unmodified to
-	silently kill him.
-
-	* org.el (org-set-font-lock-defaults): Don't activate links in
-	source code blocks and fixed-width regions.
-
-	* org-agenda.el (org-agenda-finalize): Fix links activation.
-
-	* org.el (org-open-at-point): Throw the correct error on
-	non-links.  Use `user-error' instead of `error'.
-
-	* org.el (org-in-fixed-width-region-p): Define before use.
-
-	* org-src.el (org-in-src-block-p): Declare function.
-
-	* org-compat.el: Fix bug: don't use `eval-when-compile' when
-	aliasing `user-error'.
-
-	* org-agenda.el (org-agenda-skip): Only check if point is
-	inside a code block, not at a code block.
-
-	* org.el (org-in-fixed-width-region-p): Rewrite using
-	org-element.el.
-
-	* org.el (org-fill-paragraph): Fill correctly in source code
-	block.
-
-	* org.el (org-in-fixed-width-region-p): New function.
-	(org-edit-special): Fix bug: make sure to DTRT in every
-	special environment.  Also use the new function to check
-	against fixed-width environment.
-
-	* org-src.el (org-edit-src-code): Check if we are in a source code
-	block with `org-in-src-block-p'.  Slightly reformat the docstring.
-
-	* org.el (org-in-src-block-p): Return t when point is at the
-	#+BEGIN_SRC/#+END_SRC lines unless the new optional parameter
-	'inside is set to t.
-
-	* ob-exp.el (obe-marker): Delete useless var.
-
-	* org-src.el (org-edit-src-code): Fix bug triggered by the sexp
-	(copy-marker nil) on Emacs <24.1.
-
-2013-01-08  Dmitry Antipov  <dmantipov@yandex.ru>
-
-	* org-agenda.el (org-agenda-get-restriction-and-command): Use
-	`point-marker'.
-
-	* org-capture.el (org-capture-place-template): Ditto.
-
-	* org-colview-xemacs.el (org-dblock-write:columnview): Ditto.
-
-	* org-colview.el (org-dblock-write:columnview): Ditto.
-
-	* org-mobile.el (org-mobile-locate-entry): Ditto.
-
-	* org-table.el (org-table-convert-region): Ditto.
-
-	* org.el (org-update-statistics-cookies): Ditto.
-
-2013-01-08  Eric Schulte  <eric.schulte@gmx.com>
-
-	* org-exp.el (org-export-string): Pass the dir option on through
-	to any subsequent export functions.
-
-2013-01-08  Henning Weiss  <hdweiss@gmail.com>  (tiny change)
-
-	* org-mobile.el (org-mobile-sumo-agenda-command): Remove match
-	description from block agendas when they have a title.
-
-2013-01-08  Jambunathan K  <kjambunathan@gmail.com>
-
-	* org-odt.el (org-export-as-odt-batch): Init `org-odt-zip-dir'.
-	Fix Emacs Bug#13254.
-
-	* org-odt.el (org-odt-format-org-link): Add check for presence of
-	description in headline links.
-
-2013-01-08  Michael Albinus  <michael.albinus@gmx.de>
-
-	* ob.el (org-babel-temp-file): Fix setting of
-	`temporary-file-directory' on remote hosts.
-
-	* ob-eval.el (org-babel-shell-command-on-region): Use
-	`process-file' instead of `call-process-region'.  The latter one
-	does not work on remote hosts.
-
-2013-01-08  Michael Gauland  <mike_gauland@stanfordalumni.org>  (tiny change)
-
-	* org-src.el: Create a marker to pass to copy-marker.
-
-2013-01-08  Nicolas Goaziou  <n.goaziou@gmail.com>
-
-	* org.el (org-setup-filling): Ignore `auto-fill-inhibit-regexp'.
-	The idea behind this is that `org-adaptive-fill-function' already
-	determines which lines should be filled.
-
-	* org.el (org-fill-paragraph): Small refactoring.
-
-	* org-element.el (org-element--parse-elements)
-	(org-element-at-point): Fix parsing of a list in a block in a
-	list.
-
-2013-01-08  Sebastien Vauban  <wxhgmqzgwmuf-geNee64TY+gS+FvcfC7Uqw@public.gmane.org>
-
-	* org.el (org-copy-subtree, org-paste-subtree): Fix whitespace
-	handling when copying/pasting a subtree.
-
 2013-01-07  Glenn Morris  <rgm@gnu.org>
 
 	* progmodes/compile.el (compilation-parse-errors):
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index f721cff9419..57b9a4b14c0 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,412 @@
+2013-01-08  Achim Gratz  <Stromeko@Stromeko.de>
+
+	* org-compat.el (org-define-obsolete-function-alias)
+	(org-define-obsolete-variable-alias): Introduce new compatibility
+	macros to obsolete functions and variables.
+
+	* org-agenda.el, org-clock.el, org-id.el, org-lparse.el,
+	org-protocol.el org.el: Use
+	`org-define-obsolete-{function,variable}-alias' instead of
+	`define-obsolate{function,variable}-alias'.
+
+	* org-faces.el: Define face alias mode-line for XEmacs (it's
+	called modeline there).
+
+	* org-compat.el (org-condition-case-unless-debug): Do not use
+	defalias for special forms, the Emacs 22 byte-compiler does not
+	recognize them correctly when compiling macros.  Use a macro
+	instead and rely on macro expansion.  That however makes the
+	decision at compile time, which should be acceptable in this case
+	since it only affects debugging.
+
+	* org-compat.el (org-no-popups): New wrapper macro which let-binds
+	the correct variables to suppress popup windows depending on the
+	Emacs version in use.  This is a compile-time decision when
+	byte-compiling.
+
+	* org.el (org-get-location, org-switch-to-buffer-other-window):
+	Use the wrapper `org-no-popups´ to let-bind the correct variables
+	for suppression of popup windows.
+
+	* org-compat.el (user-error): Defalias to `error´ for Emacsen that
+	don't have it.
+
+	* org-agenda.el (org-agenda-write): Use org-called-interactively-p
+	instead of called-interactively-p.
+
+	* org.el (org-find-invisible-foreground): Do not use the value of
+	variables `default-frame-alist´, `initial-frame-alist´ and
+	`window-system-default-frame-alist´ when their symbol is not
+	bound.
+
+2013-01-08  Bastien Guerry  <bzg@gnu.org>
+
+	* org-src.el (org-edit-src-code): Fix bug when trying to edit a
+	table.el table.
+
+	* org-agenda.el (org-agenda-finalize): Don't remove tag alignment
+	depending on `org-prefix-has-tag', this should depend on
+	`org-agenda-remove-tags'.
+
+	* org-agenda.el (org-agenda-finalize): Don't remove tag alignment
+	depending on `org-prefix-has-tag', this should depend on
+	`org-agenda-remove-tags'.
+
+	* org-agenda.el (org-agenda-finalize): Downcase tags when readding
+	them after agenda generation.
+
+	* org.el (org-setup-filling): Set `auto-fill-inhibit-regexp' from
+	`org-outline-regexp'.
+
+	* org-agenda.el (org-agenda-use-tag-inheritance): Fix custom
+	definition.
+
+	* org.el (org-entry-get): Speed up by let-binding some variables
+	only if needed.  Also fix a bug: consider an empty drawer as no
+	drawer.
+
+	* org-agenda.el (org-search-view, org-agenda-get-todos)
+	(org-agenda-get-timestamps, org-agenda-get-sexps)
+	(org-agenda-get-progress, org-agenda-get-deadlines)
+	(org-agenda-get-scheduled, org-agenda-get-blocks)
+	(org-agenda-change-all-lines): Get local tags only.
+	(org-agenda-use-tag-inheritance): New option.
+	(org-agenda-finalize): When `org-agenda-use-tag-inheritance'
+	is non-nil, possibly reset tags in the agenda buffer.
+	(org-agenda-check-type): Enhance docstring.
+
+	* org.el (org-use-tag-inheritance): Fix typo in docstring.
+
+	* org-agenda.el (org-float): Don't alias `org-float'.
+
+	* org.el (org-scan-tags): The skipper already checks for archived
+	entries.
+
+	* org.el (org-refresh-properties): Rename from
+	`org-refresh-effort-properties' and use two new parameters.
+	(org-agenda-prepare-buffers): Use `org-refresh-properties'.
+	Also refresh the 'org-appt-warntime text property.
+
+	* org-clock.el (org-clock-in): Use the renamed defun.
+
+	* org-icalendar.el (org-icalendar-print-entries): Refresh the
+	'org-appt-warntime property.
+	(org-icalendar-print-entries): Do not use `org-entry-get' to get
+	the "APPT_WARNTIME" property value.
+
+	* org-agenda.el (org-agenda-get-timestamps)
+	(org-agenda-get-sexps, org-agenda-get-deadlines)
+	(org-agenda-get-scheduled): Ditto.
+
+	* org.el (org-adaptive-fill-function): Fix checking of
+	post-affiliated.
+	(org-id-link-to-org-use-id): Fix compiler warning.
+
+	* org-agenda.el (org-agenda-format-item): Do not use
+	org-get-effort to get the effort text property.
+	(org-agenda-get-sexps): Use `org-back-to-heading' when setting
+	the tags.
+
+	* org-clock.el (org-clock-in): Refresh effort properties.
+
+	* org.el (org-refresh-effort-properties): New defun.
+	(org-get-effort): Delete.
+	(org-set-effort): Set the 'org-effort text property.
+	(org-property-next-allowed-value): Ditto.
+	(org-agenda-prepare-buffers): Refresh effort properties.
+
+	* org.el (org-read-date): Let-bind `mouse-autoselect-window' to
+	nil so that the mouse doesn't jump when the option is set to t
+	globally.
+
+	* org-agenda.el (org-agenda-dim-blocked-tasks): Default to nil.
+	(org-agenda-dim-blocked-tasks): Make interactive and allow an
+	optional parameter 'invisible to hide blocked tasks instead of
+	just dimming them.
+	(org-agenda-mode-map): Bind `org-agenda-dim-blocked-tasks' to
+	"#".
+
+	* org-agenda.el (org-agenda-finalize): Don't try to align tags
+	when there are no tags.  Only try to draw the habit consistency
+	graph when there is a habit in the buffer.  Only mark clocking
+	task when there is one.
+
+	* org.el (org-adaptive-fill-function): DTRT in `message-mode'.
+
+	* org.el (org-get-priority): Save match data even when using
+	`org-get-priority-function'.
+
+	* org-mobile.el (org-mobile-create-index-file): Possibly
+	normalize `org-todo-keywords'.
+
+	* org-mobile.el (org-mobile-push): Use the correct agenda
+	buffer names.
+
+	* org.el (org-store-link): Use `org-id-link-to-org-use-id' instead
+	of the obsolete variable name.
+
+	* org.el (org-fontify-meta-lines-and-blocks-1): Fix bug when
+	fontifying keywords with no value.
+
+	* org.el (org-goto-auto-isearch): Enhance docstring.
+	(org-goto-map): Make a defun, so that the customized value of
+	org-goto-auto-isearch is correctly initialized.
+	(org-goto): Initialize the keymap with `org-goto-map'.
+	(org-get-location): Use *Org Help* as a temporary buffer.
+	Tell whether auto-isearch is on or off.
+
+	* org-exp.el (org-export-as-org): Remove useless argument.
+
+	* org-docbook.el (org-export-as-docbook-batch)
+	(org-export-region-as-docbook, org-export-as-docbook-pdf): Fix
+	the number of arguments.
+	(org-export-as-docbook): Remove useless argument.
+
+	* org.el (org-speed-commands-default): Use ":" instead of ";" for
+	`org-set-tags-command', which is consistent with ":" in agenda
+	view.  Use "=" for `org-columns".
+
+	* org.el (org-sparse-tree): Fix redundant information in prompt.
+
+	* org-exp.el (org-export-string): Fix number of arguments passed
+	to the org-export-as-* functions.
+
+	* org-latex.el (org-export-as-latex): Fix typo in docstring.
+
+	* org-list.el (org-cycle-include-plain-lists): Docstring
+	enhancement.
+
+	* org.el (org-fontify-meta-lines-and-blocks-1): Fix fontification
+	bug when fontifying a keyword with no associated value.
+	(org-cycle-internal-local): Don't run hooks when cycling a plain
+	list before first headline.
+	(org-ctrl-c-ctrl-c): Throw a user error when trying to toggle a
+	blocked checkbox.
+	(org-indent-line): Fix table formulas indenting.
+
+	* org-agenda.el (org-agenda-open-link): Fix bug when no link is
+	matched.  Return a message instead of an error.
+
+	* org-agenda.el (org-agenda-priority): Remove useless parameter
+	and fix showing priority in agenda buffers.
+
+	* org-macs.el (org-with-buffer-modified-unmodified): New macro.
+
+	* org.el (org-entry-blocked-p): Use the new macro.
+
+	* org-src.el (org-edit-src-exit): Don't comma-escape the content
+	of a fixed width region.
+
+	* org.el (org-blocker-hook): Update the docstring to mention that
+	functions in this hook should not modify the buffer.
+	(org-trigger-hook): Small docstring fix.
+	(org-entry-blocked-p): Use `with-buffer-modified-unmodified'
+	so that the function never modifies the buffer.
+
+	* org-agenda.el (org-agenda-open-link): Allow to open an internal
+	link by using the new `org-offer-links-in-entry' function.
+
+	* org.el (org-offer-links-in-entry): Do not open the link directly
+	through `org-open-link-from-string', only offer to select a link
+	and return a cons with the link (as a string) and the end of
+	entry.
+	(org-open-at-point): Use `org-offer-links-in-entry' correctly.
+
+	* org.el (org-cycle-internal-local): Fix bug: allow headings with
+	leading blank characters.
+
+	* org-clock.el (org-clock-persist): Docstring fix: document the
+	'history value.
+
+	* org.el (org-insert-link): Fix bug when inserting links to
+	headlines containing the ">" character.
+
+	* org-crypt.el (org-at-encrypted-entry-p): Fix search boundary.
+
+	* org-compat.el (org-delete-directory): New compatibility function
+	for Emacs 22, where `delete-directory' does not support recursive
+	deletion.
+
+	* org-odt.el (org-odt-cleanup-xml-buffers): Use the new
+	compatibility function.
+
+	* org.el (org-table-map-tables): Fix allowed blocks.
+	(org-edit-special): Fix regression: allow editing HTML and
+	LaTeX source blocks again.
+
+	* org-src.el (org-edit-src-code): Ditto.
+
+	* org.el (org-nonsticky-props): Add `htmlize-link'.
+
+	* org.el (org-nonsticky-props): Add `htmlize-link'.
+
+	* org.el (org-edit-special): Don't edit in verbatim blocks.
+
+	* org-src.el (org-edit-src-code): Ditto.
+
+	* org-table.el (org-table-fedit-lisp-indent)
+	(orgtbl-self-insert-command): Use `org-delete-backward-char'
+	instead of `backward-delete-char'.
+
+	* org.el (org-delete-backward-char, org-delete-char): Save match
+	data.
+
+	* org-src.el (org-edit-src-code): Fix another bug about editing
+	special blocks "example" and "verbatim".
+
+	* org.el (org-structure-template-alist): Add verbatim.
+	(org-edit-special): Fix bug about editing special blocks
+	"example" and "verbatim".
+
+	* org.el (org-delete-backward-char, org-delete-char): Save match
+	data (`delete-backward-char' and `delete-char' don't.)
+	(org-enable-table-editor, org-insert-heading)
+	(org-remove-timestamp-with-keyword, org-self-insert-command):
+	Use `delete-backward-char' instead of `backward-delete-char'.
+
+	* org-table.el (org-table-fedit-lisp-indent)
+	(orgtbl-self-insert-command): Ditto.
+
+	* org-latex.el (org-export-latex-subcontent): Ditto.
+
+	* org-clock.el (org-clocktable-write-default): Ditto.
+
+	* org-ascii.el (org-export-ascii-preprocess): Ditto.
+
+	* org.el (org-todo): Ignore the comment string when changing the
+	TODO state of a headline.
+
+	* org.el (org-edit-special): Fix docstring.
+	(org-in-src-block-p): Small enhancement.
+
+	* org-publish.el (org-publish-org-to): Call `org-export-as-*'
+	functions with the correct list of arguments.
+
+	* org-html.el (org-export-as-html): Delete obsolete arg `hidden'.
+	(org-export-as-html-and-open, org-export-as-html-batch)
+	(org-export-region-as-html): Don't use obsolete arg.
+
+	* org-ascii.el (org-export-as-ascii): Delete obsolete arg
+	`hidden'.
+	(org-export-as-ascii-to-buffer): Don't use obsolete arg.
+
+	* org.el (org-in-fixed-width-region-p): Save match data.
+	(org-in-src-block-p): Use case-folding for searching the block
+	boundaries.
+	(org-activate-plain-links, org-activate-angle-links)
+	(org-activate-bracket-links): Prevent link activation in
+	source code blocks.
+
+	* org-odt.el (org-odt-cleanup-xml-buffers): Fix Emacs Bug#13197 by
+	setting the correct buffer before marking it unmodified to
+	silently kill him.
+
+	* org.el (org-set-font-lock-defaults): Don't activate links in
+	source code blocks and fixed-width regions.
+
+	* org-agenda.el (org-agenda-finalize): Fix links activation.
+
+	* org.el (org-open-at-point): Throw the correct error on
+	non-links.  Use `user-error' instead of `error'.
+
+	* org.el (org-in-fixed-width-region-p): Define before use.
+
+	* org-src.el (org-in-src-block-p): Declare function.
+
+	* org-compat.el: Fix bug: don't use `eval-when-compile' when
+	aliasing `user-error'.
+
+	* org-agenda.el (org-agenda-skip): Only check if point is
+	inside a code block, not at a code block.
+
+	* org.el (org-in-fixed-width-region-p): Rewrite using
+	org-element.el.
+
+	* org.el (org-fill-paragraph): Fill correctly in source code
+	block.
+
+	* org.el (org-in-fixed-width-region-p): New function.
+	(org-edit-special): Fix bug: make sure to DTRT in every
+	special environment.  Also use the new function to check
+	against fixed-width environment.
+
+	* org-src.el (org-edit-src-code): Check if we are in a source code
+	block with `org-in-src-block-p'.  Slightly reformat the docstring.
+
+	* org.el (org-in-src-block-p): Return t when point is at the
+	#+BEGIN_SRC/#+END_SRC lines unless the new optional parameter
+	'inside is set to t.
+
+	* ob-exp.el (obe-marker): Delete useless var.
+
+	* org-src.el (org-edit-src-code): Fix bug triggered by the sexp
+	(copy-marker nil) on Emacs <24.1.
+
+2013-01-08  Dmitry Antipov  <dmantipov@yandex.ru>
+
+	* org-agenda.el (org-agenda-get-restriction-and-command): Use
+	`point-marker'.
+
+	* org-capture.el (org-capture-place-template): Ditto.
+
+	* org-colview-xemacs.el (org-dblock-write:columnview): Ditto.
+
+	* org-colview.el (org-dblock-write:columnview): Ditto.
+
+	* org-mobile.el (org-mobile-locate-entry): Ditto.
+
+	* org-table.el (org-table-convert-region): Ditto.
+
+	* org.el (org-update-statistics-cookies): Ditto.
+
+2013-01-08  Eric Schulte  <eric.schulte@gmx.com>
+
+	* org-exp.el (org-export-string): Pass the dir option on through
+	to any subsequent export functions.
+
+2013-01-08  Henning Weiss  <hdweiss@gmail.com>  (tiny change)
+
+	* org-mobile.el (org-mobile-sumo-agenda-command): Remove match
+	description from block agendas when they have a title.
+
+2013-01-08  Jambunathan K  <kjambunathan@gmail.com>
+
+	* org-odt.el (org-export-as-odt-batch): Init `org-odt-zip-dir'.
+	Fix Emacs Bug#13254.
+
+	* org-odt.el (org-odt-format-org-link): Add check for presence of
+	description in headline links.
+
+2013-01-08  Michael Albinus  <michael.albinus@gmx.de>
+
+	* ob.el (org-babel-temp-file): Fix setting of
+	`temporary-file-directory' on remote hosts.
+
+	* ob-eval.el (org-babel-shell-command-on-region): Use
+	`process-file' instead of `call-process-region'.  The latter one
+	does not work on remote hosts.
+
+2013-01-08  Michael Gauland  <mike_gauland@stanfordalumni.org>  (tiny change)
+
+	* org-src.el: Create a marker to pass to copy-marker.
+
+2013-01-08  Nicolas Goaziou  <n.goaziou@gmail.com>
+
+	* org.el (org-setup-filling): Ignore `auto-fill-inhibit-regexp'.
+	The idea behind this is that `org-adaptive-fill-function' already
+	determines which lines should be filled.
+
+	* org.el (org-fill-paragraph): Small refactoring.
+
+	* org-element.el (org-element--parse-elements)
+	(org-element-at-point): Fix parsing of a list in a block in a
+	list.
+
+2013-01-08  Sebastien Vauban  <wxhgmqzgwmuf-geNee64TY+gS+FvcfC7Uqw@public.gmane.org>
+
+	* org.el (org-copy-subtree, org-paste-subtree): Fix whitespace
+	handling when copying/pasting a subtree.
+
 2012-12-12  Bastien Guerry  <bzg@gnu.org>
 
 	* org-latex.el (org-export-latex-links): Escape raw path when
diff --git a/lisp/org/org-src.el b/lisp/org/org-src.el
index 221ae367c87..277196bb768 100644
--- a/lisp/org/org-src.el
+++ b/lisp/org/org-src.el
@@ -211,7 +211,8 @@ edited version.  An optional argument CONTEXT is used by \\[org-edit-src-save]
 when calling this function.  See `org-src-window-setup' to configure
 the display of windows containing the Org buffer and the code buffer."
   (interactive)
-  (if (not (org-in-block-p '("src" "example" "latex" "html")))
+  (if (not (or (org-in-block-p '("src" "example" "latex" "html"))
+	       (org-at-table.el-p)))
       (user-error "Not in a source code or example block")
     (unless (eq context 'save)
       (setq org-edit-src-saved-temp-window-config (current-window-configuration)))
diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el
index 796d79ffa34..f4f4bfb7651 100644
--- a/lisp/org/org-version.el
+++ b/lisp/org/org-version.el
@@ -11,7 +11,7 @@
 (defun org-git-version ()
   "The Git version of org-mode.
   Inserted by installing org-mode or when a release is made."
-   (let ((org-git-version "7.9.3+-GNU-Emacs-24-3 (commit 31c1aeab)"))
+   (let ((org-git-version "7.9.3+-GNU-Emacs-24-3 (commit c8c217aa)"))
      org-git-version))
 ;;;###autoload
 (defvar org-odt-data-dir "/usr/share/emacs/etc/org"