From 6496d0ca956b91de7204989111db826644eaac30 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Thu, 7 Sep 2017 16:56:11 -0400 Subject: [PATCH 1/2] Correct defcustom version information * lisp/ob-lilypond.el (org-babel-lilypond-commands): * lisp/ob-lua.el (org-babel-lua-command): (org-babel-lua-mode): (org-babel-lua-hline-to): (org-babel-lua-None-to): * lisp/org-agenda.el (org-agenda-search-view-max-outline-level): * lisp/org.el (org-mouse-1-follows-link): (org-src-fontify-natively): (orgstruct-heading-prefix-regexp): * lisp/ox-ascii.el (org-ascii-format-inlinetask-function): * lisp/ox-latex.el (org-latex-format-drawer-function): (org-latex-listings-langs): * lisp/ox-odt.el (org-odt-format-drawer-function): * lisp/ox.el (org-export-with-properties): Correct ":version" value. * lisp/org-attach.el (org-attach-annex-auto-get): Correct ":package-version" value. --- lisp/ob-lilypond.el | 2 +- lisp/ob-lua.el | 8 ++++---- lisp/org-agenda.el | 2 +- lisp/org-attach.el | 2 +- lisp/org.el | 6 +++--- lisp/ox-ascii.el | 2 +- lisp/ox-latex.el | 4 ++-- lisp/ox-odt.el | 2 +- lisp/ox.el | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/lisp/ob-lilypond.el b/lisp/ob-lilypond.el index 37a7a6b57..e064aab7c 100644 --- a/lisp/ob-lilypond.el +++ b/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) diff --git a/lisp/ob-lua.el b/lisp/ob-lua.el index 877d89528..ac0ef8021 100644 --- a/lisp/ob-lua.el +++ b/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) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 76bfa90d1..7f3fec443 100644 --- a/lisp/org-agenda.el +++ b/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) diff --git a/lisp/org-attach.el b/lisp/org-attach.el index 1249de79a..1dccd1e00 100644 --- a/lisp/org-attach.el +++ b/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) diff --git a/lisp/org.el b/lisp/org.el index 3d817947f..3ec83ac74 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -2053,7 +2053,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) @@ -5903,7 +5903,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) @@ -9065,7 +9065,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) diff --git a/lisp/ox-ascii.el b/lisp/ox-ascii.el index f8192504c..71d3d7de9 100644 --- a/lisp/ox-ascii.el +++ b/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) diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el index 12f6b9e01..e3d32f2e9 100644 --- a/lisp/ox-latex.el +++ b/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 diff --git a/lisp/ox-odt.el b/lisp/ox-odt.el index ac9df27fa..8846aba63 100644 --- a/lisp/ox-odt.el +++ b/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) diff --git a/lisp/ox.el b/lisp/ox.el index c96eb6e7c..b6528d90c 100644 --- a/lisp/ox.el +++ b/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) From 79d9f0c0ce49cb852995b7093c20e5adff291806 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Thu, 7 Sep 2017 16:56:11 -0400 Subject: [PATCH 2/2] Update customize-package-emacs-version-alist * lisp/org.el (customize-package-emacs-version-alist): Add entries for all existing ":package-version" values, and remove entries for versions that aren't used as ":package-version" values. Note that this alist has a limited effect because we specify ":version" in almost all of our defcustoms. Two functions make use of this alist: describe-variable-custom-version-info and customize-changed-options. The former only looks at the alist if :version isn't specified, and the latter only looks at :version if an entry for :package-version isn't found in the alist. We should consider removing the defcustom :version specifications so that the package-version->version mapping only needs to be maintained in one place. --- lisp/org.el | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 3ec83ac74..1ed50ecd1 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -5552,10 +5552,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") - ("7.8.11" . "24.1") ("7.9.4" . "24.3") - ("8.2.6" . "24.4") ("8.2.10" . "24.5") - ("9.0" . "26.1"))) + '(Org ("8.0" . "24.4") + ("8.1" . "24.4") + ("8.2" . "24.4") + ("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)))