[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/org 9e71dfd: Merge branch 'bugfix'
|
From: |
ELPA Syncer |
|
Subject: |
[elpa] externals/org 9e71dfd: Merge branch 'bugfix' |
|
Date: |
Sat, 2 Oct 2021 01:03:31 -0400 (EDT) |
branch: externals/org
commit 9e71dfd921dcefbc8335b346c1f9e7baa0b3d166
Merge: 60365a1 9cc7f8b
Author: Kyle Meyer <kyle@kyleam.com>
Commit: Kyle Meyer <kyle@kyleam.com>
Merge branch 'bugfix'
---
etc/csl/README | 10 ++++++++++
lisp/ob-julia.el | 8 ++++----
lisp/oc-basic.el | 8 +++++---
lisp/oc-biblatex.el | 8 +++++---
lisp/oc-csl.el | 36 ++++++++++++++++++++++--------------
lisp/oc-natbib.el | 8 +++++---
lisp/oc.el | 8 +++++---
lisp/ol-doi.el | 10 ++++++----
lisp/org-plot.el | 2 +-
lisp/org.el | 1 +
lisp/ox-koma-letter.el | 4 ++--
11 files changed, 66 insertions(+), 37 deletions(-)
diff --git a/etc/csl/README b/etc/csl/README
new file mode 100644
index 0000000..1d2e520
--- /dev/null
+++ b/etc/csl/README
@@ -0,0 +1,10 @@
+These data files are used by Org's oc-csl.el library.
+
+COPYRIGHT AND LICENSE INFORMATION
+
+chicago-author-date.csl
+locales-en-US.xml
+
+ Both of these files are part of the Citation Style Language (CSL)
+ project (<https://citationstyles.org/>) and are released under the
+ Creative Commons Attribution-ShareAlike 3.0 Unported license.
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 <mail@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 <mail@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..4378ab5 100644
--- a/lisp/oc-csl.el
+++ b/lisp/oc-csl.el
@@ -4,18 +4,20 @@
;; Author: Nicolas Goaziou <mail@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)
@@ -181,15 +183,21 @@ Used only when `second-field-align' is activated by the
used CSL style."
;;; Internal variables
(defconst org-cite-csl--etc-dir
- (let* ((oc-root (file-name-directory (locate-library "oc")))
- (oc-etc-dir-1 (expand-file-name "../etc/csl/" oc-root)))
- ;; package.el and straight will put all of org-mode/lisp/ in org-mode/.
- ;; This will cause .. to resolve to the directory above Org.
- ;; To make life easier for people using package.el or straight, we can
- ;; check to see if ../etc/csl exists, and if it doesn't try ./etc/csl.
- (if (file-exists-p oc-etc-dir-1) oc-etc-dir-1
- (expand-file-name "etc/csl/" oc-root)))
- "Directory \"etc/\" from repository.")
+ (let ((oc-root (file-name-directory (locate-library "oc"))))
+ (cond
+ ;; First check whether it looks like we're running from the main
+ ;; Org repository.
+ ((let ((csl-org (expand-file-name "../etc/csl/" oc-root)))
+ (and (file-directory-p csl-org) csl-org)))
+ ;; Next look for the directory alongside oc.el because package.el
+ ;; and straight will put all of org-mode/lisp/ in org-mode/.
+ ((let ((csl-pkg (expand-file-name "etc/csl/" oc-root)))
+ (and (file-directory-p csl-pkg) csl-pkg)))
+ ;; Finally fall back the location used by shared system installs
+ ;; and when running directly from Emacs repository.
+ (t
+ (expand-file-name "org/csl/" data-directory))))
+ "Directory containing CSL-related data files.")
(defconst org-cite-csl--fallback-locales-dir org-cite-csl--etc-dir
"Fallback CSL locale files directory.")
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 <mail@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 <mail@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 <mail@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/org.el b/lisp/org.el
index 192be45..13cc11c 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -5118,6 +5118,7 @@ stacked delimiters is N. Escaping delimiters is not
possible."
'(invisible t))
(add-text-properties (match-beginning 3) (match-end 3)
'(invisible t)))
+ (goto-char (match-end 0))
(throw :exit t))))))))
(defun org-emphasize (&optional char)
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.