Merge branch 'maint'

7 files changed, 65 insertions, 14 deletions

diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index aab737e..35aab7a 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -5,7 +5,22 @@ See the end of the file for license conditions.
 
 Please send Org bug reports to emacs-orgmode@gnu.org.
 
-* Version 7.9.1
+* Version 7.9.2
+
+** New ELPA repository for Org packages
+
+You can now add the Org ELPA repository like this:
+
+#+BEGIN_SRC emacs-lisp
+(add-to-list 'package-archives '("org" . "http://orgmode.org/elpa/") t)
+#+END_SRC
+
+It contains both the =org-*.tar= package (the core Org distribution, also
+available through http://elpa.gnu.org) and the =org-plus*.tar= package (the
+extended Org distribution, with non-GNU packages from the =contrib/=
+directory.)
+
+See http://orgmode.org/elpa/
 
 ** Overview of the new keybindings
 
@@ -23,6 +38,7 @@ Please send Org bug reports to emacs-orgmode@gnu.org.
    |                 | =:=    | [[doc::org-columns][org-columns]]                 |
    |                 | =W=    | Set =APPT_WARNTIME=         |
    | =k=             |        | [[doc::org-agenda-capture][org-agenda-capture]]          |
+   | C-c ,           | ,      | [[doc::org-priority][org-priority]]                |
 
 ** New package and Babel langage
 
@@ -41,6 +57,10 @@ Please send Org bug reports to emacs-orgmode@gnu.org.
    - If your code relies on =org-make-link=, please use =concat=
      instead.
 
+   - =org-link-to-org-use-id= has been renamed to
+     =org-id-link-to-org-use-id= and its default value is nil.  The
+     previous default was =create-if-interactive-and-no-custom-id=.
+
 ** New features and user-visible changes
 
 *** Org Element
@@ -509,8 +529,38 @@ Please send Org bug reports to emacs-orgmode@gnu.org.
      Format string to format the date and time in HTML export.  Thanks
      to Sébastien Vauban for this patch.
 
+*** Org Babel
+
+**** New =:results drawer= parameter
+
+=:results drawer= replaces =:results wrap=, which is deprecated but still
+supported.
+
+**** =:results org= now put results in a =#+BEGIN_SRC org= block
+
+=:results org= used to put results in a =#+BEGIN_ORG= block but it now puts
+results in a =#+BEGIN_SRC org= block, wich comma-escaped lines.
+
+=#+BEGIN_ORG= blocks are obsolete.
+
+**** Exporting =#+BEGIN_SRC org= blocks exports the code
+
+It used to exports the results of the code.
+
 *** Miscellaneous
 
+**** New menu entry for [[doc::org-refile][org-refile]]
+**** Allow capturing to encrypted entries
+
+If you capture to an encrypted entry, it will be decrpyted before
+inserting the template then re-encrypted after finalizing the capture.
+
+**** Inactive timestamps are now handled in tables
+
+Calc can do computation on active time-stamps like <2012-09-29 sat.>.
+Inactive time-stamps in a table's cell are now internally deactivated so
+that Calc formulas can operate on them.
+
 **** [[doc::org-table-number-regexp][org-table-number-regexp]] can now accept comma as decimal mark
 **** Org allows a new property =APPT_WARNTIME=
 
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index cffe937..17c92c0 100755
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -1883,7 +1883,7 @@ The buffer is still writable when this hook is called.")
 Agenda commands will then show existing buffer instead of generating new ones.
 When nil, `q' will kill the single agenda buffer."
   :group 'org-agenda
-  ;; :version "24.3"
+  :version "24.3"
   :type 'boolean)
 
 ;;;###autoload
@@ -2375,7 +2375,7 @@ Here it means: in .txt files, use \"p\" as the key for the
 agenda command otherwise associated with \"q\".  (The command
 originally associated with \"q\" is not displayed to avoid
 duplicates.)"
-  ;; :version "24.3"
+  :version "24.3"
   :group 'org-agenda-custom-commands
   :type '(repeat (list :tag "Rule"
 		       (string :tag "        Agenda key")
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index 9f90f70..9d20814 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -371,7 +371,7 @@ The capture buffer is current and still narrowed."
   "When non-nil, add a bookmark pointing at the last stored
 position when capturing."
   :group 'org-capture
-  ;; :version "24.3"
+  :version "24.3"
   :type 'boolean)
 
 ;;; The property list for keeping information about the capture process
@@ -472,7 +472,7 @@ Here it means: in `message-mode buffers', use \"d\" as the
 key for the capture template otherwise associated with \"d\".
 \(The template originally associated with \"q\" is not displayed
 to avoid duplicates.)"
