branch: externals-release/org
commit d0f774b0b4d07c011ca64854314224079debf7ec
Merge: fa31598 e83ee60
Author: Kyle Meyer <k...@kyleam.com>
Commit: Kyle Meyer <k...@kyleam.com>
Merge branch 'km/from-emacs-28' into bugfix
---
lisp/ob-julia.el | 8 ++++----
lisp/oc-basic.el | 8 +++++---
lisp/oc-biblatex.el | 8 +++++---
lisp/oc-csl.el | 12 +++++++-----
lisp/oc-natbib.el | 8 +++++---
lisp/oc.el | 8 +++++---
lisp/ol-doi.el | 10 ++++++----
lisp/org-plot.el | 2 +-
lisp/ox-koma-letter.el | 4 ++--
9 files changed, 40 insertions(+), 28 deletions(-)
diff --git a/lisp/ob-julia.el b/lisp/ob-julia.el
index 2e70ed3..4fae0d1 100644
--- a/lisp/ob-julia.el
+++ b/lisp/ob-julia.el
@@ -6,20 +6,20 @@
;; Keywords: literate programming, reproducible research, scientific computing
;; Homepage: https://github.com/phrb/ob-julia
-;; This file is not part of GNU Emacs.
+;; This file is part of GNU Emacs.
-;; This program is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
-;; This program is distributed in the hope that it will be useful,
+;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with this program. If not, see <https://www.gnu.org/licenses/>.
+;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
;;; Commentary:
diff --git a/lisp/oc-basic.el b/lisp/oc-basic.el
index 3b58990..bf0153d 100644
--- a/lisp/oc-basic.el
+++ b/lisp/oc-basic.el
@@ -4,18 +4,20 @@
;; Author: Nicolas Goaziou <m...@nicolasgoaziou.fr>
-;; This program is free software; you can redistribute it and/or modify
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
-;; This program is distributed in the hope that it will be useful,
+;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with this program. If not, see <https://www.gnu.org/licenses/>.
+;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
;;; Commentary:
diff --git a/lisp/oc-biblatex.el b/lisp/oc-biblatex.el
index a27f9e9..224abae 100644
--- a/lisp/oc-biblatex.el
+++ b/lisp/oc-biblatex.el
@@ -4,18 +4,20 @@
;; Author: Nicolas Goaziou <m...@nicolasgoaziou.fr>
-;; This program is free software; you can redistribute it and/or modify
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
-;; This program is distributed in the hope that it will be useful,
+;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with this program. If not, see <https://www.gnu.org/licenses/>.
+;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
;;; Commentary:
diff --git a/lisp/oc-csl.el b/lisp/oc-csl.el
index 50df121..cf3538b 100644
--- a/lisp/oc-csl.el
+++ b/lisp/oc-csl.el
@@ -4,18 +4,20 @@
;; Author: Nicolas Goaziou <m...@nicolasgoaziou.fr>
-;; This program is free software; you can redistribute it and/or modify
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
-;; This program is distributed in the hope that it will be useful,
+;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with this program. If not, see <https://www.gnu.org/licenses/>.
+;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
;;; Commentary:
@@ -123,7 +125,7 @@ If nil then only the fallback en-US locale will be
available."
:group 'org-cite
:package-version '(Org . "9.5")
:type '(choice
- (dir :tag "Locales directory")
+ (directory :tag "Locales directory")
(const :tag "Use en-US locale only" nil))
:safe t)
@@ -134,7 +136,7 @@ directory. This variable is ignored when style file is
absolute."
:group 'org-cite
:package-version '(Org . "9.5")
:type '(choice
- (dir :tag "Styles directory")
+ (directory :tag "Styles directory")
(const :tag "Use absolute file names" nil))
:safe t)
diff --git a/lisp/oc-natbib.el b/lisp/oc-natbib.el
index 7e2127b..c012ff1 100644
--- a/lisp/oc-natbib.el
+++ b/lisp/oc-natbib.el
@@ -4,18 +4,20 @@
;; Author: Nicolas Goaziou <m...@nicolasgoaziou.fr>
-;; This program is free software; you can redistribute it and/or modify
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
-;; This program is distributed in the hope that it will be useful,
+;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with this program. If not, see <https://www.gnu.org/licenses/>.
+;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
;;; Commentary:
diff --git a/lisp/oc.el b/lisp/oc.el
index eb2b7a1..bb2e04d 100644
--- a/lisp/oc.el
+++ b/lisp/oc.el
@@ -4,18 +4,20 @@
;; Author: Nicolas Goaziou <m...@nicolasgoaziou.fr>
-;; This program is free software; you can redistribute it and/or modify
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
-;; This program is distributed in the hope that it will be useful,
+;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with this program. If not, see <https://www.gnu.org/licenses/>.
+;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
;;; Commentary:
diff --git a/lisp/ol-doi.el b/lisp/ol-doi.el
index dfde380..d2d16b2 100644
--- a/lisp/ol-doi.el
+++ b/lisp/ol-doi.el
@@ -1,21 +1,23 @@
;;; ol-doi.el --- DOI links support in Org -*- lexical-binding: t;
-*-
-;; Copyright (C) 2021 Free Software Foundation, Inc.
+;; Copyright (C) 2021 Free Software Foundation, Inc.
;; Author: Nicolas Goaziou <m...@nicolasgoaziou.fr>
-;; This program is free software; you can redistribute it and/or modify
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
-;; This program is distributed in the hope that it will be useful,
+;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with this program. If not, see <https://www.gnu.org/licenses/>.
+;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
;;; Commentary:
diff --git a/lisp/org-plot.el b/lisp/org-plot.el
index 63176fc..4f14c7d 100644
--- a/lisp/org-plot.el
+++ b/lisp/org-plot.el
@@ -392,7 +392,7 @@ be set.
Accepts string, nil, or lambda function which returns string
or nil. Defaults to nil."
:group 'org-plot
- :type '(alist :value-type (symbol group)))
+ :type 'alist)
(defvar org--plot/radar-template
"### spider plot/chart with gnuplot
diff --git a/lisp/ox-koma-letter.el b/lisp/ox-koma-letter.el
index 1150643..6a895a6 100644
--- a/lisp/ox-koma-letter.el
+++ b/lisp/ox-koma-letter.el
@@ -11,12 +11,12 @@
;; This file is part of GNU Emacs.
-;; This program is free software: you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
-;; This program is distributed in the hope that it will be useful,
+;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
