1
0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-21 06:55:35 +00:00

Change :version in defcustoms from "25.2" to "26.1"

* lisp/ob-J.el (org-babel-J-command):
* lisp/ob-core.el (org-babel-hash-show-time):
* 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-faces.el (org-block):
* lisp/org-src.el (org-src-block-faces):
* 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-show-context-detail):
(org-cycle-hook):
(org-occur-case-fold-search):
(org-preview-latex-default-process):
(org-preview-latex-process-alist):
(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.2" to "26.1".
(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-footnote-defined-format):
(org-latex-images-centered):
(org-latex-default-figure-position):
(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.2" to "26.1".

It looks like the goal is to sync Org 9.0.* (maint) with the Emacs
master branch (what will be version 26.1):
https://lists.gnu.org/archive/html/emacs-orgmode/2017-01/msg00558.html
This commit is contained in:
Kyle Meyer 2017-01-25 23:39:18 -05:00
parent c1822e5560
commit 7c710f6f57
22 changed files with 61 additions and 61 deletions

View File

@ -38,7 +38,7 @@
(defcustom org-babel-J-command "jconsole"
"Command to call J."
:group 'org-babel
:version "25.2"
:version "26.1"
:package-version '(Org . "9.0")
:type 'string)

View File

@ -175,7 +175,7 @@ This string must include a \"%s\" which will be replaced by the results."
"Non-nil means show the time the code block was evaluated in the result hash."
:group 'org-babel
:type 'boolean
:version "25.2"
:version "26.1"
:package-version '(Org . "9.0")
:safe #'booleanp)

View File

@ -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.2"
:version "26.1"
:package-version '(Org . "8.3"))
(defun org-babel-exp-code (info type)

View File

@ -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.2"
:version "26.1"
:package-version '(Org . "9.0")
:type 'function)

View File

@ -1945,7 +1945,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.2"
:version "26.1"
:package-version '(Org . "9.0")
:safe #'booleanp)

View File

@ -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.2"
:version "26.1"
: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.2"
:version "26.1"
: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.2"
:version "26.1"
:type '(choice
(const :tag "confirm with `y-or-n-p'" ask)
(const :tag "always get from annex if necessary" t)

View File

@ -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.2"
:version "26.1"
:package-version '(Org . "8.3")
:type 'boolean)

View File

@ -65,7 +65,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.2"
:version "26.1"
:package-version '(Org . "8.3")
:type '(choice
(const :tag "Always" t)

View File

@ -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.2"
:version "26.1"
:package-version '(Org . "9.0")
:type '(alist :key-type (string :tag " Label")
:value-type (function :tag "Summarize")))

View File

@ -398,7 +398,7 @@ follows a #+DATE:, #+AUTHOR: or #+EMAIL: keyword."
For source-blocks `org-src-block-faces' takes precedence.
See also `org-fontify-quote-and-verse-blocks'."
:group 'org-faces
:version "25.2")
:version "26.1")
(defface org-block-begin-line '((t (:inherit org-meta-line)))
"Face used for the line delimiting the begin of source blocks."

View File

@ -215,7 +215,7 @@ green, respectability.
(choice
(face :tag "Face")
(sexp :tag "Anonymous face"))))
:version "25.2"
:version "26.1"
:package-version '(Org . "9.0"))
(defcustom org-src-tab-acts-natively nil

View File

@ -265,7 +265,7 @@ t accept as input and present for editing"
"Non-nil means increment when copying current field with \
`\\[org-table-copy-down]'."
:group 'org-table-calculation
:version "25.2"
:version "26.1"
:package-version '(Org . "8.3")
:type '(choice
(const :tag "Use the difference between the current and the above fields" t)
@ -378,7 +378,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.2"
:version "26.1"
:package-version '(Org . "8.3")
:type '(choice
(const :tag "Setting an out-of-bounds field generates an error (default)" nil)
@ -407,7 +407,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.2"
:version "26.1"
:package-version '(Org . "8.3"))
(defconst org-table-auto-recalculate-regexp "^[ \t]*| *# *\\(|\\|$\\)"

View File

@ -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.2"
:version "26.1"
:package-version '(Org . "8.3")
:type 'string)

View File

@ -791,7 +791,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.2"
:version "26.1"
:package-version '(Org . "9.0")
:initialize 'custom-initialize-set
:set (lambda (var val)
@ -1206,7 +1206,7 @@ make it harder to edit the location of the match. In such
a case, use the command `org-reveal' (`\\[org-reveal]') to show
more context."
:group 'org-reveal-location
:version "25.2"
:version "26.1"
:package-version '(Org . "9.0")
:type '(choice
(const :tag "Canonical" t)
@ -1427,7 +1427,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.2"
:version "26.1"
:package-version '(Org . "8.3"))
(defgroup org-edit-structure nil
@ -1694,7 +1694,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.2"
:version "26.1"
:type '(choice
(const :tag "Case-sensitive" nil)
(const :tag "Case-insensitive" t)
@ -4081,7 +4081,7 @@ When using LaTeXML set this option to
All available processes and theirs documents can be found in
`org-preview-latex-process-alist', which see."
:group 'org-latex
:version "25.2"
:version "26.1"
:package-version '(Org . "9.0")
:type 'symbol)
@ -4171,7 +4171,7 @@ Place-holders only used by `:image-converter':
%S the image size scale ratio, which is used to adjust image size by some
processing commands."
:group 'org-latex
:version "25.2"
:version "26.1"
:package-version '(Org . "9.0")
:type '(alist :tag "LaTeX to image backends"
:value-type (plist)))
@ -4182,7 +4182,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.2"
:version "26.1"
:package-version '(Org . "9.0")
:type 'string)
@ -4300,7 +4300,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.2"
:version "26.1"
:package-version '(Org . "8.3")
:type '(repeat
(choice
@ -4846,7 +4846,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.2"
:version "26.1"
:package-version '(Org . "8.3")
:group 'org-sparse-trees)
@ -5694,7 +5694,7 @@ The following commands are available:
'(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" . "25.2")))
("9.0" . "26.1")))
(defvar org-mode-transpose-word-syntax-table
(let ((st (make-syntax-table text-mode-syntax-table)))
@ -12453,7 +12453,7 @@ variable `org-mtags-prefer-muse-templates'."
(list
(string :tag "Key")
(string :tag "Template")))
:version "25.2"
:version "26.1"
:package-version '(Org . "8.3"))
(defun org-try-structure-completion ()
@ -18344,7 +18344,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.2"
:version "26.1"
:package-version '(Org . "8.3")
:type '(alist :key-type (string :tag "Modifier")
:value-type (number :tag "Minutes")))
@ -18506,7 +18506,7 @@ The value is a list, with zero or more of the symbols `effort', `appt',
(const appt)
(const stats)
(const category))
:version "25.2"
:version "26.1"
:package-version '(Org . "8.3")
:group 'org-agenda)

View File

@ -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.2"
:version "26.1"
:package-version '(Org . "8.3")
:type 'integer)

View File

@ -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.2"
:version "26.1"
:package-version '(Org . "8.3")
:type '(string :tag "Format string"))

View File

@ -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.2"
:version "26.1"
: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.2"
:version "26.1"
: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.2"
:version "26.1"
:package-version '(Org . "8.3")
:type '(choice (const :tag "Disable" nil)
(list :tag "Enable"

View File

@ -331,7 +331,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.2"
:version "26.1"
:package-version '(Org . "8.3")
:type '(choice
(const :tag "For all elements" t)
@ -394,7 +394,7 @@ labeling scheme to generate labels and resolve links into proper
references."
:group 'org-export-latex
:type 'boolean
:version "25.2"
:version "26.1"
:package-version '(Org . "8.3"))
;;;; Preamble
@ -576,14 +576,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.2"
:version "26.1"
: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.2"
:version "26.1"
:package-version '(Org . "8.3")
:type 'boolean)
@ -620,7 +620,7 @@ inserted.
Setting :latex-hyperref-template in publishing projects will take
precedence over this variable."
:group 'org-export-latex
:version "25.2"
:version "26.1"
:package-version '(Org . "8.3")
:type '(choice (const :tag "No template" nil)
(string :tag "Format string")))
@ -661,7 +661,7 @@ The function result will be used in the section format string."
(const :tag "Use plain superscript (default)" "\\textsuperscript{\\ref{%s}}")
(const :tag "Use Memoir/KOMA-Script footref" "\\footref{%s}")
(string :tag "Other format string"))
:version "25.2"
:version "26.1"
:package-version '(Org . "9.0"))
;;;; Timestamps
@ -687,7 +687,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.2"
:version "26.1"
:package-version '(Org . "9.0")
:type 'boolean
:safe #'booleanp)
@ -721,7 +721,7 @@ environment."
"Default position for LaTeX figures."
:group 'org-export-latex
:type 'string
:version "25.2"
:version "26.1"
:package-version '(Org . "9.0")
:safe #'stringp)
@ -844,7 +844,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.2"
:version "26.1"
:package-version '(Org . "8.3")
:type 'alist
:options '(bold code italic strike-through underline verbatim))
@ -886,7 +886,7 @@ The function must accept seven parameters:
The function should return the string to be exported."
:group 'org-export-latex
:type 'function
:version "25.2"
:version "26.1"
:package-version '(Org . "8.3"))
@ -1091,7 +1091,7 @@ will produce
(list
(symbol :tag "Language name ")
(string :tag "Environment name or format string")))
:version "25.2"
:version "26.1"
:package-version '(Org . "9.0"))
@ -1106,7 +1106,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.2"
:version "26.1"
:package-version '(Org . "9.0"))
(defcustom org-latex-compiler "pdflatex"
@ -1121,7 +1121,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.2"
:version "26.1"
:package-version '(Org . "9.0"))
(defconst org-latex-compilers '("pdflatex" "xelatex" "lualatex")
@ -1139,7 +1139,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.2"
:version "26.1"
:package-version '(Org . "9.0"))
(defcustom org-latex-pdf-process
@ -1199,7 +1199,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.2"
:version "26.1"
:package-version '(Org . "8.3")
:type '(repeat (string :tag "Extension")))
@ -1223,7 +1223,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.2"
:version "26.1"
:package-version '(Org . "8.3")
:type '(repeat
(cons

View File

@ -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.2"
:version "26.1"
: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.2"
:version "26.1"
:package-version '(Org . "9.0"))

View File

@ -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.2"
:version "26.1"
: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.2"
:version "26.1"
: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.2"
:version "26.1"
:package-version '(Org . "8.3")
:type '(alist :key-type (string :tag "Type")
:value-type (regexp :tag "Path")))

View File

@ -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.2"
:version "26.1"
:package-version '(Org . "8.3"))
;;;; Node listing (menu)

View File

@ -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.2"
:version "26.1"
: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.2"
:version "26.1"
: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.2"
:version "26.1"
: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.2"
:version "26.1"
:package-version '(Org . "8.3")
:type '(choice
(const :tag "Always" t)