From ee903f3feefe6efc358c0e0bbc750dd7a7267347 Mon Sep 17 00:00:00 2001
From: Andreas Gerler <baron@bundesbrandschatzamt.de>
Date: Fri, 17 Feb 2017 21:46:13 +0100
Subject: [PATCH] update org-mode

Signed-off-by: Andreas Gerler <baron@bundesbrandschatzamt.de>
---
 bba.org                                       |  390 +-
 elpa/org-20161118/org-pkg.el                  |    3 -
 elpa/{org-20161118 => org-20170210}/COPYING   |    0
 .../README_ELPA                               |    0
 elpa/{org-20161118 => org-20170210}/dir       |    0
 .../etc/ORG-NEWS                              |    2 +-
 .../etc/styles/OrgOdtContentTemplate.xml      |    0
 .../etc/styles/OrgOdtStyles.xml               |    0
 .../etc/styles/README                         |    0
 elpa/{org-20161118 => org-20170210}/ob-C.el   |    2 +-
 elpa/{org-20161118 => org-20170210}/ob-J.el   |    4 +-
 elpa/{org-20161118 => org-20170210}/ob-R.el   |    2 +-
 elpa/{org-20161118 => org-20170210}/ob-abc.el |    2 +-
 .../ob-asymptote.el                           |    2 +-
 elpa/{org-20161118 => org-20170210}/ob-awk.el |    2 +-
 .../{org-20161118 => org-20170210}/ob-calc.el |    2 +-
 .../ob-clojure.el                             |    2 +-
 .../ob-comint.el                              |    2 +-
 elpa/{org-20161118 => org-20170210}/ob-coq.el |    2 +-
 .../{org-20161118 => org-20170210}/ob-core.el |    8 +-
 elpa/{org-20161118 => org-20170210}/ob-css.el |    2 +-
 .../ob-ditaa.el                               |    2 +-
 elpa/{org-20161118 => org-20170210}/ob-dot.el |    2 +-
 .../{org-20161118 => org-20170210}/ob-ebnf.el |    2 +-
 .../ob-emacs-lisp.el                          |    2 +-
 .../{org-20161118 => org-20170210}/ob-eval.el |    2 +-
 elpa/{org-20161118 => org-20170210}/ob-exp.el |    4 +-
 .../ob-forth.el                               |    2 +-
 .../ob-fortran.el                             |    2 +-
 .../ob-gnuplot.el                             |    2 +-
 .../ob-groovy.el                              |    2 +-
 .../ob-haskell.el                             |    2 +-
 elpa/{org-20161118 => org-20170210}/ob-io.el  |    2 +-
 .../{org-20161118 => org-20170210}/ob-java.el |    2 +-
 elpa/{org-20161118 => org-20170210}/ob-js.el  |    4 +-
 .../{org-20161118 => org-20170210}/ob-keys.el |    2 +-
 .../ob-latex.el                               |    2 +-
 .../ob-ledger.el                              |    2 +-
 .../ob-lilypond.el                            |    2 +-
 .../{org-20161118 => org-20170210}/ob-lisp.el |    4 +-
 elpa/{org-20161118 => org-20170210}/ob-lob.el |    2 +-
 elpa/{org-20161118 => org-20170210}/ob-lua.el |    2 +-
 .../ob-makefile.el                            |    2 +-
 .../ob-matlab.el                              |    2 +-
 .../ob-maxima.el                              |    2 +-
 .../ob-mscgen.el                              |    2 +-
 .../ob-ocaml.el                               |    2 +-
 .../ob-octave.el                              |    2 +-
 elpa/{org-20161118 => org-20170210}/ob-org.el |    2 +-
 .../{org-20161118 => org-20170210}/ob-perl.el |    2 +-
 .../ob-picolisp.el                            |    2 +-
 .../ob-plantuml.el                            |    2 +-
 .../ob-processing.el                          |    2 +-
 .../ob-python.el                              |    2 +-
 elpa/{org-20161118 => org-20170210}/ob-ref.el |    2 +-
 .../{org-20161118 => org-20170210}/ob-ruby.el |   17 +-
 .../{org-20161118 => org-20170210}/ob-sass.el |    2 +-
 .../ob-scala.el                               |    2 +-
 .../ob-scheme.el                              |    2 +-
 .../ob-screen.el                              |    2 +-
 elpa/{org-20161118 => org-20170210}/ob-sed.el |    2 +-
 .../ob-shell.el                               |   30 +-
 .../{org-20161118 => org-20170210}/ob-shen.el |    2 +-
 elpa/{org-20161118 => org-20170210}/ob-sql.el |    3 +-
 .../ob-sqlite.el                              |    2 +-
 .../{org-20161118 => org-20170210}/ob-stan.el |    2 +-
 .../ob-table.el                               |    2 +-
 .../ob-tangle.el                              |  175 +-
 elpa/{org-20161118 => org-20170210}/ob.el     |    2 +-
 elpa/{org-20161118 => org-20170210}/org       | 4131 ++++++++---------
 .../org-agenda.el                             |  604 +--
 .../org-archive.el                            |    2 +-
 .../org-attach.el                             |    8 +-
 .../org-autoloads.el                          |   18 +-
 .../org-bbdb.el                               |    2 +-
 .../org-bibtex.el                             |    4 +-
 .../org-capture.el                            |  181 +-
 .../org-clock.el                              |  150 +-
 .../org-colview.el                            |  168 +-
 .../org-compat.el                             |   10 +-
 .../org-crypt.el                              |    8 +-
 .../org-ctags.el                              |    2 +-
 .../org-datetree.el                           |    2 +-
 .../org-docview.el                            |    2 +-
 .../org-element.el                            |   95 +-
 .../org-entities.el                           |    2 +-
 .../org-eshell.el                             |    2 +-
 .../{org-20161118 => org-20170210}/org-eww.el |    2 +-
 .../org-faces.el                              |   10 +-
 .../org-feed.el                               |    2 +-
 .../org-footnote.el                           |    2 +-
 .../org-gnus.el                               |    2 +-
 .../org-habit.el                              |    2 +-
 elpa/{org-20161118 => org-20170210}/org-id.el |    2 +-
 .../org-indent.el                             |    2 +-
 .../org-info.el                               |   43 +-
 .../org-inlinetask.el                         |    2 +-
 .../org-install.el                            |    0
 .../{org-20161118 => org-20170210}/org-irc.el |    2 +-
 .../org-lint.el                               |    2 +-
 .../org-list.el                               |   18 +-
 .../org-loaddefs.el                           |  110 +-
 .../org-macro.el                              |    2 +-
 .../org-macs.el                               |   10 +-
 .../{org-20161118 => org-20170210}/org-mhe.el |    2 +-
 .../org-mobile.el                             |   59 +-
 .../org-mouse.el                              |    2 +-
 .../org-pcomplete.el                          |    2 +-
 elpa/org-20170210/org-pkg.el                  |    3 +
 .../org-plot.el                               |    2 +-
 .../org-protocol.el                           |    2 +-
 .../org-rmail.el                              |    2 +-
 .../{org-20161118 => org-20170210}/org-src.el |   37 +-
 .../org-table.el                              |   36 +-
 .../org-timer.el                              |    4 +-
 .../org-version.el                            |    4 +-
 .../{org-20161118 => org-20170210}/org-w3m.el |    2 +-
 elpa/{org-20161118 => org-20170210}/org.el    | 1087 ++---
 .../orgcard.pdf                               |  Bin 118264 -> 119383 bytes
 .../ox-ascii.el                               |  131 +-
 .../ox-beamer.el                              |   66 +-
 .../{org-20161118 => org-20170210}/ox-html.el |   96 +-
 .../ox-icalendar.el                           |   10 +-
 .../ox-latex.el                               |  247 +-
 elpa/{org-20161118 => org-20170210}/ox-man.el |   10 +-
 elpa/{org-20161118 => org-20170210}/ox-md.el  |    6 +-
 elpa/{org-20161118 => org-20170210}/ox-odt.el |   43 +-
 elpa/{org-20161118 => org-20170210}/ox-org.el |    2 +-
 .../ox-publish.el                             |  105 +-
 .../ox-texinfo.el                             |   15 +-
 elpa/{org-20161118 => org-20170210}/ox.el     |  217 +-
 init.el                                       |    7 +-
 132 files changed, 4340 insertions(+), 4209 deletions(-)
 delete mode 100644 elpa/org-20161118/org-pkg.el
 rename elpa/{org-20161118 => org-20170210}/COPYING (100%)
 rename elpa/{org-20161118 => org-20170210}/README_ELPA (100%)
 rename elpa/{org-20161118 => org-20170210}/dir (100%)
 rename elpa/{org-20161118 => org-20170210}/etc/ORG-NEWS (99%)
 rename elpa/{org-20161118 => org-20170210}/etc/styles/OrgOdtContentTemplate.xml (100%)
 rename elpa/{org-20161118 => org-20170210}/etc/styles/OrgOdtStyles.xml (100%)
 rename elpa/{org-20161118 => org-20170210}/etc/styles/README (100%)
 rename elpa/{org-20161118 => org-20170210}/ob-C.el (99%)
 rename elpa/{org-20161118 => org-20170210}/ob-J.el (98%)
 rename elpa/{org-20161118 => org-20170210}/ob-R.el (99%)
 rename elpa/{org-20161118 => org-20170210}/ob-abc.el (98%)
 rename elpa/{org-20161118 => org-20170210}/ob-asymptote.el (98%)
 rename elpa/{org-20161118 => org-20170210}/ob-awk.el (98%)
 rename elpa/{org-20161118 => org-20170210}/ob-calc.el (98%)
 rename elpa/{org-20161118 => org-20170210}/ob-clojure.el (98%)
 rename elpa/{org-20161118 => org-20170210}/ob-comint.el (99%)
 rename elpa/{org-20161118 => org-20170210}/ob-coq.el (97%)
 rename elpa/{org-20161118 => org-20170210}/ob-core.el (99%)
 rename elpa/{org-20161118 => org-20170210}/ob-css.el (96%)
 rename elpa/{org-20161118 => org-20170210}/ob-ditaa.el (98%)
 rename elpa/{org-20161118 => org-20170210}/ob-dot.el (98%)
 rename elpa/{org-20161118 => org-20170210}/ob-ebnf.el (98%)
 rename elpa/{org-20161118 => org-20170210}/ob-emacs-lisp.el (98%)
 rename elpa/{org-20161118 => org-20170210}/ob-eval.el (98%)
 rename elpa/{org-20161118 => org-20170210}/ob-exp.el (99%)
 rename elpa/{org-20161118 => org-20170210}/ob-forth.el (98%)
 rename elpa/{org-20161118 => org-20170210}/ob-fortran.el (99%)
 rename elpa/{org-20161118 => org-20170210}/ob-gnuplot.el (99%)
 rename elpa/{org-20161118 => org-20170210}/ob-groovy.el (98%)
 rename elpa/{org-20161118 => org-20170210}/ob-haskell.el (99%)
 rename elpa/{org-20161118 => org-20170210}/ob-io.el (98%)
 rename elpa/{org-20161118 => org-20170210}/ob-java.el (98%)
 rename elpa/{org-20161118 => org-20170210}/ob-js.el (97%)
 rename elpa/{org-20161118 => org-20170210}/ob-keys.el (98%)
 rename elpa/{org-20161118 => org-20170210}/ob-latex.el (99%)
 rename elpa/{org-20161118 => org-20170210}/ob-ledger.el (97%)
 rename elpa/{org-20161118 => org-20170210}/ob-lilypond.el (99%)
 rename elpa/{org-20161118 => org-20170210}/ob-lisp.el (98%)
 rename elpa/{org-20161118 => org-20170210}/ob-lob.el (98%)
 rename elpa/{org-20161118 => org-20170210}/ob-lua.el (99%)
 rename elpa/{org-20161118 => org-20170210}/ob-makefile.el (96%)
 rename elpa/{org-20161118 => org-20170210}/ob-matlab.el (95%)
 rename elpa/{org-20161118 => org-20170210}/ob-maxima.el (98%)
 rename elpa/{org-20161118 => org-20170210}/ob-mscgen.el (97%)
 rename elpa/{org-20161118 => org-20170210}/ob-ocaml.el (99%)
 rename elpa/{org-20161118 => org-20170210}/ob-octave.el (99%)
 rename elpa/{org-20161118 => org-20170210}/ob-org.el (97%)
 rename elpa/{org-20161118 => org-20170210}/ob-perl.el (98%)
 rename elpa/{org-20161118 => org-20170210}/ob-picolisp.el (99%)
 rename elpa/{org-20161118 => org-20170210}/ob-plantuml.el (98%)
 rename elpa/{org-20161118 => org-20170210}/ob-processing.el (99%)
 rename elpa/{org-20161118 => org-20170210}/ob-python.el (99%)
 rename elpa/{org-20161118 => org-20170210}/ob-ref.el (99%)
 rename elpa/{org-20161118 => org-20170210}/ob-ruby.el (95%)
 rename elpa/{org-20161118 => org-20170210}/ob-sass.el (97%)
 rename elpa/{org-20161118 => org-20170210}/ob-scala.el (98%)
 rename elpa/{org-20161118 => org-20170210}/ob-scheme.el (99%)
 rename elpa/{org-20161118 => org-20170210}/ob-screen.el (98%)
 rename elpa/{org-20161118 => org-20170210}/ob-sed.el (98%)
 rename elpa/{org-20161118 => org-20170210}/ob-shell.el (92%)
 rename elpa/{org-20161118 => org-20170210}/ob-shen.el (97%)
 rename elpa/{org-20161118 => org-20170210}/ob-sql.el (99%)
 rename elpa/{org-20161118 => org-20170210}/ob-sqlite.el (98%)
 rename elpa/{org-20161118 => org-20170210}/ob-stan.el (98%)
 rename elpa/{org-20161118 => org-20170210}/ob-table.el (98%)
 rename elpa/{org-20161118 => org-20170210}/ob-tangle.el (85%)
 rename elpa/{org-20161118 => org-20170210}/ob.el (95%)
 rename elpa/{org-20161118 => org-20170210}/org (91%)
 rename elpa/{org-20161118 => org-20170210}/org-agenda.el (96%)
 rename elpa/{org-20161118 => org-20170210}/org-archive.el (99%)
 rename elpa/{org-20161118 => org-20170210}/org-attach.el (99%)
 rename elpa/{org-20161118 => org-20170210}/org-autoloads.el (98%)
 rename elpa/{org-20161118 => org-20170210}/org-bbdb.el (99%)
 rename elpa/{org-20161118 => org-20170210}/org-bibtex.el (99%)
 rename elpa/{org-20161118 => org-20170210}/org-capture.el (95%)
 rename elpa/{org-20161118 => org-20170210}/org-clock.el (96%)
 rename elpa/{org-20161118 => org-20170210}/org-colview.el (94%)
 rename elpa/{org-20161118 => org-20170210}/org-compat.el (98%)
 rename elpa/{org-20161118 => org-20170210}/org-crypt.el (97%)
 rename elpa/{org-20161118 => org-20170210}/org-ctags.el (99%)
 rename elpa/{org-20161118 => org-20170210}/org-datetree.el (99%)
 rename elpa/{org-20161118 => org-20170210}/org-docview.el (98%)
 rename elpa/{org-20161118 => org-20170210}/org-element.el (99%)
 rename elpa/{org-20161118 => org-20170210}/org-entities.el (99%)
 rename elpa/{org-20161118 => org-20170210}/org-eshell.el (97%)
 rename elpa/{org-20161118 => org-20170210}/org-eww.el (99%)
 rename elpa/{org-20161118 => org-20170210}/org-faces.el (98%)
 rename elpa/{org-20161118 => org-20170210}/org-feed.el (99%)
 rename elpa/{org-20161118 => org-20170210}/org-footnote.el (99%)
 rename elpa/{org-20161118 => org-20170210}/org-gnus.el (99%)
 rename elpa/{org-20161118 => org-20170210}/org-habit.el (99%)
 rename elpa/{org-20161118 => org-20170210}/org-id.el (99%)
 rename elpa/{org-20161118 => org-20170210}/org-indent.el (99%)
 rename elpa/{org-20161118 => org-20170210}/org-info.el (76%)
 rename elpa/{org-20161118 => org-20170210}/org-inlinetask.el (99%)
 rename elpa/{org-20161118 => org-20170210}/org-install.el (100%)
 rename elpa/{org-20161118 => org-20170210}/org-irc.el (99%)
 rename elpa/{org-20161118 => org-20170210}/org-lint.el (99%)
 rename elpa/{org-20161118 => org-20170210}/org-list.el (99%)
 rename elpa/{org-20161118 => org-20170210}/org-loaddefs.el (96%)
 rename elpa/{org-20161118 => org-20170210}/org-macro.el (99%)
 rename elpa/{org-20161118 => org-20170210}/org-macs.el (98%)
 rename elpa/{org-20161118 => org-20170210}/org-mhe.el (99%)
 rename elpa/{org-20161118 => org-20170210}/org-mobile.el (96%)
 rename elpa/{org-20161118 => org-20170210}/org-mouse.el (99%)
 rename elpa/{org-20161118 => org-20170210}/org-pcomplete.el (99%)
 create mode 100644 elpa/org-20170210/org-pkg.el
 rename elpa/{org-20161118 => org-20170210}/org-plot.el (99%)
 rename elpa/{org-20161118 => org-20170210}/org-protocol.el (99%)
 rename elpa/{org-20161118 => org-20170210}/org-rmail.el (98%)
 rename elpa/{org-20161118 => org-20170210}/org-src.el (98%)
 rename elpa/{org-20161118 => org-20170210}/org-table.el (99%)
 rename elpa/{org-20161118 => org-20170210}/org-timer.el (99%)
 rename elpa/{org-20161118 => org-20170210}/org-version.el (89%)
 rename elpa/{org-20161118 => org-20170210}/org-w3m.el (99%)
 rename elpa/{org-20161118 => org-20170210}/org.el (97%)
 rename elpa/{org-20161118 => org-20170210}/orgcard.pdf (60%)
 rename elpa/{org-20161118 => org-20170210}/ox-ascii.el (95%)
 rename elpa/{org-20161118 => org-20170210}/ox-beamer.el (95%)
 rename elpa/{org-20161118 => org-20170210}/ox-html.el (98%)
 rename elpa/{org-20161118 => org-20170210}/ox-icalendar.el (99%)
 rename elpa/{org-20161118 => org-20170210}/ox-latex.el (96%)
 rename elpa/{org-20161118 => org-20170210}/ox-man.el (99%)
 rename elpa/{org-20161118 => org-20170210}/ox-md.el (99%)
 rename elpa/{org-20161118 => org-20170210}/ox-odt.el (99%)
 rename elpa/{org-20161118 => org-20170210}/ox-org.el (99%)
 rename elpa/{org-20161118 => org-20170210}/ox-publish.el (94%)
 rename elpa/{org-20161118 => org-20170210}/ox-texinfo.el (99%)
 rename elpa/{org-20161118 => org-20170210}/ox.el (98%)

diff --git a/bba.org b/bba.org
index 983ec33a..08adf524 100644
--- a/bba.org
+++ b/bba.org
@@ -33,7 +33,7 @@ To be precise, this is what's in the first part of my =~/.emacs.d/init.el= (what
     load-path))
 
 
-  (add-to-list 'load-path "~/.emacs/elpa/org-20160711")
+  (add-to-list 'load-path "~/.emacs/elpa/org-20170210")
 
   ;; (add-to-list 'load-path "~/elisp/org-mode/contrib/lisp")
   ;; Load the rest of the packages
@@ -62,7 +62,7 @@ If you are in need enable debugging:
 
 * run in servermode
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (require 'server)
   (unless (server-running-p)
     (server-start))
@@ -73,7 +73,7 @@ If you are in need enable debugging:
 
 No need for that:
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (setq inhibit-startup-screen t)
 #+END_SRC
 
@@ -93,7 +93,7 @@ Some aliases you might want to set in your bash to talk to your Emacs server:
 If running standalone on OSX we need to get some environment variables
 from bash.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (setenv "EDITOR" "emacsclient")
 
   (if (string-equal system-type "darwin")
@@ -149,13 +149,13 @@ from bash.
 
 We don't need a =$PAGER= in Emacs:
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
      (setenv "PAGER" "cat")
 #+END_SRC
 
 Want to have some [[http://www.emacswiki.org/emacs/EshellAlias][shell aliases]], right?
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
     (defalias 'e 'find-file)
     (defalias 'ff 'find-file)
     (defalias 'emacs 'find-file)
@@ -163,7 +163,7 @@ Want to have some [[http://www.emacswiki.org/emacs/EshellAlias][shell aliases]],
 
 Some of my favorite bash aliases, can be even more helpful in Eshell. Like ‘ll’:
 
-  #+BEGIN_SRC elisp
+  #+BEGIN_SRC elisp :tangle yes
     (add-hook 'eshell-mode-hook
               (lambda ()
                 ;; The 'ls' executable requires the Gnu version on the Mac
@@ -175,7 +175,7 @@ Some of my favorite bash aliases, can be even more helpful in Eshell. Like ‘ll
 
 What about =gd= to call the Diff command?
 
-   #+BEGIN_SRC elisp
+   #+BEGIN_SRC elisp :tangle yes
      (defalias 'gd 'magit-diff-unstaged)
      (defalias 'gds 'magit-diff-staged)
    #+END_SRC
@@ -185,7 +185,7 @@ What about =gd= to call the Diff command?
 I like to commit my notes in my org and workorg folders after a days work.
 Keep track of your important stuff!
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
 
   ;; define function to shutdown emacs server instance
   (defun server-shutdown ()
@@ -206,7 +206,7 @@ Keep track of your important stuff!
 #+END_SRC
 
 * async
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (if (>= emacs-major-version 24)
       (progn
         (add-to-list 'load-path "~/.emacs.d/elpa/async-20161103.1036")
@@ -217,7 +217,7 @@ Keep track of your important stuff!
 
 * [[http://www.emacswiki.org/emacs/ELPA][ELPA]]
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (if (>= emacs-major-version 24)
       (progn
         (add-to-list 'load-path "~/.emacs.d/elpa")
@@ -242,7 +242,7 @@ Keep track of your important stuff!
 
 For annotated tags prepare message with commit messages since last tag.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (require 'magit)
   (setq magit-last-seen-setup-instructions "1.4.0")
   (define-key magit-mode-map (kbd "<s-return>") 'ffap)
@@ -267,7 +267,7 @@ For annotated tags prepare message with commit messages since last tag.
 
 focus on the important stuff.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (if (>= emacs-major-version 24)
       (progn
         (add-to-list 'load-path "~/.emacs.d/elpa/focus-20160111.522")
@@ -278,7 +278,7 @@ focus on the important stuff.
 
 * fullframe
 open ibuffer and magit-status in fullframe mode.
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
     (if (>= emacs-major-version 24)
         (progn
           (add-to-list 'load-path "~/.emacs.d/elpa/fullframe-20160209.2318")
@@ -294,7 +294,7 @@ open ibuffer and magit-status in fullframe mode.
 
 Get undo for your window layout.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (if (>= emacs-major-version 24)
       (winner-mode 1))
 #+END_SRC
@@ -305,7 +305,7 @@ Enable smart parens in all modes.
 See [[https://github.com/toctan/smartparens][Smartparens on github]].
 Some key bindings taken from [[https://ebzzry.github.io/emacs-pairs.html][emacs-pairs]].
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (if (>= emacs-major-version 24)
       (progn
         (add-to-list 'load-path "~/.emacs.d/elpa/smartparens-20160217.1102")
@@ -350,7 +350,7 @@ Highlight delimiters such as parentheses, brackets or braces according
 to their depth.
 But we use it only in graphical mode as text mode lacks color depth.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (if (>= emacs-major-version 24)
       (when (display-graphic-p)
         (add-to-list 'load-path "~/.emacs.d/elpa/rainbow-delimiters-20150320.17")
@@ -375,7 +375,7 @@ search the web on your fingertips. C-c /.
 |---+-------------|
 
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
     (if (>= emacs-major-version 24)
         (progn
           (require 'engine-mode)
@@ -438,7 +438,7 @@ search the web on your fingertips. C-c /.
 * expand-region
     [2015-04-02 Thu 10:32]
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (if (>= emacs-major-version 24)
       (progn
         (add-to-list 'load-path "~/.emacs.d/elpa/expand-region-20150525.205")
@@ -457,7 +457,8 @@ snippets. Some help for Perl and even for org-mode.
 Thought about using snippets for shell-mode and eshell-mode?
 snippets for =aws cli= are awesome!
 =ha-autoinsert-yas-expand= copied from Howard Abrams.
-#+BEGIN_SRC emacs-lisp
+
+#+BEGIN_SRC emacs-lisp :tangle yes
   (add-to-list 'load-path
 	       "~/.emacs.d/elpa/yasnippet-20161110.1226")
   (require 'yasnippet)
@@ -484,7 +485,7 @@ snippets for =aws cli= are awesome!
 #+END_SRC
 
 From http://emacswiki.org/emacs/Yasnippet
-#+begin_src emacs-lisp
+#+begin_src emacs-lisp :tangle yes
     (if (>= emacs-major-version 24)
         (defun yas-shk-helm-prompt (prompt choices &optional display-fn)
           "Use helm to select a snippet. Put this into `yas/prompt-functions.'"
@@ -509,13 +510,13 @@ From http://emacswiki.org/emacs/Yasnippet
 
 Default to snippet-mode if we are in a sub directory of snippets:
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (add-to-list 'auto-mode-alist '("\\.emacs.d/snippets/[^/]*/" . snippet-mode))
 #+END_SRC
 
 We use lisp in our snippets. So suppress warnings for that:
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (add-to-list 'warning-suppress-types '(yasnippet backquote-change))
 #+END_SRC
 
@@ -525,14 +526,14 @@ We use lisp in our snippets. So suppress warnings for that:
 I use yasnippet for sql a lot.
 Languages differ and I need different templates.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (define-derived-mode sql-oracle-mode sql-mode "OracleSQL"
     "Major mode for ORACLE SQL"
     (setq sql-product 'oracle)
     )
 #+END_SRC
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
     (define-derived-mode sql-vertica-mode sql-mode "VerticaSQL"
       "Major mode for Vertica"
       (setq sql-product 'ansi)
@@ -540,7 +541,7 @@ Languages differ and I need different templates.
 
 #+END_SRC
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (define-derived-mode sql-mysql-mode sql-mode "MySQL"
     "Major mode for MySQL"
     (setq sql-product 'mysql)
@@ -553,7 +554,7 @@ Languages differ and I need different templates.
 modified puppet-lint definition to include no-80chars-check and fixed
 log-format.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (if (>= emacs-major-version 24)
       (progn
         (add-to-list 'load-path "~/.emacs.d/elpa/flycheck-20160218.41")
@@ -606,7 +607,7 @@ Probably the best help to keep track of the not every day used keybindings.
 Hide passwords on the screen from shoulder surfing.
 Single pipes interfere with org tables. Just go double.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (load-file (expand-file-name "~/.emacs.d/lisp/hidepw.el"))
   (add-hook 'org-mode-hook  'hidepw-mode)
   (setq hidepw-pattern "||\\(.*\\)||")
@@ -616,7 +617,7 @@ Single pipes interfere with org tables. Just go double.
 
 Use [[http://orgmode.org/manual/A-LaTeX-example.html#A-LaTeX-example][orgtbl]] to create tables.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (setq tex-dvi-view-command "(f=*; pdflatex \"${f%.dvi}.tex\" && open \"${f%.dvi}.pdf\")")
   (setq TeX-auto-save t)
   (setq TeX-parse-self t)
@@ -633,7 +634,7 @@ Use [[http://orgmode.org/manual/A-LaTeX-example.html#A-LaTeX-example][orgtbl]] t
 
 * thesaurus
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   ;; The file names are absolute, not relative, locations
   ;;     - e.g. /foobar/mthesaur.txt.cache, not mthesaur.txt.cache
   (setq synonyms-file        "~/.emacs.d/mthesaur.txt")
@@ -647,7 +648,7 @@ Use [[http://orgmode.org/manual/A-LaTeX-example.html#A-LaTeX-example][orgtbl]] t
 
 Adjust indentation at work.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
     ;; load yaml-mode
     ;; (require 'yaml-mode)
     ;; (add-to-list 'auto-mode-alist '("\\.yml$" . yaml-mode))
@@ -662,7 +663,7 @@ Adjust indentation at work.
 * highlight indentation
 [2016-10-09 Sun 17:13]
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (load-file (expand-file-name "~/.emacs.d/lisp/highlight-indentation.el"))
   (set-face-background 'highlight-indentation-face "#e3e3d3")
   (set-face-background 'highlight-indentation-current-column-face "#c3b3b3")
@@ -671,7 +672,7 @@ Adjust indentation at work.
 
 To get syntax highlight for HTML exports:
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (if (>= emacs-major-version 24)
       (progn
         (require 'htmlize )
@@ -683,7 +684,7 @@ To get syntax highlight for HTML exports:
 
 * vc-git
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (require 'vc-git)
     (when (featurep 'vc-git) (add-to-list 'vc-handled-backends 'git))
 
@@ -694,7 +695,7 @@ To get syntax highlight for HTML exports:
 Replaced the deprecated [[https://github.com/winterTTr/ace-jump-mode][ace-jump-mode]] with [[help:avy-goto-char][avy-goto-char]] and [[help:goto-line][goto-line]]
 with [[help:avy-goto-line][avy-goto-line]].
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (add-to-list 'load-path "~/.emacs.d/elpa/avy-20160202.2357")
   (require 'avy)
   (define-key global-map (kbd "C-c C-@") 'avy-goto-word-1)
@@ -718,7 +719,7 @@ with [[help:avy-goto-line][avy-goto-line]].
 
 I still like ido-find-file.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (ido-mode t)
   (setq ido-enable-prefix nil
         ido-enable-flex-matching t
@@ -742,7 +743,7 @@ I still like ido-find-file.
 
 * visual-regexp
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (if (>= emacs-major-version 24)
       (progn
         (require 'visual-regexp)
@@ -760,7 +761,7 @@ It's worth to use Emacs for org-mode alone.
 [[http://howardism.org/Technical/Emacs/literate-devops.html][Literate DevOps]] and [[http://www.howardism.org/Technical/Emacs/literate-database.html][Literate Database Work]] are only 2 use cases.
 With [[https://github.com/fniessen/org-html-themes.git][org html themes]] it's easy to generate beautiful output.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (require 'ox-md nil t)
 #+END_SRC
 
@@ -768,7 +769,7 @@ With [[https://github.com/fniessen/org-html-themes.git][org html themes]] it's e
 
 Some extra functionality from the org package repository.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle no
     (if (>= emacs-major-version 24)
         (progn
           (add-to-list 'load-path "~/.emacs.d/elpa/org-plus-contrib-20150831" t)
@@ -793,7 +794,7 @@ javascript:location.href='org-protocol://capture:/l/'%20+%20encodeURIComponent(l
 #+END_SRC
 
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (require 'org-protocol)
 
   (add-to-list 'auto-mode-alist '("\\.org$" . org-mode))
@@ -834,7 +835,7 @@ blocks with Org Babel.
 This package is a direct result of attempting to answer a question on
 this [[http://emacs.stackexchange.com/q/26374/10625][emacs.stackexchange.com thread]].
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (require 'ob-applescript)
 #+END_SRC
 
@@ -843,14 +844,14 @@ this [[http://emacs.stackexchange.com/q/26374/10625][emacs.stackexchange.com thr
 
 Org-mode export backend for JIRA markup
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (if (>= emacs-major-version 24)
       (require 'ox-jira))
 #+END_SRC
 
 We are lazy and want to speed up things:
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (defun bba-org-export-jira-clipboard()
     "narrow to org subtree and store content in jira format in clipboard."
     (interactive)
@@ -871,7 +872,7 @@ the jira ticket. Of course some boiler plate for the poor souls who
 never heard of orgmode.
 
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (defun bba-export-jira-org()
   "export current narrowed view to file in tmp and open a finder window on OS-X."
   (interactive)
@@ -903,7 +904,7 @@ never heard of orgmode.
 ** bba-ox-clip-formatted-copy
 [2016-12-13 Tue 15:29]
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (defun bba-ox-clip-formatted-copy()
     "wrapper for ox-clip-formatted-copy to disable org-export-babel-evaluate."
     (interactive)
@@ -916,12 +917,11 @@ never heard of orgmode.
 
 ** Some initial languages we want org-babel to support
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
 
   (org-babel-do-load-languages
    'org-babel-load-languages
    '(
-     (sh . t)
      (shell . t)
      (python . t)
      (R . t)
@@ -955,7 +955,7 @@ never heard of orgmode.
 Very useful for repetitive literate devops jobs.
 <C-c> <S-n> then <C-c><C-c> and so on.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (add-hook 'org-mode-hook
             (lambda ()
 
@@ -975,7 +975,7 @@ Very useful for repetitive literate devops jobs.
 
 This is helpful in training sessions.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (defun bba-copy-org-src-block()
     "copy last org src block and insert it at point."
     (interactive)
@@ -1042,7 +1042,7 @@ example what you will have finally:
 
 Here is the code:
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (defun bba-org-tmux-capture-pane()
     "capture pane of tmux window and insert it as org-mode sh src block."
     (interactive)
@@ -1091,7 +1091,7 @@ As a replacement you can use this function.
 Select the start and end points where you want to have ascii arrows
 and call this function.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (defun bba-insert-arrows()
     "insert ascii arrows at start and end of selection."
     (interactive)
@@ -1106,7 +1106,7 @@ and call this function.
 
 ** Define some shortcuts to access major org files.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
 
 
   (global-set-key (kbd "C-c <f5>") '(lambda () (interactive) (find-file "~/org/notes.org")))
@@ -1132,7 +1132,7 @@ and call this function.
 
 ** Tag tasks with GTD contexts
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
                (setq org-tag-alist '(("@work" . ?b)
                                      ("@home" . ?h)
                                      ("@errands" . ?e)
@@ -1144,7 +1144,7 @@ and call this function.
 
 #+END_SRC
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
 
   ;; (setq org-clock-persist 'history)
   (org-clock-persistence-insinuate)
@@ -1192,7 +1192,7 @@ and call this function.
 
 ** Define some handy link abbreviations
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
 
   (setq org-link-abbrev-alist '(
   ("bing" . "http://www.bing.com/search?q=%sform=OSDSRC")
@@ -1213,7 +1213,7 @@ and call this function.
 ** Some clock stuff.
 taken from http://doc.norang.ca/org-mode.org
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
 
 
     ;;
@@ -1462,7 +1462,7 @@ to embed videos, they give you the entire iframe HTML code to use, but
 this wouldn’t really be Emacs if we couldn’t make things just a little
 bit easier.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (defvar yt-iframe-format
     ;; You may want to change your width and height.
     (concat "<iframe width=\"440\""
@@ -1500,7 +1500,8 @@ exported to other formats as well.
 Use =C-c M= to send a multipart email with .org as text and exported
 html.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
+  (load-file "~/.emacs.d/elpa/org-plus-contrib-20150831/org-mime.el")
   (add-hook 'org-mode-hook
             (lambda()
               (define-key org-mode-map "\C-c\S-m" 'org-mime-org-buffer-htmlize)))
@@ -1508,7 +1509,7 @@ html.
 
 ** org-ellipsis
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (when (display-graphic-p)
     (setq org-ellipsis " ↴↴↴")
     )
@@ -1517,13 +1518,13 @@ html.
 
 ** fontify
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (setq org-src-fontify-natively t)
 #+END_SRC
 
 ** hide emphasis-markers
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (setq org-hide-emphasis-markers t)
   (setq org-catch-invisible-edits 'smart)
 #+END_SRC
@@ -1531,7 +1532,7 @@ html.
 ** underscore in export
 [2016-10-28 Fri 12:08]
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (setq org-export-with-sub-superscripts nil)
 #+END_SRC
 
@@ -1541,7 +1542,7 @@ html.
 run =toggle-org-custom-inline-style= in a org buffer associated with a
 file.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   ;; put your css files there
   (defvar org-theme-css-dir "~/.emacs.d/org-css/")
 
@@ -1589,30 +1590,30 @@ Thanks to [[https://github.com/dakrone/eos/blob/master/eos-org.org][eos-org]].
 
 Special begin/end of line to skip tags and stars
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (setq org-special-ctrl-a/e t)
 #+END_SRC
 
 Special keys for killing a headline
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (setq org-special-ctrl-k t)
 #+END_SRC
 
 blank lines are removed when exiting the code edit buffer
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (setq org-src-strip-leading-and-trailing-blank-lines t)
 #+END_SRC
 
 Return on a link breaks the link? Just follow it.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (setq org-return-follows-link t)
 #+END_SRC
 * CFEngine
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   ;;   (load-library "cfengine")
      (load-file (expand-file-name "~/.emacs.d/lisp/cfengine.el"))
      (add-to-list 'auto-mode-alist '("\\.cf$" . cfengine3-mode))
@@ -1718,7 +1719,7 @@ for C-c T you can use a file like this one:
 * Puppet
 [2016-02-29 Mon 16:36]
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (add-to-list 'auto-mode-alist '("\\.erb$" . rhtml-mode))
 #+END_SRC
 
@@ -1727,13 +1728,30 @@ for C-c T you can use a file like this one:
 
 Vagrant files are Ruby, so use ruby-mode for them:
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (add-to-list 'auto-mode-alist '("Vagrantfile" . ruby-mode))
 #+END_SRC
 
+#+BEGIN_SRC emacs-lisp :tangle yes
+  (defun bba-ruby-lint()
+  (interactive)
+  "check current buffer via ruby"
+  (let* ((buffer-file-name (or (buffer-file-name) ""))
+           (filename (or (file-remote-p buffer-file-name 'localname)
+			 buffer-file-name))
+	   (command (concat "ruby -c "
+				 (shell-quote-argument filename)))
+	   )
+      (compilation-start (concat "ruby -c "
+				 (shell-quote-argument filename))
+			 nil
+			 (lambda (_) (format "*Ruby Validate: %s*" command))
+			 ))
+  )
+#+END_SRC
 * mwheel
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (load-library "mwheel")
   (mwheel-install)
 
@@ -1745,7 +1763,7 @@ Vagrant files are Ruby, so use ruby-mode for them:
 Display an Emacs tip of the day.
 You may start it at the end of the config file.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
 (defun totd ()
   (interactive)
   (random t) ;; seed with time-of-day
@@ -1765,7 +1783,7 @@ You may start it at the end of the config file.
 
 * TRAMP
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (load-library "tramp")
   (add-to-list 'tramp-remote-path "~/bin")
   (setq default-tramp-method "sshx")
@@ -1773,13 +1791,19 @@ You may start it at the end of the config file.
 
 With this you can do /sudo:ssh-host:file-on-ssh-host
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (add-to-list 'tramp-default-proxies-alist '(nil "\\`root\\'" "/ssh:%h:"))
 #+END_SRC
 
+Use our default socket files
+
+#+BEGIN_SRC emacs-lisp :tangle yes
+  (if (file-accessible-directory-p "~/.ssh/sockets")
+  (setq tramp-ssh-controlmaster-options "-o ControlMaster=auto -o ControlPath=~/.ssh/sockets/ssh.%%C -o ControlPersist=600"))
+#+END_SRC
 * [[http://www.twmode.sourceforge.net/][twitter]]
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (add-to-list 'load-path "~/.emacs.d/elpa/twittering-mode-20160207.156")
   (require 'twittering-mode)
   (cond
@@ -1798,7 +1822,7 @@ With this you can do /sudo:ssh-host:file-on-ssh-host
 
 * [[http://www.mew.org][mew]] email
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :eval no :tangle no
   (autoload 'mew "mew" nil t)
   (autoload 'mew-send "mew" nil t)
 
@@ -1902,7 +1926,7 @@ necessary.
 #+END_SRC
 
 * elfeed
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (if (>= emacs-major-version 24)
       (progn
         (add-to-list 'load-path "~/.emacs.d/elpa/elfeed-20150608.13027")
@@ -1914,20 +1938,20 @@ necessary.
 
 * [[http://www.emacswiki.org/emacs/MalyonMode][Mylon]]
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (require 'malyon)
 #+END_SRC
 
 * TemplateToolkit
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (add-to-list 'auto-mode-alist '("\\.tt2$" . html-mode))
 
 #+END_SRC
 
 * EPG/GPG
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   ;; Do not use gpg agent when runing in terminal
   (defadvice epg--start (around advice-epg-disable-agent activate)
     (let ((agent (getenv "GPG_AGENT_INFO")))
@@ -1950,9 +1974,43 @@ necessary.
 
 #+END_SRC
 
+list who can decrypt a file:
+
+#+BEGIN_SRC emacs-lisp :tangle yes
+  (defun bba-epa-list-packets ()
+    "List who can decrypt the current file"
+    (interactive)
+    (let ((bba-epa-filename (buffer-file-name)))
+      (setq bba-epa-packets-buffer (generate-new-buffer "*Packets*"))
+      (set-buffer bba-epa-packets-buffer)
+      (insert (shell-command-to-string (concat "gpg --list-packets " bba-epa-filename))
+      ;; (epg--start context "--list-packets ")
+      )
+   ))
+#+END_SRC
+
+#+BEGIN_SRC emacs-lisp :tangle no
+  (defun bba-epa-list-packets ()
+    "List who can decrypt the current file"
+    (interactive)
+    (require 'epa)
+    (require 'epg)
+    (let ((bba-epa-filename (buffer-file-name))
+	  (bba-epa-packets-buffer (generate-new-buffer "*Packets*"))
+	  (context (epg-make-context epa-protocol))
+	  (epg-context-output-file context)
+      )
+      (set-buffer bba-epa-packets-buffer)
+      ;; (setf (epg-context-output-file context))
+      (epg--start context (list "--list-packets" bba-epa-filename))
+      (epg-wait-for-completion context)
+      (epg-read-output context)
+   ))
+#+END_SRC
+
 * Perl
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (require 'cperl-mode)
   (fset 'perl-mode 'cperl-mode)
 
@@ -1964,7 +2022,7 @@ necessary.
 
 * auto-completion
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (add-to-list 'load-path "~/.emacs.d/elpa/auto-complete-20160107.8")
   (require 'auto-complete-config)
   (add-to-list 'ac-dictionary-directories "~/.emacs.d/elpa/auto-complete-20160107.8")
@@ -1980,7 +2038,7 @@ necessary.
 
 Watching [[https://www.youtube.com/watch?v%3DFtieBc3KptU][Emacs For Writers]] by [[https://github.com/incandescentman][Jay Dixit]] I had to configure abbreviations.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (setq abbrev-file-name "~/org/abbrev_defs")
   (if (file-exists-p abbrev-file-name)
       (quietly-read-abbrev-file))
@@ -1993,7 +2051,7 @@ Combine abbrev with Ispell:
 
 [[http://endlessparentheses.com/ispell-and-abbrev-the-perfect-auto-correct.html][Ispell and Abbrev, the Perfect Auto-Correct]]
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (global-set-key (kbd "M-$") #'endless/ispell-word-then-abbrev)
 
   (defun endless/simple-get-word ()
@@ -2035,7 +2093,7 @@ Combine abbrev with Ispell:
 #+END_SRC
 
 * syntax-highlighting
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (font-lock-mode)
   (global-font-lock-mode 1)
 
@@ -2097,12 +2155,12 @@ acts on the whole buffer.
 On OS X you might want to run =sudo port install sqlparse= to have
 =sqlformat= available.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (load-file (expand-file-name "~/.emacs.d/lisp/sqlformat.el"))
 
 #+END_SRC
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (add-hook 'sql-mode-hook
             (lambda ()
               (key-chord-define sql-mode-map "FF" 'sqlformat)))
@@ -2112,7 +2170,7 @@ On OS X you might want to run =sudo port install sqlparse= to have
 
 Takes care of doing upper-case for keywords.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (add-to-list 'load-path "~/.emacs.d/elpa/sqlup-mode-20160911.1911")
   (require 'sqlup-mode)
   (add-hook 'sql-mode-hook 'sqlup-mode)
@@ -2133,7 +2191,7 @@ like these:
     # End:
 #+END_SRC
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (eval-after-load "cfengine3-mode"
     '(add-hook 'cfengine3-mode-hook (lambda() (add-hook 'write-contents-functions
                                                    (lambda()
@@ -2216,7 +2274,7 @@ like these:
 
 Use C-c C-c to run rpmbuild if buffer is spec file.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (defun bba-build-rpm ()
   "Do rpmbuild -ba, with the current buffers filename."
   (interactive)
@@ -2242,7 +2300,7 @@ Use C-c C-c to run rpmbuild if buffer is spec file.
 
 Use undo-tree.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (if (>= emacs-major-version 24)
       (global-undo-tree-mode))
 
@@ -2250,7 +2308,7 @@ Use undo-tree.
 
 * mode-line menu-bar etc
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (column-number-mode t)
   (line-number-mode t)
   (setq display-time-24hr-format t)
@@ -2275,7 +2333,7 @@ Keeps track of your writing.
 Includes [[http://en.wikipedia.org/wiki/Flesch%E2%80%93Kincaid_readability_tests#Flesch_Reading_Ease][Flesch Reading Ease]] and [[http://en.wikipedia.org/wiki/Flesch–Kincaid_readability_test#Flesch.E2.80.93Kincaid_Grade_Level][Flesch Grade Level]].
 With modifications by [[http://sachachua.com/blog/2011/12/emacs-artbollocks-mode-el-and-writing-more-clearly/][Sacha Chua]].
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
     (if (>= emacs-major-version 24)
         (progn
           (require 'artbollocks-mode)
@@ -2321,7 +2379,7 @@ With modifications by [[http://sachachua.com/blog/2011/12/emacs-artbollocks-mode
 Bind f3 and f4 to previous/next pane.
 Bind shift f3 and shift f4 to previous/next frame.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (defun move-cursor-next-pane ()
     "Move cursor to the next pane."
     (interactive)
@@ -2350,7 +2408,7 @@ Bind shift f3 and shift f4 to previous/next frame.
 
 Right from [[https://gist.github.com/etherald/dcdcf579751c75a2c796][gisthub]]:
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (defun twist-split ()
     (interactive)
     (setq buffer2 (window-buffer (second (window-list))))
@@ -2361,14 +2419,14 @@ Right from [[https://gist.github.com/etherald/dcdcf579751c75a2c796][gisthub]]:
 #+END_SRC
 
 * [[https://github.com/dotemacs/ipcalc.el][ipcalc]]
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
       (require 'ipcalc)
 
 #+END_SRC
 
 * [[http://www.emacswiki.org/emacs/RecentFiles][RecentFiles]]
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (require 'recentf)
   (recentf-mode 1)
   (setq recentf-max-saved-items 200
@@ -2378,7 +2436,7 @@ Right from [[https://gist.github.com/etherald/dcdcf579751c75a2c796][gisthub]]:
 #+END_SRC
 
 * insert-date function
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (defun insert-date ()
   "Insert the current date"
   (interactive)
@@ -2400,7 +2458,7 @@ Right from [[https://gist.github.com/etherald/dcdcf579751c75a2c796][gisthub]]:
 toggle full screen with super return. display battery status in
 fullscreen mode. disable scroll bar in fullscreen mode.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (defun bba-toggle-fullscreen()
     "toggle fullscreen mode"
     (interactive)
@@ -2426,7 +2484,7 @@ window-total-height.
 
 Bound to =C-X l !=
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (defun eshell-here ()
     "Opens up a new shell in the directory associated with the
   current buffer's file. The eshell is renamed to match that
@@ -2494,7 +2552,7 @@ Bound to =C-X l !=
 
 Use =C-c E= to evaluate and replace the last s-expression.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (defun bba/eval-last-sexp-replace ()
     "replace the last s-expression with its evaluated result"
     (interactive)
@@ -2506,7 +2564,7 @@ Use =C-c E= to evaluate and replace the last s-expression.
 #+END_SRC
 
 * goto-match-paren
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
       (defun goto-match-paren (arg)
         "Go to the matching parenthesis if on parenthesis, otherwise insert %.
       vi style of % jumping to matching brace."
@@ -2521,7 +2579,7 @@ Use =C-c E= to evaluate and replace the last s-expression.
 * safe hash bang files executable
 safe files with #! in first line as user executable.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (add-hook `after-save-hook
             #'(lambda ()
                 (if (not
@@ -2557,7 +2615,7 @@ safe files with #! in first line as user executable.
 
 =M-p= and =M-n= to move current line up or down.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (defun bba/move-line (n)
     "Move the current line up or down by N lines."
     (interactive "p")
@@ -2590,7 +2648,7 @@ safe files with #! in first line as user executable.
 Sometimes you need the filename of your current buffer on the command
 line or somewhere else.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (defun bba-copy-buffer-name ()
     (interactive)
     (kill-new (buffer-file-name))
@@ -2604,7 +2662,7 @@ line or somewhere else.
 Configure [[https://github.com/leoliu/ggtags][ggtags]] and [[https://github.com/syohex/emacs-helm-gtags][helm-gtags]] to use [[https://www.gnu.org/software/global/][GNU Global]].
 If you are new to tags check [[http://tuhdo.github.io/c-ide.html][this]].
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (if (>= emacs-major-version 24)
       (progn
         (add-to-list 'load-path "~/.emacs.d/elpa/ggtags-20151214.1344" t)
@@ -2639,7 +2697,7 @@ Some links you might check out:
   Stack Exchange]]
 - [[https://github.com/ShingoFukuyama/helm-swoop][helm-swoop]]
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (if (>= emacs-major-version 24)
       (progn
         (add-to-list 'load-path
@@ -2685,7 +2743,7 @@ Some links you might check out:
 
 * helm-descbinds
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (if (>= emacs-major-version 24)
       (progn
         (add-to-list 'load-path "~/.emacs.d/elpa/helm-descbinds-20160108.1947")
@@ -2699,7 +2757,7 @@ Some links you might check out:
 
 switch default browser between eww and default.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (defun bba-switch-default-browser ()
       "switch between default browser and eww"
     (interactive)
@@ -2716,7 +2774,7 @@ switch default browser between eww and default.
 
 combine key strokes to access commands even faster.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (add-to-list 'load-path "~/.emacs.d/elpa/key-chord-20151209.104")
 
   (require 'key-chord)
@@ -2741,7 +2799,7 @@ combine key strokes to access commands even faster.
 * keyfreq
 [2016-11-23 Wed 13:33]
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (add-to-list 'load-path "~/.emacs.d/elpa/keyfreq-20160516.716")
   (require 'keyfreq)
   (keyfreq-mode 1)
@@ -2753,14 +2811,14 @@ combine key strokes to access commands even faster.
 
 
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (setq type-break-keystroke-threshold '(3600 . 18000))
   (type-break-mode t)
 #+END_SRC
 
 * aliases
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (defalias 'ts 'transpose-sentences)
   (defalias 'tp 'transpose-paragraphs)
   (defalias 'om 'org-mode)
@@ -2772,7 +2830,7 @@ combine key strokes to access commands even faster.
 
 Thanks to Marcin Borkowski for this code snippet.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
 (defun smart-self-insert-punctuation (count)
   "If COUNT=1 and the point is after a space, insert the relevant
 character before any spaces."
@@ -2789,7 +2847,7 @@ character before any spaces."
 #+END_SRC
 
 * key bindings
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (define-key global-map (kbd "M-@") 'cycle-spacing)
   (define-key global-map (kbd "M-SPC") 'cycle-spacing)
   (define-key global-map "\C-x\S-f" 'find-file-at-point)
@@ -2837,7 +2895,7 @@ characters in a different color.  There is also an untabify function
 to convert hard tabs to the appropriate number of spaces, and a tabify
 function to convert groups of spaces to hard tabs.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (define-key bba/toggle "w" 'whitespace-mode)
 
   (setq whitespace-display-mappings
@@ -2849,7 +2907,7 @@ function to convert groups of spaces to hard tabs.
           ))
 #+END_SRC
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
 
 
   (define-prefix-command 'bba/launcher)
@@ -2933,7 +2991,7 @@ function to convert groups of spaces to hard tabs.
 =isearch-forward-regexp= is much more useful than =isearch-forward= so
 we use that as default:
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (global-set-key (kbd "C-s") 'isearch-forward-regexp)
   (global-set-key (kbd "C-r") 'isearch-backward-regexp)
   (global-set-key (kbd "C-M-s") 'isearch-forward)
@@ -2944,7 +3002,7 @@ Thanks to [[http://ergoemacs.org/emacs/emacs_isearch_by_arrow_keys.html][Xah Lee
 
 Here's very convenient keys for isearch.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
     (define-key isearch-mode-map (kbd "<up>") 'isearch-ring-retreat )
     (define-key isearch-mode-map (kbd "<down>") 'isearch-ring-advance )
 
@@ -2957,7 +3015,7 @@ Here's very convenient keys for isearch.
 
 Adjust mouse speed:
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (setq mouse-wheel-scroll-amount '(1 ((shift) . 1) ((control) . nil)))
   (setq mouse-wheel-progressive-speed nil)
 #+END_SRC
@@ -2990,7 +3048,7 @@ positions.
 
 * Beautifying JSON
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (defun beautify-json ()
   "Use python to prettyprint JSON."
     (interactive)
@@ -3003,7 +3061,7 @@ positions.
 * [[http://kitchingroup.cheme.cmu.edu/blog/2015/06/29/Getting-Emacs-to-read-to-me/][words-speak]]
 [2016-12-18 Sun 15:11]
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (defvar words-voice "Vicki"
     "Mac voice to use for speaking.")
 
@@ -3030,7 +3088,7 @@ positions.
 
 Kill the current buffer without asking if there is no prefix.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (defun jcs-kill-a-buffer (askp)
     (interactive "P")
     (if askp
@@ -3047,7 +3105,7 @@ Kill the current buffer without asking if there is no prefix.
 
 Had to diff files on 2 different servers. What's better then dired and TRAMP?
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (defun mkm/ediff-marked-pair ()
      "Run ediff-files on a pair of files marked in dired buffer"
      (interactive)
@@ -3092,7 +3150,7 @@ Had to diff files on 2 different servers. What's better then dired and TRAMP?
 If I’m on OS X, I can fetch passwords etc. from my Keychain. This is
 much more secure than storing them in configuration on disk:
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (defun bw/chomp (str)
     "Chomp leading and tailing whitespace from `str'."
     (while (string-match "\\`\n+\\|^\\s-+\\|\\s-+$\\|\n+\\'" str)
@@ -3114,121 +3172,121 @@ much more secure than storing them in configuration on disk:
 
 Specify printing format
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (setq ps-paper-type 'a4)
 #+END_SRC
 
 compilation output
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (setq compilation-scroll-output 'first-error)
 #+END_SRC
 
 Set ispell dictionary
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
    (setq ispell-dictionary "english")
 #+END_SRC
 
 Set shell for M-| command
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (setq shell-file-name "/bin/bash")
 #+END_SRC
 
 Set Shell used by TeX
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (setq tex-shell-file-name "/bin/bash")
 #+END_SRC
 
 Set grep command options
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (setq grep-command "grep -i -nH -e ")
 #+END_SRC
 
 Give your cursor some context.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (setq scroll-margin 3)
 #+END_SRC
 
 Confirm quit to avoid hitting C-x C-c by accident.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (setq confirm-kill-emacs 'yes-or-no-p)
 #+END_SRC
 
 Confirm suspend to avoid suspending by accident.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (put 'suspend-frame 'disabled t)
 #+END_SRC
 
 Ignore case when completing file names
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (setq read-file-name-completion-ignore-case t)
 #+END_SRC
 
 Highlight parenthesis pairs
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (show-paren-mode 1)
 #+END_SRC
 
 Blinking parenthesis
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (setq blink-matching-paren-distance nil)
 #+END_SRC
 
 Highlight text between parens
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (setq show-paren-style 'expression)
 #+END_SRC
 
 Use buffer name as frame title
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (setq frame-title-format "%b - emacs")
 #+END_SRC
 
 Completion in mini-buffer
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (icomplete-mode t)
 #+END_SRC
 
 Stack minibuffers
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (setq enable-recursive-minibuffers t)
 #+END_SRC
 
 Make dired human readable
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (setq dired-listing-switches "-alh")
 #+END_SRC
 
 Guess copy target. If split window use others current directory.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (setq dired-dwim-target t)
 #+END_SRC
 
 Dired isn't very colourful by default, but `dired+' has helpful
 highlighting.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (setq diredp-hide-details-initially-flag nil)
   (require 'dired+)
 #+END_SRC
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (setq ediff-split-window-function 'split-window-horizontally)
 #+END_SRC
 
@@ -3240,28 +3298,28 @@ set your mailserver settings outside of this file.
   (setq smtpmail-smtp-service "25")
 #+END_SRC
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (setq send-mail-function 'smtpmail-send-it)
 
 #+END_SRC
 
 Some nice functions
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle no
   ;;(blink-matching-paren 1)
   ;;(paren-activate)
 #+END_SRC
 
 XML indentation
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (if (equal "work" (getenv "SYSENV"))
       (setq nxml-child-indent 4))
 #+END_SRC
 
 * other stuff
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
 
   ;;(move-overlay hl-line-overlay
   ;;            (line-beginning-position) (1+ (line-end-position))
@@ -3313,7 +3371,7 @@ XML indentation
 
 Make the window title display the full path of the file I’m currently editing:
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (when (display-graphic-p)
     (setq frame-title-format
           '((:eval (if (buffer-file-name)
@@ -3323,20 +3381,20 @@ Make the window title display the full path of the file I’m currently editing:
 
 sRGB display fixes
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
 (setq ns-use-srgb-colorspace t)
 #+END_SRC
 
 There are a few applications, such as crontab, that require a trailing
 new line. To be safe, always leave a trailing newline.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (setq-default require-final-newline t)
 #+END_SRC
 
 You have to work hard to be lazy.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (defalias 'ts 'transpose-sentences)
   (defalias 'tp 'transpose-paragraphs)
 #+END_SRC
@@ -3345,14 +3403,14 @@ Save whatever’s in the current (system) clipboard before
 replacing it with the Emacs’ text.
 https://github.com/dakrone/eos/blob/master/eos.org
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (setq save-interprogram-paste-before-kill t)
 #+END_SRC
 * set theme bba1
 
 [[https://emacsfodder.github.io/emacs-theme-editor/][Emacs Theme Editor]] is a nice tool to define your colors.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
    (deftheme bba1 "DOCSTRING for bba1")
      (custom-theme-set-faces 'bba1
       '(default ((t (:foreground "#07e30d" :background "#282828" ))))
@@ -3407,7 +3465,7 @@ https://github.com/dakrone/eos/blob/master/eos.org
 * load custom file
     [2014-10-02 Thu 00:37]
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
     (setq custom-file
           (expand-file-name "custom.el"
                             (expand-file-name ".emacs.d" "~")))
@@ -3418,7 +3476,7 @@ https://github.com/dakrone/eos/blob/master/eos.org
 
 * Set default font on Mac
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (if (string-equal system-type "darwin")
    (set-default-font "Menlo 14"))
 #+END_SRC
@@ -3428,7 +3486,7 @@ https://github.com/dakrone/eos/blob/master/eos.org
 If you edit zone files via TRAMP you might want to activate them via
 =rndc reload=. =C-c C-r= just does that for you.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (defun dns-rndc ()
   "Do rndc reload of current buffers filename."
   (interactive)
@@ -3464,7 +3522,7 @@ not in the public git emacs configuration.
 
 all in your history.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (setq savehist-additional-variables '(kill-ring search-ring regexp-search-ring last-kbd-macro kmacro-ring shell-command-history))
   (setq kmacro-ring-max 42)
   (setq history-delete-duplicates t)
@@ -3489,7 +3547,7 @@ all in your history.
 This one uses Keyboard Maestro to launch a ssh in a screen session in iTerm2.
 Assumption clipboard is a dns name.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (defun bba-screen-start-ssh-to-clipboard (&optional arg)
   "Use a macro in Keyboard Maestro to ssh into a system in iterm screen session."
   (interactive)
@@ -3512,7 +3570,7 @@ Assumption clipboard is a dns name.
 
 Use aws command line tool via Emacs.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (defun bba-aws-desc-instances ( profile name)
     "query aws to get informations for running instances."
     (interactive "sProfile: \nsName: ")
@@ -3528,7 +3586,7 @@ Use aws command line tool via Emacs.
 * thing-at-point-fqdn
 [2016-02-12 Fri 14:13]
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (defun fqdn-bounds-of-fqdn-at-point ()
        "Return the start and end points of an fqdn at the current point.
      The result is a paired list of character positions for an fqdn
@@ -3548,7 +3606,7 @@ Use aws command line tool via Emacs.
 
 Amazon instance ID at point.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (defun instanceid-bounds-of-instanceid-at-point ()
        "Return the start and end points of an Amazon instance ID at the current point.
      The result is a paired list of character positions for an fqdn
@@ -3568,7 +3626,7 @@ Amazon instance ID at point.
 
 Some private settings outside this repository are loaded after this configuration.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (if (file-exists-p "~/.emacs_post.el")
   (load-file "~/.emacs_post.el"))
 #+END_SRC
@@ -3577,7 +3635,7 @@ Some private settings outside this repository are loaded after this configuratio
 
 Display greetings:
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (totd)
   (switch-to-buffer "*Tip of the day*")
   (delete-other-windows)
@@ -3586,7 +3644,7 @@ Display greetings:
 
 Split and show workhours:
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle yes
   (if (equal "work" (getenv "SYSENV"))
     (progn (split-window-below)
            (other-window 1)
diff --git a/elpa/org-20161118/org-pkg.el b/elpa/org-20161118/org-pkg.el
deleted file mode 100644
index 4390e4cf..00000000
--- a/elpa/org-20161118/org-pkg.el
+++ /dev/null
@@ -1,3 +0,0 @@
-(define-package "org"
-  "20161118" "Outline-based notes management and organizer" ( ))
-;; no-byte-compile: t
diff --git a/elpa/org-20161118/COPYING b/elpa/org-20170210/COPYING
similarity index 100%
rename from elpa/org-20161118/COPYING
rename to elpa/org-20170210/COPYING
diff --git a/elpa/org-20161118/README_ELPA b/elpa/org-20170210/README_ELPA
similarity index 100%
rename from elpa/org-20161118/README_ELPA
rename to elpa/org-20170210/README_ELPA
diff --git a/elpa/org-20161118/dir b/elpa/org-20170210/dir
similarity index 100%
rename from elpa/org-20161118/dir
rename to elpa/org-20170210/dir
diff --git a/elpa/org-20161118/etc/ORG-NEWS b/elpa/org-20170210/etc/ORG-NEWS
similarity index 99%
rename from elpa/org-20161118/etc/ORG-NEWS
rename to elpa/org-20170210/etc/ORG-NEWS
index dd332a4f..8c21d07f 100644
--- a/elpa/org-20161118/etc/ORG-NEWS
+++ b/elpa/org-20170210/etc/ORG-NEWS
@@ -3,7 +3,7 @@ ORG NEWS -- history of user-visible changes.           -*- org -*-
 #+LINK: doc http://orgmode.org/worg/doc.html#%s
 #+LINK: git http://orgmode.org/cgit.cgi/org-mode.git/commit/?id=%s
 
-Copyright (C) 2012-2016 Free Software Foundation, Inc.
+Copyright (C) 2012-2017 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 Please send Org bug reports to mailto:emacs-orgmode@gnu.org.
diff --git a/elpa/org-20161118/etc/styles/OrgOdtContentTemplate.xml b/elpa/org-20170210/etc/styles/OrgOdtContentTemplate.xml
similarity index 100%
rename from elpa/org-20161118/etc/styles/OrgOdtContentTemplate.xml
rename to elpa/org-20170210/etc/styles/OrgOdtContentTemplate.xml
diff --git a/elpa/org-20161118/etc/styles/OrgOdtStyles.xml b/elpa/org-20170210/etc/styles/OrgOdtStyles.xml
similarity index 100%
rename from elpa/org-20161118/etc/styles/OrgOdtStyles.xml
rename to elpa/org-20170210/etc/styles/OrgOdtStyles.xml
diff --git a/elpa/org-20161118/etc/styles/README b/elpa/org-20170210/etc/styles/README
similarity index 100%
rename from elpa/org-20161118/etc/styles/README
rename to elpa/org-20170210/etc/styles/README
diff --git a/elpa/org-20161118/ob-C.el b/elpa/org-20170210/ob-C.el
similarity index 99%
rename from elpa/org-20161118/ob-C.el
rename to elpa/org-20170210/ob-C.el
index 0bd911ed..795bcb2b 100644
--- a/elpa/org-20161118/ob-C.el
+++ b/elpa/org-20170210/ob-C.el
@@ -1,6 +1,6 @@
 ;;; ob-C.el --- Babel Functions for C and Similar Languages -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2010-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2017 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;;      Thierry Banel
diff --git a/elpa/org-20161118/ob-J.el b/elpa/org-20170210/ob-J.el
similarity index 98%
rename from elpa/org-20161118/ob-J.el
rename to elpa/org-20170210/ob-J.el
index 572149b6..eba4bc63 100644
--- a/elpa/org-20161118/ob-J.el
+++ b/elpa/org-20170210/ob-J.el
@@ -1,6 +1,6 @@
 ;;; ob-J.el --- Babel Functions for J                -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2011-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2017 Free Software Foundation, Inc.
 
 ;; Author: Oleh Krehel
 ;; Keywords: literate programming, reproducible research
@@ -38,7 +38,7 @@
 (defcustom org-babel-J-command "jconsole"
   "Command to call J."
   :group 'org-babel
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "9.0")
   :type 'string)
 
diff --git a/elpa/org-20161118/ob-R.el b/elpa/org-20170210/ob-R.el
similarity index 99%
rename from elpa/org-20161118/ob-R.el
rename to elpa/org-20170210/ob-R.el
index 2993b096..3accade4 100644
--- a/elpa/org-20161118/ob-R.el
+++ b/elpa/org-20170210/ob-R.el
@@ -1,6 +1,6 @@
 ;;; ob-R.el --- Babel Functions for R                -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;;	Dan Davison
diff --git a/elpa/org-20161118/ob-abc.el b/elpa/org-20170210/ob-abc.el
similarity index 98%
rename from elpa/org-20161118/ob-abc.el
rename to elpa/org-20170210/ob-abc.el
index 6872b1c5..0ce503d3 100644
--- a/elpa/org-20161118/ob-abc.el
+++ b/elpa/org-20170210/ob-abc.el
@@ -1,6 +1,6 @@
 ;;; ob-abc.el --- Org Babel Functions for ABC -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2013-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2017 Free Software Foundation, Inc.
 
 ;; Author: William Waites
 ;; Keywords: literate programming, music
diff --git a/elpa/org-20161118/ob-asymptote.el b/elpa/org-20170210/ob-asymptote.el
similarity index 98%
rename from elpa/org-20161118/ob-asymptote.el
rename to elpa/org-20170210/ob-asymptote.el
index e69afc48..1dbf4842 100644
--- a/elpa/org-20161118/ob-asymptote.el
+++ b/elpa/org-20170210/ob-asymptote.el
@@ -1,6 +1,6 @@
 ;;; ob-asymptote.el --- Babel Functions for Asymptote -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff --git a/elpa/org-20161118/ob-awk.el b/elpa/org-20170210/ob-awk.el
similarity index 98%
rename from elpa/org-20161118/ob-awk.el
rename to elpa/org-20170210/ob-awk.el
index 90cfe79f..2db4eeae 100644
--- a/elpa/org-20161118/ob-awk.el
+++ b/elpa/org-20170210/ob-awk.el
@@ -1,6 +1,6 @@
 ;;; ob-awk.el --- Babel Functions for Awk            -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2011-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2017 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff --git a/elpa/org-20161118/ob-calc.el b/elpa/org-20170210/ob-calc.el
similarity index 98%
rename from elpa/org-20161118/ob-calc.el
rename to elpa/org-20170210/ob-calc.el
index 415cab17..d4b7260c 100644
--- a/elpa/org-20161118/ob-calc.el
+++ b/elpa/org-20170210/ob-calc.el
@@ -1,6 +1,6 @@
 ;;; ob-calc.el --- Babel Functions for Calc          -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2010-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2017 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff --git a/elpa/org-20161118/ob-clojure.el b/elpa/org-20170210/ob-clojure.el
similarity index 98%
rename from elpa/org-20161118/ob-clojure.el
rename to elpa/org-20170210/ob-clojure.el
index 72ea77dd..39561572 100644
--- a/elpa/org-20161118/ob-clojure.el
+++ b/elpa/org-20170210/ob-clojure.el
@@ -1,6 +1,6 @@
 ;;; ob-clojure.el --- Babel Functions for Clojure    -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
 
 ;; Author: Joel Boehland, Eric Schulte, Oleh Krehel
 ;;
diff --git a/elpa/org-20161118/ob-comint.el b/elpa/org-20170210/ob-comint.el
similarity index 99%
rename from elpa/org-20161118/ob-comint.el
rename to elpa/org-20170210/ob-comint.el
index dd696c28..cc60f4e4 100644
--- a/elpa/org-20161118/ob-comint.el
+++ b/elpa/org-20170210/ob-comint.el
@@ -1,6 +1,6 @@
 ;;; ob-comint.el --- Babel Functions for Interaction with Comint Buffers -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research, comint
diff --git a/elpa/org-20161118/ob-coq.el b/elpa/org-20170210/ob-coq.el
similarity index 97%
rename from elpa/org-20161118/ob-coq.el
rename to elpa/org-20170210/ob-coq.el
index 7aea5a64..93d2b1f7 100644
--- a/elpa/org-20161118/ob-coq.el
+++ b/elpa/org-20170210/ob-coq.el
@@ -1,6 +1,6 @@
 ;;; ob-coq.el --- Babel Functions for Coq            -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2010-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2017 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff --git a/elpa/org-20161118/ob-core.el b/elpa/org-20170210/ob-core.el
similarity index 99%
rename from elpa/org-20161118/ob-core.el
rename to elpa/org-20170210/ob-core.el
index 7540ba21..e8356934 100644
--- a/elpa/org-20161118/ob-core.el
+++ b/elpa/org-20170210/ob-core.el
@@ -1,6 +1,6 @@
 ;;; ob-core.el --- Working with Code Blocks          -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
 
 ;; Authors: Eric Schulte
 ;;	Dan Davison
@@ -175,7 +175,7 @@ This string must include a \"%s\" which will be replaced by the results."
   "Non-nil means show the time the code block was evaluated in the result hash."
   :group 'org-babel
   :type 'boolean
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "9.0")
   :safe #'booleanp)
 
@@ -2905,10 +2905,6 @@ can be specified as the REGEXP argument."
       (setq string (substring string 0 -1)))
     string))
 
-(defun org-babel-local-file-name (file)
-  "Return the local name component of FILE."
-  (or (file-remote-p file 'localname) file))
-
 (defun org-babel-process-file-name (name &optional no-quote-p)
   "Prepare NAME to be used in an external process.
 If NAME specifies a remote location, the remote portion of the
diff --git a/elpa/org-20161118/ob-css.el b/elpa/org-20170210/ob-css.el
similarity index 96%
rename from elpa/org-20161118/ob-css.el
rename to elpa/org-20170210/ob-css.el
index 57343738..4203b125 100644
--- a/elpa/org-20161118/ob-css.el
+++ b/elpa/org-20170210/ob-css.el
@@ -1,6 +1,6 @@
 ;;; ob-css.el --- Babel Functions for CSS            -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff --git a/elpa/org-20161118/ob-ditaa.el b/elpa/org-20170210/ob-ditaa.el
similarity index 98%
rename from elpa/org-20161118/ob-ditaa.el
rename to elpa/org-20170210/ob-ditaa.el
index 1fa96aa6..89b5d246 100644
--- a/elpa/org-20161118/ob-ditaa.el
+++ b/elpa/org-20170210/ob-ditaa.el
@@ -1,6 +1,6 @@
 ;;; ob-ditaa.el --- Babel Functions for ditaa        -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff --git a/elpa/org-20161118/ob-dot.el b/elpa/org-20170210/ob-dot.el
similarity index 98%
rename from elpa/org-20161118/ob-dot.el
rename to elpa/org-20170210/ob-dot.el
index 8cc1c743..81442bfc 100644
--- a/elpa/org-20161118/ob-dot.el
+++ b/elpa/org-20170210/ob-dot.el
@@ -1,6 +1,6 @@
 ;;; ob-dot.el --- Babel Functions for dot            -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff --git a/elpa/org-20161118/ob-ebnf.el b/elpa/org-20170210/ob-ebnf.el
similarity index 98%
rename from elpa/org-20161118/ob-ebnf.el
rename to elpa/org-20170210/ob-ebnf.el
index 36f2c380..410570bc 100644
--- a/elpa/org-20161118/ob-ebnf.el
+++ b/elpa/org-20170210/ob-ebnf.el
@@ -1,6 +1,6 @@
 ;;; ob-ebnf.el --- Babel Functions for EBNF          -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2013-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2017 Free Software Foundation, Inc.
 
 ;; Author: Michael Gauland
 ;; Keywords: literate programming, reproducible research
diff --git a/elpa/org-20161118/ob-emacs-lisp.el b/elpa/org-20170210/ob-emacs-lisp.el
similarity index 98%
rename from elpa/org-20161118/ob-emacs-lisp.el
rename to elpa/org-20170210/ob-emacs-lisp.el
index c42034dd..c0bd12a8 100644
--- a/elpa/org-20161118/ob-emacs-lisp.el
+++ b/elpa/org-20170210/ob-emacs-lisp.el
@@ -1,6 +1,6 @@
 ;;; ob-emacs-lisp.el --- Babel Functions for Emacs-lisp Code -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff --git a/elpa/org-20161118/ob-eval.el b/elpa/org-20170210/ob-eval.el
similarity index 98%
rename from elpa/org-20161118/ob-eval.el
rename to elpa/org-20170210/ob-eval.el
index 4a368b70..324cf5fb 100644
--- a/elpa/org-20161118/ob-eval.el
+++ b/elpa/org-20170210/ob-eval.el
@@ -1,6 +1,6 @@
 ;;; ob-eval.el --- Babel Functions for External Code Evaluation -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research, comint
diff --git a/elpa/org-20161118/ob-exp.el b/elpa/org-20170210/ob-exp.el
similarity index 99%
rename from elpa/org-20161118/ob-exp.el
rename to elpa/org-20170210/ob-exp.el
index 6aebcd5e..95853a68 100644
--- a/elpa/org-20161118/ob-exp.el
+++ b/elpa/org-20170210/ob-exp.el
@@ -1,6 +1,6 @@
 ;;; ob-exp.el --- Exportation of Babel Source Blocks -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
 
 ;; Authors: Eric Schulte
 ;;	Dan Davison
@@ -323,7 +323,7 @@ defined for the code block may be used as a key and will be
 replaced with its value."
   :group 'org-babel
   :type 'string
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "8.3"))
 
 (defun org-babel-exp-code (info type)
diff --git a/elpa/org-20161118/ob-forth.el b/elpa/org-20170210/ob-forth.el
similarity index 98%
rename from elpa/org-20161118/ob-forth.el
rename to elpa/org-20170210/ob-forth.el
index e487931f..152cf727 100644
--- a/elpa/org-20161118/ob-forth.el
+++ b/elpa/org-20170210/ob-forth.el
@@ -1,6 +1,6 @@
 ;;; ob-forth.el --- Babel Functions for Forth        -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2014-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2017 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research, forth
diff --git a/elpa/org-20161118/ob-fortran.el b/elpa/org-20170210/ob-fortran.el
similarity index 99%
rename from elpa/org-20161118/ob-fortran.el
rename to elpa/org-20170210/ob-fortran.el
index 6241c65e..d059245b 100644
--- a/elpa/org-20161118/ob-fortran.el
+++ b/elpa/org-20170210/ob-fortran.el
@@ -1,6 +1,6 @@
 ;;; ob-fortran.el --- Babel Functions for Fortran    -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2011-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2017 Free Software Foundation, Inc.
 
 ;; Authors: Sergey Litvinov
 ;;       Eric Schulte
diff --git a/elpa/org-20161118/ob-gnuplot.el b/elpa/org-20170210/ob-gnuplot.el
similarity index 99%
rename from elpa/org-20161118/ob-gnuplot.el
rename to elpa/org-20170210/ob-gnuplot.el
index e91e05a9..a62303ff 100644
--- a/elpa/org-20161118/ob-gnuplot.el
+++ b/elpa/org-20170210/ob-gnuplot.el
@@ -1,6 +1,6 @@
 ;;; ob-gnuplot.el --- Babel Functions for Gnuplot    -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff --git a/elpa/org-20161118/ob-groovy.el b/elpa/org-20170210/ob-groovy.el
similarity index 98%
rename from elpa/org-20161118/ob-groovy.el
rename to elpa/org-20170210/ob-groovy.el
index 9578c70d..69993c0f 100644
--- a/elpa/org-20161118/ob-groovy.el
+++ b/elpa/org-20170210/ob-groovy.el
@@ -1,6 +1,6 @@
 ;;; ob-groovy.el --- Babel Functions for Groovy      -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2013-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2017 Free Software Foundation, Inc.
 
 ;; Author: Miro Bezjak
 ;; Keywords: literate programming, reproducible research
diff --git a/elpa/org-20161118/ob-haskell.el b/elpa/org-20170210/ob-haskell.el
similarity index 99%
rename from elpa/org-20161118/ob-haskell.el
rename to elpa/org-20170210/ob-haskell.el
index 5dcb5162..ecce6dcd 100644
--- a/elpa/org-20161118/ob-haskell.el
+++ b/elpa/org-20170210/ob-haskell.el
@@ -1,6 +1,6 @@
 ;;; ob-haskell.el --- Babel Functions for Haskell    -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff --git a/elpa/org-20161118/ob-io.el b/elpa/org-20170210/ob-io.el
similarity index 98%
rename from elpa/org-20161118/ob-io.el
rename to elpa/org-20170210/ob-io.el
index 186b1b29..5dd61109 100644
--- a/elpa/org-20161118/ob-io.el
+++ b/elpa/org-20170210/ob-io.el
@@ -1,6 +1,6 @@
 ;;; ob-io.el --- Babel Functions for Io              -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2012-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2017 Free Software Foundation, Inc.
 
 ;; Author: Andrzej Lichnerowicz
 ;; Keywords: literate programming, reproducible research
diff --git a/elpa/org-20161118/ob-java.el b/elpa/org-20170210/ob-java.el
similarity index 98%
rename from elpa/org-20161118/ob-java.el
rename to elpa/org-20170210/ob-java.el
index ccae0202..7e720231 100644
--- a/elpa/org-20161118/ob-java.el
+++ b/elpa/org-20170210/ob-java.el
@@ -1,6 +1,6 @@
 ;;; ob-java.el --- Babel Functions for Java          -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2011-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2017 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff --git a/elpa/org-20161118/ob-js.el b/elpa/org-20170210/ob-js.el
similarity index 97%
rename from elpa/org-20161118/ob-js.el
rename to elpa/org-20170210/ob-js.el
index 1a20d7ef..91be6b07 100644
--- a/elpa/org-20161118/ob-js.el
+++ b/elpa/org-20170210/ob-js.el
@@ -1,6 +1,6 @@
 ;;; ob-js.el --- Babel Functions for Javascript      -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2010-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2017 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research, js
@@ -55,7 +55,7 @@
   :type 'string)
 
 (defvar org-babel-js-function-wrapper
-  "require('sys').print(require('sys').inspect(function(){%s}()));"
+  "require('sys').print(require('sys').inspect(function(){\n%s\n}()));"
   "Javascript code to print value of body.")
 
 (defun org-babel-execute:js (body params)
diff --git a/elpa/org-20161118/ob-keys.el b/elpa/org-20170210/ob-keys.el
similarity index 98%
rename from elpa/org-20161118/ob-keys.el
rename to elpa/org-20170210/ob-keys.el
index 318f5496..f5fb9101 100644
--- a/elpa/org-20161118/ob-keys.el
+++ b/elpa/org-20170210/ob-keys.el
@@ -1,6 +1,6 @@
 ;;; ob-keys.el --- Key Bindings for Babel            -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff --git a/elpa/org-20161118/ob-latex.el b/elpa/org-20170210/ob-latex.el
similarity index 99%
rename from elpa/org-20161118/ob-latex.el
rename to elpa/org-20170210/ob-latex.el
index 8fc0493c..763ffb16 100644
--- a/elpa/org-20161118/ob-latex.el
+++ b/elpa/org-20170210/ob-latex.el
@@ -1,6 +1,6 @@
 ;;; ob-latex.el --- Babel Functions for LaTeX        -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff --git a/elpa/org-20161118/ob-ledger.el b/elpa/org-20170210/ob-ledger.el
similarity index 97%
rename from elpa/org-20161118/ob-ledger.el
rename to elpa/org-20170210/ob-ledger.el
index ee2ce0a3..c02069e2 100644
--- a/elpa/org-20161118/ob-ledger.el
+++ b/elpa/org-20170210/ob-ledger.el
@@ -1,6 +1,6 @@
 ;;; ob-ledger.el --- Babel Functions for Ledger      -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2010-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2017 Free Software Foundation, Inc.
 
 ;; Author: Eric S Fraga
 ;; Keywords: literate programming, reproducible research, accounting
diff --git a/elpa/org-20161118/ob-lilypond.el b/elpa/org-20170210/ob-lilypond.el
similarity index 99%
rename from elpa/org-20161118/ob-lilypond.el
rename to elpa/org-20170210/ob-lilypond.el
index 3d2e50fc..37a7a6b5 100644
--- a/elpa/org-20161118/ob-lilypond.el
+++ b/elpa/org-20170210/ob-lilypond.el
@@ -1,6 +1,6 @@
 ;;; ob-lilypond.el --- Babel Functions for Lilypond  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2010-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2017 Free Software Foundation, Inc.
 
 ;; Author: Martyn Jago
 ;; Keywords: babel language, literate programming
diff --git a/elpa/org-20161118/ob-lisp.el b/elpa/org-20170210/ob-lisp.el
similarity index 98%
rename from elpa/org-20161118/ob-lisp.el
rename to elpa/org-20170210/ob-lisp.el
index da7e4f4a..1e381d0c 100644
--- a/elpa/org-20161118/ob-lisp.el
+++ b/elpa/org-20170210/ob-lisp.el
@@ -1,6 +1,6 @@
 ;;; ob-lisp.el --- Babel Functions for Common Lisp   -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
 
 ;; Authors: Joel Boehland
 ;;	 Eric Schulte
@@ -52,7 +52,7 @@
   "The function to be called to evaluate code on the Lisp side.
 Valid values include `slime-eval' and `sly-eval'."
   :group 'org-babel
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "9.0")
   :type 'function)
 
diff --git a/elpa/org-20161118/ob-lob.el b/elpa/org-20170210/ob-lob.el
similarity index 98%
rename from elpa/org-20161118/ob-lob.el
rename to elpa/org-20170210/ob-lob.el
index 1c4123bd..b6f50d33 100644
--- a/elpa/org-20161118/ob-lob.el
+++ b/elpa/org-20170210/ob-lob.el
@@ -1,6 +1,6 @@
 ;;; ob-lob.el --- Functions Supporting the Library of Babel -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
 
 ;; Authors: Eric Schulte
 ;;	 Dan Davison
diff --git a/elpa/org-20161118/ob-lua.el b/elpa/org-20170210/ob-lua.el
similarity index 99%
rename from elpa/org-20161118/ob-lua.el
rename to elpa/org-20170210/ob-lua.el
index afb5c454..fa60b0ee 100644
--- a/elpa/org-20161118/ob-lua.el
+++ b/elpa/org-20170210/ob-lua.el
@@ -1,6 +1,6 @@
 ;;; ob-lua.el --- Org Babel functions for Lua evaluation -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2014, 2016 Free Software Foundation, Inc.
+;; Copyright (C) 2014, 2016, 2017 Free Software Foundation, Inc.
 
 ;; Authors: Dieter Schoen
 ;; Keywords: literate programming, reproducible research
diff --git a/elpa/org-20161118/ob-makefile.el b/elpa/org-20170210/ob-makefile.el
similarity index 96%
rename from elpa/org-20161118/ob-makefile.el
rename to elpa/org-20170210/ob-makefile.el
index 69c6e516..2aa04fd2 100644
--- a/elpa/org-20161118/ob-makefile.el
+++ b/elpa/org-20170210/ob-makefile.el
@@ -1,6 +1,6 @@
 ;;; ob-makefile.el --- Babel Functions for Makefile  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; 	   Thomas S. Dye
diff --git a/elpa/org-20161118/ob-matlab.el b/elpa/org-20170210/ob-matlab.el
similarity index 95%
rename from elpa/org-20161118/ob-matlab.el
rename to elpa/org-20170210/ob-matlab.el
index 0d3909dc..23cfa36d 100644
--- a/elpa/org-20161118/ob-matlab.el
+++ b/elpa/org-20170210/ob-matlab.el
@@ -1,6 +1,6 @@
 ;;; ob-matlab.el --- Babel support for Matlab        -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2010-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2017 Free Software Foundation, Inc.
 
 ;; Author: Dan Davison
 ;; Keywords: literate programming, reproducible research
diff --git a/elpa/org-20161118/ob-maxima.el b/elpa/org-20170210/ob-maxima.el
similarity index 98%
rename from elpa/org-20161118/ob-maxima.el
rename to elpa/org-20170210/ob-maxima.el
index 4d16156c..0a4d835a 100644
--- a/elpa/org-20161118/ob-maxima.el
+++ b/elpa/org-20170210/ob-maxima.el
@@ -1,6 +1,6 @@
 ;;; ob-maxima.el --- Babel Functions for Maxima      -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
 
 ;; Author: Eric S Fraga
 ;;	Eric Schulte
diff --git a/elpa/org-20161118/ob-mscgen.el b/elpa/org-20170210/ob-mscgen.el
similarity index 97%
rename from elpa/org-20161118/ob-mscgen.el
rename to elpa/org-20170210/ob-mscgen.el
index f53b09f1..5c9dccc6 100644
--- a/elpa/org-20161118/ob-mscgen.el
+++ b/elpa/org-20170210/ob-mscgen.el
@@ -1,6 +1,6 @@
 ;;; ob-msc.el --- Babel Functions for Mscgen         -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2010-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2017 Free Software Foundation, Inc.
 
 ;; Author: Juan Pechiar
 ;; Keywords: literate programming, reproducible research
diff --git a/elpa/org-20161118/ob-ocaml.el b/elpa/org-20170210/ob-ocaml.el
similarity index 99%
rename from elpa/org-20161118/ob-ocaml.el
rename to elpa/org-20170210/ob-ocaml.el
index 4c9d295a..7997ff03 100644
--- a/elpa/org-20161118/ob-ocaml.el
+++ b/elpa/org-20170210/ob-ocaml.el
@@ -1,6 +1,6 @@
 ;;; ob-ocaml.el --- Babel Functions for Ocaml        -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff --git a/elpa/org-20161118/ob-octave.el b/elpa/org-20170210/ob-octave.el
similarity index 99%
rename from elpa/org-20161118/ob-octave.el
rename to elpa/org-20170210/ob-octave.el
index 09b4092a..90735b11 100644
--- a/elpa/org-20161118/ob-octave.el
+++ b/elpa/org-20170210/ob-octave.el
@@ -1,6 +1,6 @@
 ;;; ob-octave.el --- Babel Functions for Octave and Matlab -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2010-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2017 Free Software Foundation, Inc.
 
 ;; Author: Dan Davison
 ;; Keywords: literate programming, reproducible research
diff --git a/elpa/org-20161118/ob-org.el b/elpa/org-20170210/ob-org.el
similarity index 97%
rename from elpa/org-20161118/ob-org.el
rename to elpa/org-20170210/ob-org.el
index 580d2b04..5683b96f 100644
--- a/elpa/org-20161118/ob-org.el
+++ b/elpa/org-20170210/ob-org.el
@@ -1,6 +1,6 @@
 ;;; ob-org.el --- Babel Functions for Org Code Blocks -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2010-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2017 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff --git a/elpa/org-20161118/ob-perl.el b/elpa/org-20170210/ob-perl.el
similarity index 98%
rename from elpa/org-20161118/ob-perl.el
rename to elpa/org-20170210/ob-perl.el
index a1aadbb1..62df8c55 100644
--- a/elpa/org-20161118/ob-perl.el
+++ b/elpa/org-20170210/ob-perl.el
@@ -1,6 +1,6 @@
 ;;; ob-perl.el --- Babel Functions for Perl          -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
 
 ;; Authors: Dan Davison
 ;;	 Eric Schulte
diff --git a/elpa/org-20161118/ob-picolisp.el b/elpa/org-20170210/ob-picolisp.el
similarity index 99%
rename from elpa/org-20161118/ob-picolisp.el
rename to elpa/org-20170210/ob-picolisp.el
index 348b1f67..f5773815 100644
--- a/elpa/org-20161118/ob-picolisp.el
+++ b/elpa/org-20170210/ob-picolisp.el
@@ -1,6 +1,6 @@
 ;;; ob-picolisp.el --- Babel Functions for Picolisp  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2010-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2017 Free Software Foundation, Inc.
 
 ;; Authors: Thorsten Jolitz
 ;;	 Eric Schulte
diff --git a/elpa/org-20161118/ob-plantuml.el b/elpa/org-20170210/ob-plantuml.el
similarity index 98%
rename from elpa/org-20161118/ob-plantuml.el
rename to elpa/org-20170210/ob-plantuml.el
index 9ce65a95..e90021a5 100644
--- a/elpa/org-20161118/ob-plantuml.el
+++ b/elpa/org-20170210/ob-plantuml.el
@@ -1,6 +1,6 @@
 ;;; ob-plantuml.el --- Babel Functions for Plantuml  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2010-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2017 Free Software Foundation, Inc.
 
 ;; Author: Zhang Weize
 ;; Keywords: literate programming, reproducible research
diff --git a/elpa/org-20161118/ob-processing.el b/elpa/org-20170210/ob-processing.el
similarity index 99%
rename from elpa/org-20161118/ob-processing.el
rename to elpa/org-20170210/ob-processing.el
index e1801e2f..a18a53cb 100644
--- a/elpa/org-20161118/ob-processing.el
+++ b/elpa/org-20170210/ob-processing.el
@@ -1,6 +1,6 @@
 ;;; ob-processing.el --- Babel functions for processing -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2015-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2017 Free Software Foundation, Inc.
 
 ;; Author: Jarmo Hurri (adapted from ob-asymptote.el written by Eric Schulte)
 ;; Keywords: literate programming, reproducible research
diff --git a/elpa/org-20161118/ob-python.el b/elpa/org-20170210/ob-python.el
similarity index 99%
rename from elpa/org-20161118/ob-python.el
rename to elpa/org-20170210/ob-python.el
index 05f2dbb3..b838a48b 100644
--- a/elpa/org-20161118/ob-python.el
+++ b/elpa/org-20170210/ob-python.el
@@ -1,6 +1,6 @@
 ;;; ob-python.el --- Babel Functions for Python      -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
 
 ;; Authors: Eric Schulte
 ;;	 Dan Davison
diff --git a/elpa/org-20161118/ob-ref.el b/elpa/org-20170210/ob-ref.el
similarity index 99%
rename from elpa/org-20161118/ob-ref.el
rename to elpa/org-20170210/ob-ref.el
index c109d893..f30f49bf 100644
--- a/elpa/org-20161118/ob-ref.el
+++ b/elpa/org-20170210/ob-ref.el
@@ -1,6 +1,6 @@
 ;;; ob-ref.el --- Babel Functions for Referencing External Data -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
 
 ;; Authors: Eric Schulte
 ;;	 Dan Davison
diff --git a/elpa/org-20161118/ob-ruby.el b/elpa/org-20170210/ob-ruby.el
similarity index 95%
rename from elpa/org-20161118/ob-ruby.el
rename to elpa/org-20170210/ob-ruby.el
index 6415f354..d0557835 100644
--- a/elpa/org-20161118/ob-ruby.el
+++ b/elpa/org-20170210/ob-ruby.el
@@ -1,6 +1,6 @@
 ;;; ob-ruby.el --- Babel Functions for Ruby          -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -42,6 +42,9 @@
 (declare-function run-ruby "ext:inf-ruby" (&optional command name))
 (declare-function xmp "ext:rcodetools" (&optional option))
 
+(defvar inf-ruby-default-implementation)
+(defvar inf-ruby-implementations)
+
 (defvar org-babel-tangle-lang-exts)
 (add-to-list 'org-babel-tangle-lang-exts '("ruby" . "rb"))
 
@@ -150,12 +153,16 @@ If there is not a current inferior-process-buffer in SESSION
 then create one.  Return the initialized session."
   (unless (string= session "none")
     (require 'inf-ruby)
-    (let ((session-buffer (save-window-excursion
-			    (run-ruby nil session) (current-buffer))))
+    (let* ((cmd (cdr (assoc inf-ruby-default-implementation
+			    inf-ruby-implementations)))
+	   (buffer (get-buffer (format "*%s*" session)))
+	   (session-buffer (or buffer (save-window-excursion
+					(run-ruby cmd session)
+					(current-buffer)))))
       (if (org-babel-comint-buffer-livep session-buffer)
 	  (progn (sit-for .25) session-buffer)
-        (sit-for .5)
-        (org-babel-ruby-initiate-session session)))))
+	(sit-for .5)
+	(org-babel-ruby-initiate-session session)))))
 
 (defvar org-babel-ruby-eoe-indicator ":org_babel_ruby_eoe"
   "String to indicate that evaluation has completed.")
diff --git a/elpa/org-20161118/ob-sass.el b/elpa/org-20170210/ob-sass.el
similarity index 97%
rename from elpa/org-20161118/ob-sass.el
rename to elpa/org-20170210/ob-sass.el
index 53fb45ed..a9a2a9f0 100644
--- a/elpa/org-20161118/ob-sass.el
+++ b/elpa/org-20170210/ob-sass.el
@@ -1,6 +1,6 @@
 ;;; ob-sass.el --- Babel Functions for the Sass CSS generation language -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff --git a/elpa/org-20161118/ob-scala.el b/elpa/org-20170210/ob-scala.el
similarity index 98%
rename from elpa/org-20161118/ob-scala.el
rename to elpa/org-20170210/ob-scala.el
index 8cdf2c09..7d5f299e 100644
--- a/elpa/org-20161118/ob-scala.el
+++ b/elpa/org-20170210/ob-scala.el
@@ -1,6 +1,6 @@
 ;;; ob-scala.el --- Babel Functions for Scala        -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2012-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2017 Free Software Foundation, Inc.
 
 ;; Author: Andrzej Lichnerowicz
 ;; Keywords: literate programming, reproducible research
diff --git a/elpa/org-20161118/ob-scheme.el b/elpa/org-20170210/ob-scheme.el
similarity index 99%
rename from elpa/org-20161118/ob-scheme.el
rename to elpa/org-20170210/ob-scheme.el
index c1d5462e..cd8c3860 100644
--- a/elpa/org-20161118/ob-scheme.el
+++ b/elpa/org-20170210/ob-scheme.el
@@ -1,6 +1,6 @@
 ;;; ob-scheme.el --- Babel Functions for Scheme      -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2010-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2017 Free Software Foundation, Inc.
 
 ;; Authors: Eric Schulte
 ;;	    Michael Gauland
diff --git a/elpa/org-20161118/ob-screen.el b/elpa/org-20170210/ob-screen.el
similarity index 98%
rename from elpa/org-20161118/ob-screen.el
rename to elpa/org-20170210/ob-screen.el
index c4c9528f..554f8c43 100644
--- a/elpa/org-20161118/ob-screen.el
+++ b/elpa/org-20170210/ob-screen.el
@@ -1,6 +1,6 @@
 ;;; ob-screen.el --- Babel Support for Interactive Terminal -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
 
 ;; Author: Benjamin Andresen
 ;; Keywords: literate programming, interactive shell
diff --git a/elpa/org-20161118/ob-sed.el b/elpa/org-20170210/ob-sed.el
similarity index 98%
rename from elpa/org-20161118/ob-sed.el
rename to elpa/org-20170210/ob-sed.el
index dd8a17ba..733c7e19 100644
--- a/elpa/org-20161118/ob-sed.el
+++ b/elpa/org-20170210/ob-sed.el
@@ -1,6 +1,6 @@
 ;;; ob-sed.el --- Babel Functions for Sed Scripts    -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2015-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2017 Free Software Foundation, Inc.
 
 ;; Author: Bjarte Johansen
 ;; Keywords: literate programming, reproducible research
diff --git a/elpa/org-20161118/ob-shell.el b/elpa/org-20170210/ob-shell.el
similarity index 92%
rename from elpa/org-20161118/ob-shell.el
rename to elpa/org-20170210/ob-shell.el
index 74b6c7e8..9c22af83 100644
--- a/elpa/org-20161118/ob-shell.el
+++ b/elpa/org-20170210/ob-shell.el
@@ -1,6 +1,6 @@
 ;;; ob-shell.el --- Babel Functions for Shell Evaluation -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -52,7 +52,12 @@ is modified outside the Customize interface."
 	       (body params)
 	     ,(format "Execute a block of %s commands with Babel." name)
 	     (let ((shell-file-name ,name))
-	       (org-babel-execute:shell body params))))))
+	       (org-babel-execute:shell body params))))
+    (eval `(defalias ',(intern (concat "org-babel-variable-assignments:" name))
+	     'org-babel-variable-assignments:shell
+	     ,(format "Return list of %s statements assigning to the block's \
+variables."
+		      name)))))
 
 (defcustom org-babel-shell-names
   '("sh" "bash" "csh" "ash" "dash" "ksh" "mksh" "posh")
@@ -102,13 +107,14 @@ This function is called by `org-babel-execute-src-block'."
         (insert (org-babel-chomp body)))
       buffer)))
 
-;; helper functions
-(defun org-babel-variable-assignments:sh-generic
+
+;;; Helper functions
+(defun org-babel--variable-assignments:sh-generic
     (varname values &optional sep hline)
   "Returns a list of statements declaring the values as a generic variable."
   (format "%s=%s" varname (org-babel-sh-var-to-sh values sep hline)))
 
-(defun org-babel-variable-assignments:bash_array
+(defun org-babel--variable-assignments:bash_array
     (varname values &optional sep hline)
   "Returns a list of statements declaring the values as a bash array."
   (format "unset %s\ndeclare -a %s=( %s )"
@@ -118,7 +124,7 @@ This function is called by `org-babel-execute-src-block'."
 	   values
 	   " ")))
 
-(defun org-babel-variable-assignments:bash_assoc
+(defun org-babel--variable-assignments:bash_assoc
     (varname values &optional sep hline)
   "Returns a list of statements declaring the values as bash associative array."
   (format "unset %s\ndeclare -A %s\n%s"
@@ -132,13 +138,13 @@ This function is called by `org-babel-execute-src-block'."
      values
      "\n")))
 
-(defun org-babel-variable-assignments:bash (varname values &optional sep hline)
+(defun org-babel--variable-assignments:bash (varname values &optional sep hline)
   "Represents the parameters as useful Bash shell variables."
   (if (listp values)
       (if (and (listp (car values)) (= 1 (length (car values))))
-	  (org-babel-variable-assignments:bash_array varname values sep hline)
-	(org-babel-variable-assignments:bash_assoc varname values sep hline))
-    (org-babel-variable-assignments:sh-generic varname values sep hline)))
+	  (org-babel--variable-assignments:bash_array varname values sep hline)
+	(org-babel--variable-assignments:bash_assoc varname values sep hline))
+    (org-babel--variable-assignments:sh-generic varname values sep hline)))
 
 (defun org-babel-variable-assignments:shell (params)
   "Return list of shell statements assigning the block's variables."
@@ -149,9 +155,9 @@ This function is called by `org-babel-execute-src-block'."
     (mapcar
      (lambda (pair)
        (if (string-suffix-p "bash" shell-file-name)
-	   (org-babel-variable-assignments:bash
+	   (org-babel--variable-assignments:bash
             (car pair) (cdr pair) sep hline)
-         (org-babel-variable-assignments:sh-generic
+         (org-babel--variable-assignments:sh-generic
 	  (car pair) (cdr pair) sep hline)))
      (org-babel--get-vars params))))
 
diff --git a/elpa/org-20161118/ob-shen.el b/elpa/org-20170210/ob-shen.el
similarity index 97%
rename from elpa/org-20161118/ob-shen.el
rename to elpa/org-20170210/ob-shen.el
index f502d431..6bf36c64 100644
--- a/elpa/org-20161118/ob-shen.el
+++ b/elpa/org-20170210/ob-shen.el
@@ -1,6 +1,6 @@
 ;;; ob-shen.el --- Babel Functions for Shen          -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2010-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2017 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research, shen
diff --git a/elpa/org-20161118/ob-sql.el b/elpa/org-20170210/ob-sql.el
similarity index 99%
rename from elpa/org-20161118/ob-sql.el
rename to elpa/org-20170210/ob-sql.el
index f7c66ac5..265c7135 100644
--- a/elpa/org-20161118/ob-sql.el
+++ b/elpa/org-20170210/ob-sql.el
@@ -1,6 +1,6 @@
 ;;; ob-sql.el --- Babel Functions for SQL            -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -226,7 +226,6 @@ SET COLSEP '|'
 	 (`vertica "\\a\n")
 	 (_ ""))
        (org-babel-expand-body:sql body params)))
-;;    (message command)
     (org-babel-eval command "")
     (org-babel-result-cond result-params
       (with-temp-buffer
diff --git a/elpa/org-20161118/ob-sqlite.el b/elpa/org-20170210/ob-sqlite.el
similarity index 98%
rename from elpa/org-20161118/ob-sqlite.el
rename to elpa/org-20170210/ob-sqlite.el
index 0d954a4c..8094019d 100644
--- a/elpa/org-20161118/ob-sqlite.el
+++ b/elpa/org-20170210/ob-sqlite.el
@@ -1,6 +1,6 @@
 ;;; ob-sqlite.el --- Babel Functions for SQLite Databases -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2010-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2017 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff --git a/elpa/org-20161118/ob-stan.el b/elpa/org-20170210/ob-stan.el
similarity index 98%
rename from elpa/org-20161118/ob-stan.el
rename to elpa/org-20170210/ob-stan.el
index bf4e394d..40dd0efa 100644
--- a/elpa/org-20161118/ob-stan.el
+++ b/elpa/org-20170210/ob-stan.el
@@ -1,6 +1,6 @@
 ;;; ob-stan.el --- Babel Functions for Stan          -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2015-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2017 Free Software Foundation, Inc.
 
 ;; Author: Kyle Meyer
 ;; Keywords: literate programming, reproducible research
diff --git a/elpa/org-20161118/ob-table.el b/elpa/org-20170210/ob-table.el
similarity index 98%
rename from elpa/org-20161118/ob-table.el
rename to elpa/org-20170210/ob-table.el
index efee5b7b..4de8936d 100644
--- a/elpa/org-20161118/ob-table.el
+++ b/elpa/org-20170210/ob-table.el
@@ -1,6 +1,6 @@
 ;;; ob-table.el --- Support for Calling Babel Functions from Tables -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff --git a/elpa/org-20161118/ob-tangle.el b/elpa/org-20170210/ob-tangle.el
similarity index 85%
rename from elpa/org-20161118/ob-tangle.el
rename to elpa/org-20170210/ob-tangle.el
index 5e1b953b..3b053326 100644
--- a/elpa/org-20161118/ob-tangle.el
+++ b/elpa/org-20170210/ob-tangle.el
@@ -1,6 +1,6 @@
 ;;; ob-tangle.el --- Extract Source Code From Org Files -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -343,63 +343,42 @@ code file.  This function uses `comment-region' which assumes
 that the appropriate major-mode is set.  SPEC has the form:
 
   (start-line file link source-name params body comment)"
-  (let* ((start-line (nth 0 spec))
-	 (info (nth 4 spec))
-	 (file (if org-babel-tangle-use-relative-file-links
-		   (file-relative-name (nth 1 spec))
-		 (nth 1 spec)))
-	 (link (let ((link (nth 2 spec)))
-		 (if org-babel-tangle-use-relative-file-links
-		     (when (string-match org-link-types-re link)
-		       (let ((type (match-string 0 link))
-			     (link (substring link (match-end 0))))
-			 (concat
-			  type
-			  (file-relative-name
-			   link
-			   (file-name-directory (cdr (assq :tangle info)))))))
-		   link)))
-	 (source-name (nth 3 spec))
-	 (body (nth 5 spec))
-	 (comment (nth 6 spec))
-	 (comments (cdr (assq :comments info)))
-	 (link-p (or (string= comments "both") (string= comments "link")
-		     (string= comments "yes") (string= comments "noweb")))
-	 (link-data `(("start-line" . ,(number-to-string start-line))
-		      ("file" . ,file)
-		      ("link" . ,link)
-		      ("source-name" . ,source-name)))
-	 (insert-comment (lambda (text)
-			   (when (and comments
-				      (not (string= comments "no"))
-				      (org-string-nw-p text))
-			     (if org-babel-tangle-uncomment-comments
-				 ;; Plain comments: no processing.
-				 (insert text)
-			       ;; Ensure comments are made to be
-			       ;; comments, and add a trailing
-			       ;; newline.  Also ignore invisible
-			       ;; characters when commenting.
-			       (comment-region
-				(point)
-				(progn (insert (org-no-properties text))
-				       (point)))
-			       (end-of-line)
-			       (insert "\n"))))))
+  (pcase-let*
+      ((`(,start ,file ,link ,source ,info ,body ,comment) spec)
+       (comments (cdr (assq :comments info)))
+       (link? (or (string= comments "both") (string= comments "link")
+		  (string= comments "yes") (string= comments "noweb")))
+       (link-data `(("start-line" . ,(number-to-string start))
+		    ("file" . ,file)
+		    ("link" . ,link)
+		    ("source-name" . ,source)))
+       (insert-comment (lambda (text)
+			 (when (and comments
+				    (not (string= comments "no"))
+				    (org-string-nw-p text))
+			   (if org-babel-tangle-uncomment-comments
+			       ;; Plain comments: no processing.
+			       (insert text)
+			     ;; Ensure comments are made to be
+			     ;; comments, and add a trailing newline.
+			     ;; Also ignore invisible characters when
+			     ;; commenting.
+			     (comment-region
+			      (point)
+			      (progn (insert (org-no-properties text))
+				     (point)))
+			     (end-of-line)
+			     (insert "\n"))))))
     (when comment (funcall insert-comment comment))
-    (when link-p
-      (funcall
-       insert-comment
-       (org-fill-template org-babel-tangle-comment-format-beg link-data)))
-    (insert
-     (org-unescape-code-in-string
-      (if org-src-preserve-indentation (org-trim body t)
-	(org-trim (org-remove-indentation body))))
-     "\n")
-    (when link-p
-      (funcall
-       insert-comment
-       (org-fill-template org-babel-tangle-comment-format-end link-data)))))
+    (when link?
+      (funcall insert-comment
+	       (org-fill-template
+		org-babel-tangle-comment-format-beg link-data)))
+    (insert body "\n")
+    (when link?
+      (funcall insert-comment
+	       (org-fill-template
+		org-babel-tangle-comment-format-end link-data)))))
 
 (defun org-babel-tangle-collect-blocks (&optional language tangle-file)
   "Collect source blocks in the current Org file.
@@ -432,13 +411,12 @@ can be used to limit the collected code blocks by target file."
     ;; Ensure blocks are in the correct order.
     (mapcar (lambda (b) (cons (car b) (nreverse (cdr b)))) blocks)))
 
-(defun org-babel-tangle-single-block
-  (block-counter &optional only-this-block)
+(defun org-babel-tangle-single-block (block-counter &optional only-this-block)
   "Collect the tangled source for current block.
 Return the list of block attributes needed by
-`org-babel-tangle-collect-blocks'.
-When ONLY-THIS-BLOCK is non-nil, return the full association
-list to be used by `org-babel-tangle' directly."
+`org-babel-tangle-collect-blocks'.  When ONLY-THIS-BLOCK is
+non-nil, return the full association list to be used by
+`org-babel-tangle' directly."
   (let* ((info (org-babel-get-src-block-info))
 	 (start-line
 	  (save-restriction (widen)
@@ -450,44 +428,39 @@ list to be used by `org-babel-tangle' directly."
 	 (cref-fmt (or (and (string-match "-l \"\\(.+\\)\"" extra)
 			    (match-string 1 extra))
 		       org-coderef-label-format))
-	 (link (let ((link (org-no-properties
-                            (org-store-link nil))))
-                 (and (string-match org-bracket-link-regexp link)
-                      (match-string 1 link))))
+	 (link (let ((l (org-no-properties (org-store-link nil))))
+                 (and (string-match org-bracket-link-regexp l)
+                      (match-string 1 l))))
 	 (source-name
 	  (or (nth 4 info)
 	      (format "%s:%d"
 		      (or (ignore-errors (nth 4 (org-heading-components)))
 			  "No heading")
 		      block-counter)))
-	 (expand-cmd
-	  (intern (concat "org-babel-expand-body:" src-lang)))
+	 (expand-cmd (intern (concat "org-babel-expand-body:" src-lang)))
 	 (assignments-cmd
 	  (intern (concat "org-babel-variable-assignments:" src-lang)))
 	 (body
 	  ;; Run the tangle-body-hook.
-          (let* ((body ;; Expand the body in language specific manner.
-                  (if (org-babel-noweb-p params :tangle)
-                      (org-babel-expand-noweb-references info)
-                    (nth 1 info)))
-                 (body
-                  (if (assq :no-expand params)
-                      body
-                    (if (fboundp expand-cmd)
-                        (funcall expand-cmd body params)
-                      (org-babel-expand-body:generic
-                       body params
-                       (and (fboundp assignments-cmd)
-                            (funcall assignments-cmd params)))))))
-            (with-temp-buffer
-              (insert body)
-              (when (string-match "-r" extra)
-                (goto-char (point-min))
-                (while (re-search-forward
-                        (replace-regexp-in-string "%s" ".+" cref-fmt) nil t)
-                  (replace-match "")))
-              (run-hooks 'org-babel-tangle-body-hook)
-              (buffer-string))))
+          (let ((body (if (org-babel-noweb-p params :tangle)
+			  (org-babel-expand-noweb-references info)
+			(nth 1 info))))
+	    (with-temp-buffer
+	      (insert
+	       ;; Expand body in language specific manner.
+	       (cond ((assq :no-expand params) body)
+		     ((fboundp expand-cmd) (funcall expand-cmd body params))
+		     (t
+		      (org-babel-expand-body:generic
+		       body params (and (fboundp assignments-cmd)
+					(funcall assignments-cmd params))))))
+	      (when (string-match "-r" extra)
+		(goto-char (point-min))
+		(while (re-search-forward
+			(replace-regexp-in-string "%s" ".+" cref-fmt) nil t)
+		  (replace-match "")))
+	      (run-hooks 'org-babel-tangle-body-hook)
+	      (buffer-string))))
 	 (comment
 	  (when (or (string= "both" (cdr (assq :comments params)))
 		    (string= "org" (cdr (assq :comments params))))
@@ -497,7 +470,7 @@ list to be used by `org-babel-tangle' directly."
 	     (buffer-substring
 	      (max (condition-case nil
 		       (save-excursion
-			 (org-back-to-heading t)  ; Sets match data
+			 (org-back-to-heading t) ; Sets match data
 			 (match-end 0))
 		     (error (point-min)))
 		   (save-excursion
@@ -507,7 +480,25 @@ list to be used by `org-babel-tangle' directly."
 		       (point-min))))
 	      (point)))))
 	 (result
-	  (list start-line file link source-name params body comment)))
+	  (list start-line
+		(if org-babel-tangle-use-relative-file-links
+		    (file-relative-name file)
+		  file)
+		(if (and org-babel-tangle-use-relative-file-links
+			 (string-match org-link-types-re link)
+			 (string= (match-string 0 link) "file"))
+		    (concat "file:"
+			    (file-relative-name (match-string 1 link)
+						(file-name-directory
+						 (cdr (assq :tangle params)))))
+		  link)
+		source-name
+		params
+		(org-unescape-code-in-string
+		 (if org-src-preserve-indentation
+		     (org-trim body t)
+		   (org-trim (org-remove-indentation body))))
+		comment)))
     (if only-this-block
 	(list (cons src-lang (list result)))
       result)))
diff --git a/elpa/org-20161118/ob.el b/elpa/org-20170210/ob.el
similarity index 95%
rename from elpa/org-20161118/ob.el
rename to elpa/org-20170210/ob.el
index 491b0d75..736f5887 100644
--- a/elpa/org-20161118/ob.el
+++ b/elpa/org-20170210/ob.el
@@ -1,6 +1,6 @@
 ;;; ob.el --- Working with Code Blocks in Org        -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
 
 ;; Authors: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff --git a/elpa/org-20161118/org b/elpa/org-20170210/org
similarity index 91%
rename from elpa/org-20161118/org
rename to elpa/org-20170210/org
index cca2dac0..4e202dd3 100644
--- a/elpa/org-20161118/org
+++ b/elpa/org-20170210/org
@@ -1,8 +1,8 @@
 This is org, produced by makeinfo version 4.13 from org.texi.
 
-This manual is for Org version 9.0.1 (release_9.0.1).
+This manual is for Org version 9.0.5 (release_9.0.5).
 
-   Copyright (C) 2004-2016 Free Software Foundation, Inc.
+   Copyright (C) 2004-2017 Free Software Foundation, Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -26,9 +26,9 @@ File: org,  Node: Top,  Next: Introduction,  Prev: (dir),  Up: (dir)
 Org Mode Manual
 ***************
 
-This manual is for Org version 9.0.1 (release_9.0.1).
+This manual is for Org version 9.0.5 (release_9.0.5).
 
-   Copyright (C) 2004-2016 Free Software Foundation, Inc.
+   Copyright (C) 2004-2017 Free Software Foundation, Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -278,12 +278,12 @@ Markup for rich export
 * Horizontal rules::            Make a line
 * Images and tables::           Images, tables and caption mechanism
 * Literal examples::            Source code examples with special formatting
+* Special symbols::             Greek letters and other symbols
+* Subscripts and superscripts::  Simple syntax for raising/lowering text
 * Embedded LaTeX::           LaTeX can be freely used inside Org documents
 
 Embedded LaTeX
 
-* Special symbols::             Greek letters and other symbols
-* Subscripts and superscripts::  Simple syntax for raising/lowering text
 * LaTeX fragments::          Complex formulas made easy
 * Previewing LaTeX fragments::  What will this snippet look like?
 * CDLaTeX mode::                Speed up entering of formulas
@@ -306,52 +306,52 @@ Exporting
 * Texinfo export::              Exporting to Texinfo
 * iCalendar export::            Exporting to iCalendar
 * Other built-in back-ends::    Exporting to a man page
-* Export in foreign buffers::   Author tables and lists in Org syntax
 * Advanced configuration::      Fine-tuning the export output
+* Export in foreign buffers::   Author tables and lists in Org syntax
 
 Beamer export
 
-* Beamer export commands:: How to export Beamer documents.
-* Beamer specific export settings:: Export settings for Beamer export.
-* Sectioning Frames and Blocks in Beamer:: Blocks and sections in Beamer.
-* Beamer specific syntax:: Syntax specific to Beamer.
-* Editing support:: Helper functions for Org Beamer export.
-* A Beamer Example:: An complete Beamer example.
+* Beamer export commands::      How to export Beamer documents.
+* Beamer specific export settings::  Export settings for Beamer export.
+* Sectioning Frames and Blocks in Beamer::  Blocks and sections in Beamer.
+* Beamer specific syntax::      Syntax specific to Beamer.
+* Editing support::             Helper functions for Org Beamer export.
+* A Beamer Example::            An complete Beamer example.
 
 HTML export
 
-* HTML Export commands::           How to invoke HTML export
+* HTML Export commands::        How to invoke HTML export
 * HTML Specific export settings::  Export settings for HTML export
-* HTML doctypes::                  Org can export to various (X)HTML flavors
-* HTML preamble and postamble::    How to insert a preamble and a postamble
-* Quoting HTML tags::              Using direct HTML in Org mode
-* Links in HTML export::           How links will be interpreted and formatted
-* Tables in HTML export::          How to modify the formatting of tables
-* Images in HTML export::          How to insert figures into HTML output
-* Math formatting in HTML export:: Beautiful math also on the web
-* Text areas in HTML export::      An alternative way to show an example
-* CSS support::                    Changing the appearance of the output
-* JavaScript support::             Info and Folding in a web browser
+* HTML doctypes::               Org can export to various (X)HTML flavors
+* HTML preamble and postamble::  How to insert a preamble and a postamble
+* Quoting HTML tags::           Using direct HTML in Org mode
+* Links in HTML export::        How links will be interpreted and formatted
+* Tables in HTML export::       How to modify the formatting of tables
+* Images in HTML export::       How to insert figures into HTML output
+* Math formatting in HTML export::  Beautiful math also on the web
+* Text areas in HTML export::   An alternative way to show an example
+* CSS support::                 Changing the appearance of the output
+* JavaScript support::          Info and Folding in a web browser
 
 LaTeX export
 
-* LaTeX export commands::            How to export to LaTeX and PDF
-* LaTeX specific export settings::   Export settings for LaTeX
-* LaTeX header and sectioning::      Setting up the export file structure
-* Quoting LaTeX code::               Incorporating literal LaTeX code
-* Tables in LaTeX export::           Specific attributes for tables
-* Images in LaTeX export::           Specific attributes for images
-* Plain lists in LaTeX export::      Specific attributes for plain lists
-* Source blocks in LaTeX export::    Specific attributes for source blocks
-* Example blocks in LaTeX export::   Specific attributes for example blocks
-* Special blocks in LaTeX export::   Specific attributes for special blocks
-* Horizontal rules in LaTeX export:: Specific attributes for horizontal rules
+* LaTeX export commands::    How to export to LaTeX and PDF
+* LaTeX specific export settings::  Export settings for LaTeX
+* LaTeX header and sectioning::  Setting up the export file structure
+* Quoting LaTeX code::       Incorporating literal LaTeX code
+* Tables in LaTeX export::   Specific attributes for tables
+* Images in LaTeX export::   Specific attributes for images
+* Plain lists in LaTeX export::  Specific attributes for plain lists
+* Source blocks in LaTeX export::  Specific attributes for source blocks
+* Example blocks in LaTeX export::  Specific attributes for example blocks
+* Special blocks in LaTeX export::  Specific attributes for special blocks
+* Horizontal rules in LaTeX export::  Specific attributes for horizontal rules
 
 OpenDocument Text export
 
 * Pre-requisites for ODT export::  What packages ODT exporter relies on
 * ODT export commands::         How to invoke ODT export
-* ODT specific export settings:: Export settings for ODT
+* ODT specific export settings::  Export settings for ODT
 * Extending ODT export::        How to produce `doc', `pdf' files
 * Applying custom styles::      How to apply custom styles to the output
 * Links in ODT export::         How links will be interpreted and formatted
@@ -436,38 +436,32 @@ Header arguments
 
 Using header arguments
 
-* System-wide header arguments::  Set global default values
-* Language-specific header arguments::  Set default values by language
-* Header arguments in Org mode properties::  Set default values for a buffer or heading
-* Language-specific header arguments in Org mode properties::  Set language-specific default values for a buffer or heading
-* Code block specific header arguments::  The most common way to set values
-* Header arguments in function calls::  The most specific level
+* System-wide header arguments::  Set globally, language-specific
+* Language-specific header arguments::  Set in the Org file's headers
+* Header arguments in Org mode properties::  Set in the Org file
+* Language-specific mode properties::
+* Code block specific header arguments::  The most commonly used method
+* Arguments in function calls::  The most specific level, takes highest priority
 
 Specific header arguments
 
-* var::                         Pass arguments to code blocks
-* results::                     Specify the type of results and how they will
-                                be collected and handled
-* file::                        Specify a path for file output
+* var::                         Pass arguments to `src' code blocks
+* results::                     Specify results type; how to collect
+* file::                        Specify a path for output file
 * file-desc::                   Specify a description for file results
 * file-ext::                    Specify an extension for file output
-* output-dir::                  Specify a directory to write file output to
-* dir::                         Specify the default (possibly remote)
-                                directory for code block execution
-* exports::                     Export code and/or results
-* tangle::                      Toggle tangling and specify file name
-* mkdirp::                      Toggle creation of parent directories of target
-                                files during tangling
-* comments::                    Toggle insertion of comments in tangled
-                                code files
-* padline::                     Control insertion of padding lines in tangled
-                                code files
-* no-expand::                   Turn off variable assignment and noweb
-                                expansion during tangling
+* output-dir::                  Specify a directory for output file
+* dir::                         Specify the default directory for code block execution
+* exports::                     Specify exporting code, results, both, none
+* tangle::                      Toggle tangling; or specify file name
+* mkdirp::                      Toggle for parent directory creation for target files during tangling
+* comments::                    Toggle insertion of comments in tangled code files
+* padline::                     Control insertion of padding lines in tangled code files
+* no-expand::                   Turn off variable assignment and noweb expansion during tangling
 * session::                     Preserve the state of code evaluation
 * noweb::                       Toggle expansion of noweb references
 * noweb-ref::                   Specify block's noweb reference resolution target
-* noweb-sep::                   String used to separate noweb references
+* noweb-sep::                   String to separate noweb references
 * cache::                       Avoid re-evaluating unchanged code blocks
 * sep::                         Delimiter for writing tabular results outside Org
 * hlines::                      Handle horizontal lines in tables
@@ -477,22 +471,22 @@ Specific header arguments
 * tangle-mode::                 Set permission of tangled files
 * eval::                        Limit evaluation of specific code blocks
 * wrap::                        Mark source block evaluation results
-* post::                        Post processing of code block results
-* prologue::                    Text to prepend to code block body
-* epilogue::                    Text to append to code block body
+* post::                        Post processing of results of code block evaluation
+* prologue::                    Text to prepend to body of code block
+* epilogue::                    Text to append to body of code block
 
 Miscellaneous
 
-* Completion::                  M-TAB knows what you need
+* Completion::                  M-TAB guesses completions
 * Easy templates::              Quick insertion of structural elements
 * Speed keys::                  Electric commands at the beginning of a headline
 * Code evaluation security::    Org mode files evaluate inline code
-* Customization::               Adapting Org to your taste
+* Customization::               Adapting Org to changing tastes
 * In-buffer settings::          Overview of the #+KEYWORDS
 * The very busy C-c C-c key::   When in doubt, press C-c C-c
 * Clean view::                  Getting rid of leading stars in the outline
 * TTY keys::                    Using Org on a tty
-* Interaction::                 Other Emacs packages
+* Interaction::                 With other Emacs packages
 * org-crypt::                   Encrypting Org files
 
 Interaction with other packages
@@ -524,7 +518,7 @@ Tables and lists in arbitrary syntax
 
 MobileOrg
 
-* Setting up the staging area::  Where to interact with the mobile device
+* Setting up the staging area::  For the mobile device
 * Pushing to MobileOrg::        Uploading Org files and agendas
 * Pulling from MobileOrg::      Integrating captured and flagged items
 
@@ -7135,11 +7129,12 @@ File: org,  Node: Internal archiving,  Prev: Moving subtrees,  Up: Archiving
 9.6.2 Internal archiving
 ------------------------
 
-If you want to just switch off (for agenda views) certain subtrees
-without moving them to a different file, you can use the `ARCHIVE tag'.
+If you want to just switch off--for agenda views--certain subtrees
+without moving them to a different file, you can use the archive tag.
 
-   A headline that is marked with the ARCHIVE tag (*note Tags::) stays
-at its location in the outline tree, but behaves in the following way:
+   A headline that is marked with the `:ARCHIVE:' tag (*note Tags::)
+stays at its location in the outline tree, but behaves in the following
+way:
    - It does not open when you attempt to do so with a visibility
      cycling command (*note Visibility cycling::).  You can force
      cycling archived subtrees with `C-<TAB>', or by setting the option
@@ -7227,6 +7222,11 @@ This buffer is read-only, but provides commands to visit the
 corresponding locations in the original Org files, and even to edit
 these files remotely.
 
+   By default, the report ignores commented (*note Comment lines::) and
+archived (*note Internal archiving::) entries.  You can override this
+by setting `org-agenda-skip-comment-trees' and
+`org-agenda-skip-archived-trees' to `nil'.
+
    Two variables control how the agenda buffer is displayed and whether
 the window configuration is restored when the agenda exits:
 `org-agenda-window-setup' and `org-agenda-restore-windows-after-quit'.
@@ -8054,8 +8054,11 @@ Filtering in the agenda
      Filter the current agenda view with respect to the category of the
      item at point.  Pressing `<' another time will remove this filter.
      When called with a prefix argument exclude the category of the
-     item at point from the agenda.  You can add a filter preset
-     through the option `org-agenda-category-filter-preset' (see below.)
+     item at point from the agenda.
+
+     You can add a filter preset in custom agenda commands through the
+     option `org-agenda-category-filter-preset'.  *Note Setting
+     options::.
 
 `^     (`org-agenda-filter-by-top-headline')'
      Filter the current agenda view and only display the siblings and
@@ -8066,9 +8069,10 @@ Filtering in the agenda
      entries matching the regular expression the user entered.  When
      called with a prefix argument, it will filter _out_ entries
      matching the regexp.  With two universal prefix arguments, it will
-     remove all the regexp filters, which can be accumulated.  You can
-     add a filter preset through the option
-     `org-agenda-category-filter-preset' (see below.)
+     remove all the regexp filters, which can be accumulated.
+
+     You can add a filter preset in custom agenda commands through the
+     option `org-agenda-regexp-filter-preset'.  *Note Setting options::.
 
 `_     (`org-agenda-filter-by-effort')'
      Filter the agenda view with respect to effort estimates.  You
@@ -8084,6 +8088,13 @@ Filtering in the agenda
      effort will be treated according to the value of
      `org-sort-agenda-noeffort-is-high'.
 
+     When called with a prefix argument, it will remove entries
+     matching the condition.  With two universal prefix arguments, it
+     will clear effort filters, which can be accumulated.
+
+     You can add a filter preset in custom agenda commands through the
+     option `org-agenda-effort-filter-preset'.  *Note Setting options::.
+
 `|     (`org-agenda-filter-remove-all')'
      Remove all filters in the current agenda view.
 
@@ -8338,7 +8349,7 @@ Change display
 Secondary filtering and query editing
 .....................................
 
-     For a detailed description of these commands, see *note
+     For a detailed description of these commands, *note
      Filtering/limiting agenda items::.
 
 `/     (`org-agenda-filter-by-tag')'
@@ -8347,20 +8358,17 @@ Secondary filtering and query editing
 
 `<     (`org-agenda-filter-by-category')'
      Filter the current agenda view with respect to the category of the
-     item at point.  Pressing `<' another time will remove this filter.
+     item at point.
 
 `^     (`org-agenda-filter-by-top-headline')'
      Filter the current agenda view and only display the siblings and
      the parent headline of the one at point.
 
 `=     (`org-agenda-filter-by-regexp')'
-     Filter the agenda view by a regular expression: only show agenda
-     entries matching the regular expression the user entered.  When
-     called with a prefix argument, it will filter _out_ entries
-     matching the regexp.  With two universal prefix arguments, it will
-     remove all the regexp filters, which can be accumulated.  You can
-     add a filter preset through the option
-     `org-agenda-category-filter-preset' (see below.)
+     Filter the agenda view by a regular expression.
+
+`_     (`org-agenda-filter-by-effort')'
+     Filter the agenda view with respect to effort estimates.
 
 `|     (`org-agenda-filter-remove-all')'
      Remove all filters in the current agenda view.
@@ -9042,8 +9050,8 @@ environment.  This causes the following issues:
      `org-agenda-overriding-columns-format' is currently set, and if
      so, takes the format from there.  Otherwise it takes the format
      associated with the first item in the agenda, or, if that item
-     does not have a specific format (defined in a property, or in its
-     file), it uses `org-columns-default-format'.
+     does not have a specific format--defined in a property, or in its
+     file--it uses `org-columns-default-format'.
 
   2. If any of the columns has a summary type defined (*note Column
      attributes::), turning on column view in the agenda will visit all
@@ -9052,11 +9060,11 @@ environment.  This causes the following issues:
      `CLOCKSUM' property.  Org will then sum the values displayed in
      the agenda.  In the daily/weekly agenda, the sums will cover a
      single day; in all other views they cover the entire block.  It is
-     vital to realize that the agenda may show the same entry _twice_
-     (for example as scheduled and as a deadline), and it may show two
-     entries from the same hierarchy (for example a _parent_ and its
-     _child_).  In these cases, the summation in the agenda will lead
-     to incorrect results because some values will count double.
+     vital to realize that the agenda may show the same entry
+     _twice_--for example as scheduled and as a deadline--and it may
+     show two entries from the same hierarchy--for example a _parent_
+     and its _child_.  In these cases, the summation in the agenda will
+     lead to incorrect results because some values will count double.
 
   3. When the column view in the agenda shows the `CLOCKSUM', that is
      always the entire clocked time for this item.  So even in the
@@ -9072,7 +9080,7 @@ environment.  This causes the following issues:
      always today's clocked time for this item.  So even in the weekly
      agenda, the clocksum listed in column view only originates from
      today.  This lets you compare the time you spent on a task for
-     today, with the time already spent (via `CLOCKSUM') and with the
+     today, with the time already spent --via `CLOCKSUM'--and with the
      planned total effort for it.
 
 
@@ -9095,7 +9103,7 @@ section summarizes the markup rules used in an Org mode buffer.
 * Images and tables::           Images, tables and caption mechanism
 * Literal examples::            Source code examples with special formatting
 * Special symbols::             Greek letters and other symbols
-* Subscripts and superscripts:: Simple syntax for raising/lowering text
+* Subscripts and superscripts::  Simple syntax for raising/lowering text
 * Embedded LaTeX::           LaTeX can be freely used inside Org documents
 
 
@@ -9322,8 +9330,8 @@ adding the desired package to `org-latex-packages-alist'.  Refer to
 `org-latex-listings' for details.
 
    (2) Code in `src' blocks may also be evaluated either interactively
-or on export.  See *note Working with source code:: for more
-information on evaluating code blocks.
+or on export.  *Note Working with source code::, for more information
+on evaluating code blocks.
 
    (3) Adding `-k' to `-n -r' will keep the labels in the source code
 while using line numbers for the links, which might be useful to
@@ -10260,12 +10268,12 @@ support for turning an Org mode file or tree into a Beamer presentation.
 
 * Menu:
 
-* Beamer export commands:: How to export Beamer documents.
-* Beamer specific export settings:: Export settings for Beamer export.
-* Sectioning Frames and Blocks in Beamer:: Blocks and sections in Beamer.
-* Beamer specific syntax:: Syntax specific to Beamer.
-* Editing support:: Helper functions for Org Beamer export.
-* A Beamer Example:: An complete Beamer example.
+* Beamer export commands::      How to export Beamer documents.
+* Beamer specific export settings::  Export settings for Beamer export.
+* Sectioning Frames and Blocks in Beamer::  Blocks and sections in Beamer.
+* Beamer specific syntax::      Syntax specific to Beamer.
+* Editing support::             Helper functions for Org Beamer export.
+* A Beamer Example::            An complete Beamer example.
 
 
 File: org,  Node: Beamer export commands,  Next: Beamer specific export settings,  Up: Beamer export
@@ -10514,18 +10522,18 @@ but with additional support for tables.
 
 * Menu:
 
-* HTML Export commands::           How to invoke HTML export
+* HTML Export commands::        How to invoke HTML export
 * HTML Specific export settings::  Export settings for HTML export
-* HTML doctypes::                  Org can export to various (X)HTML flavors
-* HTML preamble and postamble::    How to insert a preamble and a postamble
-* Quoting HTML tags::              Using direct HTML in Org mode
-* Links in HTML export::           How links will be interpreted and formatted
-* Tables in HTML export::          How to modify the formatting of tables
-* Images in HTML export::          How to insert figures into HTML output
-* Math formatting in HTML export:: Beautiful math also on the web
-* Text areas in HTML export::      An alternative way to show an example
-* CSS support::                    Changing the appearance of the output
-* JavaScript support::             Info and Folding in a web browser
+* HTML doctypes::               Org can export to various (X)HTML flavors
+* HTML preamble and postamble::  How to insert a preamble and a postamble
+* Quoting HTML tags::           Using direct HTML in Org mode
+* Links in HTML export::        How links will be interpreted and formatted
+* Tables in HTML export::       How to modify the formatting of tables
+* Images in HTML export::       How to insert figures into HTML output
+* Math formatting in HTML export::  Beautiful math also on the web
+* Text areas in HTML export::   An alternative way to show an example
+* CSS support::                 Changing the appearance of the output
+* JavaScript support::          Info and Folding in a web browser
 
 
 File: org,  Node: HTML Export commands,  Next: HTML Specific export settings,  Up: HTML export
@@ -11030,17 +11038,17 @@ are not separated by an empty line.
 
 * Menu:
 
-* LaTeX export commands::            How to export to LaTeX and PDF
-* LaTeX specific export settings::   Export settings for LaTeX
-* LaTeX header and sectioning::      Setting up the export file structure
-* Quoting LaTeX code::               Incorporating literal LaTeX code
-* Tables in LaTeX export::           Specific attributes for tables
-* Images in LaTeX export::           Specific attributes for images
-* Plain lists in LaTeX export::      Specific attributes for plain lists
-* Source blocks in LaTeX export::    Specific attributes for source blocks
-* Example blocks in LaTeX export::   Specific attributes for example blocks
-* Special blocks in LaTeX export::   Specific attributes for special blocks
-* Horizontal rules in LaTeX export:: Specific attributes for horizontal rules
+* LaTeX export commands::    How to export to LaTeX and PDF
+* LaTeX specific export settings::  Export settings for LaTeX
+* LaTeX header and sectioning::  Setting up the export file structure
+* Quoting LaTeX code::       Incorporating literal LaTeX code
+* Tables in LaTeX export::   Specific attributes for tables
+* Images in LaTeX export::   Specific attributes for images
+* Plain lists in LaTeX export::  Specific attributes for plain lists
+* Source blocks in LaTeX export::  Specific attributes for source blocks
+* Example blocks in LaTeX export::  Specific attributes for example blocks
+* Special blocks in LaTeX export::  Specific attributes for special blocks
+* Horizontal rules in LaTeX export::  Specific attributes for horizontal rules
 
    ---------- Footnotes ----------
 
@@ -11567,7 +11575,7 @@ and are compatible with LibreOffice 3.4.
 
 * Pre-requisites for ODT export::  What packages ODT exporter relies on
 * ODT export commands::         How to invoke ODT export
-* ODT specific export settings:: Export settings for ODT
+* ODT specific export settings::  Export settings for ODT
 * Extending ODT export::        How to produce `doc', `pdf' files
 * Applying custom styles::      How to apply custom styles to the output
 * Links in ODT export::         How links will be interpreted and formatted
@@ -13731,10 +13739,10 @@ File: org,  Node: Working with source code,  Next: Miscellaneous,  Prev: Publish
 Source code here refers to any code typed in Org mode documents.  Org
 can manage source code in any Org file once such code is tagged with
 begin and end markers.  Working with source code begins with tagging
-source code blocks.  Tagged source code blocks are not restricted to
-the preamble or the end of an Org document; they can go anywhere (with
-a few exceptions, such as not inside comments and fixed width areas).
-Here's a sample `src' block in emacs-lisp:
+source code blocks.  Tagged `src' code blocks are not restricted to the
+preamble or the end of an Org document; they can go anywhere--with a
+few exceptions, such as not inside comments and fixed width areas.
+Here's a sample `src' code block in emacs-lisp:
 
      #+BEGIN_SRC emacs-lisp
        (defun org-xor (a b)
@@ -13749,11 +13757,15 @@ maintenance.  That's why these blocks in Org mode literature are
 sometimes referred to as `live code' blocks (as compared to the static
 text and documentation around it).  Users can control how `live' they
 want each block by tweaking the headers for compiling, execution,
-extraction, and so on.
+extraction.
+
+   Org's `src' code block type is one of many block types, such as
+quote, export, verse, latex, example, and verbatim.  This section
+pertains to `src' code blocks between `#+BEGIN_SRC' and `#+END_SRC'
 
-   For editing `src' code blocks, Org offers native Emacs major-modes.
-That leverages all the latest Emacs features for that source code
-language mode.
+   For editing `src' code blocks, Org provides native Emacs major-modes.
+That leverages the latest Emacs features for that source code language
+mode.
 
    For exporting, Org can then extract `src' code blocks into compilable
 source files (in a conversion process known as "tangling" in literate
@@ -13773,10 +13785,9 @@ handle: audio, video, and graphics.
 passing variables, functions, and results between `src' blocks.  Such
 interoperability uses a common syntax even if these `src' blocks are in
 different source code languages.  The integration extends to linking the
-debugger's error messages to the line in the source code block in the
-Org file.  That should partly explain why this functionality by the
-original contributors, Eric Schulte and Dan Davison, was called `Org
-Babel'.
+debugger's error messages to the line in the `src' code block in the Org
+file.  That should partly explain why this functionality by the original
+contributors, Eric Schulte and Dan Davison, was called `Org Babel'.
 
    In literate programming, the main appeal is code and documentation
 co-existing in one file.  Org mode takes this several steps further.
@@ -13784,14 +13795,14 @@ First by enabling execution, and then by inserting results of that
 execution back into the Org file.  Along the way, Org provides
 extensive formatting features, including handling tables.  Org handles
 multiple source code languages in one file, and provides a common
-syntax for passing variables, functions, and results between source
-code blocks.
+syntax for passing variables, functions, and results between `src' code
+blocks.
 
    Org mode fulfills the promise of easy verification and maintenance of
-publishing reproducible research by keeping text, data, code,
-configuration settings of the execution environment, the results of the
-execution, and associated narratives, claims, references, and internal
-and external links--all in the same file.
+publishing reproducible research by keeping all these in the same file:
+text, data, code, configuration settings of the execution environment,
+the results of the execution, and associated narratives, claims,
+references, and internal and external links.
 
    Details of Org's facilities for working with source code are shown
 next.
@@ -13828,11 +13839,12 @@ Org offers two ways to structure source code in Org documents: in a
      #+END_SRC
 
    Org mode's templates system (*note Easy templates::) speeds up
-creating `src' blocks with just a couple of keystrokes.  Don't be
-put-off by having to type or remember the source block syntax.  Any
-other completion system in Emacs--of which there are several, some even
-predate Org--can be customized to create these Org `src' blocks to
-reduce errors, increase accuracy, and maintain consistency.
+creating `src' code blocks with just three keystrokes.  Do not be
+put-off by having to remember the source block syntax.  Org also works
+with other completion systems in Emacs, some of which predate Org and
+have custom domain-specific languages for defining templates.  Regular
+use of templates reduces errors, increases accuracy, and maintains
+consistency.
 
    An inline code block conforms to this structure:
 
@@ -13860,7 +13872,7 @@ reduce errors, increase accuracy, and maintain consistency.
 
 `<language>'
      Mandatory for live code blocks.  It is the identifier of the
-     source code language in the block.  *Note Languages:: for
+     source code language in the block.  *Note Languages::, for
      identifiers of supported languages.  
 
 `<switches>'
@@ -13887,7 +13899,7 @@ File: org,  Node: Editing source code,  Next: Exporting code blocks,  Prev: Stru
 ========================
 
 `C-c '' for editing the current code block.  It opens a new major-mode
-edit buffer containing the body of the source code block, ready for any
+edit buffer containing the body of the `src' code block, ready for any
 edits.  `C-c '' again to close the buffer and return to the Org buffer.
 
    <C-x C-s> saves the buffer and updates the contents of the Org
@@ -13922,7 +13934,7 @@ group `org-edit-structure'.
      applies during export or tangling, and depending on the context,
      may alter leading spaces and tabs.  When non-`nil', source code is
      aligned with the leftmost column.  No lines are modified during
-     export or tangling--very useful for white-space sensitive
+     export or tangling, which is very useful for white-space sensitive
      languages, such as Python.
 
 `org-src-ask-before-returning-to-edit-buffer'
@@ -13930,7 +13942,7 @@ group `org-edit-structure'.
      prompts.  The default prompts for a confirmation.
 
    Set `org-src-fontify-natively' to non-`nil' to turn on native code
-fontification in the _Org_ buffer.  Fontification of source code blocks
+fontification in the _Org_ buffer.  Fontification of `src' code blocks
 can give visual separation of text and code on the display page.  To
 further customize the appearance of `org-block' for specific languages,
 customize `org-src-block-faces'.  The following example shades the
@@ -13952,14 +13964,14 @@ File: org,  Node: Exporting code blocks,  Next: Extracting source code,  Prev: E
 
 Org can flexibly export just the _code_ from the code blocks, just the
 _results_ of evaluation of the code block, _both_ the code and the
-results of code block evaluation, or _none_.  Org defaults to exporting
-_code_ for most languages.  For some languages, such as `ditaa', Org
-defaults to _results_.  To export just the body of code blocks, see
-*note Literal examples::.  To export portions (sub-trees) of an Org
-document, see *note Exporting::.
+results of the code block evaluation, or _none_.  Org defaults to
+exporting _code_ for most languages.  For some languages, such as
+`ditaa', Org defaults to _results_.  To export just the body of code
+blocks, *note Literal examples::.  To selectively export sub-trees of
+an Org document, *note Exporting::.
 
-   The `:exports' header arguments control the export of code blocks
-(and not inline code):
+   The `:exports' header arguments control exporting code blocks only
+and not inline code:
 
 Header arguments:
 .................
@@ -13969,25 +13981,33 @@ Header arguments:
      block is exported.  See *note Literal examples:: for more.
 
 `:exports results'
-     After each evaluation, results are inserted after the end of code
-     block in the Org buffer.  Previous results are either replaced
-     (default) or appended to.  On export, Org includes only the
-     results and not the code block.
+     On export, Org includes only the results and not the code block.
+     After each evaluation, Org inserts the results after the end of
+     code block in the Org buffer.  By default, Org replaces any
+     previous results.  Org can also append results.
 
 `:exports both'
-     Org includes both the code block and the results on export.
+     Org exports both the code block and the results.
 
 `:exports none'
-     Org does not include neither the code block nor the results on
-     export.
+     Org does not export the code block nor the results.
 
    To stop Org from evaluating code blocks during export, set
-`org-export-babel-evaluate' variable to `nil'.  Turning off evaluation
-comes in handy when batch processing.  For example, markup languages
-for wikis, which have a high risk of untrusted code.  To evaluate just
-the inline code blocks, set to `inline-only'.  Isolating inline
-evaluations is not for security but for avoiding any delays due to
-recalculations during exports, such as calls to a remote database.
+`org-export-babel-evaluate' variable to `nil'.
+
+   Turning off evaluation comes in handy when batch processing.  For
+example, markup languages for wikis, which have a high risk of
+untrusted code.  Stopping code block evaluation also stops evaluation
+of all header arguments of the code block.  This may not be desirable
+in some circumstances.  So during export, to allow evaluation of just
+the header arguments but not any code evaluation in the source block,
+set `:eval never-export' (*note eval::).
+
+   To evaluate just the inline code blocks, set
+`org-export-babel-evaluate' to `inline-only'.  Isolating the option to
+allow inline evaluations separate from `src' code block evaluations
+during exports is not for security but for avoiding any delays due to
+recalculations, such as calls to a remote database.
 
    Org never evaluates code blocks in commented sub-trees when exporting
 (*note Comment lines::).  On the other hand, Org does evaluate code
@@ -14003,27 +14023,27 @@ Extracting source code from code blocks is a basic task in literate
 programming.  Org has features to make this easy.  In literate
 programming parlance, documents on creation are _woven_ with code and
 documentation, and on export, the code is _tangled_ for execution by a
-computer.  Org facilitates weaving and tangling with several
-customization options for producing, maintaining, sharing, and
-exporting literate programming documents.
+computer.  Org facilitates weaving and tangling for producing,
+maintaining, sharing, and exporting literate programming documents.
+Org provides extensive customization options for extracting source code.
 
-   When Org tangles the source code blocks, it expands, merges, and
+   When Org tangles `src' code blocks, it expands, merges, and
 transforms them.  Then Org recomposes them into one or more separate
-files (as specified in the options).  During this _tangling_ process,
-Org expands variables in the source code, and resolves any "noweb"
-style references (*note Noweb reference syntax::).
+files, as configured through the options.  During this _tangling_
+process, Org expands variables in the source code, and resolves any
+"noweb" style references (*note Noweb reference syntax::).
 
 Header arguments
 ................
 
 `:tangle no'
-     By default, Org does not tangle the code block on export.
+     By default, Org does not tangle the `src' code block on export.
 
 `:tangle yes'
-     Includes the code block in the tangled output.  By default, the
-     output file name is the same as the Org file but with a different
-     extension.  Org derives the extension from the language identifier
-     of the source code block.
+     Org extracts the contents of the code block for the tangled
+     output.  By default, the output file name is the same as the Org
+     file but with a file extension derived from the language
+     identifier of the `src' code block.
 
 `:tangle filename'
      Override the default file name with this one for the tangled
@@ -14035,7 +14055,7 @@ Functions
 `org-babel-tangle'
      Tangle the current file.  Bound to `C-c C-v t'.
 
-     With prefix argument only tangle the current code block.
+     With prefix argument only tangle the current `src' code block.
 
 `org-babel-tangle-file'
      Choose a file to tangle.  Bound to `C-c C-v f'.
@@ -14057,7 +14077,7 @@ tangled source file.  To make this extra jump, Org uses
 `org-babel-tangle-jump-to-org' function with two additional source code
 block header arguments: One, set `padline' (*note padline::) to true
 (the default setting).  Two, set `comments' (*note comments::) to
-`link' to tell Org to insert links to the Org file.
+`link', which makes Org insert links to the Org file.
 
 
 File: org,  Node: Evaluating code blocks,  Next: Library of Babel,  Prev: Extracting source code,  Up: Working with source code
@@ -14075,21 +14095,21 @@ inserts them in the Org file, right after the `src' code block.  The
 insertion point is after a newline and the `#+RESULTS' label.  Org
 creates the `#+RESULTS' label if one is not already there.
 
-   By default, Org enables only `emacs-lisp' source code blocks for
+   By default, Org enables only `emacs-lisp' `src' code blocks for
 execution.  See *note Languages:: for identifiers to enable other
 languages.
 
-   Org provides many ways to execute code blocks.  `C-c C-c' or `C-c C-v
-e' with the point on a code block(1) calls the
+   Org provides many ways to execute `src' code blocks.  `C-c C-c' or
+`C-c C-v e' with the point on a `src' code block(1) calls the
 `org-babel-execute-src-block' function, which executes the code in the
 block, collects the results, and inserts them in the buffer.
 
-   By calling a named code block(2) from an Org mode buffer or table.
-These named code blocks can be located in the current Org mode buffer
-or in the "Library of Babel" (*note Library of Babel::).  Using either
-the inline syntax or the `#+CALL:' syntax, the result is then wrapped
-based on `org-babel-inline-result-wrap', which by default is `"=%s="'
-that produces verbatim text suitable for markup.
+   By calling a named code block(2) from an Org mode buffer or a table.
+Org can call the named `src' code blocks from the current Org mode
+buffer or from the "Library of Babel" (*note Library of Babel::).
+Whether inline syntax or the `#+CALL:' syntax is used, the result is
+wrapped based on the variable `org-babel-inline-result-wrap', which by
+default is set to `"=%s="' to produce verbatim text suitable for markup.
 
    The syntax for `#+CALL:' is
 
@@ -14106,26 +14126,29 @@ that produces verbatim text suitable for markup.
      Structure of code blocks::).
 
 `<arguments>'
-     Org passes arguments to the code block using standard function call
-     syntax --instead of the header argument syntax.  For example, a
-     `#+CALL:' line that passes 4 to a code block named `double', which
-     declares the header argument `:var n=2', would be written as
-     `#+CALL: double(n=4)'.
+     Org passes arguments to the code block using standard function
+     call syntax.  For example, a `#+CALL:' line that passes `4' to a
+     code block named `double', which declares the header argument
+     `:var n=2', would be written as `#+CALL: double(n=4)'.  Note how
+     this function call syntax is different from the header argument
+     syntax.
 
 `<inside header arguments>'
-     Org passes inside header arguments to the named source code block.
-     These arguments use header argument syntax--instead of the
-     standard function call syntax.  Inside header arguments affect
-     code block evaluation.  For example, `[:results output]' collects
-     results printed to `STDOUT' during code execution of that block.
+     Org passes inside header arguments to the named `src' code block
+     using the header argument syntax.  Inside header arguments apply
+     to code block evaluation.  For example, `[:results output]'
+     collects results printed to `STDOUT' during code execution of that
+     block.  Note how this header argument syntax is different from the
+     function call syntax.
 
 `<end header arguments>'
      End header arguments affect the results returned by the code
      block.  For example, `:results html' wraps the results in a
-     `BEGIN_EXPORT html' block and then inserts them in the Org buffer.
+     `BEGIN_EXPORT html' block before inserting the results in the Org
+     buffer.
 
-     For more examples of header arguments for `#+CALL:' lines see
-     *note Header arguments in function calls::.
+     For more examples of header arguments for `#+CALL:' lines, *note
+     Arguments in function calls::.
 
    ---------- Footnotes ----------
 
@@ -14142,15 +14165,15 @@ File: org,  Node: Library of Babel,  Next: Languages,  Prev: Evaluating code blo
 14.6 Library of Babel
 =====================
 
-The "Library of Babel" is a collection of code blocks available for
-calling from other Org files.  This collection is in a repository file
-in Org mode format in the `doc' directory of Org mode installation.
-For remote code block evaluation syntax, see *note Evaluating code
-blocks::.
+The "Library of Babel" is a collection of code blocks.  Like a function
+library, these code blocks can be called from other Org files.  This
+collection is in a repository file in Org mode format in the `doc'
+directory of Org mode installation.  For remote code block evaluation
+syntax, *note Evaluating code blocks::.
 
-   For user's to add their own code blocks to the library, first save
-the code in an Org file, and then load it with `org-babel-lob-ingest',
-which is bound to `C-c C-v i'.
+   For any user to add code to the library, first save the code in
+regular `src' code blocks of an Org file, and then load the Org file
+with `org-babel-lob-ingest', which is bound to `C-c C-v i'.
 
 
 File: org,  Node: Languages,  Next: Header arguments,  Prev: Library of Babel,  Up: Working with source code
@@ -14158,7 +14181,7 @@ File: org,  Node: Languages,  Next: Header arguments,  Prev: Library of Babel,
 14.7 Languages
 ==============
 
-Org supports the following languages for the code blocks:
+Org supports the following languages for the `src' code blocks:
 
 Language           Identifier         Language           Identifier
 ---------------------------------------------------------------------------- 
@@ -14186,10 +14209,10 @@ SQL                sql                SQLite             sqlite
    Additional documentation for some languages are at
 `http://orgmode.org/worg/org-contrib/babel/languages.html'.
 
-   By default, `emacs-lisp' is enabled for evaluation.  To enable or
-disable other languages, customize the `org-babel-load-languages'
-variable.  Use the Emacs customization interface, or add code to the
-init file as shown next:
+   By default, only `emacs-lisp' is enabled for evaluation.  To enable
+or disable other languages, customize the `org-babel-load-languages'
+variable either through the Emacs customization interface, or by adding
+code to the init file as shown next:
 
    In this example, evaluation is disabled for `emacs-lisp', and enabled
 for `R'.
@@ -14199,8 +14222,9 @@ for `R'.
       '((emacs-lisp . nil)
         (R . t)))
 
-   A language may also be enabled when loading with `require'.  This
-example below enables execution of `clojure' code blocks:
+   Note that this is not the only way to enable a language.  Org also
+enables languages when loaded with `require' statement.  For example,
+the following enables execution of `clojure' code blocks:
 
      (require 'ob-clojure)
 
@@ -14230,12 +14254,12 @@ header values from global defaults.
 
 * Menu:
 
-* System-wide header arguments::  Set global default values
-* Language-specific header arguments::  Set default values by language
-* Header arguments in Org mode properties::  Set default values for a buffer or heading
-* Language-specific header arguments in Org mode properties::  Set language-specific default values for a buffer or heading
-* Code block specific header arguments::  The most common way to set values
-* Header arguments in function calls::  The most specific level
+* System-wide header arguments::  Set globally, language-specific
+* Language-specific header arguments::  Set in the Org file's headers
+* Header arguments in Org mode properties::  Set in the Org file
+* Language-specific mode properties::
+* Code block specific header arguments::  The most commonly used method
+* Arguments in function calls::  The most specific level, takes highest priority
 
 
 File: org,  Node: System-wide header arguments,  Next: Language-specific header arguments,  Up: Using header arguments
@@ -14252,8 +14276,8 @@ System-wide values of header arguments can be specified by adapting the
      :cache      => "no"
      :noweb      => "no"
 
-   This example sets the default value of `:noweb' header arguments to
-`yes', which expands `:noweb' references by default.
+   This example sets `:noweb' header arguments to `yes', which makes
+Org expand `:noweb' references by default.
 
      (setq org-babel-default-header-args
            (cons '(:noweb . "yes")
@@ -14265,39 +14289,38 @@ File: org,  Node: Language-specific header arguments,  Next: Header arguments in
 Language-specific header arguments
 ..................................
 
-Each language can define its own set of default header arguments in
-variable `org-babel-default-header-args:<lang>', where `<lang>' is the
-name of the language.  See the language-specific online documentation at
-`http://orgmode.org/worg/org-contrib/babel'.
+Each language can have separate default header arguments by customizing
+the variable `org-babel-default-header-args:<lang>', where `<lang>' is
+the name of the language.  For details, see the language-specific online
+documentation at `http://orgmode.org/worg/org-contrib/babel'.
 
 
-File: org,  Node: Header arguments in Org mode properties,  Next: Language-specific header arguments in Org mode properties,  Prev: Language-specific header arguments,  Up: Using header arguments
+File: org,  Node: Header arguments in Org mode properties,  Next: Language-specific mode properties,  Prev: Language-specific header arguments,  Up: Using header arguments
 
 Header arguments in Org mode properties
 .......................................
 
-For buffer-wide header arguments, use `#+PROPERTY:' lines anywhere in
-the Org mode file (*note Property syntax::).
+For header arguments applicable to the buffer, use `#+PROPERTY:' lines
+anywhere in the Org mode file (*note Property syntax::).
 
-   The following example sets `*R*'--only for `R' code blocks--to
-`session', making all the `R' code blocks execute in the same session.
-Setting `results' to `silent' ignores the results of executions for all
-blocks--not just `R' code blocks; no results inserted for any block.
+   The following example sets only for `R' code blocks to `session',
+making all the `R' code blocks execute in the same session.  Setting
+`results' to `silent' ignores the results of executions for all blocks,
+not just `R' code blocks; no results inserted for any block.
 
      #+PROPERTY: header-args:R  :session *R*
      #+PROPERTY: header-args    :results silent
 
-   Header arguments set through property drawers (*note Property
+   Header arguments set through Org's property drawers (*note Property
 syntax::) apply at the sub-tree level on down.  Since these property
 drawers can appear anywhere in the file hierarchy, Org uses outermost
 call or source block to resolve the values.  Org ignores
 `org-use-property-inheritance' setting.
 
-   In this example, the value of `:cache' header argument defaults to
-`yes' for all code blocks in the sub-tree starting with the outline
-header.
+   In this example, `:cache' defaults to `yes' for all code blocks in
+the sub-tree starting with `sample header'.
 
-     * outline header
+     * sample header
        :PROPERTIES:
        :header-args:    :cache yes
        :END:
@@ -14307,10 +14330,10 @@ header.
 set in `org-babel-default-header-args'.
 
 
-File: org,  Node: Language-specific header arguments in Org mode properties,  Next: Code block specific header arguments,  Prev: Header arguments in Org mode properties,  Up: Using header arguments
+File: org,  Node: Language-specific mode properties,  Next: Code block specific header arguments,  Prev: Header arguments in Org mode properties,  Up: Using header arguments
 
-Language-specific header arguments in Org mode properties
-.........................................................
+Language-specific mode properties
+.................................
 
 Language-specific header arguments are also read from properties
 `header-args:<lang>' where `<lang>' is the language identifier.  For
@@ -14331,7 +14354,7 @@ Subheading, but use the same session for all `R' blocks.  Blocks in
 Subheading inherit settings from Heading.
 
 
-File: org,  Node: Code block specific header arguments,  Next: Header arguments in function calls,  Prev: Language-specific header arguments in Org mode properties,  Up: Using header arguments
+File: org,  Node: Code block specific header arguments,  Next: Arguments in function calls,  Prev: Language-specific mode properties,  Up: Using header arguments
 
 Code block specific header arguments
 ....................................
@@ -14343,7 +14366,7 @@ those set as header properties.
 
    In the following example, setting `results' to `silent' makes it
 ignore results of the code execution.  Setting `:exports' to `code'
-exports only the body of the code block to HTML or LaTeX.
+exports only the body of the `src' code block to HTML or LaTeX.:
 
      #+NAME: factorial
      #+BEGIN_SRC haskell :results silent :exports code :var n=0
@@ -14351,7 +14374,7 @@ exports only the body of the code block to HTML or LaTeX.
      fac n = n * fac (n-1)
      #+END_SRC
 
-   The same header arguments in an inline code block:
+   The same header arguments in an inline `src' code block:
 
      src_haskell[:exports both]{fac 5}
 
@@ -14360,7 +14383,7 @@ exports only the body of the code block to HTML or LaTeX.
 spelling of `#+HEADER:' only as a convenience for
 backward-compatibility.  It may be removed at some point.
 
-   Multi-line header arguments on an unnamed code block:
+   Multi-line header arguments on an unnamed `src' code block:
 
      #+HEADER: :var data1=1
      #+BEGIN_SRC emacs-lisp :var data2=2
@@ -14370,7 +14393,7 @@ backward-compatibility.  It may be removed at some point.
      #+RESULTS:
      : data1:1, data2:2
 
-   Multi-line header arguments on a named code block:
+   Multi-line header arguments on a named `src' code block:
 
      #+NAME: named-block
      #+HEADER: :var data=2
@@ -14382,10 +14405,10 @@ backward-compatibility.  It may be removed at some point.
        : data:2
 
 
-File: org,  Node: Header arguments in function calls,  Prev: Code block specific header arguments,  Up: Using header arguments
+File: org,  Node: Arguments in function calls,  Prev: Code block specific header arguments,  Up: Using header arguments
 
-Header arguments in function calls
-..................................
+Arguments in function calls
+...........................
 
 Header arguments in function calls are the most specific and override
 all other settings in case of an overlap.  They get the highest
@@ -14410,35 +14433,29 @@ File: org,  Node: Specific header arguments,  Prev: Using header arguments,  Up:
 
 Org comes with many header arguments common to all languages.  New
 header arguments are added for specific languages as they become
-available for use in source code blocks.  A header argument is
-specified with an initial colon followed by the argument's name in
-lowercase.  Common header arguments are:
+available for use in `src' code blocks.  A header argument is specified
+with an initial colon followed by the argument's name in lowercase.
+Common header arguments are:
 
 * Menu:
 
-* var::                         Pass arguments to code blocks
-* results::                     Specify the type of results and how they will
-                                be collected and handled
-* file::                        Specify a path for file output
+* var::                         Pass arguments to `src' code blocks
+* results::                     Specify results type; how to collect
+* file::                        Specify a path for output file
 * file-desc::                   Specify a description for file results
 * file-ext::                    Specify an extension for file output
-* output-dir::                  Specify a directory to write file output to
-* dir::                         Specify the default (possibly remote)
-                                directory for code block execution
-* exports::                     Export code and/or results
-* tangle::                      Toggle tangling and specify file name
-* mkdirp::                      Toggle creation of parent directories of target
-                                files during tangling
-* comments::                    Toggle insertion of comments in tangled
-                                code files
-* padline::                     Control insertion of padding lines in tangled
-                                code files
-* no-expand::                   Turn off variable assignment and noweb
-                                expansion during tangling
+* output-dir::                  Specify a directory for output file
+* dir::                         Specify the default directory for code block execution
+* exports::                     Specify exporting code, results, both, none
+* tangle::                      Toggle tangling; or specify file name
+* mkdirp::                      Toggle for parent directory creation for target files during tangling
+* comments::                    Toggle insertion of comments in tangled code files
+* padline::                     Control insertion of padding lines in tangled code files
+* no-expand::                   Turn off variable assignment and noweb expansion during tangling
 * session::                     Preserve the state of code evaluation
 * noweb::                       Toggle expansion of noweb references
 * noweb-ref::                   Specify block's noweb reference resolution target
-* noweb-sep::                   String used to separate noweb references
+* noweb-sep::                   String to separate noweb references
 * cache::                       Avoid re-evaluating unchanged code blocks
 * sep::                         Delimiter for writing tabular results outside Org
 * hlines::                      Handle horizontal lines in tables
@@ -14448,9 +14465,9 @@ lowercase.  Common header arguments are:
 * tangle-mode::                 Set permission of tangled files
 * eval::                        Limit evaluation of specific code blocks
 * wrap::                        Mark source block evaluation results
-* post::                        Post processing of code block results
-* prologue::                    Text to prepend to code block body
-* epilogue::                    Text to append to code block body
+* post::                        Post processing of results of code block evaluation
+* prologue::                    Text to prepend to body of code block
+* epilogue::                    Text to append to body of code block
 
    For language-specific header arguments, see *note Languages::.
 
@@ -14460,18 +14477,18 @@ File: org,  Node: var,  Next: results,  Up: Specific header arguments
 14.8.2.1 `:var'
 ...............
 
-Use `:var' for passing arguments to code blocks.  The specifics of
-variables in code blocks vary by the source language and are covered in
-the language-specific documentation.  The syntax for `:var', however,
-is the same for all languages.  This includes when declaring a
-variable, assign a default value.
+Use `:var' for passing arguments to `src' code blocks.  The specifics
+of variables in `src' code blocks vary by the source language and are
+covered in the language-specific documentation.  The syntax for `:var',
+however, is the same for all languages.  This includes declaring a
+variable, and assigning a default value.
 
    Arguments can take values as literals, or as references, or even as
 Emacs Lisp code (*note Emacs Lisp evaluation of variables: var.).
 References are names from the Org file from the lines `#+NAME:' or
-`#+RESULTS:'.  References can refer to tables, lists, `#+BEGIN_EXAMPLE'
-blocks, other types of code blocks, or the results of execution of code
-blocks.
+`#+RESULTS:'.  References can also refer to tables, lists,
+`#+BEGIN_EXAMPLE' blocks, other types of `src' code blocks, or the
+results of execution of `src' code blocks.
 
    For better performance, Org can cache results of evaluations.  But
 caching comes with severe limitations (*note cache::).
@@ -14479,8 +14496,8 @@ caching comes with severe limitations (*note cache::).
    Argument values are indexed like arrays (*note Indexable variable
 values: var.).
 
-   The following syntax is used to pass arguments to code blocks using
-the `:var' header argument.
+   The following syntax is used to pass arguments to `src' code blocks
+using the `:var' header argument.
 
      :var name=assign
 
@@ -14537,9 +14554,10 @@ a code block.
           : 8
 
 "code block with arguments"
-     a code block name, as assigned by `#+NAME:', followed by
+     a `src' code block name, as assigned by `#+NAME:', followed by
      parentheses and optional arguments passed within the parentheses
-     following the code block name using standard function call syntax
+     following the `src' code block name using standard function call
+     syntax
 
           #+NAME: double
           #+BEGIN_SRC emacs-lisp :var input=8
@@ -14582,7 +14600,7 @@ Indexable variable values
 Indexing variable values enables referencing portions of a variable.
 Indexes are 0 based with negative values counting backwards from the
 end.  If an index is separated by `,'s then each subsequent section
-will index into the next dimension.  Note that this indexing occurs
+will index as the next dimension.  Note that this indexing occurs
 _before_ other table-related header arguments are applied, such as
 `:hlines', `:colnames' and `:rownames'.  The following example assigns
 the last cell of the first row the table `example-table' to the variable
@@ -14673,7 +14691,7 @@ file's name could change once the code in the block starts executing.
      #+END_SRC
 
    Note that values read from tables and lists will not be mistakenly
-evaluated as Emacs Lisp, as illustrated in the following example.
+evaluated as Emacs Lisp code, as illustrated in the following example.
 
      #+NAME: table
      | (a b c) |
@@ -14692,19 +14710,20 @@ File: org,  Node: results,  Next: file,  Prev: var,  Up: Specific header argumen
 14.8.2.2 `:results'
 ...................
 
-There are four classes of `:results' header arguments.  Each code block
-can take only one option per class.
+There are four classes of `:results' header arguments.  Each `src' code
+block can take only one option per class.
 
-   * collection for how the results should be collected from the code
-     block
+   * collection for how the results should be collected from the `src'
+     code block
 
-   * type for which type of result the code block will return--affects
+   * type for which type of result the code block will return; affects
      how Org processes and inserts results in the Org buffer
 
-   * format for the result--affects how Org processes and inserts
+   * format for the result; affects how Org processes and inserts
      results in the Org buffer
 
-   * handling for processing results after evaluation of the code block
+   * handling for processing results after evaluation of the `src' code
+     block
 
 Collection
 ..........
@@ -14713,13 +14732,13 @@ Collection options specify the results.  Choose one of the options;
 they are mutually exclusive.
 
    * `value' Default.  Functional mode.  Result is the value returned
-     by the last statement in the code block.  Languages like Python
-     may require an explicit `return' statement in the code block.
-     Usage example: `:results value'.
+     by the last statement in the `src' code block.  Languages like
+     Python may require an explicit `return' statement in the `src'
+     code block.  Usage example: `:results value'.
 
    * `output' Scripting mode.  Result is collected from STDOUT during
-     execution of the code in the code block.  Usage example: `:results
-     output'.
+     execution of the code in the `src' code block.  Usage example:
+     `:results output'.
 
 Type
 ....
@@ -14745,9 +14764,9 @@ default behavior is to automatically determine the result type.
 Format
 ......
 
-Format pertains to the type of the result returned by the code block.
-Choose one of the options; they are mutually exclusive.  The default
-follows the type specified above.
+Format pertains to the type of the result returned by the `src' code
+block.  Choose one of the options; they are mutually exclusive.  The
+default follows from the type specified above.
 
    * `raw' Interpreted as raw Org mode.  Inserted directly into the
      buffer.  Aligned if it is a table.  Usage example: `:results value
@@ -14763,12 +14782,12 @@ follows the type specified above.
    * `latex' Results enclosed in a `BEGIN_EXPORT latex' block.  Usage
      example: `:results value latex'.
 
-   * `code' Result enclosed in a code block.  Useful for parsing.
+   * `code' Result enclosed in a `src' code block.  Useful for parsing.
      Usage example: `:results value code'.
 
    * `pp' Result converted to pretty-print source code.  Enclosed in a
-     code block.  Languages supported: Emacs Lisp, Python, and Ruby.
-     Usage example: `:results value pp'.
+     `src' code block.  Languages supported: Emacs Lisp, Python, and
+     Ruby.  Usage example: `:results value pp'.
 
    * `drawer' Result wrapped in a RESULTS drawer.  Useful for
      containing `raw' or `org' results for later scripting and
@@ -14848,9 +14867,9 @@ File: org,  Node: dir,  Next: exports,  Prev: output-dir,  Up: Specific header a
 ....................................
 
 While the `:file' header argument can be used to specify the path to the
-output file, `:dir' specifies the default directory during code block
-execution.  If it is absent, then the directory associated with the
-current buffer is used.  In other words, supplying `:dir path'
+output file, `:dir' specifies the default directory during `src' code
+block execution.  If it is absent, then the directory associated with
+the current buffer is used.  In other words, supplying `:dir path'
 temporarily has the same effect as changing the current directory with
 `M-x cd path RET', and then not supplying `:dir'.  Under the surface,
 `:dir' simply sets the value of the Emacs variable `default-directory'.
@@ -14868,7 +14887,7 @@ directory (notice tilde is expanded):
 Remote execution
 ................
 
-To evaluate the code block on a remote machine, supply a remote
+To evaluate the `src' code block on a remote machine, supply a remote s
 directory name using `Tramp' syntax.  For example:
 
      #+BEGIN_SRC R :file plot.png :dir /dand@yakuba.princeton.edu:
@@ -14902,7 +14921,7 @@ File: org,  Node: exports,  Next: tangle,  Prev: dir,  Up: Specific header argum
 
 The `:exports' header argument is to specify if that part of the Org
 file is exported to, say, HTML or LaTeX formats.  Note that `:exports'
-affects only source code blocks and not inline code.
+affects only `src' code blocks and not inline code.
 
    * `code' The default.  The body of code is included into the
      exported file.  Example: `:exports code'.
@@ -14923,21 +14942,21 @@ File: org,  Node: tangle,  Next: mkdirp,  Prev: exports,  Up: Specific header ar
 14.8.2.9 `:tangle'
 ..................
 
-The `:tangle' header argument specifies if the code block is exported
-to source file(s).
+The `:tangle' header argument specifies if the `src' code block is
+exported to source file(s).
 
-   * `tangle' Export the code block to source file.  The file name for
-     the source file is derived from the name of the Org file, and the
-     file extension is derived from the source code language
+   * `tangle' Export the `src' code block to source file.  The file
+     name for the source file is derived from the name of the Org file,
+     and the file extension is derived from the source code language
      identifier.  Example: `:tangle yes'.
 
    * `no' The default.  Do not extract the code a source code file.
      Example: `:tangle no'.
 
-   * other Export the code block to source file whose file name is
-     derived from any string passed to the `:tangle' header argument.
-     Org derives the file name as being relative to the directory of
-     the Org file's location.  Example: `:tangle path'.
+   * other Export the `src' code block to source file whose file name
+     is derived from any string passed to the `:tangle' header
+     argument.  Org derives the file name as being relative to the
+     directory of the Org file's location.  Example: `:tangle path'.
 
 
 File: org,  Node: mkdirp,  Next: comments,  Prev: tangle,  Up: Specific header arguments
@@ -14956,13 +14975,14 @@ File: org,  Node: comments,  Next: padline,  Prev: mkdirp,  Up: Specific header
 .....................
 
 Controls inserting comments into tangled files.  These are above and
-beyond whatever comments may already exist in the source code block.
+beyond whatever comments may already exist in the `src' code block.
 
    * `no' The default.  Do not insert any extra comments during
      tangling.
 
-   * `link' Wrap the code block in comments.  Include links pointing
-     back to the place in the Org file from where the code was tangled.
+   * `link' Wrap the `src' code block in comments.  Include links
+     pointing back to the place in the Org file from where the code was
+     tangled.
 
    * `yes' Kept for backward compatibility; same as "link".
 
@@ -14973,7 +14993,8 @@ beyond whatever comments may already exist in the source code block.
    * `both' Includes both "link" and "org" comment options.
 
    * `noweb' Includes "link" comment option, expands noweb references,
-     and wraps them in link comments inside the body of the code block.
+     and wraps them in link comments inside the body of the `src' code
+     block.
 
 
 File: org,  Node: padline,  Next: no-expand,  Prev: comments,  Up: Specific header arguments
@@ -14981,11 +15002,12 @@ File: org,  Node: padline,  Next: no-expand,  Prev: comments,  Up: Specific head
 14.8.2.12 `:padline'
 ....................
 
-Control insertion of newlines to pad code blocks in the tangled file.
-   * `yes' Default.  Insert a newline before and after each code block
-     in the tangled file.
+Control insertion of newlines to pad `src' code blocks in the tangled
+file.
+   * `yes' Default.  Insert a newline before and after each `src' code
+     block in the tangled file.
 
-   * `no' Do not insert newlines to pad the tangled code blocks.
+   * `no' Do not insert newlines to pad the tangled `src' code blocks.
 
 
 File: org,  Node: no-expand,  Next: session,  Prev: padline,  Up: Specific header arguments
@@ -14993,14 +15015,15 @@ File: org,  Node: no-expand,  Next: session,  Prev: padline,  Up: Specific heade
 14.8.2.13 `:no-expand'
 ......................
 
-By default Org expands code blocks during tangling.  The `:no-expand'
-header argument turns off such expansions.  Note that one side-effect of
-expansion by `org-babel-expand-src-block' also assigns values to `:var'
-(*note var::) variables.  Expansions also replace "noweb" references
-with their targets (*note Noweb reference syntax::).  Some of these
-expansions may cause premature assignment, hence this option.  This
-option makes a difference only for tangling.  It has no effect when
-exporting since code blocks for execution have to be expanded anyway.
+By default Org expands `src' code blocks during tangling.  The
+`:no-expand' header argument turns off such expansions.  Note that one
+side-effect of expansion by `org-babel-expand-src-block' also assigns
+values to `:var' (*note var::) variables.  Expansions also replace
+"noweb" references with their targets (*note Noweb reference syntax::).
+Some of these expansions may cause premature assignment, hence this
+option.  This option makes a difference only for tangling.  It has no
+effect when exporting since `src' code blocks for execution have to be
+expanded anyway.
 
 
 File: org,  Node: session,  Next: noweb,  Prev: no-expand,  Up: Specific header arguments
@@ -15009,10 +15032,10 @@ File: org,  Node: session,  Next: noweb,  Prev: no-expand,  Up: Specific header
 ....................
 
 The `:session' header argument is for running multiple source code
-blocks under one session.  Source code blocks with the same session
-name run in the same interpreter process.
+blocks under one session.  Org runs `src' code blocks with the same
+session name in the same interpreter process.
 
-   * `none' Default.  Each source code block gets a new interpreter
+   * `none' Default.  Each `src' code block gets a new interpreter
      process to execute.  The process terminates once the block is
      evaluated.
 
@@ -15040,22 +15063,22 @@ source code blocks are evaluated, tangled, or exported.
      body of the code when evaluating, tangling, or exporting.
 
    * `yes' Expansion of "Noweb" syntax references in the body of the
-     code block when evaluating, tangling, or exporting.
+     `src' code block when evaluating, tangling, or exporting.
 
    * `tangle' Expansion of "Noweb" syntax references in the body of the
-     code block when tangling.  No expansion when evaluating or
+     `src' code block when tangling.  No expansion when evaluating or
      exporting.
 
    * `no-export' Expansion of "Noweb" syntax references in the body of
-     the code block when evaluating or tangling.  No expansion when
-     exporting.
+     the `src' code block when evaluating or tangling.  No expansion
+     when exporting.
 
    * `strip-export' Expansion of "Noweb" syntax references in the body
-     of the code block when expanding prior to evaluating or tangling.
-     Removes "noweb" syntax references when exporting.
+     of the `src' code block when expanding prior to evaluating or
+     tangling.  Removes "noweb" syntax references when exporting.
 
    * `eval' Expansion of "Noweb" syntax references in the body of the
-     code block only before evaluating.
+     `src' code block only before evaluating.
 
 Noweb prefix lines
 ..................
@@ -15065,7 +15088,7 @@ Noweb insertions now honor prefix characters that appear before
 Because the `<<example>>' noweb reference appears behind the SQL comment
 syntax, each line of the expanded noweb reference will be commented.
 
-   This code block:
+   This `src' code block:
 
      -- <<example>>
 
@@ -15142,17 +15165,17 @@ File: org,  Node: cache,  Next: sep,  Prev: noweb-sep,  Up: Specific header argu
 ..................
 
 The `:cache' header argument is for caching results of evaluating code
-blocks.  Caching results can avoid re-evaluating code blocks that have
-not changed since the previous run.  To benefit from the cache and avoid
-redundant evaluations, the source block must have a result already
-present in the buffer, and neither the header arguments (including the
-value of `:var' references) nor the text of the block itself has
-changed since the result was last computed.  This feature greatly helps
-avoid long-running calculations.  For some edge cases, however, the
-cached results may not be reliable.
-
-   The caching feature is best for when `src' blocks are pure
-functions--functions that return the same value for the same input
+blocks.  Caching results can avoid re-evaluating `src' code blocks that
+have not changed since the previous run.  To benefit from the cache and
+avoid redundant evaluations, the source block must have a result
+already present in the buffer, and neither the header arguments
+(including the value of `:var' references) nor the text of the block
+itself has changed since the result was last computed.  This feature
+greatly helps avoid long-running calculations.  For some edge cases,
+however, the cached results may not be reliable.
+
+   The caching feature is best for when `src' blocks are pure functions,
+that is functions that return the same value for the same input
 arguments (*note var::), and that do not have side effects, and do not
 rely on external variables other than the input arguments.  Functions
 that depend on a timer, file system objects, and random number
@@ -15173,12 +15196,12 @@ syntax::).  For reasons why, see
      every time.
 
    * `yes' Whether to run the code or return the cached results is
-     determined by comparing the SHA1 hash value of the combined code
-     block and arguments passed to it.  This hash value is packed on
-     the `#+RESULTS:' line from previous evaluation.  When hash values
-     match, Org does not evaluate the `src' code block.  When hash
-     values mismatch, Org evaluates the `src' code block, inserts the
-     results, recalculates the hash value, and updates `#+RESULTS:'
+     determined by comparing the SHA1 hash value of the combined `src'
+     code block and arguments passed to it.  This hash value is packed
+     on the `#+RESULTS:' line from previous evaluation.  When hash
+     values match, Org does not evaluate the `src' code block.  When
+     hash values mismatch, Org evaluates the `src' code block, inserts
+     the results, recalculates the hash value, and updates `#+RESULTS:'
      line.
 
    In this example, both functions are cached.  But `caller' runs only
@@ -15373,8 +15396,9 @@ argument, Org will automatically set the tangled file to executable
 permissions.  But this can be overridden with custom permissions using
 `tangle-mode' header argument.
 
-   When multiple code blocks tangle to a single file with different and
-conflicting `tangle-mode' header arguments, Org's behavior is undefined.
+   When multiple `src' code blocks tangle to a single file with
+different and conflicting `tangle-mode' header arguments, Org's
+behavior is undefined.
 
 
 File: org,  Node: eval,  Next: wrap,  Prev: tangle-mode,  Up: Specific header arguments
@@ -15383,22 +15407,24 @@ File: org,  Node: eval,  Next: wrap,  Prev: tangle-mode,  Up: Specific header ar
 .................
 
 The `:eval' header argument can limit evaluation of specific code
-blocks.  It is useful for protection against evaluating untrusted code
-blocks by prompting for a confirmation.  This protection is independent
-of the `org-confirm-babel-evaluate' setting.
+blocks.  It is useful for protection against evaluating untrusted `src'
+code blocks by prompting for a confirmation.  This protection is
+independent of the `org-confirm-babel-evaluate' setting.
 
 `never or no'
-     Org will never evaluate this code block.
+     Org will never evaluate this `src' code block.
 
 `query'
-     Org prompts the user for permission to evaluate this code block.
+     Org prompts the user for permission to evaluate this `src' code
+     block.
 
 `never-export or no-export'
-     Org will not evaluate this code block when exporting, yet the user
-     can evaluate this source block interactively.
+     Org will not evaluate this `src' code block when exporting, yet
+     the user can evaluate this source block interactively.
 
 `query-export'
-     Org prompts the user for permission to export this code block.
+     Org prompts the user for permission to export this `src' code
+     block.
 
    If `:eval' header argument is not set for a source block, then Org
 determines whether to evaluate from the `org-confirm-babel-evaluate'
@@ -15423,8 +15449,8 @@ File: org,  Node: post,  Next: prologue,  Prev: wrap,  Up: Specific header argum
 The `:post' header argument is for post-processing results from `src'
 block evaluation.  When `:post' has any value, Org binds the results to
 `*this*' variable for easy passing to *note var:: header argument
-specifications.  That makes results available to other code blocks, or
-for even direct Emacs Lisp code execution.
+specifications.  That makes results available to other `src' code
+blocks, or for even direct Emacs Lisp code execution.
 
    The following two examples illustrate `:post' header argument in
 action.  The first one shows how to attach `#+ATTR_LATEX:' line using
@@ -15662,50 +15688,28 @@ context.
 
    Active key bindings in Org mode buffer:
 
-`C-c C-v p'   or   `C-c C-v      `org-babel-previous-src-block'
-C-p'                             
-`C-c C-v n'   or   `C-c C-v      `org-babel-next-src-block'
-C-n'                             
-`C-c C-v e'   or   `C-c C-v      `org-babel-execute-maybe'
-C-e'                             
-`C-c C-v o'   or   `C-c C-v      `org-babel-open-src-block-result'
-C-o'                             
-`C-c C-v v'   or   `C-c C-v      `org-babel-expand-src-block'
-C-v'                             
-`C-c C-v u'   or   `C-c C-v      `org-babel-goto-src-block-head'
-C-u'                             
-`C-c C-v g'   or   `C-c C-v      `org-babel-goto-named-src-block'
-C-g'                             
-`C-c C-v r'   or   `C-c C-v      `org-babel-goto-named-result'
-C-r'                             
-`C-c C-v b'   or   `C-c C-v      `org-babel-execute-buffer'
-C-b'                             
-`C-c C-v s'   or   `C-c C-v      `org-babel-execute-subtree'
-C-s'                             
-`C-c C-v d'   or   `C-c C-v      `org-babel-demarcate-block'
-C-d'                             
-`C-c C-v t'   or   `C-c C-v      `org-babel-tangle'
-C-t'                             
-`C-c C-v f'   or   `C-c C-v      `org-babel-tangle-file'
-C-f'                             
-`C-c C-v c'   or   `C-c C-v      `org-babel-check-src-block'
-C-c'                             
-`C-c C-v j'   or   `C-c C-v      `org-babel-insert-header-arg'
-C-j'                             
-`C-c C-v l'   or   `C-c C-v      `org-babel-load-in-session'
-C-l'                             
-`C-c C-v i'   or   `C-c C-v      `org-babel-lob-ingest'
-C-i'                             
-`C-c C-v I'   or   `C-c C-v      `org-babel-view-src-block-info'
-C-I'                             
-`C-c C-v z'   or   `C-c C-v      `org-babel-switch-to-session-with-code'
-C-z'                             
-`C-c C-v a'   or   `C-c C-v      `org-babel-sha1-hash'
-C-a'                             
-`C-c C-v h'   or   `C-c C-v      `org-babel-describe-bindings'
-C-h'                             
-`C-c C-v x'   or   `C-c C-v      `org-babel-do-key-sequence-in-edit-buffer'
-C-x'                             
+`C-c C-v p'   or   `C-c C-v C-p'     `org-babel-previous-src-block'
+`C-c C-v n'   or   `C-c C-v C-n'     `org-babel-next-src-block'
+`C-c C-v e'   or   `C-c C-v C-e'     `org-babel-execute-maybe'
+`C-c C-v o'   or   `C-c C-v C-o'     `org-babel-open-src-block-result'
+`C-c C-v v'   or   `C-c C-v C-v'     `org-babel-expand-src-block'
+`C-c C-v u'   or   `C-c C-v C-u'     `org-babel-goto-src-block-head'
+`C-c C-v g'   or   `C-c C-v C-g'     `org-babel-goto-named-src-block'
+`C-c C-v r'   or   `C-c C-v C-r'     `org-babel-goto-named-result'
+`C-c C-v b'   or   `C-c C-v C-b'     `org-babel-execute-buffer'
+`C-c C-v s'   or   `C-c C-v C-s'     `org-babel-execute-subtree'
+`C-c C-v d'   or   `C-c C-v C-d'     `org-babel-demarcate-block'
+`C-c C-v t'   or   `C-c C-v C-t'     `org-babel-tangle'
+`C-c C-v f'   or   `C-c C-v C-f'     `org-babel-tangle-file'
+`C-c C-v c'   or   `C-c C-v C-c'     `org-babel-check-src-block'
+`C-c C-v j'   or   `C-c C-v C-j'     `org-babel-insert-header-arg'
+`C-c C-v l'   or   `C-c C-v C-l'     `org-babel-load-in-session'
+`C-c C-v i'   or   `C-c C-v C-i'     `org-babel-lob-ingest'
+`C-c C-v I'   or   `C-c C-v C-I'     `org-babel-view-src-block-info'
+`C-c C-v z'   or   `C-c C-v C-z'     `org-babel-switch-to-session-with-code'
+`C-c C-v a'   or   `C-c C-v C-a'     `org-babel-sha1-hash'
+`C-c C-v h'   or   `C-c C-v C-h'     `org-babel-describe-bindings'
+`C-c C-v x'   or   `C-c C-v C-x'     `org-babel-do-key-sequence-in-edit-buffer'
 
 
 File: org,  Node: Batch execution,  Prev: Key bindings and useful functions,  Up: Working with source code
@@ -15750,16 +15754,16 @@ File: org,  Node: Miscellaneous,  Next: Hacking,  Prev: Working with source code
 
 * Menu:
 
-* Completion::                  M-TAB knows what you need
+* Completion::                  M-TAB guesses completions
 * Easy templates::              Quick insertion of structural elements
 * Speed keys::                  Electric commands at the beginning of a headline
 * Code evaluation security::    Org mode files evaluate inline code
-* Customization::               Adapting Org to your taste
+* Customization::               Adapting Org to changing tastes
 * In-buffer settings::          Overview of the #+KEYWORDS
 * The very busy C-c C-c key::   When in doubt, press C-c C-c
 * Clean view::                  Getting rid of leading stars in the outline
 * TTY keys::                    Using Org on a tty
-* Interaction::                 Other Emacs packages
+* Interaction::                 With other Emacs packages
 * org-crypt::                   Encrypting Org files
 
 
@@ -15768,9 +15772,14 @@ File: org,  Node: Completion,  Next: Easy templates,  Up: Miscellaneous
 15.1 Completion
 ===============
 
-Org supports in-buffer completion.  This type of completion does not
-make use of the minibuffer.  You simply type a few letters into the
-buffer and use the key to complete text right there.
+Org has in-buffer completions.  Unlike minibuffer completions, which are
+useful for quick command interactions, Org's in-buffer completions are
+more suitable for content creation in Org documents.  Type one or more
+letters and invoke the hot key to complete the text in-place.
+Depending on the context and the keys, Org will offer different types
+of completions.  No minibuffer is involved.  Such mode-specific hot
+keys have become an integral part of Emacs and Org provides several
+shortcuts.
 
 `M-<TAB>'
      Complete word at point
@@ -15796,14 +15805,14 @@ buffer and use the key to complete text right there.
           abbreviations::).
 
         * After `#+', complete the special keywords like `TYP_TODO' or
-          `OPTIONS' which set file-specific options for Org mode.  When
-          the option keyword is already complete, pressing `M-<TAB>'
-          again will insert example settings for this keyword.
+          file-specific `OPTIONS'.  After option keyword is complete,
+          pressing `M-<TAB>' again will insert example settings for
+          that option.
 
-        * In the line after `#+STARTUP: ', complete startup keywords,
-          i.e., valid keys for this line.
+        * After `#+STARTUP: ', complete startup keywords.
 
-        * Elsewhere, complete dictionary words using Ispell.
+        * When the point is anywhere else, complete dictionary words
+          using Ispell.
 
 
 File: org,  Node: Easy templates,  Next: Speed keys,  Prev: Completion,  Up: Miscellaneous
@@ -15811,17 +15820,23 @@ File: org,  Node: Easy templates,  Next: Speed keys,  Prev: Completion,  Up: Mis
 15.2 Easy templates
 ===================
 
-Org mode supports insertion of empty structural elements (like
-`#+BEGIN_SRC' and `#+END_SRC' pairs) with just a few key strokes.  This
-is achieved through a native template expansion mechanism.  Note that
-Emacs has several other template mechanisms which could be used in a
-similar way, for example `yasnippet'.
+With just a few keystrokes, Org's easy templates inserts empty pairs of
+structural elements, such as `#+BEGIN_SRC' and `#+END_SRC'.  Easy
+templates use an expansion mechanism, which is native to Org, in a
+process similar to `yasnippet' and other Emacs template expansion
+packages.
 
-   To insert a structural element, type a `<', followed by a template
-selector and `<TAB>'.  Completion takes effect only when the above
-keystrokes are typed on a line by itself.
+   `<<>' `<s>' `<TAB>' completes the `src' code block.
 
-   The following template selectors are currently supported.
+   `<' `l' `<TAB>'
+
+   expands to:
+
+   #+BEGIN_EXPORT latex
+
+   #+END_EXPORT
+
+   Org comes with these pre-defined easy templates:
 
 `s'     `#+BEGIN_SRC ... #+END_SRC'
 `e'     `#+BEGIN_EXAMPLE ... #+END_EXAMPLE'
@@ -15837,12 +15852,8 @@ keystrokes are typed on a line by itself.
 `i'     `#+INDEX:' line
 `I'     `#+INCLUDE:' line
 
-   For example, on an empty line, typing "<e" and then pressing TAB,
-will expand into a complete EXAMPLE template.
-
-   You can install additional templates by customizing the variable
-`org-structure-template-alist'.  See the docstring of the variable for
-additional details.
+   More templates can added by customizing the variable
+`org-structure-template-alist', whose docstring has additional details.
 
 
 File: org,  Node: Speed keys,  Next: Code evaluation security,  Prev: Easy templates,  Up: Miscellaneous
@@ -15850,17 +15861,23 @@ File: org,  Node: Speed keys,  Next: Code evaluation security,  Prev: Easy templ
 15.3 Speed keys
 ===============
 
-Single keys can be made to execute commands when the cursor is at the
-beginning of a headline, i.e., before the first star.  Configure the
-variable `org-use-speed-commands' to activate this feature.  There is a
-pre-defined list of commands, and you can add more such commands using
-the variable `org-speed-commands-user'.  Speed keys not only speed up
-navigation and other commands, but they also provide an alternative way
-to execute commands bound to keys that are not or not easily available
-on a TTY, or on a small mobile device with a limited keyboard.
+Single keystrokes can execute custom commands in an Org file when the
+cursor is on a headline.  Without the extra burden of a meta or
+modifier key, Speed Keys can speed navigation or execute custom
+commands.  Besides faster navigation, Speed Keys may come in handy on
+small mobile devices that do not have full keyboards.  Speed Keys may
+also work on TTY devices known for their problems when entering Emacs
+keychords.
 
-   To see which commands are available, activate the feature and press
-`?' with the cursor at the beginning of a headline.
+   By default, Org has Speed Keys disabled.  To activate Speed Keys,
+configure the variable `org-use-speed-commands'.  To trigger a Speed
+Key, the cursor must be at the beginning of an Org headline, before any
+of the stars.
+
+   Org comes with a pre-defined list of Speed Keys; `?' shows currently
+active Speed Keys.  To add or modify Speed Keys, customize the variable,
+`org-speed-commands-user'.  For more details, see the variable's
+docstring.
 
 
 File: org,  Node: Code evaluation security,  Next: Customization,  Prev: Speed keys,  Up: Miscellaneous
@@ -15868,62 +15885,59 @@ File: org,  Node: Code evaluation security,  Next: Customization,  Prev: Speed k
 15.4 Code evaluation and security issues
 ========================================
 
-Org provides tools to work with code snippets, including evaluating
-them.
-
-   Running code on your machine always comes with a security risk.
-Badly written or malicious code can be executed on purpose or by
-accident.  Org has default settings which will only evaluate such code
-if you give explicit permission to do so, and as a casual user of these
-features you should leave these precautions intact.
+Unlike plain text, running code comes with risk.  Each `src' code block,
+in terms of risk, is equivalent to an executable file.  Org therefore
+puts a few confirmation prompts by default.  This is to alert the
+casual user from accidentally running untrusted code.
 
-   For people who regularly work with such code, the confirmation
-prompts can become annoying, and you might want to turn them off.  This
-can be done, but you must be aware of the risks that are involved.
+   For users who do not run code blocks or write code regularly, Org's
+default settings should suffice.  However, some users may want to tweak
+the prompts for fewer interruptions.  To weigh the risks of automatic
+execution of code blocks, here are some details about code evaluation.
 
-   Code evaluation can happen under the following circumstances:
+   Org evaluates code in the following circumstances:
 
 Source code blocks
-     Source code blocks can be evaluated during export, or when
-     pressing `C-c C-c' in the block.  The most important thing to
-     realize here is that Org mode files which contain code snippets
-     are, in a certain sense, like executable files.  So you should
-     accept them and load them into Emacs only from trusted
-     sources--just like you would do with a program you install on your
-     computer.
-
-     Make sure you know what you are doing before customizing the
-     variables which take off the default security brakes.
+     Org evaluates `src' code blocks in an Org file during export.  Org
+     also evaluates a `src' code block with the `C-c C-c' key chord.
+     Users exporting or running code blocks must load files only from
+     trusted sources.  Be weary of customizing variables that remove or
+     alter default security measures.
 
       -- User Option: org-confirm-babel-evaluate
-          When t (the default), the user is asked before every code
-          block evaluation.  When `nil', the user is not asked.  When
-          set to a function, it is called with two arguments (language
-          and body of the code block) and should return t to ask and
-          `nil' not to ask.
-
-     For example, here is how to execute "ditaa" code (which is
-     considered safe) without asking:
+          When `t', Org prompts the user for confirmation before
+          executing each code block.  When `nil', Org executes code
+          blocks without prompting the user for confirmation.  When
+          this option is set to a custom function, Org invokes the
+          function with these two arguments: the source code language
+          and the body of the code block.  The custom function must
+          return either a `t' or `nil', which determines if the user is
+          prompted.  Each source code language can be handled
+          separately through this function argument.
+
+     For example, this function enables execution of `ditaa' code
+     +blocks without prompting:
 
           (defun my-org-confirm-babel-evaluate (lang body)
             (not (string= lang "ditaa")))  ; don't ask for ditaa
           (setq org-confirm-babel-evaluate 'my-org-confirm-babel-evaluate)
 
 Following `shell' and `elisp' links
-     Org has two link types that can directly evaluate code (*note
-     External links::).  These links can be problematic because the
-     code to be evaluated is not visible.
+     Org has two link types that can also directly evaluate code (*note
+     External links::).  Because such code is not visible, these links
+     have a potential risk.  Org therefore prompts the user when it
+     encounters such links.  The customization variables are:
 
       -- User Option: org-confirm-shell-link-function
-          Function to queries user about shell link execution.
+          Function that prompts the user before executing a shell link.
 
       -- User Option: org-confirm-elisp-link-function
-          Functions to query user for Emacs Lisp link execution.
+          Function that prompts the user before executing an Emacs Lisp
+          link.
 
 Formulas in tables
-     Formulas in tables (*note The spreadsheet::) are code that is
-     evaluated either by the calc interpreter, or by the Emacs Lisp
-     interpreter.
+     Org executes formulas in tables (*note The spreadsheet::) either
+     through the _calc_ or the _Emacs Lisp_ interpreters.
 
 
 File: org,  Node: Customization,  Next: In-buffer settings,  Prev: Code evaluation security,  Up: Miscellaneous
@@ -15931,13 +15945,10 @@ File: org,  Node: Customization,  Next: In-buffer settings,  Prev: Code evaluati
 15.5 Customization
 ==================
 
-There are more than 500 variables that can be used to customize Org.
-For the sake of compactness of the manual, I am not describing the
-variables here.  A structured overview of customization variables is
-available with `M-x org-customize RET'.  Or select `Browse Org Group'
-from the `Org->Customization' menu.  Many settings can also be
-activated on a per-file basis, by putting special lines into the buffer
-(*note In-buffer settings::).
+Org has more than 500 variables for customization.  They can be accessed
+through the usual `M-x org-customize RET' command.  Or through the Org
+menu, `Org->Customization->Browse Org Group'.  Org also has per-file
+settings for some variables (*note In-buffer settings::).
 
 
 File: org,  Node: In-buffer settings,  Next: The very busy C-c C-c key,  Prev: Customization,  Up: Miscellaneous
@@ -15945,46 +15956,43 @@ File: org,  Node: In-buffer settings,  Next: The very busy C-c C-c key,  Prev: C
 15.6 Summary of in-buffer settings
 ==================================
 
-Org mode uses special lines in the buffer to define settings on a
-per-file basis.  These lines start with a `#+' followed by a keyword, a
-colon, and then individual words defining a setting.  Several setting
-words can be in the same line, but you can also have multiple lines for
-the keyword.  While these settings are described throughout the manual,
-here is a summary.  After changing any of these lines in the buffer,
-press `C-c C-c' with the cursor still in the line to activate the
-changes immediately.  Otherwise they become effective only when the
-file is visited again in a new Emacs session.
+In-buffer settings start with `#+', followed by a keyword, a colon, and
+then a word for each setting.  Org accepts multiple settings on the same
+line.  Org also accepts multiple lines for a keyword.  This manual
+describes these settings throughout.  A summary follows here.
+
+   `C-c C-c' activates any changes to the in-buffer settings.  Closing
+and reopening the Org file in Emacs also activates the changes.
 
 `#+ARCHIVE: %s_done::'
-     This line sets the archive location for the agenda file.  It
-     applies for all subsequent lines until the next `#+ARCHIVE' line,
-     or the end of the file.  The first such line also applies to any
-     entries before it.  The corresponding variable is
+     Sets the archive location of the agenda file.  This location
+     applies to the lines until the next `#+ARCHIVE' line, if any, in
+     the Org file.  The first archive location in the Org file also
+     applies to any entries before it.  The corresponding variable is
      `org-archive-location'.
 
 `#+CATEGORY:'
-     This line sets the category for the agenda file.  The category
-     applies to the whole document.
+     Sets the category of the agenda file, which applies to the entire
+     document.
 
 `#+COLUMNS: %25ITEM ...'
-     Set the default format for columns view.  This format applies when
-     columns view is invoked in locations where no `COLUMNS' property
-     applies.
+     Sets the default format for columns view.  Org uses this format
+     for column views where there is no `COLUMNS' property.
 
 `#+CONSTANTS: name1=value1 ...'
-     Set file-local values for constants to be used in table formulas.
+     Set file-local values for constants that table formulas can use.
      This line sets the local variable
      `org-table-formula-constants-local'.  The global version of this
      variable is `org-table-formula-constants'.
 
 `#+FILETAGS: :tag1:tag2:tag3:'
-     Set tags that can be inherited by any entry in the file, including
-     the top-level entries.
+     Set tags that all entries in the file will inherit from here,
+     including the top-level entries.
 
 `#+LINK: linkword replace'
-     These lines (several are allowed) specify link abbreviations.
-     *Note Link abbreviations::.  The corresponding variable is
-     `org-link-abbrev-alist'.
+     Each line specifies one abbreviation for one link.  Use multiple
+     `#+LINK:' lines for more, *note Link abbreviations::.  The
+     corresponding variable is `org-link-abbrev-alist'.
 
 `#+PRIORITIES: highest lowest default'
      This line sets the limits and the default for the priorities.  All
@@ -15997,23 +16005,22 @@ file is visited again in a new Emacs session.
      property.  
 
 `#+SETUPFILE: file'
-     This line defines a file that holds more in-buffer setup.
-     Normally this is entirely ignored.  Only when the buffer is parsed
-     for option-setting lines (i.e., when starting Org mode for a file,
-     when pressing `C-c C-c' in a settings line, or when exporting),
-     then the contents of this file are parsed as if they had been
-     included in the buffer.  In particular, the file can be any other
-     Org mode file with internal setup.  You can visit the file the
-     cursor is in the line with `C-c ''.
+     The setup file is for additional in-buffer settings.  Org loads
+     this file and parses it for any settings in it only when Org opens
+     the main file.  `C-c C-c' on the settings line will also parse and
+     load.  Org also parses and loads the file during normal exporting
+     process.  Org parses the contents of this file as if it was
+     included in the buffer.  It can be another Org file.  To visit the
+     file, `C-c '' while the cursor is on the line with the file name.
 
 `#+STARTUP:'
-     This line sets options to be used at startup of Org mode, when an
-     Org file is being visited.
+     Startup options Org uses when first visiting a file.
 
      The first set of options deals with the initial visibility of the
      outline tree.  The corresponding variable for global default
-     settings is `org-startup-folded', with a default value `t', which
-     means `overview'.  
+     settings is `org-startup-folded' with a default value of `t',
+     which is the same as `overview'.
+
           overview         top-level headlines only
           content          all headlines
           showall          no folding of any entries
@@ -16024,24 +16031,23 @@ file is visited again in a new Emacs session.
           indent     start with `org-indent-mode' turned on
           noindent   start with `org-indent-mode' turned off
 
-     Then there are options for aligning tables upon visiting a file.
-     This is useful in files containing narrowed table columns.  The
-     corresponding variable is `org-startup-align-all-tables', with a
-     default value `nil'.  
+     Aligns tables consistently upon visiting a file; useful for
+     restoring narrowed table columns.  The corresponding variable is
+     `org-startup-align-all-tables' with `nil' as default value.
+
           align      align all tables
           noalign    don't align tables on startup
 
-     When visiting a file, inline images can be automatically
-     displayed.  The corresponding variable is
-     `org-startup-with-inline-images', with a default value `nil' to
-     avoid delays when visiting a file.  
+     Whether Org should automatically display inline images.  The
+     corresponding variable is `org-startup-with-inline-images', with a
+     default value `nil' to avoid delays when visiting a file.  
           inlineimages   show inline images
           noinlineimages don't show inline images on startup
 
-     When visiting a file, LaTeX fragments can be converted to images
-     automatically.  The variable `org-startup-with-latex-preview' which
-     controls this behavior, is set to `nil' by default to avoid delays
-     on startup.  
+     Whether Org should automatically convert LaTeX fragments to
+     images.  The variable `org-startup-with-latex-preview', which
+     controls this setting, is set to `nil' by default to avoid startup
+     delays.  
           latexpreview   preview LaTeX fragments
           nolatexpreview don't preview LaTeX fragments
 
@@ -16070,16 +16076,16 @@ file is visited again in a new Emacs session.
           logstatesreversed   reverse the order of states notes
           nologstatesreversed do not reverse the order of states notes
 
-     Here are the options for hiding leading stars in outline headings,
-     and for indenting outlines.  The corresponding variables are
+     These options hide leading stars in outline headings, and indent
+     outlines.  The corresponding variables are
      `org-hide-leading-stars' and `org-odd-levels-only', both with a
-     default setting `nil' (meaning `showstars' and `oddeven').  
-          hidestars  make all but one of the stars starting a headline invisible.
-          showstars  show all stars starting a headline
-          indent     virtual indentation according to outline level
-          noindent   no virtual indentation according to outline level
-          odd        allow only odd outline levels (1,3,...)
-          oddeven    allow all outline levels
+     default setting of `nil' (meaning `showstars' and `oddeven').  
+          hidestars  hide all stars on the headline except one.
+          showstars  show all stars on the headline
+          indent     virtual indents according to the outline level
+          noindent   no virtual indents
+          odd        show odd outline levels only (1,3,...)
+          oddeven    show all outline levels
 
      To turn on custom format overlays over timestamps (variables
      `org-put-time-stamp-overlays' and
@@ -16091,7 +16097,7 @@ file is visited again in a new Emacs session.
           constcgs   `constants.el' should use the c-g-s unit system
           constSI    `constants.el' should use the SI unit system
 
-     To influence footnote settings, use the following keywords.  The
+     For footnote settings, use the following keywords.  The
      corresponding variables are `org-footnote-define-inline',
      `org-footnote-auto-label', and `org-footnote-auto-adjust'.  
           fninline    define footnotes inline
@@ -16115,18 +16121,16 @@ file is visited again in a new Emacs session.
           entitiesplain   Leave entities plain
 
 `#+TAGS:  TAG1(c1) TAG2(c2)'
-     These lines (several such lines are allowed) specify the valid
-     tags in this file, and (potentially) the corresponding _fast tag
+     These lines specify valid tags for this file.  Org accepts
+     multiple tags lines.  Tags could correspond to the _fast tag
      selection_ keys.  The corresponding variable is `org-tag-alist'.  
 
 `#+TBLFM:'
-     This line contains the formulas for the table directly above the
-     line.
-
-     Table can have multiple lines containing `#+TBLFM:'.  Note that
-     only the first line of `#+TBLFM:' will be applied when you
-     recalculate the table.  For more details see *note Using multiple
-     #+TBLFM lines:: in *note Editing and debugging formulas::.
+     This line is for formulas for the table directly above.  A table
+     can have multiple `#+TBLFM:' lines.  On table recalculation, Org
+     applies only the first `#+TBLFM:' line.  For details see *note
+     Using multiple #+TBLFM lines:: in *note Editing and debugging
+     formulas::.
 
 `#+TITLE:, #+AUTHOR:, #+EMAIL:, #+LANGUAGE:, #+DATE:,'
 `#+OPTIONS:, #+BIND:,'
@@ -16135,7 +16139,7 @@ file is visited again in a new Emacs session.
      details see *note Export settings::.
 
 `#+TODO:    #+SEQ_TODO:   #+TYP_TODO:'
-     These lines set the TODO keywords and their interpretation in the
+     These lines set the TODO keywords and their significance to the
      current file.  The corresponding variable is `org-todo-keywords'.
 
 
@@ -16144,34 +16148,31 @@ File: org,  Node: The very busy C-c C-c key,  Next: Clean view,  Prev: In-buffer
 15.7 The very busy C-c C-c key
 ==============================
 
-The key `C-c C-c' has many purposes in Org, which are all mentioned
-scattered throughout this manual.  One specific function of this key is
-to add _tags_ to a headline (*note Tags::).  In many other
-circumstances it means something like _"Hey Org, look here and update
-according to what you see here"_.  Here is a summary of what this means
-in different contexts.
+The `C-c C-c' key in Org serves many purposes depending on the context.
+It is probably the most over-worked, multi-purpose key combination in
+Org.  Its uses are well-documented through out this manual, but here is
+a consolidated list for easy reference.
 
-   - If there are highlights in the buffer from the creation of a sparse
-     tree, or from clock display, remove these highlights.
+   - If any highlights shown in the buffer from the creation of a
+     sparse tree, or from clock display, remove such highlights.
 
-   - If the cursor is in one of the special `#+KEYWORD' lines, this
-     triggers scanning the buffer for these lines and updating the
-     information.
+   - If the cursor is in one of the special `#+KEYWORD' lines, scan the
+     buffer for these lines and update the information.
 
-   - If the cursor is inside a table, realign the table.  This command
-     works even if the automatic table editor has been turned off.
+   - If the cursor is inside a table, realign the table.  The table
+     realigns even if automatic table editor is turned off.
 
    - If the cursor is on a `#+TBLFM' line, re-apply the formulas to the
      entire table.
 
    - If the current buffer is a capture buffer, close the note and file
-     it.  With a prefix argument, also jump to the target location upon
-     storing the note.
+     it.  With a prefix argument, also jump to the target location
+     after saving the note.
 
    - If the cursor is on a `<<<target>>>', update radio targets and
      corresponding links in this buffer.
 
-   - If the cursor is in a property line or at the start or end of a
+   - If the cursor is on a property line or at the start or end of a
      property drawer, offer property commands.
 
    - If the cursor is at a footnote reference, go to the corresponding
@@ -16196,12 +16197,11 @@ File: org,  Node: Clean view,  Next: TTY keys,  Prev: The very busy C-c C-c key,
 15.8 A cleaner outline view
 ===========================
 
-Some people find it noisy and distracting that the Org headlines start
-with a potentially large number of stars, and that text below the
-headlines is not indented.  While this is no problem when writing a
-_book-like_ document where the outline headings are really section
-headings, in a more _list-oriented_ outline, indented structure is a
-lot cleaner:
+Org's default outline with stars and no indents can become too
+cluttered for short documents.  For _book-like_ long documents, the
+effect is not as noticeable.  Org provides an alternate stars and
+indentation scheme, as shown on the right in the following table.  It
+uses only one star and indents text to line with the heading:
 
      * Top level headline             |    * Top level headline
      ** Second level                  |      * Second level
@@ -16211,90 +16211,84 @@ lot cleaner:
      more text                        |          more text
      * Another top level headline     |    * Another top level headline
 
-This kind of view can be achieved dynamically at display time using
-`org-indent-mode'.  In this minor mode, all lines are prefixed for
-display with the necessary amount of space(1).  Also headlines are
-prefixed with additional stars, so that the amount of indentation
-shifts by two(2) spaces per level.  All headline stars but the last one
-are made invisible using the `org-hide' face(3); see below under `2.'
-for more information on how this works.  You can turn on
-`org-indent-mode' for all files by customizing the variable
-`org-startup-indented', or you can turn it on for individual files using
+To turn this mode on, use the minor mode, `org-indent-mode'.  Text lines
+that are not headlines are prefixed with spaces to vertically align
+with the headline text(1).
+
+   To make more horizontal space, the headlines are shifted by two
+stars.  This can be configured by the
+`org-indent-indentation-per-level' variable.  Only one star on each
+headline is visible, the rest are masked with the same font color as
+the background.  This font face can be configured with the `org-hide'
+variable.
+
+   Note that turning on `org-indent-mode' sets `org-hide-leading-stars'
+to `t' and `org-adapt-indentation' to `nil'; `2.' below shows how this
+works.
+
+   To globally turn on `org-indent-mode' for all files, customize the
+variable `org-startup-indented'.
+
+   To turn on indenting for individual files, use `#+STARTUP' option as
+follows:
 
      #+STARTUP: indent
 
-   If you want a similar effect in an earlier version of Emacs and/or
-Org, or if you want the indentation to be hard space characters so that
-the plain text file looks as similar as possible to the Emacs display,
-Org supports you in the following way:
+   Indent on startup makes Org use hard spaces to align text with
+headings as shown in examples below.
 
   1. _Indentation of text below headlines_
-     You may indent text below each headline to make the left boundary
-     line up with the headline, like
+     Indent text to align with the headline.
 
           *** 3rd level
               more text, now indented
 
-     Org supports this with paragraph filling, line wrapping, and
-     structure editing(4), preserving or adapting the indentation as
-     appropriate.
+     Org adapts indentations with paragraph filling, line wrapping, and
+     structure editing(2).
 
   2. _Hiding leading stars_
-     You can modify the display in such a way that all leading stars
-     become invisible.  To do this in a global way, configure the
-     variable `org-hide-leading-stars' or change this on a per-file
-     basis with
+     Org can make leading stars invisible.  For global preference,
+     configure the variable `org-hide-leading-stars'.  For per-file
+     preference, use these file `#+STARTUP' options:
 
           #+STARTUP: hidestars
           #+STARTUP: showstars
 
-     With hidden stars, the tree becomes:
+     With stars hidden, the tree is shown as:
 
           * Top level headline
            * Second level
             * 3rd level
             ...
 
-     The leading stars are not truly replaced by whitespace, they are
-     only fontified with the face `org-hide' that uses the background
-     color as font color.  If you are not using either white or black
-     background, you may have to customize this face to get the wanted
-     effect.  Another possibility is to set this font such that the
-     extra stars are almost invisible, for example using the color
-     `grey90' on a white background.
-
-  3. Things become cleaner still if you skip all the even levels and
-     use only odd levels 1, 3, 5..., effectively adding two stars to go
-     from one outline level to the next(5).  In this way we get the
-     outline view shown at the beginning of this section.  In order to
-     make the structure editing and export commands handle this
-     convention correctly, configure the variable
-     `org-odd-levels-only', or set this on a per-file basis with one of
-     the following lines:
+     Because Org makes the font color same as the background color to
+     hide to stars, sometimes `org-hide' face may need tweaking to get
+     the effect right.  For some black and white combinations, `grey90'
+     on a white background might mask the stars better.
+
+  3. Using stars for only odd levels, 1, 3, 5, ..., can also clean up
+     the clutter.  This removes two stars from each level(3).  For Org
+     to properly handle this cleaner structure during edits and
+     exports, configure the variable `org-odd-levels-only'.  To set
+     this per-file, use either one of the following lines:
 
           #+STARTUP: odd
           #+STARTUP: oddeven
 
-     You can convert an Org file from single-star-per-level to the
-     double-star-per-level convention with `M-x
-     org-convert-to-odd-levels RET' in that file.  The reverse
-     operation is `M-x org-convert-to-oddeven-levels'.
+     To switch between single and double stars layouts, use `M-x
+     org-convert-to-odd-levels RET' and `M-x
+     org-convert-to-oddeven-levels'.
 
    ---------- Footnotes ----------
 
-   (1) `org-indent-mode' also sets the `wrap-prefix' property, such
-that `visual-line-mode' (or purely setting `word-wrap') wraps long
-lines (including headlines) correctly indented.
-
-   (2) See the variable `org-indent-indentation-per-level'.
+   (1) The `org-indent-mode' also sets the `wrap-prefix' correctly for
+indenting and wrapping long lines of headlines or text.  This minor
+mode handles `visual-line-mode' and directly applied settings through
+`word-wrap'.
 
-   (3) Turning on `org-indent-mode' sets `org-hide-leading-stars' to
-`t' and `org-adapt-indentation' to `nil'.
+   (2) Also see the variable `org-adapt-indentation'.
 
-   (4) See also the variable `org-adapt-indentation'.
-
-   (5) When you need to specify a level for a property search or refile
-targets, `LEVEL=2' will correspond to 3 stars, etc.
+   (3) Because `LEVEL=2' has 3 stars, `LEVEL=3' has 4 stars, and so on
 
 
 File: org,  Node: TTY keys,  Next: Interaction,  Prev: Clean view,  Up: Miscellaneous
@@ -16302,17 +16296,12 @@ File: org,  Node: TTY keys,  Next: Interaction,  Prev: Clean view,  Up: Miscella
 15.9 Using Org on a tty
 =======================
 
-Because Org contains a large number of commands, by default many of
-Org's core commands are bound to keys that are generally not accessible
-on a tty, such as the cursor keys (<left>, <right>, <up>, <down>),
-<TAB> and <RET>, in particular when used together with modifiers like
-<Meta> and/or <Shift>.  To access these commands on a tty when special
-keys are unavailable, the following alternative bindings can be used.
-The tty bindings below will likely be more cumbersome; you may find for
-some of the bindings below that a customized workaround suits you
-better.  For example, changing a timestamp is really only fun with
-`S-<cursor>' keys, whereas on a tty you would rather use `C-c .' to
-re-insert the timestamp.
+Org provides alternative key bindings for TTY and modern mobile devices
+that cannot handle cursor keys and complex modifier key chords.  Some
+of these workarounds may be more cumbersome than necessary.  Users
+should look into customizing these further based on their usage needs.
+For example, the normal `S-<cursor>' for editing timestamp might be
+better with `C-c .' chord.
 
 Default     Alternative 1  Speed   Alternative 2
                            key     
@@ -16344,8 +16333,8 @@ File: org,  Node: Interaction,  Next: org-crypt,  Prev: TTY keys,  Up: Miscellan
 15.10 Interaction with other packages
 =====================================
 
-Org lives in the world of GNU Emacs and interacts in various ways with
-other code out there.
+Org's compatibility and the level of interaction with other Emacs
+packages are documented here.
 
 * Menu:
 
@@ -16359,53 +16348,47 @@ File: org,  Node: Cooperation,  Next: Conflicts,  Up: Interaction
 -----------------------------------------
 
 `calc.el' by Dave Gillespie
-     Org uses the Calc package for implementing spreadsheet
-     functionality in its tables (*note The spreadsheet::).  Another
-     possibility for interaction between the two packages is using Calc
-     for embedded calculations.  *Note Embedded Mode: (calc)Embedded
-     Mode.
+     Org uses the Calc package for tables to implement spreadsheet
+     functionality (*note The spreadsheet::).  Org also uses Calc for
+     embedded calculations.  *Note Embedded Mode: (calc)Embedded Mode.
 
 `constants.el' by Carsten Dominik
-     In a table formula (*note The spreadsheet::), it is possible to use
-     names for natural constants or units.  Instead of defining your own
-     constants in the variable `org-table-formula-constants', install
-     the `constants' package which defines a large number of constants
-     and units, and lets you use unit prefixes like `M' for `Mega',
-     etc.  You will need version 2.0 of this package, available at
-     `http://www.astro.uva.nl/~dominik/Tools'.  Org checks for the
-     function `constants-get', which has to be autoloaded in your
-     setup.  See the installation instructions in the file
-     `constants.el'.
+     Org can use names for constants in formulas in tables.  Org can
+     also use calculation suffixes for units, such as `M' for `Mega'.
+     For a standard collection of such constants, install the
+     `constants' package.  Install version 2.0 of this package,
+     available at `http://www.astro.uva.nl/~dominik/Tools'.  Org checks
+     if the function `constants-get' has been autoloaded.  Installation
+     instructions are in the file, `constants.el'.
 
 `cdlatex.el' by Carsten Dominik
-     Org mode can make use of the CDLaTeX package to efficiently enter
-     LaTeX fragments into Org files.  See *note CDLaTeX mode::.
+     Org mode can use CDLaTeX package to efficiently enter LaTeX
+     fragments into Org files (*note CDLaTeX mode::).
 
 `imenu.el' by Ake Stenhoff and Lars Lindberg
-     Imenu allows menu access to an index of items in a file.  Org mode
-     supports Imenu--all you need to do to get the index is the
-     following:
+     Imenu creates dynamic menus based on an index of items in a file.
+     Org mode supports Imenu menus.  Enable it with a mode hook as
+     follows:
           (add-hook 'org-mode-hook
                     (lambda () (imenu-add-to-menubar "Imenu")))
-     By default the index is two levels deep--you can modify the depth
-     using the option `org-imenu-depth'.
+     By default the Imenu index is two levels deep.  Change the index
+     depth using thes variable, `org-imenu-depth'.
 
 `speedbar.el' by Eric M. Ludlam
-     Speedbar is a package that creates a special frame displaying
-     files and index items in files.  Org mode supports Speedbar and
-     allows you to drill into Org files directly from the Speedbar.  It
-     also allows you to restrict the scope of agenda commands to a file
-     or a subtree by using the command `<' in the Speedbar frame.  
+     Speedbar package creates a special Emacs frame for displaying
+     files and index items in files.  Org mode supports Speedbar; users
+     can drill into Org files directly from the Speedbar.  The `<' in
+     the Speedbar frame tweeks the agenda commands to that file or to a
+     subtree.  
 
 `table.el' by Takaaki Ota
      Complex ASCII tables with automatic line wrapping, column- and
      row-spanning, and alignment can be created using the Emacs table
-     package by Takaaki Ota.  Org mode will recognize these tables and
-     export them properly.  Because of interference with other Org mode
-     functionality, you unfortunately cannot edit these tables directly
-     in the buffer.  Instead, you need to use the command `C-c '' to
-     edit them, similar to source code snippets.
-
+     package by Takaaki Ota.  Org mode recognizes such tables and
+     export them properly.  `C-c '' to edit these tables in a special
+     buffer, much like Org's `src' code blocks.  Because of
+     interference with other Org mode functionality, Takaaki Ota tables
+     cannot be edited directly in the Org buffer.
     `C-c '     (`org-edit-special')'
           Edit a `table.el' table.  Works when the cursor is in a
           table.el table.  
@@ -16414,41 +16397,38 @@ File: org,  Node: Cooperation,  Next: Conflicts,  Up: Interaction
           Insert a `table.el' table.  If there is already a table at
           point, this command converts it between the `table.el' format
           and the Org mode format.  See the documentation string of the
-          command `org-convert-table' for the restrictions under which
-          this is possible.
+          command `org-convert-table' for details.
 
 
 File: org,  Node: Conflicts,  Prev: Cooperation,  Up: Interaction
 
-15.10.2 Packages that lead to conflicts with Org mode
------------------------------------------------------
-
-     In Emacs, `shift-selection-mode' is on by default, meaning that
-     cursor motions combined with the shift key should start or enlarge
-     regions.  This conflicts with the use of `S-<cursor>' commands in
-     Org to change timestamps, TODO keywords, priorities, and item
-     bullet types if the cursor is at such a location.  By default,
-     `S-<cursor>' commands outside special contexts don't do anything,
-     but you can customize the variable `org-support-shift-select'.
-     Org mode then tries to accommodate shift selection by (i) using it
-     outside of the special contexts where special commands apply, and
-     by (ii) extending an existing active region even if the cursor
-     moves across a special context.
+15.10.2 Packages that conflict with Org mode
+--------------------------------------------
+
+     In Emacs, `shift-selection-mode' combines cursor motions with
+     shift key to enlarge regions.  Emacs sets this mode by default.
+     This conflicts with Org's use of `S-<cursor>' commands to change
+     timestamps, TODO keywords, priorities, and item bullet types, etc.
+     Since `S-<cursor>' commands outside of specific contexts don't do
+     anything, Org offers the variable `org-support-shift-select' for
+     customization.  Org mode accommodates shift selection by (i)
+     making it available outside of the special contexts where special
+     commands apply, and (ii) extending an existing active region even
+     if the cursor moves across a special context.
 
 `CUA.el' by Kim. F. Storm
-     For the same reason, key bindings in Org also conflict with the
-     `S-<cursor>' keys used by CUA mode.  If you prefer to leave these
-     keys to a different package while working in Org mode, configure
-     the variable `org-replace-disputed-keys'.  When set, Org will move
-     the following key bindings in Org files, and in the agenda buffer
-     (but not during date selection).
+     Org key bindings conflict with `S-<cursor>' keys used by CUA mode.
+     For Org to relinquish these bindings to CUA mode, configure the
+     variable `org-replace-disputed-keys'.  When set, Org moves the
+     following key bindings in Org files, and in the agenda buffer (but
+     not during date selection).
 
           S-UP      =>  M-p             S-DOWN     =>  M-n
           S-LEFT    =>  M--             S-RIGHT    =>  M-+
           C-S-LEFT  =>  M-S--           C-S-RIGHT  =>  M-S-+
 
-     Yes, these are unfortunately more difficult to remember.  If you
-     want to have other replacement keys, look at the variable
+     Yes, these are unfortunately more difficult to remember.  To
+     define a different replacement keys, look at the variable
      `org-disputed-keys'.
 
 `ecomplete.el' by Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -16464,9 +16444,9 @@ File: org,  Node: Conflicts,  Prev: Cooperation,  Up: Interaction
 
 `filladapt.el' by Kyle Jones
      Org mode tries to do the right thing when filling paragraphs, list
-     items and other elements.  Many users reported they had problems
-     using both `filladapt.el' and Org mode, so a safe thing to do is
-     to disable it like this:
+     items and other elements.  Many users reported problems using both
+     `filladapt.el' and Org mode, so a safe thing to do is to disable
+     filladapt like this:
 
           (add-hook 'org-mode-hook 'turn-off-filladapt-mode)
 
@@ -16477,17 +16457,17 @@ File: org,  Node: Conflicts,  Prev: Cooperation,  Up: Interaction
 
           (add-hook 'org-mode-hook
                     (lambda ()
-                      (org-set-local 'yas/trigger-key [tab])
+                      (setq-local yas/trigger-key [tab])
                       (define-key yas/keymap [tab] 'yas/next-field-or-maybe-expand)))
 
      The latest version of yasnippet doesn't play well with Org mode.
-     If the above code does not fix the conflict, start by defining the
+     If the above code does not fix the conflict, first define the
      following function:
 
           (defun yas/org-very-safe-expand ()
             (let ((yas/fallback-behavior 'return-nil)) (yas/expand)))
 
-     Then, tell Org mode what to do with the new function:
+     Then tell Org mode to use that function:
 
           (add-hook 'org-mode-hook
                     (lambda ()
@@ -16524,16 +16504,15 @@ File: org,  Node: org-crypt,  Prev: Interaction,  Up: Miscellaneous
 15.11 org-crypt.el
 ==================
 
-Org-crypt will encrypt the text of an entry, but not the headline, or
-properties.  Org-crypt uses the Emacs EasyPG library to encrypt and
-decrypt files.
+Org crypt encrypts the text of an Org entry, but not the headline, or
+properties.  Org crypt uses the Emacs EasyPG library to encrypt and
+decrypt.
 
    Any text below a headline that has a `:crypt:' tag will be
-automatically be encrypted when the file is saved.  If you want to use
-a different tag just customize the `org-crypt-tag-matcher' setting.
+automatically be encrypted when the file is saved.  To use a different
+tag, customize the `org-crypt-tag-matcher' variable.
 
-   To use org-crypt it is suggested that you have the following in your
-Emacs init file:
+   Suggested Org crypt settings in Emacs init file:
 
      (require 'org-crypt)
      (org-crypt-use-before-save-magic)
@@ -16553,8 +16532,8 @@ Emacs init file:
        ;;
        ;; # -*- buffer-auto-save-file-name: nil; -*-
 
-   Excluding the crypt tag from inheritance prevents already encrypted
-text being encrypted again.
+   Excluding the crypt tag from inheritance prevents encrypting
+previously encrypted text.
 
 
 File: org,  Node: Hacking,  Next: MobileOrg,  Prev: Miscellaneous,  Up: Top
@@ -16586,10 +16565,9 @@ File: org,  Node: Hooks,  Next: Add-on packages,  Up: Hacking
 A.1 Hooks
 =========
 
-Org has a large number of hook variables that can be used to add
-functionality.  This appendix about hacking is going to illustrate the
-use of some of them.  A complete list of all hooks with documentation is
-maintained by the Worg project and can be found at
+Org has a large number of hook variables for adding functionality.  This
+appendix illustrates using a few.  A complete list of hooks with
+documentation is maintained by the Worg project at
 `http://orgmode.org/worg/org-configs/org-hooks.php'.
 
 
@@ -16598,13 +16576,13 @@ File: org,  Node: Add-on packages,  Next: Adding hyperlink types,  Prev: Hooks,
 A.2 Add-on packages
 ===================
 
-A large number of add-on packages have been written by various authors.
+Various authors wrote a large number of add-on packages for Org.
 
    These packages are not part of Emacs, but they are distributed as
 contributed packages with the separate release available at
 `http://orgmode.org'.  See the `contrib/README' file in the source code
-directory for a list of contributed files.  You may also find some more
-information on the Worg page: `http://orgmode.org/worg/org-contrib/'.
+directory for a list of contributed files.  Worg page with more
+information is at: `http://orgmode.org/worg/org-contrib/'.
 
 
 File: org,  Node: Adding hyperlink types,  Next: Adding export back-ends,  Prev: Add-on packages,  Up: Hacking
@@ -16612,12 +16590,10 @@ File: org,  Node: Adding hyperlink types,  Next: Adding export back-ends,  Prev:
 A.3 Adding hyperlink types
 ==========================
 
-Org has a large number of hyperlink types built-in (*note
-Hyperlinks::).  If you would like to add new link types, Org provides
-an interface for doing so.  Let's look at an example file,
-`org-man.el', that will add support for creating links like
-`[[man:printf][The printf manpage]]' to show Unix manual pages inside
-Emacs:
+Org has many built-in hyperlink types (*note Hyperlinks::), and an
+interface for adding new link types.  The example file, `org-man.el',
+shows the process of adding Org links to Unix man pages, which look
+like this: `[[man:printf][The printf manpage]]':
 
      ;;; org-man.el - Support for links to manpages in Org
 
@@ -16659,46 +16635,42 @@ Emacs:
 
      ;;; org-man.el ends here
 
-You would activate this new link type in Emacs init file with
+To activate links to man pages in Org, enter this in the init file:
 
      (require 'org-man)
 
-Let's go through the file and see what it does.
-  1. It does `(require 'org)' to make sure that `org.el' has been
-     loaded.
-
-  2. The next line calls `org-add-link-type' to define a new link type
-     with prefix `man'.  The call also contains the name of a function
-     that will be called to follow such a link.
-
-  3. The next line adds a function to `org-store-link-functions', in
-     order to allow the command `C-c l' to record a useful link in a
-     buffer displaying a man page.
-
-   The rest of the file defines the necessary variables and functions.
-First there is a customization variable that determines which Emacs
-command should be used to display man pages.  There are two options,
-`man' and `woman'.  Then the function to follow a link is defined.  It
-gets the link path as an argument--in this case the link path is just a
-topic for the manual command.  The function calls the value of
-`org-man-command' to display the man page.
-
-   Finally the function `org-man-store-link' is defined.  When you try
-to store a link with `C-c l', this function will be called to try to
-make a link.  The function must first decide if it is supposed to
-create the link for this buffer type; we do this by checking the value
-of the variable `major-mode'.  If not, the function must exit and
-return the value `nil'.  If yes, the link is created by getting the
-manual topic from the buffer name and prefixing it with the string
-`man:'.  Then it must call the command `org-store-link-props' and set
-the `:type' and `:link' properties.  Optionally you can also set the
-`:description' property to provide a default for the link description
-when the link is later inserted into an Org buffer with `C-c C-l'.
-
-   When it makes sense for your new link type, you may also define a
-function that implements special (e.g., completion) support for
-inserting such a link with `C-c C-l'.  Such a function should not
-accept any arguments, and return the full link with prefix.
+A review of `org-man.el':
+  1. First, `(require 'org)' ensures `org.el' is loaded.
+
+  2. The `org-add-link-type' defines a new link type with `man' prefix.
+     The call contains the function to call that follows the link type.
+
+  3. The next line adds a function to `org-store-link-functions' that
+     records a useful link with the command `C-c l' in a buffer
+     displaying a man page.
+
+   The rest of the file defines necessary variables and functions.
+First is the customization variable `org-man-command'.  It has two
+options, `man' and `woman'.  Next is a function whose argument is the
+link path, which for man pages is the topic of the man command.  To
+follow the link, the function calls the `org-man-command' to display
+the man page.
+
+   `C-c l' constructs and stores the link.
+
+   `C-c l' calls the function `org-man-store-link', which first checks
+if the `major-mode' is appropriate.  If check fails, the function
+returns `nil'.  Otherwise the function makes a link string by combining
+the `man:' prefix with the man topic.  The function then calls
+`org-store-link-props' with `:type' and `:link' properties.  A
+`:description' property is an optional string that is displayed when the
+function inserts the link in the Org buffer.
+
+   `C-c C-l' inserts the stored link.
+
+   To define new link types, define a function that implements
+completion support with `C-c C-l'.  This function should not accept any
+arguments but return the appropriate prefix and complete link string.
 
 
 File: org,  Node: Adding export back-ends,  Next: Context-sensitive commands,  Prev: Adding hyperlink types,  Up: Hacking
@@ -16706,29 +16678,28 @@ File: org,  Node: Adding export back-ends,  Next: Context-sensitive commands,  P
 A.4 Adding export back-ends
 ===========================
 
-Org 8.0 comes with a completely rewritten export engine which makes it
-easy to write new export back-ends, either from scratch, or by deriving
-them from existing ones.
+Org's export engine makes it easy for writing new back-ends.  The
+framework on which the engine was built makes it easy to derive new
+back-ends from existing ones.
 
-   Your two entry points are respectively `org-export-define-backend'
-and `org-export-define-derived-backend'.  To grok these functions, you
-should first have a look at `ox-latex.el' (for how to define a new
-back-end from scratch) and `ox-beamer.el' (for how to derive a new
-back-end from an existing one.
+   The two main entry points to the export engine are:
+`org-export-define-backend' and `org-export-define-derived-backend'.
+To grok these functions, see `ox-latex.el' for an example of defining a
+new back-end from scratch, and `ox-beamer.el' for an example of
+deriving from an existing engine.
 
-   When creating a new back-end from scratch, the basic idea is to set
-the name of the back-end (as a symbol) and an alist of elements and
-export functions.  On top of this, you will need to set additional
-keywords like `:menu-entry' (to display the back-end in the export
-dispatcher), and `:options-alist' (to let the user set export options
-that are specific to this back-end.)
+   For creating a new back-end from scratch, first set its name as a
+symbol in an alist consisting of elements and export functions.  To
+make the back-end visible to the export dispatcher, set `:menu-entry'
+keyword.  For export options specific to this back-end, set the
+`:options-alist'.
 
-   Deriving a new back-end is similar, except that you need to set
-`:translate-alist' to an alist of export functions that should be used
-instead of the parent back-end functions.
+   For creating a new back-end from an existing one, set
+`:translate-alist' to an alist of export functions.  This alist
+replaces the parent back-end functions.
 
-   For a complete reference documentation, see the Org Export Reference
-on Worg (http://orgmode.org/worg/dev/org-export-reference.html).
+   For complete documentation, see the Org Export Reference on Worg
+(http://orgmode.org/worg/dev/org-export-reference.html).
 
 
 File: org,  Node: Context-sensitive commands,  Next: Tables in arbitrary syntax,  Prev: Adding export back-ends,  Up: Hacking
@@ -16736,39 +16707,16 @@ File: org,  Node: Context-sensitive commands,  Next: Tables in arbitrary syntax,
 A.5 Context-sensitive commands
 ==============================
 
-Org has several commands that act differently depending on context.
-The most important example is the `C-c C-c' (*note The very busy C-c
-C-c key::).  Also the `M-cursor' and `M-S-cursor' keys have this
-property.
-
-   Add-ons can tap into this functionality by providing a function that
-detects special context for that add-on and executes functionality
-appropriate for the context.  Here is an example from Dan Davison's
-`org-R.el' which allows you to evaluate commands based on the `R'
-programming language (1).  For this package, special contexts are lines
-that start with `#+R:' or `#+RR:'.
-
-     (defun org-R-apply-maybe ()
-       "Detect if this is context for org-R and execute R commands."
-       (if (save-excursion
-             (beginning-of-line 1)
-             (looking-at "#\\+RR?:"))
-           (progn (call-interactively 'org-R-apply)
-                  t) ;; to signal that we took action
-         nil)) ;; to signal that we did not
-
-     (add-hook 'org-ctrl-c-ctrl-c-hook 'org-R-apply-maybe)
-
-   The function first checks if the cursor is in such a line.  If that
-is the case, `org-R-apply' is called and the function returns `t' to
-signal that action was taken, and `C-c C-c' will stop looking for other
-contexts.  If the function finds it should do nothing locally, it
-returns `nil' so that other, similar functions can have a try.
+Org has facilities for building context sensitive commands.  Authors of
+Org add-ons can tap into this functionality.
 
-   ---------- Footnotes ----------
+   Some Org commands change depending on the context.  The most
+important example of this behavior is the `C-c C-c' (*note The very
+busy C-c C-c key::).  Other examples are `M-cursor' and `M-S-cursor'.
 
-   (1) `org-R.el' has been replaced by the Org mode functionality
-described in *note Working with source code:: and is now obsolete.
+   These context sensitive commands work by providing a function that
+detects special context for that add-on and executes functionality
+appropriate for that context.
 
 
 File: org,  Node: Tables in arbitrary syntax,  Next: Dynamic blocks,  Prev: Context-sensitive commands,  Up: Hacking
@@ -16776,23 +16724,28 @@ File: org,  Node: Tables in arbitrary syntax,  Next: Dynamic blocks,  Prev: Cont
 A.6 Tables and lists in arbitrary syntax
 ========================================
 
-Since Orgtbl mode can be used as a minor mode in arbitrary buffers, a
-frequent feature request has been to make it work with native tables in
-specific languages, for example LaTeX.  However, this is extremely hard
-to do in a general way, would lead to a customization nightmare, and
-would take away much of the simplicity of the Orgtbl mode table editor.
-
-   This appendix describes a different approach.  We keep the Orgtbl
-mode table in its native format (the source table), and use a custom
-function to translate the table to the correct syntax, and to install
-it in the right location (the target table).  This puts the burden of
-writing conversion functions on the user, but it allows for a very
-flexible system.
-
-   Bastien added the ability to do the same with lists, in Orgstruct
-mode.  You can use Org's facilities to edit and structure lists by
-turning `orgstruct-mode' on, then locally exporting such lists in
-another format (HTML, LaTeX or Texinfo.)
+Because of Org's success in handling tables with Orgtbl, a frequently
+asked feature is to Org's usability functions to other table formats
+native to other modem's, such as LaTeX.  This would be hard to do in a
+general way without complicated customization nightmares.  Moreover,
+that would take Org away from its simplicity roots that Orgtbl has
+proven.  There is, however, an alternate approach to accomplishing the
+same.
+
+   This approach involves implementing a custom _translate_ function
+that operates on a native Org _source table_ to produce a table in
+another format.  This strategy would keep the excellently working
+Orgtbl simple and isolate complications, if any, confined to the
+translate function.  To add more alien table formats, we just add more
+translate functions.  Also the burden of developing custom translate
+functions for new table formats will be in the hands of those who know
+those formats best.
+
+   For an example of how this strategy works, see Orgstruct mode.  In
+that mode, Bastien added the ability to use Org's facilities to edit
+and re-structure lists.  He did by turning `orgstruct-mode' on, and
+then exporting the list locally to another format, such as HTML, LaTeX
+or Texinfo.
 
 * Menu:
 
@@ -16807,56 +16760,51 @@ File: org,  Node: Radio tables,  Next: A LaTeX example,  Up: Tables in arbitrary
 A.6.1 Radio tables
 ------------------
 
-To define the location of the target table, you first need to create two
-lines that are comments in the current mode, but contain magic words
-`BEGIN/END RECEIVE ORGTBL' for Orgtbl mode to find.  Orgtbl mode will
-insert the translated table between these lines, replacing whatever was
-there before.  For example in C mode where comments are between `/* ...
-*/':
+Radio tables are target locations for translated tables that are not
+near their source.  Org finds the target location and inserts the
+translated table.
+
+   The key to finding the target location are the magic words `BEGIN/END
+RECEIVE ORGTBL'.  They have to appear as comments in the current mode.
+If the mode is C, then:
 
      /* BEGIN RECEIVE ORGTBL table_name */
      /* END RECEIVE ORGTBL table_name */
 
-Just above the source table, we put a special line that tells Orgtbl
-mode how to translate this table and where to install it.  For example: 
+At the location of source, Org needs a special line to direct Orgtbl to
+translate and to find the target for inserting the translated table.
+For example: 
      #+ORGTBL: SEND table_name translation_function arguments...
 
-`table_name' is the reference name for the table that is also used in
-the receiver lines.  `translation_function' is the Lisp function that
-does the translation.  Furthermore, the line can contain a list of
-arguments (alternating key and value) at the end.  The arguments will be
-passed as a property list to the translation function for
-interpretation.  A few standard parameters are already recognized and
-acted upon before the translation function is called:
+`table_name' is the table's reference name, which is also used in the
+receiver lines, and the `translation_function' is the Lisp function that
+translates.  This line, in addition, may also contain alternating key
+and value arguments at the end.  The translation function gets these
+values as a property list.  A few standard parameters are already
+recognized and acted upon before the translation function is called:
 
 `:skip N'
-     Skip the first N lines of the table.  Hlines do count as separate
-     lines for this parameter!
+     Skip the first N lines of the table.  Hlines do count; include
+     them if they are to be skipped.
 
 `:skipcols (n1 n2 ...)'
-     List of columns that should be skipped.  If the table has a column
-     with calculation marks, that column is automatically discarded as
-     well.  Please note that the translator function sees the table
-     _after_ the removal of these columns, the function never knows
-     that there have been additional columns.
+     List of columns to be skipped.  First Org automatically discards
+     columns with calculation marks and then sends the table to the
+     translator function, which then skips columns as specified in
+     `skipcols'.
 
-The one problem remaining is how to keep the source table in the buffer
-without disturbing the normal workings of the file, for example during
-compilation of a C file or processing of a LaTeX file.  There are a
-number of different solutions:
+To keep the source table intact in the buffer without being disturbed
+when the source file is compiled or otherwise being worked on, use one
+of these strategies:
 
-   * The table could be placed in a block comment if that is supported
-     by the language.  For example, in C mode you could wrap the table
-     between `/*' and `*/' lines.
+   * Place the table in a block comment.  For example, in C mode you
+     could wrap the table between `/*' and `*/' lines.
 
-   * Sometimes it is possible to put the table after some kind of END
-     statement, for example `\bye' in TeX and `\end{document}' in LaTeX.
+   * Put the table after an `END' statement.  For example `\bye' in TeX
+     and `\end{document}' in LaTeX.
 
-   * You can just comment the table line-by-line whenever you want to
-     process the file, and uncomment it whenever you need to edit the
-     table.  This only sounds tedious--the command `M-x
-     orgtbl-toggle-comment RET' makes this comment-toggling very easy,
-     in particular if you bind it to a key.
+   * Comment and uncomment each line of the table during edits.  The
+     `M-x orgtbl-toggle-comment RET' command makes toggling easy.
 
 
 File: org,  Node: A LaTeX example,  Next: Translator functions,  Prev: Radio tables,  Up: Tables in arbitrary syntax
@@ -16864,13 +16812,12 @@ File: org,  Node: A LaTeX example,  Next: Translator functions,  Prev: Radio tab
 A.6.2 A LaTeX example of radio tables
 -------------------------------------
 
-The best way to wrap the source table in LaTeX is to use the `comment'
-environment provided by `comment.sty'.  It has to be activated by
-placing `\usepackage{comment}' into the document header.  Orgtbl mode
-can insert a radio table skeleton(1)  with the command `M-x
-orgtbl-insert-radio-table RET'.  You will be prompted for a table name,
-let's say we use `salesfigures'.  You will then get the following
-template:
+To wrap a source table in LaTeX, use the `comment' environment provided
+by `comment.sty'.  To activate it, put `\usepackage{comment}' in the
+document header.  Orgtbl mode inserts a radio table skeleton(1)  with
+the command `M-x orgtbl-insert-radio-table RET', which prompts for a
+table name.  For example, if `salesfigures' is the name, the template
+inserts:
 
      % BEGIN RECEIVE ORGTBL salesfigures
      % END RECEIVE ORGTBL salesfigures
@@ -16879,10 +16826,10 @@ template:
      | | |
      \end{comment}
 
-The `#+ORGTBL: SEND' line tells Orgtbl mode to use the function
-`orgtbl-to-latex' to convert the table into LaTeX and to put it into
-the receiver location with name `salesfigures'.  You may now fill in
-the table--feel free to use the spreadsheet features(2):
+The line `#+ORGTBL: SEND' tells Orgtbl mode to use the function
+`orgtbl-to-latex' to convert the table to LaTeX format, then insert the
+table at the target (receive) location named `salesfigures'.  Now the
+table is ready for data entry.  It can even use spreadsheet features(2):
 
      % BEGIN RECEIVE ORGTBL salesfigures
      % END RECEIVE ORGTBL salesfigures
@@ -16897,14 +16844,12 @@ the table--feel free to use the spreadsheet features(2):
      % $ (optional extra dollar to keep font-lock happy, see footnote)
      \end{comment}
 
-When you are done, press `C-c C-c' in the table to get the converted
-table inserted between the two marker lines.
+After editing, `C-c C-c' inserts translated table at the target
+location, between the two marker lines.
 
-   Now let's assume you want to make the table header by hand, because
-you want to control how columns are aligned, etc.  In this case we make
-sure that the table translator skips the first 2 lines of the source
-table, and tell the command to work as a splice, i.e., to not produce
-header and footer commands of the target table:
+   For hand-made custom tables, note that the translator needs to skip
+the first two lines of the source table.  Also the command has to
+_splice_ out the target table without the header and footer.
 
      \begin{tabular}{lrrr}
      Month & \multicolumn{1}{c}{Days} & Nr.\ sold & per day\\
@@ -16923,38 +16868,37 @@ header and footer commands of the target table:
      \end{comment}
 
    The LaTeX translator function `orgtbl-to-latex' is already part of
-Orgtbl mode.  By default, it uses a `tabular' environment to typeset the
-table and marks horizontal lines with `\hline'.  You can control the
-output through several parameters (see also *note Translator
-functions::), including the following ones :
+Orgtbl mode and uses `tabular' environment by default to typeset the
+table and mark the horizontal lines with `\hline'.  For additional
+parameters to control output, *note Translator functions:::
 
 `:splice nil/t'
-     When non-`nil', return only table body lines, don't wrap them into
-     a tabular environment.  Default is `nil'.
+     When non-`nil', returns only table body lines; not wrapped in
+     tabular environment.  Default is `nil'.
 
 `:fmt fmt'
-     A format to be used to wrap each field, it should contain `%s' for
-     the original field value.  For example, to wrap each field value
-     in dollars, you could use `:fmt "$%s$"'.  This may also be a
+     Format to warp each field.  It should contain `%s' for the original
+     field value.  For example, to wrap each field value in dollar
+     symbol, you could use `:fmt "$%s$"'.  Format can also wrap a
      property list with column numbers and formats, for example `:fmt
-     (2 "$%s$" 4 "%s\\%%")'.  A function of one argument can be used in
-     place of the strings; the function must return a formatted string.
+     (2 "$%s$" 4 "%s\\%%")'.  In place of a string, a function of one
+     argument can be used; the function must return a formatted string.
 
 `:efmt efmt'
-     Use this format to print numbers with exponentials.  The format
-     should have `%s' twice for inserting mantissa and exponent, for
-     example `"%s\\times10^{%s}"'.  This may also be a property list
-     with column numbers and formats, for example `:efmt (2
+     Format numbers as exponentials.  The spec should have `%s' twice
+     for inserting mantissa and exponent, for example
+     `"%s\\times10^{%s}"'.  This may also be a property list with
+     column numbers and formats, for example `:efmt (2
      "$%s\\times10^{%s}$" 4 "$%s\\cdot10^{%s}$")'.  After `efmt' has
-     been applied to a value, `fmt' will also be applied.  Similar to
-     `fmt', functions of two arguments can be supplied instead of
-     strings.  By default, no special formatting is applied.
+     been applied to a value, `fmt' will also be applied.  Functions
+     with two arguments can be supplied instead of strings.  By default,
+     no special formatting is applied.
 
    ---------- Footnotes ----------
 
    (1) By default this works only for LaTeX, HTML, and Texinfo.
 Configure the variable `orgtbl-radio-table-templates' to install
-templates for other modes.
+templates for other export formats.
 
    (2) If the `#+TBLFM' line contains an odd number of dollar
 characters, this may cause problems with font-lock in LaTeX mode.  As
@@ -16970,26 +16914,24 @@ File: org,  Node: Translator functions,  Next: Radio lists,  Prev: A LaTeX examp
 A.6.3 Translator functions
 --------------------------
 
-Orgtbl mode has several translator functions built-in: `orgtbl-to-csv'
+Orgtbl mode has built-in translator functions: `orgtbl-to-csv'
 (comma-separated values), `orgtbl-to-tsv' (TAB-separated values)
 `orgtbl-to-latex', `orgtbl-to-html', `orgtbl-to-texinfo',
-`orgtbl-to-unicode' and `orgtbl-to-orgtbl'.  These all use a generic
-translator, `orgtbl-to-generic', which, in turn, delegates translations
-to various export back-ends.
+`orgtbl-to-unicode' and `orgtbl-to-orgtbl'.  They use the generic
+translator, `orgtbl-to-generic', which delegates translations to various
+export back-ends.
 
-   In particular, properties passed into the function (i.e., the ones
-set by the `ORGTBL SEND' line) take precedence over translations
-defined in the function.  So if you would like to use the LaTeX
-translator, but wanted the line endings to be `\\[2mm]' instead of the
-default `\\', you could just overrule the default with
+   Properties passed to the function through the `ORGTBL SEND' line take
+precedence over properties defined inside the function.  For example,
+this overrides the default LaTeX line endings, `\\', with `\\[2mm]':
 
      #+ORGTBL: SEND test orgtbl-to-latex :lend " \\\\[2mm]"
 
-   For a new language, you can use the generic function to write your
-own converter function.  For example, if you have a language where a
-table is started with `!BTBL!', ended with `!ETBL!', and where table
-lines are started with `!BL!', ended with `!EL!', and where the field
-separator is a TAB, you could define your generic translator like this:
+   For a new language translator, define a converter function.  It can
+be a generic function, such as shown in this example.  It marks a
+beginning and ending of a table with `!BTBL!' and `!ETBL!'; a beginning
+and ending of lines with `!BL!' and `!EL!'; and uses a TAB for a field
+separator:
 
      (defun orgtbl-to-language (table params)
        "Convert the orgtbl-mode TABLE to language."
@@ -16999,21 +16941,19 @@ separator is a TAB, you could define your generic translator like this:
          '(:tstart "!BTBL!" :tend "!ETBL!" :lstart "!BL!" :lend "!EL!" :sep "\t")
          params)))
 
-Please check the documentation string of the function
-`orgtbl-to-generic' for a full list of parameters understood by that
-function, and remember that you can pass each of them into
+The documentation for the `orgtbl-to-generic' function shows a complete
+list of parameters, each of which can be passed through to
 `orgtbl-to-latex', `orgtbl-to-texinfo', and any other function using
-the generic function.
+that generic function.
 
-   Of course you can also write a completely new function doing
-complicated things the generic translator cannot do.  A translator
-function takes two arguments.  The first argument is the table, a list
-of lines, each line either the symbol `hline' or a list of fields.  The
-second argument is the property list containing all parameters
-specified in the `#+ORGTBL: SEND' line.  The function must return a
-single string containing the formatted table.  If you write a generally
-useful translator, please post it on <emacs-orgmode@gnu.org> so that
-others can benefit from your work.
+   For complicated translations the generic translator function could be
+replaced by a custom translator function.  Such a custom function must
+take two arguments and return a single string containing the formatted
+table.  The first argument is the table whose lines are a list of
+fields or the symbol `hline'.  The second argument is the property list
+consisting of parameters specified in the `#+ORGTBL: SEND' line.
+Please share your translator functions by posting them to the Org users
+mailing list, <emacs-orgmode@gnu.org>.
 
 
 File: org,  Node: Radio lists,  Prev: Translator functions,  Up: Tables in arbitrary syntax
@@ -17021,27 +16961,22 @@ File: org,  Node: Radio lists,  Prev: Translator functions,  Up: Tables in arbit
 A.6.4 Radio lists
 -----------------
 
-Sending and receiving radio lists works exactly the same way as sending
-and receiving radio tables (*note Radio tables::).  As for radio
-tables, you can insert radio list templates in HTML, LaTeX and Texinfo
-modes by calling `org-list-insert-radio-list'.
-
-   Here are the differences with radio tables:
+Call the `org-list-insert-radio-list' function to insert a radio list
+template in HTML, LaTeX, and Texinfo mode documents.  Sending and
+receiving radio lists works is the same as for radio tables (*note
+Radio tables::) except for these differences:
 
    - Orgstruct mode must be active.
 
-   - Use the `ORGLST' keyword instead of `ORGTBL'.
-
-   - `C-c C-c' will work when pressed on the first item of the list.
+   - Use `ORGLST' keyword instead of `ORGTBL'.
 
-   Built-in translators functions are : `org-list-to-latex',
-`org-list-to-html' and `org-list-to-texinfo'.  They all use the generic
-translator `org-list-to-generic'.  Please check its documentation for a
-list of supported parameters, which can be used to control more
-accurately how the list should be rendered.
+   - `C-c C-c' works only on the first list item.
 
-   Here is a LaTeX example.  Let's say that you have this in your LaTeX
-file:
+   Built-in translators functions are: `org-list-to-latex',
+`org-list-to-html' and `org-list-to-texinfo'.  They use the
+`org-list-to-generic' translator function.  See its documentation for
+parameters for accurate customizations of lists.  Here is a LaTeX
+example:
 
      % BEGIN RECEIVE ORGLST to-buy
      % END RECEIVE ORGLST to-buy
@@ -17054,8 +16989,8 @@ file:
      - a new life
      \end{comment}
 
-   Pressing `C-c C-c' on `a new house' and will insert the converted
-LaTeX list between the two marker lines.
+   `C-c C-c' on `a new house' inserts the translated LaTeX list
+in-between the BEGIN and END marker lines.
 
 
 File: org,  Node: Dynamic blocks,  Next: Special agenda views,  Prev: Tables in arbitrary syntax,  Up: Hacking
@@ -17063,20 +16998,20 @@ File: org,  Node: Dynamic blocks,  Next: Special agenda views,  Prev: Tables in
 A.7 Dynamic blocks
 ==================
 
-Org documents can contain _dynamic blocks_.  These are specially marked
-regions that are updated by some user-written function.  A good example
-for such a block is the clock table inserted by the command `C-c C-x
-C-r' (*note Clocking work time::).
+Org supports _dynamic blocks_ in Org documents.  They are inserted with
+begin and end markers like any other `src' code block, but the contents
+are updated automatically by a user function.  For example, `C-c C-x
+C-r' inserts a dynamic table that updates the work time (*note Clocking
+work time::).
 
-   Dynamic blocks are enclosed by a BEGIN-END structure that assigns a
-name to the block and can also specify parameters for the function
-producing the content of the block.
+   Dynamic blocks can have names and function parameters.  The syntax
+is similar to `src' code block specifications:
 
      #+BEGIN: myblock :parameter1 value1 :parameter2 value2 ...
 
      #+END:
 
-   Dynamic blocks are updated with the following commands
+   These command update dynamic blocks:
 
 `C-c C-x C-u     (`org-dblock-update')'
      Update dynamic block at point.  
@@ -17084,36 +17019,36 @@ producing the content of the block.
 `C-u C-c C-x C-u'
      Update all dynamic blocks in the current file.
 
-   Updating a dynamic block means to remove all the text between BEGIN
-and END, parse the BEGIN line for parameters and then call the specific
-writer function for this block to insert the new content.  If you want
-to use the original content in the writer function, you can use the
-extra parameter `:content'.
+   Before updating a dynamic block, Org removes content between the
+BEGIN and END markers.  Org then reads the parameters on the BEGIN line
+for passing to the writer function.  If the function expects to access
+the removed content, then Org expects an extra parameter, `:content',
+on the BEGIN line.
+
+   To syntax for calling a writer function with a named block, `myblock'
+is: `org-dblock-write:myblock'.  Parameters come from the BEGIN line.
 
-   For a block with name `myblock', the writer function is
-`org-dblock-write:myblock' with as only parameter a property list with
-the parameters given in the begin line.  Here is a trivial example of a
-block that keeps track of when the block update function was last run:
+   The following is an example of a dynamic block and a block writer
+function that updates the time when the function was last run:
 
      #+BEGIN: block-update-time :format "on %m/%d/%Y at %H:%M"
 
      #+END:
 
-The corresponding block writer function could look like this:
+The dynamic block's writer function:
 
      (defun org-dblock-write:block-update-time (params)
        (let ((fmt (or (plist-get params :format) "%d. %m. %Y")))
          (insert "Last block update at: "
                  (format-time-string fmt))))
 
-   If you want to make sure that all dynamic blocks are always
-up-to-date, you could add the function `org-update-all-dblocks' to a
-hook, for example `before-save-hook'.  `org-update-all-dblocks' is
-written in a way such that it does nothing in buffers that are not in
-`org-mode'.
+   To keep dynamic blocks up-to-date in an Org file, use the function,
+`org-update-all-dblocks' in hook, such as `before-save-hook'.  The
+`org-update-all-dblocks' function does not run if the file is not in
+Org mode.
 
-   You can narrow the current buffer to the current dynamic block (like
-any other block) with `org-narrow-to-block'.
+   Dynamic blocks, like any other block, can be narrowed with
+`org-narrow-to-block'.
 
 
 File: org,  Node: Special agenda views,  Next: Speeding up your agendas,  Prev: Dynamic blocks,  Up: Hacking
@@ -17121,29 +17056,23 @@ File: org,  Node: Special agenda views,  Next: Speeding up your agendas,  Prev:
 A.8 Special agenda views
 ========================
 
-Org provides a special hook that can be used to narrow down the
-selection made by these agenda views: `agenda', `agenda*'(1), `todo',
-`alltodo', `tags', `tags-todo', `tags-tree'.  You may specify a
-function that is used at each match to verify if the match should
-indeed be part of the agenda view, and if not, how much should be
-skipped.  You can specify a global condition that will be applied to
-all agenda views, this condition would be stored in the variable
-`org-agenda-skip-function-global'.  More commonly, such a definition is
-applied only to specific custom searches, using
-`org-agenda-skip-function'.
-
-   Let's say you want to produce a list of projects that contain a
-WAITING tag anywhere in the project tree.  Let's further assume that
-you have marked all tree headings that define a project with the TODO
-keyword PROJECT.  In this case you would run a TODO search for the
-keyword PROJECT, but skip the match unless there is a WAITING tag
-anywhere in the subtree belonging to the project line.
-
-   To achieve this, you must write a function that searches the subtree
-for the tag.  If the tag is found, the function must return `nil' to
-indicate that this match should not be skipped.  If there is no such
-tag, return the location of the end of the subtree, to indicate that
-search should continue from there.
+Org provides a special hook to further limit items in agenda views:
+`agenda', `agenda*'(1), `todo', `alltodo', `tags', `tags-todo',
+`tags-tree'.  Specify a custom function that tests inclusion of every
+matched item in the view.  This function can also skip as much as is
+needed.
+
+   For a global condition applicable to agenda views, use the
+`org-agenda-skip-function-global' variable.  Org uses a global condition
+with `org-agenda-skip-function' for custom searching.
+
+   This example defines a function for a custom view showing TODO items
+with WAITING status.  Manually this is a multi step search process, but
+with a custom view, this can be automated as follows:
+
+   The custom function searches the subtree for the WAITING tag and
+returns `nil' on match.  Otherwise it gives the location from where the
+search continues.
 
      (defun my-skip-unless-waiting ()
        "Skip trees that are not waiting"
@@ -17152,26 +17081,22 @@ search should continue from there.
              nil          ; tag found, do not skip
            subtree-end))) ; tag not found, continue after end of subtree
 
-   Now you may use this function in an agenda custom command, for
-example like this:
+   To use this custom function in a custom agenda command:
 
      (org-add-agenda-custom-command
       '("b" todo "PROJECT"
         ((org-agenda-skip-function 'my-skip-unless-waiting)
          (org-agenda-overriding-header "Projects waiting for something: "))))
 
-   Note that this also binds `org-agenda-overriding-header' to get a
-meaningful header in the agenda view.
-
-   A general way to create custom searches is to base them on a search
-for entries with a certain level limit.  If you want to study all
-entries with your custom search function, simply do a search for
-`LEVEL>0'(2), and then use `org-agenda-skip-function' to select the
-entries you really want to have.
+   Note that this also binds `org-agenda-overriding-header' to a more
+meaningful string suitable for the agenda view.
 
-   You may also put a Lisp form into `org-agenda-skip-function'.  In
-particular, you may use the functions `org-agenda-skip-entry-if' and
-`org-agenda-skip-subtree-if' in this form, for example:
+   Search for entries with a limit set on levels for the custom search.
+This is a general appraoch to creating custom searches in Org.  To
+include all levels, use `LEVEL>0'(2).  Then to selectively pick the
+matched entries, use `org-agenda-skip-function', which also accepts Lisp
+forms, such as `org-agenda-skip-entry-if' and
+`org-agenda-skip-subtree-if'.  For example:
 
 `(org-agenda-skip-entry-if 'scheduled)'
      Skip current entry if it has been scheduled.
@@ -17204,8 +17129,8 @@ particular, you may use the functions `org-agenda-skip-entry-if' and
 `(org-agenda-skip-subtree-if 'regexp "regular expression")'
      Same as above, but check and skip the entire subtree.
 
-   Therefore we could also have written the search for WAITING projects
-like this, even without defining a special function:
+   The following is an example of a search for `WAITING' without the
+special function:
 
      (org-add-agenda-custom-command
       '("b" todo "PROJECT"
@@ -17216,11 +17141,11 @@ like this, even without defining a special function:
    ---------- Footnotes ----------
 
    (1) The `agenda*' view is the same as `agenda' except that it only
-considers _appointments_, i.e., scheduled and deadline items that have a
-time specification `[h]h:mm' in their time-stamps.
+considers _appointments_, i.e., scheduled and deadline items that have
+a time specification `[h]h:mm' in their time-stamps.
 
-   (2) Note that, when using `org-odd-levels-only', a level number
-corresponds to order in the hierarchy, not to the number of stars.
+   (2) Note that, for `org-odd-levels-only', a level number corresponds
+to order in the hierarchy, not to the number of stars.
 
 
 File: org,  Node: Speeding up your agendas,  Next: Extracting agenda information,  Prev: Special agenda views,  Up: Hacking
@@ -17228,30 +17153,29 @@ File: org,  Node: Speeding up your agendas,  Next: Extracting agenda information
 A.9 Speeding up your agendas
 ============================
 
-When your Org files grow in both number and size, agenda commands may
-start to become slow.  Below are some tips on how to speed up the
-agenda commands.
+Some agenda commands slow down when the Org files grow in size or
+number.  Here are tips to speed up:
 
-  1. Reduce the number of Org agenda files: this will reduce the
-     slowdown caused by accessing a hard drive.
+  1. Reduce the number of Org agenda files to avoid slowdowns due to
+     hard drive accesses.
 
-  2. Reduce the number of DONE and archived headlines: this way the
-     agenda does not need to skip them.
+  2. Reduce the number of `DONE' and archived headlines so agenda
+     operations that skip over these can finish faster.
 
-  3. Inhibit the dimming of blocked tasks:
+  3. Do not dim blocked tasks:
           (setq org-agenda-dim-blocked-tasks nil)
 
-  4. Inhibit agenda files startup options:
+  4. Stop preparing agenda buffers on startup:
           (setq org-agenda-inhibit-startup nil)
 
-  5. Disable tag inheritance in agenda:
+  5. Disable tag inheritance for agendas:
           (setq org-agenda-use-tag-inheritance nil)
 
-   You can set these options for specific agenda views only.  See the
-docstrings of these variables for details on why they affect the agenda
-generation, and this dedicated Worg page
-(http://orgmode.org/worg/agenda-optimization.html) for further
-explanations.
+   These options can be applied to selected agenda views.  For more
+details about generation of agenda views, see the docstrings for the
+relevant variables, and this dedicated Worg page
+(http://orgmode.org/worg/agenda-optimization.html) for agenda
+optimization.
 
 
 File: org,  Node: Extracting agenda information,  Next: Using the property API,  Prev: Speeding up your agendas,  Up: Hacking
@@ -17259,28 +17183,29 @@ File: org,  Node: Extracting agenda information,  Next: Using the property API,
 A.10 Extracting agenda information
 ==================================
 
-Org provides commands to access agenda information for the command line
-in Emacs batch mode.  This extracted information can be sent directly
-to a printer, or it can be read by a program that does further
-processing of the data.  The first of these commands is the function
-`org-batch-agenda', that produces an agenda view and sends it as ASCII
-text to STDOUT.  The command takes a single string as parameter.  If
-the string has length 1, it is used as a key to one of the commands you
-have configured in `org-agenda-custom-commands', basically any key you
-can use after `C-c a'.  For example, to directly print the current TODO
-list, you could use
+Org provides commands to access agendas through Emacs batch mode.
+Through this command-line interface, agendas are automated for further
+processing or printing.
+
+   `org-batch-agenda' creates an agenda view in ASCII and outputs to
+STDOUT.  This command takes one string parameter.  When string
+length=1, Org uses it as a key to `org-agenda-custom-commands'.  These
+are the same ones available through `C-c a'.
+
+   This example command line directly prints the TODO list to the
+printer:
 
      emacs -batch -l ~/.emacs -eval '(org-batch-agenda "t")' | lpr
 
-   If the parameter is a string with 2 or more characters, it is used
-as a tags/TODO match string.  For example, to print your local shopping
-list (all items with the tag `shop', but excluding the tag `NewYork'),
-you could use
+   When the string parameter length is two or more characters, Org
+matches it with tags/TODO strings.  For example, this example command
+line prints items tagged with `shop', but excludes items tagged with
+`NewYork':
 
      emacs -batch -l ~/.emacs                                      \
            -eval '(org-batch-agenda "+shop-NewYork")' | lpr
 
-You may also modify parameters on the fly like this:
+An example showing on-the-fly parameter modifications:
 
      emacs -batch -l ~/.emacs                                      \
         -eval '(org-batch-agenda "a"                               \
@@ -17289,14 +17214,11 @@ You may also modify parameters on the fly like this:
                  org-agenda-files (quote ("~/org/project.org")))'  \
         | lpr
 
-which will produce a 30-day agenda, fully restricted to the Org file
-`~/org/projects.org', not even including the diary.
+which will produce an agenda for the next 30 days from just the
+`~/org/projects.org' file.
 
-   If you want to process the agenda data in more sophisticated ways,
-you can use the command `org-batch-agenda-csv' to get a comma-separated
-list of values for each agenda item.  Each line in the output will
-contain a number of fields separated by commas.  The fields in a line
-are:
+   For structured processing of agenda output, use
+`org-batch-agenda-csv' with the following fields:
 
      category     The category of the item
      head         The headline, without TODO keyword, TAGS and PRIORITY
@@ -17319,12 +17241,15 @@ are:
      priority-l   The priority letter if any was given
      priority-n   The computed numerical priority
 
-Time and date will only be given if a timestamp (or deadline/scheduled)
-led to the selection of the item.
+If the selection of the agenda item was based on a timestamp, including
+those items with `DEADLINE' and `SCHEDULED' keywords, then Org includes
+date and time in the output.
+
+   If the selection of the agenda item was based on a timestamp  (or
+deadline/scheduled), then Org includes date and time in the output.
 
-   A CSV list like this is very easy to use in a post-processing script.
-For example, here is a Perl program that gets the TODO list from
-Emacs/Org and prints all the items, preceded by a checkbox:
+   Here is an example of a post-processing script in Perl.  It takes
+the CSV output from Emacs and prints with a checkbox:
 
      #!/usr/bin/perl
 
@@ -17349,8 +17274,7 @@ File: org,  Node: Using the property API,  Next: Using the mapping API,  Prev: E
 A.11 Using the property API
 ===========================
 
-Here is a description of the functions that can be used to work with
-properties.
+Functions for working with properties.
 
  -- Function: org-entry-properties &optional pom which
      Get all properties of the entry at point-or-marker POM.
@@ -17425,35 +17349,32 @@ File: org,  Node: Using the mapping API,  Prev: Using the property API,  Up: Hac
 A.12 Using the mapping API
 ==========================
 
-Org has sophisticated mapping capabilities to find all entries
-satisfying certain criteria.  Internally, this functionality is used to
-produce agenda views, but there is also an API that can be used to
-execute arbitrary functions for each or selected entries.  The main
-entry point for this API is:
+Org has sophisticated mapping capabilities for finding entries.  Org
+uses this functionality internally for generating agenda views.  Org
+also exposes an API for executing arbitrary functions for each selected
+entry.  The API's main entry point is:
 
  -- Function: org-map-entries func &optional match scope &rest skip
      Call `FUNC' at each headline selected by `MATCH' in `SCOPE'.
 
-     `FUNC' is a function or a Lisp form.  The function will be called
-     without arguments, with the cursor positioned at the beginning of
-     the headline.  The return values of all calls to the function will
-     be collected and returned as a list.
-
-     The call to `FUNC' will be wrapped into a save-excursion form, so
-     `FUNC' does not need to preserve point.  After evaluation, the
-     cursor will be moved to the end of the line (presumably of the
-     headline of the processed entry) and search continues from there.
-     Under some circumstances, this may not produce the wanted results.
-     For example, if you have removed (e.g., archived) the current
-     (sub)tree it could mean that the next entry will be skipped
-     entirely.  In such cases, you can specify the position from where
-     search should continue by making `FUNC' set the variable
-     `org-map-continue-from' to the desired buffer position.
-
-     `MATCH' is a tags/property/todo match as it is used in the agenda
-     match view.  Only headlines that are matched by this query will be
-     considered during the iteration.  When `MATCH' is `nil' or `t', all
-     headlines will be visited by the iteration.
+     `FUNC' is a function or a Lisp form.  With the cursor positioned
+     at the beginning of the headline, call the function without
+     arguments.  Org returns an alist of return values of calls to the
+     function.
+
+     To avoid preserving point, Org wraps the call to `FUNC' in
+     save-excursion form.  After evaluation, Org moves the cursor to
+     the end of the line that was just processed.  Search continues
+     from that point forward.  This may not always work as expected
+     under some conditions, such as if the current sub-tree was removed
+     by a previous archiving operation.  In such rare circumstances,
+     Org skips the next entry entirely when it should not.  To stop Org
+     from such skips, make `FUNC' set the variable
+     `org-map-continue-from' to a specific buffer position.
+
+     `MATCH' is a tags/property/TODO match.  Org iterates only matched
+     headlines.  Org iterates over all headlines when `MATCH' is `nil'
+     or `t'.
 
      `SCOPE' determines the scope of this command.  It can be any of:
 
@@ -17468,8 +17389,8 @@ entry point for this API is:
                   all agenda files with any archive files associated with them
           (file1 file2 ...)
                   if this is a list, all files in the list will be scanned
-     The remaining args are treated as settings for the skipping
-     facilities of the scanner.  The following items can be given here:
+     The remaining args are treated as settings for the scanner's
+     skipping facilities.  Valid args are:
 
           archive   skip trees with the archive tag
           comment   skip trees with the COMMENT keyword
@@ -17479,11 +17400,9 @@ entry point for this API is:
                     will not be called for that entry and search will
                     continue from the point where the function leaves it
 
-   The function given to that mapping routine can really do anything
-you like.  It can use the property API (*note Using the property API::)
-to gather more information about the entry, or in order to change
-metadata in the entry.  Here are a couple of functions that might be
-handy:
+   The mapping routine can call any arbitrary function, even functions
+that change meta data or query the property API (*note Using the
+property API::).  Here are some handy functions:
 
  -- Function: org-todo &optional arg
      Change the TODO state of the entry.  See the docstring of the
@@ -17504,10 +17423,9 @@ handy:
  -- Function: org-demote
      Demote the current entry.
 
-   Here is a simple example that will turn all entries in the current
-file with a tag `TOMORROW' into TODO entries with the keyword
-`UPCOMING'.  Entries in comment trees and in archive trees will be
-ignored.
+   This example turns all entries tagged with `TOMORROW' into TODO
+entries with keyword `UPCOMING'.  Org ignores entries in comment trees
+and archive trees.
 
      (org-map-entries
       '(org-todo "UPCOMING")
@@ -17524,33 +17442,33 @@ File: org,  Node: MobileOrg,  Next: History and acknowledgments,  Prev: Hacking,
 Appendix B MobileOrg
 ********************
 
-MobileOrg is the name of the mobile companion app for Org mode,
-currently available for iOS and for Android.  MobileOrg offers offline
-viewing and capture support for an Org mode system rooted on a "real"
-computer.  It also allows you to record changes to existing entries.
-The iOS implementation (https://github.com/MobileOrg/) for the
-iPhone/iPod Touch/iPad series of devices, was started by Richard
+MobileOrg is a companion mobile app that runs on iOS and Android
+devices.  MobileOrg enables offline-views and capture support for an
+Org mode system that is rooted on a "real" computer.  MobileOrg can
+record changes to existing entries.
+
+   The iOS implementation (https://github.com/MobileOrg/) for the
+_iPhone/iPod Touch/iPad_ series of devices, was started by Richard
 Moreland and is now in the hands Sean Escriva.  Android users should
 check out MobileOrg Android
-(http://wiki.github.com/matburt/mobileorg-android/) by Matt Jones.  The
-two implementations are not identical but offer similar features.
-
-   This appendix describes the support Org has for creating agenda
-views in a format that can be displayed by MobileOrg, and for
-integrating notes captured and changes made by MobileOrg into the main
-system.
-
-   For changing tags and TODO states in MobileOrg, you should have set
-up the customization variables `org-todo-keywords' and `org-tag-alist'
-to cover all important tags and TODO keywords, even if individual files
-use only part of these.  MobileOrg will also offer you states and tags
-set up with in-buffer settings, but it will understand the logistics of
-TODO state sets (*note Per-file keywords::) and mutually exclusive tags
-(*note Setting tags::) only for those set in these variables.
+(http://wiki.github.com/matburt/mobileorg-android/) by Matt Jones.
+Though the two implementations are not identical, they offer similar
+features.
+
+   This appendix describes Org's support for agenda view formats
+compatible with MobileOrg.  It also describes synchronizing changes,
+such as to notes, between MobileOrg and the computer.
+
+   To change tags and TODO states in MobileOrg, first customize the
+variables `org-todo-keywords' and `org-tag-alist'.  These should cover
+all the important tags and TODO keywords, even if Org files use only
+some of them.  Though MobileOrg has in-buffer settings, it understands
+TODO states _sets_ (*note Per-file keywords::) and _mutually exclusive_
+tags (*note Setting tags::) only for those set in these variables.
 
 * Menu:
 
-* Setting up the staging area::  Where to interact with the mobile device
+* Setting up the staging area::  For the mobile device
 * Pushing to MobileOrg::        Uploading Org files and agendas
 * Pulling from MobileOrg::      Integrating captured and flagged items
 
@@ -17560,36 +17478,35 @@ File: org,  Node: Setting up the staging area,  Next: Pushing to MobileOrg,  Up:
 B.1 Setting up the staging area
 ===============================
 
-MobileOrg needs to interact with Emacs through a directory on a server.
-If you are using a public server, you should consider encrypting the
-files that are uploaded to the server.  This can be done with Org mode
-7.02 and with MobileOrg 1.5 (iPhone version), and you need an `openssl'
-installation on your system.  To turn on encryption, set a password in
-MobileOrg and, on the Emacs side, configure the variable
-`org-mobile-use-encryption'(1).
-
-   The easiest way to create that directory is to use a free
-Dropbox.com (http://dropbox.com) account(2).  When MobileOrg first
-connects to your Dropbox, it will create a directory MobileOrg inside
-the Dropbox.  After the directory has been created, tell Emacs about it:
+MobileOrg needs access to a file directory on a server to interact with
+Emacs.  With a public server, consider encrypting the files.  MobileOrg
+version 1.5 supports encryption for the iPhone.  Org also requires
+`openssl' installed on the local computer.  To turn on encryption, set
+the same password in MobileOrg and in Emacs.  Set the password in the
+variable `org-mobile-use-encryption'(1).  Note that even after
+MobileOrg encrypts the file contents, the file names will remain
+visible on the file systems of the local computer, the server, and the
+mobile device.
+
+   For a server to host files, consider options like Dropbox.com
+(http://dropbox.com) account(2).  On first connection, MobileOrg
+creates a directory `MobileOrg/' on Dropbox.  Pass its location to
+Emacs through an init file variable as follows:
 
      (setq org-mobile-directory "~/Dropbox/MobileOrg")
 
-   Org mode has commands to put files for MobileOrg into that directory,
-and to read captured notes from there.
+   Org copies files to the above directory for MobileOrg.  Org also
+uses the same directory for sharing notes between Org and MobileOrg.
 
    ---------- Footnotes ----------
 
-   (1) If you can safely store the password in your Emacs setup, you
-might also want to configure `org-mobile-encryption-password'.  Please
-read the docstring of that variable.  Note that encryption will apply
-only to the contents of the `.org' files.  The file names themselves
-will remain visible.
+   (1) If Emacs is configured for safe storing of passwords, then
+configure the variable, `org-mobile-encryption-password'; please read
+the docstring of that variable.
 
-   (2) If you cannot use Dropbox, or if your version of MobileOrg does
-not support it, you can use a webdav server.  For more information,
-check out the documentation of MobileOrg and also this FAQ entry
-(http://orgmode.org/worg/org-faq.html#mobileorg_webdav).
+   (2) An alternative is to use webdav server.  MobileOrg documentation
+has details of webdav server configuration.  Additional help is at FAQ
+entry (http://orgmode.org/worg/org-faq.html#mobileorg_webdav).
 
 
 File: org,  Node: Pushing to MobileOrg,  Next: Pulling from MobileOrg,  Prev: Setting up the staging area,  Up: MobileOrg
@@ -17597,36 +17514,33 @@ File: org,  Node: Pushing to MobileOrg,  Next: Pulling from MobileOrg,  Prev: Se
 B.2 Pushing to MobileOrg
 ========================
 
-This operation copies all files currently listed in `org-mobile-files'
-to the directory `org-mobile-directory'.  By default this list contains
-all agenda files (as listed in `org-agenda-files'), but additional files
-can be included by customizing `org-mobile-files'.  File names will be
-staged with paths relative to `org-directory', so all files should be
-inside this directory(1).
+Org pushes files listed in `org-mobile-files' to
+`org-mobile-directory'.  Files include agenda files (as listed in
+`org-agenda-files').  Customize `org-mobile-files' to add other files.
+File names will be staged with paths relative to `org-directory', so
+all files should be inside this directory(1).
 
-   The push operation also creates a special Org file `agendas.org' with
-all custom agenda view defined by the user(2).
+   Push creates a special Org file `agendas.org' with custom agenda
+views defined by the user(2).
 
-   Finally, Org writes the file `index.org', containing links to all
-other files.  MobileOrg first reads this file from the server, and then
-downloads all agendas and Org files listed in it.  To speed up the
-download, MobileOrg will only read files whose checksums(3) have
-changed.
+   Org writes the file `index.org', containing links to other files.
+MobileOrg reads this file first from the server to determine what other
+files to download for agendas.  For faster downloads, MobileOrg will
+read only those files whose checksums(3) have changed.
 
    ---------- Footnotes ----------
 
-   (1) Symbolic links in `org-directory' need to have the same name as
+   (1) Symbolic links in `org-directory' should have the same name as
 their targets.
 
    (2) While creating the agendas, Org mode will force ID properties on
 all referenced entries, so that these entries can be uniquely
-identified if MobileOrg flags them for further action.  If you do not
-want to get these properties in so many entries, you can set the
-variable `org-mobile-force-id-on-agenda-items' to `nil'.  Org mode will
-then rely on outline paths, in the hope that these will be unique
-enough.
+identified if MobileOrg flags them for further action.  To avoid
+setting properties configure the variable
+`org-mobile-force-id-on-agenda-items' to `nil'.  Org mode will then
+rely on outline paths, assuming they are unique.
 
-   (3) Checksums are stored automatically in the file `checksums.dat'
+   (3) Checksums are stored automatically in the file `checksums.dat'.
 
 
 File: org,  Node: Pulling from MobileOrg,  Prev: Pushing to MobileOrg,  Up: MobileOrg
@@ -17634,58 +17548,46 @@ File: org,  Node: Pulling from MobileOrg,  Prev: Pushing to MobileOrg,  Up: Mobi
 B.3 Pulling from MobileOrg
 ==========================
 
-When MobileOrg synchronizes with the server, it not only pulls the Org
-files for viewing.  It also appends captured entries and pointers to
-flagged and changed entries to the file `mobileorg.org' on the server.
-Org has a _pull_ operation that integrates this information into an
-inbox file and operates on the pointers to flagged entries.  Here is
-how it works:
+When MobileOrg synchronizes with the server, it pulls the Org files for
+viewing.  It then appends to the file `mobileorg.org' on the server the
+captured entries, pointers to flagged and changed entries.  Org
+integrates its data in an inbox file format.
 
   1. Org moves all entries found in `mobileorg.org'(1) and appends them
      to the file pointed to by the variable
      `org-mobile-inbox-for-pull'.  Each captured entry and each editing
-     event will be a top-level entry in the inbox file.
-
-  2. After moving the entries, Org will attempt to implement the
-     changes made in MobileOrg.  Some changes are applied directly and
-     without user interaction.  Examples are all changes to tags, TODO
-     state, headline and body text that can be cleanly applied.
-     Entries that have been flagged for further action will receive a
-     tag `:FLAGGED:', so that they can be easily found again.  When
-     there is a problem finding an entry or applying the change, the
-     pointer entry will remain in the inbox and will be marked with an
-     error message.  You need to later resolve these issues by hand.
-
-  3. Org will then generate an agenda view with all flagged entries.
-     The user should then go through these entries and do whatever
-     actions are necessary.  If a note has been stored while flagging
-     an entry in MobileOrg, that note will be displayed in the echo
-     area when the cursor is on the corresponding agenda line.
+     event is a top-level entry in the inbox file.
+
+  2. After moving the entries, Org attempts changes to MobileOrg.  Some
+     changes are applied directly and without user interaction.
+     Examples include changes to tags, TODO state, headline and body
+     text.  Entries for further action are tagged as `:FLAGGED:'.  Org
+     marks entries with problems with an error message in the inbox.
+     They have to be resolved manually.
+
+  3. Org generates an agenda view for flagged entries for user
+     intervention to clean up.  For notes stored in flagged entries,
+     MobileOrg displays them in the echo area when the cursor is on the
+     corresponding agenda item.
 
     `?'
-          Pressing `?' in that special agenda will display the full
-          flagging note in another window and also push it onto the
-          kill ring.  So you could use `?  z C-y C-c C-c' to store that
-          flagging note as a normal note in the entry.  Pressing `?'
-          twice in succession will offer to remove the `:FLAGGED:' tag
-          along with the recorded flagging note (which is stored in a
-          property).  In this way you indicate that the intended
-          processing for this flagged entry is finished.
-
-   If you are not able to process all flagged entries directly, you can
-always return to this agenda view(2) using `C-c a ?'.
+          Pressing `?' displays the entire flagged note in another
+          window.  Org also pushes it to the kill ring.  To store
+          flagged note as a normal note, use `?  z C-y C-c C-c'.
+          Pressing `?' twice does these things: first it removes the
+          `:FLAGGED:' tag; second, it removes the flagged note from the
+          property drawer; third, it signals that manual editing of the
+          flagged entry is now finished.
+
+   `C-c a ?' returns to the agenda view to finish processing flagged
+entries.  Note that these entries may not be the most recent since
+MobileOrg searches files that were last pulled.  To get an updated
+agenda view with changes since the last pull, pull again.
 
    ---------- Footnotes ----------
 
    (1) `mobileorg.org' will be empty after this operation.
 
-   (2) Note, however, that there is a subtle difference.  The view
-created automatically by `M-x org-mobile-pull RET' is guaranteed to
-search all files that have been addressed by the last pull.  This might
-include a file that is not currently in your list of agenda files.  If
-you later use `C-c a ?' to regenerate the view, only the current agenda
-files will be searched.
-
 
 File: org,  Node: History and acknowledgments,  Next: GNU Free Documentation License,  Prev: MobileOrg,  Up: Top
 
@@ -17700,9 +17602,9 @@ Emacs Outline mode.  I was trying to organize my notes and projects,
 and using Emacs seemed to be the natural way to go.  However, having to
 remember eleven different commands with two or three keys per command,
 only to hide and show parts of the outline tree, that seemed entirely
-unacceptable to me.  Also, when using outlines to take notes, I
-constantly wanted to restructure the tree, organizing it parallel to my
-thoughts and plans.  _Visibility cycling_ and _structure editing_ were
+unacceptable.  Also, when using outlines to take notes, I constantly
+wanted to restructure the tree, organizing it paralleling my thoughts
+and plans.  _Visibility cycling_ and _structure editing_ were
 originally implemented in the package `outline-magic.el', but quickly
 moved to the more general `org.el'.  As this environment became
 comfortable for project planning, the next step was adding _TODO
@@ -17730,7 +17632,7 @@ Bastien Guerry
      invented Worg, helped establishing the Web presence of Org, and
      sponsored hosting costs for the orgmode.org website.  Bastien
      stepped in as maintainer of Org between 2011 and 2013, at a time
-     when I desparately needed a break.
+     when I desperately needed a break.
 
 Eric Schulte and Dan Davison
      Eric and Dan are jointly responsible for the Org-babel system,
@@ -17763,7 +17665,7 @@ C.2 From Bastien
 
 I (Bastien) have been maintaining Org between 2011 and 2013.  This
 appendix would not be complete without adding a few more
-acknowledgements and thanks.
+acknowledgments and thanks.
 
    I am first grateful to Carsten for his trust while handing me over
 the maintainership of Org.  His unremitting support is what really
@@ -18631,7 +18533,7 @@ Concept index
                                                               (line  11)
 * #+BEGIN:dynamic block:                 Dynamic blocks.      (line  15)
 * #+BEGIN_CENTER:                        Paragraphs.          (line  31)
-* #+BEGIN_COMMENT:                       Comment lines.       (line   6)
+* #+BEGIN_COMMENT:                       Comment lines.       (line  10)
 * #+BEGIN_EXAMPLE:                       Literal examples.    (line   8)
 * #+BEGIN_EXPORT ascii:                  ASCII/Latin-1/UTF-8 export.
                                                               (line  53)
@@ -18741,9 +18643,9 @@ Concept index
 * #+ODT_STYLES_FILE:                     Applying custom styles.
                                                               (line  28)
 * #+OPTIONS:                             Export settings.     (line   6)
-* #+ORGLST:                              Radio lists.         (line  13)
-* #+ORGTBL:                              Radio tables.        (line  17)
-* #+ORGTBL, SEND:                        A LaTeX example.     (line  14)
+* #+ORGLST:                              Radio lists.         (line  11)
+* #+ORGTBL:                              Radio tables.        (line  19)
+* #+ORGTBL, SEND:                        A LaTeX example.     (line  13)
 * #+PINDEX:                              Indices.             (line   6)
 * #+PLOT:                                Org-Plot.            (line   6)
 * #+PRIORITIES:                          Priorities.          (line  44)
@@ -18752,9 +18654,9 @@ Concept index
                                                               (line   6)
 * #+SELECT_TAGS:                         Export settings.     (line  44)
 * #+SEQ_TODO:                            Per-file keywords.   (line   6)
-* #+SETUPFILE <1>:                       In-buffer settings.  (line  55)
+* #+SETUPFILE <1>:                       In-buffer settings.  (line  52)
 * #+SETUPFILE:                           Export settings.     (line  13)
-* #+STARTUP:                             In-buffer settings.  (line  68)
+* #+STARTUP:                             In-buffer settings.  (line  64)
 * #+SUBAUTHOR <1>:                       Texinfo title and copyright page.
                                                               (line  13)
 * #+SUBAUTHOR:                           Texinfo specific export settings.
@@ -18770,7 +18672,7 @@ Concept index
 * #+SUBTITLE (Texinfo):                  Texinfo specific export settings.
                                                               (line  10)
 * #+TAGS:                                Setting tags.        (line  29)
-* #+TBLFM <1>:                           In-buffer settings.  (line 178)
+* #+TBLFM <1>:                           In-buffer settings.  (line 173)
 * #+TBLFM <2>:                           Editing and debugging formulas.
                                                               (line  99)
 * #+TBLFM:                               Field and range formulas.
@@ -18874,12 +18776,12 @@ Concept index
 * agenda:                                Weekly/daily agenda. (line   6)
 * agenda dispatcher:                     Agenda dispatcher.   (line   6)
 * agenda files:                          Agenda files.        (line   6)
-* agenda files, removing buffers:        Agenda commands.     (line 522)
+* agenda files, removing buffers:        Agenda commands.     (line 519)
 * agenda views:                          Agenda views.        (line   6)
 * agenda views, custom:                  Custom agenda views. (line   6)
 * agenda views, exporting <1>:           Exporting agenda views.
                                                               (line   6)
-* agenda views, exporting:               Agenda commands.     (line 508)
+* agenda views, exporting:               Agenda commands.     (line 505)
 * agenda views, main example:            Storing searches.    (line   9)
 * agenda views, optimization:            Speeding up your agendas.
                                                               (line   6)
@@ -18892,7 +18794,7 @@ Concept index
                                                               (line   6)
 * agenda, sticky:                        Agenda dispatcher.   (line  53)
 * agenda, with block views:              Block agenda.        (line   6)
-* align, STARTUP keyword:                In-buffer settings.  (line  88)
+* align, STARTUP keyword:                In-buffer settings.  (line  85)
 * alignment in tables:                   Column width and alignment.
                                                               (line   6)
 * anniversaries, from BBDB:              Weekly/daily agenda. (line  79)
@@ -18906,6 +18808,8 @@ Concept index
 * appointment reminders:                 Weekly/daily agenda. (line 126)
 * appt.el:                               Weekly/daily agenda. (line 126)
 * archive locations:                     Moving subtrees.     (line  25)
+* archive tag:                           Internal archiving.  (line   6)
+* archived entries, in agenda views:     Agenda views.        (line  40)
 * Archives mode:                         Agenda commands.     (line 134)
 * archiving:                             Archiving.           (line   6)
 * ASCII export:                          ASCII/Latin-1/UTF-8 export.
@@ -18922,7 +18826,7 @@ Concept index
 * BBDB, anniversaries:                   Weekly/daily agenda. (line  79)
 * Beamer export:                         Beamer export.       (line   6)
 * begin block, end block:                Structure of code blocks.
-                                                              (line  45)
+                                                              (line  46)
 * block agenda:                          Block agenda.        (line   6)
 * blocking, of checkboxes:               Checkboxes.          (line  46)
 * blocks, folding:                       Blocks.              (line   6)
@@ -18938,21 +18842,21 @@ Concept index
 * calculations, in tables <1>:           The spreadsheet.     (line   6)
 * calculations, in tables:               Built-in table editor.
                                                               (line 162)
-* calendar commands, from agenda:        Agenda commands.     (line 457)
+* calendar commands, from agenda:        Agenda commands.     (line 454)
 * calendar integration:                  Weekly/daily agenda. (line  32)
 * calendar, for selecting date:          The date/time prompt.
                                                               (line  76)
 * capture <1>:                           Capture.             (line   6)
 * capture:                               Capture - Refile - Archive.
                                                               (line   6)
-* capturing, from agenda:                Agenda commands.     (line 351)
+* capturing, from agenda:                Agenda commands.     (line 348)
 * category:                              Categories.          (line   6)
 * category filtering, in agenda:         Filtering/limiting agenda items.
                                                               (line  17)
 * category, require for tags/property match: Matching tags and properties.
                                                               (line  72)
 * CDLaTeX:                               CDLaTeX mode.        (line   6)
-* cdlatex.el:                            Cooperation.         (line  26)
+* cdlatex.el:                            Cooperation.         (line  21)
 * center blocks:                         Paragraphs.          (line  31)
 * center image (LaTeX export):           Images in LaTeX export.
                                                               (line  52)
@@ -18993,6 +18897,8 @@ Concept index
 * column, of field coordinates:          References.          (line  86)
 * commands, in agenda buffer:            Agenda commands.     (line   6)
 * comment lines:                         Comment lines.       (line   6)
+* comment trees:                         Comment lines.       (line  13)
+* commented entries, in agenda views:    Agenda views.        (line  40)
 * completion, of dictionary words:       Completion.          (line   6)
 * completion, of file names:             Handling links.      (line  89)
 * completion, of link abbreviations:     Completion.          (line   6)
@@ -19006,10 +18912,10 @@ Concept index
 * completion, of TODO keywords <1>:      Completion.          (line   6)
 * completion, of TODO keywords:          Workflow states.     (line  15)
 * constants, in calculations:            References.          (line 110)
-* constants.el:                          Cooperation.         (line  14)
-* constcgs, STARTUP keyword:             In-buffer settings.  (line 148)
-* constSI, STARTUP keyword:              In-buffer settings.  (line 148)
-* content, STARTUP keyword <1>:          In-buffer settings.  (line  74)
+* constants.el:                          Cooperation.         (line  12)
+* constcgs, STARTUP keyword:             In-buffer settings.  (line 143)
+* constSI, STARTUP keyword:              In-buffer settings.  (line 143)
+* content, STARTUP keyword <1>:          In-buffer settings.  (line  71)
 * content, STARTUP keyword:              Initial visibility.  (line   6)
 * contents, global visibility state:     Global and local cycling.
                                                               (line  22)
@@ -19026,12 +18932,12 @@ Concept index
 * countdown timer:                       Timers.              (line   6)
 * creating timestamps:                   Creating timestamps. (line   6)
 * CSS, for HTML export:                  CSS support.         (line   6)
-* CUA.el:                                Conflicts.           (line  19)
+* CUA.el:                                Conflicts.           (line  18)
 * custom agenda views:                   Custom agenda views. (line   6)
 * custom date/time format:               Custom time format.  (line   6)
 * custom search strings:                 Custom searches.     (line   6)
 * customization:                         Customization.       (line   6)
-* customtime, STARTUP keyword:           In-buffer settings.  (line 144)
+* customtime, STARTUP keyword:           In-buffer settings.  (line 139)
 * cutting, of subtrees:                  Structure editing.   (line   6)
 * cycling, in plain lists:               Plain lists.         (line  69)
 * cycling, of agenda files:              Agenda files.        (line  22)
@@ -19057,7 +18963,7 @@ Concept index
                                                               (line 132)
 * demotion, of subtrees:                 Structure editing.   (line   6)
 * dependencies, of TODO states:          TODO dependencies.   (line   6)
-* diary entries, creating from agenda:   Agenda commands.     (line 462)
+* diary entries, creating from agenda:   Agenda commands.     (line 459)
 * diary integration:                     Weekly/daily agenda. (line  32)
 * dictionary word completion:            Completion.          (line   6)
 * directories, for publishing:           Sources and destinations.
@@ -19068,9 +18974,9 @@ Concept index
                                                               (line   6)
 * document structure:                    Document structure.  (line   6)
 * document title:                        Export settings.     (line  59)
-* Dominik, Carsten:                      Cooperation.         (line  14)
+* Dominik, Carsten:                      Cooperation.         (line  12)
 * DONE, final TODO keyword:              Per-file keywords.   (line  26)
-* dragging, agenda lines:                Agenda commands.     (line 356)
+* dragging, agenda lines:                Agenda commands.     (line 353)
 * drawer, for properties:                Property syntax.     (line   6)
 * drawer, for state change recording:    Tracking TODO state changes.
                                                               (line   6)
@@ -19087,7 +18993,7 @@ Concept index
                                                               (line   6)
 * dynamic blocks:                        Dynamic blocks.      (line   6)
 * dynamic indentation:                   Clean view.          (line   6)
-* ecomplete.el:                          Conflicts.           (line  35)
+* ecomplete.el:                          Conflicts.           (line  33)
 * editing tables:                        Tables.              (line   6)
 * editing, of table formulas:            Editing and debugging formulas.
                                                               (line   6)
@@ -19103,12 +19009,12 @@ Concept index
 * email, macro:                          Macro replacement.   (line  24)
 * embedding images in ODT:               Images in ODT export.
                                                               (line   6)
-* entitiesplain, STARTUP keyword:        In-buffer settings.  (line 171)
-* entitiespretty, STARTUP keyword <1>:   In-buffer settings.  (line 171)
+* entitiesplain, STARTUP keyword:        In-buffer settings.  (line 166)
+* entitiespretty, STARTUP keyword <1>:   In-buffer settings.  (line 166)
 * entitiespretty, STARTUP keyword:       Special symbols.     (line  34)
 * escaping characters:                   Special symbols.     (line  27)
 * evaluate time range:                   Creating timestamps. (line  62)
-* even, STARTUP keyword:                 In-buffer settings.  (line 134)
+* even, STARTUP keyword:                 In-buffer settings.  (line 129)
 * example blocks, in LaTeX export:       Example blocks in LaTeX export.
                                                               (line   6)
 * export back-end:                       Exporting.           (line  12)
@@ -19124,7 +19030,7 @@ Concept index
 * exporting:                             Exporting.           (line   6)
 * exporting agenda views <1>:            Exporting agenda views.
                                                               (line  13)
-* exporting agenda views:                Agenda commands.     (line 508)
+* exporting agenda views:                Agenda commands.     (line 505)
 * exporting, not:                        Comment lines.       (line   6)
 * extended TODO keywords:                TODO extensions.     (line   6)
 * external archiving:                    Moving subtrees.     (line   6)
@@ -19145,18 +19051,18 @@ Concept index
 * files for agenda:                      Agenda files.        (line   6)
 * files, adding to agenda list:          Agenda files.        (line  15)
 * files, selecting for publishing:       Selecting files.     (line   6)
-* filladapt.el:                          Conflicts.           (line  46)
+* filladapt.el:                          Conflicts.           (line  44)
 * filtering, by tag, category, top headline and effort, in agenda: Filtering/limiting agenda items.
                                                               (line  17)
 * Filters, exporting:                    Advanced configuration.
                                                               (line  32)
-* fnadjust, STARTUP keyword:             In-buffer settings.  (line 154)
-* fnauto, STARTUP keyword:               In-buffer settings.  (line 154)
-* fnconfirm, STARTUP keyword:            In-buffer settings.  (line 154)
-* fninline, STARTUP keyword:             In-buffer settings.  (line 154)
-* fnlocal, STARTUP keyword:              In-buffer settings.  (line 154)
-* fnplain, STARTUP keyword:              In-buffer settings.  (line 154)
-* fnprompt, STARTUP keyword:             In-buffer settings.  (line 154)
+* fnadjust, STARTUP keyword:             In-buffer settings.  (line 149)
+* fnauto, STARTUP keyword:               In-buffer settings.  (line 149)
+* fnconfirm, STARTUP keyword:            In-buffer settings.  (line 149)
+* fninline, STARTUP keyword:             In-buffer settings.  (line 149)
+* fnlocal, STARTUP keyword:              In-buffer settings.  (line 149)
+* fnplain, STARTUP keyword:              In-buffer settings.  (line 149)
+* fnprompt, STARTUP keyword:             In-buffer settings.  (line 149)
 * folded, subtree visibility state:      Global and local cycling.
                                                               (line  10)
 * folding, sparse trees:                 Sparse trees.        (line   6)
@@ -19202,9 +19108,9 @@ Concept index
 * headline, promotion and demotion:      Structure editing.   (line   6)
 * headlines:                             Headlines.           (line   6)
 * hide text:                             Visibility cycling.  (line   6)
-* hideblocks, STARTUP keyword <1>:       In-buffer settings.  (line 166)
+* hideblocks, STARTUP keyword <1>:       In-buffer settings.  (line 161)
 * hideblocks, STARTUP keyword:           Blocks.              (line  13)
-* hidestars, STARTUP keyword:            In-buffer settings.  (line 134)
+* hidestars, STARTUP keyword:            In-buffer settings.  (line 129)
 * hiding leading stars:                  Clean view.          (line   6)
 * history:                               History and acknowledgments.
                                                               (line   6)
@@ -19240,11 +19146,11 @@ Concept index
 * images, inline in LaTeX:               Images in LaTeX export.
                                                               (line   6)
 * images, inlining:                      Handling links.      (line 136)
-* imenu.el:                              Cooperation.         (line  30)
+* imenu.el:                              Cooperation.         (line  25)
 * in-buffer settings:                    In-buffer settings.  (line   6)
 * inactive timestamp:                    Timestamps.          (line  52)
 * include files, during export:          Include files.       (line   6)
-* indent, STARTUP keyword:               In-buffer settings.  (line  80)
+* indent, STARTUP keyword:               In-buffer settings.  (line  76)
 * indentation, in source blocks <1>:     Editing source code. (line  38)
 * indentation, in source blocks:         Literal examples.    (line  72)
 * index, in a publishing project:        Generating an index. (line   6)
@@ -19253,7 +19159,7 @@ Concept index
                                                               (line   6)
 * inheritance, of tags:                  Tag inheritance.     (line   6)
 * inlined images, markup rules:          Images and tables.   (line  22)
-* inlineimages, STARTUP keyword <1>:     In-buffer settings.  (line  95)
+* inlineimages, STARTUP keyword <1>:     In-buffer settings.  (line  90)
 * inlineimages, STARTUP keyword:         Handling links.      (line 136)
 * inlining images:                       Handling links.      (line 136)
 * inlining images in HTML:               Images in HTML export.
@@ -19288,7 +19194,7 @@ Concept index
 * LaTeX sectioning structure:            LaTeX header and sectioning.
                                                               (line   6)
 * LaTeX, and Orgtbl mode:                A LaTeX example.     (line   6)
-* latexpreview, STARTUP keyword:         In-buffer settings.  (line 102)
+* latexpreview, STARTUP keyword:         In-buffer settings.  (line  97)
 * Latin-1 export:                        ASCII/Latin-1/UTF-8 export.
                                                               (line   6)
 * level, require for tags/property match: Matching tags and properties.
@@ -19298,7 +19204,7 @@ Concept index
 * LibreOffice:                           OpenDocument Text export.
                                                               (line   6)
 * limits, in agenda:                     Filtering/limiting agenda items.
-                                                              (line 107)
+                                                              (line 118)
 * link abbreviations:                    Link abbreviations.  (line   6)
 * link abbreviations, completion of:     Completion.          (line   6)
 * link completion:                       Handling links.      (line  66)
@@ -19323,22 +19229,22 @@ Concept index
 * lists, ordered:                        Plain lists.         (line   6)
 * lists, plain:                          Plain lists.         (line   6)
 * literal examples, markup rules:        Literal examples.    (line   6)
-* logdone, STARTUP keyword:              In-buffer settings.  (line 108)
-* logdrawer, STARTUP keyword:            In-buffer settings.  (line 108)
+* logdone, STARTUP keyword:              In-buffer settings.  (line 103)
+* logdrawer, STARTUP keyword:            In-buffer settings.  (line 103)
 * logging, of progress:                  Progress logging.    (line   6)
-* lognoteclock-out, STARTUP keyword:     In-buffer settings.  (line 108)
-* lognotedone, STARTUP keyword:          In-buffer settings.  (line 108)
-* lognoteredeadline, STARTUP keyword:    In-buffer settings.  (line 108)
-* lognoterefile, STARTUP keyword:        In-buffer settings.  (line 108)
-* lognoterepeat, STARTUP keyword:        In-buffer settings.  (line 108)
-* lognotereschedule, STARTUP keyword:    In-buffer settings.  (line 108)
-* logredeadline, STARTUP keyword:        In-buffer settings.  (line 108)
-* logrefile, STARTUP keyword:            In-buffer settings.  (line 108)
-* logrepeat, STARTUP keyword:            In-buffer settings.  (line 108)
-* logreschedule, STARTUP keyword:        In-buffer settings.  (line 108)
-* logstatesreversed, STARTUP keyword:    In-buffer settings.  (line 108)
+* lognoteclock-out, STARTUP keyword:     In-buffer settings.  (line 103)
+* lognotedone, STARTUP keyword:          In-buffer settings.  (line 103)
+* lognoteredeadline, STARTUP keyword:    In-buffer settings.  (line 103)
+* lognoterefile, STARTUP keyword:        In-buffer settings.  (line 103)
+* lognoterepeat, STARTUP keyword:        In-buffer settings.  (line 103)
+* lognotereschedule, STARTUP keyword:    In-buffer settings.  (line 103)
+* logredeadline, STARTUP keyword:        In-buffer settings.  (line 103)
+* logrefile, STARTUP keyword:            In-buffer settings.  (line 103)
+* logrepeat, STARTUP keyword:            In-buffer settings.  (line 103)
+* logreschedule, STARTUP keyword:        In-buffer settings.  (line 103)
+* logstatesreversed, STARTUP keyword:    In-buffer settings.  (line 103)
 * lookup functions in tables:            Lookup functions.    (line   6)
-* Ludlam, Eric M.:                       Cooperation.         (line  39)
+* Ludlam, Eric M.:                       Cooperation.         (line  34)
 * macro replacement, during export:      Macro replacement.   (line   6)
 * maintainer:                            Feedback.            (line   6)
 * mapping entries, API:                  Using the mapping API.
@@ -19372,26 +19278,26 @@ Concept index
 * names as TODO keywords:                TODO types.          (line   6)
 * narrow columns in tables:              Column width and alignment.
                                                               (line   6)
-* noalign, STARTUP keyword:              In-buffer settings.  (line  88)
-* nofnadjust, STARTUP keyword:           In-buffer settings.  (line 154)
-* nofninline, STARTUP keyword:           In-buffer settings.  (line 154)
-* nohideblocks, STARTUP keyword <1>:     In-buffer settings.  (line 166)
+* noalign, STARTUP keyword:              In-buffer settings.  (line  85)
+* nofnadjust, STARTUP keyword:           In-buffer settings.  (line 149)
+* nofninline, STARTUP keyword:           In-buffer settings.  (line 149)
+* nohideblocks, STARTUP keyword <1>:     In-buffer settings.  (line 161)
 * nohideblocks, STARTUP keyword:         Blocks.              (line  13)
-* noindent, STARTUP keyword:             In-buffer settings.  (line  80)
-* noinlineimages, STARTUP keyword <1>:   In-buffer settings.  (line  95)
+* noindent, STARTUP keyword:             In-buffer settings.  (line  76)
+* noinlineimages, STARTUP keyword <1>:   In-buffer settings.  (line  90)
 * noinlineimages, STARTUP keyword:       Handling links.      (line 136)
-* nolatexpreview, STARTUP keyword:       In-buffer settings.  (line 102)
-* nologdone, STARTUP keyword:            In-buffer settings.  (line 108)
-* nologdrawer, STARTUP keyword:          In-buffer settings.  (line 108)
-* nolognoteclock-out, STARTUP keyword:   In-buffer settings.  (line 108)
-* nologredeadline, STARTUP keyword:      In-buffer settings.  (line 108)
-* nologrefile, STARTUP keyword:          In-buffer settings.  (line 108)
-* nologrepeat, STARTUP keyword:          In-buffer settings.  (line 108)
-* nologreschedule, STARTUP keyword:      In-buffer settings.  (line 108)
-* nologstatesreversed, STARTUP keyword:  In-buffer settings.  (line 108)
+* nolatexpreview, STARTUP keyword:       In-buffer settings.  (line  97)
+* nologdone, STARTUP keyword:            In-buffer settings.  (line 103)
+* nologdrawer, STARTUP keyword:          In-buffer settings.  (line 103)
+* nolognoteclock-out, STARTUP keyword:   In-buffer settings.  (line 103)
+* nologredeadline, STARTUP keyword:      In-buffer settings.  (line 103)
+* nologrefile, STARTUP keyword:          In-buffer settings.  (line 103)
+* nologrepeat, STARTUP keyword:          In-buffer settings.  (line 103)
+* nologreschedule, STARTUP keyword:      In-buffer settings.  (line 103)
+* nologstatesreversed, STARTUP keyword:  In-buffer settings.  (line 103)
 * occur, command:                        Sparse trees.        (line   6)
 * occur-tree:                            Storing searches.    (line   9)
-* odd, STARTUP keyword:                  In-buffer settings.  (line 134)
+* odd, STARTUP keyword:                  In-buffer settings.  (line 129)
 * odd-levels-only outlines:              Clean view.          (line   6)
 * ODT:                                   OpenDocument Text export.
                                                               (line   6)
@@ -19412,23 +19318,23 @@ Concept index
 * org-capture-last-stored:               Using capture.       (line  50)
 * org-crypt.el:                          org-crypt.           (line   6)
 * org-decrypt-entry:                     org-crypt.           (line   6)
-* org-hide-block-startup:                In-buffer settings.  (line 165)
+* org-hide-block-startup:                In-buffer settings.  (line 160)
 * org-insert-drawer <1>:                 Property syntax.     (line  90)
 * org-insert-drawer:                     Drawers.             (line   6)
 * org-list-insert-radio-list:            Radio lists.         (line   6)
-* org-pretty-entities:                   In-buffer settings.  (line 170)
+* org-pretty-entities:                   In-buffer settings.  (line 165)
 * org-publish-project-alist:             Project alist.       (line   6)
 * Orgstruct mode:                        Orgstruct mode.      (line   6)
 * Orgtbl mode <1>:                       Tables in arbitrary syntax.
                                                               (line   6)
 * Orgtbl mode:                           Orgtbl mode.         (line   6)
-* Ota, Takaaki:                          Cooperation.         (line  46)
+* Ota, Takaaki:                          Cooperation.         (line  41)
 * Outline mode:                          Outlines.            (line   6)
 * outline tree:                          Headlines.           (line   6)
 * outlines:                              Outlines.            (line   6)
 * overview, global visibility state:     Global and local cycling.
                                                               (line  22)
-* overview, STARTUP keyword <1>:         In-buffer settings.  (line  74)
+* overview, STARTUP keyword <1>:         In-buffer settings.  (line  71)
 * overview, STARTUP keyword:             Initial visibility.  (line   6)
 * packages, interaction with other:      Interaction.         (line   6)
 * paragraphs, markup rules:              Paragraphs.          (line   6)
@@ -19487,7 +19393,7 @@ Concept index
 * property, CATEGORY <1>:                Categories.          (line  12)
 * property, CATEGORY:                    Property inheritance.
                                                               (line  30)
-* property, COLUMNS <1>:                 In-buffer settings.  (line  28)
+* property, COLUMNS <1>:                 In-buffer settings.  (line  26)
 * property, COLUMNS:                     Property inheritance.
                                                               (line  22)
 * property, COOKIE_DATA <1>:             Checkboxes.          (line  30)
@@ -19570,9 +19476,9 @@ Concept index
                                                               (line  61)
 * relative timer:                        Timers.              (line   6)
 * reminders:                             Weekly/daily agenda. (line 126)
-* remote editing, bulk, from agenda:     Agenda commands.     (line 367)
-* remote editing, from agenda:           Agenda commands.     (line 230)
-* remote editing, undo:                  Agenda commands.     (line 231)
+* remote editing, bulk, from agenda:     Agenda commands.     (line 364)
+* remote editing, from agenda:           Agenda commands.     (line 227)
+* remote editing, undo:                  Agenda commands.     (line 228)
 * remote references:                     References.          (line 131)
 * repeated tasks:                        Repeated tasks.      (line   6)
 * report, of clocked time:               The clock table.     (line   6)
@@ -19614,11 +19520,11 @@ Concept index
 * show children, command:                Global and local cycling.
                                                               (line  51)
 * show hidden text:                      Visibility cycling.  (line   6)
-* showall, STARTUP keyword <1>:          In-buffer settings.  (line  74)
+* showall, STARTUP keyword <1>:          In-buffer settings.  (line  71)
 * showall, STARTUP keyword:              Initial visibility.  (line   6)
-* showeverything, STARTUP keyword <1>:   In-buffer settings.  (line  74)
+* showeverything, STARTUP keyword <1>:   In-buffer settings.  (line  71)
 * showeverything, STARTUP keyword:       Initial visibility.  (line   6)
-* showstars, STARTUP keyword:            In-buffer settings.  (line 134)
+* showstars, STARTUP keyword:            In-buffer settings.  (line 129)
 * shy hyphen, special symbol:            Special symbols.     (line  39)
 * sitemap, of published pages:           Sitemap.             (line   6)
 * sorting, of agenda items:              Sorting agenda items.
@@ -19639,9 +19545,9 @@ Concept index
 * source code, extracting:               Extracting source code.
                                                               (line   6)
 * source code, inline:                   Structure of code blocks.
-                                                              (line  23)
+                                                              (line  24)
 * source code, language:                 Structure of code blocks.
-                                                              (line  50)
+                                                              (line  51)
 * source code, languages:                Languages.           (line   6)
 * source code, library:                  Library of Babel.    (line   6)
 * source code, noweb reference:          Noweb reference syntax.
@@ -19649,7 +19555,7 @@ Concept index
 * source code, results of evaluation:    Results of evaluation.
                                                               (line   6)
 * source code, switches:                 Structure of code blocks.
-                                                              (line  55)
+                                                              (line  56)
 * source code, working with:             Working with source code.
                                                               (line   6)
 * sparse tree, for deadlines:            Inserting deadline/schedule.
@@ -19665,13 +19571,13 @@ Concept index
 * special symbols:                       Special symbols.     (line   6)
 * special symbols, in-buffer display:    Special symbols.     (line  31)
 * speed keys:                            Speed keys.          (line   6)
-* speedbar.el:                           Cooperation.         (line  39)
+* speedbar.el:                           Cooperation.         (line  34)
 * spreadsheet capabilities:              The spreadsheet.     (line   6)
 * square brackets, around links:         External links.      (line  69)
 * statistics, for checkboxes:            Checkboxes.          (line  30)
 * statistics, for TODO items:            Breaking down tasks. (line   6)
 * storing links:                         Handling links.      (line  10)
-* Storm, Kim. F.:                        Conflicts.           (line  19)
+* Storm, Kim. F.:                        Conflicts.           (line  18)
 * strike-through text, markup rules:     Emphasis and monospace.
                                                               (line   6)
 * structure editing:                     Structure editing.   (line   6)
@@ -19704,10 +19610,10 @@ Concept index
                                                               (line   6)
 * table editor, built-in:                Built-in table editor.
                                                               (line   6)
-* table editor, table.el:                Cooperation.         (line  46)
+* table editor, table.el:                Cooperation.         (line  41)
 * table lookup functions:                Lookup functions.    (line   6)
 * table of contents:                     Table of contents.   (line   6)
-* table.el:                              Cooperation.         (line  43)
+* table.el:                              Cooperation.         (line  38)
 * tables:                                Tables.              (line   6)
 * tables, in HTML:                       Tables in HTML export.
                                                               (line   6)
@@ -19804,7 +19710,7 @@ Concept index
 * types as TODO keywords:                TODO types.          (line   6)
 * underlined text, markup rules:         Emphasis and monospace.
                                                               (line   6)
-* undoing remote-editing events:         Agenda commands.     (line 231)
+* undoing remote-editing events:         Agenda commands.     (line 228)
 * unison:                                Uploading files.     (line   6)
 * unoconv:                               Extending ODT export.
                                                               (line  11)
@@ -19821,7 +19727,7 @@ Concept index
 * verbatim text, markup rules:           Emphasis and monospace.
                                                               (line   6)
 * verse blocks:                          Paragraphs.          (line  13)
-* viper.el:                              Conflicts.           (line  93)
+* viper.el:                              Conflicts.           (line  91)
 * visibility cycling:                    Visibility cycling.  (line   6)
 * visibility cycling, drawers:           Drawers.             (line   6)
 * visibility, initialize:                Initial visibility.  (line   6)
@@ -19829,9 +19735,9 @@ Concept index
 * VM links:                              External links.      (line  42)
 * WANDERLUST links:                      External links.      (line  42)
 * weekly agenda:                         Weekly/daily agenda. (line   6)
-* windmove.el:                           Conflicts.           (line  80)
+* windmove.el:                           Conflicts.           (line  78)
 * workflow states as TODO keywords:      Workflow states.     (line   6)
-* yasnippet.el:                          Conflicts.           (line  54)
+* yasnippet.el:                          Conflicts.           (line  52)
 * zip:                                   Pre-requisites for ODT export.
                                                               (line   6)
 
@@ -19844,18 +19750,18 @@ Key index
 [index]
 * Menu:
 
-* $:                                     Agenda commands.     (line 265)
-* %:                                     Agenda commands.     (line 384)
+* $:                                     Agenda commands.     (line 262)
+* %:                                     Agenda commands.     (line 381)
 * ':                                     CDLaTeX mode.        (line  43)
-* *:                                     Agenda commands.     (line 369)
-* +:                                     Agenda commands.     (line 287)
-* ,:                                     Agenda commands.     (line 279)
-* -:                                     Agenda commands.     (line 292)
+* *:                                     Agenda commands.     (line 366)
+* +:                                     Agenda commands.     (line 284)
+* ,:                                     Agenda commands.     (line 276)
+* -:                                     Agenda commands.     (line 289)
 * .:                                     Agenda commands.     (line 102)
 * / <1>:                                 Agenda commands.     (line 203)
 * /:                                     Filtering/limiting agenda items.
                                                               (line  17)
-* ::                                     Agenda commands.     (line 275)
+* ::                                     Agenda commands.     (line 272)
 * ;:                                     Timers.              (line   6)
 * < <1>:                                 Agenda commands.     (line 207)
 * < <2>:                                 Filtering/limiting agenda items.
@@ -19886,14 +19792,14 @@ Key index
                                                               (line  10)
 * = <1>:                                 Agenda commands.     (line 215)
 * =:                                     Filtering/limiting agenda items.
-                                                              (line  78)
-* > <1>:                                 Agenda commands.     (line 328)
+                                                              (line  81)
+* > <1>:                                 Agenda commands.     (line 325)
 * > <2>:                                 Agenda files.        (line  61)
 * > <3>:                                 The date/time prompt.
                                                               (line  82)
 * >:                                     Using column view.   (line  71)
 * ?:                                     Pulling from MobileOrg.
-                                                              (line  34)
+                                                              (line  28)
 * [ <1>:                                 Agenda commands.     (line 126)
 * [:                                     Filtering/limiting agenda items.
                                                               (line  57)
@@ -19902,30 +19808,31 @@ Key index
 * ^ <1>:                                 CDLaTeX mode.        (line  33)
 * ^ <2>:                                 Agenda commands.     (line 211)
 * ^:                                     Filtering/limiting agenda items.
-                                                              (line  74)
+                                                              (line  77)
 * _ <1>:                                 CDLaTeX mode.        (line  33)
+* _ <2>:                                 Agenda commands.     (line 218)
 * _:                                     Filtering/limiting agenda items.
-                                                              (line  87)
+                                                              (line  91)
 * `:                                     CDLaTeX mode.        (line  39)
-* a:                                     Agenda commands.     (line 253)
+* a:                                     Agenda commands.     (line 250)
 * A:                                     Agenda commands.     (line  69)
 * a:                                     Using column view.   (line  60)
-* B:                                     Agenda commands.     (line 387)
+* B:                                     Agenda commands.     (line 384)
 * b:                                     Agenda commands.     (line  99)
-* C:                                     Agenda commands.     (line 490)
-* c:                                     Agenda commands.     (line 457)
+* C:                                     Agenda commands.     (line 487)
+* c:                                     Agenda commands.     (line 454)
 * C-#:                                   Advanced features.   (line  10)
 * C-':                                   Agenda files.        (line  22)
 * C-,:                                   Agenda files.        (line  22)
 * C-0 C-c C-w:                           Refile and copy.     (line  47)
 * C-<RET>:                               Structure editing.   (line  23)
-* C-_:                                   Agenda commands.     (line 231)
+* C-_:                                   Agenda commands.     (line 228)
 * C-c !:                                 Creating timestamps. (line  15)
 * C-c #:                                 Checkboxes.          (line  85)
 * C-c $:                                 Moving subtrees.     (line   9)
 * C-c %:                                 Handling links.      (line 142)
 * C-c &:                                 Handling links.      (line 146)
-* C-c ' <1>:                             Cooperation.         (line  54)
+* C-c ' <1>:                             Cooperation.         (line  48)
 * C-c ' <2>:                             Editing source code. (line   6)
 * C-c ' <3>:                             Include files.       (line  58)
 * C-c ' <4>:                             Literal examples.    (line  87)
@@ -19942,7 +19849,7 @@ Key index
                                                               (line 105)
 * C-c -:                                 Plain lists.         (line 127)
 * C-c .:                                 Creating timestamps. (line  10)
-* C-c / <1>:                             Conflicts.           (line  93)
+* C-c / <1>:                             Conflicts.           (line  91)
 * C-c /:                                 Sparse trees.        (line  15)
 * C-c / /:                               Sparse trees.        (line  17)
 * C-c / a:                               Inserting deadline/schedule.
@@ -19983,7 +19890,7 @@ Key index
 * C-c a !:                               Stuck projects.      (line  14)
 * C-c a #:                               Stuck projects.      (line  13)
 * C-c a ?:                               Pulling from MobileOrg.
-                                                              (line  44)
+                                                              (line  37)
 * C-c a a:                               Weekly/daily agenda. (line   9)
 * C-c a C:                               Storing searches.    (line   9)
 * C-c a e:                               Exporting agenda views.
@@ -20005,7 +19912,7 @@ Key index
 * C-c c:                                 Conventions.         (line  35)
 * C-c c C:                               Capture templates.   (line  10)
 * C-c C-*:                               Plain lists.         (line 144)
-* C-c C-a <1>:                           Agenda commands.     (line 300)
+* C-c C-a <1>:                           Agenda commands.     (line 297)
 * C-c C-a:                               Attachments.         (line  26)
 * C-c C-a a:                             Attachments.         (line  31)
 * C-c C-a c:                             Attachments.         (line  37)
@@ -20023,7 +19930,7 @@ Key index
 * C-c C-a z:                             Attachments.         (line  44)
 * C-c C-b <1>:                           Editing support.     (line  11)
 * C-c C-b:                               Motion.              (line  15)
-* C-c C-c <1>:                           Cooperation.         (line  46)
+* C-c C-c <1>:                           Cooperation.         (line  41)
 * C-c C-c <2>:                           The very busy C-c C-c key.
                                                               (line   6)
 * C-c C-c <3>:                           Key bindings and useful functions.
@@ -20052,7 +19959,7 @@ Key index
 * C-c C-c D:                             Property syntax.     (line 107)
 * C-c C-c d:                             Property syntax.     (line 104)
 * C-c C-c s:                             Property syntax.     (line  96)
-* C-c C-d <1>:                           Agenda commands.     (line 307)
+* C-c C-d <1>:                           Agenda commands.     (line 304)
 * C-c C-d:                               Inserting deadline/schedule.
                                                               (line   9)
 * C-c C-e:                               The export dispatcher.
@@ -20119,104 +20026,104 @@ Key index
                                                               (line  53)
 * C-c C-r:                               Global and local cycling.
                                                               (line  38)
-* C-c C-s <1>:                           Agenda commands.     (line 303)
+* C-c C-s <1>:                           Agenda commands.     (line 300)
 * C-c C-s:                               Inserting deadline/schedule.
                                                               (line  16)
 * C-c C-t <1>:                           Clocking commands.   (line  67)
 * C-c C-t:                               TODO basics.         (line  13)
 * C-c C-u:                               Motion.              (line  18)
 * C-c C-v a:                             Key bindings and useful functions.
-                                                              (line  54)
+                                                              (line  36)
 * C-c C-v b:                             Key bindings and useful functions.
-                                                              (line  32)
+                                                              (line  25)
 * C-c C-v c:                             Key bindings and useful functions.
-                                                              (line  42)
+                                                              (line  30)
 * C-c C-v C-a:                           Key bindings and useful functions.
-                                                              (line  54)
+                                                              (line  36)
 * C-c C-v C-b:                           Key bindings and useful functions.
-                                                              (line  32)
+                                                              (line  25)
 * C-c C-v C-c:                           Key bindings and useful functions.
-                                                              (line  42)
+                                                              (line  30)
 * C-c C-v C-d:                           Key bindings and useful functions.
-                                                              (line  36)
+                                                              (line  27)
 * C-c C-v C-e:                           Key bindings and useful functions.
-                                                              (line  20)
+                                                              (line  19)
 * C-c C-v C-f:                           Key bindings and useful functions.
-                                                              (line  40)
+                                                              (line  29)
 * C-c C-v C-g:                           Key bindings and useful functions.
-                                                              (line  28)
+                                                              (line  23)
 * C-c C-v C-h:                           Key bindings and useful functions.
-                                                              (line  56)
+                                                              (line  37)
 * C-c C-v C-I:                           Key bindings and useful functions.
-                                                              (line  50)
+                                                              (line  34)
 * C-c C-v C-i:                           Key bindings and useful functions.
-                                                              (line  48)
+                                                              (line  33)
 * C-c C-v C-j:                           Key bindings and useful functions.
-                                                              (line  44)
+                                                              (line  31)
 * C-c C-v C-l:                           Key bindings and useful functions.
-                                                              (line  46)
+                                                              (line  32)
 * C-c C-v C-n:                           Key bindings and useful functions.
                                                               (line  18)
 * C-c C-v C-o:                           Key bindings and useful functions.
-                                                              (line  22)
+                                                              (line  20)
 * C-c C-v C-p:                           Key bindings and useful functions.
                                                               (line  18)
 * C-c C-v C-r:                           Key bindings and useful functions.
-                                                              (line  30)
+                                                              (line  24)
 * C-c C-v C-s:                           Key bindings and useful functions.
-                                                              (line  34)
+                                                              (line  26)
 * C-c C-v C-t:                           Key bindings and useful functions.
-                                                              (line  38)
+                                                              (line  28)
 * C-c C-v C-u:                           Key bindings and useful functions.
-                                                              (line  26)
+                                                              (line  22)
 * C-c C-v C-v:                           Key bindings and useful functions.
-                                                              (line  24)
+                                                              (line  21)
 * C-c C-v C-x:                           Key bindings and useful functions.
-                                                              (line  58)
+                                                              (line  38)
 * C-c C-v C-z:                           Key bindings and useful functions.
-                                                              (line  52)
+                                                              (line  35)
 * C-c C-v d:                             Key bindings and useful functions.
-                                                              (line  36)
+                                                              (line  27)
 * C-c C-v e:                             Key bindings and useful functions.
-                                                              (line  20)
+                                                              (line  19)
 * C-c C-v f:                             Key bindings and useful functions.
-                                                              (line  40)
+                                                              (line  29)
 * C-c C-v g:                             Key bindings and useful functions.
-                                                              (line  28)
+                                                              (line  23)
 * C-c C-v h:                             Key bindings and useful functions.
-                                                              (line  56)
+                                                              (line  37)
 * C-c C-v I:                             Key bindings and useful functions.
-                                                              (line  50)
+                                                              (line  34)
 * C-c C-v i <1>:                         Key bindings and useful functions.
-                                                              (line  48)
+                                                              (line  33)
 * C-c C-v i:                             Library of Babel.    (line  12)
 * C-c C-v j:                             Key bindings and useful functions.
-                                                              (line  44)
+                                                              (line  31)
 * C-c C-v l:                             Key bindings and useful functions.
-                                                              (line  46)
+                                                              (line  32)
 * C-c C-v n:                             Key bindings and useful functions.
                                                               (line  18)
 * C-c C-v o:                             Key bindings and useful functions.
-                                                              (line  22)
+                                                              (line  20)
 * C-c C-v p:                             Key bindings and useful functions.
                                                               (line  18)
 * C-c C-v r:                             Key bindings and useful functions.
-                                                              (line  30)
+                                                              (line  24)
 * C-c C-v s:                             Key bindings and useful functions.
-                                                              (line  34)
+                                                              (line  26)
 * C-c C-v t <1>:                         Key bindings and useful functions.
-                                                              (line  38)
+                                                              (line  28)
 * C-c C-v t:                             Extracting source code.
                                                               (line  36)
 * C-c C-v u:                             Key bindings and useful functions.
-                                                              (line  26)
+                                                              (line  22)
 * C-c C-v v:                             Key bindings and useful functions.
-                                                              (line  24)
+                                                              (line  21)
 * C-c C-v x:                             Key bindings and useful functions.
-                                                              (line  58)
+                                                              (line  38)
 * C-c C-v z:                             Key bindings and useful functions.
-                                                              (line  52)
-* C-c C-w <1>:                           Agenda commands.     (line 250)
+                                                              (line  35)
+* C-c C-w <1>:                           Agenda commands.     (line 247)
 * C-c C-w <2>:                           Refile and copy.     (line  14)
 * C-c C-w <3>:                           Using capture.       (line  22)
 * C-c C-w:                               Structure editing.   (line 103)
@@ -20232,15 +20139,15 @@ Key index
                                                               (line  20)
 * C-c C-x \:                             Special symbols.     (line  34)
 * C-c C-x _:                             Timers.              (line  47)
-* C-c C-x A:                             Agenda commands.     (line 261)
-* C-c C-x a:                             Agenda commands.     (line 258)
-* C-c C-x A:                             Internal archiving.  (line  49)
-* C-c C-x a:                             Internal archiving.  (line  36)
+* C-c C-x A:                             Agenda commands.     (line 258)
+* C-c C-x a:                             Agenda commands.     (line 255)
+* C-c C-x A:                             Internal archiving.  (line  50)
+* C-c C-x a:                             Internal archiving.  (line  37)
 * C-c C-x b <1>:                         Agenda commands.     (line  52)
 * C-c C-x b:                             Global and local cycling.
                                                               (line  55)
 * C-c C-x c:                             Structure editing.   (line  95)
-* C-c C-x C-a <1>:                       Agenda commands.     (line 253)
+* C-c C-x C-a <1>:                       Agenda commands.     (line 250)
 * C-c C-x C-a:                           Archiving.           (line  11)
 * C-c C-x C-b:                           Checkboxes.          (line  56)
 * C-c C-x C-c <1>:                       Agenda column view.  (line  11)
@@ -20258,7 +20165,7 @@ Key index
 * C-c C-x C-p:                           Handling links.      (line 152)
 * C-c C-x C-q:                           Clocking commands.   (line  71)
 * C-c C-x C-r:                           The clock table.     (line  10)
-* C-c C-x C-s <1>:                       Agenda commands.     (line 265)
+* C-c C-x C-s <1>:                       Agenda commands.     (line 262)
 * C-c C-x C-s:                           Moving subtrees.     (line   9)
 * C-c C-x C-t:                           Custom time format.  (line  12)
 * C-c C-x C-u <1>:                       Dynamic blocks.      (line  21)
@@ -20286,14 +20193,14 @@ Key index
 * C-c C-x o <1>:                         Checkboxes.          (line  77)
 * C-c C-x o:                             TODO dependencies.   (line  37)
 * C-c C-x p <1>:                         Header arguments in Org mode properties.
-                                                              (line  32)
+                                                              (line  31)
 * C-c C-x p:                             Property syntax.     (line  83)
 * C-c C-x q:                             Tag hierarchy.       (line  86)
 * C-c C-x v:                             Global and local cycling.
                                                               (line  61)
 * C-c C-y <1>:                           Clocking commands.   (line  51)
 * C-c C-y:                               Creating timestamps. (line  59)
-* C-c C-z <1>:                           Agenda commands.     (line 295)
+* C-c C-z <1>:                           Agenda commands.     (line 292)
 * C-c C-z:                               Drawers.             (line  35)
 * C-c l <1>:                             Literal examples.    (line  95)
 * C-c l:                                 Handling links.      (line   9)
@@ -20307,17 +20214,17 @@ Key index
                                                               (line  41)
 * C-c }:                                 Editing and debugging formulas.
                                                               (line  26)
-* C-c ~:                                 Cooperation.         (line  56)
-* C-k:                                   Agenda commands.     (line 244)
-* C-S-<left> <1>:                        Agenda commands.     (line 242)
+* C-c ~:                                 Cooperation.         (line  50)
+* C-k:                                   Agenda commands.     (line 241)
+* C-S-<left> <1>:                        Agenda commands.     (line 239)
 * C-S-<left>:                            Multiple sets in one file.
                                                               (line  25)
 * C-S-<RET>:                             Structure editing.   (line  30)
-* C-S-<right> <1>:                       Agenda commands.     (line 239)
+* C-S-<right> <1>:                       Agenda commands.     (line 236)
 * C-S-<right>:                           Multiple sets in one file.
                                                               (line  25)
 * C-S-<up/down>:                         Clocking commands.   (line  56)
-* C-TAB:                                 Internal archiving.  (line  46)
+* C-TAB:                                 Internal archiving.  (line  47)
 * C-u C-c !:                             Creating timestamps. (line  19)
 * C-u C-c *:                             Updating the table.  (line  16)
 * C-u C-c .:                             Creating timestamps. (line  19)
@@ -20330,7 +20237,7 @@ Key index
 * C-u C-c C-l:                           Handling links.      (line  86)
 * C-u C-c C-t:                           TODO basics.         (line  28)
 * C-u C-c C-w:                           Refile and copy.     (line  33)
-* C-u C-c C-x a:                         Internal archiving.  (line  39)
+* C-u C-c C-x a:                         Internal archiving.  (line  40)
 * C-u C-c C-x C-s:                       Moving subtrees.     (line  11)
 * C-u C-c C-x C-u <1>:                   Dynamic blocks.      (line  22)
 * C-u C-c C-x C-u <2>:                   The clock table.     (line  20)
@@ -20358,7 +20265,7 @@ Key index
                                                               (line  47)
 * C-x C-w <1>:                           Exporting agenda views.
                                                               (line  12)
-* C-x C-w:                               Agenda commands.     (line 507)
+* C-x C-w:                               Agenda commands.     (line 504)
 * C-x n b:                               Structure editing.   (line 122)
 * C-x n s:                               Structure editing.   (line 119)
 * C-x n w:                               Structure editing.   (line 125)
@@ -20372,18 +20279,18 @@ Key index
 * g:                                     Agenda commands.     (line 175)
 * G:                                     Agenda commands.     (line 164)
 * g:                                     Using column view.   (line  24)
-* H:                                     Agenda commands.     (line 494)
-* i:                                     Agenda commands.     (line 462)
-* I:                                     Agenda commands.     (line 333)
+* H:                                     Agenda commands.     (line 491)
+* i:                                     Agenda commands.     (line 459)
+* I:                                     Agenda commands.     (line 330)
 * J:                                     Agenda commands.     (line 108)
 * j:                                     Agenda commands.     (line 105)
-* k:                                     Agenda commands.     (line 346)
+* k:                                     Agenda commands.     (line 343)
 * l:                                     Agenda commands.     (line 115)
 * L:                                     Agenda commands.     (line  36)
-* M:                                     Agenda commands.     (line 481)
-* m:                                     Agenda commands.     (line 367)
-* M-*:                                   Agenda commands.     (line 381)
-* M-<down> <1>:                          Agenda commands.     (line 360)
+* M:                                     Agenda commands.     (line 478)
+* m:                                     Agenda commands.     (line 364)
+* M-*:                                   Agenda commands.     (line 378)
+* M-<down> <1>:                          Agenda commands.     (line 357)
 * M-<down> <2>:                          Editing and debugging formulas.
                                                               (line  77)
 * M-<down> <3>:                          Built-in table editor.
@@ -20402,13 +20309,13 @@ Key index
                                                               (line  86)
 * M-<right> <2>:                         Plain lists.         (line 103)
 * M-<right>:                             Structure editing.   (line  44)
-* M-<TAB> <1>:                           Completion.          (line  10)
+* M-<TAB> <1>:                           Completion.          (line  15)
 * M-<TAB> <2>:                           Property syntax.     (line  80)
 * M-<TAB> <3>:                           Setting tags.        (line   6)
 * M-<TAB> <4>:                           Per-file keywords.   (line  23)
 * M-<TAB>:                               Editing and debugging formulas.
                                                               (line  64)
-* M-<up> <1>:                            Agenda commands.     (line 356)
+* M-<up> <1>:                            Agenda commands.     (line 353)
 * M-<up> <2>:                            Editing and debugging formulas.
                                                               (line  77)
 * M-<up> <3>:                            Built-in table editor.
@@ -20425,7 +20332,7 @@ Key index
 * M-g n:                                 Sparse trees.        (line  29)
 * M-g p:                                 Sparse trees.        (line  32)
 * M-h:                                   Structure editing.   (line  59)
-* M-m:                                   Agenda commands.     (line 378)
+* M-m:                                   Agenda commands.     (line 375)
 * M-S-<down> <1>:                        The date/time prompt.
                                                               (line  82)
 * M-S-<down> <2>:                        Editing and debugging formulas.
@@ -20472,20 +20379,20 @@ Key index
 * N:                                     Agenda commands.     (line  23)
 * n <1>:                                 Agenda commands.     (line  19)
 * n:                                     Using column view.   (line  43)
-* O:                                     Agenda commands.     (line 337)
+* O:                                     Agenda commands.     (line 334)
 * o:                                     Agenda commands.     (line  71)
 * P:                                     Agenda commands.     (line  26)
 * p <1>:                                 Agenda commands.     (line  20)
 * p:                                     Using column view.   (line  43)
-* q <1>:                                 Agenda commands.     (line 521)
+* q <1>:                                 Agenda commands.     (line 518)
 * q:                                     Using column view.   (line  27)
 * r:                                     Agenda commands.     (line 168)
 * R:                                     Agenda commands.     (line 137)
 * r <1>:                                 Global TODO list.    (line  23)
 * r:                                     Using column view.   (line  20)
-* S:                                     Agenda commands.     (line 485)
+* S:                                     Agenda commands.     (line 482)
 * s:                                     Agenda commands.     (line 178)
-* S-<down> <1>:                          Agenda commands.     (line 292)
+* S-<down> <1>:                          Agenda commands.     (line 289)
 * S-<down> <2>:                          The date/time prompt.
                                                               (line  82)
 * S-<down> <3>:                          Creating timestamps. (line  47)
@@ -20493,7 +20400,7 @@ Key index
 * S-<down> <5>:                          Editing and debugging formulas.
                                                               (line  67)
 * S-<down>:                              Plain lists.         (line  90)
-* S-<left> <1>:                          Agenda commands.     (line 324)
+* S-<left> <1>:                          Agenda commands.     (line 321)
 * S-<left> <2>:                          The clock table.     (line  24)
 * S-<left> <3>:                          The date/time prompt.
                                                               (line  82)
@@ -20508,7 +20415,7 @@ Key index
 * S-<left>:                              Plain lists.         (line 149)
 * S-<RET>:                               Built-in table editor.
                                                               (line 165)
-* S-<right> <1>:                         Agenda commands.     (line 310)
+* S-<right> <1>:                         Agenda commands.     (line 307)
 * S-<right> <2>:                         The clock table.     (line  24)
 * S-<right> <3>:                         The date/time prompt.
                                                               (line  82)
@@ -20525,7 +20432,7 @@ Key index
                                                               (line  66)
 * S-<TAB>:                               Global and local cycling.
                                                               (line  22)
-* S-<up> <1>:                            Agenda commands.     (line 287)
+* S-<up> <1>:                            Agenda commands.     (line 284)
 * S-<up> <2>:                            The date/time prompt.
                                                               (line  82)
 * S-<up> <3>:                            Creating timestamps. (line  47)
@@ -20536,10 +20443,10 @@ Key index
 * S-M-<RET>:                             TODO basics.         (line  58)
 * S-M-<right>:                           Using column view.   (line  73)
 * S-M-<up/down>:                         Clocking commands.   (line  60)
-* T:                                     Agenda commands.     (line 270)
-* t:                                     Agenda commands.     (line 235)
-* U:                                     Agenda commands.     (line 375)
-* u:                                     Agenda commands.     (line 372)
+* T:                                     Agenda commands.     (line 267)
+* t:                                     Agenda commands.     (line 232)
+* U:                                     Agenda commands.     (line 372)
+* u:                                     Agenda commands.     (line 369)
 * v:                                     Using column view.   (line  56)
 * v [:                                   Agenda commands.     (line 126)
 * v A:                                   Agenda commands.     (line 133)
@@ -20556,18 +20463,18 @@ Key index
 * v w:                                   Agenda commands.     (line  77)
 * v y:                                   Agenda commands.     (line  80)
 * w:                                     Agenda commands.     (line  77)
-* x:                                     Agenda commands.     (line 522)
-* X:                                     Agenda commands.     (line 340)
-* z:                                     Agenda commands.     (line 295)
+* x:                                     Agenda commands.     (line 519)
+* X:                                     Agenda commands.     (line 337)
+* z:                                     Agenda commands.     (line 292)
 * {:                                     Filtering/limiting agenda items.
                                                               (line  57)
-* | <1>:                                 Agenda commands.     (line 224)
+* | <1>:                                 Agenda commands.     (line 221)
 * |:                                     Filtering/limiting agenda items.
-                                                              (line 101)
+                                                              (line 112)
 * }:                                     Filtering/limiting agenda items.
                                                               (line  57)
 * ~:                                     Filtering/limiting agenda items.
-                                                              (line 143)
+                                                              (line 154)
 
 
 File: org,  Node: Command and Function Index,  Next: Variable Index,  Prev: Key Index,  Up: Top
@@ -20583,70 +20490,71 @@ Command and function index
 * next-error:                            Sparse trees.        (line  29)
 * org-agenda <1>:                        Conventions.         (line  35)
 * org-agenda:                            Activation.          (line   6)
-* org-agenda-add-note:                   Agenda commands.     (line 295)
-* org-agenda-archive:                    Agenda commands.     (line 265)
+* org-agenda-add-note:                   Agenda commands.     (line 292)
+* org-agenda-archive:                    Agenda commands.     (line 262)
 * org-agenda-archive-default-with-confirmation: Agenda commands.
-                                                              (line 253)
-* org-agenda-archive-to-archive-sibling: Agenda commands.     (line 261)
+                                                              (line 250)
+* org-agenda-archive-to-archive-sibling: Agenda commands.     (line 258)
 * org-agenda-archives-mode:              Agenda commands.     (line 130)
 * org-agenda-archives-mode 'files:       Agenda commands.     (line 133)
-* org-agenda-bulk-action:                Agenda commands.     (line 387)
-* org-agenda-bulk-mark:                  Agenda commands.     (line 367)
-* org-agenda-bulk-mark-all:              Agenda commands.     (line 369)
-* org-agenda-bulk-mark-regexp:           Agenda commands.     (line 384)
-* org-agenda-bulk-remove-all-marks:      Agenda commands.     (line 375)
-* org-agenda-bulk-toggle:                Agenda commands.     (line 378)
-* org-agenda-bulk-toggle-all:            Agenda commands.     (line 381)
-* org-agenda-bulk-unmark:                Agenda commands.     (line 372)
-* org-agenda-capture:                    Agenda commands.     (line 346)
-* org-agenda-clock-cancel:               Agenda commands.     (line 340)
+* org-agenda-bulk-action:                Agenda commands.     (line 384)
+* org-agenda-bulk-mark:                  Agenda commands.     (line 364)
+* org-agenda-bulk-mark-all:              Agenda commands.     (line 366)
+* org-agenda-bulk-mark-regexp:           Agenda commands.     (line 381)
+* org-agenda-bulk-remove-all-marks:      Agenda commands.     (line 372)
+* org-agenda-bulk-toggle:                Agenda commands.     (line 375)
+* org-agenda-bulk-toggle-all:            Agenda commands.     (line 378)
+* org-agenda-bulk-unmark:                Agenda commands.     (line 369)
+* org-agenda-capture:                    Agenda commands.     (line 343)
+* org-agenda-clock-cancel:               Agenda commands.     (line 337)
 * org-agenda-clock-goto:                 Agenda commands.     (line 108)
-* org-agenda-clock-in:                   Agenda commands.     (line 333)
-* org-agenda-clock-out:                  Agenda commands.     (line 337)
+* org-agenda-clock-in:                   Agenda commands.     (line 330)
+* org-agenda-clock-out:                  Agenda commands.     (line 334)
 * org-agenda-clockreport-mode:           Agenda commands.     (line 137)
 * org-agenda-columns <1>:                Agenda column view.  (line  11)
 * org-agenda-columns:                    Agenda commands.     (line 182)
-* org-agenda-convert-date:               Agenda commands.     (line 490)
-* org-agenda-date-prompt:                Agenda commands.     (line 328)
+* org-agenda-convert-date:               Agenda commands.     (line 487)
+* org-agenda-date-prompt:                Agenda commands.     (line 325)
 * org-agenda-day-view:                   Agenda commands.     (line  74)
-* org-agenda-deadline:                   Agenda commands.     (line 307)
-* org-agenda-diary-entry:                Agenda commands.     (line 462)
-* org-agenda-do-date-earlier:            Agenda commands.     (line 324)
-* org-agenda-do-date-later:              Agenda commands.     (line 310)
-* org-agenda-drag-line-backward:         Agenda commands.     (line 356)
-* org-agenda-drag-line-forward:          Agenda commands.     (line 360)
+* org-agenda-deadline:                   Agenda commands.     (line 304)
+* org-agenda-diary-entry:                Agenda commands.     (line 459)
+* org-agenda-do-date-earlier:            Agenda commands.     (line 321)
+* org-agenda-do-date-later:              Agenda commands.     (line 307)
+* org-agenda-drag-line-backward:         Agenda commands.     (line 353)
+* org-agenda-drag-line-forward:          Agenda commands.     (line 357)
 * org-agenda-earlier:                    Agenda commands.     (line  99)
 * org-agenda-entry-text-mode:            Agenda commands.     (line 156)
-* org-agenda-exit:                       Agenda commands.     (line 522)
+* org-agenda-exit:                       Agenda commands.     (line 519)
 * org-agenda-file-to-front:              Agenda files.        (line  15)
 * org-agenda-filter-by-category <1>:     Agenda commands.     (line 207)
 * org-agenda-filter-by-category:         Filtering/limiting agenda items.
                                                               (line  67)
+* org-agenda-filter-by-effort <1>:       Agenda commands.     (line 218)
 * org-agenda-filter-by-effort:           Filtering/limiting agenda items.
-                                                              (line  87)
+                                                              (line  91)
 * org-agenda-filter-by-regexp <1>:       Agenda commands.     (line 215)
 * org-agenda-filter-by-regexp:           Filtering/limiting agenda items.
-                                                              (line  78)
+                                                              (line  81)
 * org-agenda-filter-by-tag <1>:          Agenda commands.     (line 203)
 * org-agenda-filter-by-tag:              Filtering/limiting agenda items.
                                                               (line  17)
 * org-agenda-filter-by-top-headline <1>: Agenda commands.     (line 211)
 * org-agenda-filter-by-top-headline:     Filtering/limiting agenda items.
-                                                              (line  74)
-* org-agenda-filter-remove-all <1>:      Agenda commands.     (line 224)
+                                                              (line  77)
+* org-agenda-filter-remove-all <1>:      Agenda commands.     (line 221)
 * org-agenda-filter-remove-all:          Filtering/limiting agenda items.
-                                                              (line 101)
+                                                              (line 112)
 * org-agenda-follow-mode:                Agenda commands.     (line  45)
 * org-agenda-fortnight-view:             Agenda commands.     (line  78)
 * org-agenda-goto:                       Agenda commands.     (line  39)
-* org-agenda-goto-calendar:              Agenda commands.     (line 457)
+* org-agenda-goto-calendar:              Agenda commands.     (line 454)
 * org-agenda-goto-date:                  Agenda commands.     (line 105)
 * org-agenda-goto-today:                 Agenda commands.     (line 102)
-* org-agenda-holidays:                   Agenda commands.     (line 494)
-* org-agenda-kill:                       Agenda commands.     (line 244)
+* org-agenda-holidays:                   Agenda commands.     (line 491)
+* org-agenda-kill:                       Agenda commands.     (line 241)
 * org-agenda-later:                      Agenda commands.     (line  93)
 * org-agenda-limit-interactively:        Filtering/limiting agenda items.
-                                                              (line 143)
+                                                              (line 154)
 * org-agenda-list:                       Weekly/daily agenda. (line   9)
 * org-agenda-list-stuck-projects:        Stuck projects.      (line  13)
 * org-agenda-log-mode:                   Agenda commands.     (line 115)
@@ -20655,47 +20563,47 @@ Command and function index
 * org-agenda-next-item:                  Agenda commands.     (line  23)
 * org-agenda-next-line:                  Agenda commands.     (line  19)
 * org-agenda-open-link:                  Agenda commands.     (line  61)
-* org-agenda-phases-of-moon:             Agenda commands.     (line 481)
+* org-agenda-phases-of-moon:             Agenda commands.     (line 478)
 * org-agenda-previous-item:              Agenda commands.     (line  26)
 * org-agenda-previous-line:              Agenda commands.     (line  20)
-* org-agenda-priority-down:              Agenda commands.     (line 292)
-* org-agenda-priority-up:                Agenda commands.     (line 287)
-* org-agenda-quit:                       Agenda commands.     (line 521)
+* org-agenda-priority-down:              Agenda commands.     (line 289)
+* org-agenda-priority-up:                Agenda commands.     (line 284)
+* org-agenda-quit:                       Agenda commands.     (line 518)
 * org-agenda-recenter:                   Agenda commands.     (line  36)
 * org-agenda-redo:                       Agenda commands.     (line 168)
-* org-agenda-refile:                     Agenda commands.     (line 250)
+* org-agenda-refile:                     Agenda commands.     (line 247)
 * org-agenda-remove-restriction-lock <1>: Agenda commands.    (line 193)
 * org-agenda-remove-restriction-lock:    Agenda files.        (line  49)
 * org-agenda-reset-view:                 Agenda commands.     (line  81)
-* org-agenda-schedule:                   Agenda commands.     (line 303)
+* org-agenda-schedule:                   Agenda commands.     (line 300)
 * org-agenda-set-restriction-lock:       Agenda files.        (line  42)
-* org-agenda-set-tags:                   Agenda commands.     (line 275)
+* org-agenda-set-tags:                   Agenda commands.     (line 272)
 * org-agenda-show-and-scroll-up:         Agenda commands.     (line  34)
-* org-agenda-show-priority:              Agenda commands.     (line 284)
-* org-agenda-show-tags:                  Agenda commands.     (line 270)
-* org-agenda-sunrise-sunset:             Agenda commands.     (line 485)
+* org-agenda-show-priority:              Agenda commands.     (line 281)
+* org-agenda-show-tags:                  Agenda commands.     (line 267)
+* org-agenda-sunrise-sunset:             Agenda commands.     (line 482)
 * org-agenda-switch-to:                  Agenda commands.     (line  42)
-* org-agenda-todo:                       Agenda commands.     (line 235)
-* org-agenda-todo-nextset:               Agenda commands.     (line 239)
-* org-agenda-todo-previousset:           Agenda commands.     (line 242)
-* org-agenda-toggle-archive-tag:         Agenda commands.     (line 258)
+* org-agenda-todo:                       Agenda commands.     (line 232)
+* org-agenda-todo-nextset:               Agenda commands.     (line 236)
+* org-agenda-todo-previousset:           Agenda commands.     (line 239)
+* org-agenda-toggle-archive-tag:         Agenda commands.     (line 255)
 * org-agenda-toggle-diary:               Agenda commands.     (line 111)
 * org-agenda-toggle-time-grid:           Agenda commands.     (line 164)
 * org-agenda-tree-to-indirect-buffer:    Agenda commands.     (line  52)
-* org-agenda-undo:                       Agenda commands.     (line 231)
+* org-agenda-undo:                       Agenda commands.     (line 228)
 * org-agenda-week-view:                  Agenda commands.     (line  77)
 * org-agenda-write <1>:                  Exporting agenda views.
                                                               (line  12)
-* org-agenda-write:                      Agenda commands.     (line 507)
+* org-agenda-write:                      Agenda commands.     (line 504)
 * org-agenda-year-view:                  Agenda commands.     (line  80)
 * org-archive-subtree:                   Moving subtrees.     (line   9)
 * org-archive-subtree-default:           Archiving.           (line  11)
-* org-archive-to-archive-sibling:        Internal archiving.  (line  49)
+* org-archive-to-archive-sibling:        Internal archiving.  (line  50)
 * org-ascii-export-as-ascii:             ASCII/Latin-1/UTF-8 export.
                                                               (line  25)
 * org-ascii-export-to-ascii:             ASCII/Latin-1/UTF-8 export.
                                                               (line  21)
-* org-attach <1>:                        Agenda commands.     (line 300)
+* org-attach <1>:                        Agenda commands.     (line 297)
 * org-attach:                            Attachments.         (line  26)
 * org-attach-attach:                     Attachments.         (line  31)
 * org-attach-delete-all:                 Attachments.         (line  66)
@@ -20717,8 +20625,8 @@ Command and function index
                                                               (line  12)
 * org-beamer-select-environment:         Editing support.     (line  11)
 * org-buffer-property-keys:              Using the property API.
-                                                              (line  35)
-* org-calendar-goto-agenda:              Agenda commands.     (line 458)
+                                                              (line  34)
+* org-calendar-goto-agenda:              Agenda commands.     (line 455)
 * org-capture <1>:                       Using capture.       (line   6)
 * org-capture <2>:                       Conventions.         (line  35)
 * org-capture:                           Activation.          (line   6)
@@ -20777,37 +20685,37 @@ Command and function index
 * org-delete-property:                   Property syntax.     (line 104)
 * org-delete-property-globally:          Property syntax.     (line 107)
 * org-demote:                            Using the mapping API.
-                                                              (line  83)
+                                                              (line  78)
 * org-demote-subtree:                    Structure editing.   (line  50)
 * org-do-demote:                         Structure editing.   (line  44)
 * org-do-promote:                        Structure editing.   (line  41)
-* org-edit-special:                      Cooperation.         (line  54)
+* org-edit-special:                      Cooperation.         (line  48)
 * org-entities-help:                     Special symbols.     (line  16)
 * org-entry-add-to-multivalued-property: Using the property API.
-                                                              (line  52)
+                                                              (line  51)
 * org-entry-delete:                      Using the property API.
-                                                              (line  29)
+                                                              (line  28)
 * org-entry-get:                         Using the property API.
-                                                              (line  20)
+                                                              (line  19)
 * org-entry-get-multivalued-property:    Using the property API.
-                                                              (line  47)
+                                                              (line  46)
 * org-entry-member-in-multivalued-property: Using the property API.
-                                                              (line  64)
+                                                              (line  63)
 * org-entry-properties:                  Using the property API.
-                                                              (line  10)
+                                                              (line   9)
 * org-entry-put:                         Using the property API.
-                                                              (line  32)
+                                                              (line  31)
 * org-entry-put-multivalued-property:    Using the property API.
-                                                              (line  42)
+                                                              (line  41)
 * org-entry-remove-from-multivalued-property: Using the property API.
-                                                              (line  58)
+                                                              (line  57)
 * org-evaluate-time-range <1>:           Clocking commands.   (line  51)
 * org-evaluate-time-range:               Creating timestamps. (line  59)
 * org-export-dispatch:                   The export dispatcher.
                                                               (line  10)
 * org-feed-goto-inbox:                   RSS feeds.           (line  27)
 * org-feed-update-all:                   RSS feeds.           (line  23)
-* org-force-cycle-archived:              Internal archiving.  (line  46)
+* org-force-cycle-archived:              Internal archiving.  (line  47)
 * org-forward-same-level:                Motion.              (line  12)
 * org-global-cycle:                      Global and local cycling.
                                                               (line  22)
@@ -20828,7 +20736,7 @@ Command and function index
 * org-insert-heading-respect-content:    Structure editing.   (line  23)
 * org-insert-link:                       Handling links.      (line  65)
 * org-insert-property-drawer:            Using the property API.
-                                                              (line  19)
+                                                              (line  18)
 * org-insert-todo-heading <1>:           Checkboxes.          (line  74)
 * org-insert-todo-heading <2>:           TODO basics.         (line  58)
 * org-insert-todo-heading:               Structure editing.   (line  26)
@@ -20844,7 +20752,7 @@ Command and function index
 * org-lookup-first:                      Lookup functions.    (line   8)
 * org-lookup-last:                       Lookup functions.    (line  18)
 * org-map-entries:                       Using the mapping API.
-                                                              (line  13)
+                                                              (line  12)
 * org-mark-element:                      Structure editing.   (line  59)
 * org-mark-ring-goto:                    Handling links.      (line 146)
 * org-mark-ring-push:                    Handling links.      (line 142)
@@ -20869,12 +20777,12 @@ Command and function index
 * org-previous-link:                     Handling links.      (line 152)
 * org-previous-visible-heading:          Motion.              (line   9)
 * org-priority <1>:                      Using the mapping API.
-                                                              (line  71)
+                                                              (line  66)
 * org-priority:                          Priorities.          (line  24)
 * org-priority-down:                     Priorities.          (line  29)
 * org-priority-up:                       Priorities.          (line  29)
 * org-promote:                           Using the mapping API.
-                                                              (line  80)
+                                                              (line  75)
 * org-promote-subtree:                   Structure editing.   (line  47)
 * org-property-action:                   Property syntax.     (line  92)
 * org-property-next-allowed-value:       Property syntax.     (line 100)
@@ -20924,7 +20832,7 @@ Command and function index
                                                               (line 132)
 * org-table-create-or-convert-from-region: Built-in table editor.
                                                               (line  41)
-* org-table-create-with-table.el:        Cooperation.         (line  56)
+* org-table-create-with-table.el:        Cooperation.         (line  50)
 * org-table-cut-region:                  Built-in table editor.
                                                               (line 136)
 * org-table-delete-column:               Built-in table editor.
@@ -21032,19 +20940,19 @@ Command and function index
 * org-timestamp-up-day:                  Creating timestamps. (line  42)
 * org-timestamp-up/down:                 Clocking commands.   (line  60)
 * org-todo <1>:                          Using the mapping API.
-                                                              (line  67)
+                                                              (line  62)
 * org-todo <2>:                          Clocking commands.   (line  67)
 * org-todo:                              TODO basics.         (line  13)
 * org-todo-list <1>:                     Global TODO list.    (line   9)
 * org-todo-list:                         TODO basics.         (line  50)
-* org-toggle-archive-tag:                Internal archiving.  (line  36)
+* org-toggle-archive-tag:                Internal archiving.  (line  37)
 * org-toggle-checkbox:                   Checkboxes.          (line  52)
 * org-toggle-heading:                    Structure editing.   (line 128)
 * org-toggle-inline-images:              Handling links.      (line 133)
 * org-toggle-ordered-property <1>:       Checkboxes.          (line  77)
 * org-toggle-ordered-property:           TODO dependencies.   (line  37)
 * org-toggle-tag:                        Using the mapping API.
-                                                              (line  75)
+                                                              (line  70)
 * org-toggle-time-stamp-overlays:        Custom time format.  (line  12)
 * org-tree-to-indirect-buffer:           Global and local cycling.
                                                               (line  55)
@@ -21070,78 +20978,78 @@ Variable index
 **************
 
 This is not a complete index of variables and faces, only the ones that
-are mentioned in the manual.  For a more complete list, use `M-x
-org-customize <RET>' and then click yourself through the tree.
+are mentioned in the manual.  For a complete list, use `M-x
+org-customize <RET>'.
 
 [index]
 * Menu:
 
 * cdlatex-simplify-sub-super-scripts:    CDLaTeX mode.        (line  33)
-* constants-unit-system <1>:             In-buffer settings.  (line 147)
+* constants-unit-system <1>:             In-buffer settings.  (line 142)
 * constants-unit-system:                 References.          (line 117)
 * htmlize-output-type:                   Exporting agenda views.
                                                               (line  20)
-* LaTeX-verbatim-environments:           A LaTeX example.     (line  21)
-* org-adapt-indentation:                 Clean view.          (line  45)
+* LaTeX-verbatim-environments:           A LaTeX example.     (line  20)
+* org-adapt-indentation:                 Clean view.          (line  52)
 * org-agenda-add-entry-text-maxlines:    Exporting agenda views.
                                                               (line  20)
-* org-agenda-bulk-custom-functions:      Agenda commands.     (line 367)
-* org-agenda-category-filter-preset <1>: Agenda commands.     (line 208)
+* org-agenda-bulk-custom-functions:      Agenda commands.     (line 364)
 * org-agenda-category-filter-preset:     Filtering/limiting agenda items.
                                                               (line  68)
 * org-agenda-clock-consistency-checks:   Agenda commands.     (line 151)
 * org-agenda-columns-add-appointments-to-effort-sum: Effort estimates.
                                                               (line  41)
-* org-agenda-confirm-kill:               Agenda commands.     (line 247)
+* org-agenda-confirm-kill:               Agenda commands.     (line 244)
 * org-agenda-custom-commands <1>:        Extracting agenda information.
                                                               (line   6)
 * org-agenda-custom-commands <2>:        Setting options.     (line   6)
 * org-agenda-custom-commands <3>:        Storing searches.    (line   9)
 * org-agenda-custom-commands:            Sparse trees.        (line  37)
 * org-agenda-custom-commands-contexts:   Setting options.     (line  61)
-* org-agenda-diary-file:                 Agenda commands.     (line 465)
+* org-agenda-diary-file:                 Agenda commands.     (line 462)
 * org-agenda-dim-blocked-tasks <1>:      Speeding up your agendas.
-                                                              (line  16)
+                                                              (line  15)
 * org-agenda-dim-blocked-tasks:          TODO dependencies.   (line  47)
 * org-agenda-effort-filter-preset:       Filtering/limiting agenda items.
-                                                              (line  88)
+                                                              (line  92)
 * org-agenda-entry-text-maxlines:        Agenda commands.     (line 159)
 * org-agenda-exporter-settings <1>:      Exporting agenda views.
                                                               (line  13)
-* org-agenda-exporter-settings:          Agenda commands.     (line 508)
+* org-agenda-exporter-settings:          Agenda commands.     (line 505)
 * org-agenda-files <1>:                  iCalendar export.    (line  37)
 * org-agenda-files <2>:                  Sorting agenda items.
                                                               (line   8)
 * org-agenda-files:                      Agenda files.        (line   6)
 * org-agenda-inhibit-startup <1>:        Speeding up your agendas.
-                                                              (line  19)
+                                                              (line  18)
 * org-agenda-inhibit-startup:            Initial visibility.  (line   6)
 * org-agenda-log-mode-items:             Agenda commands.     (line 118)
 * org-agenda-max-effort:                 Filtering/limiting agenda items.
-                                                              (line 107)
+                                                              (line 118)
 * org-agenda-max-entries:                Filtering/limiting agenda items.
-                                                              (line 107)
+                                                              (line 118)
 * org-agenda-max-tags:                   Filtering/limiting agenda items.
-                                                              (line 107)
+                                                              (line 118)
 * org-agenda-max-todos:                  Filtering/limiting agenda items.
-                                                              (line 107)
+                                                              (line 118)
 * org-agenda-ndays:                      Weekly/daily agenda. (line  15)
 * org-agenda-overriding-header:          Special agenda views.
-                                                              (line  45)
+                                                              (line  38)
 * org-agenda-prefix-format:              Presentation and sorting.
                                                               (line   6)
-* org-agenda-regexp-filter-preset <1>:   Agenda commands.     (line 216)
 * org-agenda-regexp-filter-preset:       Filtering/limiting agenda items.
-                                                              (line  79)
-* org-agenda-restore-windows-after-quit: Agenda views.        (line  40)
+                                                              (line  82)
+* org-agenda-restore-windows-after-quit: Agenda views.        (line  45)
 * org-agenda-show-inherited-tags <1>:    Speeding up your agendas.
-                                                              (line  22)
-* org-agenda-show-inherited-tags:        Agenda commands.     (line 273)
-* org-agenda-skip-archived-trees:        Internal archiving.  (line  21)
+                                                              (line  21)
+* org-agenda-show-inherited-tags:        Agenda commands.     (line 270)
+* org-agenda-skip-archived-trees <1>:    Agenda views.        (line  40)
+* org-agenda-skip-archived-trees:        Internal archiving.  (line  22)
+* org-agenda-skip-comment-trees:         Agenda views.        (line  40)
 * org-agenda-skip-deadline-prewarning-if-scheduled: Deadlines and scheduling.
                                                               (line  14)
 * org-agenda-skip-function <1>:          Using the mapping API.
-                                                              (line  52)
+                                                              (line  49)
 * org-agenda-skip-function:              Special agenda views.
                                                               (line   6)
 * org-agenda-skip-function-global:       Special agenda views.
@@ -21162,7 +21070,6 @@ org-customize <RET>' and then click yourself through the tree.
 * org-agenda-start-with-entry-text-mode: Agenda commands.     (line 159)
 * org-agenda-start-with-follow-mode:     Agenda commands.     (line  48)
 * org-agenda-sticky:                     Agenda dispatcher.   (line  53)
-* org-agenda-tag-filter-preset <1>:      Agenda commands.     (line 204)
 * org-agenda-tag-filter-preset:          Filtering/limiting agenda items.
                                                               (line  18)
 * org-agenda-tags-column:                Presentation and sorting.
@@ -21181,15 +21088,15 @@ org-customize <RET>' and then click yourself through the tree.
 * org-agenda-todo-list-sublevels <1>:    Global TODO list.    (line  47)
 * org-agenda-todo-list-sublevels:        Breaking down tasks. (line   6)
 * org-agenda-use-tag-inheritance <1>:    Speeding up your agendas.
-                                                              (line  22)
+                                                              (line  21)
 * org-agenda-use-tag-inheritance:        Tag inheritance.     (line  32)
 * org-agenda-use-time-grid <1>:          Agenda commands.     (line 167)
 * org-agenda-use-time-grid:              Time-of-day specifications.
                                                               (line  41)
-* org-agenda-window-setup:               Agenda views.        (line  40)
-* org-archive-default-command <1>:       Agenda commands.     (line 256)
+* org-agenda-window-setup:               Agenda views.        (line  45)
+* org-archive-default-command <1>:       Agenda commands.     (line 253)
 * org-archive-default-command:           Archiving.           (line  12)
-* org-archive-location <1>:              In-buffer settings.  (line  16)
+* org-archive-location <1>:              In-buffer settings.  (line  14)
 * org-archive-location:                  Moving subtrees.     (line  10)
 * org-archive-save-context-info:         Moving subtrees.     (line  41)
 * org-ascii-links-to-notes:              ASCII/Latin-1/UTF-8 export.
@@ -21199,7 +21106,7 @@ org-customize <RET>' and then click yourself through the tree.
 * org-attach-directory:                  Attachments.         (line   6)
 * org-attach-method:                     Attachments.         (line  32)
 * org-babel-default-header-args <1>:     Header arguments in Org mode properties.
-                                                              (line  32)
+                                                              (line  31)
 * org-babel-default-header-args:         System-wide header arguments.
                                                               (line   6)
 * org-beamer-environments-default:       Sectioning Frames and Blocks in Beamer.
@@ -21217,7 +21124,7 @@ org-customize <RET>' and then click yourself through the tree.
 * org-capture-bookmark:                  Using capture.       (line  50)
 * org-capture-templates-contexts:        Templates in contexts.
                                                               (line   6)
-* org-capture-use-agenda-date:           Agenda commands.     (line 351)
+* org-capture-use-agenda-date:           Agenda commands.     (line 348)
 * org-catch-invisible-edits:             Catching invisible edits.
                                                               (line   6)
 * org-checkbox-hierarchical-statistics:  Checkboxes.          (line  30)
@@ -21235,14 +21142,14 @@ org-customize <RET>' and then click yourself through the tree.
 * org-columns-default-format <2>:        Agenda commands.     (line 185)
 * org-columns-default-format <3>:        Effort estimates.    (line  31)
 * org-columns-default-format:            Using column view.   (line  10)
-* org-columns-skip-archived-trees:       Internal archiving.  (line  31)
+* org-columns-skip-archived-trees:       Internal archiving.  (line  32)
 * org-columns-summary-types:             Column attributes.   (line  65)
 * org-confirm-babel-evaluate:            Code evaluation security.
-                                                              (line  34)
+                                                              (line  26)
 * org-confirm-elisp-link-function:       Code evaluation security.
-                                                              (line  56)
-* org-confirm-shell-link-function:       Code evaluation security.
                                                               (line  53)
+* org-confirm-shell-link-function:       Code evaluation security.
+                                                              (line  50)
 * org-create-file-search-functions:      Custom searches.     (line  12)
 * org-ctrl-c-ctrl-c-hook:                Context-sensitive commands.
                                                               (line   6)
@@ -21252,7 +21159,7 @@ org-customize <RET>' and then click yourself through the tree.
 * org-cycle-global-at-bob:               Global and local cycling.
                                                               (line  16)
 * org-cycle-include-plain-lists:         Plain lists.         (line  69)
-* org-cycle-open-archived-trees:         Internal archiving.  (line  11)
+* org-cycle-open-archived-trees:         Internal archiving.  (line  12)
 * org-cycle-separator-lines:             Headlines.           (line  26)
 * org-deadline-warning-days <1>:         Inserting deadline/schedule.
                                                               (line  24)
@@ -21260,12 +21167,12 @@ org-customize <RET>' and then click yourself through the tree.
                                                               (line  14)
 * org-default-notes-file <1>:            Template elements.   (line  49)
 * org-default-notes-file:                Setting up capture.  (line   9)
-* org-default-priority <1>:              In-buffer settings.  (line  48)
+* org-default-priority <1>:              In-buffer settings.  (line  45)
 * org-default-priority:                  Priorities.          (line  38)
 * org-display-custom-times:              Custom time format.  (line   6)
 * org-display-internal-link-with-indirect-buffer: Handling links.
                                                               (line 132)
-* org-disputed-keys:                     Conflicts.           (line  30)
+* org-disputed-keys:                     Conflicts.           (line  28)
 * org-done (face):                       Faces for TODO keywords.
                                                               (line   6)
 * org-edit-footnote-reference:           Footnotes.           (line  85)
@@ -21283,6 +21190,8 @@ org-customize <RET>' and then click yourself through the tree.
 * org-export-allow-bind-keywords:        Export settings.     (line 202)
 * org-export-async-init-file:            The export dispatcher.
                                                               (line  24)
+* org-export-babel-evaluate:             Exporting code blocks.
+                                                              (line  36)
 * org-export-backends <1>:               Other built-in back-ends.
                                                               (line   6)
 * org-export-backends:                   Exporting.           (line  38)
@@ -21309,7 +21218,7 @@ org-customize <RET>' and then click yourself through the tree.
                                                               (line   6)
 * org-export-time-stamp-file:            Export settings.     (line 178)
 * org-export-with-archived-trees <1>:    Export settings.     (line  94)
-* org-export-with-archived-trees:        Internal archiving.  (line  27)
+* org-export-with-archived-trees:        Internal archiving.  (line  28)
 * org-export-with-author:                Export settings.     (line  99)
 * org-export-with-broken-links:          Export settings.     (line 103)
 * org-export-with-clocks:                Export settings.     (line 108)
@@ -21348,11 +21257,11 @@ org-customize <RET>' and then click yourself through the tree.
 * org-file-apps:                         Handling links.      (line 104)
 * org-fontify-emphasized-text:           Emphasis and monospace.
                                                               (line   6)
-* org-footnote-auto-adjust <1>:          In-buffer settings.  (line 152)
+* org-footnote-auto-adjust <1>:          In-buffer settings.  (line 147)
 * org-footnote-auto-adjust:              Footnotes.           (line  48)
-* org-footnote-auto-label <1>:           In-buffer settings.  (line 152)
+* org-footnote-auto-label <1>:           In-buffer settings.  (line 147)
 * org-footnote-auto-label:               Footnotes.           (line  34)
-* org-footnote-define-inline <1>:        In-buffer settings.  (line 152)
+* org-footnote-define-inline <1>:        In-buffer settings.  (line 147)
 * org-footnote-define-inline:            Footnotes.           (line  48)
 * org-footnote-section <1>:              Footnotes.           (line  48)
 * org-footnote-section:                  Headlines.           (line  18)
@@ -21367,12 +21276,12 @@ org-customize <RET>' and then click yourself through the tree.
 * org-goto-auto-isearch:                 Motion.              (line  26)
 * org-goto-interface:                    Motion.              (line  37)
 * org-group-tags:                        Tag hierarchy.       (line  86)
-* org-hide (face):                       Clean view.          (line  65)
+* org-hide (face):                       Clean view.          (line  70)
 * org-hide-block-startup:                Blocks.              (line   6)
-* org-hide-leading-stars <1>:            Clean view.          (line  49)
-* org-hide-leading-stars:                In-buffer settings.  (line 131)
+* org-hide-leading-stars <1>:            Clean view.          (line  55)
+* org-hide-leading-stars:                In-buffer settings.  (line 126)
 * org-hierarchical-todo-statistics:      Breaking down tasks. (line  25)
-* org-highest-priority <1>:              In-buffer settings.  (line  48)
+* org-highest-priority <1>:              In-buffer settings.  (line  45)
 * org-highest-priority:                  Priorities.          (line  38)
 * org-html-container-element:            HTML Specific export settings.
                                                               (line  17)
@@ -21437,7 +21346,7 @@ org-customize <RET>' and then click yourself through the tree.
 * org-icalendar-use-deadline:            iCalendar export.    (line   6)
 * org-icalendar-use-scheduled:           iCalendar export.    (line   6)
 * org-id-link-to-org-use-id:             Handling links.      (line  21)
-* org-imenu-depth:                       Cooperation.         (line  35)
+* org-imenu-depth:                       Cooperation.         (line  30)
 * org-insert-mode-line-in-empty-file:    Activation.          (line  27)
 * org-irc-link-to-logs:                  Handling links.      (line  45)
 * org-keep-stored-link-after-insertion:  Handling links.      (line  66)
@@ -21484,7 +21393,7 @@ org-customize <RET>' and then click yourself through the tree.
                                                               (line  20)
 * org-latex-to-mathml-jar-file:          Working with LaTeX math snippets.
                                                               (line  20)
-* org-link-abbrev-alist <1>:             In-buffer settings.  (line  43)
+* org-link-abbrev-alist <1>:             In-buffer settings.  (line  40)
 * org-link-abbrev-alist:                 Link abbreviations.  (line  12)
 * org-link-frame-setup:                  Handling links.      (line 104)
 * org-link-parameters:                   Handling links.      (line  66)
@@ -21495,29 +21404,29 @@ org-customize <RET>' and then click yourself through the tree.
 * org-list-empty-line-terminates-plain-lists: Plain lists.    (line  30)
 * org-list-indent-offset:                Plain lists.         (line  56)
 * org-list-use-circular-motion:          Plain lists.         (line  94)
-* org-log-done <1>:                      In-buffer settings.  (line 106)
+* org-log-done <1>:                      In-buffer settings.  (line 101)
 * org-log-done <2>:                      Agenda commands.     (line 118)
 * org-log-done:                          Tracking TODO state changes.
                                                               (line  29)
-* org-log-into-drawer <1>:               Agenda commands.     (line 298)
+* org-log-into-drawer <1>:               Agenda commands.     (line 295)
 * org-log-into-drawer:                   Tracking TODO state changes.
                                                               (line   6)
-* org-log-note-clock-out <1>:            In-buffer settings.  (line 106)
+* org-log-note-clock-out <1>:            In-buffer settings.  (line 101)
 * org-log-note-clock-out:                Clocking commands.   (line  37)
 * org-log-refile:                        Refile and copy.     (line  17)
-* org-log-repeat <1>:                    In-buffer settings.  (line 106)
+* org-log-repeat <1>:                    In-buffer settings.  (line 101)
 * org-log-repeat:                        Repeated tasks.      (line  37)
 * org-log-states-order-reversed:         Tracking TODO state changes.
                                                               (line   6)
-* org-lowest-priority <1>:               In-buffer settings.  (line  48)
+* org-lowest-priority <1>:               In-buffer settings.  (line  45)
 * org-lowest-priority:                   Priorities.          (line  38)
 * org-M-RET-may-split-line <1>:          Plain lists.         (line  82)
 * org-M-RET-may-split-line:              Structure editing.   (line   7)
 * org-md-headline-style:                 Markdown export.     (line  30)
 * org-odd-levels-only <1>:               Special agenda views.
-                                                              (line  48)
-* org-odd-levels-only <2>:               Clean view.          (line  73)
-* org-odd-levels-only <3>:               In-buffer settings.  (line 131)
+                                                              (line  41)
+* org-odd-levels-only <2>:               Clean view.          (line  75)
+* org-odd-levels-only <3>:               In-buffer settings.  (line 126)
 * org-odd-levels-only:                   Matching tags and properties.
                                                               (line  72)
 * org-odt-category-map-alist:            Labels and captions in ODT export.
@@ -21557,12 +21466,12 @@ org-customize <RET>' and then click yourself through the tree.
 * org-priority-faces:                    Priorities.          (line  13)
 * org-priority-start-cycle-with-default: Priorities.          (line  33)
 * org-property-allowed-value-functions:  Using the property API.
-                                                              (line  69)
+                                                              (line  68)
 * org-publish-project-alist <1>:         Publishing options.  (line  13)
 * org-publish-project-alist:             Project alist.       (line   6)
 * org-publish-use-timestamps-flag:       Triggering publication.
                                                               (line  21)
-* org-put-time-stamp-overlays:           In-buffer settings.  (line 142)
+* org-put-time-stamp-overlays:           In-buffer settings.  (line 137)
 * org-read-date-display-live:            The date/time prompt.
                                                               (line  91)
 * org-read-date-force-compatible-dates:  The date/time prompt.
@@ -21576,33 +21485,33 @@ org-customize <RET>' and then click yourself through the tree.
 * org-refile-use-outline-path:           Refile and copy.     (line  17)
 * org-remove-highlights-with-change <1>: Clocking commands.   (line  83)
 * org-remove-highlights-with-change:     Sparse trees.        (line  20)
-* org-replace-disputed-keys:             Conflicts.           (line  19)
+* org-replace-disputed-keys:             Conflicts.           (line  18)
 * org-return-follows-link:               Handling links.      (line 123)
 * org-reverse-note-order:                Refile and copy.     (line  17)
 * org-scheduled-delay-days:              Deadlines and scheduling.
                                                               (line  42)
 * org-show-context-detail:               Sparse trees.        (line   6)
 * org-sort-agenda-noeffort-is-high:      Filtering/limiting agenda items.
-                                                              (line  88)
-* org-sparse-tree-open-archived-trees:   Internal archiving.  (line  17)
+                                                              (line  92)
+* org-sparse-tree-open-archived-trees:   Internal archiving.  (line  18)
 * org-special-ctrl-a/e:                  Headlines.           (line   6)
 * org-special-ctrl-k:                    Headlines.           (line   6)
 * org-speed-commands-user:               Speed keys.          (line   6)
-* org-startup-align-all-tables <1>:      In-buffer settings.  (line  85)
+* org-startup-align-all-tables <1>:      In-buffer settings.  (line  81)
 * org-startup-align-all-tables:          Column width and alignment.
                                                               (line  33)
 * org-startup-folded <1>:                Speeding up your agendas.
-                                                              (line  19)
-* org-startup-folded <2>:                In-buffer settings.  (line  74)
+                                                              (line  18)
+* org-startup-folded <2>:                In-buffer settings.  (line  71)
 * org-startup-folded:                    Initial visibility.  (line   6)
-* org-startup-indented:                  In-buffer settings.  (line  80)
-* org-startup-with-inline-images <1>:    In-buffer settings.  (line  92)
+* org-startup-indented:                  In-buffer settings.  (line  76)
+* org-startup-with-inline-images <1>:    In-buffer settings.  (line  88)
 * org-startup-with-inline-images:        Handling links.      (line 136)
-* org-startup-with-latex-preview <1>:    In-buffer settings.  (line  99)
+* org-startup-with-latex-preview <1>:    In-buffer settings.  (line  94)
 * org-startup-with-latex-preview:        Previewing LaTeX fragments.
                                                               (line  28)
 * org-store-link-functions:              Adding hyperlink types.
-                                                              (line  65)
+                                                              (line  61)
 * org-stuck-projects:                    Stuck projects.      (line  17)
 * org-support-shift-select <1>:          Conflicts.           (line   6)
 * org-support-shift-select:              Plain lists.         (line  94)
@@ -21614,14 +21523,14 @@ org-customize <RET>' and then click yourself through the tree.
                                                               (line   6)
 * org-table-export-default-format:       Built-in table editor.
                                                               (line 205)
-* org-table-formula:                     In-buffer settings.  (line  33)
-* org-table-formula-constants <1>:       Cooperation.         (line  14)
-* org-table-formula-constants <2>:       In-buffer settings.  (line  33)
+* org-table-formula:                     In-buffer settings.  (line  30)
+* org-table-formula-constants <1>:       Cooperation.         (line  12)
+* org-table-formula-constants <2>:       In-buffer settings.  (line  30)
 * org-table-formula-constants:           References.          (line 110)
 * org-table-use-standard-references <1>: Editing and debugging formulas.
                                                               (line   6)
 * org-table-use-standard-references:     References.          (line  17)
-* org-tag-alist <1>:                     In-buffer settings.  (line 176)
+* org-tag-alist <1>:                     In-buffer settings.  (line 171)
 * org-tag-alist:                         Setting tags.        (line  23)
 * org-tag-faces:                         Tags.                (line  10)
 * org-tag-persistent-alist:              Setting tags.        (line  38)
@@ -21645,13 +21554,13 @@ org-customize <RET>' and then click yourself through the tree.
 * org-texinfo-info-process:              Texinfo export commands.
                                                               (line   6)
 * org-time-stamp-custom-formats:         Custom time format.  (line   6)
-* org-time-stamp-overlay-formats:        In-buffer settings.  (line 142)
+* org-time-stamp-overlay-formats:        In-buffer settings.  (line 137)
 * org-time-stamp-rounding-minutes:       Creating timestamps. (line  23)
 * org-todo (face):                       Faces for TODO keywords.
                                                               (line   6)
 * org-todo-keyword-faces:                Faces for TODO keywords.
                                                               (line   6)
-* org-todo-keywords <1>:                 In-buffer settings.  (line 196)
+* org-todo-keywords <1>:                 In-buffer settings.  (line 189)
 * org-todo-keywords <2>:                 Global TODO list.    (line  18)
 * org-todo-keywords <3>:                 TODO extensions.     (line   6)
 * org-todo-keywords:                     TODO basics.         (line  42)
@@ -21665,7 +21574,7 @@ org-customize <RET>' and then click yourself through the tree.
                                                               (line  35)
 * org-use-fast-todo-selection:           TODO basics.         (line  14)
 * org-use-property-inheritance <1>:      Using the property API.
-                                                              (line  19)
+                                                              (line  18)
 * org-use-property-inheritance <2>:      Header arguments in Org mode properties.
                                                               (line  17)
 * org-use-property-inheritance <3>:      iCalendar export.    (line  46)
@@ -21693,534 +21602,530 @@ org-customize <RET>' and then click yourself through the tree.
 
 Tag Table:
 Node: Top882
-Node: Introduction24916
-Node: Summary25357
-Node: Installation28053
-Node: Activation30749
-Ref: Activation-Footnote-132269
-Node: Feedback32391
-Ref: Feedback-Footnote-136046
-Node: Conventions36173
-Node: Document structure38210
-Node: Outlines39201
-Node: Headlines39830
-Ref: Headlines-Footnote-141032
-Ref: Headlines-Footnote-241208
-Node: Visibility cycling41279
-Node: Global and local cycling41658
-Ref: Global and local cycling-Footnote-144342
-Ref: Global and local cycling-Footnote-244400
-Ref: Global and local cycling-Footnote-344450
-Node: Initial visibility44719
-Ref: Initial visibility-Footnote-145754
-Node: Catching invisible edits45935
-Node: Motion46400
-Node: Structure editing47727
-Node: Sparse trees54364
-Ref: Sparse trees-Footnote-156874
-Ref: Sparse trees-Footnote-256985
-Node: Plain lists57056
-Ref: Plain lists-Footnote-164471
-Ref: Plain lists-Footnote-264825
-Ref: Plain lists-Footnote-364921
-Ref: Plain lists-Footnote-465168
-Ref: Plain lists-Footnote-565339
-Ref: Plain lists-Footnote-665402
-Ref: Plain lists-Footnote-765502
-Ref: Plain lists-Footnote-865604
-Node: Drawers65670
-Node: Blocks67493
-Node: Footnotes68052
-Ref: Footnotes-Footnote-171996
-Ref: Footnotes-Footnote-272093
-Node: Orgstruct mode72170
-Node: Org syntax73800
-Node: Tables74773
-Node: Built-in table editor75414
-Ref: Built-in table editor-Footnote-185168
-Node: Column width and alignment85268
-Ref: Column width and alignment-Footnote-187829
-Node: Column groups87926
-Node: Orgtbl mode89497
-Node: The spreadsheet90306
-Node: References91766
-Ref: References-Footnote-198484
-Ref: References-Footnote-298706
-Ref: References-Footnote-398975
-Ref: References-Footnote-499088
-Node: Formula syntax for Calc99378
-Ref: Formula syntax for Calc-Footnote-1104525
-Node: Formula syntax for Lisp104849
-Node: Durations and time values106584
-Node: Field and range formulas107662
-Node: Column formulas110059
-Node: Lookup functions112147
-Node: Editing and debugging formulas114070
-Ref: Using multiple #+TBLFM lines118329
-Node: Updating the table119542
-Node: Advanced features120898
-Ref: Advanced features-Footnote-1125379
-Node: Org-Plot125485
-Node: Hyperlinks129679
-Node: Link format130436
-Node: Internal links131695
-Ref: Internal links-Footnote-1133990
-Ref: Internal links-Footnote-2134230
-Node: Radio targets134368
-Node: External links135035
-Ref: External links-Footnote-1138959
-Ref: External links-Footnote-2139377
-Node: Handling links139633
-Ref: Handling links-Footnote-1147497
-Ref: Handling links-Footnote-2147656
-Ref: Handling links-Footnote-3147838
-Ref: Handling links-Footnote-4148133
-Ref: Handling links-Footnote-5148379
-Ref: Handling links-Footnote-6148498
-Ref: Handling links-Footnote-7148570
-Node: Using links outside Org148654
-Node: Link abbreviations149139
-Node: Search options151908
-Ref: Search options-Footnote-1153790
-Node: Custom searches153871
-Node: TODO items154881
-Ref: TODO items-Footnote-1155989
-Node: TODO basics156103
-Node: TODO extensions158949
-Node: Workflow states159979
-Ref: Workflow states-Footnote-1161280
-Node: TODO types161373
-Ref: TODO types-Footnote-1162971
-Node: Multiple sets in one file163053
-Node: Fast access to TODO states164907
-Ref: Fast access to TODO states-Footnote-1165780
-Ref: Fast access to TODO states-Footnote-2165864
-Node: Per-file keywords166157
-Ref: Per-file keywords-Footnote-1167528
-Node: Faces for TODO keywords167729
-Node: TODO dependencies168770
-Node: Progress logging171105
-Node: Closing items171817
-Ref: Closing items-Footnote-1173022
-Ref: Closing items-Footnote-2173091
-Node: Tracking TODO state changes173165
-Ref: Tracking TODO state changes-Footnote-1176201
-Ref: Tracking TODO state changes-Footnote-2176256
-Ref: Tracking TODO state changes-Footnote-3176396
-Node: Tracking your habits176684
-Node: Priorities180918
-Ref: Priorities-Footnote-1182908
-Node: Breaking down tasks182977
-Ref: Breaking down tasks-Footnote-1184956
-Node: Checkboxes185052
-Ref: Checkboxes-Footnote-1189679
-Ref: Checkboxes-Footnote-2189803
-Ref: Checkboxes-Footnote-3189977
-Node: Tags190097
-Node: Tag inheritance191153
-Ref: Tag inheritance-Footnote-1192968
-Ref: Tag inheritance-Footnote-2193068
-Node: Setting tags193194
-Ref: Setting tags-Footnote-1199505
-Node: Tag hierarchy199588
-Node: Tag searches202956
-Node: Properties and columns204238
-Node: Property syntax205674
-Node: Special properties210016
-Node: Property searches211661
-Node: Property inheritance213096
-Node: Column view214912
-Node: Defining columns216147
-Node: Scope of column definitions216525
-Node: Column attributes217430
-Ref: Column attributes-Footnote-1222224
-Ref: Column attributes-Footnote-2222380
-Ref: Column attributes-Footnote-3222593
-Ref: Column attributes-Footnote-4222876
-Node: Using column view223009
-Node: Capturing column view225934
-Ref: Capturing column view-Footnote-1229011
-Node: Property API229147
-Node: Dates and times229501
-Node: Timestamps230408
-Ref: Timestamps-Footnote-1232827
-Ref: Timestamps-Footnote-2233013
-Ref: Timestamps-Footnote-3233144
-Node: Creating timestamps233913
-Node: The date/time prompt236737
-Ref: The date/time prompt-Footnote-1241319
-Ref: The date/time prompt-Footnote-2241482
-Ref: The date/time prompt-Footnote-3241588
-Node: Custom time format241682
-Node: Deadlines and scheduling243404
-Ref: Deadlines and scheduling-Footnote-1246884
-Node: Inserting deadline/schedule247039
-Ref: Inserting deadline/schedule-Footnote-1248839
-Ref: Inserting deadline/schedule-Footnote-2248947
-Node: Repeated tasks249055
-Ref: Repeated tasks-Footnote-1253458
-Ref: Repeated tasks-Footnote-2253707
-Node: Clocking work time253906
-Ref: Clocking work time-Footnote-1255091
-Ref: Clocking work time-Footnote-2255235
-Node: Clocking commands255373
-Ref: Clocking commands-Footnote-1260320
-Ref: Clocking commands-Footnote-2260427
-Ref: Clocking commands-Footnote-3260477
-Ref: Clocking commands-Footnote-4260535
-Node: The clock table260613
-Ref: The clock table-Footnote-1268063
-Ref: The clock table-Footnote-2268157
-Node: Resolving idle time268282
-Ref: Resolving idle time-Footnote-1272129
-Node: Effort estimates272597
-Ref: Effort estimates-Footnote-1275350
-Node: Timers275457
-Node: Capture - Refile - Archive277749
-Node: Capture278739
-Node: Setting up capture279807
-Ref: Setting up capture-Footnote-1280216
-Node: Using capture280282
-Node: Capture templates282690
-Node: Template elements284651
-Ref: Template elements-Footnote-1290846
-Node: Template expansion291021
-Ref: Template expansion-Footnote-1295011
-Ref: Template expansion-Footnote-2295098
-Ref: Template expansion-Footnote-3295280
-Node: Templates in contexts295378
-Node: Attachments296200
-Ref: Attachments-Footnote-1299582
-Node: RSS feeds299732
-Node: Protocols301209
-Node: Refile and copy301924
-Ref: Refile and copy-Footnote-1304346
-Node: Archiving304442
-Node: Moving subtrees305142
-Node: Internal archiving307166
-Node: Agenda views309796
-Node: Agenda files311987
-Ref: Agenda files-Footnote-1314790
-Ref: Agenda files-Footnote-2314939
-Node: Agenda dispatcher315132
-Ref: Agenda dispatcher-Footnote-1318041
-Ref: Agenda dispatcher-Footnote-2318135
-Node: Built-in agenda views318237
-Node: Weekly/daily agenda318886
-Ref: Weekly/daily agenda-Footnote-1324620
-Ref: Weekly/daily agenda-Footnote-2324847
-Node: Global TODO list325022
-Node: Matching tags and properties327550
-Node: Timeline334499
-Node: Search view335191
-Node: Stuck projects336484
-Ref: Stuck projects-Footnote-1338544
-Node: Presentation and sorting338574
-Node: Categories339531
-Node: Time-of-day specifications340260
-Node: Sorting agenda items342229
-Node: Filtering/limiting agenda items343798
-Ref: Filtering/limiting agenda items-Footnote-1350520
-Node: Agenda commands350935
-Ref: Agenda commands-Footnote-1372290
-Ref: Agenda commands-Footnote-2372371
-Ref: Agenda commands-Footnote-3372490
-Ref: Agenda commands-Footnote-4372590
-Node: Custom agenda views372673
-Node: Storing searches373314
-Ref: Storing searches-Footnote-1376266
-Ref: Storing searches-Footnote-2376383
-Node: Block agenda376631
-Node: Setting options377869
-Node: Exporting agenda views381458
-Ref: Exporting agenda views-Footnote-1386359
-Ref: Exporting agenda views-Footnote-2386417
-Ref: Exporting agenda views-Footnote-3386573
-Ref: Exporting agenda views-Footnote-4386760
-Node: Agenda column view386842
-Node: Markup389916
-Node: Paragraphs390902
-Node: Emphasis and monospace392068
-Node: Horizontal rules392910
-Node: Images and tables393161
-Node: Literal examples394868
-Ref: Literal examples-Footnote-1399377
-Ref: Literal examples-Footnote-2399910
-Ref: Literal examples-Footnote-3400082
-Ref: Literal examples-Footnote-4400261
-Ref: Literal examples-Footnote-5400511
-Node: Special symbols400605
-Ref: Special symbols-Footnote-1402534
-Ref: Special symbols-Footnote-2402689
-Node: Subscripts and superscripts402779
-Node: Embedded LaTeX403883
-Ref: Embedded LaTeX-Footnote-1404697
-Node: LaTeX fragments404887
-Ref: LaTeX fragments-Footnote-1406967
-Node: Previewing LaTeX fragments407190
-Ref: Previewing LaTeX fragments-Footnote-1408619
-Node: CDLaTeX mode408865
-Ref: CDLaTeX mode-Footnote-1411362
-Node: Exporting411510
-Ref: Exporting-Footnote-1414089
-Node: The export dispatcher414199
-Ref: The export dispatcher-Footnote-1416238
-Node: Export settings416501
-Ref: Export settings-Footnote-1424017
-Ref: Export settings-Footnote-2424119
-Ref: Export settings-Footnote-3424214
-Node: Table of contents424257
-Ref: Table of contents-Footnote-1426008
-Node: Include files426206
-Ref: Include files-Footnote-1429127
-Ref: Include files-Footnote-2429277
-Node: Macro replacement429443
-Ref: Macro replacement-Footnote-1431574
-Node: Comment lines431804
-Ref: Comment lines-Footnote-1432610
-Node: ASCII/Latin-1/UTF-8 export432710
-Node: Beamer export435488
-Node: Beamer export commands436211
-Node: Beamer specific export settings436886
-Node: Sectioning Frames and Blocks in Beamer438670
-Ref: Sectioning Frames and Blocks in Beamer-Footnote-1441626
-Ref: Sectioning Frames and Blocks in Beamer-Footnote-2441789
-Node: Beamer specific syntax441907
-Node: Editing support443538
-Node: A Beamer Example443969
-Node: HTML export445247
-Node: HTML Export commands446419
-Node: HTML Specific export settings446965
-Node: HTML doctypes448750
-Node: HTML preamble and postamble450964
-Node: Quoting HTML tags452012
-Node: Links in HTML export452651
-Node: Tables in HTML export453862
-Node: Images in HTML export455298
-Ref: Images in HTML export-Footnote-1456588
-Node: Math formatting in HTML export456643
-Ref: Math formatting in HTML export-Footnote-1458034
-Node: Text areas in HTML export458294
-Node: CSS support459076
-Ref: CSS support-Footnote-1462248
-Ref: CSS support-Footnote-2462420
-Node: JavaScript support462662
-Node: LaTeX export466043
-Ref: LaTeX export-Footnote-1467373
-Node: LaTeX export commands467617
-Ref: LaTeX export commands-Footnote-1468719
-Node: LaTeX specific export settings468925
-Node: LaTeX header and sectioning471097
-Ref: LaTeX header and sectioning-Footnote-1472730
-Ref: LaTeX header and sectioning-Footnote-2472842
-Node: Quoting LaTeX code473005
-Node: Tables in LaTeX export473605
-Ref: Tables in LaTeX export-Footnote-1477215
-Ref: Tables in LaTeX export-Footnote-2477293
-Ref: Tables in LaTeX export-Footnote-3477367
-Node: Images in LaTeX export477451
-Ref: Images in LaTeX export-Footnote-1480067
-Node: Plain lists in LaTeX export480221
-Node: Source blocks in LaTeX export481337
-Node: Example blocks in LaTeX export482734
-Node: Special blocks in LaTeX export483370
-Node: Horizontal rules in LaTeX export484551
-Node: Markdown export484940
-Ref: Markdown export-Footnote-1486238
-Node: OpenDocument Text export486324
-Ref: OpenDocument Text export-Footnote-1487514
-Node: Pre-requisites for ODT export487658
-Node: ODT export commands487986
-Ref: x-export-to-odt488190
-Ref: ODT export commands-Footnote-1489189
-Ref: ODT export commands-Footnote-2489249
-Node: ODT specific export settings489300
-Node: Extending ODT export490142
-Ref: x-export-to-other-formats491130
-Ref: x-convert-to-other-formats491640
-Node: Applying custom styles492097
-Node: Links in ODT export494221
-Node: Tables in ODT export494868
-Ref: Tables in ODT export-Footnote-1497004
-Node: Images in ODT export497097
-Ref: Images in ODT export-Footnote-1499823
-Node: Math formatting in ODT export500056
-Node: Working with LaTeX math snippets500520
-Ref: Working with LaTeX math snippets-Footnote-1502739
-Ref: Working with LaTeX math snippets-Footnote-2502815
-Node: Working with MathML or OpenDocument formula files502860
-Node: Labels and captions in ODT export503414
-Node: Literal examples in ODT export504872
-Node: Advanced topics in ODT export505736
-Node: Configuring a document converter506492
-Ref: x-odt-converter-capabilities507264
-Node: Working with OpenDocument style files507845
-Ref: x-factory-styles508321
-Ref: x-orgodtstyles-xml508559
-Ref: x-orgodtcontenttemplate-xml508886
-Ref: x-overriding-factory-styles509542
-Ref: x-org-odt-styles-file509822
-Ref: x-org-odt-content-template-file510703
-Node: Creating one-off styles510844
-Node: Customizing tables in ODT export513065
-Ref: Customizing tables in ODT export-Footnote-1518042
-Ref: Customizing tables in ODT export-Footnote-2518146
-Ref: Customizing tables in ODT export-Footnote-3518234
-Node: Validating OpenDocument XML518549
-Ref: Validating OpenDocument XML-Footnote-1519548
-Node: Org export519600
-Node: Texinfo export520364
-Node: Texinfo export commands521464
-Ref: Texinfo export commands-Footnote-1521999
-Node: Texinfo specific export settings522107
-Node: Texinfo file header523141
-Ref: Texinfo file header-Footnote-1524143
-Node: Texinfo title and copyright page524205
-Node: Texinfo `Top' node525678
-Node: Headings and sectioning structure526417
-Node: Indices527872
-Node: Quoting Texinfo code528665
-Node: Plain lists in Texinfo export529157
-Ref: Plain lists in Texinfo export-Footnote-1529913
-Node: Tables in Texinfo export529979
-Node: Images in Texinfo export530441
-Node: Special blocks in Texinfo export530937
-Node: A Texinfo example531513
-Node: iCalendar export533532
-Ref: iCalendar export-Footnote-1536264
-Ref: iCalendar export-Footnote-2536354
-Ref: iCalendar export-Footnote-3536454
-Node: Other built-in back-ends536591
-Node: Advanced configuration537181
-Node: Export in foreign buffers544156
-Node: Publishing545113
-Node: Configuration545981
-Node: Project alist546744
-Node: Sources and destinations547885
-Node: Selecting files549408
-Node: Publishing action550409
-Ref: Publishing action-Footnote-1552238
-Node: Publishing options552395
-Node: Publishing links565545
-Node: Sitemap566897
-Node: Generating an index570116
-Node: Uploading files570898
-Node: Sample configuration572662
-Node: Simple example573151
-Node: Complex example573798
-Node: Triggering publication575849
-Node: Working with source code576845
-Node: Structure of code blocks581099
-Node: Editing source code583560
-Node: Exporting code blocks586312
-Node: Extracting source code588354
-Node: Evaluating code blocks590751
-Ref: Evaluating code blocks-Footnote-1593761
-Ref: Evaluating code blocks-Footnote-2593887
-Node: Library of Babel594073
-Node: Languages594694
-Node: Header arguments596994
-Node: Using header arguments597351
-Node: System-wide header arguments598248
-Node: Language-specific header arguments598955
-Node: Header arguments in Org mode properties599454
-Node: Language-specific header arguments in Org mode properties600942
-Node: Code block specific header arguments601834
-Node: Header arguments in function calls603491
-Node: Specific header arguments604272
-Node: var607170
-Node: results613695
-Node: file617527
-Node: file-desc618192
-Node: file-ext618590
-Node: output-dir619007
-Node: dir619405
-Node: exports621508
-Node: tangle622381
-Node: mkdirp623207
-Node: comments623521
-Node: padline624456
-Node: no-expand624829
-Node: session625530
-Node: noweb626604
-Node: noweb-ref628365
-Ref: noweb-ref-Footnote-1629556
-Node: noweb-sep629671
-Node: cache629975
-Node: sep632553
-Node: hlines632944
-Node: colnames634426
-Node: rownames635830
-Node: shebang637019
-Node: tangle-mode637497
-Node: eval638275
-Node: wrap639219
-Node: post639526
-Node: prologue641255
-Node: epilogue641751
-Node: Results of evaluation642009
-Node: Noweb reference syntax645730
-Node: Key bindings and useful functions647250
-Node: Batch execution649949
-Node: Miscellaneous650987
-Node: Completion651816
-Node: Easy templates653461
-Node: Speed keys654879
-Node: Code evaluation security655703
-Node: Customization658413
-Node: In-buffer settings659008
-Node: The very busy C-c C-c key668709
-Node: Clean view670686
-Ref: Clean view-Footnote-1674605
-Ref: Clean view-Footnote-2674789
-Ref: Clean view-Footnote-3674850
-Ref: Clean view-Footnote-4674962
-Ref: Clean view-Footnote-5675017
-Node: TTY keys675142
-Node: Interaction676908
-Node: Cooperation677302
-Node: Conflicts680388
-Node: org-crypt685076
-Node: Hacking686394
-Node: Hooks687380
-Node: Add-on packages687780
-Node: Adding hyperlink types688334
-Node: Adding export back-ends692234
-Node: Context-sensitive commands693592
-Ref: Context-sensitive commands-Footnote-1695169
-Node: Tables in arbitrary syntax695303
-Node: Radio tables696715
-Node: A LaTeX example699302
-Ref: A LaTeX example-Footnote-1703294
-Ref: A LaTeX example-Footnote-2703451
-Node: Translator functions703886
-Node: Radio lists706287
-Node: Dynamic blocks707644
-Node: Special agenda views709842
-Ref: x-agenda-skip-entry-regexp713305
-Ref: Special agenda views-Footnote-1714108
-Ref: Special agenda views-Footnote-2714303
-Node: Speeding up your agendas714438
-Node: Extracting agenda information715541
-Node: Using the property API719619
-Node: Using the mapping API722986
-Node: MobileOrg727408
-Node: Setting up the staging area729102
-Ref: Setting up the staging area-Footnote-1730183
-Ref: Setting up the staging area-Footnote-2730484
-Node: Pushing to MobileOrg730746
-Ref: Pushing to MobileOrg-Footnote-1731746
-Ref: Pushing to MobileOrg-Footnote-2731833
-Ref: Pushing to MobileOrg-Footnote-3732249
-Node: Pulling from MobileOrg732320
-Ref: Pulling from MobileOrg-Footnote-1734741
-Ref: Pulling from MobileOrg-Footnote-2734801
-Node: History and acknowledgments735176
-Node: GNU Free Documentation License750368
-Node: Main Index775558
-Node: Key Index866649
-Node: Command and Function Index919091
-Node: Variable Index953969
+Node: Introduction24566
+Node: Summary25007
+Node: Installation27703
+Node: Activation30399
+Ref: Activation-Footnote-131919
+Node: Feedback32041
+Ref: Feedback-Footnote-135696
+Node: Conventions35823
+Node: Document structure37860
+Node: Outlines38851
+Node: Headlines39480
+Ref: Headlines-Footnote-140682
+Ref: Headlines-Footnote-240858
+Node: Visibility cycling40929
+Node: Global and local cycling41308
+Ref: Global and local cycling-Footnote-143992
+Ref: Global and local cycling-Footnote-244050
+Ref: Global and local cycling-Footnote-344100
+Node: Initial visibility44369
+Ref: Initial visibility-Footnote-145404
+Node: Catching invisible edits45585
+Node: Motion46050
+Node: Structure editing47377
+Node: Sparse trees54014
+Ref: Sparse trees-Footnote-156524
+Ref: Sparse trees-Footnote-256635
+Node: Plain lists56706
+Ref: Plain lists-Footnote-164121
+Ref: Plain lists-Footnote-264475
+Ref: Plain lists-Footnote-364571
+Ref: Plain lists-Footnote-464818
+Ref: Plain lists-Footnote-564989
+Ref: Plain lists-Footnote-665052
+Ref: Plain lists-Footnote-765152
+Ref: Plain lists-Footnote-865254
+Node: Drawers65320
+Node: Blocks67143
+Node: Footnotes67702
+Ref: Footnotes-Footnote-171646
+Ref: Footnotes-Footnote-271743
+Node: Orgstruct mode71820
+Node: Org syntax73450
+Node: Tables74423
+Node: Built-in table editor75064
+Ref: Built-in table editor-Footnote-184818
+Node: Column width and alignment84918
+Ref: Column width and alignment-Footnote-187479
+Node: Column groups87576
+Node: Orgtbl mode89147
+Node: The spreadsheet89956
+Node: References91416
+Ref: References-Footnote-198134
+Ref: References-Footnote-298356
+Ref: References-Footnote-398625
+Ref: References-Footnote-498738
+Node: Formula syntax for Calc99028
+Ref: Formula syntax for Calc-Footnote-1104175
+Node: Formula syntax for Lisp104499
+Node: Durations and time values106234
+Node: Field and range formulas107312
+Node: Column formulas109709
+Node: Lookup functions111797
+Node: Editing and debugging formulas113720
+Ref: Using multiple #+TBLFM lines117979
+Node: Updating the table119192
+Node: Advanced features120548
+Ref: Advanced features-Footnote-1125029
+Node: Org-Plot125135
+Node: Hyperlinks129329
+Node: Link format130086
+Node: Internal links131345
+Ref: Internal links-Footnote-1133640
+Ref: Internal links-Footnote-2133880
+Node: Radio targets134018
+Node: External links134685
+Ref: External links-Footnote-1138609
+Ref: External links-Footnote-2139027
+Node: Handling links139283
+Ref: Handling links-Footnote-1147147
+Ref: Handling links-Footnote-2147306
+Ref: Handling links-Footnote-3147488
+Ref: Handling links-Footnote-4147783
+Ref: Handling links-Footnote-5148029
+Ref: Handling links-Footnote-6148148
+Ref: Handling links-Footnote-7148220
+Node: Using links outside Org148304
+Node: Link abbreviations148789
+Node: Search options151558
+Ref: Search options-Footnote-1153440
+Node: Custom searches153521
+Node: TODO items154531
+Ref: TODO items-Footnote-1155639
+Node: TODO basics155753
+Node: TODO extensions158599
+Node: Workflow states159629
+Ref: Workflow states-Footnote-1160930
+Node: TODO types161023
+Ref: TODO types-Footnote-1162621
+Node: Multiple sets in one file162703
+Node: Fast access to TODO states164557
+Ref: Fast access to TODO states-Footnote-1165430
+Ref: Fast access to TODO states-Footnote-2165514
+Node: Per-file keywords165807
+Ref: Per-file keywords-Footnote-1167178
+Node: Faces for TODO keywords167379
+Node: TODO dependencies168420
+Node: Progress logging170755
+Node: Closing items171467
+Ref: Closing items-Footnote-1172672
+Ref: Closing items-Footnote-2172741
+Node: Tracking TODO state changes172815
+Ref: Tracking TODO state changes-Footnote-1175851
+Ref: Tracking TODO state changes-Footnote-2175906
+Ref: Tracking TODO state changes-Footnote-3176046
+Node: Tracking your habits176334
+Node: Priorities180568
+Ref: Priorities-Footnote-1182558
+Node: Breaking down tasks182627
+Ref: Breaking down tasks-Footnote-1184606
+Node: Checkboxes184702
+Ref: Checkboxes-Footnote-1189329
+Ref: Checkboxes-Footnote-2189453
+Ref: Checkboxes-Footnote-3189627
+Node: Tags189747
+Node: Tag inheritance190803
+Ref: Tag inheritance-Footnote-1192618
+Ref: Tag inheritance-Footnote-2192718
+Node: Setting tags192844
+Ref: Setting tags-Footnote-1199155
+Node: Tag hierarchy199238
+Node: Tag searches202606
+Node: Properties and columns203888
+Node: Property syntax205324
+Node: Special properties209666
+Node: Property searches211311
+Node: Property inheritance212746
+Node: Column view214562
+Node: Defining columns215797
+Node: Scope of column definitions216175
+Node: Column attributes217080
+Ref: Column attributes-Footnote-1221874
+Ref: Column attributes-Footnote-2222030
+Ref: Column attributes-Footnote-3222243
+Ref: Column attributes-Footnote-4222526
+Node: Using column view222659
+Node: Capturing column view225584
+Ref: Capturing column view-Footnote-1228661
+Node: Property API228797
+Node: Dates and times229151
+Node: Timestamps230058
+Ref: Timestamps-Footnote-1232477
+Ref: Timestamps-Footnote-2232663
+Ref: Timestamps-Footnote-3232794
+Node: Creating timestamps233563
+Node: The date/time prompt236387
+Ref: The date/time prompt-Footnote-1240969
+Ref: The date/time prompt-Footnote-2241132
+Ref: The date/time prompt-Footnote-3241238
+Node: Custom time format241332
+Node: Deadlines and scheduling243054
+Ref: Deadlines and scheduling-Footnote-1246534
+Node: Inserting deadline/schedule246689
+Ref: Inserting deadline/schedule-Footnote-1248489
+Ref: Inserting deadline/schedule-Footnote-2248597
+Node: Repeated tasks248705
+Ref: Repeated tasks-Footnote-1253108
+Ref: Repeated tasks-Footnote-2253357
+Node: Clocking work time253556
+Ref: Clocking work time-Footnote-1254741
+Ref: Clocking work time-Footnote-2254885
+Node: Clocking commands255023
+Ref: Clocking commands-Footnote-1259970
+Ref: Clocking commands-Footnote-2260077
+Ref: Clocking commands-Footnote-3260127
+Ref: Clocking commands-Footnote-4260185
+Node: The clock table260263
+Ref: The clock table-Footnote-1267713
+Ref: The clock table-Footnote-2267807
+Node: Resolving idle time267932
+Ref: Resolving idle time-Footnote-1271779
+Node: Effort estimates272247
+Ref: Effort estimates-Footnote-1275000
+Node: Timers275107
+Node: Capture - Refile - Archive277399
+Node: Capture278389
+Node: Setting up capture279457
+Ref: Setting up capture-Footnote-1279866
+Node: Using capture279932
+Node: Capture templates282340
+Node: Template elements284301
+Ref: Template elements-Footnote-1290496
+Node: Template expansion290671
+Ref: Template expansion-Footnote-1294661
+Ref: Template expansion-Footnote-2294748
+Ref: Template expansion-Footnote-3294930
+Node: Templates in contexts295028
+Node: Attachments295850
+Ref: Attachments-Footnote-1299232
+Node: RSS feeds299382
+Node: Protocols300859
+Node: Refile and copy301574
+Ref: Refile and copy-Footnote-1303996
+Node: Archiving304092
+Node: Moving subtrees304792
+Node: Internal archiving306816
+Node: Agenda views309448
+Node: Agenda files311872
+Ref: Agenda files-Footnote-1314675
+Ref: Agenda files-Footnote-2314824
+Node: Agenda dispatcher315017
+Ref: Agenda dispatcher-Footnote-1317926
+Ref: Agenda dispatcher-Footnote-2318020
+Node: Built-in agenda views318122
+Node: Weekly/daily agenda318771
+Ref: Weekly/daily agenda-Footnote-1324505
+Ref: Weekly/daily agenda-Footnote-2324732
+Node: Global TODO list324907
+Node: Matching tags and properties327435
+Node: Timeline334384
+Node: Search view335076
+Node: Stuck projects336369
+Ref: Stuck projects-Footnote-1338429
+Node: Presentation and sorting338459
+Node: Categories339416
+Node: Time-of-day specifications340145
+Node: Sorting agenda items342114
+Node: Filtering/limiting agenda items343683
+Ref: Filtering/limiting agenda items-Footnote-1350831
+Node: Agenda commands351246
+Ref: Agenda commands-Footnote-1372256
+Ref: Agenda commands-Footnote-2372337
+Ref: Agenda commands-Footnote-3372456
+Ref: Agenda commands-Footnote-4372556
+Node: Custom agenda views372639
+Node: Storing searches373280
+Ref: Storing searches-Footnote-1376232
+Ref: Storing searches-Footnote-2376349
+Node: Block agenda376597
+Node: Setting options377835
+Node: Exporting agenda views381424
+Ref: Exporting agenda views-Footnote-1386325
+Ref: Exporting agenda views-Footnote-2386383
+Ref: Exporting agenda views-Footnote-3386539
+Ref: Exporting agenda views-Footnote-4386726
+Node: Agenda column view386808
+Node: Markup389880
+Node: Paragraphs390867
+Node: Emphasis and monospace392033
+Node: Horizontal rules392875
+Node: Images and tables393126
+Node: Literal examples394833
+Ref: Literal examples-Footnote-1399342
+Ref: Literal examples-Footnote-2399875
+Ref: Literal examples-Footnote-3400044
+Ref: Literal examples-Footnote-4400223
+Ref: Literal examples-Footnote-5400473
+Node: Special symbols400567
+Ref: Special symbols-Footnote-1402496
+Ref: Special symbols-Footnote-2402651
+Node: Subscripts and superscripts402741
+Node: Embedded LaTeX403845
+Ref: Embedded LaTeX-Footnote-1404659
+Node: LaTeX fragments404849
+Ref: LaTeX fragments-Footnote-1406929
+Node: Previewing LaTeX fragments407152
+Ref: Previewing LaTeX fragments-Footnote-1408581
+Node: CDLaTeX mode408827
+Ref: CDLaTeX mode-Footnote-1411324
+Node: Exporting411472
+Ref: Exporting-Footnote-1414051
+Node: The export dispatcher414161
+Ref: The export dispatcher-Footnote-1416200
+Node: Export settings416463
+Ref: Export settings-Footnote-1423979
+Ref: Export settings-Footnote-2424081
+Ref: Export settings-Footnote-3424176
+Node: Table of contents424219
+Ref: Table of contents-Footnote-1425970
+Node: Include files426168
+Ref: Include files-Footnote-1429089
+Ref: Include files-Footnote-2429239
+Node: Macro replacement429405
+Ref: Macro replacement-Footnote-1431536
+Node: Comment lines431766
+Ref: Comment lines-Footnote-1432572
+Node: ASCII/Latin-1/UTF-8 export432672
+Node: Beamer export435450
+Node: Beamer export commands436208
+Node: Beamer specific export settings436883
+Node: Sectioning Frames and Blocks in Beamer438667
+Ref: Sectioning Frames and Blocks in Beamer-Footnote-1441623
+Ref: Sectioning Frames and Blocks in Beamer-Footnote-2441786
+Node: Beamer specific syntax441904
+Node: Editing support443535
+Node: A Beamer Example443966
+Node: HTML export445244
+Node: HTML Export commands446388
+Node: HTML Specific export settings446934
+Node: HTML doctypes448719
+Node: HTML preamble and postamble450933
+Node: Quoting HTML tags451981
+Node: Links in HTML export452620
+Node: Tables in HTML export453831
+Node: Images in HTML export455267
+Ref: Images in HTML export-Footnote-1456557
+Node: Math formatting in HTML export456612
+Ref: Math formatting in HTML export-Footnote-1458003
+Node: Text areas in HTML export458263
+Node: CSS support459045
+Ref: CSS support-Footnote-1462217
+Ref: CSS support-Footnote-2462389
+Node: JavaScript support462631
+Node: LaTeX export466012
+Ref: LaTeX export-Footnote-1467298
+Node: LaTeX export commands467542
+Ref: LaTeX export commands-Footnote-1468644
+Node: LaTeX specific export settings468850
+Node: LaTeX header and sectioning471022
+Ref: LaTeX header and sectioning-Footnote-1472655
+Ref: LaTeX header and sectioning-Footnote-2472767
+Node: Quoting LaTeX code472930
+Node: Tables in LaTeX export473530
+Ref: Tables in LaTeX export-Footnote-1477140
+Ref: Tables in LaTeX export-Footnote-2477218
+Ref: Tables in LaTeX export-Footnote-3477292
+Node: Images in LaTeX export477376
+Ref: Images in LaTeX export-Footnote-1479992
+Node: Plain lists in LaTeX export480146
+Node: Source blocks in LaTeX export481262
+Node: Example blocks in LaTeX export482659
+Node: Special blocks in LaTeX export483295
+Node: Horizontal rules in LaTeX export484476
+Node: Markdown export484865
+Ref: Markdown export-Footnote-1486163
+Node: OpenDocument Text export486249
+Ref: OpenDocument Text export-Footnote-1487440
+Node: Pre-requisites for ODT export487584
+Node: ODT export commands487912
+Ref: x-export-to-odt488116
+Ref: ODT export commands-Footnote-1489115
+Ref: ODT export commands-Footnote-2489175
+Node: ODT specific export settings489226
+Node: Extending ODT export490068
+Ref: x-export-to-other-formats491056
+Ref: x-convert-to-other-formats491566
+Node: Applying custom styles492023
+Node: Links in ODT export494147
+Node: Tables in ODT export494794
+Ref: Tables in ODT export-Footnote-1496930
+Node: Images in ODT export497023
+Ref: Images in ODT export-Footnote-1499749
+Node: Math formatting in ODT export499982
+Node: Working with LaTeX math snippets500446
+Ref: Working with LaTeX math snippets-Footnote-1502665
+Ref: Working with LaTeX math snippets-Footnote-2502741
+Node: Working with MathML or OpenDocument formula files502786
+Node: Labels and captions in ODT export503340
+Node: Literal examples in ODT export504798
+Node: Advanced topics in ODT export505662
+Node: Configuring a document converter506418
+Ref: x-odt-converter-capabilities507190
+Node: Working with OpenDocument style files507771
+Ref: x-factory-styles508247
+Ref: x-orgodtstyles-xml508485
+Ref: x-orgodtcontenttemplate-xml508812
+Ref: x-overriding-factory-styles509468
+Ref: x-org-odt-styles-file509748
+Ref: x-org-odt-content-template-file510629
+Node: Creating one-off styles510770
+Node: Customizing tables in ODT export512991
+Ref: Customizing tables in ODT export-Footnote-1517968
+Ref: Customizing tables in ODT export-Footnote-2518072
+Ref: Customizing tables in ODT export-Footnote-3518160
+Node: Validating OpenDocument XML518475
+Ref: Validating OpenDocument XML-Footnote-1519474
+Node: Org export519526
+Node: Texinfo export520290
+Node: Texinfo export commands521390
+Ref: Texinfo export commands-Footnote-1521925
+Node: Texinfo specific export settings522033
+Node: Texinfo file header523067
+Ref: Texinfo file header-Footnote-1524069
+Node: Texinfo title and copyright page524131
+Node: Texinfo `Top' node525604
+Node: Headings and sectioning structure526343
+Node: Indices527798
+Node: Quoting Texinfo code528591
+Node: Plain lists in Texinfo export529083
+Ref: Plain lists in Texinfo export-Footnote-1529839
+Node: Tables in Texinfo export529905
+Node: Images in Texinfo export530367
+Node: Special blocks in Texinfo export530863
+Node: A Texinfo example531439
+Node: iCalendar export533458
+Ref: iCalendar export-Footnote-1536190
+Ref: iCalendar export-Footnote-2536280
+Ref: iCalendar export-Footnote-3536380
+Node: Other built-in back-ends536517
+Node: Advanced configuration537107
+Node: Export in foreign buffers544082
+Node: Publishing545039
+Node: Configuration545907
+Node: Project alist546670
+Node: Sources and destinations547811
+Node: Selecting files549334
+Node: Publishing action550335
+Ref: Publishing action-Footnote-1552164
+Node: Publishing options552321
+Node: Publishing links565471
+Node: Sitemap566823
+Node: Generating an index570042
+Node: Uploading files570824
+Node: Sample configuration572588
+Node: Simple example573077
+Node: Complex example573724
+Node: Triggering publication575775
+Node: Working with source code576771
+Node: Structure of code blocks581221
+Node: Editing source code583708
+Node: Exporting code blocks586467
+Node: Extracting source code588888
+Node: Evaluating code blocks591332
+Ref: Evaluating code blocks-Footnote-1594453
+Ref: Evaluating code blocks-Footnote-2594579
+Node: Library of Babel594765
+Node: Languages595444
+Node: Header arguments597841
+Node: Using header arguments598198
+Node: System-wide header arguments599004
+Node: Language-specific header arguments599699
+Node: Header arguments in Org mode properties600219
+Node: Language-specific mode properties601662
+Node: Code block specific header arguments602482
+Node: Arguments in function calls604133
+Node: Specific header arguments604893
+Node: var607575
+Node: results614157
+Node: file618056
+Node: file-desc618721
+Node: file-ext619119
+Node: output-dir619536
+Node: dir619934
+Node: exports622051
+Node: tangle622923
+Node: mkdirp623768
+Node: comments624082
+Node: padline625038
+Node: no-expand625429
+Node: session626141
+Node: noweb627218
+Node: noweb-ref629016
+Ref: noweb-ref-Footnote-1630207
+Node: noweb-sep630322
+Node: cache630626
+Node: sep633224
+Node: hlines633615
+Node: colnames635097
+Node: rownames636501
+Node: shebang637690
+Node: tangle-mode638168
+Node: eval638952
+Node: wrap639936
+Node: post640243
+Node: prologue641978
+Node: epilogue642474
+Node: Results of evaluation642732
+Node: Noweb reference syntax646453
+Node: Key bindings and useful functions647973
+Node: Batch execution650012
+Node: Miscellaneous651050
+Node: Completion651889
+Node: Easy templates653773
+Node: Speed keys654958
+Node: Code evaluation security655966
+Node: Customization658771
+Node: In-buffer settings659197
+Node: The very busy C-c C-c key668424
+Node: Clean view670255
+Ref: Clean view-Footnote-1673654
+Ref: Clean view-Footnote-2673877
+Ref: Clean view-Footnote-3673932
+Node: TTY keys674004
+Node: Interaction675429
+Node: Cooperation675826
+Node: Conflicts678542
+Node: org-crypt683051
+Node: Hacking684303
+Node: Hooks685289
+Node: Add-on packages685618
+Node: Adding hyperlink types686146
+Node: Adding export back-ends689507
+Node: Context-sensitive commands690727
+Node: Tables in arbitrary syntax691408
+Node: Radio tables693071
+Node: A LaTeX example695144
+Ref: A LaTeX example-Footnote-1698857
+Ref: A LaTeX example-Footnote-2699023
+Node: Translator functions699458
+Node: Radio lists701564
+Node: Dynamic blocks702714
+Node: Special agenda views704760
+Ref: x-agenda-skip-entry-regexp707585
+Ref: Special agenda views-Footnote-1708350
+Ref: Special agenda views-Footnote-2708545
+Node: Speeding up your agendas708673
+Node: Extracting agenda information709717
+Node: Using the property API713541
+Node: Using the mapping API716866
+Node: MobileOrg720833
+Node: Setting up the staging area722393
+Ref: Setting up the staging area-Footnote-1723595
+Ref: Setting up the staging area-Footnote-2723764
+Node: Pushing to MobileOrg723971
+Ref: Pushing to MobileOrg-Footnote-1724850
+Ref: Pushing to MobileOrg-Footnote-2724936
+Ref: Pushing to MobileOrg-Footnote-3725295
+Node: Pulling from MobileOrg725367
+Ref: Pulling from MobileOrg-Footnote-1727387
+Node: History and acknowledgments727447
+Node: GNU Free Documentation License742632
+Node: Main Index767822
+Node: Key Index859205
+Node: Command and Function Index911720
+Node: Variable Index946671
 
 End Tag Table
 
diff --git a/elpa/org-20161118/org-agenda.el b/elpa/org-20170210/org-agenda.el
similarity index 96%
rename from elpa/org-20161118/org-agenda.el
rename to elpa/org-20170210/org-agenda.el
index 0a10bba7..b17efe83 100644
--- a/elpa/org-20161118/org-agenda.el
+++ b/elpa/org-20170210/org-agenda.el
@@ -1,6 +1,6 @@
 ;;; org-agenda.el --- Dynamic task and appointment lists for Org
 
-;; Copyright (C) 2004-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2017 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -469,8 +469,8 @@ match    What to search for:
 settings  A list of option settings, similar to that in a let form, so like
           this: ((opt1 val1) (opt2 val2) ...).   The values will be
           evaluated at the moment of execution, so quote them when needed.
-files     A list of files file to write the produced agenda buffer to
-          with the command `org-store-agenda-views'.
+files     A list of files to write the produced agenda buffer to with
+          the command `org-store-agenda-views'.
           If a file name ends in \".html\", an HTML version of the buffer
           is written out.  If it ends in \".ps\", a postscript version is
           produced.  Otherwise, only the plain text is written to the file.
@@ -844,10 +844,9 @@ restricted to unfinished TODO entries only."
 
 (defcustom org-agenda-skip-scheduled-if-done nil
   "Non-nil means don't show scheduled items in agenda when they are done.
-This is relevant for the daily/weekly agenda, not for the TODO list.  And
-it applies only to the actual date of the scheduling.  Warnings about
-an item with a past scheduling dates are always turned off when the item
-is DONE."
+This is relevant for the daily/weekly agenda, not for the TODO list.  It
+applies only to the actual date of the scheduling.  Warnings about an item
+with a past scheduling dates are always turned off when the item is DONE."
   :group 'org-agenda-skip
   :group 'org-agenda-daily/weekly
   :type 'boolean)
@@ -896,8 +895,8 @@ several times."
 (defcustom org-agenda-skip-deadline-if-done nil
   "Non-nil means don't show deadlines when the corresponding item is done.
 When nil, the deadline is still shown and should give you a happy feeling.
-This is relevant for the daily/weekly agenda.  And it applied only to the
-actually date of the deadline.  Warnings about approaching and past-due
+This is relevant for the daily/weekly agenda.  It applies only to the
+actual date of the deadline.  Warnings about approaching and past-due
 deadlines are always turned off when the item is DONE."
   :group 'org-agenda-skip
   :group 'org-agenda-daily/weekly
@@ -1946,7 +1945,7 @@ category, you can use:
   "When non-nil, switch to columns view right after creating the agenda."
   :group 'org-agenda-column-view
   :type 'boolean
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "9.0")
   :safe #'booleanp)
 
@@ -2942,7 +2941,7 @@ L   Timeline for current buffer         #   List stuck projects (!=configure)
 		  type (nth 2 entry)
 		  match (nth 3 entry))
 	    (if (> (length key) 1)
-		(add-to-list 'prefixes (string-to-char key))
+		(cl-pushnew (string-to-char key) prefixes :test #'equal)
 	      (setq line
 		    (format
 		     "%-4s%-14s"
@@ -5090,45 +5089,44 @@ Stuck projects are project that have no next actions.  For the definitions
 of what a project is and how to check if it stuck, customize the variable
 `org-stuck-projects'."
   (interactive)
-  (let* ((org-agenda-skip-function
-	  'org-agenda-skip-entry-when-regexp-matches-in-subtree)
-	 ;; We could have used org-agenda-skip-if here.
-	 (org-agenda-overriding-header
+  (let* ((org-agenda-overriding-header
 	  (or org-agenda-overriding-header "List of stuck projects: "))
 	 (matcher (nth 0 org-stuck-projects))
 	 (todo (nth 1 org-stuck-projects))
-	 (todo-wds (if (member "*" todo)
-		       (progn
-			 (org-agenda-prepare-buffers (org-agenda-files
-						      nil 'ifmode))
-			 (org-delete-all
-			  org-done-keywords-for-agenda
-			  (copy-sequence org-todo-keywords-for-agenda)))
-		     todo))
-	 (todo-re (concat "^\\*+[ \t]+\\("
-			  (mapconcat 'identity todo-wds "\\|")
-			  "\\)\\>"))
 	 (tags (nth 2 org-stuck-projects))
-	 (tags-re (if (member "*" tags)
-		      (concat org-outline-regexp-bol
-			      ".*:[[:alnum:]_@#%]+:[ \t]*$")
-		    (if tags
-			(concat org-outline-regexp-bol
-				".*:\\("
-				(mapconcat #'identity tags "\\|")
-				"\\):[[:alnum:]_@#%:]*[ \t]*$"))))
-	 (gen-re (nth 3 org-stuck-projects))
-	 (re-list
-	  (delq nil
-		(list
-		 (if todo todo-re)
-		 (if tags tags-re)
-		 (and gen-re (stringp gen-re) (string-match "\\S-" gen-re)
-		      gen-re)))))
-    (setq org-agenda-skip-regexp
-	  (if re-list
-	      (mapconcat 'identity re-list "\\|")
-	    (error "No information how to identify unstuck projects")))
+	 (gen-re (org-string-nw-p (nth 3 org-stuck-projects)))
+	 (todo-wds
+	  (if (not (member "*" todo)) todo
+	    (org-agenda-prepare-buffers (org-agenda-files nil 'ifmode))
+	    (org-delete-all org-done-keywords-for-agenda
+			    (copy-sequence org-todo-keywords-for-agenda))))
+	 (todo-re (and todo
+		       (format "^\\*+[ \t]+\\(%s\\)\\>"
+			       (mapconcat #'identity todo-wds "\\|"))))
+	 (tags-re (cond ((null tags) nil)
+			((member "*" tags)
+			 (eval-when-compile
+			   (concat org-outline-regexp-bol
+				   ".*:[[:alnum:]_@#%]+:[ \t]*$")))
+			(tags (concat org-outline-regexp-bol
+				      ".*:\\("
+				      (mapconcat #'identity tags "\\|")
+				      "\\):[[:alnum:]_@#%:]*[ \t]*$"))
+			(t nil)))
+	 (re-list (delq nil (list todo-re tags-re gen-re)))
+	 (skip-re
+	  (if (null re-list)
+	      (error "Missing information to identify unstuck projects")
+	    (mapconcat #'identity re-list "\\|")))
+	 (org-agenda-skip-function
+	  ;; Skip entry if `org-agenda-skip-regexp' matches anywhere
+	  ;; in the subtree.
+	  `(lambda ()
+	     (and (save-excursion
+		    (let ((case-fold-search nil))
+		      (re-search-forward
+		       ,skip-re (save-excursion (org-end-of-subtree t)) t)))
+		  (progn (outline-next-heading) (point))))))
     (org-tags-view nil matcher)
     (setq org-agenda-buffer-name (buffer-name))
     (with-current-buffer org-agenda-buffer-name
@@ -5583,24 +5581,27 @@ This function is invoked if `org-agenda-todo-ignore-deadlines',
 			(match-string 1) org-agenda-todo-ignore-timestamp))
 		      (t))))))))))
 
-(defun org-agenda-get-timestamps (&optional deadline-results)
-  "Return the date stamp information for agenda display."
+(defun org-agenda-get-timestamps (&optional deadlines)
+  "Return the date stamp information for agenda display.
+Optional argument DEADLINES is a list of deadline items to be
+displayed in agenda view."
   (let* ((props (list 'face 'org-agenda-calendar-event
 		      'org-not-done-regexp org-not-done-regexp
 		      'org-todo-regexp org-todo-regexp
 		      'org-complex-heading-regexp org-complex-heading-regexp
 		      'mouse-face 'highlight
 		      'help-echo
-		      (format "mouse-2 or RET jump to org file %s"
+		      (format "mouse-2 or RET jump to Org file %s"
 			      (abbreviate-file-name buffer-file-name))))
-	 (d1 (calendar-absolute-from-gregorian date))
-	 mm
+	 (current (calendar-absolute-from-gregorian date))
+	 (today (org-today))
 	 (deadline-position-alist
-	  (mapcar (lambda (a) (and (setq mm (get-text-property
-					0 'org-hd-marker a))
-			      (cons (marker-position mm) a)))
-		  deadline-results))
-	 (remove-re org-ts-regexp)
+	  (mapcar (lambda (d)
+		    (let ((m (get-text-property 0 'org-hd-marker d)))
+		      (and m (marker-position m))))
+		  deadlines))
+	 ;; Match time-stamps set to current date, time-stamps with
+	 ;; a repeater, and S-exp time-stamps.
 	 (regexp
 	  (concat
 	   (if org-agenda-include-inactive-timestamps "[[<]" "<")
@@ -5608,90 +5609,106 @@ This function is invoked if `org-agenda-todo-ignore-deadlines',
 	    (substring
 	     (format-time-string
 	      (car org-time-stamp-formats)
-	      (apply 'encode-time	; DATE bound by calendar
+	      (apply #'encode-time	; DATE bound by calendar
 		     (list 0 0 0 (nth 1 date) (car date) (nth 2 date))))
 	     1 11))
 	   "\\|\\(<[0-9]+-[0-9]+-[0-9]+[^>\n]+?\\+[0-9]+[hdwmy]>\\)"
 	   "\\|\\(<%%\\(([^>\n]+)\\)>\\)"))
-	 marker hdmarker clockp inactivep donep tmp priority category level ee
-	 txt timestr tags b0 b3 e3 head todo-state end-of-match show-all
-	 warntime habitp inherited-tags ts-date)
+	 timestamp-items)
     (goto-char (point-min))
-    (while (setq end-of-match (re-search-forward regexp nil t))
-      (setq b0 (match-beginning 0)
-	    b3 (match-beginning 3) e3 (match-end 3)
-	    todo-state (save-match-data (ignore-errors (org-get-todo-state)))
-	    habitp (and (functionp 'org-is-habit-p) (save-match-data (org-is-habit-p)))
-	    show-all (or (eq org-agenda-repeating-timestamp-show-all t)
-			 (member todo-state
-				 org-agenda-repeating-timestamp-show-all)))
+    (while (re-search-forward regexp nil t)
+      ;; Skip date ranges, scheduled and deadlines, which are handled
+      ;; specially.  Also skip time-stamps before first headline as
+      ;; there would be no entry to add to the agenda.  Eventually,
+      ;; ignore clock entries.
       (catch :skip
-	(when (org-at-date-range-p) (throw :skip nil))
-	(when (org-at-planning-p) (throw :skip nil))
-	(org-agenda-skip)
-	(if (and (match-end 1)
-		 (not (= d1 (org-agenda--timestamp-to-absolute
-			     (match-string 1) d1 nil show-all
-			     (current-buffer) b0))))
+	(save-match-data
+	  (when (or (org-at-date-range-p)
+		    (org-at-planning-p)
+		    (org-before-first-heading-p)
+		    (and org-agenda-include-inactive-timestamps
+			 (org-at-clock-log-p)))
 	    (throw :skip nil))
-	(if (and e3
-		 (not (org-diary-sexp-entry (buffer-substring b3 e3) "" date)))
+	  (org-agenda-skip))
+	(let* ((pos (match-beginning 0))
+	       (repeat (match-string 1))
+	       (sexp-entry (match-string 3))
+	       (time-stamp (if (or repeat sexp-entry) (match-string 0)
+			     (save-excursion
+			       (goto-char pos)
+			       (looking-at org-ts-regexp-both)
+			       (match-string 0))))
+	       (todo-state (org-get-todo-state))
+	       (show-all (or (eq org-agenda-repeating-timestamp-show-all t)
+			     (member todo-state
+				     org-agenda-repeating-timestamp-show-all)))
+	       (warntime (get-text-property (point) 'org-appt-warntime))
+	       (done? (member todo-state org-done-keywords)))
+	  ;; Possibly skip done tasks.
+	  (when (and done? org-agenda-skip-timestamp-if-done)
+	    (throw :skip t))
+	  ;; S-exp entry doesn't match current day: skip it.
+	  (when (and sexp-entry (not (org-diary-sexp-entry sexp-entry "" date)))
 	    (throw :skip nil))
-	(setq tmp (buffer-substring (max (point-min)
-					 (- b0 org-ds-keyword-length))
-				    b0)
-	      timestr (if b3 "" (buffer-substring b0 (point-at-eol)))
-	      inactivep (= (char-after b0) ?\[)
-	      clockp (and org-agenda-include-inactive-timestamps
-			  (or (string-match org-clock-string tmp)
-			      (string-match "]-+\\'" tmp)))
-	      warntime (get-text-property (point) 'org-appt-warntime)
-	      donep (member todo-state org-done-keywords))
-	(when (or clockp (and donep org-agenda-skip-timestamp-if-done))
-	  (throw :skip t))
-	(if (string-match ">" timestr)
-	    ;; substring should only run to end of time stamp
-	    (setq timestr (substring timestr 0 (match-end 0))))
-	(setq marker (org-agenda-new-marker b0)
-	      category (org-get-category b0))
-	(save-excursion
-	  (if (not (re-search-backward org-outline-regexp-bol nil t))
-	      (throw :skip nil)
-	    (goto-char (match-beginning 0))
-	    (if (and (eq t org-agenda-skip-timestamp-if-deadline-is-shown)
-		     (assoc (point) deadline-position-alist))
-		(throw :skip nil))
-	    (setq hdmarker (org-agenda-new-marker)
-		  inherited-tags
-		  (or (eq org-agenda-show-inherited-tags 'always)
-		      (and (listp org-agenda-show-inherited-tags)
-			   (memq 'agenda org-agenda-show-inherited-tags))
-		      (and (eq org-agenda-show-inherited-tags t)
-			   (or (eq org-agenda-use-tag-inheritance t)
-			       (memq 'agenda org-agenda-use-tag-inheritance))))
-		  tags (org-get-tags-at nil (not inherited-tags))
-		  level (make-string (org-reduced-level (org-outline-level)) ? ))
-	    (looking-at "\\*+[ \t]+\\(.*\\)")
-	    (setq head (match-string 1))
-	    (setq txt (org-agenda-format-item
-		       (if inactivep org-agenda-inactive-leader nil)
-		       head level category tags timestr
-		       remove-re habitp)))
-	  (setq priority (org-get-priority txt))
-	  (org-add-props txt props 'priority priority
-			 'org-marker marker 'org-hd-marker hdmarker
-			 'date date
-			 'level level
-			 'ts-date
-			 (ignore-errors (org-time-string-to-absolute timestr))
-			 'todo-state todo-state
-			 'warntime warntime
-			 'type "timestamp")
-	  (push txt ee))
-	(if org-agenda-skip-additional-timestamps-same-entry
-	    (outline-next-heading)
-	  (goto-char end-of-match))))
-    (nreverse ee)))
+	  ;; When time-stamp doesn't match CURRENT but has a repeater,
+	  ;; make sure it repeats on CURRENT.  Furthermore, if
+	  ;; SHOW-ALL is nil, ensure that repeats are only the first
+	  ;; before and the first after today.
+	  (when (and repeat
+		     (if show-all
+			 (/= current
+			     (org-agenda--timestamp-to-absolute
+			      repeat current 'future (current-buffer) pos))
+		       (and (/= current
+				(org-agenda--timestamp-to-absolute
+				 repeat today 'past (current-buffer) pos))
+			    (/= current
+				(org-agenda--timestamp-to-absolute
+				 repeat today 'future (current-buffer) pos)))))
+	    (throw :skip nil))
+	  (save-excursion
+	    (re-search-backward org-outline-regexp-bol nil t)
+	    ;; Possibly skip time-stamp when a deadline is set.
+	    (when (and org-agenda-skip-timestamp-if-deadline-is-shown
+		       (assq (point) deadline-position-alist))
+	      (throw :skip nil))
+	    (let* ((category (org-get-category pos))
+		   (inherited-tags
+		    (or (eq org-agenda-show-inherited-tags 'always)
+			(and (consp org-agenda-show-inherited-tags)
+			     (memq 'agenda org-agenda-show-inherited-tags))
+			(and (eq org-agenda-show-inherited-tags t)
+			     (or (eq org-agenda-use-tag-inheritance t)
+				 (memq 'agenda
+				       org-agenda-use-tag-inheritance)))))
+		   (tags (org-get-tags-at nil (not inherited-tags)))
+		   (level (make-string (org-reduced-level (org-outline-level))
+				       ?\s))
+		   (head (and (looking-at "\\*+[ \t]+\\(.*\\)")
+			      (match-string 1)))
+		   (inactive? (= (char-after pos) ?\[))
+		   (habit? (and (fboundp 'org-is-habit-p) (org-is-habit-p)))
+		   (item
+		    (org-agenda-format-item
+		     (and inactive? org-agenda-inactive-leader)
+		     head level category tags time-stamp org-ts-regexp habit?)))
+	      (org-add-props item props
+		'priority (if habit?
+			      (org-habit-get-priority (org-habit-parse-todo))
+			    (org-get-priority item))
+		'org-marker (org-agenda-new-marker pos)
+		'org-hd-marker (org-agenda-new-marker)
+		'date date
+		'level level
+		'ts-date (if repeat (org-agenda--timestamp-to-absolute repeat)
+			   current)
+		'todo-state todo-state
+		'warntime warntime
+		'type "timestamp")
+	      (push item timestamp-items))))
+	(when org-agenda-skip-additional-timestamps-same-entry
+	  (outline-next-heading))))
+    (nreverse timestamp-items)))
 
 (defun org-agenda-get-sexps ()
   "Return the sexp information for agenda display."
@@ -6036,7 +6053,8 @@ specification like [h]h:mm."
 	 (regexp (if with-hour
 		     org-deadline-time-hour-regexp
 		   org-deadline-time-regexp))
-	 (todayp (org-agenda-today-p date)) ; DATE bound by calendar.
+	 (today (org-today))
+	 (today? (org-agenda-today-p date)) ; DATE bound by calendar.
 	 (current (calendar-absolute-from-gregorian date))
 	 deadline-items)
     (goto-char (point-min))
@@ -6047,18 +6065,29 @@ specification like [h]h:mm."
 	(let* ((s (match-string 1))
 	       (pos (1- (match-beginning 1)))
 	       (todo-state (save-match-data (org-get-todo-state)))
-	       (donep (member todo-state org-done-keywords))
+	       (done? (member todo-state org-done-keywords))
 	       (show-all (or (eq org-agenda-repeating-timestamp-show-all t)
 			     (member todo-state
 				     org-agenda-repeating-timestamp-show-all)))
-	       ;; DEADLINE is the current scheduled date.  When it
-	       ;; contains a repeater and SHOW-ALL is non-nil,
-	       ;; LAST-REPEAT is the repeat closest to CURRENT.
-	       ;; Otherwise, LAST-REPEAT is equal to DEADLINE.
-	       (last-repeat (org-agenda--timestamp-to-absolute
-			     s current 'past show-all (current-buffer) pos))
-	       (deadline (org-agenda--timestamp-to-absolute s current))
-	       (diff (- last-repeat current))
+	       (sexp? (string-prefix-p "%%" s))
+	       ;; DEADLINE is the bare deadline date, i.e., without
+	       ;; any repeater, or the last repeat if SHOW-ALL is
+	       ;; non-nil.  REPEAT is closest repeat after CURRENT, if
+	       ;; all repeated time stamps are to be shown, or after
+	       ;; TODAY otherwise.  REPEAT only applies to future
+	       ;; dates.
+	       (deadline (cond
+			  (sexp? (org-agenda--timestamp-to-absolute s current))
+			  (show-all (org-agenda--timestamp-to-absolute s))
+			  (t (org-agenda--timestamp-to-absolute
+			      s today 'past (current-buffer) pos))))
+	       (repeat (cond (sexp? deadline)
+			     ((< current today) deadline)
+			     (t
+			      (org-agenda--timestamp-to-absolute
+			       s (if show-all current today) 'future
+			       (current-buffer) pos))))
+	       (diff (- deadline current))
 	       (suppress-prewarning
 		(let ((scheduled
 		       (and org-agenda-skip-deadline-prewarning-if-scheduled
@@ -6073,13 +6102,8 @@ specification like [h]h:mm."
 		   ((eq org-agenda-skip-deadline-prewarning-if-scheduled
 			'pre-scheduled)
 		    ;; Set pre-warning to no earlier than SCHEDULED.
-		    (min (- last-repeat
-			    (org-agenda--timestamp-to-absolute
-			     scheduled current 'past show-all
-			     (current-buffer)
-			     (save-excursion
-			       (beginning-of-line)
-			       (1+ (search-forward org-deadline-string)))))
+		    (min (- deadline
+			    (org-agenda--timestamp-to-absolute scheduled))
 			 org-deadline-warning-days))
 		   ;; Set pre-warning to deadline.
 		   (t 0))))
@@ -6089,14 +6113,17 @@ specification like [h]h:mm."
 			(org-get-wdays s))))
 	  ;; When to show a deadline in the calendar: if the
 	  ;; expiration is within WDAYS warning time.  Past-due
-	  ;; deadlines are only shown on the current date
-	  (unless (or (and (<= diff wdays)
-			   (and todayp (not org-agenda-only-exact-dates)))
-		      (= diff 0))
+	  ;; deadlines are only shown on today agenda.
+	  (when (cond ((= current deadline) nil)
+		      ((< deadline today)
+		       (and (not today?)
+			    (or (< current today) (/= repeat current))))
+		      ((> deadline current)
+		       (or (not today?) (> diff wdays)))
+		      (t (/= repeat current)))
 	    (throw :skip nil))
-	  ;; Skip done tasks if `org-agenda-skip-deadline-if-done' is
-	  ;; non-nil or if it isn't applicable to CURRENT deadline.
-	  (when (and donep
+	  ;; Possibly skip done tasks.
+	  (when (and done?
 		     (or org-agenda-skip-deadline-if-done
 			 (/= deadline current)))
 	    (throw :skip nil))
@@ -6116,28 +6143,35 @@ specification like [h]h:mm."
 				 (memq 'agenda
 				       org-agenda-use-tag-inheritance)))))
 		   (tags (org-get-tags-at nil (not inherited-tags)))
-		   (timestr
-		    (if (string-match " \\([012]?[0-9]:[0-9][0-9]\\)" s)
-			(concat (substring s (match-beginning 1)) " ")
-		      'time))
+		   (time
+		    (cond
+		     ;; No time of day designation if it is only
+		     ;; a reminder.
+		     ((and (/= current deadline) (/= current repeat)) nil)
+		     ((string-match " \\([012]?[0-9]:[0-9][0-9]\\)" s)
+		      (concat (substring s (match-beginning 1)) " "))
+		     (t 'time)))
 		   (item
 		    (org-agenda-format-item
-		     ;; For past deadlines, make sure to report time
-		     ;; difference since date S, not since closest
-		     ;; repeater.
-		     (let ((diff (if (< (org-today) current) diff
-				   (- deadline current))))
-		       (if (= diff 0) (car org-agenda-deadline-leaders)
-			 (let ((future (nth 1 org-agenda-deadline-leaders))
-			       (past (nth 2 org-agenda-deadline-leaders)))
-			   (cond ((> diff 0) (format future diff))
-				 ((string= future past) (format past diff))
-				 (t (format past (abs diff)))))))
+		     ;; Insert appropriate suffixes before deadlines.
+		     (pcase-let ((`(,now ,future ,past)
+				  org-agenda-deadline-leaders))
+		       (cond
+			;; Future (i.e., repeated) deadlines are
+			;; displayed as new headlines.
+			((> current today) now)
+			;; When SHOW-ALL is nil, prefer repeated
+			;; deadlines over reminders of past deadlines.
+			((and (not show-all) (= repeat today)) now)
+			((= deadline current) now)
+			((< deadline current) (format past (- diff)))
+			(t (format future diff))))
 		     head level category tags
-		     (and (= diff 0) timestr)))
+		     (and (or (= repeat current) (= deadline current))
+			  time)))
 		   (face (org-agenda-deadline-face
 			  (- 1 (/ (float (- deadline current)) (max wdays 1)))))
-		   (upcomingp (and todayp (> diff 0)))
+		   (upcoming? (and today? (> deadline today)))
 		   (warntime (get-text-property (point) 'org-appt-warntime)))
 	      (org-add-props item props
 		'org-marker (org-agenda-new-marker pos)
@@ -6145,11 +6179,19 @@ specification like [h]h:mm."
 		'warntime warntime
 		'level level
 		'ts-date deadline
-		'priority (- (org-get-priority item) diff)
+		'priority
+		;; Adjust priority to today reminders about deadlines.
+		;; Overdue deadlines get the highest priority
+		;; increase, then imminent deadlines and eventually
+		;; more distant deadlines.
+		(let ((adjust (cond ((not today?) 0)
+				    ((and (not show-all) (= repeat current)) 0)
+				    (t (- diff)))))
+		  (+ adjust (org-get-priority item)))
 		'todo-state todo-state
-		'type (if upcomingp "upcoming-deadline" "deadline")
-		'date (if upcomingp date deadline)
-		'face (if donep 'org-agenda-done face)
+		'type (if upcoming? "upcoming-deadline" "deadline")
+		'date (if upcoming? date deadline)
+		'face (if done? 'org-agenda-done face)
 		'undone-face face
 		'done-face 'org-agenda-done)
 	      (push item deadline-items))))))
@@ -6158,10 +6200,7 @@ specification like [h]h:mm."
 (defun org-agenda-deadline-face (fraction)
   "Return the face to displaying a deadline item.
 FRACTION is what fraction of the head-warning time has passed."
-  (let ((faces org-agenda-deadline-faces) f)
-    (catch 'exit
-      (while (setq f (pop faces))
-	(if (>= fraction (car f)) (throw 'exit (cdr f)))))))
+  (assoc-default fraction org-agenda-deadline-faces #'<=))
 
 (defun org-agenda-get-scheduled (&optional deadlines with-hour)
   "Return the scheduled information for agenda display.
@@ -6174,11 +6213,12 @@ scheduled items with an hour specification like [h]h:mm."
 		      'done-face 'org-agenda-done
 		      'mouse-face 'highlight
 		      'help-echo
-		      (format "mouse-2 or RET jump to org file %s"
+		      (format "mouse-2 or RET jump to Org file %s"
 			      (abbreviate-file-name buffer-file-name))))
 	 (regexp (if with-hour
 		     org-scheduled-time-hour-regexp
 		   org-scheduled-time-regexp))
+	 (today (org-today))
 	 (todayp (org-agenda-today-p date)) ; DATE bound by calendar.
 	 (current (calendar-absolute-from-gregorian date))
 	 (deadline-pos
@@ -6199,16 +6239,28 @@ scheduled items with an hour specification like [h]h:mm."
 	       (show-all (or (eq org-agenda-repeating-timestamp-show-all t)
 			     (member todo-state
 				     org-agenda-repeating-timestamp-show-all)))
-	       ;; SCHEDULE is the current scheduled date.  When it
-	       ;; contains a repeater and SHOW-ALL is non-nil,
-	       ;; LAST-REPEAT is the repeat closest to CURRENT.
-	       ;; Otherwise, LAST-REPEAT is equal to SCHEDULE.
-	       (last-repeat (org-agenda--timestamp-to-absolute
-			     s current 'past show-all (current-buffer) pos))
-	       (schedule (org-agenda--timestamp-to-absolute s current))
-	       (diff (- last-repeat current))
+	       (sexp? (string-prefix-p "%%" s))
+	       ;; SCHEDULE is the bare scheduled date, i.e., without
+	       ;; any repeater if non-nil, or last repeat if SHOW-ALL
+	       ;; is nil.  REPEAT is the closest repeat after CURRENT,
+	       ;; if all repeated time stamps are to be shown, or
+	       ;; after TODAY otherwise.  REPEAT only applies to
+	       ;; future dates.
+	       (schedule (cond
+			  (sexp? (org-agenda--timestamp-to-absolute s current))
+			  (show-all (org-agenda--timestamp-to-absolute s))
+			  (t (org-agenda--timestamp-to-absolute
+			      s today 'past (current-buffer) pos))))
+	       (repeat (cond
+			(sexp? schedule)
+			((< current today) schedule)
+			(t
+			 (org-agenda--timestamp-to-absolute
+			  s (if show-all current today) 'future
+			  (current-buffer) pos))))
+	       (diff (- current schedule))
 	       (warntime (get-text-property (point) 'org-appt-warntime))
-	       (pastschedp (< schedule (org-today)))
+	       (pastschedp (< schedule today))
 	       (habitp (and (fboundp 'org-is-habit-p) (org-is-habit-p)))
 	       (suppress-delay
 		(let ((deadline (and org-agenda-skip-scheduled-delay-if-deadline
@@ -6222,16 +6274,9 @@ scheduled items with an hour specification like [h]h:mm."
 		    (- org-agenda-skip-scheduled-delay-if-deadline))
 		   ((eq org-agenda-skip-scheduled-delay-if-deadline
 			'post-deadline)
-		    ;; Set delay to no later than DEADLINE.  If
-		    ;; DEADLINE has a repeater, compare last schedule
-		    ;; repeat and last deadline repeat.
-		    (min (- last-repeat
-			    (org-agenda--timestamp-to-absolute
-			     deadline current 'past show-all
-			     (current-buffer)
-			     (save-excursion
-			       (beginning-of-line)
-			       (1+ (search-forward org-deadline-string)))))
+		    ;; Set delay to no later than DEADLINE.
+		    (min (- schedule
+			    (org-agenda--timestamp-to-absolute deadline))
 			 org-scheduled-delay-days))
 		   (t 0))))
 	       (ddays
@@ -6239,30 +6284,30 @@ scheduled items with an hour specification like [h]h:mm."
 		 ;; Nullify delay when a repeater triggered already
 		 ;; and the delay is of the form --Xd.
 		 ((and (string-match-p "--[0-9]+[hdwmy]" s)
-		       (/= schedule last-repeat))
+		       (> current schedule))
 		  0)
 		 (suppress-delay
 		  (let ((org-scheduled-delay-days suppress-delay))
 		    (org-get-wdays s t t)))
 		 (t (org-get-wdays s t)))))
-	  ;; Only show a scheduled item in the calendar if it is on or
-	  ;; past the current date.  Skip it if it has been displayed
-	  ;; for more than `org-scheduled-past-days'.
-	  (unless (or (and (>= ddays 0) (= diff (- ddays)))
-		      (and (< (+ diff ddays) 0)
-			   (< (abs diff) org-scheduled-past-days)
-			   (and todayp (not org-agenda-only-exact-dates)))
-		      (and todayp
-			   habitp
-			   (bound-and-true-p org-habit-show-all-today)))
-	    (throw :skip nil))
-	  ;; Skip done habits, or tasks if
-	  ;; `org-agenda-skip-deadline-if-done' is non-nil or if it
-	  ;; was scheduled in the past anyway.
+	  ;; Display scheduled items at base date (SCHEDULE), today if
+	  ;; scheduled before the current date, and at any repeat past
+	  ;; today.  However, skip delayed items and items that have
+	  ;; been displayed for more than `org-scheduled-past-days'.
+	  (unless (and todayp
+		       habitp
+		       (bound-and-true-p org-habit-show-all-today))
+	    (when (or (and (> ddays 0) (< diff ddays))
+		      (> diff org-scheduled-past-days)
+		      (> schedule current)
+		      (and (< schedule current)
+			   (not todayp)
+			   (/= repeat current)))
+	      (throw :skip nil)))
+	  ;; Possibly skip done tasks.
 	  (when (and donep
 		     (or org-agenda-skip-scheduled-if-done
-			 (/= schedule current)
-			 habitp))
+			 (/= schedule current)))
 	    (throw :skip nil))
 	  ;; Skip entry if it already appears as a deadline, per
 	  ;; `org-agenda-skip-scheduled-if-deadline-is-shown'.  This
@@ -6273,16 +6318,16 @@ scheduled items with an hour specification like [h]h:mm."
 			habitp))
 		   nil)
 		  (`repeated-after-deadline
-		   (>= last-repeat
-		       (time-to-days (org-get-deadline-time (point)))))
+		   (>= repeat (time-to-days (org-get-deadline-time (point)))))
 		  (`not-today pastschedp)
 		  (`t t)
 		  (_ nil))
 	    (throw :skip nil))
 	  ;; Skip habits if `org-habit-show-habits' is nil, or if we
-	  ;; only show them for today.
+	  ;; only show them for today.  Also skip done habits.
 	  (when (and habitp
-		     (or (not (bound-and-true-p org-habit-show-habits))
+		     (or donep
+			 (not (bound-and-true-p org-habit-show-habits))
 			 (and (not todayp)
 			      (bound-and-true-p
 			       org-habit-show-habits-only-for-today))))
@@ -6303,22 +6348,32 @@ scheduled items with an hour specification like [h]h:mm."
 		   (level
 		    (make-string (org-reduced-level (org-outline-level)) ?\s))
 		   (head (buffer-substring (point) (line-end-position)))
-		   (timestr
-		    (if (string-match " \\([012]?[0-9]:[0-9][0-9]\\)" s)
-			(concat (substring s (match-beginning 1)) " ")
-		      'time))
-		   (item (org-agenda-format-item
-			  ;; For past scheduled dates, make sure to
-			  ;; report time difference since SCHEDULE,
-			  ;; not since closest repeater.
-			  (let ((diff (if (< (org-today) current) diff
-					(- schedule current))))
-			    (if (= diff 0) (car org-agenda-scheduled-leaders)
-			      (format (nth 1 org-agenda-scheduled-leaders)
-				      (- 1 diff))))
-			  head level category tags
-			  (and (= diff 0) timestr)
-			  nil habitp))
+		   (time
+		    (cond
+		     ;; No time of day designation if it is only
+		     ;; a reminder.
+		     ((and (/= current schedule) (/= current repeat)) nil)
+		     ((string-match " \\([012]?[0-9]:[0-9][0-9]\\)" s)
+		      (concat (substring s (match-beginning 1)) " "))
+		     (t 'time)))
+		   (item
+		    (org-agenda-format-item
+		     (pcase-let ((`(,first ,next) org-agenda-scheduled-leaders))
+		       (cond
+			;; If CURRENT is in the future, don't use past
+			;; scheduled prefix.
+			((> current today) first)
+			;; SHOW-ALL focuses on future repeats.  If one
+			;; such repeat happens today, ignore late
+			;; schedule reminder.  However, still report
+			;; such reminders when repeat happens later.
+			((and (not show-all) (= repeat today)) first)
+			;; Initial report.
+			((= schedule current) first)
+			;; Subsequent reminders.  Count from base
+			;; schedule.
+			(t (format next (1+ diff)))))
+		     head level category tags time nil habitp))
 		   (face (cond ((and (not habitp) pastschedp)
 				'org-scheduled-previously)
 			       (todayp 'org-scheduled-today)
@@ -6335,7 +6390,7 @@ scheduled items with an hour specification like [h]h:mm."
 		'warntime warntime
 		'level level
 		'priority (if habitp (org-habit-get-priority habitp)
-			    (+ 94 (- 5 diff) (org-get-priority item)))
+			    (+ 99 diff (org-get-priority item)))
 		'org-habit-p habitp
 		'todo-state todo-state)
 	      (push item scheduled-items))))))
@@ -6444,7 +6499,7 @@ The flag is set if the currently compiled format contains a `%b'.")
 
 (defun org-agenda-get-category-icon (category)
   "Return an image for CATEGORY according to `org-agenda-category-icon-alist'."
-  (dolist (entry org-agenda-category-icon-alist)
+  (cl-dolist (entry org-agenda-category-icon-alist)
     (when (string-match-p (car entry) category)
       (if (listp (cadr entry))
 	  (cl-return (cadr entry))
@@ -7439,31 +7494,41 @@ With no prefix argument, keep entries matching the effort condition.
 With one prefix argument, filter out entries matching the condition.
 With two prefix arguments, remove the effort filters."
   (interactive "P")
-  (cond ((member strip '(nil 4))
-	 (let ((efforts (org-split-string
-			 (or (cdr (assoc (concat org-effort-property "_ALL")
-					 org-global-properties))
-			     "0 0:10 0:30 1:00 2:00 3:00 4:00 5:00 6:00 7:00 8:00"
-			     "")))
-	       (eff -1)
-	       effort-prompt op)
-	   (while (not (member op '(?< ?> ?=)))
-	     (setq op (read-char-exclusive "Effort operator? (> = or <)")))
-	   (cl-loop for i from 0 to 9 do
-		    (setq effort-prompt
-			  (concat
-			   effort-prompt " ["
-			   (if (= i 9) "0" (int-to-string (1+ i)))
-			   "]" (nth i efforts))))
-	   (message "Effort %s%s" (char-to-string op) effort-prompt)
-	   (while (or (< eff 0) (> eff 9))
-	     (setq eff (string-to-number (char-to-string (read-char-exclusive)))))
-	   (setq org-agenda-effort-filter
-		 (list (concat (if strip "-" "+")
-			       (char-to-string op) (nth (1- eff) efforts))))
-	   (org-agenda-filter-apply org-agenda-effort-filter 'effort)))
-	(t (org-agenda-filter-show-all-effort)
-	   (message "Effort filter removed"))))
+  (cond
+   ((member strip '(nil 4))
+    (let* ((efforts (split-string
+		     (or (cdr (assoc (concat org-effort-property "_ALL")
+				     org-global-properties))
+			 "0 0:10 0:30 1:00 2:00 3:00 4:00 5:00 6:00 7:00")))
+	   ;; XXX: the following handles only up to 10 different
+	   ;; effort values.
+	   (allowed-keys (if (null efforts) nil
+			   (mapcar (lambda (n) (mod n 10)) ;turn 10 into 0
+				   (number-sequence 1 (length efforts)))))
+	   (op nil))
+      (while (not (memq op '(?< ?> ?=)))
+	(setq op (read-char-exclusive "Effort operator? (> = or <)")))
+      ;; Select appropriate duration.  Ignore non-digit characters.
+      (let ((prompt
+	     (apply #'format
+		    (concat "Effort %c "
+			    (mapconcat (lambda (s) (concat "[%d]" s))
+				       efforts
+				       " "))
+		    op allowed-keys))
+	    (eff -1))
+	(while (not (memq eff allowed-keys))
+	  (message prompt)
+	  (setq eff (- (read-char-exclusive) 48)))
+	(setq org-agenda-effort-filter
+	      (list (concat (if strip "-" "+")
+			    (char-to-string op)
+			    ;; Numbering is 1 2 3 ... 9 0, but we want
+			    ;; 0 1 2 ... 8 9.
+			    (nth (mod (1- eff) 10) efforts)))))
+      (org-agenda-filter-apply org-agenda-effort-filter 'effort)))
+   (t (org-agenda-filter-show-all-effort)
+      (message "Effort filter removed"))))
 
 (defun org-agenda-filter-remove-all ()
   "Remove all filters from the current agenda buffer."
@@ -7655,8 +7720,11 @@ E looks like \"+<2:25\"."
 (defun org-agenda-compare-effort (op value)
   "Compare the effort of the current line with VALUE, using OP.
 If the line does not have an effort defined, return nil."
-  (let ((eff (org-get-at-eol 'effort-minutes 1)))
-    (funcall op (or eff (if org-sort-agenda-noeffort-is-high 32767 -1))
+  ;; `effort-minutes' property cannot be extracted directly from
+  ;; current line but is stored as a property in `txt'.
+  (let ((effort (get-text-property 0 'effort-minutes (org-get-at-bol 'txt))))
+    (funcall op
+	     (or effort (if org-sort-agenda-noeffort-is-high 32767 -1))
 	     value)))
 
 (defun org-agenda-filter-expand-tags (filter &optional no-operator)
@@ -8273,7 +8341,7 @@ When called with a prefix argument, include all archive files as well."
 	       (t ""))
 	      (if (or org-agenda-category-filter
 		      (get 'org-agenda-category-filter :preset-filter))
-	      	  '(:eval (propertize
+		  '(:eval (propertize
 	      		   (concat " <"
 	      			   (mapconcat
 	      			    'identity
diff --git a/elpa/org-20161118/org-archive.el b/elpa/org-20170210/org-archive.el
similarity index 99%
rename from elpa/org-20161118/org-archive.el
rename to elpa/org-20170210/org-archive.el
index 3ba8bf14..4ce81aab 100644
--- a/elpa/org-20161118/org-archive.el
+++ b/elpa/org-20170210/org-archive.el
@@ -1,6 +1,6 @@
 ;;; org-archive.el --- Archiving for Org             -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2004-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2017 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/elpa/org-20161118/org-attach.el b/elpa/org-20170210/org-attach.el
similarity index 99%
rename from elpa/org-20161118/org-attach.el
rename to elpa/org-20170210/org-attach.el
index d6e587d8..75157a1e 100644
--- a/elpa/org-20161118/org-attach.el
+++ b/elpa/org-20170210/org-attach.el
@@ -1,6 +1,6 @@
 ;;; org-attach.el --- Manage file attachments to Org tasks -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2008-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2017 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@newartisans.com>
 ;; Keywords: org data task
@@ -59,7 +59,7 @@ where the Org file lives."
 This is only done if the Org file is in a git repository."
   :group 'org-attach
   :type 'boolean
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "9.0"))
 
 (defcustom org-attach-git-annex-cutoff (* 32 1024)
@@ -131,7 +131,7 @@ lns   create a symbol link.  Note that this is not supported
   "Non-nil means attachments are deleted upon archiving a subtree.
 When set to `query', ask the user instead."
   :group 'org-attach
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "8.3")
   :type '(choice
 	  (const :tag "Never delete attachments" nil)
@@ -143,7 +143,7 @@ When set to `query', ask the user instead."
 If \\='ask, prompt using `y-or-n-p'.  If t, always get.  If nil, never get."
   :group 'org-attach
   :package-version '(Org . "9")
-  :version "25.2"
+  :version "26.1"
   :type '(choice
 	  (const :tag "confirm with `y-or-n-p'" ask)
 	  (const :tag "always get from annex if necessary" t)
diff --git a/elpa/org-20161118/org-autoloads.el b/elpa/org-20170210/org-autoloads.el
similarity index 98%
rename from elpa/org-20161118/org-autoloads.el
rename to elpa/org-20170210/org-autoloads.el
index 9c594e57..088e5227 100644
--- a/elpa/org-20161118/org-autoloads.el
+++ b/elpa/org-20170210/org-autoloads.el
@@ -3,7 +3,7 @@
 ;;; Code:
 (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
-;;;### (autoloads nil "org" "org.el" (22587 64998 0 0))
+;;;### (autoloads nil "org" "org.el" (22693 37959 0 0))
 ;;; Generated autoloads from org.el
 
 (autoload 'org-babel-do-load-languages "org" "\
@@ -225,7 +225,7 @@ Call the customize function with org as argument.
 
 ;;;***
 
-;;;### (autoloads nil "org-agenda" "org-agenda.el" (22587 64998 0
+;;;### (autoloads nil "org-agenda" "org-agenda.el" (22693 37958 0
 ;;;;;;  0))
 ;;; Generated autoloads from org-agenda.el
 
@@ -499,7 +499,7 @@ to override `appt-message-warning-time'.
 
 ;;;***
 
-;;;### (autoloads nil "org-capture" "org-capture.el" (22587 64998
+;;;### (autoloads nil "org-capture" "org-capture.el" (22693 37958
 ;;;;;;  0 0))
 ;;; Generated autoloads from org-capture.el
 
@@ -543,7 +543,7 @@ Set `org-capture-templates' to be similar to `org-remember-templates'.
 
 ;;;***
 
-;;;### (autoloads nil "org-colview" "org-colview.el" (22587 64998
+;;;### (autoloads nil "org-colview" "org-colview.el" (22693 37958
 ;;;;;;  0 0))
 ;;; Generated autoloads from org-colview.el
 
@@ -612,7 +612,7 @@ Turn on or update column view in the agenda.
 
 ;;;***
 
-;;;### (autoloads nil "org-compat" "org-compat.el" (22587 64998 0
+;;;### (autoloads nil "org-compat" "org-compat.el" (22693 37958 0
 ;;;;;;  0))
 ;;; Generated autoloads from org-compat.el
 
@@ -623,7 +623,7 @@ Try very hard to provide sensible version strings.
 
 ;;;***
 
-;;;### (autoloads nil "org-lint" "org-lint.el" (22587 64998 0 0))
+;;;### (autoloads nil "org-lint" "org-lint.el" (22693 37958 0 0))
 ;;; Generated autoloads from org-lint.el
 
 (autoload 'org-lint "org-lint" "\
@@ -639,7 +639,7 @@ ARG can also be a list of checker names, as symbols, to run.
 
 ;;;***
 
-;;;### (autoloads nil "org-macs" "org-macs.el" (22587 64998 0 0))
+;;;### (autoloads nil "org-macs" "org-macs.el" (22693 37958 0 0))
 ;;; Generated autoloads from org-macs.el
 
 (autoload 'org-load-noerror-mustsuffix "org-macs" "\
@@ -649,7 +649,7 @@ Load FILE with optional arguments NOERROR and MUSTSUFFIX.
 
 ;;;***
 
-;;;### (autoloads nil "org-version" "org-version.el" (22587 64998
+;;;### (autoloads nil "org-version" "org-version.el" (22693 37958
 ;;;;;;  0 0))
 ;;; Generated autoloads from org-version.el
 
@@ -696,7 +696,7 @@ The location of ODT styles.")
 ;;;;;;  "org-timer.el" "org-w3m.el" "ox-ascii.el" "ox-beamer.el"
 ;;;;;;  "ox-html.el" "ox-icalendar.el" "ox-latex.el" "ox-man.el"
 ;;;;;;  "ox-md.el" "ox-odt.el" "ox-org.el" "ox-publish.el" "ox-texinfo.el"
-;;;;;;  "ox.el") (22587 64998 0 0))
+;;;;;;  "ox.el") (22693 37959 0 0))
 
 ;;;***
 
diff --git a/elpa/org-20161118/org-bbdb.el b/elpa/org-20170210/org-bbdb.el
similarity index 99%
rename from elpa/org-20161118/org-bbdb.el
rename to elpa/org-20170210/org-bbdb.el
index dd9ef269..f8516681 100644
--- a/elpa/org-20161118/org-bbdb.el
+++ b/elpa/org-20170210/org-bbdb.el
@@ -1,6 +1,6 @@
 ;;; org-bbdb.el --- Support for links to BBDB entries -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2004-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2017 Free Software Foundation, Inc.
 
 ;; Authors: Carsten Dominik <carsten at orgmode dot org>
 ;;       Thomas Baumann <thomas dot baumann at ch dot tum dot de>
diff --git a/elpa/org-20161118/org-bibtex.el b/elpa/org-20170210/org-bibtex.el
similarity index 99%
rename from elpa/org-20161118/org-bibtex.el
rename to elpa/org-20170210/org-bibtex.el
index db5d97b3..d81c9f18 100644
--- a/elpa/org-20161118/org-bibtex.el
+++ b/elpa/org-20170210/org-bibtex.el
@@ -1,6 +1,6 @@
 ;;; org-bibtex.el --- Org links to BibTeX entries    -*- lexical-binding: t; -*-
 ;;
-;; Copyright (C) 2007-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2017 Free Software Foundation, Inc.
 ;;
 ;; Authors: Bastien Guerry <bzg@gnu.org>
 ;;       Carsten Dominik <carsten dot dominik at gmail dot com>
@@ -293,7 +293,7 @@ It is relevant only if `org-bibtex-tags-are-keywords' is non-nil.
 Tag inheritence itself is controlled by `org-use-tag-inheritence'
 and `org-exclude-tags-from-inheritence'."
   :group 'org-bibtex
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "8.3")
   :type 'boolean)
 
diff --git a/elpa/org-20161118/org-capture.el b/elpa/org-20170210/org-capture.el
similarity index 95%
rename from elpa/org-20161118/org-capture.el
rename to elpa/org-20170210/org-capture.el
index f7579270..ae5ee50c 100644
--- a/elpa/org-20161118/org-capture.el
+++ b/elpa/org-20170210/org-capture.el
@@ -1,6 +1,6 @@
 ;;; org-capture.el --- Fast note taking in Org       -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2010-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2017 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -749,8 +749,7 @@ captured item after finalizing."
       ;; Store this place as the last one where we stored something
       ;; Do the marking in the base buffer, so that it makes sense after
       ;; the indirect buffer has been killed.
-      (when org-capture-bookmark
-	(org-capture-bookmark-last-stored-position))
+      (org-capture-store-last-position)
 
       ;; Run the hook
       (run-hooks 'org-capture-before-finalize-hook))
@@ -890,14 +889,14 @@ Store them in the capture property list."
 
        ((eq (car target) 'file+headline)
 	(set-buffer (org-capture-target-buffer (nth 1 target)))
+	(unless (derived-mode-p 'org-mode)
+	  (error
+	   "Target buffer \"%s\" for file+headline should be in Org mode"
+	   (current-buffer)))
 	(org-capture-put-target-region-and-position)
 	(widen)
 	(let ((hd (nth 2 target)))
 	  (goto-char (point-min))
-	  (unless (derived-mode-p 'org-mode)
-	    (error
-	     "Target buffer \"%s\" for file+headline should be in Org mode"
-	     (current-buffer)))
 	  (if (re-search-forward
 	       (format org-complex-heading-regexp-format (regexp-quote hd))
 	       nil t)
@@ -932,6 +931,10 @@ Store them in the capture property list."
        ((memq (car target) '(file+datetree file+datetree+prompt file+weektree file+weektree+prompt))
 	(require 'org-datetree)
 	(set-buffer (org-capture-target-buffer (nth 1 target)))
+	(unless (derived-mode-p 'org-mode)
+	  (error "Target buffer \"%s\" for %s should be in Org mode"
+		 (current-buffer)
+		 (car target)))
 	(org-capture-put-target-region-and-position)
 	(widen)
 	;; Make a date/week tree entry, with the current date (or
@@ -1301,8 +1304,8 @@ Of course, if exact position has been required, just put it there."
 			   (org-table-current-dline))))
    (t (error "This should not happen"))))
 
-(defun org-capture-bookmark-last-stored-position ()
-  "Bookmark the last-captured position."
+(defun org-capture-store-last-position ()
+  "Store the last-captured position."
   (let* ((where (org-capture-get :position-for-last-stored 'local))
 	 (pos (cond
 	       ((markerp where)
@@ -1315,14 +1318,11 @@ Of course, if exact position has been required, just put it there."
 		      (point-at-bol))
 		  (point))))))
     (with-current-buffer (buffer-base-buffer (current-buffer))
-      (org-with-wide-buffer
-       (goto-char pos)
-       (let ((bookmark-name (plist-get org-bookmark-names-plist
-				       :last-capture)))
-	 (when bookmark-name
-	   (with-demoted-errors
-	       (bookmark-set bookmark-name))))
-       (move-marker org-capture-last-stored-marker (point))))))
+      (org-with-point-at pos
+	(when org-capture-bookmark
+	  (let ((bookmark (plist-get org-bookmark-names-plist :last-capture)))
+	    (when bookmark (with-demoted-errors (bookmark-set bookmark)))))
+	(move-marker org-capture-last-stored-marker (point))))))
 
 (defun org-capture-narrow (beg end)
   "Narrow, unless configuration says not to narrow."
@@ -1437,6 +1437,7 @@ Use PREFIX as a prefix for the name of the indirect buffer."
 
 (defun org-mks (table title &optional prompt specials)
   "Select a member of an alist with multiple keys.
+
 TABLE is the alist which should contain entries where the car is a string.
 There should be two types of entries.
 
@@ -1444,7 +1445,7 @@ There should be two types of entries.
    This indicates that `a' is a prefix key for multi-letter selection, and
    that there are entries following with keys like \"ab\", \"ax\"...
 
-2. Selectable members must have more than two elements, with the first
+2. Select-able members must have more than two elements, with the first
    being the string of keys that lead to selecting it, and the second a
    short description string of the item.
 
@@ -1455,84 +1456,72 @@ When you press a prefix key, the commands (and maybe further prefixes)
 under this key will be shown and offered for selection.
 
 TITLE will be placed over the selection in the temporary buffer,
-PROMPT will be used when prompting for a key.  SPECIAL is an alist with
-also (\"key\" \"description\") entries.  When one of these is selection,
-only the bare key is returned."
-  (setq prompt (or prompt "Select: "))
-  (let (tbl orig-table dkey ddesc des-keys allowed-keys
-	    current prefix rtn re pressed buffer (inhibit-quit t))
-    (save-window-excursion
-      (setq buffer (org-switch-to-buffer-other-window "*Org Select*"))
-      (setq orig-table table)
-      (catch 'exit
-	(while t
-	  (erase-buffer)
-	  (insert title "\n\n")
-	  (setq tbl table
-		des-keys nil
-		allowed-keys nil
-		cursor-type nil)
-	  (setq prefix (if current (concat current " ") ""))
-	  (while tbl
-	    (cond
-	     ((and (= 2 (length (car tbl))) (= (length (caar tbl)) 1))
-	      ;; This is a description on this level
-	      (setq dkey (caar tbl) ddesc (cl-cadar tbl))
-	      (pop tbl)
-	      (push dkey des-keys)
-	      (push dkey allowed-keys)
-	      (insert prefix "[" dkey "]" "..." "  " ddesc "..." "\n")
-	      ;; Skip keys which are below this prefix
-	      (setq re (concat "\\`" (regexp-quote dkey)))
-	      (let (case-fold-search)
-		(while (and tbl (string-match re (caar tbl))) (pop tbl))))
-	     ((= 2 (length (car tbl)))
-	      ;; Not yet a usable description, skip it
-	      )
-	     (t
-	      ;; usable entry on this level
-	      (insert prefix "[" (caar tbl) "]" "     " (nth 1 (car tbl)) "\n")
-	      (push (caar tbl) allowed-keys)
-	      (pop tbl))))
-	  (when specials
-	    (insert "-------------------------------------------------------------------------------\n")
-	    (let ((sp specials))
-	      (while sp
-		(insert (format "[%s]     %s\n"
-				(caar sp) (nth 1 (car sp))))
-		(push (caar sp) allowed-keys)
-		(pop sp))))
-	  (push "\C-g" allowed-keys)
-	  (goto-char (point-min))
-	  (if (not (pos-visible-in-window-p (point-max)))
-	      (org-fit-window-to-buffer))
-	  (message prompt)
-	  (setq pressed (char-to-string (read-char-exclusive)))
-	  (while (not (member pressed allowed-keys))
-	    (message "Invalid key `%s'" pressed) (sit-for 1)
-	    (message prompt)
-	    (setq pressed (char-to-string (read-char-exclusive))))
-	  (when (equal pressed "\C-g")
-	    (kill-buffer buffer)
-	    (user-error "Abort"))
-	  (when (and (not (assoc pressed table))
-		     (not (member pressed des-keys))
-		     (assoc pressed specials))
-	    (throw 'exit (setq rtn pressed)))
-	  (unless (member pressed des-keys)
-	    (throw 'exit (setq rtn (rassoc (cdr (assoc pressed table))
-					   orig-table))))
-	  (setq current (concat current pressed))
-	  (setq table (mapcar
-		       (lambda (x)
-			 (if (and (> (length (car x)) 1)
-				  (equal (substring (car x) 0 1) pressed))
-			     (cons (substring (car x) 1) (cdr x))
-			   nil))
-		       table))
-	  (setq table (remove nil table)))))
-    (when buffer (kill-buffer buffer))
-    rtn))
+PROMPT will be used when prompting for a key.  SPECIAL is an
+alist with (\"key\" \"description\") entries.  When one of these
+is selected, only the bare key is returned."
+  (save-window-excursion
+    (let ((inhibit-quit t)
+	  (buffer (org-switch-to-buffer-other-window "*Org Select*"))
+	  (prompt (or prompt "Select: "))
+	  current)
+      (unwind-protect
+	  (catch 'exit
+	    (while t
+	      (erase-buffer)
+	      (insert title "\n\n")
+	      (let ((des-keys nil)
+		    (allowed-keys '("\C-g"))
+		    (cursor-type nil))
+		;; Populate allowed keys and descriptions keys
+		;; available with CURRENT selector.
+		(let ((re (format "\\`%s\\(.\\)\\'"
+				  (if current (regexp-quote current) "")))
+		      (prefix (if current (concat current " ") "")))
+		  (dolist (entry table)
+		    (pcase entry
+		      ;; Description.
+		      (`(,(and key (pred (string-match re))) ,desc)
+		       (let ((k (match-string 1 key)))
+			 (push k des-keys)
+			 (push k allowed-keys)
+			 (insert prefix "[" k "]" "..." "  " desc "..." "\n")))
+		      ;; Usable entry.
+		      (`(,(and key (pred (string-match re))) ,desc . ,_)
+		       (let ((k (match-string 1 key)))
+			 (insert prefix "[" k "]" "     " desc "\n")
+			 (push k allowed-keys)))
+		      (_ nil))))
+		;; Insert special entries, if any.
+		(when specials
+		  (insert "----------------------------------------------------\
+---------------------------\n")
+		  (pcase-dolist (`(,key ,description) specials)
+		    (insert (format "[%s]     %s\n" key description))
+		    (push key allowed-keys)))
+		;; Display UI and let user select an entry or
+		;; a sub-level prefix.
+		(goto-char (point-min))
+		(unless (pos-visible-in-window-p (point-max))
+		  (org-fit-window-to-buffer))
+		(message prompt)
+		(let ((pressed (char-to-string (read-char-exclusive))))
+		  (while (not (member pressed allowed-keys))
+		    (message "Invalid key `%s'" pressed) (sit-for 1)
+		    (message prompt)
+		    (setq pressed (char-to-string (read-char-exclusive))))
+		  (setq current (concat current pressed))
+		  (cond
+		   ((equal pressed "\C-g") (user-error "Abort"))
+		   ;; Selection is a prefix: open a new menu.
+		   ((member pressed des-keys))
+		   ;; Selection matches an association: return it.
+		   ((let ((entry (assoc current table)))
+		      (and entry (throw 'exit entry))))
+		   ;; Selection matches a special entry: return the
+		   ;; selection prefix.
+		   ((assoc current specials) (throw 'exit current))
+		   (t (error "No entry available")))))))
+	(when buffer (kill-buffer buffer))))))
 
 ;;; The template code
 (defun org-capture-select-template (&optional keys)
diff --git a/elpa/org-20161118/org-clock.el b/elpa/org-20170210/org-clock.el
similarity index 96%
rename from elpa/org-20161118/org-clock.el
rename to elpa/org-20170210/org-clock.el
index d2dd68f6..649f11b4 100644
--- a/elpa/org-20161118/org-clock.el
+++ b/elpa/org-20170210/org-clock.el
@@ -1,6 +1,6 @@
 ;;; org-clock.el --- The time clocking code for Org mode -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2004-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2017 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -65,7 +65,7 @@ Do not check directly this variable in a Lisp program.  Call
 function `org-clock-into-drawer' instead."
   :group 'org-todo
   :group 'org-clock
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "8.3")
   :type '(choice
 	  (const :tag "Always" t)
@@ -1593,18 +1593,19 @@ to, overriding the existing value of `org-clock-out-switch-to-state'."
 		m (floor (/ s 60))
 		s (- s (* 60 s)))
 	  (insert " => " (format "%2d:%02d" h m))
-	  (when (setq remove (and org-clock-out-remove-zero-time-clocks
-				  (= (+ h m) 0)))
-	    (beginning-of-line 1)
-	    (delete-region (point) (point-at-eol))
-	    (and (looking-at "\n") (> (point-max) (1+ (point)))
-		 (delete-char 1)))
 	  (move-marker org-clock-marker nil)
 	  (move-marker org-clock-hd-marker nil)
-	  (when org-log-note-clock-out
-	    (org-add-log-setup
-	     'clock-out nil nil nil
-	     (concat "# Task: " (org-get-heading t) "\n\n")))
+	  ;; Possibly remove zero time clocks.  However, do not add
+	  ;; a note associated to the CLOCK line in this case.
+	  (cond ((and org-clock-out-remove-zero-time-clocks
+		      (= (+ h m) 0))
+		 (setq remove t)
+		 (delete-region (line-beginning-position)
+				(line-beginning-position 2)))
+		(org-log-note-clock-out
+		 (org-add-log-setup
+		  'clock-out nil nil nil
+		  (concat "# Task: " (org-get-heading t) "\n\n"))))
 	  (when org-clock-mode-line-timer
 	    (cancel-timer org-clock-mode-line-timer)
 	    (setq org-clock-mode-line-timer nil))
@@ -2370,6 +2371,7 @@ the currently selected interval size."
 		    (`file-with-archives
 		     (and buffer-file-name
 			  (org-add-archive-files (list buffer-file-name))))
+		    ((pred consp) scope)
 		    (_ (or (buffer-file-name) (current-buffer)))))
 	   (block (plist-get params :block))
 	   (ts (plist-get params :tstart))
@@ -2430,8 +2432,7 @@ the currently selected interval size."
 	     ;; Even though `file-with-archives' can consist of
 	     ;; multiple files, we consider this is one extended file
 	     ;; instead.
-	     (cond ((eq scope 'file-with-archives) nil)
-		   ((consp files)))))
+	     (and (consp files) (not (eq scope 'file-with-archives)))))
 
 	(funcall formatter
 		 origin
@@ -2471,10 +2472,11 @@ from the dynamic block definition."
 	 (properties (plist-get params :properties))
 	 (ntcol (max 1 (or (plist-get params :tcolumns) 100)))
 	 (indent (plist-get params :indent))
+	 (formula (plist-get params :formula))
 	 (case-fold-search t)
-	 range-text total-time tbl level hlc formula pcol
+	 range-text total-time tbl level hlc
 	 file-time entries entry headline
-	 recalc content narrow-cut-p tcol)
+	 recalc narrow-cut-p)
 
     ;; Implement abbreviations
     (when (plist-get params :compact)
@@ -2543,8 +2545,10 @@ from the dynamic block definition."
      (if level-p   (concat (nth 2 lwords) "|") "")  ; level column, maybe
      (if timestamp (concat (nth 3 lwords) "|") "")  ; timestamp column, maybe
      (if properties (concat (mapconcat 'identity properties "|") "|") "") ;properties columns, maybe
-     (concat (nth 4 lwords) "|"
-	     (nth 5 lwords) "|\n"))                 ; headline and time columns
+     (nth 4 lwords) "|"			;headline
+     (nth 5 lwords) "|"			;time column
+     (make-string (1- (min maxlevel (or ntcol 100))) ?|)
+     (if (eq formula '%) "%|\n" "\n"))
 
     ;; Insert the total time in the table
     (insert-before-markers
@@ -2554,11 +2558,16 @@ from the dynamic block definition."
 					; file column, maybe
      (if level-p   "|"      "")        ; level column, maybe
      (if timestamp "|"      "")        ; timestamp column, maybe
-     (if properties (make-string (length properties) ?|) "")  ; properties columns, maybe
+     (make-string (length properties) ?|)  ; properties columns, maybe
      (concat (format org-clock-total-time-cell-format (nth 7 lwords))  "| ") ; instead of a headline
      (format org-clock-total-time-cell-format
-	     (org-minutes-to-clocksum-string (or total-time 0))) ; the time
-     "|\n")                          ; close line
+	     (org-minutes-to-clocksum-string (or total-time 0))) ;time
+     "|"
+     (make-string (1- (min maxlevel (or ntcol 100))) ?|)
+     (cond ((not (eq formula '%)) "")
+	   ((or (not total-time) (= total-time 0)) "0.0|")
+	   (t  "100.0|"))
+     "\n")
 
     ;; Now iterate over the tables and insert the data
     ;; but only if any time has been collected
@@ -2612,49 +2621,29 @@ from the dynamic block definition."
 		   properties "|") "|") "")  ;properties columns, maybe
 	     (if indent (org-clocktable-indent-string level) "") ; indentation
 	     hlc headline hlc "|"                                ; headline
-	     (make-string (min (1- ntcol) (or (- level 1))) ?|)
-					; empty fields for higher levels
+	     (make-string (1- (min ntcol level)) ?|) ; empty fields for higher levels
 	     hlc (org-minutes-to-clocksum-string (nth 3 entry)) hlc ; time
-	     "|\n"                                               ; close line
+	     (make-string (1+ (- maxlevel level)) ?|)
+	     (if (eq formula '%)
+		 (format "%.1f |" (* 100 (/ (nth 3 entry) (float total-time))))
+	       "")
+	     "\n"			; close line
 	     )))))
-    ;; When exporting subtrees or regions the region might be
-    ;; activated, so let's disable ̀delete-active-region'
-    (let ((delete-active-region nil)) (backward-delete-char 1))
-    (if (setq formula (plist-get params :formula))
-	(cond
-	 ((eq formula '%)
-	  ;; compute the column where the % numbers need to go
-	  (setq pcol (+ 2
-			(length properties)
-			(if multifile 1 0)
-			(if level-p 1 0)
-			(if timestamp 1 0)
-			(min maxlevel (or ntcol 100))))
-	  ;; compute the column where the total time is
-	  (setq tcol (+ 2
-			(length properties)
-			(if multifile 1 0)
-			(if level-p 1 0)
-			(if timestamp 1 0)))
-	  (insert
-	   (format
-	    "\n#+TBLFM: $%d='(org-clock-time%% @%d$%d $%d..$%d);%%.1f"
-	    pcol            ; the column where the % numbers should go
-	    (if (and narrow (not narrow-cut-p)) 3 2) ; row of the total time
-	    tcol            ; column of the total time
-	    tcol (1- pcol)  ; range of columns where times can be found
-	    ))
-	  (setq recalc t))
-	 ((stringp formula)
-	  (insert "\n#+TBLFM: " formula)
-	  (setq recalc t))
-	 (t (error "Invalid formula in clocktable")))
-      ;; Should we rescue an old formula?
-      (when (stringp (setq content (plist-get params :content)))
-	(when (string-match "^\\([ \t]*#\\+tblfm:.*\\)" content)
+    (delete-char -1)
+    (cond
+     ;; Possibly rescue old formula?
+     ((or (not formula) (eq formula '%))
+      (let ((contents (org-string-nw-p (plist-get params :content))))
+	(when (and contents (string-match "^\\([ \t]*#\\+tblfm:.*\\)" contents))
 	  (setq recalc t)
-	  (insert "\n" (match-string 1 (plist-get params :content)))
+	  (insert "\n" (match-string 1 contents))
 	  (beginning-of-line 0))))
+     ;; Insert specified formula line.
+     ((stringp formula)
+      (insert "\n#+TBLFM: " formula)
+      (setq recalc t))
+     (t
+      (user-error "Invalid :formula parameter in clocktable")))
     ;; Back to beginning, align the table, recalculate if necessary
     (goto-char ipos)
     (skip-chars-forward "^|")
@@ -2667,13 +2656,7 @@ from the dynamic block definition."
 	(org-table-goto-line 3)
 	(org-table-goto-column (car sort))
 	(org-table-sort-lines nil (cdr sort))))
-    (when recalc
-      (if (eq formula '%)
-	  (save-excursion
-	    (if (and narrow (not narrow-cut-p)) (beginning-of-line 2))
-	    (org-table-goto-column pcol nil 'force)
-	    (insert "%")))
-      (org-table-recalculate 'all))
+    (when recalc (org-table-recalculate 'all))
     total-time))
 
 (defun org-clocktable-indent-string (level)
@@ -2846,30 +2829,6 @@ TIME:      The sum of all time spend in this tree, in minutes.  This time
       (setq tbl (nreverse tbl))
       (list file org-clock-file-total-minutes tbl))))
 
-(defun org-clock-time% (total &rest strings)
-  "Compute a time fraction in percent.
-TOTAL s a time string like 10:21 specifying the total times.
-STRINGS is a list of strings that should be checked for a time.
-The first string that does have a time will be used.
-This function is made for clock tables."
-  (let ((re "\\([0-9]+\\):\\([0-9]+\\)")
-	tot s)
-    (save-match-data
-      (catch 'exit
-	(if (not (string-match re total))
-	    (throw 'exit 0.)
-	  (setq tot (+ (string-to-number (match-string 2 total))
-		       (* 60 (string-to-number (match-string 1 total)))))
-	  (if (= tot 0.) (throw 'exit 0.)))
-	(while (setq s (pop strings))
-	  (if (string-match "\\([0-9]+\\):\\([0-9]+\\)" s)
-	      (throw 'exit
-		     (/ (* 100.0 (+ (string-to-number (match-string 2 s))
-				    (* 60 (string-to-number
-					   (match-string 1 s)))))
-			tot))))
-	0))))
-
 ;; Saving and loading the clock
 
 (defvar org-clock-loaded nil
@@ -2927,7 +2886,8 @@ The details of what will be saved are regulated by the variable
 		 org-clock-has-been-used
 		 (not (file-exists-p org-clock-persist-file))))
     (with-temp-file org-clock-persist-file
-      (insert (format ";; org-persist.el - %s at %s\n"
+      (insert (format ";; %s - %s at %s\n"
+		      (file-name-nondirectory org-clock-persist-file)
 		      (system-name)
 		      (format-time-string (org-time-stamp-format t))))
       ;; Store clock to be resumed.
@@ -2962,9 +2922,9 @@ The details of what will be saved are regulated by the variable
 (defun org-clock-load ()
   "Load clock-related data from disk, maybe resuming a stored clock."
   (when (and org-clock-persist (not org-clock-loaded))
-    (if (file-readable-p org-clock-persist-file)
-	(message "Restoring clock data")
-      (message "Not restoring clock data; %S not found" org-clock-persist-file)
+    (if (not (file-readable-p org-clock-persist-file))
+	(message "Not restoring clock data; %S not found" org-clock-persist-file)
+      (message "Restoring clock data")
       ;; Load history.
       (load-file org-clock-persist-file)
       (setq org-clock-loaded t)
diff --git a/elpa/org-20161118/org-colview.el b/elpa/org-20170210/org-colview.el
similarity index 94%
rename from elpa/org-20161118/org-colview.el
rename to elpa/org-20170210/org-colview.el
index 5223902d..6a75f70d 100644
--- a/elpa/org-20161118/org-colview.el
+++ b/elpa/org-20170210/org-colview.el
@@ -1,6 +1,6 @@
 ;;; org-colview.el --- Column View in Org            -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2004-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2017 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -85,7 +85,7 @@ output.
 Types defined in this variable take precedence over those defined
 in `org-columns-summary-types-default', which see."
   :group 'org-properties
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "9.0")
   :type '(alist :key-type (string :tag "       Label")
 		:value-type (function :tag "Summarize")))
@@ -239,17 +239,15 @@ display, as a string."
 	    (org-columns-compact-links value)))
    (value)))
 
-(defun org-columns--collect-values (&optional agenda)
+(defun org-columns--collect-values (&optional compiled-fmt)
   "Collect values for columns on the current line.
 
-When optional argument AGENDA is non-nil, assume the value is
-meant for the agenda, i.e., caller is `org-agenda-columns'.
-
 Return a list of triplets (SPEC VALUE DISPLAYED) suitable for
 `org-columns--display-here'.
 
 This function assumes `org-columns-current-fmt-compiled' is
-initialized."
+initialized is set in the current buffer.  However, it is
+possible to override it with optional argument COMPILED-FMT."
   (let ((summaries (get-text-property (point) 'org-summaries)))
     (mapcar
      (lambda (spec)
@@ -257,19 +255,18 @@ initialized."
 	 (`(,p . ,_)
 	  (let* ((v (or (cdr (assoc spec summaries))
 			(org-entry-get (point) p 'selective t)
-			(and agenda
+			(and compiled-fmt ;assume `org-agenda-columns'
 			     ;; Effort property is not defined.  Try
 			     ;; to use appointment duration.
 			     org-agenda-columns-add-appointments-to-effort-sum
 			     (string= p (upcase org-effort-property))
 			     (get-text-property (point) 'duration)
-			     (propertize
-			      (org-minutes-to-clocksum-string
-			       (get-text-property (point) 'duration))
-			      'face 'org-warning))
+			     (propertize (org-minutes-to-clocksum-string
+					  (get-text-property (point) 'duration))
+					 'face 'org-warning))
 			"")))
 	    (list spec v (org-columns--displayed-value spec v))))))
-     org-columns-current-fmt-compiled)))
+     (or compiled-fmt org-columns-current-fmt-compiled))))
 
 (defun org-columns--set-widths (cache)
   "Compute the maximum column widths from the format and CACHE.
@@ -1507,26 +1504,26 @@ PARAMS is a property list of parameters:
   (interactive)
   (org-columns-remove-overlays)
   (move-marker org-columns-begin-marker (point))
-  (let ((org-columns--time (float-time (current-time)))
-	(fmt
-	 (cond
-	  ((bound-and-true-p org-agenda-overriding-columns-format))
-	  ((let ((m (org-get-at-bol 'org-hd-marker)))
-	     (and m
-		  (or (org-entry-get m "COLUMNS" t)
-		      (with-current-buffer (marker-buffer m)
-			org-columns-default-format)))))
-	  ((and (local-variable-p 'org-columns-current-fmt)
-		org-columns-current-fmt))
-	  ((let ((m (next-single-property-change (point-min) 'org-hd-marker)))
-	     (and m
-		  (let ((m (get-text-property m 'org-hd-marker)))
-		    (or (org-entry-get m "COLUMNS" t)
-			(with-current-buffer (marker-buffer m)
-			  org-columns-default-format))))))
-	  (t org-columns-default-format))))
-    (setq-local org-columns-current-fmt fmt)
-    (org-columns-compile-format fmt)
+  (let* ((org-columns--time (float-time (current-time)))
+	 (fmt
+	  (cond
+	   ((bound-and-true-p org-agenda-overriding-columns-format))
+	   ((let ((m (org-get-at-bol 'org-hd-marker)))
+	      (and m
+		   (or (org-entry-get m "COLUMNS" t)
+		       (with-current-buffer (marker-buffer m)
+			 org-columns-default-format)))))
+	   ((and (local-variable-p 'org-columns-current-fmt)
+		 org-columns-current-fmt))
+	   ((let ((m (next-single-property-change (point-min) 'org-hd-marker)))
+	      (and m
+		   (let ((m (get-text-property m 'org-hd-marker)))
+		     (or (org-entry-get m "COLUMNS" t)
+			 (with-current-buffer (marker-buffer m)
+			   org-columns-default-format))))))
+	   (t org-columns-default-format)))
+	 (compiled-fmt (org-columns-compile-format fmt)))
+    (setq org-columns-current-fmt fmt)
     (when org-agenda-columns-compute-summary-properties
       (org-agenda-colview-compute org-columns-current-fmt-compiled))
     (save-excursion
@@ -1538,8 +1535,13 @@ PARAMS is a property list of parameters:
 		       (org-get-at-bol 'org-marker))))
 	    (when m
 	      (push (cons (line-beginning-position)
+			  ;; `org-columns-current-fmt-compiled' is
+			  ;; initialized but only set locally to the
+			  ;; agenda buffer.  Since current buffer is
+			  ;; changing, we need to force the original
+			  ;; compiled-fmt there.
 			  (org-with-point-at m
-			    (org-columns--collect-values 'agenda)))
+			    (org-columns--collect-values compiled-fmt)))
 		    cache)))
 	  (forward-line))
 	(when cache
@@ -1564,56 +1566,60 @@ This will add overlays to the date lines, to show the summary for each day."
 		   (if (member property '("CLOCKSUM" "CLOCKSUM_T"))
 		       (list property title width ":" nil)
 		     spec))))
-	      org-columns-current-fmt-compiled))
-	entries)
+	      org-columns-current-fmt-compiled)))
     ;; Ensure there's at least one summation column.
     (when (cl-some (lambda (spec) (nth 3 spec)) fmt)
       (goto-char (point-max))
-      (while (not (bobp))
-	(when (or (get-text-property (point) 'org-date-line)
-		  (eq (get-text-property (point) 'face)
-		      'org-agenda-structure))
-	  ;; OK, this is a date line that should be used.
-	  (let (rest)
-	    (dolist (c cache (setq cache rest))
-	      (if (> (car c) (point))
-		  (push c entries)
-		(push c rest))))
-	  ;; Now ENTRIES contains entries below the current one.
-	  ;; CACHE is the rest.  Compute the summaries for the
-	  ;; properties we want, set nil properties for the rest.
-	  (when (setq entries (mapcar 'cdr entries))
-	    (org-columns--display-here
-	     (mapcar
-	      (lambda (spec)
-		(pcase spec
-		  (`("ITEM" . ,_)
-		   ;; Replace ITEM with current date.  Preserve
-		   ;; properties for fontification.
-		   (let ((date (buffer-substring
-				(line-beginning-position)
-				(line-end-position))))
-		     (list spec date date)))
-		  (`(,_ ,_ ,_ nil ,_) (list spec "" ""))
-		  (`(,_ ,_ ,_ ,operator ,printf)
-		   (let* ((summarize (org-columns--summarize operator))
-			  (values
-			   ;; Use real values for summary, not those
-			   ;; prepared for display.
-			   (delq nil
-				 (mapcar
-				  (lambda (e)
-				    (org-string-nw-p (nth 1 (assoc spec e))))
-				  entries)))
-			  (final (if values (funcall summarize values printf)
-				   "")))
-		     (unless (equal final "")
-		       (put-text-property 0 (length final) 'face 'bold final))
-		     (list spec final final)))))
-	      fmt)
-	     'dateline)
-	    (setq-local org-agenda-columns-active t)))
-	(forward-line -1)))))
+      (catch :complete
+	(while t
+	  (when (or (get-text-property (point) 'org-date-line)
+		    (eq (get-text-property (point) 'face)
+			'org-agenda-structure))
+	    ;; OK, this is a date line that should be used.
+	    (let (entries)
+	      (let (rest)
+		(dolist (c cache)
+		  (if (> (car c) (point))
+		      (push c entries)
+		    (push c rest)))
+		(setq cache rest))
+	      ;; ENTRIES contains entries below the current one.
+	      ;; CACHE is the rest.  Compute the summaries for the
+	      ;; properties we want, set nil properties for the rest.
+	      (when (setq entries (mapcar #'cdr entries))
+		(org-columns--display-here
+		 (mapcar
+		  (lambda (spec)
+		    (pcase spec
+		      (`("ITEM" . ,_)
+		       ;; Replace ITEM with current date.  Preserve
+		       ;; properties for fontification.
+		       (let ((date (buffer-substring
+				    (line-beginning-position)
+				    (line-end-position))))
+			 (list spec date date)))
+		      (`(,_ ,_ ,_ nil ,_) (list spec "" ""))
+		      (`(,_ ,_ ,_ ,operator ,printf)
+		       (let* ((summarize (org-columns--summarize operator))
+			      (values
+			       ;; Use real values for summary, not
+			       ;; those prepared for display.
+			       (delq nil
+				     (mapcar
+				      (lambda (e) (org-string-nw-p
+					      (nth 1 (assoc spec e))))
+				      entries)))
+			      (final (if values
+					 (funcall summarize values printf)
+				       "")))
+			 (unless (equal final "")
+			   (put-text-property 0 (length final)
+					      'face 'bold final))
+			 (list spec final final)))))
+		  fmt)
+		 'dateline)
+		(setq-local org-agenda-columns-active t))))
+	  (if (bobp) (throw :complete t) (forward-line -1)))))))
 
 (defun org-agenda-colview-compute (fmt)
   "Compute the relevant columns in the contributing source buffers."
diff --git a/elpa/org-20161118/org-compat.el b/elpa/org-20170210/org-compat.el
similarity index 98%
rename from elpa/org-20161118/org-compat.el
rename to elpa/org-20170210/org-compat.el
index 202b7280..f4d389e5 100644
--- a/elpa/org-20161118/org-compat.el
+++ b/elpa/org-20170210/org-compat.el
@@ -1,6 +1,6 @@
 ;;; org-compat.el --- Compatibility Code for Older Emacsen -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2004-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2017 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -430,6 +430,14 @@ Pass COLUMN and FORCE to `move-to-column'."
     (lambda (&optional _beg _end)
       (with-no-warnings (font-lock-fontify-buffer)))))
 
+;; `file-local-name' was added in Emacs 26.1.
+(defalias 'org-babel-local-file-name
+  (if (fboundp 'file-local-name)
+      'file-local-name
+    (lambda (file)
+      "Return the local name component of FILE."
+      (or (file-remote-p file 'localname) file))))
+
 (defmacro org-no-popups (&rest body)
   "Suppress popup windows.
 Let-bind some variables to nil around BODY to achieve the desired
diff --git a/elpa/org-20161118/org-crypt.el b/elpa/org-20170210/org-crypt.el
similarity index 97%
rename from elpa/org-20161118/org-crypt.el
rename to elpa/org-20170210/org-crypt.el
index 10399962..4439c947 100644
--- a/elpa/org-20161118/org-crypt.el
+++ b/elpa/org-20170210/org-crypt.el
@@ -1,5 +1,5 @@
 ;;; org-crypt.el --- Public Key Encryption for Org Entries -*- lexical-binding: t; -*-
-;; Copyright (C) 2007-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2017 Free Software Foundation, Inc.
 
 ;; Emacs Lisp Archive Entry
 ;; Filename: org-crypt.el
@@ -183,7 +183,11 @@ See `org-crypt-disable-auto-save'."
 	 (org-end-of-subtree t t)
 	 (org-back-over-empty-lines)
 	 (let ((contents (delete-and-extract-region beg (point))))
-	   (insert (org-encrypt-string contents crypt-key)))
+	   (condition-case err
+	       (insert (org-encrypt-string contents crypt-key))
+	     ;; If encryption failed, make sure to insert back entry
+	     ;; contents in the buffer.
+	     (error (insert contents) (error (nth 1 err)))))
 	 (when folded
 	   (goto-char start-heading)
 	   (outline-hide-subtree))
diff --git a/elpa/org-20161118/org-ctags.el b/elpa/org-20170210/org-ctags.el
similarity index 99%
rename from elpa/org-20161118/org-ctags.el
rename to elpa/org-20170210/org-ctags.el
index 3c63af07..98eb8068 100644
--- a/elpa/org-20161118/org-ctags.el
+++ b/elpa/org-20170210/org-ctags.el
@@ -1,6 +1,6 @@
 ;;; org-ctags.el - Integrate Emacs "tags" Facility with Org -*- lexical-binding: t; -*-
 ;;
-;; Copyright (C) 2007-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2017 Free Software Foundation, Inc.
 
 ;; Author: Paul Sexton <eeeickythump@gmail.com>
 
diff --git a/elpa/org-20161118/org-datetree.el b/elpa/org-20170210/org-datetree.el
similarity index 99%
rename from elpa/org-20161118/org-datetree.el
rename to elpa/org-20170210/org-datetree.el
index 2a921bfc..540753d6 100644
--- a/elpa/org-20161118/org-datetree.el
+++ b/elpa/org-20170210/org-datetree.el
@@ -1,6 +1,6 @@
 ;;; org-datetree.el --- Create date entries in a tree -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/elpa/org-20161118/org-docview.el b/elpa/org-20170210/org-docview.el
similarity index 98%
rename from elpa/org-20161118/org-docview.el
rename to elpa/org-20170210/org-docview.el
index 0f0bdaf0..dfad8933 100644
--- a/elpa/org-20161118/org-docview.el
+++ b/elpa/org-20170210/org-docview.el
@@ -1,6 +1,6 @@
 ;;; org-docview.el --- Support for links to doc-view-mode buffers -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
 
 ;; Author: Jan Böcker <jan.boecker at jboecker dot de>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/elpa/org-20161118/org-element.el b/elpa/org-20170210/org-element.el
similarity index 99%
rename from elpa/org-20161118/org-element.el
rename to elpa/org-20170210/org-element.el
index b86244eb..9d7e4359 100644
--- a/elpa/org-20161118/org-element.el
+++ b/elpa/org-20170210/org-element.el
@@ -1,6 +1,6 @@
 ;;; org-element.el --- Parser for Org Syntax         -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2012-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2017 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Goaziou <n.goaziou at gmail dot com>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -4677,47 +4677,51 @@ indentation removed from its contents."
 	    ;; the beginnings of the contents or right after a line
 	    ;; break.
 	    (lambda (blob first-flag min-ind)
-	      (catch 'zero
-		(dolist (datum (org-element-contents blob) min-ind)
-		  (when first-flag
-		    (setq first-flag nil)
-		    (cond
-		     ;; Objects cannot start with spaces: in this
-		     ;; case, indentation is 0.
-		     ((not (stringp datum)) (throw 'zero 0))
-		     ((not (string-match
-			    "\\`\\([ \t]+\\)\\([^ \t\n]\\|\n\\|\\'\\)" datum))
-		      (throw 'zero 0))
-		     ((equal (match-string 2 datum) "\n")
-		      (put-text-property
-		       (match-beginning 1) (match-end 1) 'org-ind 'empty datum))
-		     (t
-		      (let ((i (string-width (match-string 1 datum))))
-			(put-text-property
-			 (match-beginning 1) (match-end 1) 'org-ind i datum)
-			(setq min-ind (min i min-ind))))))
+	      (dolist (datum (org-element-contents blob) min-ind)
+		(when first-flag
+		  (setq first-flag nil)
 		  (cond
-		   ((stringp datum)
-		    (let ((s 0))
-		      (while (string-match
-			      "\n\\([ \t]+\\)\\([^ \t\n]\\|\n\\|\\'\\)" datum s)
-			(setq s (match-end 1))
-			(if (equal (match-string 2 datum) "\n")
-			    (put-text-property
-			     (match-beginning 1) (match-end 1)
-			     'org-ind 'empty
-			     datum)
-			  (let ((i (string-width (match-string 1 datum))))
-			    (put-text-property
-			     (match-beginning 1) (match-end 1) 'org-ind i datum)
-			    (setq min-ind (min i min-ind)))))))
-		   ((eq (org-element-type datum) 'line-break)
-		    (setq first-flag t))
-		   ((memq (org-element-type datum) org-element-recursive-objects)
-		    (setq min-ind
-			  (funcall find-min-ind datum first-flag min-ind))))))))
-	   (min-ind (funcall find-min-ind
-			     element (not ignore-first) most-positive-fixnum)))
+		   ;; Objects cannot start with spaces: in this
+		   ;; case, indentation is 0.
+		   ((not (stringp datum)) (throw :zero 0))
+		   ((not (string-match
+			  "\\`\\([ \t]+\\)\\([^ \t\n]\\|\n\\|\\'\\)" datum))
+		    (throw :zero 0))
+		   ((equal (match-string 2 datum) "\n")
+		    (put-text-property
+		     (match-beginning 1) (match-end 1) 'org-ind 'empty datum))
+		   (t
+		    (let ((i (string-width (match-string 1 datum))))
+		      (put-text-property
+		       (match-beginning 1) (match-end 1) 'org-ind i datum)
+		      (setq min-ind (min i min-ind))))))
+		(cond
+		 ((stringp datum)
+		  (let ((s 0))
+		    (while (string-match
+			    "\n\\([ \t]*\\)\\([^ \t\n]\\|\n\\|\\'\\)" datum s)
+		      (setq s (match-end 1))
+		      (cond
+		       ((equal (match-string 1 datum) "")
+			(unless (member (match-string 2 datum) '("" "\n"))
+			  (throw :zero 0)))
+		       ((equal (match-string 2 datum) "\n")
+			(put-text-property (match-beginning 1) (match-end 1)
+					   'org-ind 'empty datum))
+		       (t
+			(let ((i (string-width (match-string 1 datum))))
+			  (put-text-property (match-beginning 1) (match-end 1)
+					     'org-ind i datum)
+			  (setq min-ind (min i min-ind))))))))
+		 ((eq (org-element-type datum) 'line-break)
+		  (setq first-flag t))
+		 ((memq (org-element-type datum) org-element-recursive-objects)
+		  (setq min-ind
+			(funcall find-min-ind datum first-flag min-ind)))))))
+	   (min-ind
+	    (catch :zero
+	      (funcall find-min-ind
+		       element (not ignore-first) most-positive-fixnum))))
     (if (or (zerop min-ind) (= min-ind most-positive-fixnum)) element
       ;; Build ELEMENT back, replacing each string with the same
       ;; string minus common indentation.
@@ -4800,9 +4804,12 @@ indentation removed from its contents."
 ;; `org-element--cache-objects'.
 
 
-(defvar org-element-use-cache t
-  "Non nil when Org parser should cache its results.
-This is mostly for debugging purpose.")
+(defvar org-element-use-cache nil
+  "Non-nil when Org parser should cache its results.
+
+WARNING: for the time being, using cache sometimes triggers
+freezes.  Therefore, it is disabled by default.  Activate it if
+you want to help debugging the issue.")
 
 (defvar org-element-cache-sync-idle-time 0.6
   "Length, in seconds, of idle time before syncing cache.")
diff --git a/elpa/org-20161118/org-entities.el b/elpa/org-20170210/org-entities.el
similarity index 99%
rename from elpa/org-20161118/org-entities.el
rename to elpa/org-20170210/org-entities.el
index 79b28e27..05ccf0cf 100644
--- a/elpa/org-20161118/org-entities.el
+++ b/elpa/org-20170210/org-entities.el
@@ -1,6 +1,6 @@
 ;;; org-entities.el --- Support for Special Entities -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2010-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2017 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>,
 ;;         Ulf Stegemann <ulf at zeitform dot de>
diff --git a/elpa/org-20161118/org-eshell.el b/elpa/org-20170210/org-eshell.el
similarity index 97%
rename from elpa/org-20161118/org-eshell.el
rename to elpa/org-20170210/org-eshell.el
index 6f9a18a4..34cc4ffb 100644
--- a/elpa/org-20161118/org-eshell.el
+++ b/elpa/org-20170210/org-eshell.el
@@ -1,6 +1,6 @@
 ;;; org-eshell.el - Support for Links to Working Directories in Eshell -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2011-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2017 Free Software Foundation, Inc.
 
 ;; Author: Konrad Hinsen <konrad.hinsen AT fastmail.net>
 
diff --git a/elpa/org-20161118/org-eww.el b/elpa/org-20170210/org-eww.el
similarity index 99%
rename from elpa/org-20161118/org-eww.el
rename to elpa/org-20170210/org-eww.el
index 01ec9053..d5b7b620 100644
--- a/elpa/org-20161118/org-eww.el
+++ b/elpa/org-20170210/org-eww.el
@@ -1,6 +1,6 @@
 ;;; org-eww.el --- Store url and kill from Eww mode for Org  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2014-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2017 Free Software Foundation, Inc.
 
 ;; Author: Marco Wahl <marcowahlsoft>a<gmailcom>
 ;; Keywords: link, eww
diff --git a/elpa/org-20161118/org-faces.el b/elpa/org-20170210/org-faces.el
similarity index 98%
rename from elpa/org-20161118/org-faces.el
rename to elpa/org-20170210/org-faces.el
index 96f7b8e0..cd43d371 100644
--- a/elpa/org-20161118/org-faces.el
+++ b/elpa/org-20170210/org-faces.el
@@ -1,6 +1,6 @@
 ;;; org-faces.el --- Face definitions -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2004-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2017 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -398,7 +398,7 @@ follows a #+DATE:, #+AUTHOR: or #+EMAIL: keyword."
 For source-blocks `org-src-block-faces' takes precedence.
 See also `org-fontify-quote-and-verse-blocks'."
   :group 'org-faces
-  :version "25.2")
+  :version "26.1")
 
 (defface org-block-begin-line '((t (:inherit org-meta-line)))
   "Face used for the line delimiting the begin of source blocks."
@@ -558,7 +558,11 @@ month and 365.24 days for a year)."
   :group 'org-faces)
 
 (defface org-agenda-filter-category '((t :inherit mode-line))
-  "Face for categories(s) in the mode-line when filtering the agenda."
+  "Face for categories in the mode-line when filtering the agenda."
+  :group 'org-faces)
+
+(defface org-agenda-filter-effort '((t :inherit mode-line))
+  "Face for effort in the mode-line when filtering the agenda."
   :group 'org-faces)
 
 (defface org-time-grid	   ;Copied from `font-lock-variable-name-face'
diff --git a/elpa/org-20161118/org-feed.el b/elpa/org-20170210/org-feed.el
similarity index 99%
rename from elpa/org-20161118/org-feed.el
rename to elpa/org-20170210/org-feed.el
index 0c3cd052..6ebe5ecf 100644
--- a/elpa/org-20161118/org-feed.el
+++ b/elpa/org-20170210/org-feed.el
@@ -1,6 +1,6 @@
 ;;; org-feed.el --- Add RSS feed items to Org files  -*- lexical-binding: t; -*-
 ;;
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/elpa/org-20161118/org-footnote.el b/elpa/org-20170210/org-footnote.el
similarity index 99%
rename from elpa/org-20161118/org-footnote.el
rename to elpa/org-20170210/org-footnote.el
index 5b60a193..e6a3321b 100644
--- a/elpa/org-20161118/org-footnote.el
+++ b/elpa/org-20170210/org-footnote.el
@@ -1,6 +1,6 @@
 ;;; org-footnote.el --- Footnote support in Org      -*- lexical-binding: t; -*-
 ;;
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/elpa/org-20161118/org-gnus.el b/elpa/org-20170210/org-gnus.el
similarity index 99%
rename from elpa/org-20161118/org-gnus.el
rename to elpa/org-20170210/org-gnus.el
index a0de1c18..b9d09895 100644
--- a/elpa/org-20161118/org-gnus.el
+++ b/elpa/org-20170210/org-gnus.el
@@ -1,6 +1,6 @@
 ;;; org-gnus.el --- Support for Links to Gnus Groups and Messages -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2004-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2017 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;;         Tassilo Horn <tassilo at member dot fsf dot org>
diff --git a/elpa/org-20161118/org-habit.el b/elpa/org-20170210/org-habit.el
similarity index 99%
rename from elpa/org-20161118/org-habit.el
rename to elpa/org-20170210/org-habit.el
index 081627e1..1f615657 100644
--- a/elpa/org-20161118/org-habit.el
+++ b/elpa/org-20170210/org-habit.el
@@ -1,6 +1,6 @@
 ;;; org-habit.el --- The habit tracking code for Org -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw at gnu dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/elpa/org-20161118/org-id.el b/elpa/org-20170210/org-id.el
similarity index 99%
rename from elpa/org-20161118/org-id.el
rename to elpa/org-20170210/org-id.el
index cf268515..f07d243b 100644
--- a/elpa/org-20161118/org-id.el
+++ b/elpa/org-20170210/org-id.el
@@ -1,6 +1,6 @@
 ;;; org-id.el --- Global identifiers for Org entries -*- lexical-binding: t; -*-
 ;;
-;; Copyright (C) 2008-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2017 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/elpa/org-20161118/org-indent.el b/elpa/org-20170210/org-indent.el
similarity index 99%
rename from elpa/org-20161118/org-indent.el
rename to elpa/org-20170210/org-indent.el
index fd58c69e..e1a33172 100644
--- a/elpa/org-20161118/org-indent.el
+++ b/elpa/org-20170210/org-indent.el
@@ -1,6 +1,6 @@
 ;;; org-indent.el --- Dynamic indentation for Org    -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/elpa/org-20161118/org-info.el b/elpa/org-20170210/org-info.el
similarity index 76%
rename from elpa/org-20161118/org-info.el
rename to elpa/org-20170210/org-info.el
index d82168ec..79b9bcc3 100644
--- a/elpa/org-20161118/org-info.el
+++ b/elpa/org-20170210/org-info.el
@@ -1,6 +1,6 @@
 ;;; org-info.el --- Support for Links to Info Nodes -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2004-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2017 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -97,21 +97,34 @@ Taken from <http://www.gnu.org/software/emacs/manual/html_mono/.>")
 (defconst org-info-other-documents
   '(("libc" . "http://www.gnu.org/software/libc/manual/html_mono/libc.html")
     ("make" . "http://www.gnu.org/software/make/manual/make.html"))
-  "Alist of documents generated from texinfo source.
-
-When converting info links to html, links to any one of these manuals are
-converted to use these URL's.")
+  "Alist of documents generated from Texinfo source.
+When converting info links to HTML, links to any one of these manuals are
+converted to use these URL.")
 
 (defun org-info-map-html-url (filename)
-  "Given info FILENAME, either return it (plus '.html' suffix added) or convert
-it to URL pointing to the official page on internet, e.g., use gnu.org for all
-emacs related documents. See `org-info-official-gnu-document' and
-`org-info-other-documents' for details."
-  (if (member filename org-info-emacs-documents)
-      (format "http://www.gnu.org/software/emacs/manual/html_mono/%s.html"
-              filename)
-    (let ((url (cdr (assoc filename org-info-other-documents))))
-      (or url (concat filename ".html")))))
+  "Return URL or HTML file associated to Info FILENAME.
+If FILENAME refers to an official GNU document, return a URL pointing to
+the official page for that document, e.g., use \"gnu.org\" for all Emacs
+related documents.  Otherwise, append \".html\" extension to FILENAME.
+See `org-info-emacs-documents' and `org-info-other-documents' for details."
+  (cond ((member filename org-info-emacs-documents)
+	 (format "http://www.gnu.org/software/emacs/manual/html_mono/%s.html"
+		 filename))
+	((cdr (assoc filename org-info-other-documents)))
+	(t (concat filename ".html"))))
+
+(defun org-info--expand-node-name (node)
+  "Expand Info NODE to HTML cross reference."
+  ;; See (info "(texinfo) HTML Xref Node Name Expansion") for the
+  ;; expansion rule.
+  (let ((node (replace-regexp-in-string
+	       "\\([ \t\n\r]+\\)\\|\\([^a-zA-Z0-9]\\)"
+	       (lambda (m)
+		 (if (match-end 1) "-" (format "_%04x" (string-to-char m))))
+	       (org-trim node))))
+    (cond ((string= node "") "")
+	  ((string-match-p "\\`[0-9]" node) (concat "g_t" node))
+	  (t node))))
 
 (defun org-info-export (path desc format)
   "Export an info link.
@@ -123,7 +136,7 @@ See `org-link-parameters' for details about PATH, DESC and FORMAT."
 	  (node (or (match-string 2 path) "Top")))
       (format "<a href=\"%s#%s\">%s</a>"
 	      (org-info-map-html-url filename)
-	      (replace-regexp-in-string " " "-" node)
+	      (org-info--expand-node-name node)
 	      (or desc path)))))
 
 (provide 'org-info)
diff --git a/elpa/org-20161118/org-inlinetask.el b/elpa/org-20170210/org-inlinetask.el
similarity index 99%
rename from elpa/org-20161118/org-inlinetask.el
rename to elpa/org-20170210/org-inlinetask.el
index 910b1a03..2918d406 100644
--- a/elpa/org-20161118/org-inlinetask.el
+++ b/elpa/org-20170210/org-inlinetask.el
@@ -1,6 +1,6 @@
 ;;; org-inlinetask.el --- Tasks Independent of Outline Hierarchy -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/elpa/org-20161118/org-install.el b/elpa/org-20170210/org-install.el
similarity index 100%
rename from elpa/org-20161118/org-install.el
rename to elpa/org-20170210/org-install.el
diff --git a/elpa/org-20161118/org-irc.el b/elpa/org-20170210/org-irc.el
similarity index 99%
rename from elpa/org-20161118/org-irc.el
rename to elpa/org-20170210/org-irc.el
index 2447793b..3a6a7f4d 100644
--- a/elpa/org-20161118/org-irc.el
+++ b/elpa/org-20170210/org-irc.el
@@ -1,6 +1,6 @@
 ;;; org-irc.el --- Store Links to IRC Sessions -*- lexical-binding: t; -*-
 ;;
-;; Copyright (C) 2008-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2017 Free Software Foundation, Inc.
 ;;
 ;; Author: Philip Jackson <emacs@shellarchive.co.uk>
 ;; Keywords: erc, irc, link, org
diff --git a/elpa/org-20161118/org-lint.el b/elpa/org-20170210/org-lint.el
similarity index 99%
rename from elpa/org-20161118/org-lint.el
rename to elpa/org-20170210/org-lint.el
index 2f92bb41..b734a37b 100644
--- a/elpa/org-20161118/org-lint.el
+++ b/elpa/org-20170210/org-lint.el
@@ -1,6 +1,6 @@
 ;;; org-lint.el --- Linting for Org documents        -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2015-2016  Free Software Foundation
+;; Copyright (C) 2015-2017  Free Software Foundation
 
 ;; Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/elpa/org-20161118/org-list.el b/elpa/org-20170210/org-list.el
similarity index 99%
rename from elpa/org-20161118/org-list.el
rename to elpa/org-20170210/org-list.el
index bb39b6ed..df4cb1c7 100644
--- a/elpa/org-20161118/org-list.el
+++ b/elpa/org-20170210/org-list.el
@@ -1,6 +1,6 @@
 ;;; org-list.el --- Plain lists for Org              -*- lexical-binding: t; -*-
 ;;
-;; Copyright (C) 2004-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2017 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;;	   Bastien Guerry <bzg@gnu.org>
@@ -2097,11 +2097,19 @@ Possible values are: `folded', `children' or `subtree'.  See
   "Return column at which body of ITEM should start."
   (save-excursion
     (goto-char item)
-    (looking-at "[ \t]*\\(\\S-+\\)\\(.*[ \t]+::\\)?\\([ \t]+\\|$\\)")
-    (if (match-beginning 2)
-	(let ((start (1+ (match-end 2)))
+    (if (save-excursion
+	  (end-of-line)
+	  (re-search-backward
+	   "[ \t]::\\([ \t]\\|$\\)" (line-beginning-position) t))
+	;; Descriptive list item.  Body starts after item's tag, if
+	;; possible.
+	(let ((start (1+ (- (match-beginning 1) (line-beginning-position))))
 	      (ind (org-get-indentation)))
-	  (if (> start (+ ind org-list-description-max-indent)) (+ ind 5) start))
+	  (if (> start (+ ind org-list-description-max-indent))
+	      (+ ind 5)
+	    start))
+      ;; Regular item.  Body starts after bullet.
+      (looking-at "[ \t]*\\(\\S-+\\)")
       (+ (progn (goto-char (match-end 1)) (current-column))
 	 (if (and org-list-two-spaces-after-bullet-regexp
 		  (string-match-p org-list-two-spaces-after-bullet-regexp
diff --git a/elpa/org-20161118/org-loaddefs.el b/elpa/org-20170210/org-loaddefs.el
similarity index 96%
rename from elpa/org-20161118/org-loaddefs.el
rename to elpa/org-20170210/org-loaddefs.el
index 8d088c9c..95bae237 100644
--- a/elpa/org-20161118/org-loaddefs.el
+++ b/elpa/org-20170210/org-loaddefs.el
@@ -72,7 +72,7 @@
 
 ;;;***
 
-;;;### (autoloads nil "ob-core" "ob-core.el" "aded9ceab7d8e7a5f75426ee4d0a6ab8")
+;;;### (autoloads nil "ob-core" "ob-core.el" "db51cea35fa29cfc12253a82317a2cd2")
 ;;; Generated autoloads from ob-core.el
 
 (autoload 'org-babel-execute-safely-maybe "ob-core" "\
@@ -407,7 +407,7 @@ Mark current src block.
 
 ;;;***
 
-;;;### (autoloads nil "ob-keys" "ob-keys.el" "1b6bb2a5d2a1c57ceefe7f17c31145d2")
+;;;### (autoloads nil "ob-keys" "ob-keys.el" "aef8e17375204895ffacafab4505b19f")
 ;;; Generated autoloads from ob-keys.el
 
 (autoload 'org-babel-describe-bindings "ob-keys" "\
@@ -445,7 +445,7 @@ Describe all keybindings behind `org-babel-key-prefix'.
 
 ;;;***
 
-;;;### (autoloads nil "ob-lob" "ob-lob.el" "02ae46f9f177689b816213d7361eb4f1")
+;;;### (autoloads nil "ob-lob" "ob-lob.el" "2391a67c5342826bbd67ef40462b1239")
 ;;; Generated autoloads from ob-lob.el
 
 (autoload 'org-babel-lob-execute-maybe "ob-lob" "\
@@ -640,7 +640,7 @@ compatible with `org-babel-get-src-block-info', which see.
 
 ;;;***
 
-;;;### (autoloads nil "ob-tangle" "ob-tangle.el" "9ddd66b126a5065eec5fb68c9d9b3117")
+;;;### (autoloads nil "ob-tangle" "ob-tangle.el" "3bdf344e899ac5f06aef01f914cf7c2a")
 ;;; Generated autoloads from ob-tangle.el
 
 (autoload 'org-babel-tangle-file "ob-tangle" "\
@@ -943,7 +943,7 @@ to override `appt-message-warning-time'.
 
 ;;;***
 
-;;;### (autoloads nil "org-archive" "org-archive.el" "e579a93b2eb48a2a1954a007238c1a35")
+;;;### (autoloads nil "org-archive" "org-archive.el" "95ef7e30d8accb91b0e8c6a094901eda")
 ;;; Generated autoloads from org-archive.el
 
 (autoload 'org-add-archive-files "org-archive" "\
@@ -1001,7 +1001,7 @@ This command is set with the variable `org-archive-default-command'.
 
 ;;;***
 
-;;;### (autoloads nil "org-attach" "org-attach.el" "5259718c8fb5cd5dfb689dfc6dcba8b8")
+;;;### (autoloads nil "org-attach" "org-attach.el" "275d0ad05b7179d6056c3209f534665e")
 ;;; Generated autoloads from org-attach.el
 
 (autoload 'org-attach "org-attach" "\
@@ -1012,7 +1012,7 @@ Shows a list of commands and prompts for another key to execute a command.
 
 ;;;***
 
-;;;### (autoloads nil "org-bbdb" "org-bbdb.el" "dd3729b6cb22da295c6685f776b48cee")
+;;;### (autoloads nil "org-bbdb" "org-bbdb.el" "44fa870e8a88e187148b1fe228b4dbd5")
 ;;; Generated autoloads from org-bbdb.el
 
 (autoload 'org-bbdb-anniversaries "org-bbdb" "\
@@ -1079,7 +1079,7 @@ Set `org-capture-templates' to be similar to `org-remember-templates'.
 
 ;;;***
 
-;;;### (autoloads nil "org-clock" "org-clock.el" "fc39befe2f0710e30ce926125f066b0b")
+;;;### (autoloads nil "org-clock" "org-clock.el" "ed7cf422f023bb9ecc064c262a7dfc24")
 ;;; Generated autoloads from org-clock.el
 
 (autoload 'org-resolve-clocks "org-clock" "\
@@ -1313,7 +1313,7 @@ Try very hard to provide sensible version strings.
 
 ;;;***
 
-;;;### (autoloads nil "org-datetree" "org-datetree.el" "72e0b9002fdc11e5b427df1bdf941040")
+;;;### (autoloads nil "org-datetree" "org-datetree.el" "344cb8b21572a5db9627e15cd726b75a")
 ;;; Generated autoloads from org-datetree.el
 
 (autoload 'org-datetree-find-date-create "org-datetree" "\
@@ -1343,7 +1343,7 @@ tree can be found.
 
 ;;;***
 
-;;;### (autoloads nil "org-element" "org-element.el" "5dcc839c1317b4b18cd9f87067142f31")
+;;;### (autoloads nil "org-element" "org-element.el" "c4ce6b7b82c57a87233ddc00b913b514")
 ;;; Generated autoloads from org-element.el
 
 (autoload 'org-element-update-syntax "org-element" "\
@@ -1443,7 +1443,7 @@ Providing it allows for quicker computation.
 
 ;;;***
 
-;;;### (autoloads nil "org-feed" "org-feed.el" "f20250ff0b1bcc3a09bc51f2d3dac665")
+;;;### (autoloads nil "org-feed" "org-feed.el" "608074d7ed60ce9f56348bfcce5183ec")
 ;;; Generated autoloads from org-feed.el
 
 (autoload 'org-feed-update-all "org-feed" "\
@@ -1470,7 +1470,7 @@ Show the raw feed buffer of a feed.
 
 ;;;***
 
-;;;### (autoloads nil "org-footnote" "org-footnote.el" "b10215857eb0d4bc274cf1bd9058f62e")
+;;;### (autoloads nil "org-footnote" "org-footnote.el" "77ebf00295a588116899b29f5c171e47")
 ;;; Generated autoloads from org-footnote.el
 
 (autoload 'org-footnote-action "org-footnote" "\
@@ -1505,7 +1505,7 @@ offer additional commands in a menu.
 
 ;;;***
 
-;;;### (autoloads nil "org-id" "org-id.el" "c45c85357eecf12fea1e59b23b0f92bf")
+;;;### (autoloads nil "org-id" "org-id.el" "cc516afc6179f3d06aa3fb530949a7e9")
 ;;; Generated autoloads from org-id.el
 
 (autoload 'org-id-get-create "org-id" "\
@@ -1597,7 +1597,7 @@ Store a link to the current entry, using its ID.
 
 ;;;***
 
-;;;### (autoloads nil "org-indent" "org-indent.el" "e3b5e64cfb3021dbba92e9249b7bf7d3")
+;;;### (autoloads nil "org-indent" "org-indent.el" "5387df02530b7f6d2c06073af3d39b87")
 ;;; Generated autoloads from org-indent.el
 
 (autoload 'org-indent-mode "org-indent" "\
@@ -1629,7 +1629,7 @@ during idle time.
 
 ;;;***
 
-;;;### (autoloads nil "org-irc" "org-irc.el" "f3560aa567a7599379c3c7528b7025c1")
+;;;### (autoloads nil "org-irc" "org-irc.el" "7cbdd6fc2f77dda7a2e3b24d6161adc9")
 ;;; Generated autoloads from org-irc.el
 
 (autoload 'org-irc-store-link "org-irc" "\
@@ -1690,7 +1690,7 @@ Load FILE with optional arguments NOERROR and MUSTSUFFIX.
 
 ;;;***
 
-;;;### (autoloads nil "org-mobile" "org-mobile.el" "9417c8f7111dd7a376be9631fd08d8be")
+;;;### (autoloads nil "org-mobile" "org-mobile.el" "bfa675ecf4e4d2836f8acb6018917e68")
 ;;; Generated autoloads from org-mobile.el
 
 (autoload 'org-mobile-push "org-mobile" "\
@@ -1723,7 +1723,7 @@ agenda view showing the flagged items.
 
 ;;;***
 
-;;;### (autoloads nil "org-plot" "org-plot.el" "44c470d26d070d9bf510e3b4027e3144")
+;;;### (autoloads nil "org-plot" "org-plot.el" "03f6cfa8c21082c9ad6f01d1963728fc")
 ;;; Generated autoloads from org-plot.el
 
 (autoload 'org-plot/gnuplot "org-plot" "\
@@ -1756,7 +1756,7 @@ line directly before or after the table.
 
 ;;;***
 
-;;;### (autoloads nil "org-table" "org-table.el" "6f1e2bb5fdca093cc2b3ba948233172d")
+;;;### (autoloads nil "org-table" "org-table.el" "80e55c91865f9a597aba7ace1babd95b")
 ;;; Generated autoloads from org-table.el
 
 (autoload 'org-table-create-with-table\.el "org-table" "\
@@ -2436,7 +2436,7 @@ which will prompt for the width.
 
 ;;;***
 
-;;;### (autoloads nil "org-timer" "org-timer.el" "d1eb161bc9c0e0e34df1b6f3b4b35776")
+;;;### (autoloads nil "org-timer" "org-timer.el" "3e7535f8a06b8928041f0625e81614b7")
 ;;; Generated autoloads from org-timer.el
 
 (autoload 'org-timer-start "org-timer" "\
@@ -2753,9 +2753,30 @@ Call the customize function with org as argument.
 
 ;;;***
 
-;;;### (autoloads nil "ox" "ox.el" "b7e9cf0030b0325e3057a19968d4b289")
+;;;### (autoloads nil "ox" "ox.el" "05bb28760552014600de6c6647d967bb")
 ;;; Generated autoloads from ox.el
 
+(autoload 'org-export-get-backend "ox" "\
+Return export back-end named after NAME.
+NAME is a symbol.  Return nil if no such back-end is found.
+
+\(fn NAME)" nil nil)
+
+(autoload 'org-export-get-environment "ox" "\
+Collect export options from the current buffer.
+
+Optional argument BACKEND is an export back-end, as returned by
+`org-export-create-backend'.
+
+When optional argument SUBTREEP is non-nil, assume the export is
+done against the current sub-tree.
+
+Third optional argument EXT-PLIST is a property list with
+external parameters overriding Org default settings, but still
+inferior to file-local settings.
+
+\(fn &optional BACKEND SUBTREEP EXT-PLIST)" nil nil)
+
 (autoload 'org-export-as "ox" "\
 Transcode current Org buffer into BACKEND code.
 
@@ -2921,7 +2942,7 @@ When ARG is `\\[universal-argument] \\[universal-argument]', display the asynchr
 
 ;;;***
 
-;;;### (autoloads nil "ox-ascii" "ox-ascii.el" "51a551fcaf0d7bc6cead0f6955786209")
+;;;### (autoloads nil "ox-ascii" "ox-ascii.el" "95b3c37f08fb0ebe5273efafd0f988f1")
 ;;; Generated autoloads from ox-ascii.el
 
 (autoload 'org-ascii-export-as-ascii "ox-ascii" "\
@@ -3021,7 +3042,7 @@ Return output file name.
 
 ;;;***
 
-;;;### (autoloads nil "ox-beamer" "ox-beamer.el" "c6c0dc6dc7c3d4b50d59dfc0263e7ff0")
+;;;### (autoloads nil "ox-beamer" "ox-beamer.el" "4198cac31feb4fffae98088664bf6115")
 ;;; Generated autoloads from ox-beamer.el
 
 (autoload 'org-beamer-mode "ox-beamer" "\
@@ -3156,7 +3177,7 @@ Return output file name.
 
 ;;;***
 
-;;;### (autoloads nil "ox-html" "ox-html.el" "aaf4c7d033873c7251cae8d1771cb2d7")
+;;;### (autoloads nil "ox-html" "ox-html.el" "920d50a595bad039c4953b886a95b048")
 ;;; Generated autoloads from ox-html.el
 
 (put 'org-html-head-include-default-style 'safe-local-variable 'booleanp)
@@ -3262,7 +3283,7 @@ Return output file name.
 
 ;;;***
 
-;;;### (autoloads nil "ox-icalendar" "ox-icalendar.el" "d2fd303438c246ba8df136588a8dd620")
+;;;### (autoloads nil "ox-icalendar" "ox-icalendar.el" "4aba56b7a031259feef0494c7c4ab4ba")
 ;;; Generated autoloads from ox-icalendar.el
 
 (autoload 'org-icalendar-export-to-ics "ox-icalendar" "\
@@ -3312,9 +3333,17 @@ The file is stored under the name chosen in
 
 ;;;***
 
-;;;### (autoloads nil "ox-latex" "ox-latex.el" "123ed15c25201263b6e1a9a1693e542e")
+;;;### (autoloads nil "ox-latex" "ox-latex.el" "57c8c5fa4f77f6160c7017cad7111c2d")
 ;;; Generated autoloads from ox-latex.el
 
+(autoload 'org-latex-make-preamble "ox-latex" "\
+Return a formatted LaTeX preamble.
+INFO is a plist used as a communication channel.  Optional
+argument TEMPLATE, when non-nil, is the header template string,
+as expected by `org-splice-latex-header'.
+
+\(fn INFO &optional TEMPLATE)" nil nil)
+
 (autoload 'org-latex-export-as-latex "ox-latex" "\
 Export current buffer as a LaTeX buffer.
 
@@ -3444,7 +3473,7 @@ Return output file name.
 
 ;;;***
 
-;;;### (autoloads nil "ox-md" "ox-md.el" "dbb219a197b6d27b0af3d9a9377381c2")
+;;;### (autoloads nil "ox-md" "ox-md.el" "b1c6278e891677457394317d4b226b3e")
 ;;; Generated autoloads from ox-md.el
 
 (autoload 'org-md-export-as-markdown "ox-md" "\
@@ -3516,7 +3545,7 @@ Return output file name.
 
 ;;;***
 
-;;;### (autoloads nil "ox-odt" "ox-odt.el" "15318d5d3b6daaa6fa2bb82b892c08e3")
+;;;### (autoloads nil "ox-odt" "ox-odt.el" "62715edd080b6dc8d5baa9f4ea6b296c")
 ;;; Generated autoloads from ox-odt.el
 
 (put 'org-odt-preferred-output-format 'safe-local-variable 'stringp)
@@ -3578,7 +3607,7 @@ is non-nil then the newly converted file is opened using
 
 ;;;***
 
-;;;### (autoloads nil "ox-org" "ox-org.el" "5fb639dd8cc9e0783080f8903d41aea2")
+;;;### (autoloads nil "ox-org" "ox-org.el" "d126e8a4348dd5d8538b072fd888fd59")
 ;;; Generated autoloads from ox-org.el
 
 (autoload 'org-org-export-as-org "ox-org" "\
@@ -3656,7 +3685,7 @@ Return output file name.
 
 ;;;***
 
-;;;### (autoloads nil "ox-publish" "ox-publish.el" "19f9abdf61bfdd43ec21e401c1efa073")
+;;;### (autoloads nil "ox-publish" "ox-publish.el" "db00755d9c0d3d8c71597adf15a2512a")
 ;;; Generated autoloads from ox-publish.el
 
 (defalias 'org-publish-project 'org-publish)
@@ -3699,7 +3728,7 @@ the project.
 
 ;;;***
 
-;;;### (autoloads nil "ox-texinfo" "ox-texinfo.el" "69992b53b9f9c13d7941e0afb25cd87e")
+;;;### (autoloads nil "ox-texinfo" "ox-texinfo.el" "aaad8d4c3a538744acc5bc6f623616a7")
 ;;; Generated autoloads from ox-texinfo.el
 
 (autoload 'org-texinfo-publish-to-texinfo "ox-texinfo" "\
@@ -3726,6 +3755,27 @@ command to convert it.
 ;;;### (autoloads nil "ox" "ox.el" (0 0 0 0))
 ;;; Generated autoloads from ox.el
 
+(autoload 'org-export-get-backend "ox" "\
+Return export back-end named after NAME.
+NAME is a symbol.  Return nil if no such back-end is found.
+
+\(fn NAME)" nil nil)
+
+(autoload 'org-export-get-environment "ox" "\
+Collect export options from the current buffer.
+
+Optional argument BACKEND is an export back-end, as returned by
+`org-export-create-backend'.
+
+When optional argument SUBTREEP is non-nil, assume the export is
+done against the current sub-tree.
+
+Third optional argument EXT-PLIST is a property list with
+external parameters overriding Org default settings, but still
+inferior to file-local settings.
+
+\(fn &optional BACKEND SUBTREEP EXT-PLIST)" nil nil)
+
 (autoload 'org-export-as "ox" "\
 Transcode current Org buffer into BACKEND code.
 
diff --git a/elpa/org-20161118/org-macro.el b/elpa/org-20170210/org-macro.el
similarity index 99%
rename from elpa/org-20161118/org-macro.el
rename to elpa/org-20170210/org-macro.el
index 85608918..71e917b7 100644
--- a/elpa/org-20161118/org-macro.el
+++ b/elpa/org-20170210/org-macro.el
@@ -1,6 +1,6 @@
 ;;; org-macro.el --- Macro Replacement Code for Org  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2013-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2017 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Goaziou <n.goaziou@gmail.com>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/elpa/org-20161118/org-macs.el b/elpa/org-20170210/org-macs.el
similarity index 98%
rename from elpa/org-20161118/org-macs.el
rename to elpa/org-20170210/org-macs.el
index 6c0abcbf..e4b39a2c 100644
--- a/elpa/org-20161118/org-macs.el
+++ b/elpa/org-20170210/org-macs.el
@@ -1,6 +1,6 @@
 ;;; org-macs.el --- Top-level Definitions for Org -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2004-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2017 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -194,11 +194,11 @@ program is needed for, so that the error message can be more informative."
        (<= (match-beginning n) pos)
        (>= (match-end n) pos)))
 
-(defun org-match-line (re)
-  "Looking-at at the beginning of the current line."
+(defun org-match-line (regexp)
+  "Match REGEXP at the beginning of the current line."
   (save-excursion
-    (goto-char (point-at-bol))
-    (looking-at re)))
+    (beginning-of-line)
+    (looking-at regexp)))
 
 (defun org-plist-delete (plist property)
   "Delete PROPERTY from PLIST.
diff --git a/elpa/org-20161118/org-mhe.el b/elpa/org-20170210/org-mhe.el
similarity index 99%
rename from elpa/org-20161118/org-mhe.el
rename to elpa/org-20170210/org-mhe.el
index 5d9ae589..1c1c5ef9 100644
--- a/elpa/org-20161118/org-mhe.el
+++ b/elpa/org-20170210/org-mhe.el
@@ -1,6 +1,6 @@
 ;;; org-mhe.el --- Support for Links to MH-E Messages -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2004-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2017 Free Software Foundation, Inc.
 
 ;; Author: Thomas Baumann <thomas dot baumann at ch dot tum dot de>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/elpa/org-20161118/org-mobile.el b/elpa/org-20170210/org-mobile.el
similarity index 96%
rename from elpa/org-20161118/org-mobile.el
rename to elpa/org-20170210/org-mobile.el
index 3ef3f4e0..f6ef18f1 100644
--- a/elpa/org-20161118/org-mobile.el
+++ b/elpa/org-20170210/org-mobile.el
@@ -1,5 +1,5 @@
 ;;; org-mobile.el --- Code for Asymmetric Sync With a Mobile Device -*- lexical-binding: t; -*-
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -308,40 +308,29 @@ Also exclude files matching `org-mobile-files-exclude-regexp'."
 This will create the index file, copy all agenda files there, and also
 create all custom agenda views, for upload to the mobile phone."
   (interactive)
-  (let ((a-buffer (get-buffer org-agenda-buffer-name)))
-    (let ((org-agenda-curbuf-name org-agenda-buffer-name)
-	  (org-agenda-buffer-name "*SUMO*")
-	  (org-agenda-tag-filter org-agenda-tag-filter)
-	  (org-agenda-redo-command org-agenda-redo-command))
-      (save-excursion
-	(save-restriction
-	  (save-window-excursion
-	    (run-hooks 'org-mobile-pre-push-hook)
-	    (org-mobile-check-setup)
-	    (org-mobile-prepare-file-lists)
-	    (message "Creating agendas...")
-	    (let ((inhibit-redisplay t)
-		  (org-agenda-files (mapcar 'car org-mobile-files-alist)))
-	      (org-mobile-create-sumo-agenda))
-	    (message "Creating agendas...done")
-	    (org-save-all-org-buffers) ; to save any IDs created by this process
-	    (message "Copying files...")
-	    (org-mobile-copy-agenda-files)
-	    (message "Writing index file...")
-	    (org-mobile-create-index-file)
-	    (message "Writing checksums...")
-	    (org-mobile-write-checksums)
-	    (run-hooks 'org-mobile-post-push-hook))))
-      (setq org-agenda-buffer-name org-agenda-curbuf-name
-	    org-agenda-this-buffer-name org-agenda-curbuf-name))
-    (redraw-display)
-    (when (buffer-live-p a-buffer)
-      (if (not (get-buffer-window a-buffer))
-    	  (kill-buffer a-buffer)
-    	(let ((cw (selected-window)))
-    	  (select-window (get-buffer-window a-buffer))
-    	  (org-agenda-redo)
-    	  (select-window cw)))))
+  (let ((org-agenda-buffer-name "*SUMO*")
+	(org-agenda-tag-filter org-agenda-tag-filter)
+	(org-agenda-redo-command org-agenda-redo-command))
+    (save-excursion
+      (save-restriction
+	(save-window-excursion
+	  (run-hooks 'org-mobile-pre-push-hook)
+	  (org-mobile-check-setup)
+	  (org-mobile-prepare-file-lists)
+	  (message "Creating agendas...")
+	  (let ((inhibit-redisplay t)
+		(org-agenda-files (mapcar 'car org-mobile-files-alist)))
+	    (org-mobile-create-sumo-agenda))
+	  (message "Creating agendas...done")
+	  (org-save-all-org-buffers) ; to save any IDs created by this process
+	  (message "Copying files...")
+	  (org-mobile-copy-agenda-files)
+	  (message "Writing index file...")
+	  (org-mobile-create-index-file)
+	  (message "Writing checksums...")
+	  (org-mobile-write-checksums)
+	  (run-hooks 'org-mobile-post-push-hook)))))
+  (org-agenda-maybe-redo)
   (message "Files for mobile viewer staged"))
 
 (defvar org-mobile-before-process-capture-hook nil
diff --git a/elpa/org-20161118/org-mouse.el b/elpa/org-20170210/org-mouse.el
similarity index 99%
rename from elpa/org-20161118/org-mouse.el
rename to elpa/org-20170210/org-mouse.el
index 797a21fb..d6a47278 100644
--- a/elpa/org-20161118/org-mouse.el
+++ b/elpa/org-20170210/org-mouse.el
@@ -1,6 +1,6 @@
 ;;; org-mouse.el --- Better mouse support for Org -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2006-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2017 Free Software Foundation, Inc.
 
 ;; Author: Piotr Zielinski <piotr dot zielinski at gmail dot com>
 ;; Maintainer: Carsten Dominik <carsten at orgmode dot org>
diff --git a/elpa/org-20161118/org-pcomplete.el b/elpa/org-20170210/org-pcomplete.el
similarity index 99%
rename from elpa/org-20161118/org-pcomplete.el
rename to elpa/org-20170210/org-pcomplete.el
index 5a524915..61ec5fad 100644
--- a/elpa/org-20161118/org-pcomplete.el
+++ b/elpa/org-20170210/org-pcomplete.el
@@ -1,6 +1,6 @@
 ;;; org-pcomplete.el --- In-buffer Completion Code -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2004-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2017 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;;         John Wiegley <johnw at gnu dot org>
diff --git a/elpa/org-20170210/org-pkg.el b/elpa/org-20170210/org-pkg.el
new file mode 100644
index 00000000..7bef203f
--- /dev/null
+++ b/elpa/org-20170210/org-pkg.el
@@ -0,0 +1,3 @@
+(define-package "org"
+  "20170210" "Outline-based notes management and organizer" ( ))
+;; no-byte-compile: t
diff --git a/elpa/org-20161118/org-plot.el b/elpa/org-20170210/org-plot.el
similarity index 99%
rename from elpa/org-20161118/org-plot.el
rename to elpa/org-20170210/org-plot.el
index 6b513680..449143a4 100644
--- a/elpa/org-20161118/org-plot.el
+++ b/elpa/org-20170210/org-plot.el
@@ -1,6 +1,6 @@
 ;;; org-plot.el --- Support for Plotting from Org -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2008-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2017 Free Software Foundation, Inc.
 ;;
 ;; Author: Eric Schulte <schulte dot eric at gmail dot com>
 ;; Keywords: tables, plotting
diff --git a/elpa/org-20161118/org-protocol.el b/elpa/org-20170210/org-protocol.el
similarity index 99%
rename from elpa/org-20161118/org-protocol.el
rename to elpa/org-20170210/org-protocol.el
index 4ffa0308..c2abb2f2 100644
--- a/elpa/org-20161118/org-protocol.el
+++ b/elpa/org-20170210/org-protocol.el
@@ -1,6 +1,6 @@
 ;;; org-protocol.el --- Intercept Calls from Emacsclient to Trigger Custom Actions -*- lexical-binding: t; -*-
 ;;
-;; Copyright (C) 2008-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2017 Free Software Foundation, Inc.
 ;;
 ;; Authors: Bastien Guerry <bzg@gnu.org>
 ;;       Daniel M German <dmg AT uvic DOT org>
diff --git a/elpa/org-20161118/org-rmail.el b/elpa/org-20170210/org-rmail.el
similarity index 98%
rename from elpa/org-20161118/org-rmail.el
rename to elpa/org-20170210/org-rmail.el
index f24e25b9..31c59a13 100644
--- a/elpa/org-20161118/org-rmail.el
+++ b/elpa/org-20170210/org-rmail.el
@@ -1,6 +1,6 @@
 ;;; org-rmail.el --- Support for Links to Rmail Messages -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2004-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2017 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/elpa/org-20161118/org-src.el b/elpa/org-20170210/org-src.el
similarity index 98%
rename from elpa/org-20161118/org-src.el
rename to elpa/org-20170210/org-src.el
index bcc93acd..b45306ef 100644
--- a/elpa/org-20161118/org-src.el
+++ b/elpa/org-20170210/org-src.el
@@ -1,6 +1,6 @@
 ;;; org-src.el --- Source code examples in Org       -*- lexical-binding: t; -*-
 ;;
-;; Copyright (C) 2004-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2017 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;;	   Bastien Guerry <bzg@gnu.org>
@@ -215,7 +215,7 @@ green, respectability.
                        (choice
                         (face :tag "Face")
                         (sexp :tag "Anonymous face"))))
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "9.0"))
 
 (defcustom org-src-tab-acts-natively nil
@@ -522,21 +522,22 @@ as `org-src-fontify-natively' is non-nil."
 	(with-current-buffer
 	    (get-buffer-create
 	     (format " *org-src-fontification:%s*" lang-mode))
-	  (erase-buffer)
-	  ;; Add string and a final space to ensure property change.
-	  (insert string " ")
-	  (unless (eq major-mode lang-mode) (funcall lang-mode))
-	  (org-font-lock-ensure)
-	  (let ((pos (point-min)) next)
-	    (while (setq next (next-property-change pos))
-	      ;; Handle additional properties from font-lock, so as to
-	      ;; preserve, e.g., composition.
-	      (dolist (prop (cons 'face font-lock-extra-managed-props))
-		(let ((new-prop (get-text-property pos prop)))
-		  (put-text-property
-		   (+ start (1- pos)) (1- (+ start next)) prop new-prop
-		   org-buffer)))
-	      (setq pos next))))
+	  (let ((inhibit-modification-hooks nil))
+	    (erase-buffer)
+	    ;; Add string and a final space to ensure property change.
+	    (insert string " ")
+	    (unless (eq major-mode lang-mode) (funcall lang-mode))
+	    (org-font-lock-ensure)
+	    (let ((pos (point-min)) next)
+	      (while (setq next (next-property-change pos))
+		;; Handle additional properties from font-lock, so as to
+		;; preserve, e.g., composition.
+		(dolist (prop (cons 'face font-lock-extra-managed-props))
+		  (let ((new-prop (get-text-property pos prop)))
+		    (put-text-property
+		     (+ start (1- pos)) (1- (+ start next)) prop new-prop
+		     org-buffer)))
+		(setq pos next)))))
 	;; Add Org faces.
 	(let ((src-face (nth 1 (assoc-string lang org-src-block-faces t))))
           (when (or (facep src-face) (listp src-face))
@@ -765,7 +766,7 @@ white spaces.  Match group 2 contains the same string without any
 surrounding space.  Match group 3 contains the label.
 
 A coderef format regexp can only match at the end of a line."
-  (format "\\S-\\([ \t]*\\(%s\\)[ \t]*\\)$"
+  (format "\\([ \t]*\\(%s\\)[ \t]*\\)$"
 	  (replace-regexp-in-string
 	   "%s"
 	   (if label (regexp-quote label) "\\([-a-zA-Z0-9_][-a-zA-Z0-9_ ]*\\)")
diff --git a/elpa/org-20161118/org-table.el b/elpa/org-20170210/org-table.el
similarity index 99%
rename from elpa/org-20161118/org-table.el
rename to elpa/org-20170210/org-table.el
index 4bd1c89c..f6d43d39 100644
--- a/elpa/org-20161118/org-table.el
+++ b/elpa/org-20170210/org-table.el
@@ -1,6 +1,6 @@
 ;;; org-table.el --- The Table Editor for Org        -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2004-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2017 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -265,7 +265,7 @@ t       accept as input and present for editing"
   "Non-nil means increment when copying current field with \
 `\\[org-table-copy-down]'."
   :group 'org-table-calculation
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "8.3")
   :type '(choice
 	  (const :tag "Use the difference between the current and the above fields" t)
@@ -378,7 +378,7 @@ portability of tables."
   "Non-nil means that evaluation of a field formula can add new
 columns if an out-of-bounds field is being set."
   :group 'org-table-calculation
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "8.3")
   :type '(choice
 	  (const :tag "Setting an out-of-bounds field generates an error (default)" nil)
@@ -407,7 +407,7 @@ The function can be slow on larger regions; this safety feature
 prevents it from hanging emacs."
   :group 'org-table-import-export
   :type 'integer
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "8.3"))
 
 (defconst org-table-auto-recalculate-regexp "^[ \t]*| *# *\\(|\\|$\\)"
@@ -1250,21 +1250,21 @@ Return t when the line exists, nil if it does not exist."
 
 (defun org-table-get-field (&optional n replace)
   "Return the value of the field in column N of current row.
-N defaults to current field.
-If REPLACE is a string, replace field with this value.  The return value
-is always the old value."
-  (and n (org-table-goto-column n))
+N defaults to current column.  If REPLACE is a string, replace
+field with this value.  The return value is always the old
+value."
+  (when n (org-table-goto-column n))
   (skip-chars-backward "^|\n")
-  (backward-char 1)
-  (if (looking-at "|[^|\r\n]*")
-      (let* ((pos (match-beginning 0))
-	     (val (buffer-substring (1+ pos) (match-end 0))))
-	(if replace
-	    (replace-match (concat "|" (if (equal replace "") " " replace))
-			   t t))
-	(goto-char (min (point-at-eol) (+ 2 pos)))
-	val)
-    (forward-char 1) ""))
+  (if (or (bolp) (looking-at-p "[ \t]*$"))
+      ;; Before first column or after last one.
+      ""
+    (looking-at "[^|\r\n]*")
+    (let* ((pos (match-beginning 0))
+	   (val (buffer-substring pos (match-end 0))))
+      (when replace
+	(replace-match (if (equal replace "") " " replace) t t))
+      (goto-char (min (line-end-position) (1+ pos)))
+      val)))
 
 ;;;###autoload
 (defun org-table-field-info (_arg)
diff --git a/elpa/org-20161118/org-timer.el b/elpa/org-20170210/org-timer.el
similarity index 99%
rename from elpa/org-20161118/org-timer.el
rename to elpa/org-20170210/org-timer.el
index 2d2ee21e..146775b2 100644
--- a/elpa/org-20161118/org-timer.el
+++ b/elpa/org-20170210/org-timer.el
@@ -1,6 +1,6 @@
 ;;; org-timer.el --- Timer code for Org mode         -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2008-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2017 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -69,7 +69,7 @@ the value of the timer."
   "The default timer when a timer is set, in minutes or hh:mm:ss format.
 When 0, the user is prompted for a value."
   :group 'org-time
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "8.3")
   :type 'string)
 
diff --git a/elpa/org-20161118/org-version.el b/elpa/org-20170210/org-version.el
similarity index 89%
rename from elpa/org-20161118/org-version.el
rename to elpa/org-20170210/org-version.el
index df7bc1a9..3736c5b9 100644
--- a/elpa/org-20161118/org-version.el
+++ b/elpa/org-20170210/org-version.el
@@ -5,13 +5,13 @@
 (defun org-release ()
   "The release version of Org.
 Inserted by installing Org mode or when a release is made."
-   (let ((org-release "9.0.1"))
+   (let ((org-release "9.0.5"))
      org-release))
 ;;;###autoload
 (defun org-git-version ()
   "The Git version of org-mode.
 Inserted by installing Org or when a release is made."
-   (let ((org-git-version "9.0.1-elpa"))
+   (let ((org-git-version "9.0.5-elpa"))
      org-git-version))
 ;;;###autoload
 (defvar org-odt-data-dir "/usr/share/emacs/etc/org"
diff --git a/elpa/org-20161118/org-w3m.el b/elpa/org-20170210/org-w3m.el
similarity index 99%
rename from elpa/org-20161118/org-w3m.el
rename to elpa/org-20170210/org-w3m.el
index 2f40169c..e9bbeff3 100644
--- a/elpa/org-20161118/org-w3m.el
+++ b/elpa/org-20170210/org-w3m.el
@@ -1,6 +1,6 @@
 ;;; org-w3m.el --- Support from Copy and Paste From w3m -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2008-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2017 Free Software Foundation, Inc.
 
 ;; Author: Andy Stewart <lazycat dot manatee at gmail dot com>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/elpa/org-20161118/org.el b/elpa/org-20170210/org.el
similarity index 97%
rename from elpa/org-20161118/org.el
rename to elpa/org-20170210/org.el
index b4f7ad25..1c514d4c 100644
--- a/elpa/org-20161118/org.el
+++ b/elpa/org-20170210/org.el
@@ -1,7 +1,7 @@
 ;;; org.el --- Outline-based notes management and organizer -*- lexical-binding: t; -*-
 
 ;; Carstens outline-mode for keeping track of everything.
-;; Copyright (C) 2004-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2017 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Maintainer: Carsten Dominik <carsten at orgmode dot org>
@@ -115,8 +115,7 @@ Stars are put in group 1 and the trimmed body in group 2.")
 (declare-function isearch-no-upper-case-p "isearch" (string regexp-flag))
 (declare-function org-add-archive-files "org-archive" (files))
 (declare-function org-agenda-entry-get-agenda-timestamp "org-agenda" (pom))
-(declare-function org-agenda-list "org-agenda"
-		  (&optional arg start-day span with-hour))
+(declare-function org-agenda-list "org-agenda" (&optional arg start-day span with-hour))
 (declare-function org-agenda-redo "org-agenda" (&optional all))
 (declare-function org-babel-do-in-edit-buffer "ob-core" (&rest body) t)
 (declare-function org-babel-tangle-file "ob-tangle" (file &optional target-file lang))
@@ -172,6 +171,9 @@ Stars are put in group 1 and the trimmed body in group 2.")
 (declare-function org-tags-view "org-agenda" (&optional todo-only match))
 (declare-function orgtbl-ascii-plot "org-table" (&optional ask))
 (declare-function orgtbl-mode "org-table" (&optional arg))
+(declare-function org-export-get-backend "ox" (name))
+(declare-function org-export-get-environment "ox" (&optional backend subtreep ext-plist))
+(declare-function org-latex-make-preamble "ox-latex" (info &optional template))
 
 (defsubst org-uniquify (list)
   "Non-destructively remove duplicate elements from LIST."
@@ -789,7 +791,7 @@ Adding a back-end to this list will also pull the back-end it
 depends on, if any."
   :group 'org
   :group 'org-export
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "9.0")
   :initialize 'custom-initialize-set
   :set (lambda (var val)
@@ -1204,7 +1206,7 @@ make it harder to edit the location of the match.  In such
 a case, use the command `org-reveal' (`\\[org-reveal]') to show
 more context."
   :group 'org-reveal-location
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "9.0")
   :type '(choice
 	  (const :tag "Canonical" t)
@@ -1425,7 +1427,7 @@ argument is a symbol.  After a global state change, it can have the values
 the values `folded', `children', or `subtree'."
   :group 'org-cycle
   :type 'hook
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "8.3"))
 
 (defgroup org-edit-structure nil
@@ -1692,7 +1694,7 @@ The highlights created by `org-toggle-latex-fragment' always need
 If set to `smart' the search will be case-insensitive only if it
 doesn't specify any upper case character."
   :group 'org-sparse-trees
-  :version "25.2"
+  :version "26.1"
   :type '(choice
 	  (const :tag "Case-sensitive" nil)
 	  (const :tag "Case-insensitive" t)
@@ -2251,7 +2253,7 @@ See `org-file-apps'.")
     ("dvi"    . "xdvi %s")
     ("fig"    . "xfig %s")
     (t . "open %s"))
-  "Default file applications on a MacOS X system.
+  "Default file applications on a macOS system.
 The system \"open\" is known as a default, but we use X11 applications
 for some files for which the OS does not have a good default.
 See `org-file-apps'.")
@@ -2323,7 +2325,7 @@ Possible values for the file identifier are:
                will also open html files inside Emacs, unless you add
                (\"html\" . default) to the list as well.
  `system'      The system command to open files, like `open' on Windows
-               and Mac OS X, and mailcap under GNU/Linux.  This is the command
+               and macOS, and mailcap under GNU/Linux.  This is the command
                that will be selected if you call `org-open-at-point' with a
                double prefix argument (`\\[universal-argument] \
 \\[universal-argument] \\[org-open-at-point]').
@@ -3826,14 +3828,14 @@ in this variable)."
 	  (regexp :tag "Properties matched by regexp")))
 
 (defun org-property-inherit-p (property)
-  "Check if PROPERTY is one that should be inherited."
+  "Return a non-nil value if PROPERTY should be inherited."
   (cond
    ((eq org-use-property-inheritance t) t)
    ((not org-use-property-inheritance) nil)
    ((stringp org-use-property-inheritance)
     (string-match org-use-property-inheritance property))
    ((listp org-use-property-inheritance)
-    (member property org-use-property-inheritance))
+    (member-ignore-case property org-use-property-inheritance))
    (t (error "Invalid setting of `org-use-property-inheritance'"))))
 
 (defcustom org-columns-default-format "%25ITEM %TODO %3PRIORITY %TAGS"
@@ -4079,7 +4081,7 @@ When using LaTeXML set this option to
 All available processes and theirs documents can be found in
 `org-preview-latex-process-alist', which see."
   :group 'org-latex
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "9.0")
   :type 'symbol)
 
@@ -4092,7 +4094,7 @@ All available processes and theirs documents can be found in
      :image-output-type "png"
      :image-size-adjust (1.0 . 1.0)
      :latex-compiler ("latex -interaction nonstopmode -output-directory %o %f")
-     :image-converter ("dvipng -fg %F -bg %B -D %D -T tight -o %o%b.png %f"))
+     :image-converter ("dvipng -fg %F -bg %B -D %D -T tight -o %O %f"))
     (dvisvgm
      :programs ("latex" "dvisvgm")
      :description "dvi > svg"
@@ -4102,7 +4104,7 @@ All available processes and theirs documents can be found in
      :image-output-type "svg"
      :image-size-adjust (1.7 . 1.5)
      :latex-compiler ("latex -interaction nonstopmode -output-directory %o %f")
-     :image-converter ("dvisvgm %f -n -b min -c %S -o %o%b.svg"))
+     :image-converter ("dvisvgm %f -n -b min -c %S -o %O"))
     (imagemagick
      :programs ("latex" "convert")
      :description "pdf > png"
@@ -4113,7 +4115,7 @@ All available processes and theirs documents can be found in
      :image-size-adjust (1.0 . 1.0)
      :latex-compiler ("pdflatex -interaction nonstopmode -output-directory %o %f")
      :image-converter
-     ("convert -density %D -trim -antialias %f -quality 100 %o%b.png")))
+     ("convert -density %D -trim -antialias %f -quality 100 %O")))
   "Definitions of external processes for LaTeX previewing.
 Org mode can use some external commands to generate TeX snippet's images for
 previewing or inserting into HTML files, e.g., \"dvipng\".  This variable tells
@@ -4156,9 +4158,10 @@ PROPERTIES accepts the following attributes:
 
 Place-holders used by `:image-converter' and `:latex-compiler':
 
-  %f    input file name.
-  %b    base name of input file.
-  %o    base directory of input file.
+  %f    input file name
+  %b    base name of input file
+  %o    base directory of input file
+  %O    absolute output file name
 
 Place-holders only used by `:image-converter':
 
@@ -4168,7 +4171,7 @@ Place-holders only used by `:image-converter':
   %S    the image size scale ratio, which is used to adjust image size by some
         processing commands."
   :group 'org-latex
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "9.0")
   :type '(alist :tag "LaTeX to image backends"
 		:value-type (plist)))
@@ -4179,7 +4182,7 @@ A relative path here creates many directories relative to the
 processed org files paths.  An absolute path puts all preview
 images at the same place."
   :group 'org-latex
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "9.0")
   :type 'string)
 
@@ -4297,7 +4300,7 @@ A string will be inserted as-is in the header of the document."
   :group 'org-export-latex
   :set 'org-set-packages-alist
   :get 'org-get-packages-alist
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "8.3")
   :type '(repeat
 	  (choice
@@ -4843,7 +4846,7 @@ Otherwise, these types are allowed:
 		 (const :tag "Only scheduled timestamps" scheduled)
 		 (const :tag "Only deadline timestamps" deadline)
 		 (const :tag "Only closed timestamps" closed))
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "8.3")
   :group 'org-sparse-trees)
 
@@ -5691,7 +5694,7 @@ The following commands are available:
 	     '(Org ("6.21b" . "23.1")  ("6.33x" . "23.2")
 		   ("7.8.11" . "24.1") ("7.9.4" . "24.3")
 		   ("8.2.6" . "24.4") ("8.2.10" . "24.5")
-		   ("9.0" . "25.2")))
+		   ("9.0" . "26.1")))
 
 (defvar org-mode-transpose-word-syntax-table
   (let ((st (make-syntax-table text-mode-syntax-table)))
@@ -8975,77 +8978,79 @@ subtree has a repeater.  Setting N to 0, then, can be used to
 remove the repeater from a subtree and create a shifted clone
 with the original repeater."
   (interactive "nNumber of clones to produce: ")
-  (let ((shift
-	 (or shift
-	     (if (and (not (equal current-prefix-arg '(4)))
-		      (save-excursion
-			(re-search-forward org-ts-regexp-both
-					   (save-excursion
-					     (org-end-of-subtree t)
-					     (point)) t)))
-		 (read-from-minibuffer
-		  "Date shift per clone (e.g. +1w, empty to copy unchanged): ")
-	       ""))) ;; No time shift
-	(n-no-remove -1)
-	(drawer-re org-drawer-regexp)
-	(org-clock-re (format "^[ \t]*%s.*$" org-clock-string))
-	beg end template task idprop
-	shift-n shift-what doshift nmin nmax)
-    (unless (wholenump n)
-      (user-error "Invalid number of replications %s" n))
-    (when (and (setq doshift (and (stringp shift) (string-match "\\S-" shift)))
-	       (not (string-match "\\`[ \t]*\\+?\\([0-9]+\\)\\([hdwmy]\\)[ \t]*\\'"
-				  shift)))
-      (user-error "Invalid shift specification %s" shift))
-    (when doshift
-      (setq shift-n (string-to-number (match-string 1 shift))
-	    shift-what (cdr (assoc (match-string 2 shift)
-				   '(("d" . day) ("w" . week)
-				     ("m" . month) ("y" . year))))))
-    (when (eq shift-what 'week) (setq shift-n (* 7 shift-n) shift-what 'day))
-    (setq nmin 1 nmax n)
-    (org-back-to-heading t)
-    (setq beg (point))
-    (setq idprop (org-entry-get nil "ID"))
-    (org-end-of-subtree t t)
-    (or (bolp) (insert "\n"))
-    (setq end (point))
-    (setq template (buffer-substring beg end))
-    (when (and doshift
-	       (string-match "<[^<>\n]+ [.+]?\\+[0-9]+[hdwmy][^<>\n]*>" template))
-      (delete-region beg end)
-      (setq end beg)
-      (setq nmin 0 nmax (1+ nmax) n-no-remove nmax))
-    (goto-char end)
-    (cl-loop for n from nmin to nmax do
-	     ;; prepare clone
-	     (with-temp-buffer
-	       (insert template)
-	       (org-mode)
-	       (goto-char (point-min))
-	       (org-show-subtree)
-	       (and idprop (if org-clone-delete-id
-			       (org-entry-delete nil "ID")
-			     (org-id-get-create t)))
-	       (unless (= n 0)
-		 (while (re-search-forward org-clock-re nil t)
-		   (kill-whole-line))
-		 (goto-char (point-min))
-		 (while (re-search-forward drawer-re nil t)
-		   (org-remove-empty-drawer-at (point))))
-	       (goto-char (point-min))
-	       (when doshift
-		 (while (re-search-forward org-ts-regexp-both nil t)
-		   (org-timestamp-change (* n shift-n) shift-what))
-		 (unless (= n n-no-remove)
-		   (goto-char (point-min))
-		   (while (re-search-forward org-ts-regexp nil t)
-		     (save-excursion
-		       (goto-char (match-beginning 0))
-		       (when (looking-at "<[^<>\n]+\\( +[.+]?\\+[0-9]+[hdwmy]\\)")
-			 (delete-region (match-beginning 1) (match-end 1)))))))
-	       (setq task (buffer-string)))
-	     (insert task))
+  (unless (wholenump n) (user-error "Invalid number of replications %s" n))
+  (when (org-before-first-heading-p) (user-error "No subtree to clone"))
+  (let* ((beg (save-excursion (org-back-to-heading t) (point)))
+	 (end-of-tree (save-excursion (org-end-of-subtree t t) (point)))
+	 (shift
+	  (or shift
+	      (if (and (not (equal current-prefix-arg '(4)))
+		       (save-excursion
+			 (goto-char beg)
+			 (re-search-forward org-ts-regexp-both end-of-tree t)))
+		  (read-from-minibuffer
+		   "Date shift per clone (e.g. +1w, empty to copy unchanged): ")
+		"")))			;No time shift
+	 (doshift
+	  (and (org-string-nw-p shift)
+	       (or (string-match "\\`[ \t]*\\+?\\([0-9]+\\)\\([dwmy]\\)[ \t]*\\'"
+				 shift)
+		   (user-error "Invalid shift specification %s" shift)))))
+    (goto-char end-of-tree)
+    (unless (bolp) (insert "\n"))
+    (let* ((end (point))
+	   (template (buffer-substring beg end))
+	   (shift-n (and doshift (string-to-number (match-string 1 shift))))
+	   (shift-what (pcase (and doshift (match-string 2 shift))
+			 (`nil nil)
+			 ("d" 'day)
+			 ("w" (setq shift-n (* 7 shift-n)) 'day)
+			 ("m" 'month)
+			 ("y" 'year)
+			 (_ (error "Unsupported time unit"))))
+	   (nmin 1)
+	   (nmax n)
+	   (n-no-remove -1)
+	   (idprop (org-entry-get nil "ID")))
+      (when (and doshift
+		 (string-match-p "<[^<>\n]+ [.+]?\\+[0-9]+[hdwmy][^<>\n]*>"
+				 template))
+	(delete-region beg end)
+	(setq end beg)
+	(setq nmin 0)
+	(setq nmax (1+ nmax))
+	(setq n-no-remove nmax))
+      (goto-char end)
+      (cl-loop for n from nmin to nmax do
+	       (insert
+		;; Prepare clone.
+		(with-temp-buffer
+		  (insert template)
+		  (org-mode)
+		  (goto-char (point-min))
+		  (org-show-subtree)
+		  (and idprop (if org-clone-delete-id
+				  (org-entry-delete nil "ID")
+				(org-id-get-create t)))
+		  (unless (= n 0)
+		    (while (re-search-forward org-clock-line-re nil t)
+		      (delete-region (line-beginning-position)
+				     (line-beginning-position 2)))
+		    (goto-char (point-min))
+		    (while (re-search-forward org-drawer-regexp nil t)
+		      (org-remove-empty-drawer-at (point))))
+		  (goto-char (point-min))
+		  (when doshift
+		    (while (re-search-forward org-ts-regexp-both nil t)
+		      (org-timestamp-change (* n shift-n) shift-what))
+		    (unless (= n n-no-remove)
+		      (goto-char (point-min))
+		      (while (re-search-forward org-ts-regexp nil t)
+			(save-excursion
+			  (goto-char (match-beginning 0))
+			  (when (looking-at "<[^<>\n]+\\( +[.+]?\\+[0-9]+[hdwmy]\\)")
+			    (delete-region (match-beginning 1) (match-end 1)))))))
+		  (buffer-string)))))
     (goto-char beg)))
 
 ;;; Outline Sorting
@@ -9730,31 +9735,39 @@ DPROP is the drawer property and TPROP is either the
 corresponding text property to set, or an alist with each element
 being a text property (as a symbol) and a function to apply to
 the value of the drawer property."
-  (let ((case-fold-search t)
-	(inhibit-read-only t))
+  (let* ((case-fold-search t)
+	 (inhibit-read-only t)
+	 (inherit? (org-property-inherit-p dprop))
+	 (property-re (org-re-property (concat (regexp-quote dprop) "\\+?") t))
+	 (global (and inherit? (org--property-global-value dprop nil))))
     (org-with-silent-modifications
-     (org-with-wide-buffer
-      (goto-char (point-min))
-      (while (re-search-forward (concat "^[ \t]*:" dprop ": +\\(.*\\)[ \t]*$") nil t)
-	(org-refresh-property tprop (match-string-no-properties 1)))))))
-
-(defun org-refresh-property (tprop p)
+     (org-with-point-at 1
+       ;; Set global values (e.g., values defined through
+       ;; "#+PROPERTY:" keywords) to the whole buffer.
+       (when global (put-text-property (point-min) (point-max) tprop global))
+       ;; Set local values.
+       (while (re-search-forward property-re nil t)
+	 (when (org-at-property-p)
+	   (org-refresh-property tprop (org-entry-get (point) dprop) inherit?))
+	 (outline-next-heading))))))
+
+(defun org-refresh-property (tprop p &optional inherit)
   "Refresh the buffer text property TPROP from the drawer property P.
-The refresh happens only for the current tree (not subtree)."
+The refresh happens only for the current headline, or the whole
+sub-tree if optional argument INHERIT is non-nil."
   (unless (org-before-first-heading-p)
     (save-excursion
       (org-back-to-heading t)
-      (if (symbolp tprop)
-	  ;; TPROP is a text property symbol
-	  (put-text-property
-	   (point) (or (outline-next-heading) (point-max)) tprop p)
-	;; TPROP is an alist with (properties . function) elements
-	(dolist (al tprop)
-	  (save-excursion
-	    (put-text-property
-	     (line-beginning-position) (or (outline-next-heading) (point-max))
-	     (car al)
-	     (funcall (cdr al) p))))))))
+      (let ((start (point))
+	    (end (save-excursion
+		   (if inherit (org-end-of-subtree t t)
+		     (or (outline-next-heading) (point-max))))))
+	(if (symbolp tprop)
+	    ;; TPROP is a text property symbol.
+	    (put-text-property start end tprop p)
+	  ;; TPROP is an alist with (property . function) elements.
+	  (pcase-dolist (`(,prop . ,f) tprop)
+	    (put-text-property start end prop (funcall f p))))))))
 
 (defun org-refresh-category-properties ()
   "Refresh category text properties in the buffer."
@@ -11155,7 +11168,8 @@ of matched result, which is either `dedicated' or `fuzzy'."
   (let* ((case-fold-search t)
 	 (origin (point))
 	 (normalized (replace-regexp-in-string "\n[ \t]*" " " s))
-	 (words (org-split-string s "[ \t\n]+"))
+	 (starred (eq (string-to-char normalized) ?*))
+	 (words (split-string (if starred (substring s 1) s)))
 	 (s-multi-re (mapconcat #'regexp-quote words "[ \t]+\\(?:\n[ \t]*\\)?"))
 	 (s-single-re (mapconcat #'regexp-quote words "[ \t]+"))
 	 type)
@@ -11197,109 +11211,101 @@ of matched result, which is either `dedicated' or `fuzzy'."
       ;; Look for a regular expression.
       (funcall (if (derived-mode-p 'org-mode) #'org-occur #'org-do-occur)
 	       (match-string 1 s)))
-     ;; Fuzzy links.
-     (t
-      (let ((starred (eq (string-to-char normalized) ?*)))
-	(cond
-	 ;; Look for targets, only if not in a headline search.
-	 ((and (not starred)
-	       (let ((target (format "<<%s>>" s-multi-re)))
-		 (catch :target-match
-		   (goto-char (point-min))
-		   (while (re-search-forward target nil t)
-		     (backward-char)
-		     (let ((context (org-element-context)))
-		       (when (eq (org-element-type context) 'target)
-			 (setq type 'dedicated)
-			 (goto-char (org-element-property :begin context))
-			 (throw :target-match t))))
-		   nil))))
-	 ;; Look for elements named after S, only if not in a headline
-	 ;; search.
-	 ((and (not starred)
-	       (let ((name (format "^[ \t]*#\\+NAME: +%s[ \t]*$" s-single-re)))
-		 (catch :name-match
-		   (goto-char (point-min))
-		   (while (re-search-forward name nil t)
-		     (let ((element (org-element-at-point)))
-		       (when (equal (org-split-string
-				     (org-element-property :name element)
-				     "[ \t]+")
-				    words)
-			 (setq type 'dedicated)
-			 (beginning-of-line)
-			 (throw :name-match t))))
-		   nil))))
-	 ;; Regular text search.  Prefer headlines in Org mode
-	 ;; buffers.
-	 ((and (derived-mode-p 'org-mode)
-	       (let* ((wspace "[ \t]")
-		      (wspaceopt (concat wspace "*"))
-		      (cookie (concat "\\(?:"
-				      wspaceopt
-				      "\\[[0-9]*\\(?:%\\|/[0-9]*\\)\\]"
-				      wspaceopt
-				      "\\)"))
-		      (sep (concat "\\(?:\\(?:" wspace "\\|" cookie "\\)+\\)"))
-		      (title
-		       (format "\\(?:%s[ \t]+\\)?%s?%s%s?"
-			       org-comment-string
-			       sep
-			       (let ((re (mapconcat #'regexp-quote words sep)))
-				 (if starred (substring re 1) re))
-			       sep))
-		      (exact-title (format "\\`%s\\'" title))
-		      (re (concat org-outline-regexp-bol "+.*" title)))
-		 (goto-char (point-min))
-		 (catch :found
-		   (while (re-search-forward re nil t)
-		     (when (string-match-p exact-title (org-get-heading t t))
-		       (throw :found t)))
-		   nil)))
-	  (beginning-of-line)
-	  (setq type 'dedicated))
-	 ;; Offer to create non-existent headline depending on
-	 ;; `org-link-search-must-match-exact-headline'.
-	 ((and (derived-mode-p 'org-mode)
-	       (not org-link-search-inhibit-query)
-	       (eq org-link-search-must-match-exact-headline 'query-to-create)
-	       (yes-or-no-p "No match - create this as a new heading? "))
-	  (goto-char (point-max))
-	  (unless (bolp) (newline))
-	  (org-insert-heading nil t t)
-	  (insert s "\n")
-	  (beginning-of-line 0))
-	 ;; Only headlines are looked after.  No need to process
-	 ;; further: throw an error.
-	 ((and (derived-mode-p 'org-mode)
-	       (or starred org-link-search-must-match-exact-headline))
-	  (goto-char origin)
-	  (error "No match for fuzzy expression: %s" normalized))
-	 ;; Regular text search.
-	 ((catch :fuzzy-match
-	    (goto-char (point-min))
-	    (while (re-search-forward s-multi-re nil t)
-	      ;; Skip match if it contains AVOID-POS or it is included
-	      ;; in a link with a description but outside the
-	      ;; description.
-	      (unless (or (and avoid-pos
-			       (<= (match-beginning 0) avoid-pos)
-			       (> (match-end 0) avoid-pos))
-			  (and (save-match-data
-				 (org-in-regexp org-bracket-link-regexp))
-			       (match-beginning 3)
-			       (or (> (match-beginning 3) (point))
-				   (<= (match-end 3) (point)))
-			       (org-element-lineage
-				(save-match-data (org-element-context))
-				'(link) t)))
-		(goto-char (match-beginning 0))
-		(setq type 'fuzzy)
-		(throw :fuzzy-match t)))
-	    nil))
-	 ;; All failed.  Throw an error.
-	 (t (goto-char origin)
-	    (error "No match for fuzzy expression: %s" normalized))))))
+     ;; From here, we handle fuzzy links.
+     ;;
+     ;; Look for targets, only if not in a headline search.
+     ((and (not starred)
+	   (let ((target (format "<<%s>>" s-multi-re)))
+	     (catch :target-match
+	       (goto-char (point-min))
+	       (while (re-search-forward target nil t)
+		 (backward-char)
+		 (let ((context (org-element-context)))
+		   (when (eq (org-element-type context) 'target)
+		     (setq type 'dedicated)
+		     (goto-char (org-element-property :begin context))
+		     (throw :target-match t))))
+	       nil))))
+     ;; Look for elements named after S, only if not in a headline
+     ;; search.
+     ((and (not starred)
+	   (let ((name (format "^[ \t]*#\\+NAME: +%s[ \t]*$" s-single-re)))
+	     (catch :name-match
+	       (goto-char (point-min))
+	       (while (re-search-forward name nil t)
+		 (let ((element (org-element-at-point)))
+		   (when (equal words
+				(split-string
+				 (org-element-property :name element)))
+		     (setq type 'dedicated)
+		     (beginning-of-line)
+		     (throw :name-match t))))
+	       nil))))
+     ;; Regular text search.  Prefer headlines in Org mode buffers.
+     ;; Ignore COMMENT keyword, TODO keywords, priority cookies,
+     ;; statistics cookies and tags.
+     ((and (derived-mode-p 'org-mode)
+	   (let ((title-re
+		  (format "%s.*\\(?:%s[ \t]\\)?.*%s"
+			  org-outline-regexp-bol
+			  org-comment-string
+			  (mapconcat #'regexp-quote words ".+")))
+		 (cookie-re "\\[[0-9]*\\(?:%\\|/[0-9]*\\)\\]")
+		 (comment-re (format "\\`%s[ \t]+" org-comment-string)))
+	     (goto-char (point-min))
+	     (catch :found
+	       (while (re-search-forward title-re nil t)
+		 (when (equal words
+			      (split-string
+			       (replace-regexp-in-string
+				cookie-re ""
+				(replace-regexp-in-string
+				 comment-re "" (org-get-heading t t)))))
+		   (throw :found t)))
+	       nil)))
+      (beginning-of-line)
+      (setq type 'dedicated))
+     ;; Offer to create non-existent headline depending on
+     ;; `org-link-search-must-match-exact-headline'.
+     ((and (derived-mode-p 'org-mode)
+	   (not org-link-search-inhibit-query)
+	   (eq org-link-search-must-match-exact-headline 'query-to-create)
+	   (yes-or-no-p "No match - create this as a new heading? "))
+      (goto-char (point-max))
+      (unless (bolp) (newline))
+      (org-insert-heading nil t t)
+      (insert s "\n")
+      (beginning-of-line 0))
+     ;; Only headlines are looked after.  No need to process
+     ;; further: throw an error.
+     ((and (derived-mode-p 'org-mode)
+	   (or starred org-link-search-must-match-exact-headline))
+      (goto-char origin)
+      (error "No match for fuzzy expression: %s" normalized))
+     ;; Regular text search.
+     ((catch :fuzzy-match
+	(goto-char (point-min))
+	(while (re-search-forward s-multi-re nil t)
+	  ;; Skip match if it contains AVOID-POS or it is included in
+	  ;; a link with a description but outside the description.
+	  (unless (or (and avoid-pos
+			   (<= (match-beginning 0) avoid-pos)
+			   (> (match-end 0) avoid-pos))
+		      (and (save-match-data
+			     (org-in-regexp org-bracket-link-regexp))
+			   (match-beginning 3)
+			   (or (> (match-beginning 3) (point))
+			       (<= (match-end 3) (point)))
+			   (org-element-lineage
+			    (save-match-data (org-element-context))
+			    '(link) t)))
+	    (goto-char (match-beginning 0))
+	    (setq type 'fuzzy)
+	    (throw :fuzzy-match t)))
+	nil))
+     ;; All failed.  Throw an error.
+     (t (goto-char origin)
+	(error "No match for fuzzy expression: %s" normalized)))
     ;; Disclose surroundings of match, if appropriate.
     (when (and (derived-mode-p 'org-mode) (not stealth))
       (org-show-context 'link-search))
@@ -12455,7 +12461,7 @@ variable `org-mtags-prefer-muse-templates'."
 	  (list
 	   (string :tag "Key")
 	   (string :tag "Template")))
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "8.3"))
 
 (defun org-try-structure-completion ()
@@ -13072,7 +13078,7 @@ statistics everywhere."
 				 (and (member kwd org-done-keywords)
 				      (member kwd (cadr org-provide-todo-statistics))))))
 	    	    (setq cnt-all (1+ cnt-all))
-	    	  (and (eq org-provide-todo-statistics t)
+		  (and (eq org-provide-todo-statistics t)
 		       kwd
 		       (setq cnt-all (1+ cnt-all))))
 		(when (or (and (member org-provide-todo-statistics '(t all-headlines))
@@ -13311,9 +13317,11 @@ This function is run automatically after each state change to a DONE state."
       (when (eq org-log-repeat t) (setq org-log-repeat 'state))
       (let ((to-state (or (org-entry-get nil "REPEAT_TO_STATE" 'selective)
 			  org-todo-repeat-to-state)))
-	(unless (and to-state (member to-state org-todo-keywords-1))
-	  (setq to-state (if (eq interpret 'type) org-last-state head)))
-	(org-todo to-state))
+	(org-todo (cond ((and to-state (member to-state org-todo-keywords-1))
+			 to-state)
+			((eq interpret 'type) org-last-state)
+			(head)
+			(t 'none))))
       (when (or org-log-repeat (org-entry-get nil "CLOCK"))
 	(org-entry-put nil "LAST_REPEAT" (format-time-string
 					  (org-time-stamp-format t t))))
@@ -13331,77 +13339,81 @@ This function is run automatically after each state change to a DONE state."
 			     org-log-repeat)))
       (org-back-to-heading t)
       (org-add-planning-info nil nil 'closed)
-      (let ((end (save-excursion (outline-next-heading) (point))))
+      (let ((end (save-excursion (outline-next-heading) (point)))
+	    (planning-re (regexp-opt
+			  (list org-scheduled-string org-deadline-string))))
 	(while (re-search-forward org-ts-regexp end t)
-	  (when (save-match-data
-		  (or (org-at-planning-p)
-		      (org-at-property-p)
-		      (eq (org-element-type (save-excursion
-					      (backward-char)
-					      (org-element-context)))
-			  'timestamp)))
-	    (let ((type (cond ((match-end 1) org-scheduled-string)
-			      ((match-end 3) org-deadline-string)
-			      (t "Plain:")))
-		  (ts (or (match-string 2) (match-string 4) (match-string 0))))
-	      (cond
-	       ((not
-		 (string-match "\\([.+]\\)?\\(\\+[0-9]+\\)\\([hdwmy]\\)" ts))
-		;; Time-stamps without a repeater are usually skipped.
-		;; However, a SCHEDULED time-stamp without one is
-		;; removed, as it is considered as no longer relevant.
-		(when (equal type org-scheduled-string)
-		  (org-remove-timestamp-with-keyword type)))
-	       (t
-		(let ((n (string-to-number (match-string 2 ts)))
-		      (what (match-string 3 ts)))
-		  (when (equal what "w") (setq n (* n 7) what "d"))
-		  (when (and (equal what "h")
-			     (not (string-match-p "[0-9]\\{1,2\\}:[0-9]\\{2\\}"
-						  ts)))
-		    (user-error
-		     "Cannot repeat in Repeat in %d hour(s) because no hour \
+	  (let* ((ts (match-string 0))
+		 (planning? (org-at-planning-p))
+		 (type (if (not planning?) "Plain:"
+			 (save-excursion
+			   (re-search-backward
+			    planning-re (line-beginning-position) t)
+			   (match-string 0)))))
+	    (cond
+	     ;; Ignore fake time-stamps (e.g., within comments).
+	     ((and (not planning?)
+		   (not (org-at-property-p))
+		   (not (eq 'timestamp
+			    (org-element-type (save-excursion
+						(backward-char)
+						(org-element-context)))))))
+	     ;; Time-stamps without a repeater are usually skipped.
+	     ;; However, a SCHEDULED time-stamp without one is
+	     ;; removed, as it is considered as no longer relevant.
+	     ((not (string-match "\\([.+]\\)?\\(\\+[0-9]+\\)\\([hdwmy]\\)" ts))
+	      (when (equal type org-scheduled-string)
+		(org-remove-timestamp-with-keyword type)))
+	     (t
+	      (let ((n (string-to-number (match-string 2 ts)))
+		    (what (match-string 3 ts)))
+		(when (equal what "w") (setq n (* n 7) what "d"))
+		(when (and (equal what "h")
+			   (not (string-match-p "[0-9]\\{1,2\\}:[0-9]\\{2\\}"
+						ts)))
+		  (user-error
+		   "Cannot repeat in Repeat in %d hour(s) because no hour \
 has been set"
-		     n))
-		  ;; Preparation, see if we need to modify the start
-		  ;; date for the change.
-		  (when (match-end 1)
-		    (let ((time (save-match-data (org-time-string-to-time ts))))
-		      (cond
-		       ((equal (match-string 1 ts) ".")
-			;; Shift starting date to today
-			(org-timestamp-change
-			 (- (org-today) (time-to-days time))
-			 'day))
-		       ((equal (match-string 1 ts) "+")
-			(let ((nshiftmax 10)
-			      (nshift 0))
-			  (while (or (= nshift 0)
-				     (not (time-less-p (current-time) time)))
-			    (when (= (cl-incf nshift) nshiftmax)
-			      (or (y-or-n-p
-				   (format "%d repeater intervals were not \
+		   n))
+		;; Preparation, see if we need to modify the start
+		;; date for the change.
+		(when (match-end 1)
+		  (let ((time (save-match-data (org-time-string-to-time ts))))
+		    (cond
+		     ((equal (match-string 1 ts) ".")
+		      ;; Shift starting date to today
+		      (org-timestamp-change
+		       (- (org-today) (time-to-days time))
+		       'day))
+		     ((equal (match-string 1 ts) "+")
+		      (let ((nshiftmax 10)
+			    (nshift 0))
+			(while (or (= nshift 0)
+				   (not (time-less-p (current-time) time)))
+			  (when (= (cl-incf nshift) nshiftmax)
+			    (or (y-or-n-p
+				 (format "%d repeater intervals were not \
 enough to shift date past today.  Continue? "
-					   nshift))
-				  (user-error "Abort")))
-			    (org-timestamp-change n (cdr (assoc what whata)))
-			    (org-at-timestamp-p t)
-			    (setq ts (match-string 1))
-			    (setq time
-				  (save-match-data
-				    (org-time-string-to-time ts)))))
-			(org-timestamp-change (- n) (cdr (assoc what whata)))
-			;; Rematch, so that we have everything in
-			;; place for the real shift.
-			(org-at-timestamp-p t)
-			(setq ts (match-string 1))
-			(string-match "\\([.+]\\)?\\(\\+[0-9]+\\)\\([hdwmy]\\)"
-				      ts)))))
-		  (save-excursion
-		    (org-timestamp-change n (cdr (assoc what whata)) nil t))
-		  (setq msg
-			(concat
-			 msg type " " org-last-changed-timestamp " ")))))))))
+					 nshift))
+				(user-error "Abort")))
+			  (org-timestamp-change n (cdr (assoc what whata)))
+			  (org-at-timestamp-p t)
+			  (setq ts (match-string 1))
+			  (setq time
+				(save-match-data
+				  (org-time-string-to-time ts)))))
+		      (org-timestamp-change (- n) (cdr (assoc what whata)))
+		      ;; Rematch, so that we have everything in place
+		      ;; for the real shift.
+		      (org-at-timestamp-p t)
+		      (setq ts (match-string 1))
+		      (string-match "\\([.+]\\)?\\(\\+[0-9]+\\)\\([hdwmy]\\)"
+				    ts)))))
+		(save-excursion
+		  (org-timestamp-change n (cdr (assoc what whata)) nil t))
+		(setq msg
+		      (concat
+		       msg type " " org-last-changed-timestamp " "))))))))
       (setq org-log-post-message msg)
       (message "%s" msg))))
 
@@ -13430,6 +13442,83 @@ of `org-todo-keywords-1'."
     (message "%d TODO entries found"
 	     (org-occur (concat "^" org-outline-regexp " *" kwd-re )))))
 
+(defun org--deadline-or-schedule (arg type time)
+  "Insert DEADLINE or SCHEDULE information in current entry.
+TYPE is either `deadline' or `scheduled'.  See `org-deadline' or
+`org-schedule' for information about ARG and TIME arguments."
+  (let* ((deadline? (eq type 'deadline))
+	 (keyword (if deadline? org-deadline-string org-scheduled-string))
+	 (log (if deadline? org-log-redeadline org-log-reschedule))
+	 (old-date (org-entry-get nil (if deadline? "DEADLINE" "SCHEDULED")))
+	 (old-date-time (and old-date (org-time-string-to-time old-date)))
+	 ;; Save repeater cookie from either TIME or current scheduled
+	 ;; time stamp.  We are going to insert it back at the end of
+	 ;; the process.
+	 (repeater (or (and (org-string-nw-p time)
+			    ;; We use `org-repeat-re' because we need
+			    ;; to tell the difference between a real
+			    ;; repeater and a time delta, e.g. "+2d".
+			    (string-match org-repeat-re time)
+			    (match-string 1 time))
+		       (and (org-string-nw-p old-date)
+			    (string-match "\\([.+-]+[0-9]+[hdwmy]\
+\\(?:[/ ][-+]?[0-9]+[hdwmy]\\)?\\)"
+					  old-date)
+			    (match-string 1 old-date)))))
+    (pcase arg
+      (`(4)
+       (when (and old-date log)
+	 (org-add-log-setup (if deadline? 'deldeadline 'delschedule)
+			    nil old-date log))
+       (org-remove-timestamp-with-keyword keyword)
+       (message (if deadline? "Item no longer has a deadline."
+		  "Item is no longer scheduled.")))
+      (`(16)
+       (save-excursion
+	 (org-back-to-heading t)
+	 (let ((regexp (if deadline? org-deadline-time-regexp
+			 org-scheduled-time-regexp)))
+	   (if (not (re-search-forward regexp (line-end-position 2) t))
+	       (user-error (if deadline? "No deadline information to update"
+			     "No scheduled information to update"))
+	     (let* ((rpl0 (match-string 1))
+		    (rpl (replace-regexp-in-string " -[0-9]+[hdwmy]" "" rpl0))
+		    (msg (if deadline? "Warn starting from" "Delay until")))
+	       (replace-match
+		(concat keyword
+			" <" rpl
+			(format " -%dd"
+				(abs (- (time-to-days
+					 (save-match-data
+					   (org-read-date
+					    nil t nil msg old-date-time)))
+					(time-to-days old-date-time))))
+			">") t t))))))
+      (_
+       (org-add-planning-info type time 'closed)
+       (when (and old-date
+		  log
+		  (not (equal old-date org-last-inserted-timestamp)))
+	 (org-add-log-setup (if deadline? 'redeadline 'reschedule)
+			    org-last-inserted-timestamp
+			    old-date
+			    log))
+       (when repeater
+	 (save-excursion
+	   (org-back-to-heading t)
+	   (when (re-search-forward
+		  (concat keyword " " org-last-inserted-timestamp)
+		  (line-end-position 2)
+		  t)
+	     (goto-char (1- (match-end 0)))
+	     (insert " " repeater)
+	     (setq org-last-inserted-timestamp
+		   (concat (substring org-last-inserted-timestamp 0 -1)
+			   " " repeater
+			   (substring org-last-inserted-timestamp -1))))))
+       (message (if deadline? "Deadline on %s" "Scheduled to %s")
+		org-last-inserted-timestamp)))))
+
 (defun org-deadline (arg &optional time)
   "Insert the \"DEADLINE:\" string with a timestamp to make a deadline.
 With one universal prefix argument, remove any deadline from the item.
@@ -13438,66 +13527,14 @@ With argument TIME, set the deadline at the corresponding date.  TIME
 can either be an Org date like \"2011-07-24\" or a delta like \"+2d\"."
   (interactive "P")
   (if (and (org-region-active-p) org-loop-over-headlines-in-active-region)
-      (let ((cl (if (eq org-loop-over-headlines-in-active-region 'start-level)
-		    'region-start-level 'region))
-	    org-loop-over-headlines-in-active-region)
-	(org-map-entries
-	 `(org-deadline ',arg ,time)
-	 org-loop-over-headlines-in-active-region
-	 cl (when (outline-invisible-p) (org-end-of-subtree nil t))))
-    (let* ((old-date (org-entry-get nil "DEADLINE"))
-	   (old-date-time (when old-date (org-time-string-to-time old-date)))
-	   (repeater (and old-date
-			  (string-match
-			   "\\([.+-]+[0-9]+[hdwmy]\\(?:[/ ][-+]?[0-9]+[hdwmy]\\)?\\) ?"
-			   old-date)
-			  (match-string 1 old-date))))
-      (cond
-       ((equal arg '(4))
-	(when (and old-date org-log-redeadline)
-	  (org-add-log-setup 'deldeadline nil old-date org-log-redeadline))
-	(org-remove-timestamp-with-keyword org-deadline-string)
-	(message "Item no longer has a deadline."))
-       ((equal arg '(16))
-	(save-excursion
-	  (org-back-to-heading t)
-	  (if (re-search-forward
-	       org-deadline-time-regexp
-	       (save-excursion (outline-next-heading) (point)) t)
-	      (let* ((rpl0 (match-string 1))
-		     (rpl (replace-regexp-in-string " -[0-9]+[hdwmy]" "" rpl0)))
-		(replace-match
-		 (concat org-deadline-string
-			 " <" rpl
-			 (format " -%dd"
-				 (abs
-				  (- (time-to-days
-				      (save-match-data
-					(org-read-date nil t nil "Warn starting from" old-date-time)))
-				     (time-to-days old-date-time))))
-			 ">") t t))
-	    (user-error "No deadline information to update"))))
-       (t
-	(org-add-planning-info 'deadline time 'closed)
-	(when (and old-date
-		   org-log-redeadline
-		   (not (equal old-date org-last-inserted-timestamp)))
-	  (org-add-log-setup
-	   'redeadline org-last-inserted-timestamp old-date org-log-redeadline))
-	(when repeater
-	  (save-excursion
-	    (org-back-to-heading t)
-	    (when (re-search-forward (concat org-deadline-string " "
-					     org-last-inserted-timestamp)
-				     (save-excursion
-				       (outline-next-heading) (point)) t)
-	      (goto-char (1- (match-end 0)))
-	      (insert " " repeater)
-	      (setq org-last-inserted-timestamp
-		    (concat (substring org-last-inserted-timestamp 0 -1)
-			    " " repeater
-			    (substring org-last-inserted-timestamp -1))))))
-	(message "Deadline on %s" org-last-inserted-timestamp))))))
+      (org-map-entries
+       (lambda () (org--deadline-or-schedule arg 'deadline time))
+       nil
+       (if (eq org-loop-over-headlines-in-active-region 'start-level)
+	   'region-start-level
+	 'region)
+       (lambda () (when (outline-invisible-p) (org-end-of-subtree nil t))))
+    (org--deadline-or-schedule arg 'deadline time)))
 
 (defun org-schedule (arg &optional time)
   "Insert the SCHEDULED: string with a timestamp to schedule a TODO item.
@@ -13507,67 +13544,14 @@ With argument TIME, scheduled at the corresponding date.  TIME can
 either be an Org date like \"2011-07-24\" or a delta like \"+2d\"."
   (interactive "P")
   (if (and (org-region-active-p) org-loop-over-headlines-in-active-region)
-      (let ((cl (if (eq org-loop-over-headlines-in-active-region 'start-level)
-		    'region-start-level 'region))
-	    org-loop-over-headlines-in-active-region)
-	(org-map-entries
-	 `(org-schedule ',arg ,time)
-	 org-loop-over-headlines-in-active-region
-	 cl (when (outline-invisible-p) (org-end-of-subtree nil t))))
-    (let* ((old-date (org-entry-get nil "SCHEDULED"))
-	   (old-date-time (when old-date (org-time-string-to-time old-date)))
-	   (repeater (and old-date
-			  (string-match
-			   "\\([.+-]+[0-9]+[hdwmy]\\(?:[/ ][-+]?[0-9]+[hdwmy]\\)?\\) ?"
-			   old-date)
-			  (match-string 1 old-date))))
-      (cond
-       ((equal arg '(4))
-	(progn
-	  (when (and old-date org-log-reschedule)
-	    (org-add-log-setup 'delschedule nil old-date org-log-reschedule))
-	  (org-remove-timestamp-with-keyword org-scheduled-string)
-	  (message "Item is no longer scheduled.")))
-       ((equal arg '(16))
-	(save-excursion
-	  (org-back-to-heading t)
-	  (if (re-search-forward
-	       org-scheduled-time-regexp
-	       (save-excursion (outline-next-heading) (point)) t)
-	      (let* ((rpl0 (match-string 1))
-		     (rpl (replace-regexp-in-string " -[0-9]+[hdwmy]" "" rpl0)))
-		(replace-match
-		 (concat org-scheduled-string
-			 " <" rpl
-			 (format " -%dd"
-				 (abs
-				  (- (time-to-days
-				      (save-match-data
-					(org-read-date nil t nil "Delay until" old-date-time)))
-				     (time-to-days old-date-time))))
-			 ">") t t))
-	    (user-error "No scheduled information to update"))))
-       (t
-	(org-add-planning-info 'scheduled time 'closed)
-	(when (and old-date
-		   org-log-reschedule
-		   (not (equal old-date org-last-inserted-timestamp)))
-	  (org-add-log-setup
-	   'reschedule org-last-inserted-timestamp old-date org-log-reschedule))
-	(when repeater
-	  (save-excursion
-	    (org-back-to-heading t)
-	    (when (re-search-forward (concat org-scheduled-string " "
-					     org-last-inserted-timestamp)
-				     (save-excursion
-				       (outline-next-heading) (point)) t)
-	      (goto-char (1- (match-end 0)))
-	      (insert " " repeater)
-	      (setq org-last-inserted-timestamp
-		    (concat (substring org-last-inserted-timestamp 0 -1)
-			    " " repeater
-			    (substring org-last-inserted-timestamp -1))))))
-	(message "Scheduled to %s" org-last-inserted-timestamp))))))
+      (org-map-entries
+       (lambda () (org--deadline-or-schedule arg 'scheduled time))
+       nil
+       (if (eq org-loop-over-headlines-in-active-region 'start-level)
+	   'region-start-level
+	 'region)
+       (lambda () (when (outline-invisible-p) (org-end-of-subtree nil t))))
+    (org--deadline-or-schedule arg 'scheduled time)))
 
 (defun org-get-scheduled-time (pom &optional inherit)
   "Get the scheduled time as a time tuple, of a format suitable
@@ -13910,7 +13894,10 @@ EXTRA is additional text that will be inserted into the notes buffer."
 	 ;; Find location for the new note.
 	 (goto-char org-log-note-marker)
 	 (set-marker org-log-note-marker nil)
-	 (goto-char (org-log-beginning t))
+	 ;; Note associated to a clock is to be located right after
+	 ;; the clock.  Do not move point.
+	 (unless (eq org-log-note-purpose 'clock-out)
+	   (goto-char (org-log-beginning t)))
 	 ;; Make sure point is at the beginning of an empty line.
 	 (cond ((not (bolp)) (let ((inhibit-read-only t)) (insert "\n")))
 	       ((looking-at "[ \t]*\\S-") (save-excursion (insert "\n"))))
@@ -15191,7 +15178,10 @@ When JUST-ALIGN is non-nil, only align tags."
 	      ;; white spaces.
 	      (end-of-line)
 	      (if (not (equal tags ""))
-		  (insert " " tags)
+		  ;; When text is being inserted on an invisible
+		  ;; region boundary, it can be inadvertently sucked
+		  ;; into invisibility.
+		  (outline-flag-region (point) (progn (insert " " tags) (point)) nil)
 		(skip-chars-backward " \t")
 		(delete-region (point) (line-end-position)))))
 	  ;; Align tags, if any.  Fix tags column if `org-indent-mode'
@@ -15970,12 +15960,11 @@ strings."
 		;; First look for timestamps within headline.
 		(let ((ts (funcall find-ts (line-end-position) nil)))
 		  (if (= (length ts) 2) (setq props (nconc ts props))
-		    (forward-line)
 		    ;; Then find timestamps in the section, skipping
 		    ;; planning line.
-		    (when (looking-at-p org-planning-line-re)
-		      (forward-line))
 		    (let ((end (save-excursion (outline-next-heading))))
+		      (forward-line)
+		      (when (looking-at-p org-planning-line-re) (forward-line))
 		      (setq props (nconc (funcall find-ts end ts) props))))))))
 	  ;; Get the standard properties, like :PROP:.
 	  (when (memq which '(nil all standard))
@@ -16015,7 +16004,7 @@ strings."
 	  ;; Return value.
 	  props)))))
 
-(defun org-property--local-values (property literal-nil)
+(defun org--property-local-values (property literal-nil)
   "Return value for PROPERTY in current entry.
 Value is a list whose car is the base value for PROPERTY and cdr
 a list of accumulated values.  Return nil if neither is found in
@@ -16040,6 +16029,17 @@ unless LITERAL-NIL is non-nil."
 	;; Return final values.
 	(and (not (equal value '(nil))) (nreverse value))))))
 
+(defun org--property-global-value (property literal-nil)
+  "Return value for PROPERTY in current buffer.
+Return value is a string.  Return nil if property is not set
+globally.  Also return nil when PROPERTY is set to \"nil\",
+unless LITERAL-NIL is non-nil."
+  (let ((global
+	 (cdr (or (assoc-string property org-file-properties t)
+		  (assoc-string property org-global-properties t)
+		  (assoc-string property org-global-properties-fixed t)))))
+    (if literal-nil global (org-not-nil global))))
+
 (defun org-entry-get (pom property &optional inherit literal-nil)
   "Get value of PROPERTY for entry or content at point-or-marker POM.
 
@@ -16067,7 +16067,7 @@ value higher up the hierarchy."
 	   (or (not (eq inherit 'selective)) (org-property-inherit-p property)))
       (org-entry-get-with-inheritance property literal-nil))
      (t
-      (let* ((local (org-property--local-values property literal-nil))
+      (let* ((local (org--property-local-values property literal-nil))
 	     (value (and local (mapconcat #'identity (delq nil local) " "))))
 	(if literal-nil value (org-not-nil value)))))))
 
@@ -16083,24 +16083,22 @@ If yes, return this value.  If not, return the current value of the variable."
   "Delete PROPERTY from entry at point-or-marker POM.
 Accumulated properties, i.e. PROPERTY+, are also removed.  Return
 non-nil when a property was removed."
-  (unless (member property org-special-properties)
-    (org-with-point-at pom
-      (let ((range (org-get-property-block)))
-	(when range
-	  (let* ((begin (car range))
-		 (origin (cdr range))
-		 (end (copy-marker origin))
-		 (re (org-re-property
-		      (concat (regexp-quote property) "\\+?") t t)))
-	    (goto-char begin)
-	    (while (re-search-forward re end t)
-	      (delete-region (match-beginning 0) (line-beginning-position 2)))
-	    ;; If drawer is empty, remove it altogether.
-	    (when (= begin end)
-	      (delete-region (line-beginning-position 0)
-			     (line-beginning-position 2)))
-	    ;; Return non-nil if some property was removed.
-	    (prog1 (/= end origin) (set-marker end nil))))))))
+  (org-with-point-at pom
+    (pcase (org-get-property-block)
+      (`(,begin . ,origin)
+       (let* ((end (copy-marker origin))
+	      (re (org-re-property
+		   (concat (regexp-quote property) "\\+?") t t)))
+	 (goto-char begin)
+	 (while (re-search-forward re end t)
+	   (delete-region (match-beginning 0) (line-beginning-position 2)))
+	 ;; If drawer is empty, remove it altogether.
+	 (when (= begin end)
+	   (delete-region (line-beginning-position 0)
+			  (line-beginning-position 2)))
+	 ;; Return non-nil if some property was removed.
+	 (prog1 (/= end origin) (set-marker end nil))))
+      (_ nil))))
 
 ;; Multi-values properties are properties that contain multiple values
 ;; These values are assumed to be single words, separated by whitespace.
@@ -16181,7 +16179,7 @@ However, if LITERAL-NIL is set, return the string value \"nil\" instead."
    (let (value)
      (catch 'exit
        (while t
-	 (let ((v (org-property--local-values property literal-nil)))
+	 (let ((v (org--property-local-values property literal-nil)))
 	   (when v
 	     (setq value
 		   (concat (mapconcat #'identity (delq nil v) " ")
@@ -16194,10 +16192,7 @@ However, if LITERAL-NIL is set, return the string value \"nil\" instead."
 	     (throw 'exit nil))
 	    ((org-up-heading-safe))
 	    (t
-	     (let ((global
-		    (cdr (or (assoc-string property org-file-properties t)
-			     (assoc-string property org-global-properties t)
-			     (assoc-string property org-global-properties-fixed t)))))
+	     (let ((global (org--property-global-value property literal-nil)))
 	       (cond ((not global))
 		     (value (setq value (concat global " " value)))
 		     (t (setq value global))))
@@ -17802,7 +17797,7 @@ days in order to avoid rounding problems."
 
 (org-define-error 'org-diary-sexp-no-match "Unable to match diary sexp")
 
-(defun org-time-string-to-absolute (s &optional daynr prefer show-all buffer pos)
+(defun org-time-string-to-absolute (s &optional daynr prefer buffer pos)
   "Convert time stamp S to an absolute day number.
 
 If DAYNR in non-nil, and there is a specifier for a cyclic time
@@ -17826,7 +17821,7 @@ signalled."
 	      (match-string 1 s) "" (calendar-gregorian-from-absolute daynr)))
 	daynr
       (signal 'org-diary-sexp-no-match (list s))))
-   ((and daynr show-all) (org-closest-date s daynr prefer))
+   (daynr (org-closest-date s daynr prefer))
    (t (time-to-days
        (condition-case errdata
 	   (apply #'encode-time (org-parse-time-string s))
@@ -18124,7 +18119,7 @@ INACTIVE-OK."
 (defun org-at-clock-log-p nil
   "Is the cursor on the clock log line?"
   (save-excursion
-    (move-beginning-of-line 1)
+    (beginning-of-line)
     (looking-at org-clock-line-re)))
 
 (defvar org-clock-history)                     ; defined in org-clock.el
@@ -18370,7 +18365,7 @@ minutes.
 For example, if the value of this variable is ((\"hours\" . 60)), then an
 effort string \"2hours\" is equivalent to 120 minutes."
   :group 'org-agenda
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "8.3")
   :type '(alist :key-type (string :tag "Modifier")
 		:value-type (number :tag "Minutes")))
@@ -18532,7 +18527,7 @@ The value is a list, with zero or more of the symbols `effort', `appt',
 	      (const appt)
 	      (const stats)
 	      (const category))
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "8.3")
   :group 'org-agenda)
 
@@ -19385,12 +19380,9 @@ inspection."
 	    (with-current-buffer (find-file-noselect tmp-out-file t)
 	      (goto-char (point-min))
 	      (when (re-search-forward
-		     (concat
-		      (regexp-quote
-		       "<math xmlns=\"http://www.w3.org/1998/Math/MathML\"")
-		      "[^>]*?>"
-		      "\\(.\\|\n\\)*"
-		      "</math>")
+		     (format "<math[^>]*?%s[^>]*?>\\(.\\|\n\\)*</math>"
+			     (regexp-quote
+			      "xmlns=\"http://www.w3.org/1998/Math/MathML\""))
 		     nil t)
 		(prog1 (match-string 0) (kill-buffer))))))
     (cond
@@ -19438,31 +19430,10 @@ inspection."
       ;; Failed conversion.  Return the LaTeX fragment verbatim
       latex-frag)))
 
-(declare-function org-export-get-backend "ox" (name))
-(declare-function org-export--get-global-options "ox" (&optional backend))
-(declare-function org-export--get-inbuffer-options "ox" (&optional backend))
-(declare-function org-latex-guess-inputenc "ox-latex" (header))
-(declare-function org-latex-guess-babel-language "ox-latex" (header info))
-(defun org-create-formula--latex-header ()
-  "Return LaTeX header appropriate for previewing a LaTeX snippet."
-  (let ((info (org-combine-plists (org-export--get-global-options
-				   (org-export-get-backend 'latex))
-				  (org-export--get-inbuffer-options
-				   (org-export-get-backend 'latex)))))
-    (org-latex-guess-babel-language
-     (org-latex-guess-inputenc
-      (org-splice-latex-header
-       org-format-latex-header
-       org-latex-default-packages-alist
-       org-latex-packages-alist t
-       (plist-get info :latex-header)))
-     info)))
-
 (defun org--get-display-dpi ()
   "Get the DPI of the display.
-
-Assumes that the display has the same pixel width in the
-horizontal and vertical directions."
+The function assumes that the display has the same pixel width in
+the horizontal and vertical directions."
   (if (display-graphic-p)
       (round (/ (display-pixel-height)
 		(/ (display-mm-height) 25.4)))
@@ -19497,20 +19468,22 @@ a HTML file."
 	 (post-clean (or (plist-get processing-info :post-clean)
 			 '(".dvi" ".xdv" ".pdf" ".tex" ".aux" ".log"
 			   ".svg" ".png" ".jpg" ".jpeg" ".out")))
-	 (latex-header (or (plist-get processing-info :latex-header)
-			   (org-create-formula--latex-header)))
+	 (latex-header
+	  (or (plist-get processing-info :latex-header)
+	      (org-latex-make-preamble
+	       (org-export-get-environment (org-export-get-backend 'latex))
+	       org-format-latex-header)))
 	 (latex-compiler (plist-get processing-info :latex-compiler))
 	 (image-converter (plist-get processing-info :image-converter))
 	 (tmpdir temporary-file-directory)
 	 (texfilebase (make-temp-name
 		       (expand-file-name "orgtex" tmpdir)))
 	 (texfile (concat texfilebase ".tex"))
-	 (font-height (face-attribute 'default :height nil))
 	 (image-size-adjust (or (plist-get processing-info :image-size-adjust)
 				'(1.0 . 1.0)))
 	 (scale (* (if buffer (car image-size-adjust) (cdr image-size-adjust))
 		   (or (plist-get options (if buffer :scale :html-scale)) 1.0)))
-	 (dpi (* scale (floor (if buffer font-height 140.0))))
+	 (dpi (* scale (if buffer (org--get-display-dpi) 140.0)))
 	 (fg (or (plist-get options (if buffer :foreground :html-foreground))
 		 "Black"))
 	 (bg (or (plist-get options (if buffer :background :html-background))
@@ -21149,11 +21122,6 @@ This command does many different things, depending on context:
     (funcall org-finish-function))
    ((org-babel-hash-at-point))
    ((run-hook-with-args-until-success 'org-ctrl-c-ctrl-c-hook))
-   ((save-excursion (beginning-of-line) (looking-at-p "[ \t]*$"))
-    (or (run-hook-with-args-until-success 'org-ctrl-c-ctrl-c-final-hook)
-	(user-error
-	 (substitute-command-keys
-	  "`\\[org-ctrl-c-ctrl-c]' can do nothing useful here"))))
    (t
     (let* ((context
 	    (org-element-lineage
@@ -21161,8 +21129,8 @@ This command does many different things, depending on context:
 	     ;; Limit to supported contexts.
 	     '(babel-call clock dynamic-block footnote-definition
 			  footnote-reference inline-babel-call inline-src-block
-			  item keyword node-property paragraph plain-list
-			  property-drawer radio-target src-block
+			  inlinetask item keyword node-property paragraph
+			  plain-list property-drawer radio-target src-block
 			  statistics-cookie table table-cell table-row
 			  timestamp)
 	     t))
@@ -21177,7 +21145,21 @@ This command does many different things, depending on context:
 	    (setq context parent)
 	    (setq type 'item))))
       ;; Act according to type of element or object at point.
+      ;;
+      ;; Do nothing on a blank line, except if it is contained in
+      ;; a src block.  Hence, we first check if point is in such
+      ;; a block and then if it is at a blank line.
       (pcase type
+	((or `inline-src-block `src-block)
+	 (unless org-babel-no-eval-on-ctrl-c-ctrl-c
+	   (org-babel-eval-wipe-error-buffer)
+	   (org-babel-execute-src-block
+	    current-prefix-arg (org-babel-get-src-block-info nil context))))
+	((guard (org-match-line "[ \t]*$"))
+	 (or (run-hook-with-args-until-success 'org-ctrl-c-ctrl-c-final-hook)
+	     (user-error
+	      (substitute-command-keys
+	       "`\\[org-ctrl-c-ctrl-c]' can do nothing useful here"))))
 	((or `babel-call `inline-babel-call)
 	 (let ((info (org-babel-lob-get-info context)))
 	   (when info (org-babel-execute-src-block nil info))))
@@ -21193,11 +21175,6 @@ This command does many different things, depending on context:
 	((or `headline `inlinetask)
 	 (save-excursion (goto-char (org-element-property :begin context))
 			 (call-interactively #'org-set-tags)))
-	((or `inline-src-block `src-block)
-	 (unless org-babel-no-eval-on-ctrl-c-ctrl-c
-	   (org-babel-eval-wipe-error-buffer)
-	   (org-babel-execute-src-block
-	    current-prefix-arg (org-babel-get-src-block-info nil context))))
 	(`item
 	 ;; At an item: `C-u C-u' sets checkbox to "[-]"
 	 ;; unconditionally, whereas `C-u' will toggle its presence.
@@ -22764,18 +22741,21 @@ If PROCESS is a function, it is called with a single argument:
 the SOURCE file.
 
 If it is a list of commands, each of them is called using
-`shell-command'.  By default, in each command, %b, %f, %F and %o
-are replaced with, respectively, SOURCE base name, name, full
-name and directory.  It is possible, however, to use more
-place-holders by specifying them in optional argument SPEC, as an
-alist following the pattern (CHARACTER . REPLACEMENT-STRING).
+`shell-command'.  By default, in each command, %b, %f, %F, %o and
+%O are replaced with, respectively, SOURCE base name, name, full
+name, directory and absolute output file name.  It is possible,
+however, to use more place-holders by specifying them in optional
+argument SPEC, as an alist following the pattern
+
+  (CHARACTER . REPLACEMENT-STRING).
 
 When PROCESS is a list of commands, optional argument LOG-BUF can
 be set to a buffer or a buffer name.  `shell-command' then uses
 it for output."
   (let* ((base-name (file-name-base source))
 	 (full-name (file-truename source))
-	 (out-dir (file-name-directory source))
+	 (out-dir (or (file-name-directory source) "./"))
+	 (output (expand-file-name (concat base-name "." ext) out-dir))
 	 (time (current-time))
 	 (err-msg (if (stringp err-msg) (concat ".  " err-msg) "")))
     (save-window-excursion
@@ -22787,16 +22767,16 @@ it for output."
 			     `((?b . ,(shell-quote-argument base-name))
 			       (?f . ,(shell-quote-argument source))
 			       (?F . ,(shell-quote-argument full-name))
-			       (?o . ,(shell-quote-argument out-dir))))))
+			       (?o . ,(shell-quote-argument out-dir))
+			       (?O . ,(shell-quote-argument output))))))
 	   (dolist (command process)
 	     (shell-command (format-spec command spec) log-buf))))
 	(_ (error "No valid command to process %S%s" source err-msg))))
     ;; Check for process failure.  Output file is expected to be
     ;; located in the same directory as SOURCE.
-    (let ((output (expand-file-name (concat base-name "." ext) out-dir)))
-      (unless (org-file-newer-than-p output time)
-	(error (format "File %S wasn't produced%s" output err-msg)))
-      output)))
+    (unless (org-file-newer-than-p output time)
+      (error (format "File %S wasn't produced%s" output err-msg)))
+    output))
 
 ;;; Indentation
 
@@ -22822,7 +22802,7 @@ ELEMENT."
 	  (goto-char start)
 	  (org-get-indentation))))
       ((memq type '(headline inlinetask nil))
-       (if (save-excursion (beginning-of-line) (looking-at "[ \t]*$"))
+       (if (org-match-line "[ \t]*$")
 	   (org--get-expected-indentation element t)
 	 0))
       ((memq type '(diary-sexp footnote-definition)) 0)
@@ -22974,6 +22954,13 @@ Also align node properties according to `org-property-format'."
 		  (= (line-beginning-position)
 		     (org-element-property :post-affiliated element)))
 	     'noindent)
+	    ((and (eq type 'latex-environment)
+		  (>= (point) (org-element-property :post-affiliated element))
+		  (< (point) (org-with-wide-buffer
+			      (goto-char (org-element-property :end element))
+			      (skip-chars-backward " \r\t\n")
+			      (line-beginning-position 2))))
+	     'noindent)
 	    ((and (eq type 'src-block)
 		  org-src-tab-acts-natively
 		  (> (line-beginning-position)
@@ -23025,22 +23012,38 @@ assumed to be significant there."
 		 (element-end (copy-marker (org-element-property :end element)))
 		 (ind (org--get-expected-indentation element nil)))
 	    (cond
+	     ;; Element indented as a single block.  Example blocks
+	     ;; preserving indentation are a special case since the
+	     ;; "contents" must not be indented whereas the block
+	     ;; boundaries can.
+	     ((or (memq type '(export-block latex-environment))
+		  (and (eq type 'example-block)
+		       (not
+			(or org-src-preserve-indentation
+			    (org-element-property :preserve-indent element)))))
+	      (let ((offset (- ind (org-get-indentation))))
+		(unless (zerop offset)
+		  (indent-rigidly (org-element-property :begin element)
+				  (org-element-property :end element)
+				  offset)))
+	      (goto-char element-end))
+	     ;; Elements indented line wise.  Be sure to exclude
+	     ;; example blocks (preserving indentation) and source
+	     ;; blocks from this category as they are treated
+	     ;; specially later.
 	     ((or (memq type '(paragraph table table-row))
 		  (not (or (org-element-property :contents-begin element)
-			   (memq type
-				 '(example-block export-block src-block)))))
-	      ;; Elements here are indented as a single block.  Also
-	      ;; align node properties.
+			   (memq type '(example-block src-block)))))
 	      (when (eq type 'node-property)
 		(org--align-node-property)
 		(beginning-of-line))
 	      (funcall indent-to ind (min element-end end)))
+	     ;; Elements consisting of three parts: before the
+	     ;; contents, the contents, and after the contents.  The
+	     ;; contents are treated specially, according to the
+	     ;; element type, or not indented at all.  Other parts are
+	     ;; indented as a single block.
 	     (t
-	      ;; Elements in this category consist of three parts:
-	      ;; before the contents, the contents, and after the
-	      ;; contents.  The contents are treated specially,
-	      ;; according to the element type, or not indented at
-	      ;; all.  Other parts are indented as a single block.
 	      (let* ((post (copy-marker
 			    (org-element-property :post-affiliated element)))
 		     (cbeg
@@ -23050,8 +23053,7 @@ assumed to be significant there."
 			 ;; Fake contents for source blocks.
 			 (org-with-wide-buffer
 			  (goto-char post)
-			  (forward-line)
-			  (point)))
+			  (line-beginning-position 2)))
 			((memq type '(footnote-definition item plain-list))
 			 ;; Contents in these elements could start on
 			 ;; the same line as the beginning of the
@@ -23085,7 +23087,7 @@ assumed to be significant there."
 		      (t (funcall indent-to ind (min cbeg end))))
 		(when (< (point) end)
 		  (cl-case type
-		    ((example-block export-block verse-block))
+		    ((example-block verse-block))
 		    (src-block
 		     ;; In a source block, indent source code
 		     ;; according to language major mode, but only if
@@ -24688,34 +24690,41 @@ Move to the previous element at the same level, when possible."
 (defun org-drag-element-backward ()
   "Move backward element at point."
   (interactive)
-  (if (org-with-limited-levels (org-at-heading-p)) (org-move-subtree-up)
-    (let* ((elem (org-element-at-point))
-	   (prev-elem
-	    (save-excursion
-	      (goto-char (org-element-property :begin elem))
-	      (skip-chars-backward " \r\t\n")
-	      (unless (bobp)
-		(let* ((beg (org-element-property :begin elem))
-		       (prev (org-element-at-point))
-		       (up prev))
-		  (while (and (setq up (org-element-property :parent up))
-			      (<= (org-element-property :end up) beg))
-		    (setq prev up))
-		  prev)))))
-      ;; Error out if no previous element or previous element is
-      ;; a parent of the current one.
-      (if (or (not prev-elem) (org-element-nested-p elem prev-elem))
-	  (user-error "Cannot drag element backward")
-	(let ((pos (point)))
-	  (org-element-swap-A-B prev-elem elem)
-	  (goto-char (+ (org-element-property :begin prev-elem)
-			(- pos (org-element-property :begin elem)))))))))
+  (let ((elem (or (org-element-at-point)
+		  (user-error "No element at point"))))
+    (if (eq (org-element-type elem) 'headline)
+	;; Preserve point when moving a whole tree, even if point was
+	;; on blank lines below the headline.
+	(let ((offset (skip-chars-backward " \t\n")))
+	  (unwind-protect (org-move-subtree-up)
+	    (forward-char (- offset))))
+      (let ((prev-elem
+	     (save-excursion
+	       (goto-char (org-element-property :begin elem))
+	       (skip-chars-backward " \r\t\n")
+	       (unless (bobp)
+		 (let* ((beg (org-element-property :begin elem))
+			(prev (org-element-at-point))
+			(up prev))
+		   (while (and (setq up (org-element-property :parent up))
+			       (<= (org-element-property :end up) beg))
+		     (setq prev up))
+		   prev)))))
+	;; Error out if no previous element or previous element is
+	;; a parent of the current one.
+	(if (or (not prev-elem) (org-element-nested-p elem prev-elem))
+	    (user-error "Cannot drag element backward")
+	  (let ((pos (point)))
+	    (org-element-swap-A-B prev-elem elem)
+	    (goto-char (+ (org-element-property :begin prev-elem)
+			  (- pos (org-element-property :begin elem))))))))))
 
 (defun org-drag-element-forward ()
   "Move forward element at point."
   (interactive)
   (let* ((pos (point))
-	 (elem (org-element-at-point)))
+	 (elem (or (org-element-at-point)
+		   (user-error "No element at point"))))
     (when (= (point-max) (org-element-property :end elem))
       (user-error "Cannot drag element forward"))
     (goto-char (org-element-property :end elem))
diff --git a/elpa/org-20161118/orgcard.pdf b/elpa/org-20170210/orgcard.pdf
similarity index 60%
rename from elpa/org-20161118/orgcard.pdf
rename to elpa/org-20170210/orgcard.pdf
index 07c4534390c14a3f67b7293972c3972f318c2038..0d266a59681bf3b08bb3153551997422dc3c0c80 100644
GIT binary patch
delta 47548
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

delta 46451
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

diff --git a/elpa/org-20161118/ox-ascii.el b/elpa/org-20170210/ox-ascii.el
similarity index 95%
rename from elpa/org-20161118/ox-ascii.el
rename to elpa/org-20170210/ox-ascii.el
index 43808aa0..2a129e9d 100644
--- a/elpa/org-20161118/ox-ascii.el
+++ b/elpa/org-20170210/ox-ascii.el
@@ -1,6 +1,6 @@
 ;;; ox-ascii.el --- ASCII Back-End for Org Export Engine -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2012-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2017 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Goaziou <n.goaziou at gmail dot com>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -188,7 +188,7 @@ This margin is applied on both sides of the text."
 This margin applies to top level list only, not to its
 sub-lists."
   :group 'org-export-ascii
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "8.3")
   :type 'integer)
 
@@ -896,41 +896,71 @@ is a plist used as a communication channel."
 			     (car (org-element-contents element))))
 	'link unique-link-p info nil 'headline t)))
 
+(defun org-ascii--describe-datum (datum info)
+  "Describe DATUM object or element.
+If DATUM is a string, consider it to be a file name, per
+`org-export-resolve-id-link'.  INFO is the communication channel,
+as a plist."
+  (pcase (org-element-type datum)
+    (`plain-text (format "See file %s" datum)) ;External file
+    (`headline
+     (format (org-ascii--translate "See section %s" info)
+	     (if (org-export-numbered-headline-p datum info)
+		 (mapconcat #'number-to-string
+			    (org-export-get-headline-number datum info)
+			    ".")
+	       (org-export-data (org-element-property :title datum) info))))
+    (_
+     (let ((number (org-export-get-ordinal
+		    datum info nil #'org-ascii--has-caption-p))
+	   ;; If destination is a target, make sure we can name the
+	   ;; container it refers to.
+	   (enumerable
+	    (org-element-lineage datum '(headline paragrah src-block table) t)))
+       (pcase (org-element-type enumerable)
+	 (`headline
+	  (format (org-ascii--translate "See section %s" info)
+		  (if (org-export-numbered-headline-p enumerable info)
+		      (mapconcat #'number-to-string number ".")
+		    (org-export-data
+		     (org-element-property :title enumerable) info))))
+	 ((guard (not number))
+	  (org-ascii--translate "Unknown reference" info))
+	 (`paragraph
+	  (format (org-ascii--translate "See figure %s" info) number))
+	 (`src-block
+	  (format (org-ascii--translate "See listing %s" info) number))
+	 (`table
+	  (format (org-ascii--translate "See table %s" info) number))
+	 (_ (org-ascii--translate "Unknown reference" info)))))))
+
 (defun org-ascii--describe-links (links width info)
   "Return a string describing a list of links.
-
 LINKS is a list of link type objects, as returned by
 `org-ascii--unique-links'.  WIDTH is the text width allowed for
 the output string.  INFO is a plist used as a communication
 channel."
   (mapconcat
    (lambda (link)
-     (let ((type (org-element-property :type link))
-	   (anchor (let ((desc (org-element-contents link)))
-		     (if desc (org-export-data desc info)
-		       (org-element-property :raw-link link)))))
+     (let* ((type (org-element-property :type link))
+	    (description (org-element-contents link))
+	    (anchor (org-export-data
+		     (or description (org-element-property :raw-link link))
+		     info)))
        (cond
-	;; Coderefs, radio links and fuzzy links are ignored.
-	((member type '("coderef" "radio" "fuzzy")) nil)
-	;; Id and custom-id links: Headlines refer to their numbering.
-	((member type '("custom-id" "id"))
-	 (let ((dest (org-export-resolve-id-link link info)))
-	   (concat
-	    (org-ascii--fill-string
-	     (format
-	      "[%s] %s"
-	      anchor
-	      (if (stringp dest)	; External file.
-		  dest
-		(format
-		 (org-ascii--translate "See section %s" info)
-		 (if (org-export-numbered-headline-p dest info)
-		     (mapconcat #'number-to-string
-				(org-export-get-headline-number dest info)
-				".")
-		   (org-export-data (org-element-property :title dest) info)))))
-	     width info)
-	    "\n\n")))
+	((member type '("coderef" "radio")) nil)
+	((member type '("custom-id" "fuzzy" "id"))
+	 ;; Only links with a description need an entry.  Other are
+	 ;; already handled in `org-ascii-link'.
+	 (when description
+	   (let ((dest (if (equal type "fuzzy")
+			   (org-export-resolve-fuzzy-link link info)
+			 (org-export-resolve-id-link link info))))
+	     (concat
+	      (org-ascii--fill-string
+	       (format "[%s] %s" anchor (org-ascii--describe-datum dest info))
+	       width info)
+	      "\n\n"))))
 	;; Do not add a link that cannot be resolved and doesn't have
 	;; any description: destination is already visible in the
 	;; paragraph.
@@ -1541,24 +1571,33 @@ INFO is a plist holding contextual information."
      ;; Do not apply a special syntax on radio links.  Though, use
      ;; transcoded target's contents as output.
      ((string= type "radio") desc)
-     ;; Do not apply a special syntax on fuzzy links pointing to
-     ;; targets.
-     ((string= type "fuzzy")
-      (let ((destination (org-export-resolve-fuzzy-link link info)))
-	(if (org-string-nw-p desc) desc
-	  (when destination
-	    (let ((number
-		   (org-export-get-ordinal
-		    destination info nil 'org-ascii--has-caption-p)))
-	      (if number
-		  (if (atom number) (number-to-string number)
-		    (mapconcat #'number-to-string number "."))
-		;; Unnumbered headline.
-		(when (eq 'headline (org-element-type destination))
-		  (format "[%s]"
-			  (org-export-data
-			   (org-element-property :title destination)
-			   info)))))))))
+     ((member type '("custom-id" "fuzzy" "id"))
+      (let ((destination (if (string= type "fuzzy")
+			     (org-export-resolve-fuzzy-link link info)
+			   (org-export-resolve-id-link link info))))
+	(pcase (org-element-type destination)
+	  ((guard desc)
+	   (if (plist-get info :ascii-links-to-notes)
+	       (format "[%s]" desc)
+	     (concat desc
+		     (format " (%s)"
+			     (org-ascii--describe-datum destination info)))))
+	  ;; External file.
+	  (`plain-text destination)
+	  (`headline
+	   (if (org-export-numbered-headline-p destination info)
+	       (mapconcat #'number-to-string
+			  (org-export-get-headline-number destination info)
+			  ".")
+	     (org-export-data (org-element-property :title destination) info)))
+	  ;; Handle enumerable elements and targets within them.
+	  ((and (let number (org-export-get-ordinal
+			     destination info nil #'org-ascii--has-caption-p))
+		(guard number))
+	   (if (atom number) (number-to-string number)
+	     (mapconcat #'number-to-string number ".")))
+	  ;; Don't know what to do.  Signal it.
+	  (_ "???"))))
      (t
       (let ((raw-link (org-element-property :raw-link link)))
 	(if (not (org-string-nw-p desc)) (format "[%s]" raw-link)
diff --git a/elpa/org-20161118/ox-beamer.el b/elpa/org-20170210/ox-beamer.el
similarity index 95%
rename from elpa/org-20161118/ox-beamer.el
rename to elpa/org-20170210/ox-beamer.el
index c254c0b3..0cbe2c7e 100644
--- a/elpa/org-20161118/ox-beamer.el
+++ b/elpa/org-20170210/ox-beamer.el
@@ -1,6 +1,6 @@
 ;;; ox-beamer.el --- Beamer Back-End for Org Export Engine -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2007-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2017 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten.dominik AT gmail DOT com>
 ;;         Nicolas Goaziou <n.goaziou AT gmail DOT com>
@@ -140,7 +140,7 @@ You might want to put e.g. \"allowframebreaks=0.9\" here."
 The format string should have at most one \"%s\"-expression,
 which is replaced with the subtitle."
   :group 'org-export-beamer
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "8.3")
   :type '(string :tag "Format string"))
 
@@ -260,7 +260,6 @@ Return overlay specification, as a string, or nil."
 		     (link . org-beamer-link)
 		     (plain-list . org-beamer-plain-list)
 		     (radio-target . org-beamer-radio-target)
-		     (target . org-beamer-target)
 		     (template . org-beamer-template)))
 
 
@@ -720,46 +719,16 @@ channel."
   "Transcode a LINK object into Beamer code.
 CONTENTS is the description part of the link.  INFO is a plist
 used as a communication channel."
-  (let ((type (org-element-property :type link)))
-    (cond
-     ;; Link type is handled by a special function.
-     ((org-export-custom-protocol-maybe link contents 'beamer))
-     ;; Use \hyperlink command for all internal links.
-     ((equal type "radio")
-      (let ((destination (org-export-resolve-radio-link link info)))
-	(if (not destination) contents
-	  (format "\\hyperlink%s{%s}{%s}"
-		  (or (org-beamer--element-has-overlay-p link) "")
-		  (org-export-get-reference destination info)
-		  contents))))
-     ((and (member type '("custom-id" "fuzzy" "id"))
-	   (let ((destination (if (string= type "fuzzy")
-				  (org-export-resolve-fuzzy-link link info)
-				(org-export-resolve-id-link link info))))
-	     (cl-case (org-element-type destination)
-	       (headline
-		(let ((label
-		       (format "sec-%s"
-			       (mapconcat
-				'number-to-string
-				(org-export-get-headline-number
-				 destination info)
-				"-"))))
-		  (if (and (plist-get info :section-numbers) (not contents))
-		      (format "\\ref{%s}" label)
-		    (format "\\hyperlink%s{%s}{%s}"
-			    (or (org-beamer--element-has-overlay-p link) "")
-			    label
-			    contents))))
-	       (target
-		(let ((ref (org-export-get-reference destination info)))
-		  (if (not contents) (format "\\ref{%s}" ref)
-		    (format "\\hyperlink%s{%s}{%s}"
-			    (or (org-beamer--element-has-overlay-p link) "")
-			    ref
-			    contents))))))))
-     ;; Otherwise, use `latex' back-end.
-     (t (org-export-with-backend 'latex link contents info)))))
+  (or (org-export-custom-protocol-maybe link contents 'beamer)
+      ;; Fall-back to LaTeX export.  However, prefer "\hyperlink" over
+      ;; "\hyperref" since the former handles overlay specifications.
+      (let ((latex-link (org-export-with-backend 'latex link contents info)))
+	(if (string-match "\\`\\\\hyperref\\[\\(.*?\\)\\]" latex-link)
+	    (replace-match
+	     (format "\\\\hyperlink%s{\\1}"
+		     (or (org-beamer--element-has-overlay-p link) ""))
+	     nil nil latex-link)
+	  latex-link))))
 
 
 ;;;; Plain List
@@ -810,15 +779,6 @@ contextual information."
 	  text))
 
 
-;;;; Target
-
-(defun org-beamer-target (target _contents info)
-  "Transcode a TARGET object into Beamer code.
-CONTENTS is nil.  INFO is a plist holding contextual
-information."
-  (format "\\label{%s}" (org-export-get-reference target info)))
-
-
 ;;;; Template
 ;;
 ;; Template used is similar to the one used in `latex' back-end,
@@ -837,7 +797,7 @@ holding export options."
      ;; LaTeX compiler
      (org-latex--insert-compiler info)
      ;; Document class and packages.
-     (org-latex--make-preamble info)
+     (org-latex-make-preamble info)
      ;; Insert themes.
      (let ((format-theme
 	    (function
diff --git a/elpa/org-20161118/ox-html.el b/elpa/org-20170210/ox-html.el
similarity index 98%
rename from elpa/org-20161118/ox-html.el
rename to elpa/org-20170210/ox-html.el
index 404b62f8..0db5a66b 100644
--- a/elpa/org-20161118/ox-html.el
+++ b/elpa/org-20170210/ox-html.el
@@ -1,6 +1,6 @@
 ;;; ox-html.el --- HTML Back-End for Org Export Engine -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2011-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2017 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;;      Jambunathan K <kjambunathan at gmail dot com>
@@ -768,7 +768,7 @@ INFO      the export options (plist).
 
 The function result will be used in the section format string."
   :group 'org-export-html
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "8.3")
   :type 'function)
 
@@ -800,7 +800,7 @@ The function must accept seven parameters:
 
 The function should return the string to be exported."
   :group 'org-export-html
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "8.3")
   :type 'function)
 
@@ -1511,7 +1511,7 @@ The viewport meta tag is inserted if this variable is non-nil.
 See the following site for a reference:
 https://developer.mozilla.org/en-US/docs/Mozilla/Mobile/Viewport_meta_tag"
   :group 'org-export-html
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "8.3")
   :type '(choice (const :tag "Disable" nil)
 		 (list :tag "Enable"
@@ -1566,21 +1566,26 @@ INFO is the current state of the export process, as a plist."
        (org-html-html5-p info)))
 
 (defun org-html-close-tag (tag attr info)
-  (concat "<" tag " " attr
+  "Return close-tag for string TAG.
+ATTR specifies additional attributes.  INFO is a property list
+containing current export state."
+  (concat "<" tag
+	  (org-string-nw-p (concat " " attr))
 	  (if (org-html-xhtml-p info) " />" ">")))
 
 (defun org-html-doctype (info)
-  "Return correct html doctype tag from `org-html-doctype-alist',
-or the literal value of :html-doctype from INFO if :html-doctype
-is not found in the alist.
-INFO is a plist used as a communication channel."
+  "Return correct HTML doctype tag.
+INFO is a plist used as a communication channel.  Doctype tag is
+extracted from `org-html-doctype-alist', or the literal value
+of :html-doctype from INFO if :html-doctype is not found in the
+alist."
   (let ((dt (plist-get info :html-doctype)))
     (or (cdr (assoc dt org-html-doctype-alist)) dt)))
 
 (defun org-html--make-attribute-string (attributes)
   "Return a list of attributes, as a string.
-ATTRIBUTES is a plist where values are either strings or nil. An
-attributes with a nil value will be omitted from the result."
+ATTRIBUTES is a plist where values are either strings or nil.  An
+attribute with a nil value will be omitted from the result."
   (let (output)
     (dolist (item attributes (mapconcat 'identity (nreverse output) " "))
       (cond ((null item) (pop output))
@@ -1596,12 +1601,12 @@ INFO is a plist used as a communication channel.  When optional
 arguments CAPTION and LABEL are given, use them for caption and
 \"id\" attribute."
   (let ((html5-fancy (org-html--html5-fancy-p info)))
-    (format (if html5-fancy "\n<figure%s>%s%s\n</figure>"
-	      "\n<div%s class=\"figure\">%s%s\n</div>")
+    (format (if html5-fancy "\n<figure%s>\n%s%s\n</figure>"
+	      "\n<div%s class=\"figure\">\n%s%s\n</div>")
 	    ;; ID.
 	    (if (org-string-nw-p label) (format " id=\"%s\"" label) "")
 	    ;; Contents.
-	    (format "\n<p>%s</p>" contents)
+	    (if html5-fancy contents (format "<p>%s</p>" contents))
 	    ;; Caption.
 	    (if (not (org-string-nw-p caption)) ""
 	      (format (if html5-fancy "\n<figcaption>%s</figcaption>"
@@ -1875,25 +1880,24 @@ INFO is a plist used as a communication channel."
 	    (setq template (replace-match val t t template))))))))
 
 (defun org-html-format-spec (info)
-  "Return format specification for elements that can be
-used in the preamble or postamble."
-  `((?t . ,(org-export-data (plist-get info :title) info))
-    (?s . ,(org-export-data (plist-get info :subtitle) info))
-    (?d . ,(org-export-data (org-export-get-date info) info))
-    (?T . ,(format-time-string
-	    (plist-get info :html-metadata-timestamp-format)))
-    (?a . ,(org-export-data (plist-get info :author) info))
-    (?e . ,(mapconcat
-	    (lambda (e)
-	      (format "<a href=\"mailto:%s\">%s</a>" e e))
-	    (split-string (plist-get info :email)  ",+ *")
-	    ", "))
-    (?c . ,(plist-get info :creator))
-    (?C . ,(let ((file (plist-get info :input-file)))
-	     (format-time-string
-	      (plist-get info :html-metadata-timestamp-format)
-	      (when file (nth 5 (file-attributes file))))))
-    (?v . ,(or (plist-get info :html-validation-link) ""))))
+  "Return format specification for preamble and postamble.
+INFO is a plist used as a communication channel."
+  (let ((timestamp-format (plist-get info :html-metadata-timestamp-format)))
+    `((?t . ,(org-export-data (plist-get info :title) info))
+      (?s . ,(org-export-data (plist-get info :subtitle) info))
+      (?d . ,(org-export-data (org-export-get-date info timestamp-format)
+			      info))
+      (?T . ,(format-time-string timestamp-format))
+      (?a . ,(org-export-data (plist-get info :author) info))
+      (?e . ,(mapconcat
+	      (lambda (e) (format "<a href=\"mailto:%s\">%s</a>" e e))
+	      (split-string (plist-get info :email)  ",+ *")
+	      ", "))
+      (?c . ,(plist-get info :creator))
+      (?C . ,(let ((file (plist-get info :input-file)))
+	       (format-time-string timestamp-format
+				   (and file (nth 5 (file-attributes file))))))
+      (?v . ,(or (plist-get info :html-validation-link) "")))))
 
 (defun org-html--build-pre/postamble (type info)
   "Return document preamble or postamble as a string, or nil.
@@ -3048,7 +3052,7 @@ INFO is a plist holding contextual information.  See
      ;; equivalent line number.
      ((string= type "coderef")
       (let ((fragment (concat "coderef-" (org-html-encode-plain-text path))))
-	(format "<a href=\"#%s\"%s%s>%s</a>"
+	(format "<a href=\"#%s\" %s%s>%s</a>"
 		fragment
 		(format "class=\"coderef\" onmouseover=\"CodeHighlightOn(this, \
 '%s');\" onmouseout=\"CodeHighlightOff(this, '%s');\""
@@ -3588,20 +3592,16 @@ information."
   "Transcode a VERSE-BLOCK element from Org to HTML.
 CONTENTS is verse block contents.  INFO is a plist holding
 contextual information."
-  ;; Replace each newline character with line break.  Also replace
-  ;; each blank line with a line break.
-  (setq contents (replace-regexp-in-string
-		  "^ *\\\\\\\\$" (format "%s\n" (org-html-close-tag "br" nil info))
-		  (replace-regexp-in-string
-		   "\\(\\\\\\\\\\)?[ \t]*\n"
-		   (format "%s\n" (org-html-close-tag "br" nil info)) contents)))
-  ;; Replace each white space at beginning of a line with a
-  ;; non-breaking space.
-  (while (string-match "^[ \t]+" contents)
-    (let* ((num-ws (length (match-string 0 contents)))
-	   (ws (org-html--make-string num-ws "&#xa0;")))
-      (setq contents (replace-match ws nil t contents))))
-  (format "<p class=\"verse\">\n%s</p>" contents))
+  (format "<p class=\"verse\">\n%s</p>"
+	  ;; Replace leading white spaces with non-breaking spaces.
+	  (replace-regexp-in-string
+	   "^[ \t]+" (lambda (m) (org-html--make-string (length m) "&#xa0;"))
+	   ;; Replace each newline character with line break.  Also
+	   ;; remove any trailing "br" close-tag so as to avoid
+	   ;; duplicates.
+	   (let* ((br (org-html-close-tag "br" nil info))
+		  (re (format "\\(%s\\)[ \t]*$" (regexp-quote br))))
+	     (replace-regexp-in-string re br contents)))))
 
 
 ;;; Filter Functions
diff --git a/elpa/org-20161118/ox-icalendar.el b/elpa/org-20170210/ox-icalendar.el
similarity index 99%
rename from elpa/org-20161118/ox-icalendar.el
rename to elpa/org-20170210/ox-icalendar.el
index c22866a9..9ccbb272 100644
--- a/elpa/org-20161118/ox-icalendar.el
+++ b/elpa/org-20170210/ox-icalendar.el
@@ -1,6 +1,6 @@
 ;;; ox-icalendar.el --- iCalendar Back-End for Org Export Engine -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2004-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2017 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;;      Nicolas Goaziou <n dot goaziou at gmail dot com>
@@ -458,7 +458,7 @@ or subject for the event."
    (mapconcat
     (lambda (line)
       ;; Limit each line to a maximum of 75 characters.  If it is
-      ;; longer, fold it by using "\n " as a continuation marker.
+      ;; longer, fold it by using "\r\n " as a continuation marker.
       (let ((len (length line)))
 	(if (<= len 75) line
 	  (let ((folded-line (substring line 0 75))
@@ -468,11 +468,11 @@ or subject for the event."
 	    ;; line, real contents must be split at 74 chars.
 	    (while (< (setq chunk-end (+ chunk-start 74)) len)
 	      (setq folded-line
-		    (concat folded-line "\n "
+		    (concat folded-line "\r\n "
 			    (substring line chunk-start chunk-end))
 		    chunk-start chunk-end))
-	    (concat folded-line "\n " (substring line chunk-start))))))
-    (org-split-string s "\n") "\n")))
+	    (concat folded-line "\r\n " (substring line chunk-start))))))
+    (org-split-string s "\n") "\r\n")))
 
 
 
diff --git a/elpa/org-20161118/ox-latex.el b/elpa/org-20170210/ox-latex.el
similarity index 96%
rename from elpa/org-20161118/ox-latex.el
rename to elpa/org-20170210/ox-latex.el
index 89faa4ec..6e00f57e 100644
--- a/elpa/org-20161118/ox-latex.el
+++ b/elpa/org-20170210/ox-latex.el
@@ -1,6 +1,6 @@
 ;;; ox-latex.el --- LaTeX Back-End for Org Export Engine -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2011-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2017 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Goaziou <n.goaziou at gmail dot com>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -100,8 +100,10 @@
 	      (if a (org-latex-export-to-pdf t s v b)
 		(org-open-file (org-latex-export-to-pdf nil s v b)))))))
   :filters-alist '((:filter-options . org-latex-math-block-options-filter)
+		   (:filter-paragraph . org-latex-clean-invalid-line-breaks)
 		   (:filter-parse-tree org-latex-math-block-tree-filter
-				       org-latex-matrices-tree-filter))
+				       org-latex-matrices-tree-filter)
+		   (:filter-verse-block . org-latex-clean-invalid-line-breaks))
   :options-alist
   '((:latex-class "LATEX_CLASS" nil org-latex-default-class t)
     (:latex-class-options "LATEX_CLASS_OPTIONS" nil nil t)
@@ -329,7 +331,7 @@ Otherwise, place it near the end.  When value is a list of
 symbols, put caption above selected elements only.  Allowed
 symbols are: `image', `table', `src-block' and `special-block'."
   :group 'org-export-latex
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "8.3")
   :type '(choice
 	  (const :tag "For all elements" t)
@@ -392,7 +394,7 @@ labeling scheme to generate labels and resolve links into proper
 references."
   :group 'org-export-latex
   :type 'boolean
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "8.3"))
 
 ;;;; Preamble
@@ -574,14 +576,14 @@ precedence over this variable."
 The format string should have at most one \"%s\"-expression,
 which is replaced with the subtitle."
   :group 'org-export-latex
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "8.3")
   :type '(string :tag "Format string"))
 
 (defcustom org-latex-subtitle-separate nil
   "Non-nil means the subtitle is not typeset as part of title."
   :group 'org-export-latex
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "8.3")
   :type 'boolean)
 
@@ -618,7 +620,7 @@ inserted.
 Setting :latex-hyperref-template in publishing projects will take
 precedence over this variable."
   :group 'org-export-latex
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "8.3")
   :type '(choice (const :tag "No template" nil)
 		 (string :tag "Format string")))
@@ -659,7 +661,7 @@ The function result will be used in the section format string."
 	  (const :tag "Use plain superscript (default)" "\\textsuperscript{\\ref{%s}}")
 	  (const :tag "Use Memoir/KOMA-Script footref" "\\footref{%s}")
 	  (string :tag "Other format string"))
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "9.0"))
 
 ;;;; Timestamps
@@ -685,7 +687,7 @@ The function result will be used in the section format string."
 (defcustom org-latex-images-centered t
   "When non-nil, images are centered."
   :group 'org-export-latex
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "9.0")
   :type 'boolean
   :safe #'booleanp)
@@ -719,7 +721,7 @@ environment."
   "Default position for LaTeX figures."
   :group 'org-export-latex
   :type 'string
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "9.0")
   :safe #'stringp)
 
@@ -842,7 +844,7 @@ to typeset and try to protect special characters.
 If no association can be found for a given markup, text will be
 returned as-is."
   :group 'org-export-latex
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "8.3")
   :type 'alist
   :options '(bold code italic strike-through underline verbatim))
@@ -884,7 +886,7 @@ The function must accept seven parameters:
 The function should return the string to be exported."
   :group 'org-export-latex
   :type 'function
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "8.3"))
 
 
@@ -1021,7 +1023,7 @@ be a list containing two strings: the name of the option, and the
 value.  For example,
 
   (setq org-latex-minted-options
-    '((\"bgcolor\" \"bg\") (\"frame\" \"lines\")))
+    \\='((\"bgcolor\" \"bg\") (\"frame\" \"lines\")))
 
 will result in src blocks being exported with
 
@@ -1060,7 +1062,7 @@ exported.  This format string may contain these elements:
 For example,
 
   (setq org-latex-custom-lang-environments
-     '((python \"pythoncode\")
+     \\='((python \"pythoncode\")
        (ocaml \"\\\\begin{listing}
 \\\\begin{minted}[%o]{ocaml}
 %s\\\\end{minted}
@@ -1089,7 +1091,7 @@ will produce
 	  (list
 	   (symbol :tag "Language name                    ")
 	   (string :tag "Environment name or format string")))
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "9.0"))
 
 
@@ -1104,7 +1106,7 @@ See also `org-latex-compiler'."
 	  (const :tag "latex-mode file variable" "%% -*- latex-run-command: %s -*-\n")
 	  (const :tag "AUCTeX file variable" "%% -*- LaTeX-command: %s -*-\n")
 	  (string :tag "custom format" "%% %s"))
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "9.0"))
 
 (defcustom org-latex-compiler "pdflatex"
@@ -1119,7 +1121,7 @@ Can also be set in buffers via #+LATEX_COMPILER.  See also
 	  (const :tag "XeLaTeX"  "xelatex")
 	  (const :tag "LuaLaTeX" "lualatex")
 	  (const :tag "Unset" ""))
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "9.0"))
 
 (defconst org-latex-compilers '("pdflatex" "xelatex" "lualatex")
@@ -1137,7 +1139,7 @@ A better approach is to use a compiler suit such as `latexmk'."
   :type '(choice (const :tag "BibTeX" "bibtex")
 		 (const :tag "Biber" "biber")
 		 (string :tag "Other process"))
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "9.0"))
 
 (defcustom org-latex-pdf-process
@@ -1145,12 +1147,15 @@ A better approach is to use a compiler suit such as `latexmk'."
     "%latex -interaction nonstopmode -output-directory %o %f"
     "%latex -interaction nonstopmode -output-directory %o %f")
   "Commands to process a LaTeX file to a PDF file.
+
 This is a list of strings, each of them will be given to the
 shell as a command.  %f in the command will be replaced by the
-full file name, %b by the file base name (i.e. without directory
-and extension parts), %o by the base directory of the file,
-%latex is the LaTeX compiler (see `org-latex-compiler'), and %bib
-is the BibTeX-like compiler (see `org-latex-bib-compiler').
+relative file name, %F by the absolute file name, %b by the file
+base name (i.e. without directory and extension parts), %o by the
+base directory of the file, %O by the absolute file name of the
+output file, %latex is the LaTeX compiler (see
+`org-latex-compiler'), and %bib is the BibTeX-like compiler (see
+`org-latex-bib-compiler').
 
 The reason why this is a list is that it usually takes several
 runs of `pdflatex', maybe mixed with a call to `bibtex'.  Org
@@ -1194,7 +1199,7 @@ file name as its single argument."
 The logfiles will be removed if `org-latex-remove-logfiles' is
 non-nil."
   :group 'org-export-latex
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "8.3")
   :type '(repeat (string :tag "Extension")))
 
@@ -1218,7 +1223,7 @@ The regular expressions are used to find possible warnings in the
 log of a latex-run.  These warnings will be reported after
 calling `org-latex-compile'."
   :group 'org-export-latex
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "8.3")
   :type '(repeat
 	  (cons
@@ -1293,8 +1298,7 @@ For non-floats, see `org-latex--wrap-label'."
 			    main)
 		       (and (eq type 'src-block)
 			    (not (plist-get attr :float))
-			    (memq (plist-get info :latex-listings)
-				  '(nil minted)))))
+			    (null (plist-get info :latex-listings)))))
 	 (short (org-export-get-caption element t))
 	 (caption-from-attr-latex (plist-get attr :caption)))
     (cond
@@ -1483,15 +1487,7 @@ should not be used for floats.  See
 
 (defun org-latex--protect-text (text)
   "Protect special characters in string TEXT and return it."
-  (replace-regexp-in-string
-   "--\\|[\\{}$%&_#~^]"
-   (lambda (m)
-     (cond ((equal m "--") "-{}-")
-	   ((equal m "\\") "\\textbackslash{}")
-	   ((equal m "~") "\\textasciitilde{}")
-	   ((equal m "^") "\\textasciicircum{}")
-	   (t (concat "\\" m))))
-   text nil t))
+  (replace-regexp-in-string "[\\{}$%&_#~^]" "\\\\\\&" text))
 
 (defun org-latex--text-markup (text markup info)
   "Format TEXT depending on MARKUP text markup.
@@ -1505,13 +1501,23 @@ INFO is a plist used as a communication channel.  See
       ;; and use "\\verb" command.
       (verb
        (let ((separator (org-latex--find-verb-separator text)))
-	 (concat "\\verb" separator
+	 (concat "\\verb"
+		 separator
 		 (replace-regexp-in-string "\n" " " text)
 		 separator)))
       ;; Handle the `protectedtexttt' special case: Protect some
       ;; special chars and use "\texttt{%s}" format string.
       (protectedtexttt
-       (format "\\texttt{%s}" (org-latex--protect-text text)))
+       (format "\\texttt{%s}"
+	       (replace-regexp-in-string
+		"--\\|[\\{}$%&_#~^]"
+		(lambda (m)
+		  (cond ((equal m "--") "-{}-")
+			((equal m "\\") "\\textbackslash{}")
+			((equal m "~") "\\textasciitilde{}")
+			((equal m "^") "\\textasciicircum{}")
+			(t (org-latex--protect-text m))))
+		text nil t)))
       ;; Else use format string.
       (t (format fmt text)))))
 
@@ -1577,37 +1583,6 @@ INFO is a plist used as a communication channel."
       (?L . ,(capitalize language))
       (?D . ,(org-export-get-date info)))))
 
-(defun org-latex--make-preamble (info)
-  "Return a formatted LaTeX preamble.
-INFO is a plist used as a communication channel."
-  (let* ((class (plist-get info :latex-class))
-	    (class-options (plist-get info :latex-class-options))
-	    (header (nth 1 (assoc class (plist-get info :latex-classes))))
-	    (document-class-string
-	     (and (stringp header)
-		  (if (not class-options) header
-		    (replace-regexp-in-string
-		     "^[ \t]*\\\\documentclass\\(\\(\\[[^]]*\\]\\)?\\)"
-		     class-options header t nil 1)))))
-       (if (not document-class-string)
-	   (user-error "Unknown LaTeX class `%s'" class)
-	 (org-latex-guess-polyglossia-language
-	  (org-latex-guess-babel-language
-	   (org-latex-guess-inputenc
-	    (org-element-normalize-string
-	     (org-splice-latex-header
-	      document-class-string
-	      (org-latex--remove-packages
-	       org-latex-default-packages-alist info)
-	      (org-latex--remove-packages
-	       org-latex-packages-alist info)
-	      nil
-	      (mapconcat 'org-element-normalize-string
-			 (list (plist-get info :latex-header)
-			       (plist-get info :latex-header-extra)) ""))))
-	   info)
-	  info))))
-
 (defun org-latex--insert-compiler (info)
   "Insert LaTeX_compiler info into the document.
 INFO is a plist used as a communication channel."
@@ -1616,9 +1591,60 @@ INFO is a plist used as a communication channel."
 	    (member (or compiler "") org-latex-compilers)
 	    (format org-latex-compiler-file-string compiler))))
 
+
+;;; Filters
+
+(defun org-latex-matrices-tree-filter (tree _backend info)
+  (org-latex--wrap-latex-matrices tree info))
+
+(defun org-latex-math-block-tree-filter (tree _backend info)
+  (org-latex--wrap-latex-math-block tree info))
+
+(defun org-latex-math-block-options-filter (info _backend)
+  (dolist (prop '(:author :date :title) info)
+    (plist-put info prop
+	       (org-latex--wrap-latex-math-block (plist-get info prop) info))))
+
+(defun org-latex-clean-invalid-line-breaks (data _backend _info)
+  (replace-regexp-in-string
+   "\\(\\end{[A-Za-z0-9*]+}\\|^\\)[ \t]*\\\\\\\\[ \t]*$" "\\1"
+   data))
+
 
 ;;; Template
 
+;;;###autoload
+(defun org-latex-make-preamble (info &optional template)
+  "Return a formatted LaTeX preamble.
+INFO is a plist used as a communication channel.  Optional
+argument TEMPLATE, when non-nil, is the header template string,
+as expected by `org-splice-latex-header'."
+  (let* ((class (plist-get info :latex-class))
+	 (class-options (plist-get info :latex-class-options))
+	 (header (nth 1 (assoc class (plist-get info :latex-classes))))
+	 (class-template
+	  (or template
+	      (and (stringp header)
+		   (if (not class-options) header
+		     (replace-regexp-in-string
+		      "^[ \t]*\\\\documentclass\\(\\(\\[[^]]*\\]\\)?\\)"
+		      class-options header t nil 1)))
+	      (user-error "Unknown LaTeX class `%s'" class))))
+    (org-latex-guess-polyglossia-language
+     (org-latex-guess-babel-language
+      (org-latex-guess-inputenc
+       (org-element-normalize-string
+	(org-splice-latex-header
+	 class-template
+	 (org-latex--remove-packages org-latex-default-packages-alist info)
+	 (org-latex--remove-packages org-latex-packages-alist info)
+	 nil
+	 (mapconcat #'org-element-normalize-string
+		    (list (plist-get info :latex-header)
+			  (plist-get info :latex-header-extra)) ""))))
+      info)
+     info)))
+
 (defun org-latex-template (contents info)
   "Return complete document string after LaTeX conversion.
 CONTENTS is the transcoded contents string.  INFO is a plist
@@ -1632,7 +1658,7 @@ holding export options."
      ;; LaTeX compiler.
      (org-latex--insert-compiler info)
      ;; Document class and packages.
-     (org-latex--make-preamble info)
+     (org-latex-make-preamble info)
      ;; Possibly limit depth for headline numbering.
      (let ((sec-num (plist-get info :section-numbers)))
        (when (integerp sec-num)
@@ -1995,7 +2021,7 @@ holding contextual information."
 		    (concat headline-label pre-blanks contents))))))))
 
 (defun org-latex-format-headline-default-function
-    (todo _todo-type priority text tags info)
+    (todo _todo-type priority text tags _info)
   "Default format function for a headline.
 See `org-latex-format-headline-function' for details."
   (concat
@@ -2004,8 +2030,7 @@ See `org-latex-format-headline-function' for details."
    text
    (and tags
 	(format "\\hfill{}\\textsc{%s}"
-		(mapconcat (lambda (tag) (org-latex-plain-text tag info))
-			   tags ":")))))
+		(mapconcat #'org-latex--protect-text tags ":")))))
 
 
 ;;;; Horizontal Rule
@@ -2040,7 +2065,7 @@ contextual information."
 	 (separator (org-latex--find-verb-separator code)))
     (cl-case (plist-get info :latex-listings)
       ;; Do not use a special package: transcode it verbatim.
-      ((nil) (format "\\texttt{%s}" (org-latex--protect-text code)))
+      ((nil) (format "\\texttt{%s}" (org-latex--text-markup code 'code info)))
       ;; Use minted package.
       (minted
        (let* ((org-lang (org-element-property :language inline-src-block))
@@ -2087,7 +2112,7 @@ holding contextual information."
 	     todo todo-type priority title tags contents info)))
 
 (defun org-latex-format-inlinetask-default-function
-  (todo _todo-type priority title tags contents info)
+    (todo _todo-type priority title tags contents _info)
   "Default format function for a inlinetasks.
 See `org-latex-format-inlinetask-function' for details."
   (let ((full-title
@@ -2096,9 +2121,7 @@ See `org-latex-format-inlinetask-function' for details."
 		 title
 		 (when tags
 		   (format "\\hfill{}\\textsc{:%s:}"
-			   (mapconcat
-			    (lambda (tag) (org-latex-plain-text tag info))
-			    tags ":"))))))
+			   (mapconcat #'org-latex--protect-text tags ":"))))))
     (concat "\\begin{center}\n"
 	    "\\fbox{\n"
 	    "\\begin{minipage}[c]{.6\\textwidth}\n"
@@ -2416,17 +2439,16 @@ DESC is the description part of the link, or the empty string.
 INFO is a plist holding contextual information.  See
 `org-export-data'."
   (let* ((type (org-element-property :type link))
-	 (raw-path (replace-regexp-in-string
-		    "%" "\\%" (org-element-property :path link) nil t))
+	 (raw-path (org-element-property :path link))
 	 ;; Ensure DESC really exists, or set it to nil.
 	 (desc (and (not (string= desc "")) desc))
 	 (imagep (org-export-inline-image-p
 		  link (plist-get info :latex-inline-image-rules)))
-	 (path (cond
-		((member type '("http" "https" "ftp" "mailto" "doi"))
-		 (concat type ":" raw-path))
-		((string= type "file") (org-export-file-uri raw-path))
-		(t raw-path))))
+	 (path (org-latex--protect-text
+		(cond ((member type '("http" "https" "ftp" "mailto" "doi"))
+		       (concat type ":" raw-path))
+		      ((string= type "file") (org-export-file-uri raw-path))
+		      (t raw-path)))))
     (cond
      ;; Link type is handled by a special function.
      ((org-export-custom-protocol-maybe link desc 'latex))
@@ -2682,8 +2704,6 @@ channel."
 	    (t "\\[\n%s\\]"))
 	  contents))
 
-(defun org-latex-matrices-tree-filter (tree _backend info)
-  (org-latex--wrap-latex-matrices tree info))
 
 ;;;; Pseudo Object: LaTeX Math Block
 
@@ -2695,22 +2715,24 @@ channel."
 DATA is a parse tree or a secondary string.  INFO is a plist
 containing export options.  Modify DATA by side-effect and return it."
   (let ((valid-object-p
-	 ;; Non-nil when OBJ can be added to the latex math block.
-	 (lambda (obj)
+	 ;; Non-nil when OBJ can be added to the latex math block B.
+	 (lambda (obj b)
 	   (pcase (org-element-type obj)
 	     (`entity (org-element-property :latex-math-p obj))
 	     (`latex-fragment
 	      (let ((value (org-element-property :value obj)))
 		(or (string-prefix-p "\\(" value)
 		    (string-match-p "\\`\\$[^$]" value))))
-	     ((or `subscript `superscript) t)))))
+	     ((and type (or `subscript `superscript))
+	      (not (memq type (mapcar #'org-element-type
+				      (org-element-contents b)))))))))
     (org-element-map data '(entity latex-fragment subscript superscript)
       (lambda (object)
 	;; Skip objects already wrapped.
 	(when (and (not (eq (org-element-type
 			     (org-element-property :parent object))
 			    'latex-math-block))
-		   (funcall valid-object-p object))
+		   (funcall valid-object-p object nil))
 	  (let ((math-block (list 'latex-math-block nil))
 		(next-elements (org-export-get-next-element object info t))
 		(last object))
@@ -2722,30 +2744,23 @@ containing export options.  Modify DATA by side-effect and return it."
 	      ;; MATH-BLOCK swallows consecutive math objects.
 	      (catch 'exit
 		(dolist (next next-elements)
-		  (if (not (funcall valid-object-p next)) (throw 'exit nil)
-		    (org-element-extract-element next)
-		    (org-element-adopt-elements math-block next)
-		    ;; Eschew the case: \beta$x$ -> \(\betax\).
-		    (unless (memq (org-element-type next)
-				  '(subscript superscript))
-		      (org-element-put-property last :post-blank 1))
-		    (setq last next)
-		    (when (> (or (org-element-property :post-blank next) 0) 0)
-		      (throw 'exit nil))))))
+		  (unless (funcall valid-object-p next math-block)
+		    (throw 'exit nil))
+		  (org-element-extract-element next)
+		  (org-element-adopt-elements math-block next)
+		  ;; Eschew the case: \beta$x$ -> \(\betax\).
+		  (unless (memq (org-element-type next)
+				'(subscript superscript))
+		    (org-element-put-property last :post-blank 1))
+		  (setq last next)
+		  (when (> (or (org-element-property :post-blank next) 0) 0)
+		    (throw 'exit nil)))))
 	    (org-element-put-property
 	     math-block :post-blank (org-element-property :post-blank last)))))
       info nil '(subscript superscript latex-math-block) t)
     ;; Return updated DATA.
     data))
 
-(defun org-latex-math-block-tree-filter (tree _backend info)
-  (org-latex--wrap-latex-math-block tree info))
-
-(defun org-latex-math-block-options-filter (info _backend)
-  (dolist (prop '(:author :date :title) info)
-    (plist-put info prop
-	       (org-latex--wrap-latex-math-block (plist-get info prop) info))))
-
 (defun org-latex-math-block (_math-block contents _info)
   "Transcode a MATH-BLOCK object from Org to LaTeX.
 CONTENTS is a string.  INFO is a plist used as a communication
@@ -2859,13 +2874,19 @@ contextual information."
 	       (float-env
 		(cond
 		 ((string= "multicolumn" float)
-		  (format "\\begin{listing*}\n%s%%s\n%s\\end{listing*}"
+		  (format "\\begin{listing*}[%s]\n%s%%s\n%s\\end{listing*}"
+			  (plist-get info :latex-default-figure-position)
 			  (if caption-above-p caption-str "")
 			  (if caption-above-p "" caption-str)))
 		 (caption
-		  (concat (if caption-above-p caption-str "")
-			  "%s"
-			  (if caption-above-p "" (concat "\n" caption-str))))
+		  (format "\\begin{listing}[%s]\n%s%%s\n%s\\end{listing}"
+			  (plist-get info :latex-default-figure-position)
+			  (if caption-above-p caption-str "")
+			  (if caption-above-p "" caption-str)))
+		 ((string= "t" float)
+		  (concat (format "\\begin{listing}[%s]\n"
+				  (plist-get info :latex-default-figure-position))
+			  "%s\n\\end{listing}"))
 		 (t "%s")))
 	       (options (plist-get info :latex-minted-options))
 	       (body
@@ -3613,7 +3634,7 @@ produced."
 	(mapc #'delete-file
 	      (directory-files
 	       (file-name-directory outfile)
-	       nil
+	       t
 	       (concat (regexp-quote (file-name-base outfile))
 		       "\\(?:\\.[0-9]+\\)?\\."
 		       (regexp-opt org-latex-logfiles-extensions))
diff --git a/elpa/org-20161118/ox-man.el b/elpa/org-20170210/ox-man.el
similarity index 99%
rename from elpa/org-20161118/ox-man.el
rename to elpa/org-20170210/ox-man.el
index 4e2bfc75..2bb121fb 100644
--- a/elpa/org-20161118/ox-man.el
+++ b/elpa/org-20170210/ox-man.el
@@ -1,6 +1,6 @@
 ;; ox-man.el --- Man Back-End for Org Export Engine -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2011-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2017 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Goaziou <n.goaziou at gmail dot com>
 ;;      Luis R Anaya <papoanaya aroba hot mail punto com>
@@ -208,11 +208,13 @@ in this list - but it does not hurt if it is present."
     "tbl %f | eqn | groff -man | ps2pdf - > %b.pdf")
 
   "Commands to process a Man file to a PDF file.
+
 This is a list of strings, each of them will be given to the
 shell as a command.  %f in the command will be replaced by the
-full file name, %b by the file base name (i.e. without directory
-and extension parts) and %o by the base directory of the file.
-
+relative file name, %F by the absolute file name, %b by the file
+base name (i.e. without directory and extension parts), %o by the
+base directory of the file and %O by the absolute file name of
+the output file.
 
 By default, Org uses 3 runs of to do the processing.
 
diff --git a/elpa/org-20161118/ox-md.el b/elpa/org-20170210/ox-md.el
similarity index 99%
rename from elpa/org-20161118/ox-md.el
rename to elpa/org-20170210/ox-md.el
index b8c47047..ad6ee35f 100644
--- a/elpa/org-20161118/ox-md.el
+++ b/elpa/org-20170210/ox-md.el
@@ -1,6 +1,6 @@
 ;;; ox-md.el --- Markdown Back-End for Org Export Engine -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2012-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2017 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Goaziou <n.goaziou@gmail.com>
 ;; Keywords: org, wp, markdown
@@ -59,7 +59,7 @@ The first %s placeholder will be replaced with the localized Footnotes section
 heading, the second with the contents of the Footnotes section."
  :group 'org-export-md
  :type 'string
- :version "25.2"
+ :version "26.1"
  :package-version '(Org . "9.0"))
 
 (defcustom org-md-footnote-format "<sup>%s</sup>"
@@ -67,7 +67,7 @@ heading, the second with the contents of the Footnotes section."
 The %s will be replaced by the footnote reference itself."
   :group 'org-export-md
   :type 'string
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "9.0"))
 
 
diff --git a/elpa/org-20161118/ox-odt.el b/elpa/org-20170210/ox-odt.el
similarity index 99%
rename from elpa/org-20161118/ox-odt.el
rename to elpa/org-20170210/ox-odt.el
index 05d86bfb..943a6be0 100644
--- a/elpa/org-20161118/ox-odt.el
+++ b/elpa/org-20170210/ox-odt.el
@@ -1,6 +1,6 @@
 ;;; ox-odt.el --- OpenDocument Text Exporter for Org Mode -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2010-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2017 Free Software Foundation, Inc.
 
 ;; Author: Jambunathan K <kjambunathan at gmail dot com>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -673,7 +673,7 @@ TAGS      the tags string, separated with colons (string or nil).
 
 The function result will be used as headline text."
   :group 'org-export-odt
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "8.3")
   :type 'function)
 
@@ -694,7 +694,7 @@ The function must accept six parameters:
 
 The function should return the string to be exported."
   :group 'org-export-odt
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "8.3")
   :type 'function)
 
@@ -753,7 +753,7 @@ A rule consists in an association whose key is the type of link
 to consider, and value is a regexp that will be matched against
 link's path."
   :group 'org-export-odt
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "8.3")
   :type '(alist :key-type (string :tag "Type")
 		:value-type (regexp :tag "Path")))
@@ -847,7 +847,7 @@ ON-OR-OFF                 := t | nil
 For example, with the following configuration
 
 \(setq org-odt-table-styles
-      '((\"TableWithHeaderRowsAndColumns\" \"Custom\"
+      \\='((\"TableWithHeaderRowsAndColumns\" \"Custom\"
          ((use-first-row-styles . t)
           (use-first-column-styles . t)))
         (\"TableWithHeaderColumns\" \"Custom\"
@@ -2882,15 +2882,10 @@ contextual information."
 
 (defun org-odt--encode-tabs-and-spaces (line)
   (replace-regexp-in-string
-   "\\([\t]\\|\\([ ]+\\)\\)"
+   "\\(\t\\| \\{2,\\}\\)"
    (lambda (s)
-     (cond
-      ((string= s "\t") "<text:tab/>")
-      (t (let ((n (length s)))
-	   (cond
-	    ((= n 1) " ")
-	    ((> n 1) (concat " " (format "<text:s text:c=\"%d\"/>" (1- n))))
-	    (t ""))))))
+     (if (string= s "\t") "<text:tab/>"
+       (format " <text:s text:c=\"%d\"/>" (1- (length s)))))
    line))
 
 (defun org-odt--encode-plain-text (text &optional no-whitespace-filling)
@@ -3673,15 +3668,13 @@ channel."
   "Transcode a VERSE-BLOCK element from Org to ODT.
 CONTENTS is verse block contents.  INFO is a plist holding
 contextual information."
-  ;; Add line breaks to each line of verse.
-  (setq contents (replace-regexp-in-string
-		  "\\(<text:line-break/>\\)?[ \t]*\n"
-		  "<text:line-break/>" contents))
-  ;; Replace tabs and spaces.
-  (setq contents (org-odt--encode-tabs-and-spaces contents))
-  ;; Surround it in a verse environment.
-  (format "\n<text:p text:style-name=\"%s\">%s</text:p>"
-	  "OrgVerse" contents))
+  (format "\n<text:p text:style-name=\"OrgVerse\">%s</text:p>"
+	  (replace-regexp-in-string
+	   ;; Replace leading tabs and spaces.
+	   "^[ \t]+" #'org-odt--encode-tabs-and-spaces
+	   ;; Add line breaks to each line of verse.
+	   (replace-regexp-in-string
+	    "\\(<text:line-break/>\\)?[ \t]*$" "<text:line-break/>" contents))))
 
 
 
@@ -3741,9 +3734,9 @@ contextual information."
 		 (org-link
 		  (let ((link (with-temp-buffer
 				(insert latex-frag)
-				(org-format-latex cache-subdir cache-dir
-						  nil display-msg
-						  nil processing-type)
+				(org-format-latex cache-subdir nil nil cache-dir
+						  nil display-msg nil
+						  processing-type)
 				(buffer-substring-no-properties
 				 (point-min) (point-max)))))
 		    (if (string-match-p "file:\\([^]]*\\)" link) link
diff --git a/elpa/org-20161118/ox-org.el b/elpa/org-20170210/ox-org.el
similarity index 99%
rename from elpa/org-20161118/ox-org.el
rename to elpa/org-20170210/ox-org.el
index b8cd15da..d0fa3a9a 100644
--- a/elpa/org-20161118/ox-org.el
+++ b/elpa/org-20170210/ox-org.el
@@ -1,6 +1,6 @@
 ;;; ox-org.el --- Org Back-End for Org Export Engine -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2013-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2017 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Goaziou <n.goaziou@gmail.com>
 ;; Keywords: org, wp
diff --git a/elpa/org-20161118/ox-publish.el b/elpa/org-20170210/ox-publish.el
similarity index 94%
rename from elpa/org-20161118/ox-publish.el
rename to elpa/org-20170210/ox-publish.el
index e8271f61..5170a9a7 100644
--- a/elpa/org-20161118/ox-publish.el
+++ b/elpa/org-20170210/ox-publish.el
@@ -1,5 +1,5 @@
 ;;; ox-publish.el --- Publish Related Org Mode Files as a Website -*- lexical-binding: t; -*-
-;; Copyright (C) 2006-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2017 Free Software Foundation, Inc.
 
 ;; Author: David O'Toole <dto@gnu.org>
 ;; Maintainer: Carsten Dominik <carsten DOT dominik AT gmail DOT com>
@@ -104,7 +104,8 @@ Most properties are optional, but some should always be set:
 
     Extension (without the dot!) of source files.  This can be
     a regular expression.  If not given, \"org\" will be used as
-    default extension.
+    default extension.  If it is `any', include all the files,
+    even without extension.
 
   `:publishing-directory'
 
@@ -362,7 +363,7 @@ still decide about that independently."
 		filename pub-dir pub-func base-dir))))
     (if rtn (message "Publishing file %s using `%s'" filename pub-func)
       (when org-publish-list-skipped-files
-	(message   "Skipping unmodified file %s" filename)))
+	(message "Skipping unmodified file %s" filename)))
     rtn))
 
 (defun org-publish-update-timestamp
@@ -385,6 +386,15 @@ If there is no timestamp, create one."
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Getting project information out of `org-publish-project-alist'
 
+(defun org-publish-property (property project &optional default)
+  "Return value PROPERTY, as a symbol, in PROJECT.
+DEFAULT is returned when PROPERTY is not actually set in PROJECT
+definition."
+  (let ((properties (cdr project)))
+    (if (plist-member properties property)
+	(plist-get properties property)
+      default)))
+
 (defun org-publish-expand-projects (projects-alist)
   "Expand projects in PROJECTS-ALIST.
 This splices all the components into the list."
@@ -526,34 +536,61 @@ matching filenames."
 		  org-publish-temp-files))))
 
 (defun org-publish-get-project-from-filename (filename &optional up)
-  "Return the project that FILENAME belongs to."
+  "Return a project that FILENAME belongs to.
+When UP is non-nil, return a meta-project (i.e., with a :components part)
+publishing FILENAME."
   (let* ((filename (expand-file-name filename))
-	 project-name)
-
-    (catch 'p-found
-      (dolist (prj org-publish-project-alist)
-	(unless (plist-get (cdr prj) :components)
-	  ;; [[info:org:Selecting%20files]] shows how this is supposed to work:
-	  (let* ((r (plist-get (cdr prj) :recursive))
-		 (b (expand-file-name (file-name-as-directory
-				       (plist-get (cdr prj) :base-directory))))
-		 (x (or (plist-get (cdr prj) :base-extension) "org"))
-		 (e (plist-get (cdr prj) :exclude))
-		 (i (plist-get (cdr prj) :include))
-		 (xm (concat "^" b (if r ".+" "[^/]+") "\\.\\(" x "\\)$")))
-	    (when
-		(or (and i
-			 (member filename
-				 (dolist (file i) (expand-file-name file b))))
-		    (and (not (and e (string-match e filename)))
-			 (string-match xm filename)))
-	      (setq project-name (car prj))
-	      (throw 'p-found project-name))))))
-    (when up
-      (dolist (prj org-publish-project-alist)
-	(if (member project-name (plist-get (cdr prj) :components))
-	    (setq project-name (car prj)))))
-    (assoc project-name org-publish-project-alist)))
+	 (project
+	  (cl-some
+	   (lambda (p)
+	     ;; Ignore meta-projects.
+	     (unless (org-publish-property :components p)
+	       (let ((base (expand-file-name
+			    (org-publish-property :base-directory p))))
+		 (cond
+		  ;; Check if FILENAME is explicitly included in one
+		  ;; project.
+		  ((member filename
+			   (mapcar (lambda (f) (expand-file-name f base))
+				   (org-publish-property :include p)))
+		   p)
+		  ;; Exclude file names matching :exclude property.
+		  ((let ((exclude-re (org-publish-property :exclude p)))
+		     (and exclude-re
+			  (string-match-p exclude-re
+					  (file-relative-name filename base))))
+		   nil)
+		  ;; Check :extension.  Handle special `any'
+		  ;; extension.
+		  ((let ((extension (org-publish-property :base-extension p)))
+		     (not (or (eq extension 'any)
+			      (string= (or extension "org")
+				       (file-name-extension filename)))))
+		   nil)
+		  ;; Check if FILENAME belong to project's base
+		  ;; directory, or some of its sub-directories
+		  ;; if :recursive in non-nil.
+		  ((org-publish-property :recursive p)
+		   (and (string-prefix-p base filename) p))
+		  ((equal base (file-name-directory filename)) p)
+		  (t nil)))))
+	   org-publish-project-alist)))
+    (cond
+     ((not project) nil)
+     ((not up) project)
+     ;; When optional argument UP is non-nil, return the top-most
+     ;; meta-project effectively publishing FILENAME.
+     (t
+      (letrec ((find-parent-project
+		(lambda (project)
+		  (or (cl-some
+		       (lambda (p)
+			 (and (member (car project)
+				      (org-publish-property :components p))
+			      (funcall find-parent-project p)))
+		       org-publish-project-alist)
+		      project))))
+	(funcall find-parent-project project))))))
 
 
 
@@ -697,7 +734,7 @@ If `:auto-sitemap' is set, publish the sitemap too.  If
 	       (or (plist-get project-plist :sitemap-file-entry-format)
 		   org-publish-sitemap-file-entry-format)))
 	  (funcall sitemap-function project sitemap-filename)))
-      ;; Publish all files from PROJECT excepted "theindex.org".  Its
+      ;; Publish all files from PROJECT except "theindex.org".  Its
       ;; publishing will be deferred until "theindex.inc" is
       ;; populated.
       (let ((theindex
@@ -725,13 +762,13 @@ Default for SITEMAP-FILENAME is `sitemap.org'."
 	 (dir (file-name-as-directory
 	       (plist-get project-plist :base-directory)))
 	 (localdir (file-name-directory dir))
-	 (indent-str (make-string 2 ?\ ))
+	 (indent-str (make-string 2 ?\s))
 	 (exclude-regexp (plist-get project-plist :exclude))
 	 (files (nreverse
 		 (org-publish-get-base-files project exclude-regexp)))
 	 (sitemap-filename (concat dir (or sitemap-filename "sitemap.org")))
 	 (sitemap-title (or (plist-get project-plist :sitemap-title)
-			  (concat "Sitemap for project " (car project))))
+			    (concat "Sitemap for project " (car project))))
 	 (sitemap-style (or (plist-get project-plist :sitemap-style)
 			    'tree))
 	 (sitemap-sans-extension
@@ -1040,7 +1077,7 @@ publishing directory."
 	      (dotimes (n len)
 		(insert
 		 (concat
-		  (make-string (* (+ rank n) 2) ? ) "  - "
+		  (make-string (* (+ rank n) 2) ?\s) "  - "
 		  (if (not (= (1- len) n)) (nth (+ rank n) entry)
 		    ;; Last term: Link it to TARGET, if possible.
 		    (let ((target (nth 2 idx)))
diff --git a/elpa/org-20161118/ox-texinfo.el b/elpa/org-20170210/ox-texinfo.el
similarity index 99%
rename from elpa/org-20161118/ox-texinfo.el
rename to elpa/org-20170210/ox-texinfo.el
index cf9cc2ff..895923f4 100644
--- a/elpa/org-20161118/ox-texinfo.el
+++ b/elpa/org-20170210/ox-texinfo.el
@@ -1,6 +1,6 @@
 ;;; ox-texinfo.el --- Texinfo Back-End for Org Export Engine -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2012-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2017 Free Software Foundation, Inc.
 ;; Author: Jonathan Leech-Pepin <jonathan.leechpepin at gmail dot com>
 ;; Keywords: outlines, hypermedia, calendar, wp
 
@@ -224,7 +224,7 @@ TAGS      the tags as a list of strings (list of strings or nil).
 The function result will be used in the section format string."
   :group 'org-export-texinfo
   :type 'function
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "8.3"))
 
 ;;;; Node listing (menu)
@@ -346,10 +346,13 @@ The function should return the string to be exported."
 
 (defcustom org-texinfo-info-process '("makeinfo %f")
   "Commands to process a Texinfo file to an INFO file.
-This is list of strings, each of them will be given to the shell
-as a command.  %f in the command will be replaced by the full
-file name, %b by the file base name (i.e without extension) and
-%o by the base directory of the file."
+
+This is a list of strings, each of them will be given to the
+shell as a command.  %f in the command will be replaced by the
+relative file name, %F by the absolute file name, %b by the file
+base name (i.e. without directory and extension parts), %o by the
+base directory of the file and %O by the absolute file name of
+the output file."
   :group 'org-export-texinfo
   :type '(repeat :tag "Shell command sequence"
 		 (string :tag "Shell command")))
diff --git a/elpa/org-20161118/ox.el b/elpa/org-20170210/ox.el
similarity index 98%
rename from elpa/org-20161118/ox.el
rename to elpa/org-20170210/ox.el
index ca1143cd..82230b6b 100644
--- a/elpa/org-20161118/ox.el
+++ b/elpa/org-20170210/ox.el
@@ -1,6 +1,6 @@
 ;;; ox.el --- Export Framework for Org Mode          -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2012-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2017 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Goaziou <n.goaziou at gmail dot com>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -77,12 +77,12 @@
 (require 'org-macro)
 (require 'tabulated-list)
 
+(declare-function org-src-coderef-format "org-src" (&optional element))
+(declare-function org-src-coderef-regexp "org-src" (fmt &optional label))
 (declare-function org-publish "ox-publish" (project &optional force async))
 (declare-function org-publish-all "ox-publish" (&optional force async))
 (declare-function org-publish-current-file "ox-publish" (&optional force async))
 (declare-function org-publish-current-project "ox-publish" (&optional force async))
-(declare-function org-src-coderef-format "org-src" (&optional element))
-(declare-function org-src-coderef-regexp "org-src" (fmt &optional label))
 
 (defvar org-publish-project-alist)
 (defvar org-table-number-fraction)
@@ -375,7 +375,7 @@ see.
 This option can also be set with the OPTIONS keyword, e.g.,
 \"creator:t\"."
   :group 'org-export-general
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "8.3")
   :type 'boolean
   :safe #'booleanp)
@@ -790,7 +790,7 @@ e.g. \"tasks:nil\"."
 This option can also be set with the OPTIONS keyword,
 e.g. \"title:nil\"."
   :group 'org-export-general
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "8.3")
   :type 'boolean
   :safe #'booleanp)
@@ -856,7 +856,7 @@ where PATH is the un-resolvable reference.
 This option can also be set with the OPTIONS keyword, e.g.,
 \"broken-links:mark\"."
   :group 'org-export-general
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "9.0")
   :type '(choice
 	  (const :tag "Ignore broken links" t)
@@ -894,7 +894,7 @@ HTML code while every other back-end will ignore it."
   "Non-nil means pushing export output to the kill ring.
 This variable is ignored during asynchronous export."
   :group 'org-export-general
-  :version "25.2"
+  :version "26.1"
   :package-version '(Org . "8.3")
   :type '(choice
 	  (const :tag "Always" t)
@@ -996,13 +996,12 @@ mode."
 				  (:copier nil))
   name parent transcoders options filters blocks menu)
 
+;;;###autoload
 (defun org-export-get-backend (name)
   "Return export back-end named after NAME.
 NAME is a symbol.  Return nil if no such back-end is found."
-  (catch 'found
-    (dolist (b org-export-registered-backends)
-      (when (eq (org-export-backend-name b) name)
-	(throw 'found b)))))
+  (cl-find-if (lambda (b) (and (eq name (org-export-backend-name b))))
+	      org-export-registered-backends))
 
 (defun org-export-register-backend (backend)
   "Register BACKEND as a known export back-end.
@@ -1332,6 +1331,7 @@ The back-end could then be called with, for example:
 ;; along with their value in order to set them as buffer local
 ;; variables later in the process.
 
+;;;###autoload
 (defun org-export-get-environment (&optional backend subtreep ext-plist)
   "Collect export options from the current buffer.
 
@@ -1782,12 +1782,23 @@ INFO is a plist holding export options."
 	(funcall walk-data data nil)
 	selected-trees))))
 
-(defun org-export--skip-p (blob options selected)
-  "Non-nil when element or object BLOB should be skipped during export.
+(defun org-export--skip-p (datum options selected)
+  "Non-nil when element or object DATUM should be skipped during export.
 OPTIONS is the plist holding export options.  SELECTED, when
 non-nil, is a list of headlines or inlinetasks belonging to
 a tree with a select tag."
-  (cl-case (org-element-type blob)
+  (cl-case (org-element-type datum)
+    ((comment comment-block)
+     ;; Skip all comments and comment blocks.  Make to keep maximum
+     ;; number of blank lines around the comment so as to preserve
+     ;; local structure of the document upon interpreting it back into
+     ;; Org syntax.
+     (let* ((previous (org-export-get-previous-element datum options))
+	    (before (or (org-element-property :post-blank previous) 0))
+	    (after (or (org-element-property :post-blank datum) 0)))
+       (when previous
+	 (org-element-put-property previous :post-blank (max before after 1))))
+     t)
     (clock (not (plist-get options :with-clocks)))
     (drawer
      (let ((with-drawers-p (plist-get options :with-drawers)))
@@ -1797,7 +1808,7 @@ a tree with a select tag."
 		;; every drawer whose name belong to that list.
 		;; Otherwise, ignore drawers whose name isn't in that
 		;; list.
-		(let ((name (org-element-property :drawer-name blob)))
+		(let ((name (org-element-property :drawer-name datum)))
 		  (if (eq (car with-drawers-p) 'not)
 		      (member-ignore-case name (cdr with-drawers-p))
 		    (not (member-ignore-case name with-drawers-p))))))))
@@ -1806,23 +1817,23 @@ a tree with a select tag."
      (not (plist-get options :with-footnotes)))
     ((headline inlinetask)
      (let ((with-tasks (plist-get options :with-tasks))
-	   (todo (org-element-property :todo-keyword blob))
-	   (todo-type (org-element-property :todo-type blob))
+	   (todo (org-element-property :todo-keyword datum))
+	   (todo-type (org-element-property :todo-type datum))
 	   (archived (plist-get options :with-archived-trees))
-	   (tags (org-export-get-tags blob options nil t)))
+	   (tags (org-export-get-tags datum options nil t)))
        (or
-	(and (eq (org-element-type blob) 'inlinetask)
+	(and (eq (org-element-type datum) 'inlinetask)
 	     (not (plist-get options :with-inlinetasks)))
 	;; Ignore subtrees with an exclude tag.
 	(cl-loop for k in (plist-get options :exclude-tags)
 		 thereis (member k tags))
 	;; When a select tag is present in the buffer, ignore any tree
 	;; without it.
-	(and selected (not (memq blob selected)))
+	(and selected (not (memq datum selected)))
 	;; Ignore commented sub-trees.
-	(org-element-property :commentedp blob)
+	(org-element-property :commentedp datum)
 	;; Ignore archived subtrees if `:with-archived-trees' is nil.
-	(and (not archived) (org-element-property :archivedp blob))
+	(and (not archived) (org-element-property :archivedp datum))
 	;; Ignore tasks, if specified by `:with-tasks' property.
 	(and todo
 	     (or (not with-tasks)
@@ -1834,7 +1845,7 @@ a tree with a select tag."
      (let ((properties-set (plist-get options :with-properties)))
        (cond ((null properties-set) t)
 	     ((consp properties-set)
-	      (not (member-ignore-case (org-element-property :key blob)
+	      (not (member-ignore-case (org-element-property :key datum)
 				       properties-set))))))
     (planning (not (plist-get options :with-planning)))
     (property-drawer (not (plist-get options :with-properties)))
@@ -1842,14 +1853,14 @@ a tree with a select tag."
     (table (not (plist-get options :with-tables)))
     (table-cell
      (and (org-export-table-has-special-column-p
-	   (org-export-get-parent-table blob))
-	  (org-export-first-sibling-p blob options)))
-    (table-row (org-export-table-row-is-special-p blob options))
+	   (org-export-get-parent-table datum))
+	  (org-export-first-sibling-p datum options)))
+    (table-row (org-export-table-row-is-special-p datum options))
     (timestamp
      ;; `:with-timestamps' only applies to isolated timestamps
      ;; objects, i.e. timestamp objects in a paragraph containing only
      ;; timestamps and whitespaces.
-     (when (let ((parent (org-export-get-parent-element blob)))
+     (when (let ((parent (org-export-get-parent-element datum)))
 	     (and (memq (org-element-type parent) '(paragraph verse-block))
 		  (not (org-element-map parent
 			   (cons 'plain-text
@@ -1860,9 +1871,9 @@ a tree with a select tag."
        (cl-case (plist-get options :with-timestamps)
 	 ((nil) t)
 	 (active
-	  (not (memq (org-element-property :type blob) '(active active-range))))
+	  (not (memq (org-element-property :type datum) '(active active-range))))
 	 (inactive
-	  (not (memq (org-element-property :type blob)
+	  (not (memq (org-element-property :type datum)
 		     '(inactive inactive-range)))))))))
 
 
@@ -2007,18 +2018,24 @@ channel.
 Unlike to `org-export-with-backend', this function will
 recursively convert DATA using BACKEND translation table."
   (when (symbolp backend) (setq backend (org-export-get-backend backend)))
-  (org-export-data
-   data
-   ;; Set-up a new communication channel with translations defined in
-   ;; BACKEND as the translate table and a new hash table for
-   ;; memoization.
-   (org-combine-plists
-    info
-    (list :back-end backend
-	  :translate-alist (org-export-get-all-transcoders backend)
-	  ;; Size of the hash table is reduced since this function
-	  ;; will probably be used on small trees.
-	  :exported-data (make-hash-table :test 'eq :size 401)))))
+  ;; Set-up a new communication channel with translations defined in
+  ;; BACKEND as the translate table and a new hash table for
+  ;; memoization.
+  (let ((new-info
+	 (org-combine-plists
+	  info
+	  (list :back-end backend
+		:translate-alist (org-export-get-all-transcoders backend)
+		;; Size of the hash table is reduced since this
+		;; function will probably be used on small trees.
+		:exported-data (make-hash-table :test 'eq :size 401)))))
+    (prog1 (org-export-data data new-info)
+      ;; Preserve `:internal-references', as those do not depend on
+      ;; the back-end used; we need to make sure that any new
+      ;; reference when the temporary back-end was active gets through
+      ;; the default one.
+      (plist-put info :internal-references
+		 (plist-get new-info :internal-references)))))
 
 (defun org-export-expand (blob contents &optional with-affiliated)
   "Expand a parsed element or object to its original state.
@@ -2472,20 +2489,24 @@ channel, as a plist.  It must return a string or nil.")
 (defun org-export-filter-apply-functions (filters value info)
   "Call every function in FILTERS.
 
-Functions are called with arguments VALUE, current export
-back-end's name and INFO.  A function returning a nil value will
-be skipped.  If it returns the empty string, the process ends and
-VALUE is ignored.
+Functions are called with three arguments: a value, the export
+back-end name and the communication channel.  First function in
+FILTERS is called with VALUE as its first argument.  Second
+function in FILTERS is called with the previous result as its
+value, etc.
+
+Functions returning nil are skipped.  Any function returning the
+empty string ends the process, which returns the empty string.
 
 Call is done in a LIFO fashion, to be sure that developer
 specified filters, if any, are called first."
-  (catch 'exit
+  (catch :exit
     (let* ((backend (plist-get info :back-end))
 	   (backend-name (and backend (org-export-backend-name backend))))
       (dolist (filter filters value)
 	(let ((result (funcall filter value backend-name info)))
-	  (cond ((not result) value)
-		((equal value "") (throw 'exit nil))
+	  (cond ((not result))
+		((equal result "") (throw :exit ""))
 		(t (setq value result))))))))
 
 (defun org-export-install-filters (info)
@@ -2637,49 +2658,18 @@ The function assumes BUFFER's major mode is `org-mode'."
 			   'invisible (quote ,invis-prop))
 			 ov-set)))))))))
 
-(defun org-export--delete-comments ()
-  "Delete commented areas in the buffer.
-Commented areas are comments, comment blocks, commented trees and
-inlinetasks.  Trailing blank lines after a comment or a comment
-block are removed, as long as it doesn't alter the structure of
-the document.  Narrowing, if any, is ignored."
+(defun org-export--delete-comment-trees ()
+  "Delete commented trees and commented inlinetasks in the buffer.
+Narrowing, if any, is ignored."
   (org-with-wide-buffer
    (goto-char (point-min))
    (let* ((case-fold-search t)
-	  (comment-re "^[ \t]*#\\(?: \\|$\\|\\+end_comment\\)")
-	  (regexp (concat org-outline-regexp-bol ".*" org-comment-string "\\|"
-			  comment-re)))
+	  (regexp (concat org-outline-regexp-bol ".*" org-comment-string)))
      (while (re-search-forward regexp nil t)
        (let ((element (org-element-at-point)))
-	 (pcase (org-element-type element)
-	   ((or `headline `inlinetask)
-	    (when (org-element-property :commentedp element)
-	      (delete-region (org-element-property :begin element)
-			     (org-element-property :end element))))
-	   ((or `comment `comment-block)
-	    (let* ((parent (org-element-property :parent element))
-		   (start (org-element-property :begin element))
-		   (end (org-element-property :end element))
-		   ;; We remove trailing blank lines.  Doing so could
-		   ;; modify the structure of the document.  Therefore
-		   ;; we ensure that any comment between elements is
-		   ;; replaced with one empty line, so as to keep them
-		   ;; separated.
-		   (add-blank?
-		    (save-excursion
-		      (goto-char start)
-		      (not (or (bobp)
-			       (eq (org-element-property :contents-begin parent)
-				   start)
-			       (eq (org-element-property :contents-end parent)
-				   end)
-			       (progn
-				 (forward-line -1)
-				 (or (looking-at-p "^[ \t]*$")
-				     (org-with-limited-levels
-				      (org-at-heading-p)))))))))
-	      (delete-region start end)
-	      (when add-blank? (insert "\n"))))))))))
+	 (when (org-element-property :commentedp element)
+	   (delete-region (org-element-property :begin element)
+			  (org-element-property :end element))))))))
 
 (defun org-export--prune-tree (data info)
   "Prune non exportable elements from DATA.
@@ -3034,7 +3024,7 @@ Return code as a string."
 			     (org-export-backend-name backend))
 	 ;; Include files, delete comments and expand macros.
 	 (org-export-expand-include-keyword)
-	 (org-export--delete-comments)
+	 (org-export--delete-comment-trees)
 	 (org-macro-initialize-templates)
 	 (org-macro-replace-all org-macro-templates nil parsed-keywords)
 	 ;; Refresh buffer properties and radio targets after
@@ -3672,18 +3662,20 @@ the communication channel used for export, as a plist."
   (when (symbolp backend) (setq backend (org-export-get-backend backend)))
   (org-export-barf-if-invalid-backend backend)
   (let ((type (org-element-type data)))
-    (if (memq type '(nil org-data)) (error "No foreign transcoder available")
-      (let* ((all-transcoders (org-export-get-all-transcoders backend))
-	     (transcoder (cdr (assq type all-transcoders))))
-	(if (not (functionp transcoder))
-	    (error "No foreign transcoder available")
-	  (funcall
-	   transcoder data contents
-	   (org-combine-plists
-	    info (list
-		  :back-end backend
-		  :translate-alist all-transcoders
-		  :exported-data (make-hash-table :test #'eq :size 401)))))))))
+    (when (memq type '(nil org-data)) (error "No foreign transcoder available"))
+    (let* ((all-transcoders (org-export-get-all-transcoders backend))
+	   (transcoder (cdr (assq type all-transcoders))))
+      (unless (functionp transcoder) (error "No foreign transcoder available"))
+      (let ((new-info
+	     (org-combine-plists
+	      info (list
+		    :back-end backend
+		    :translate-alist all-transcoders
+		    :exported-data (make-hash-table :test #'eq :size 401)))))
+	;; `:internal-references' are shared across back-ends.
+	(prog1 (funcall transcoder data contents new-info)
+	  (plist-put info :internal-references
+		     (plist-get new-info :internal-references)))))))
 
 
 ;;;; For Export Snippets
@@ -4167,18 +4159,15 @@ error if no block contains REF."
 	(lambda (el)
 	  (with-temp-buffer
 	    (insert (org-trim (org-element-property :value el)))
-	    (let* ((label-fmt (regexp-quote
-			       (or (org-element-property :label-fmt el)
-				   org-coderef-label-format)))
-		   (ref-re
-		    (format "^.*?\\S-.*?\\([ \t]*\\(%s\\)\\)[ \t]*$"
-			    (format label-fmt ref))))
+	    (let* ((label-fmt (or (org-element-property :label-fmt el)
+				  org-coderef-label-format))
+		   (ref-re (org-src-coderef-regexp label-fmt ref)))
 	      ;; Element containing REF is found.  Resolve it to
 	      ;; either a label or a line number, as needed.
 	      (when (re-search-backward ref-re nil t)
-		(cond
-		 ((org-element-property :use-labels el) ref)
-		 (t (+ (or (org-export-get-loc el info) 0) (line-number-at-pos))))))))
+		(if (org-element-property :use-labels el) ref
+		  (+ (or (org-export-get-loc el info) 0)
+		     (line-number-at-pos)))))))
 	info 'first-match)
       (signal 'org-link-broken (list ref))))
 
@@ -4278,8 +4267,7 @@ significant."
 		 (and (org-export-match-search-cell-p datum search-cells)
 		      datum)))))
 	(unless matches
-	  (signal 'org-link-broken
-		  (list (org-element-property :raw-path link))))
+	  (signal 'org-link-broken (list (org-element-property :path link))))
 	(puthash
 	 search-cells
 	 ;; There can be multiple matches for un-typed searches, i.e.,
@@ -5735,6 +5723,12 @@ them."
      ("fr" :ascii "References" :default "Références")
      ("de" :default "Quellen")
      ("es" :default "Referencias"))
+    ("See figure %s"
+     ("fr" :default "cf. figure %s"
+      :html "cf.&nbsp;figure&nbsp;%s" :latex "cf.~figure~%s"))
+    ("See listing %s"
+     ("fr" :default "cf. programme %s"
+      :html "cf.&nbsp;programme&nbsp;%s" :latex "cf.~programme~%s"))
     ("See section %s"
      ("da" :default "jævnfør afsnit %s")
      ("de" :default "siehe Abschnitt %s")
@@ -5747,6 +5741,9 @@ them."
      ("ru" :html "&#1057;&#1084;. &#1088;&#1072;&#1079;&#1076;&#1077;&#1083; %s"
       :utf-8 "См. раздел %s")
      ("zh-CN" :html "&#21442;&#35265;&#31532;%s&#33410;" :utf-8 "参见第%s节"))
+    ("See table %s"
+     ("fr" :default "cf. tableau %s"
+      :html "cf.&nbsp;tableau&nbsp;%s" :latex "cf.~tableau~%s"))
     ("Table"
      ("de" :default "Tabelle")
      ("es" :default "Tabla")
diff --git a/init.el b/init.el
index 7089cfe1..79f60b5d 100644
--- a/init.el
+++ b/init.el
@@ -1,10 +1,11 @@
 (setq load-path
       (append
-       (list (expand-file-name "~/.emacs.d/lisp") (expand-file-name "~/.emacs.d/elpa/org-20161118"))
+       (list (expand-file-name "~/.emacs.d/lisp") (expand-file-name "~/.emacs.d/elpa/org-20170210"))
        load-path))
-
+(if (string-equal system-type "darwin")
+    (delete ' "/Applications/Emacs.app/Contents/Resources/lisp/org" load-path))
 (setq org-use-extra-keys t)
-(require 'org "~/.emacs.d/elpa/org-20161118/org.el")
+(require 'org "~/.emacs.d/elpa/org-20170210/org.el")
 (require 'ob-core)
 (require 'ob-tangle)
 (require 'ob-sql)
-- 
2.47.3