-  ;; :version "24.3"
+  :version "24.3"
   :group 'org-capture
   :type '(repeat (list :tag "Rule"
 		       (string :tag "        Capture key")
@@ -492,7 +492,7 @@ to avoid duplicates.)"
   "Non-nil means use the date at point when capturing from agendas.
 When nil, you can still capturing using the date at point with \\[org-agenda-capture]]."
   :group 'org-capture
-  ;; :version "24.3"
+  :version "24.3"
   :type 'boolean)
 
 ;;;###autoload
diff --git a/lisp/org-datetree.el b/lisp/org-datetree.el
index f2cceb2..4ff8e7d 100644
--- a/lisp/org-datetree.el
+++ b/lisp/org-datetree.el
@@ -41,7 +41,7 @@ so the base level will be properly adjusted.")
 (defcustom org-datetree-add-timestamp nil
   "When non-nil, add a time stamp when create a datetree entry."
   :group 'org-capture
-  ;; :version "24.3"
+  :version "24.3"
   :type '(choice
 	  (const :tag "Do not add a time stamp" nil)
 	  (const :tag "Add an inactive time stamp" inactive)
diff --git a/lisp/org-id.el b/lisp/org-id.el
index a641340..c156e24 100644
--- a/lisp/org-id.el
+++ b/lisp/org-id.el
@@ -114,6 +114,7 @@ nil   Never use an ID to make a link, instead link using a text search for
       the headline text."
   :group 'org-link-store
   :group 'org-id
+  :version "24.3"
   :type '(choice
 	  (const :tag "Create ID to make link" t)
 	  (const :tag "Create if storing link interactively"
diff --git a/lisp/org-latex.el b/lisp/org-latex.el
index 6fdaed6..933fa56 100644
--- a/lisp/org-latex.el
+++ b/lisp/org-latex.el
@@ -330,7 +330,7 @@ its description and the Org's version number, as a string.  Set
 this option to the empty string if you don't want to include
 hyperref options altogether."
   :type 'string
-  ;; :version "24.3"
+  :version "24.3"
   :group 'org-export-latex)
 
 (defcustom org-export-latex-footnote-separator "\\textsuperscript{,}\\,"
@@ -649,7 +649,7 @@ and `org-export-with-tags' instead."
 (defcustom org-export-latex-link-with-unknown-path-format "\\texttt{%s}"
   "Format string for links with unknown path type."
   :group 'org-export-latex
-  ;; :version "24.3"
+  :version "24.3"
   :type 'string)
 
 (defcustom org-export-latex-inline-image-extensions
diff --git a/lisp/org.el b/lisp/org.el
index a52bfde..b537ff4 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -1413,7 +1413,7 @@ return the description to use."
 (defcustom org-url-hexify-p t
   "When non-nil, hexify URL when creating a link."
   :type 'boolean
-  ;; :version "24.3"
+  :version "24.3"
   :group 'org-link-store)
 
 (defcustom org-email-link-description-format "Email %c: %.30s"
@@ -1817,7 +1817,7 @@ For more examples, see the system specific constants
 (defcustom org-doi-server-url "http://dx.doi.org/"
   "The URL of the DOI server."
   :type 'string
-  ;; :version "24.3"
+  :version "24.3"
   :group 'org-link-follow)
 
 (defgroup org-refile nil
@@ -3402,7 +3402,7 @@ imagemagick     Convert the LaTeX fragments to pdf files and use imagemagick
    directories relative to the processed org files paths.  An absolute path
    puts all preview images at the same place."
   :group 'org-latex
-  ;; :version "24.3"
+  :version "24.3"
   :type 'string)
 
 (defun org-format-latex-mathml-available-p ()
@@ -3588,7 +3588,7 @@ The default use of these custom properties is to let the user
 hide them with `org-toggle-custom-properties-visibility'."
   :group 'org-properties
   :group 'org-appearance
-  ;; :version "24.3"
+  :version "24.3"
   :type '(repeat (string :tag "Property Name")))
 
 (defcustom org-fontify-done-headline nil
@@ -4283,7 +4283,7 @@ Otherwise, these types are allowed:
 		 (const :tag "Only inactive timestamps" inactive)
 		 (const :tag "Only scheduled timestamps" scheduled)
 		 (const :tag "Only deadline timestamps" deadline))
-  ;; :version "24.3"
+  :version "24.3"
   :group 'org-sparse-trees)
 
 (defun org-cycle-hide-archived-subtrees (state)