From d9070419119cf6b19f2f471aa2eb81ec3d9b0d0f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 5 Oct 2016 11:18:39 +0200
Subject: [PATCH] Change :version in defcustoms from "25.1" to "25.2"

* lisp/ob-exp.el (org-babel-exp-inline-code-template):
* lisp/ob-lisp.el (org-babel-lisp-eval-fn):
* lisp/org-agenda.el (org-agenda-view-columns-initially):
* lisp/org-attach.el (org-attach-commit):
(org-attach-archive-delete):
(org-attach-annex-auto-get):
* lisp/org-bibtex.el (org-bibtex-inherit-tags):
* lisp/org-clock.el (org-clock-into-drawer):
* lisp/org-colview.el (org-columns-summary-types):
* lisp/org-table.el (org-table-copy-increment):
(org-table-formula-create-columns):
(org-table-convert-region-max-lines):
* lisp/org-timer.el (org-timer-default-timer):
* lisp/org.el (org-export-backends):
(org-cycle-hook):
(org-occur-case-fold-search):
(org-preview-latex-image-directory):
(org-latex-default-packages-alist):
(org-sparse-tree-default-date-type):
(org-structure-template-alist):
(org-effort-durations):
(org-agenda-ignore-properties): Change :version from "25.1" to "25.2".
(customize-package-emacs-version-alist): Fix associations between Org
and Emacs releases.
* lisp/ox-ascii.el (org-ascii-list-margin):
* lisp/ox-beamer.el (org-beamer-subtitle-format):
* lisp/ox-html.el (org-html-format-headline-function):
(org-html-format-inlinetask-function):
(org-html-viewport):
* lisp/ox-latex.el (org-latex-caption-above):
(org-latex-prefer-user-labels):
(org-latex-subtitle-format):
(org-latex-hyperref-template):
(org-latex-images-centered):
(org-latex-text-markup-alist):
(org-latex-format-inlinetask-function):
(org-latex-custom-lang-environments):
(org-latex-compiler-file-string):
(org-latex-compiler):
(org-latex-bib-compiler):
(org-latex-logfiles-extensions):
(org-latex-known-warnings):
* lisp/ox-md.el (org-md-footnotes-section):
(org-md-footnote-format):
* lisp/ox-odt.el (org-odt-format-headline-function):
(org-odt-format-inlinetask-function):
(org-odt-inline-image-rules):
* lisp/ox-texinfo.el (org-texinfo-format-headline-function):
* lisp/ox.el (org-export-with-creator):
(org-export-with-title):
(org-export-with-broken-links):
(org-export-copy-to-kill-ring): Change :version from "25.1" to "25.2".

Neither Org 8.3 nor Org 9.0 were released with Emacs 25.1.
---
 lisp/ob-exp.el      |  2 +-
 lisp/ob-lisp.el     |  2 +-
 lisp/org-agenda.el  |  2 +-
 lisp/org-attach.el  |  6 +++---
 lisp/org-bibtex.el  |  2 +-
 lisp/org-clock.el   |  2 +-
 lisp/org-colview.el |  2 +-
 lisp/org-table.el   |  6 +++---
 lisp/org-timer.el   |  2 +-
 lisp/org.el         | 21 +++++++++++----------
 lisp/ox-ascii.el    |  2 +-
 lisp/ox-beamer.el   |  2 +-
 lisp/ox-html.el     |  6 +++---
 lisp/ox-latex.el    | 28 ++++++++++++++--------------
 lisp/ox-md.el       |  4 ++--
 lisp/ox-odt.el      |  6 +++---
 lisp/ox-texinfo.el  |  2 +-
 lisp/ox.el          |  8 ++++----
 18 files changed, 53 insertions(+), 52 deletions(-)

diff --git a/lisp/ob-exp.el b/lisp/ob-exp.el
index 0847903f4..6aebcd5ee 100644
--- a/lisp/ob-exp.el
+++ b/lisp/ob-exp.el
@@ -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.1"
+  :version "25.2"
   :package-version '(Org . "8.3"))
 
 (defun org-babel-exp-code (info type)
diff --git a/lisp/ob-lisp.el b/lisp/ob-lisp.el
index cec15108b..da7e4f4a7 100644
--- a/lisp/ob-lisp.el
+++ b/lisp/ob-lisp.el
@@ -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.1"
+  :version "25.2"
   :package-version '(Org . "9.0")
   :type 'function)
 
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 81ed6481a..bde2f8d17 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -1939,7 +1939,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.1"
+  :version "25.2"
   :package-version '(Org . "9.0")
   :safe #'booleanp)
 
diff --git a/lisp/org-attach.el b/lisp/org-attach.el
index b03beb66a..4bcf28bf9 100644
--- a/lisp/org-attach.el
+++ b/lisp/org-attach.el
@@ -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.1"
+  :version "25.2"
   :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.1"
+  :version "25.2"
   :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.1"
+  :version "25.2"
   :type '(choice
 	  (const :tag "confirm with `y-or-n-p'" ask)
 	  (const :tag "always get from annex if necessary" t)
diff --git a/lisp/org-bibtex.el b/lisp/org-bibtex.el
index 52661f9e4..db5d97b3c 100644
--- a/lisp/org-bibtex.el
+++ b/lisp/org-bibtex.el
@@ -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.1"
+  :version "25.2"
   :package-version '(Org . "8.3")
   :type 'boolean)
 
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 84b977312..da9b8375f 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -67,7 +67,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.1"
+  :version "25.2"
   :package-version '(Org . "8.3")
   :type '(choice
 	  (const :tag "Always" t)
diff --git a/lisp/org-colview.el b/lisp/org-colview.el
index 7bf077a3d..82434f58e 100644
--- a/lisp/org-colview.el
+++ b/lisp/org-colview.el
@@ -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.1"
+  :version "25.2"
   :package-version '(Org . "9.0")
   :type '(alist :key-type (string :tag "       Label")
 		:value-type (function :tag "Summarize")))
