From 7d35d4649411bed659811ef54ece8959cc1765b1 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 6 May 2020 02:10:15 +0200
Subject: [PATCH] Fix :package-version values

* lisp/ol.el (org-link-email-description-format):
* lisp/org-src.el (org-src-tab-acts-natively):
* lisp/org-table.el (org-table-header-line-p):
* lisp/org.el (org-loop-over-headlines-in-active-region):
(org-fontify-done-headline): Use correct (PACKAGE . VERSION-STRING)
value.  Remove :version keyword since :package-version overrides it.
---
 lisp/ol.el        | 2 +-
 lisp/org-src.el   | 3 +--
 lisp/org-table.el | 2 +-
 lisp/org.el       | 6 ++----
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/lisp/ol.el b/lisp/ol.el
index 452ed95bc..0cb1b0a7e 100644
--- a/lisp/ol.el
+++ b/lisp/ol.el
@@ -460,7 +460,7 @@ This is for example useful to limit the length of the subject.
 
 Examples: \"%f on: %.30s\", \"Email from %f\", \"Email %c\""
   :group 'org-link-store
-  :package-version '(Org . 9.3)
+  :package-version '(Org . "9.3")
   :type 'string
   :safe #'stringp)
 
diff --git a/lisp/org-src.el b/lisp/org-src.el
index 5a17f51bb..c9eef744e 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -241,8 +241,7 @@ green, respectability.
   "If non-nil, the effect of TAB in a code block is as if it were
 issued in the language major mode buffer."
   :type 'boolean
-  :version "27.1"
-  :package-version "9.4"
+  :package-version '(Org . "9.4")
   :group 'org-babel)
 
 
diff --git a/lisp/org-table.el b/lisp/org-table.el
index 48386244a..e9f15dbea 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -169,7 +169,7 @@ table, obtained by prompting the user."
 (defcustom org-table-header-line-p nil
   "Activate `org-table-header-line-mode' by default?"
   :type 'boolean
-  :package-version "9.4"
+  :package-version '(Org . "9.4")
   :group 'org-table)
 
 (defcustom org-table-default-size "5x2"
diff --git a/lisp/org.el b/lisp/org.el
index e82463046..5af4f8c05 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -919,8 +919,7 @@ equivalent option for agenda views."
 		 (const :tag "All headlines in active region" t)
 		 (const :tag "In active region, headlines at the same level than the first one" start-level)
 		 (string :tag "Tags/Property/Todo matcher"))
-  :version "27.1"
-  :package-version "9.4"
+  :package-version '(Org . "9.4")
   :group 'org-todo
   :group 'org-archive)
 
@@ -3592,8 +3591,7 @@ Normally, only the TODO/DONE keyword indicates the state of a headline.
 When this is non-nil, the headline after the keyword is set to the
 `org-headline-done' as an additional indication."
   :group 'org-appearance
-  :version "27.1"
-  :package-version "9.4"
+  :package-version '(Org . "9.4")
   :type 'boolean)
 
 (defcustom org-fontify-emphasized-text t