Merge upstream Org (from commit acbbe2)

doc/misc/ChangeLog

+2012-10-26  Bastien Guerry  <bzg@gnu.org>
+
+	* org.texi (Installation): Update the link to Org's ELPA.  Also
+	don't mention org-install.el anymore as the replacement file
+	org-loaddefs.el is now loaded by org.el.
+
 2012-10-25  Michael Albinus  <michael.albinus@gmx.de>
 
 	* tramp.texi (Frequently Asked Questions): Mention

doc/misc/org.texi

@@ -857,7 +857,7 @@ Theory Ltd.}
 @b{Important:} @i{If you the version of Org that comes with Emacs or as a
 XEmacs package, please skip this section and go directly to @ref{Activation}.
 If you downloaded Org as an ELPA package, please read the instructions on the
-@uref{http://orgmode.org/elpa/, Org ELPA page}.  To see what version of Org
+@uref{http://orgmode.org/elpa.html, Org ELPA page}.  To see what version of Org
 (if any) is part of your Emacs distribution, type @kbd{M-x org-version} (if
 your Emacs distribution does not come with Org, this function will not be
 defined).}
@@ -947,7 +947,7 @@ description on Worg}.
 Installing Info files is system dependent, because of differences in the
 @file{install-info} program.  The Info documentation is installed together
 with the rest of Org mode.  If you don't install Org mode, it is possible to
-install the Info documentation separately (you need to have
+install the Info documentation seperately (you need to have
 install-info@footnote{The output from install-info (if any) is system
 dependent.  In particular Debian and its derivatives use two different
 versions of install-info and you may see the message:
@@ -964,13 +964,6 @@ on your system).
 make install-info
 @end example
 
-Then add the following line to @file{.emacs}.  It is needed so that
-Emacs can autoload functions that are located in files not immediately loaded
-when Org mode starts.
-@lisp
-(require 'org-install)
-@end lisp
-
 Do not forget to activate Org as described in the following section.
 @page
 
@@ -1092,9 +1085,6 @@ shown below.
 ;; add latest org-mode to load path
 (add-to-list 'load-path (expand-file-name "/path/to/org-mode/lisp"))
 (add-to-list 'load-path (expand-file-name "/path/to/org-mode/contrib/lisp" t))
-
-;; activate org
-(require 'org-install)
 @end example
 
 If an error occurs, a backtrace can be very useful (see below on how to
@@ -3785,7 +3775,7 @@ mostly if more than two TODO states are possible (@pxref{TODO
 extensions}).  See also @ref{Conflicts}, for a discussion of the interaction
 with @code{shift-selection-mode}.  See also the variable
 @code{org-treat-S-cursor-todo-selection-as-state-change}.
-@orgcmd{C-c / t,org-show-todo-key}
+@orgcmd{C-c / t,org-show-todo-tree}
 @cindex sparse tree, for TODO
 @vindex org-todo-keywords
 View TODO items in a @emph{sparse tree} (@pxref{Sparse trees}).  Folds the
@@ -9386,16 +9376,16 @@ so often, shortcuts are provided using the Easy Templates facility
 @item C-c '
 Edit the source code example at point in its native mode.  This works by
 switching to a temporary buffer with the source code.  You need to exit by
-pressing @kbd{C-c '} again@footnote{Upon exit, lines starting with @samp{*}
-or @samp{#} will get a comma prepended, to keep them from being interpreted
-by Org as outline nodes or special comments.  These commas will be stripped
-for editing with @kbd{C-c '}, and also for export.}.  The edited version will
-then replace the old version in the Org buffer.  Fixed-width regions
-(where each line starts with a colon followed by a space) will be edited
-using @code{artist-mode}@footnote{You may select a different-mode with the
-variable @code{org-edit-fixed-width-region-mode}.} to allow creating ASCII
-drawings easily.  Using this command in an empty line will create a new
-fixed-width region.
+pressing @kbd{C-c '} again@footnote{Upon exit, lines starting with @samp{*},
+@samp{,*}, @samp{#+} and @samp{,#+} will get a comma prepended, to keep them
+from being interpreted by Org as outline nodes or special syntax.  These
+commas will be stripped for editing with @kbd{C-c '}, and also for export.}.
+The edited version will then replace the old version in the Org buffer.
+Fixed-width regions (where each line starts with a colon followed by a space)
+will be edited using @code{artist-mode}@footnote{You may select
+a different-mode with the variable @code{org-edit-fixed-width-region-mode}.}
+to allow creating ASCII drawings easily.  Using this command in an empty line
+will create a new fixed-width region.
 @kindex C-c l
 @item C-c l
 Calling @code{org-store-link} while editing a source code example in a
@@ -14523,14 +14513,13 @@ Be sure to adjust the paths to fit your system.
 #
 DIR=`pwd`
 FILES=""
-ORGINSTALL="~/src/org/lisp/org-install.el"
 
 # wrap each argument in the code required to call tangle on it
 for i in $@@; do
     FILES="$FILES \"$i\""
 done
 
-emacs -Q --batch -l $ORGINSTALL \
+emacs -Q --batch \
 --eval "(progn
 (add-to-list 'load-path (expand-file-name \"~/src/org/lisp/\"))
 (add-to-list 'load-path (expand-file-name \"~/src/org/contrib/lisp/\" t))
@@ -16704,7 +16693,7 @@ on @file{org-element.el} and @file{org-export.el} has been outstanding, and
 opened the doors for many new ideas and features.
 
 @item Jambunathan K
-Jambunathan contributed the ODT exporter, definitely a killer feature of
+Jambunathan contributed the ODT exporter, definitly a killer feature of
 Org mode.  He also contributed the new HTML exporter, which is another core
 feature of Org.  Here too, I knew I could rely on him to fix bugs in these
 areas and to patiently explain the users what was the problems and solutions.
@@ -16712,7 +16701,7 @@ areas and to patiently explain the users what was the problems and solutions.
 @item Achim Gratz
 Achim rewrote the building process of Org, turning some @emph{ad hoc} tools
 into a flexible and conceptually clean process.  He patiently coped with the
-many hiccups that such a change can create for users.
+many hicups that such a change can create for users.
 
 @item Nick Dokos
 The Org mode mailing list would not be such a nice place without Nick, who

etc/ChangeLog

+2012-10-26  Nicolas Goaziou  <n.goaziou@gmail.com>
+
+	* refcards/orgcard.tex: Fix keybindings about
+	`org-show-todo-tree'.
+
 2012-10-23  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Fix outdated timestamp documentation in Elisp manual (bug#12706).

etc/refcards/orgcard.tex

@@ -484,9 +484,9 @@ \section{TODO Items and Checkboxes}
 \metax{select next/previous state}{S-LEFT/RIGHT}
 \metax{select next/previous set}{C-S-LEFT/RIGHT}
 \key{toggle ORDERED property}{C-c C-x o}
-\key{view TODO items in a sparse tree}{C-c C-v}
-\key{view 3rd TODO keyword's sparse tree}{C-3 C-c C-v}
 
+\key{view TODO items in a sparse tree}{C-c / t}
+\key{view 3rd TODO keyword's sparse tree}{C-3 C-c / t}
 \key{set the priority of the current item}{C-c , [ABC]}
 \key{remove priority cookie from current item}{C-c , SPC}
 \key{raise/lower priority of current item}{S-UP/DOWN\notetwo}

lisp/org/ChangeLog

+2012-10-26  Achim Gratz  <stromeko@stromeko.de>
+
+	* ob-ditaa.el: Needs to (require 'org-compat) for
+	org-find-library-dir.
+
+	* org.el: Remove utf-8 codepoints in docstrings, bytecode doesn't
+	work when loaded from compressed files.
+
+	* org-compat.el: Make sure that file-name-directory is getting a
+	stringp.  This avoids a possible " (wrong-type-argument stringp
+	nil)" error when the library in question does not exist.
+
+	* org-odt.el: Replace arc-mode.el by arc-mode.
+
+	* org.el: Replace org-macs.el by org-macs.
+
+	* org-install.el: Provide an empty file that prints a warning
+	about an outdated configuration.
+
+2012-10-26  Bastien Guerry  <bzg@gnu.org>
+
+	* org-latex.el (org-export-as-latex): Remove obsolete argument
+	`hidden'.  Also fix the docstring: using 'string as the value
+	for `to-buffer' outputs a string with no LaTeX header.
+	(org-export-as-latex-batch)
+	(org-export-as-latex-to-buffer, org-export-region-as-latex)
+	(org-export-as-pdf): Don't use the obsoleted argument.
+
+	* ob-haskell.el (org-export-as-latex): Don't use the obsoleted
+	argument `hidden'.
+
+	* org.el (org-refile): Run within `with-demoted-errors' so
+	that a corrupted bookmark file does not stop the refile
+	process.
+
+	* org-capture.el (org-capture-bookmark-last-stored-position):
+	Ditto for the capture process.
+
+	* org-src.el (org-edit-src-exit): Fix bug when saving an empty
+	source buffer.
+
+	* org-lparse.el (org-lparse): Fix bug by returning the output
+	of `org-do-lparse'.
+
+	* org.el (org-refile-check-position): Throw an error when the
+	refile target is the current buffer and is not a file.
+	(org-agenda-file-to-front, org-remove-file): Throw an error
+	when the current buffer is not a file.
+	(org-check-agenda-file): Enhance the message.
+	(org-element-type): Autoload.
+	(org-element-context, org-element-paragraph-parser): Don't
+	declare as these two functions are not used in org.el.
+
+	* org-lparse.el (browse-url-file-url): Declare.
+
+	* org.el (org-refile-check-position): Fix typo in docstring.
+
+	* org-clock.el (org-clock-modeline-total): Make obsolete.
+	(org-clock-mode-line-total): Rename from
+	`org-clock-modeline-total'.
+	(org-clock-get-sum-start): Fix references to
+	`org-clock-modeline-total'.
+
+	* org-faces.el (org-agenda-filter-tags)
+	(org-agenda-filter-category, mode-line): Use the 'mode-line
+	face instead of the obsolete 'modeline.
+
+	* org-odt.el (org-odt-styles-dir): Try more directories.
+	Don't throw an error, just send a message.
+
+	* org-odt.el (org-odt-lib-dir, org-odt-data-dir)
+	(org-odt-schema-dir-list, org-odt-styles-dir-list): Delete.
+	(org-export-odt-schema-dir, org-odt-styles-dir): Infer the
+	correct directories without requiring other variables.
+
+	* org-fixup.el (org-make-org-version, org-make-autoloads):
+	Don't define `org-odt-data-dir' in org-version.el.
+
+	* org-loaddefs.el: New file.
+
+	* org.el ("org-loaddefs.el"): Don't throw an error if the file
+	cannot be fund.
+	(org-version): Use org-loaddefs.el instead of org-install.el.
+
+	* org.el: Don't dynamically autoload already autoloaded
+	functions.
+	(org-clock-update-time-maybe): Move to org-clock.el.
+
+	* org-exp.el (org-insert-export-options-template): Remove
+	autoload cookie.
+
+	* org-clock.el (org-resolve-clocks, org-clock-in)
+	(org-clock-out, org-clock-cancel, org-clock-goto)
+	(org-clock-sum, org-clock-display, org-clock-report)
+	(org-dblock-write:clocktable): Add autoload cookie.
+	(org-clock-update-time-maybe): Moved from org.el.
+
+	* org-beamer.el (org-beamer-sectioning, org-beamer-mode): Ditto.
+
+	* org-ascii.el (org-export-ascii-preprocess): Ditto.
+
+	* org-archive.el (org-archive-subtree)
+	(org-archive-to-archive-sibling, org-toggle-archive-tag): Add
+	autoload cookie.
+
+	* org-colview.el (org-columns, org-dblock-write:columnview)
+	(org-insert-columns-dblock, org-agenda-columns): Ditto.
+
+	* org-table.el (org-table-create-with-table.el)
+	(org-table-create-or-convert-from-region, org-table-create)
+	(org-table-convert-region, org-table-import)
+	(org-table-export, org-table-align)
+	(org-table-justify-field-maybe, org-table-next-field)
+	(org-table-previous-field, org-table-next-row)
+	(org-table-copy-down, org-table-field-info)
+	(org-table-current-dline, org-table-goto-column)
+	(org-table-insert-column, org-table-delete-column)
+	(org-table-move-column-right, org-table-move-column-left)
+	(org-table-move-column, org-table-move-row-down)
+	(org-table-move-row-up, org-table-move-row)
+	(org-table-insert-row, org-table-insert-hline)
+	(org-table-hline-and-move, org-table-kill-row)
+	(org-table-sort-lines, org-table-cut-region)
+	(org-table-copy-region, org-table-paste-rectangle)
+	(org-table-convert, org-table-wrap-region)
+	(org-table-edit-field, org-table-sum)
+	(org-table-get-stored-formulas)
+	(org-table-maybe-eval-formula)
+	(org-table-rotate-recalc-marks)
+	(org-table-maybe-recalculate-line, org-table-eval-formula)
+	(org-table-recalculate, org-table-iterate)
+	(org-table-edit-formulas)
+	(org-table-toggle-coordinate-overlays)
+	(org-table-toggle-formula-debugger, orgtbl-to-generic)
+	(orgtbl-to-tsv, orgtbl-to-csv, orgtbl-to-latex)
+	(orgtbl-to-html, orgtbl-to-texinfo, orgtbl-to-orgtbl): Ditto.
+
+	* org.el (turn-on-orgtbl): Moved here from org-table.el.
+	(org-clock-persistence-insinuate): Moved here from org-clock.el.
+	(org-update-all-dblocks, org-map-entries)
+	(org-require-autoloaded-modules, org-forward-element)
+	(org-backward-element, org-up-element)
+	(org-element-greater-elements, org-drag-element-backward)
+	(org-drag-element-forward, org-mark-element)
+	(org-narrow-to-element, org-transpose-element)
+	(org-unindent-buffer): Don't autoload.
+
+	* org-clock.el (org-clock-get-clocktable): Rename from
+	`org-get-clocktable'.
+	(org-clock-persistence-insinuate): Move to org.el.
+
+	* org-capture.el: Do no set `generated-autoload-file' locally.
+	Minor code clean up.
+
+	* org-agenda.el (org-agenda-list): Use
+	`org-clock-get-clocktable'.  Do no set
+	`generated-autoload-file' locally.
+
+	* org-table.el (org-table-iterate-buffer-tables): Minor
+	reformatting.
+	(turn-on-orgtbl): Move to org.el.
+
+	* org-html.el (org-export-htmlize-generate-css): Don't autoload.
+
+	* org-timer.el (org-timer-pause-or-continue, org-timer-stop):
+	Ditto.
+
+	* ob-tangle.el (org-babel-tangle-lang-exts): Ditto.
+
+	* ob-lob.el (org-babel-lob-ingest): Ditto.
+
+	* org-id.el (org-id-copy)
+	(org-id-get-with-outline-path-completion)
+	(org-id-get-with-outline-drilling): Ditto.
+
+	* org-lparse.el (org-lparse-and-open, org-lparse-batch)
+	(org-lparse-to-buffer, org-replace-region-by)
+	(org-lparse-region): Ditto.
+
+	* org-mobile.el (org-mobile-create-sumo-agenda): Ditto.
+
+	* org.el (org-cycle): Fix misplaced autoload cookie.
+
+	* org-agenda.el (org-agenda-get-timestamps): Check if the item
+	is an habit when formatting it with `org-agenda-format-item'.
+	(org-agenda-get-blocks): Fix bug: don't assume the item is an
+	habit when formatting with `org-agenda-format-item'.
+
+	* org.el (org-calendar-agenda-action-key): Delete an option.
+	(org-mode-map): Delete its keybinding.
+	(org-agenda-action-marker, org-mark-entry-for-agenda-action):
+	Delete.
+
+	* org-agenda.el (org-agenda-diary-entry): Don't prevent from
+	being used outside of Org agendas, as it can be used in
+	calendar buffers too.
+
+2012-10-26  Caio Tiago Oliveira  <asrail@gmail.com>  (tiny change)
+
+	* ob-scala.el (org-babel-scala-wrapper-method): Use a Scala
+	block enclosing the submitted code.
+
+2012-10-26  Myles English  <mylesenglish@gmail.com>  (tiny change)
+
+	* org-clock.el (org-clock-in): Moved the call to
+	org-clock-in-prepare-hook until the task's properties
+	can be accessed.
+
+2012-10-26  Nicolas Goaziou  <n.goaziou@gmail.com>
+
+	* org.el (org-auto-fill-function): Make sure `adaptive-fill-mode'
+	mode is nil when pre-computed `fill-prefix' is the empty string.
+	Otherwise filling functions from fill.el think it has to be computed
+	again and overwrite it.
+
+	* org.el: Make `org-closest-date' aware of hours repeaters.
+
+	* org.el (org-end-of-line): Do not call `end-of-visual-line' when
+	moving to the end of line.  Also improve behaviour on elements that
+	can be hidden.
+
+	* org.el (org-sparse-tree): Allow to call `org-show-todo-tree'
+	with an argument.
+
+	* org-element.el (org-element--get-next-object-candidates): Fix
+	parsing of objects of the same type in a single paragraph.
+
+	* org-element.el (org-element-sub/superscript-successor): Fix
+	parsing of sub/superscript at beginning of item.
+	(org-element-latex-or-entity-successor): Fix parsing of latex
+	fragments at beginning of item.
+
+	* org-agenda.el (org-agenda-later): Fix function when span is
+	a number and an argument was provided.  Also fix typo in docstring.
+
+	* org.el (org-read-date-analyze): Fix analyzing for dates like
+	"29.03 16:40".
+
+	* org-element.el (org-element-center-block-parser)
+	(org-element-drawer-parser, , org-element-footnote-definition-parser)
+	(org-element-inlinetask-parser, org-element-plain-list-parser)
+	(org-element-quote-block-parser, org-element-special-block-parser)
+	(org-element-babel-call-parser, org-element-clock-parser)
+	(org-element-comment-parser, org-element-comment-block-parser)
+	(org-element-example-block-parser, org-element-export-block-parser)
+	(org-element-fixed-width-parser, org-element-horizontal-rule-parser)
+	(org-element-keyword-parser, org-element-latex-environment-parser)
+	(org-element-paragraph-parser, org-element-planning-parser)
+	(org-element-property-drawer-parser, org-element-src-block-parser)
+	(org-element-table-parser)
+	(org-element-verse-block-parserorg-element-dynamic-block-parser):
+	Make sure element never ends at the end of a blank non-empty line.
+
+	* org-element.el (org-element-context)
+	(org-element--get-next-object-candidates): Fix `org-element-context'.
+	In particular, the restrictions for an object may be different from
+	those of its container (i.e. table rows and table cells).
+
+	* org-element.el (org-element-example-block-parser)
+	(org-element-src-block-parser): Store value of example-blocks and
+	src-blocks unescaped.
+	(org-element-example-block-interpreter)
+	(org-element-src-block-interpreter): Escape value again when storing
+	it.
+
+	* org-src.el (org-escape-code-in-string)
+	(org-unescape-code-in-string, org-escape-code-in-region)
+	(org-unescape-code-in-region): New functions.
+	(org-edit-src-code, org-edit-src-exit): Use new functions.
+
+	* org.el (org-strip-protective-commas): Removed function.
+
+	* org-exp.el (org-export-select-backend-specific-text): Use new
+	function.
+
+	* ob.el (org-babel-parse-src-block-match)
+	(org-babel-parse-inline-src-block-match, org-babel-insert-result):
+	Always escape produced blocks, independently on the language of the
+	block, if any.  Use new functions.
+
+	* org-element.el (org-element-paragraph-parser): Fix regexp
+	starting a block.
+
+	* org-element.el (org-element-center-block-parser):
+	(org-element-drawer-parser, org-element-dynamic-block-parser)
+	(org-element-example-block-parser, org-element-export-block-parser)
+	(org-element-latex-environment-parser, org-element-paragraph-parser)
+	(org-element-property-drawer-parser, org-element-src-block-parser)
+	(org-element-verse-block-parser): Use stricter regexps for boundaries
+	of elements.
+
+2012-10-26  Toby S. Cubitt  <tsc25@cantab.net>
+
+	* org-agenda.el (org-agenda-get-sexps): Reset `extra' to nil at
+	beginning of re-search-forward loop, otherwise next iteration picks up
+	`extra' value from previous entry.
+
 2012-09-30  Abdó Roig-Maranges  <abdo.roig@gmail.com>
 
 	* org-html.el (org-export-html-preprocess)

lisp/org/ob-ditaa.el

@@ -40,6 +40,7 @@
 
 ;;; Code:
 (require 'ob)
+(require 'org-compat)
 
 (defvar org-ditaa-jar-path) ;; provided by org-exp-blocks
 

lisp/org/ob-haskell.el

@@ -147,6 +147,8 @@ specifying a variable of the same value."
     (format "%S" var)))
 
 (defvar org-src-preserve-indentation)
+(declare-function org-export-as-latex "org-latex"
+		  (arg &optional ext-plist to-buffer body-only pub-dir))
 (defun org-babel-haskell-export-to-lhs (&optional arg)
   "Export to a .lhs file with all haskell code blocks escaped.
 When called with a prefix argument the resulting

lisp/org/ob-io.el

@@ -38,12 +38,12 @@
 (require 'ob-eval)
 (eval-when-compile (require 'cl))
 
+(defvar org-babel-tangle-lang-exts) ;; Autoloaded
 (add-to-list 'org-babel-tangle-lang-exts '("io" . "io"))
 (defvar org-babel-default-header-args:io '())
 (defvar org-babel-io-command "io"
   "Name of the command to use for executing Io code.")
 
-
 (defun org-babel-execute:io (body params)
   "Execute a block of Io code with org-babel.  This function is
 called by `org-babel-execute-src-block'"

lisp/org/ob-keys.el

@@ -98,6 +98,8 @@ a-list placed behind the generic `org-babel-key-prefix'.")
 
 (provide 'ob-keys)
 
-
+;; Local variables:
+;; generated-autoload-file: "org-loaddefs.el"
+;; End:
 
 ;;; ob-keys.el ends here

lisp/org/ob-lob.el

@@ -45,7 +45,6 @@ To add files to this list use the `org-babel-lob-ingest' command."
 (defvar org-babel-default-lob-header-args '((:exports . "results"))
   "Default header arguments to use when exporting #+lob/call lines.")
 
-;;;###autoload
 (defun org-babel-lob-ingest (&optional file)
   "Add all named source-blocks defined in FILE to
 `org-babel-library-of-babel'."
@@ -143,6 +142,8 @@ if so then run the appropriate source block from the Library."
 
 (provide 'ob-lob)
 
-
+;; Local variables:
+;; generated-autoload-file: "org-loaddefs.el"
+;; End:
 
 ;;; ob-lob.el ends here

lisp/org/ob-picolisp.el

@@ -60,6 +60,7 @@
 (eval-when-compile (require 'cl))
 
 (declare-function run-picolisp "ext:inferior-picolisp" (cmd))
+(defvar org-babel-tangle-lang-exts) ;; Autoloaded
 
 ;; optionally define a file extension for this language
 (add-to-list 'org-babel-tangle-lang-exts '("picolisp" . "l"))

lisp/org/ob-ref.el

@@ -59,6 +59,7 @@
 (declare-function org-at-item-p "org-list" ())
 (declare-function org-narrow-to-subtree "org" ())
 (declare-function org-id-find-id-in-file "org-id" (id file &optional markerp))
+(declare-function org-id-find-id-file "org-id" (id))
 (declare-function org-show-context "org" (&optional key))
 (declare-function org-pop-to-buffer-same-window
 		  "org-compat" (&optional buffer-or-name norecord label))

lisp/org/ob-scala.el

@@ -36,12 +36,12 @@
 (require 'ob-eval)
 (eval-when-compile (require 'cl))
 
+(defvar org-babel-tangle-lang-exts) ;; Autoloaded
 (add-to-list 'org-babel-tangle-lang-exts '("scala" . "scala"))
 (defvar org-babel-default-header-args:scala '())
 (defvar org-babel-scala-command "scala"
   "Name of the command to use for executing Scala code.")
 
-
 (defun org-babel-execute:scala (body params)
   "Execute a block of Scala code with org-babel.  This function is
 called by `org-babel-execute-src-block'"
@@ -72,9 +72,17 @@ Emacs-lisp table, otherwise return the results as a string."
 
 
 (defvar org-babel-scala-wrapper-method
-  "(
+
+"var str_result :String = null;
+
+Console.withOut(new java.io.OutputStream() {def write(b: Int){
+}}) {
+  str_result = {
 %s
-) asString print
+  }.toString
+}
+
+print(str_result)
 ")
 
 

lisp/org/ob-sql.el

@@ -47,7 +47,8 @@
 (eval-when-compile (require 'cl))
 
 (declare-function org-table-import "org-table" (file arg))
-(declare-function orgtbl-to-csv "org-table" (TABLE PARAMS))
+(declare-function orgtbl-to-csv "org-table" (table params))
+(declare-function org-table-to-lisp "org-table" (&optional txt))
 
 (defvar org-babel-default-header-args:sql '())
 

lisp/org/ob-sqlite.el

@@ -33,7 +33,8 @@
 (declare-function org-fill-template "org" (template alist))
 (declare-function org-table-convert-region "org-table"
 		  (beg0 end0 &optional separator))
-(declare-function orgtbl-to-csv "org-table" (TABLE PARAMS))
+(declare-function orgtbl-to-csv "org-table" (table params))
+(declare-function org-table-to-lisp "org-table" (&optional txt))
 
 (defvar org-babel-default-header-args:sqlite '())
 

lisp/org/ob-tangle.el

@@ -38,7 +38,6 @@
 (declare-function org-babel-update-block-body "org" (new-body))
 (declare-function make-directory "files" (dir &optional parents))
 
-;;;###autoload
 (defcustom org-babel-tangle-lang-exts
   '(("emacs-lisp" . "el"))
   "Alist mapping languages to their file extensions.
@@ -514,6 +513,8 @@ which enable the original code blocks to be found."
 
 (provide 'ob-tangle)
 
-
+;; Local variables:
+;; generated-autoload-file: "org-loaddefs.el"
+;; End:
 
 ;;; ob-tangle.el ends here

lisp/org/ob.el

@@ -39,7 +39,6 @@
 (declare-function show-all "outline" ())
 (declare-function org-reduce "org" (CL-FUNC CL-SEQ &rest CL-KEYS))
 (declare-function org-mark-ring-push "org" (&optional pos buffer))
-(declare-function org-strip-protective-commas "org" (beg end))
 (declare-function tramp-compat-make-temp-file "tramp-compat"
                   (filename &optional dir-flag))
 (declare-function tramp-dissect-file-name "tramp" (name &optional nodefault))
@@ -64,7 +63,6 @@
 (declare-function org-cycle "org" (&optional arg))
 (declare-function org-uniquify "org" (list))
 (declare-function org-current-level "org" ())
-(declare-function org-strip-protective-commas "org" (beg end))
 (declare-function org-table-import "org-table" (file arg))
 (declare-function org-add-hook "org-compat"
 		  (hook function &optional append local))
@@ -87,10 +85,11 @@
 (declare-function org-list-struct "org-list" ())
 (declare-function org-list-prevs-alist "org-list" (struct))
 (declare-function org-list-get-list-end "org-list" (item struct prevs))
-(declare-function org-strip-protective-commas "org" (beg end))
 (declare-function org-remove-if "org" (predicate seq))
 (declare-function org-completing-read "org" (&rest args))
-(declare-function org-add-protective-commas "org-src" (beg end))
+(declare-function org-escape-code-in-region "org-src" (beg end))
+(declare-function org-unescape-code-in-string "org-src" (s))
+(declare-function org-table-to-lisp "org-table" (&optional txt))
 
 (defgroup org-babel nil
   "Code block evaluation and management in `org-mode' documents."
@@ -494,8 +493,8 @@ can not be resolved.")
 
 ;;; functions
 (defvar call-process-region)
-;;;###autoload
 
+;;;###autoload
 (defun org-babel-execute-src-block (&optional arg info params)
   "Execute the current source code block.
 Insert the results of execution into the buffer.  Source code
@@ -838,6 +837,7 @@ evaluation mechanisms."
     (key-binding (or key (read-key-sequence nil))))))
 
 (defvar org-bracket-link-regexp)
+
 ;;;###autoload
 (defun org-babel-open-src-block-result (&optional re-run)
   "If `point' is on a src block then open the results of the
@@ -944,6 +944,7 @@ buffer."
 (def-edebug-spec org-babel-map-inline-src-blocks (form body))
 
 (defvar org-babel-lob-one-liner-regexp)
+
 ;;;###autoload
 (defmacro org-babel-map-call-lines (file &rest body)
   "Evaluate BODY forms on each call line in FILE.
@@ -1241,7 +1242,7 @@ may be specified in the properties of the current outline entry."
           ;; get block body less properties, protective commas, and indentation
           (with-temp-buffer
             (save-match-data
-              (insert (org-babel-strip-protective-commas body lang))
+              (insert (org-unescape-code-in-string body))
 	      (unless preserve-indentation (org-do-remove-indentation))