diff --git a/lisp/org-table.el b/lisp/org-table.el
index d92882521..5c49231e5 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -264,7 +264,7 @@ t       accept as input and present for editing"
 (defcustom org-table-copy-increment t
   "Non-nil means increment when copying current field with \\[org-table-copy-down]."
   :group 'org-table-calculation
-  :version "25.1"
+  :version "25.2"
   :package-version '(Org . "8.3")
   :type '(choice
 	  (const :tag "Use the difference between the current and the above fields" t)
@@ -377,7 +377,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.1"
+  :version "25.2"
   :package-version '(Org . "8.3")
   :type '(choice
 	  (const :tag "Setting an out-of-bounds field generates an error (default)" nil)
@@ -406,7 +406,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.1"
+  :version "25.2"
   :package-version '(Org . "8.3"))
 
 (defconst org-table-auto-recalculate-regexp "^[ \t]*| *# *\\(|\\|$\\)"
diff --git a/lisp/org-timer.el b/lisp/org-timer.el
index 9be67b2d6..efc1fd8d3 100644
--- a/lisp/org-timer.el
+++ b/lisp/org-timer.el
@@ -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.1"
+  :version "25.2"
   :package-version '(Org . "8.3")
   :type 'string)
 
diff --git a/lisp/org.el b/lisp/org.el
index 99c5fa740..18b58a4f8 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -785,7 +785,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.1"
+  :version "25.2"
   :package-version '(Org . "9.0")
   :initialize 'custom-initialize-set
   :set (lambda (var val)
@@ -1412,7 +1412,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.1"
+  :version "25.2"
   :package-version '(Org . "8.3"))
 
 (defgroup org-edit-structure nil
@@ -1677,7 +1677,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.1"
+  :version "25.2"
   :type '(choice
 	  (const :tag "Case-sensitive" nil)
 	  (const :tag "Case-insensitive" t)
@@ -4153,7 +4153,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.1"
+  :version "25.2"
   :package-version '(Org . "9.0")
   :type 'string)
 
@@ -4271,7 +4271,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.1"
+  :version "25.2"
   :package-version '(Org . "8.3")
   :type '(repeat
 	  (choice
@@ -4817,7 +4817,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.1"
+  :version "25.2"
   :package-version '(Org . "8.3")
   :group 'org-sparse-trees)
 
@@ -5647,7 +5647,8 @@ The following commands are available:
 (add-to-list 'customize-package-emacs-version-alist
 	     '(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.3" . "25.1")))
+		   ("8.2.6" . "24.4") ("8.2.10" . "24.5")
+		   ("9.0" . "25.2")))
 
 (defvar org-mode-transpose-word-syntax-table
   (let ((st (make-syntax-table text-mode-syntax-table)))
@@ -12389,7 +12390,7 @@ variable `org-mtags-prefer-muse-templates'."
 	  (list
 	   (string :tag "Key")
 	   (string :tag "Template")))
-  :version "25.1"
+  :version "25.2"
   :package-version '(Org . "8.3"))
 
 (defun org-try-structure-completion ()
@@ -18289,7 +18290,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.1"
+  :version "25.2"
   :package-version '(Org . "8.3")
   :type '(alist :key-type (string :tag "Modifier")
 		:value-type (number :tag "Minutes")))
@@ -18451,7 +18452,7 @@ The value is a list, with zero or more of the symbols `effort', `appt',
 	      (const appt)
 	      (const stats)
 	      (const category))
-  :version "25.1"
+  :version "25.2"
   :package-version '(Org . "8.3")
   :group 'org-agenda)
 
diff --git a/lisp/ox-ascii.el b/lisp/ox-ascii.el
index f5e797e25..43808aa02 100644
--- a/lisp/ox-ascii.el
+++ b/lisp/ox-ascii.el
@@ -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.1"
+  :version "25.2"
   :package-version '(Org . "8.3")
   :type 'integer)
 
diff --git a/lisp/ox-beamer.el b/lisp/ox-beamer.el
index 2d1d53f5b..c254c0b3f 100644
--- a/lisp/ox-beamer.el
+++ b/lisp/ox-beamer.el
@@ -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.1"
+  :version "25.2"
   :package-version '(Org . "8.3")
   :type '(string :tag "Format string"))
 
diff --git a/lisp/ox-html.el b/lisp/ox-html.el
index e351d9afa..26c5cdd6f 100644
--- a/lisp/ox-html.el
+++ b/lisp/ox-html.el
@@ -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.1"
+  :version "25.2"
   :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.1"
+  :version "25.2"
   :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.1"
+  :version "25.2"
   :package-version '(Org . "8.3")
   :type '(choice (const :tag "Disable" nil)
 		 (list :tag "Enable"
diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index 5fe8628e9..1f1ad4034 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -329,7 +329,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.1"
+  :version "25.2"
   :package-version '(Org . "8.3")
   :type '(choice
 	  (const :tag "For all elements" t)
@@ -392,7 +392,7 @@ labeling scheme to generate labels and resolve links into proper
 references."
   :group 'org-export-latex
   :type 'boolean
-  :version "25.1"
+  :version "25.2"
   :package-version '(Org . "8.3"))
 
 ;;;; Preamble
@@ -574,14 +574,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.1"
+  :version "25.2"
   :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.1"
+  :version "25.2"
   :package-version '(Org . "8.3")
   :type 'boolean)
 
@@ -618,7 +618,7 @@ inserted.
 Setting :latex-hyperref-template in publishing projects will take
 precedence over this variable."
   :group 'org-export-latex
-  :version "25.1"
+  :version "25.2"
   :package-version '(Org . "8.3")
   :type '(choice (const :tag "No template" nil)
 		 (string :tag "Format string")))
@@ -685,7 +685,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.1"
+  :version "25.2"
   :package-version '(Org . "9.0")
   :type 'boolean
   :safe #'booleanp)
@@ -842,7 +842,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.1"
+  :version "25.2"
   :package-version '(Org . "8.3")
   :type 'alist
   :options '(bold code italic strike-through underline verbatim))
@@ -884,7 +884,7 @@ The function must accept seven parameters:
 The function should return the string to be exported."
   :group 'org-export-latex
   :type 'function
-  :version "25.1"
+  :version "25.2"
   :package-version '(Org . "8.3"))
 
 
@@ -1089,7 +1089,7 @@ will produce
 	  (list
 	   (symbol :tag "Language name                    ")
 	   (string :tag "Environment name or format string")))
-  :version "25.1"
+  :version "25.2"
   :package-version '(Org . "9.0"))
 
 
@@ -1104,7 +1104,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.1"
+  :version "25.2"
   :package-version '(Org . "9.0"))
 
 (defcustom org-latex-compiler "pdflatex"
@@ -1119,7 +1119,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.1"
+  :version "25.2"
   :package-version '(Org . "9.0"))
 
 (defconst org-latex-compilers '("pdflatex" "xelatex" "lualatex")
@@ -1137,7 +1137,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.1"
+  :version "25.2"
   :package-version '(Org . "9.0"))
 
 (defcustom org-latex-pdf-process
@@ -1194,7 +1194,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.1"
+  :version "25.2"
   :package-version '(Org . "8.3")
   :type '(repeat (string :tag "Extension")))
 
@@ -1218,7 +1218,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.1"
+  :version "25.2"
   :package-version '(Org . "8.3")
   :type '(repeat
 	  (cons
diff --git a/lisp/ox-md.el b/lisp/ox-md.el
index c2e4966f8..b8c470476 100644
--- a/lisp/ox-md.el
+++ b/lisp/ox-md.el
@@ -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.1"
+ :version "25.2"
  :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.1"
+  :version "25.2"
   :package-version '(Org . "9.0"))
 
 
diff --git a/lisp/ox-odt.el b/lisp/ox-odt.el
index d68faf441..edc883bd8 100644
--- a/lisp/ox-odt.el
+++ b/lisp/ox-odt.el
@@ -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.1"
+  :version "25.2"
   :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.1"
+  :version "25.2"
   :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.1"
+  :version "25.2"
   :package-version '(Org . "8.3")
   :type '(alist :key-type (string :tag "Type")
 		:value-type (regexp :tag "Path")))
diff --git a/lisp/ox-texinfo.el b/lisp/ox-texinfo.el
index 39cb8ad2c..cf9cc2ff8 100644
--- a/lisp/ox-texinfo.el
+++ b/lisp/ox-texinfo.el
@@ -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.1"
+  :version "25.2"
   :package-version '(Org . "8.3"))
 
 ;;;; Node listing (menu)
diff --git a/lisp/ox.el b/lisp/ox.el
index 0ae07abac..92acdfa10 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -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.1"
+  :version "25.2"
   :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.1"
+  :version "25.2"
   :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.1"
+  :version "25.2"
   :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.1"
+  :version "25.2"
   :package-version '(Org . "8.3")
   :type '(choice
 	  (const :tag "Always" t)