Merge branch 'maint'

lisp/ob-lilypond.el

@@ -89,7 +89,7 @@ you can leave the string empty on this case."
 	  (string :tag "Lilypond   ")
 	  (string :tag "PDF Viewer ")
 	  (string :tag "MIDI Player"))
-  :version "24.3"
+  :version "24.4"
   :package-version '(Org . "8.2.7")
   :set
   (lambda (_symbol value)

lisp/ob-lua.el

@@ -49,7 +49,7 @@
 
 (defcustom org-babel-lua-command "lua"
   "Name of the command for executing Lua code."
-  :version "24.5"
+  :version "26.1"
   :package-version '(Org . "8.3")
   :group 'org-babel
   :type 'string)
@@ -58,21 +58,21 @@
   "Preferred lua mode for use in running lua interactively.
 This will typically be 'lua-mode."
   :group 'org-babel
-  :version "24.5"
+  :version "26.1"
   :package-version '(Org . "8.3")
   :type 'symbol)
 
 (defcustom org-babel-lua-hline-to "None"
   "Replace hlines in incoming tables with this when translating to lua."
   :group 'org-babel
-  :version "24.5"
+  :version "26.1"
   :package-version '(Org . "8.3")
   :type 'string)
 
 (defcustom org-babel-lua-None-to 'hline
   "Replace 'None' in lua tables with this before returning."
   :group 'org-babel
-  :version "24.5"
+  :version "26.1"
   :package-version '(Org . "8.3")
   :type 'symbol)
 

lisp/org-agenda.el

@@ -1445,7 +1445,7 @@ E.g. when this is set to 1, the search view will only
 show headlines of level 1.  When set to 0, the default
 value, don't limit agenda view by outline level."
   :group 'org-agenda-search-view
-  :version "24.4"
+  :version "26.1"
   :package-version '(Org . "8.3")
   :type 'integer)
 

lisp/org-attach.el

@@ -144,7 +144,7 @@ When set to `query', ask the user instead."
   "Confirmation preference for automatically getting annex files.
 If \\='ask, prompt using `y-or-n-p'.  If t, always get.  If nil, never get."
   :group 'org-attach
-  :package-version '(Org . "9")
+  :package-version '(Org . "9.0")
   :version "26.1"
   :type '(choice
 	  (const :tag "confirm with `y-or-n-p'" ask)

lisp/org.el

@@ -2064,7 +2064,7 @@ In tables, the special behavior of RET has precedence."
 A longer mouse click will still set point.  Needs to be set
 before org.el is loaded."
   :group 'org-link-follow
-  :version "24.4"
+  :version "26.1"
   :package-version '(Org . "8.3")
   :type '(choice
 	  (const :tag "A double click follows the link" double)
@@ -5569,10 +5569,13 @@ The following commands are available:
 
 ;; Update `customize-package-emacs-version-alist'
 (add-to-list 'customize-package-emacs-version-alist
-	     '(Org ("6.21b" . "23.1")  ("6.33x" . "23.2")
+	     '(Org ("8.0" . "24.4")
-		   ("7.8.11" . "24.1") ("7.9.4" . "24.3")
+		   ("8.1" . "24.4")
-		   ("8.2.6" . "24.4") ("8.2.10" . "24.5")
+		   ("8.2" . "24.4")
-		   ("9.0" . "26.1")))
+		   ("8.2.7" . "24.4")
+		   ("8.3" . "26.1")
+		   ("9.0" . "26.1")
+		   ("9.1" . "26.1")))
 
 (defvar org-mode-transpose-word-syntax-table
   (let ((st (make-syntax-table text-mode-syntax-table)))
@@ -5920,7 +5923,7 @@ This includes angle, plain, and bracket links."
   "When non-nil, fontify code in code blocks.
 See also the `org-block' face."
   :type 'boolean
-  :version "24.4"
+  :version "26.1"
   :package-version '(Org . "8.3")
   :group 'org-appearance
   :group 'org-babel)
@@ -9071,7 +9074,7 @@ function is being called interactively."
   "Regexp that matches the custom prefix of Org headlines in
 orgstruct(++)-mode."
   :group 'org
-  :version "24.4"
+  :version "26.1"
   :package-version '(Org . "8.3")
   :type 'regexp)
 ;;;###autoload(put 'orgstruct-heading-prefix-regexp 'safe-local-variable 'stringp)

lisp/ox-ascii.el

@@ -401,7 +401,7 @@ The function must accept nine parameters:
 The function should return either the string to be exported or
 nil to ignore the inline task."
   :group 'org-export-ascii
-  :version "24.4"
+  :version "26.1"
   :package-version '(Org . "8.3")
   :type 'function)
 

lisp/ox-latex.el

@@ -865,7 +865,7 @@ The function should return the string to be exported.
 
 The default function simply returns the value of CONTENTS."
   :group 'org-export-latex
-  :version "24.4"
+  :version "26.1"
   :package-version '(Org . "8.3")
   :type 'function)
 
@@ -956,7 +956,7 @@ parameter for the listings package.  If the mode name and the
 listings name are the same, the language does not need an entry
 in this list - but it does not hurt if it is present."
   :group 'org-export-latex
-  :version "24.4"
+  :version "26.1"
   :package-version '(Org . "8.3")
   :type '(repeat
 	  (list

lisp/ox-odt.el

@@ -656,7 +656,7 @@ The function should return the string to be exported.
 
 The default value simply returns the value of CONTENTS."
   :group 'org-export-odt
-  :version "24.4"
+  :version "26.1"
   :package-version '(Org . "8.3")
   :type 'function)
 

lisp/ox.el

@@ -594,7 +594,7 @@ properties to export, as strings.
 This option can also be set with the OPTIONS keyword,
 e.g. \"prop:t\"."
   :group 'org-export-general
-  :version "24.4"
+  :version "26.1"
   :package-version '(Org . "8.3")
   :type '(choice
 	  (const :tag "All properties" t)