diff options
author | Kyle Meyer <kyle@kyleam.com> | 2017-01-26 00:06:04 -0500 |
---|---|---|
committer | Kyle Meyer <kyle@kyleam.com> | 2017-01-26 00:15:11 -0500 |
commit | 98d672de3dd83ea7d56d022579c340683a2cb84b (patch) | |
tree | f94c776263e80a6ed4382a874aedea2bd0ddd5cb | |
parent | 7278899697ef146ed7048245a9a75a09922f46e0 (diff) | |
download | org-mode-98d672de3dd83ea7d56d022579c340683a2cb84b.tar.gz |
Update "25.2" defcustom :version's that remain in master
* lisp/ob-clojure.el (org-babel-clojure-sync-nrepl-timeout):
* lisp/org-agenda.el (org-agenda-show-future-repeats):
(org-agenda-prefer-last-repeat):
* lisp/org-bibtex.el (org-bibtex-headline-format-function):
* lisp/ox-publish.el (org-publish-sitemap-sort-folders):
* lisp/ox.el (org-export-global-macros): Change :version from "25.2"
to "26.1".
As mentioned in 7c710f6f5, it looks like the goal is to sync Org
9.0.* (maint) with the Emacs master branch. In that case, 26.1 won't
be correct for changes that are specific to Org's master branch, but
neither will 25.2.
-rw-r--r-- | lisp/ob-clojure.el | 2 | ||||
-rw-r--r-- | lisp/org-agenda.el | 4 | ||||
-rw-r--r-- | lisp/org-bibtex.el | 2 | ||||
-rw-r--r-- | lisp/ox-publish.el | 2 | ||||
-rw-r--r-- | lisp/ox.el | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/lisp/ob-clojure.el b/lisp/ob-clojure.el index 6dac2c9..d407105 100644 --- a/lisp/ob-clojure.el +++ b/lisp/ob-clojure.el @@ -67,7 +67,7 @@ If the value is nil, timeout is disabled." :group 'org-babel :type 'integer - :version "25.2" + :version "26.1" :package-version '(Org . "9.1") :safe #'wholenump) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index a21f1ed..b66eb86 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -1256,7 +1256,7 @@ When set to the symbol `next' only the first future repeat is shown." (const :tag "Show all repeated entries" t) (const :tag "Show next repeated entry" next) (const :tag "Do not show repeated entries" nil)) - :version "25.2" + :version "26.1" :package-version '(Org . "9.1") :safe #'symbolp) @@ -1277,7 +1277,7 @@ entries with these TODO keywords." (const :tag "Prefer base date" nil) (repeat :tag "Prefer last repeat for entries with these TODO keywords" (string :tag "TODO keyword"))) - :version "25.2" + :version "26.1" :package-version '(Org . "9.1") :safe (lambda (x) (or (booleanp x) (consp x)))) diff --git a/lisp/org-bibtex.el b/lisp/org-bibtex.el index af6a324..0d4bd22 100644 --- a/lisp/org-bibtex.el +++ b/lisp/org-bibtex.el @@ -244,7 +244,7 @@ It should take a single argument, the bibtex entry (an alist as returned by `org-bibtex-read'). The default value simply returns the entry title." :group 'org-bibtex - :version "25.2" + :version "26.1" :package-version '(Org . "9.1") :type 'function) diff --git a/lisp/ox-publish.el b/lisp/ox-publish.el index fa85174..44f8097 100644 --- a/lisp/ox-publish.el +++ b/lisp/ox-publish.el @@ -335,7 +335,7 @@ This variable is ignored when site-map style is `tree'." (const :tag "Folders after files" last) (const :tag "No folder in site-map" ignore) (const :tag "Mix folders and files" nil)) - :version "25.2" + :version "26.1" :package-version '(Org . "9.1") :safe #'symbolp) @@ -900,7 +900,7 @@ macro's arguments. Moreover, if the template starts with \"(eval\", it will be parsed as an Elisp expression and evaluated accordingly." :group 'org-export-general - :version "25.2" + :version "26.1" :package-version '(Org . "9.1") :type '(repeat (cons (string :tag "Name") |