Commit Graph

24543 Commits

Author SHA1 Message Date
Nicolas Goaziou 6cb9d2ffea Merge branch 'bugfix' 2021-10-03 23:24:12 +02:00
Nicolas Goaziou 4b346e5157 oc: Fix typo in docstring
* lisp/oc.el (org-cite-adjust-note): Fix typo.
2021-10-03 23:23:37 +02:00
Bastien 8b78d482a6 Fix email addresses in some *.el headers 2021-10-03 08:54:33 +02:00
Kyle Meyer 0e6b04c856 Merge branch 'bugfix' 2021-10-02 14:22:58 -04:00
Kyle Meyer 10dc9debb9 Merge branch 'km/from-emacs-28' into bugfix 2021-10-02 14:22:37 -04:00
Glenn Morris 41e67cff0d Backport commit 4341e79a5 from Emacs
* lisp/oc.el (org-cite-global-bibliography)
(org-cite-note-rules, org-cite-punctuation-marks):
* lisp/oc-csl.el (org-cite-csl-locales-dir)
(org-cite-csl-styles-dir, org-cite-csl-no-citelinks-backends):
* lisp/oc-natbib.el (org-cite-natbib-options):
* lisp/org-keys.el (org-mouse-1-follows-link):
Remove bogus ":safe t" properties that would largely need to be
replaced by custom predicates.

Remove bogus ":safe t" custom properties
4341e79a5fad3e5e668a3eeb1b688d1986011481
Glenn Morris
Sat Oct 2 11:00:23 2021 -0700
2021-10-02 14:20:38 -04:00
Glenn Morris ec22cf0a53 Backport commit 62d6cecfc from Emacs
* lisp/oc.el (org-cite-activate-processor)
(org-cite-export-processors, org-cite-follow-processor)
(org-cite-insert-processor):
* lisp/ol.el (org-link-parameters, org-link-frame-setup)
(org-link-shell-confirm-function)
(org-link-shell-skip-confirm-regexp)
(org-link-elisp-confirm-function)
(org-link-elisp-skip-confirm-regexp):
* lisp/org-num.el (org-num-format-function):
Remove bogus ":safe nil" that do nothing but propagate a
misunderstanding of the safe-local-variable property.

Remove bogus ":safe nil" custom properties
62d6cecfcd1a67e15a436c5c2b975f327d9a8b50
Glenn Morris
Sat Oct 2 10:46:29 2021 -0700
2021-10-02 13:56:50 -04:00
Kyle Meyer 06578d7450 Merge branch 'bugfix' 2021-10-02 13:48:07 -04:00
Kyle Meyer df7b0eac13 Merge branch 'km/from-emacs-28' into bugfix 2021-10-02 13:45:37 -04:00
Glenn Morris c3e8709e2d Backport commit f9111d878 from Emacs
* lisp/oc-basic.el (org-cite-basic-sorting-field)
(org-cite-basic-author-year-separator)
(org-cite-basic-max-key-distance)
(org-cite-basic-author-column-end)
(org-cite-basic-column-separator)
(org-cite-basic-mouse-over-key-face):
* lisp/oc-biblatex.el (org-cite-biblatex-options):
* lisp/oc-csl.el (org-cite-csl-link-cites)
(org-cite-csl-html-hanging-indent)
(org-cite-csl-html-label-width-per-char)
(org-cite-csl-latex-hanging-indent):
* lisp/oc.el (org-cite-adjust-note-numbers):
* lisp/org-keys.el (org-return-follows-link):
* lisp/org.el (org-fontify-todo-headline):
* lisp/ox-html.el (org-html-equation-reference-format)
(org-html-wrap-src-lines):
* lisp/ox-latex.el (org-latex-reference-command)
(org-latex-default-quote-environment): Fix :safe property.

The safe-local-variable property is a function (bug#50944)
f9111d8784bf12263abbe127cdfcbe5f409c9b3b
Glenn Morris
Sat Oct 2 10:37:42 2021 -0700
2021-10-02 13:44:34 -04:00
Kyle Meyer e8b1aedff2 doc/doc-setup.org: Absorb header from Emacs repo
In the Emacs repository, this file's header was updated in include
copyright information in b3d310fa96 (Fixes for doc/misc org source
files, 2021-02-26).  Copy it over.
2021-10-02 13:35:46 -04:00
Bastien a46cf533fa Revert "org-manual.org: Another way to run version from git"
This reverts commit aaa184f766.
2021-10-02 19:20:39 +02:00
Max Nikulin aaa184f766 org-manual.org: Another way to run version from git
* doc/org-manual.org (Using Org's git repository): Suggest '-L' command
line option to test git version without modification of init file.
2021-10-02 19:17:15 +02:00
Max Nikulin 50e6ccff3a org-manual.org: Mention org-contrib NonGNU ELPA package
* doc/org-manual.org (Installing Org's contributed packages): Add a link
to the NonGNU ELPA package as an option to install org-contrib.  Mention
the list of external packages on Worg.
2021-10-02 19:17:14 +02:00
Max Nikulin 749368f4f0 org-manual.el: Restore `load-path' for git version
* doc/org-manual.org (Using Org's git repository): Add example of
`load-path' adjustment that was earlier in the previous section
and was removed by commit f9cdda8234, so 'above' became a dangling
reference.
2021-10-02 19:17:12 +02:00
Nicholas Vollmer fac96da572 org-attach.el: Fix checkdoc warnings
* org-attach.el: Fix checkdoc warnings.
2021-10-02 19:15:52 +02:00
Max Nikulin 47e0cddbe3 manfull.pl: Avoid silent failures
* mk/manfull.pl: Report failures of patching of single-page HTML
manuals.

It should prevent silent generating of manual pages inconsistent with
provided CSS files when output of makeinfo will change next time.
2021-10-02 19:12:46 +02:00
Max Nikulin ffdf727842 manfull.pl: Adjust pattern for current makeinfo
* mk/manfull.pl: During patching of single-page html manuals allow
current form of table of contents headers.

Older makeinfo did not add "contents-heading" class to "<h2>" element.
Helper script failed to properly modify HTML files generated by current
version of makeinfo.  With partially patched file, CSS stiles intended
for table of contents were applied to all unordered lists, so e.g. in
"Plain Lists" section items were bold and with missed markers.
2021-10-02 19:12:46 +02:00
Max Nikulin 439359bff1 manfull.pl: Avoid silent failures
* mk/manfull.pl: Report failures of patching of single-page HTML
manuals.

It should prevent silent generating of manual pages inconsistent with
provided CSS files when output of makeinfo will change next time.
2021-10-02 19:12:28 +02:00
Max Nikulin b7df8307ec manfull.pl: Adjust pattern for current makeinfo
* mk/manfull.pl: During patching of single-page html manuals allow
current form of table of contents headers.

Older makeinfo did not add "contents-heading" class to "<h2>" element.
Helper script failed to properly modify HTML files generated by current
version of makeinfo.  With partially patched file, CSS stiles intended
for table of contents were applied to all unordered lists, so e.g. in
"Plain Lists" section items were bold and with missed markers.
2021-10-02 19:12:28 +02:00
Kyle Meyer 20630fcdcb Merge branch 'bugfix' 2021-10-02 11:34:06 -04:00
Kyle Meyer 06ab36eb02 etc/csl: Update files to latest versions
* etc/csl/chicago-author-date.csl:
* etc/csl/locales-en-US.xml: Catch up to latest upstream version.

chicago-author-date.csl is from commit
e22b8a566bad9b4c7f52720f60dd875057a5d210
(https://github.com/citation-style-language/styles), and
locales-en-US.xml is from commit
495f88863723df52ca10506eb4c2ed246aa37f2f
(https://github.com/citation-style-language/locales).

Link: https://list.orgmode.org/CAF-FPGO1kDOR2Nr8QOuP_jV-pxkxE=HA1Vx0TvhBjBe7M+fu4w@mail.gmail.com
2021-10-02 11:29:29 -04:00
Kyle Meyer 79f0611614 etc/csl/README: Narrow heading's scope
The text below and both repositories mention only the license and
desired attribution.
2021-10-02 11:29:29 -04:00
Nicholas Vollmer aa6f8ed877 org-src.el: Fix checkdoc warnings
* org-src.el: Fix checkdoc warnings.
2021-10-02 17:10:15 +02:00
Lars Ingebrigtsen 881145f5ef Backport commit bd60fca2f from Emacs
* lisp/ox-koma-letter.el (org-koma-letter-export-block)
(org-koma-letter-export-snippet): Fix warning about two unused
parameter.

Fix ox-koma-letter compilation warnings
bd60fca2faa03034e89df68a69255656df6512ba
Lars Ingebrigtsen
Sat Oct 2 10:37:55 2021 +0200

[ km: This has already been taken care of in the bugfix branch by
  85e5540eb (lisp/ox-koma-letter.el: Use lexical-binding,
  2021-09-30). ]
2021-10-02 11:02:13 -04:00
Kyle Meyer 9e71dfd921 Merge branch 'bugfix' 2021-10-02 00:55:26 -04:00
Kyle Meyer 9cc7f8bd15 etc/csl: Add a README in preparation for Emacs sync
Following nearly all other subdirectories in Emacs's etc/, add a
README explaining what the files are and what license they are under.

I did not add these files, but I have verified that

 - etc/csl/chicago-author-date.csl is identical to
   9821a884d2cbf919a064426999b05aa78e98da8d:chicago-author-date.csl
   from https://github.com/citation-style-language/styles

 - etc/csl/locales-en-US.xml is identical to
   a2b76b20ee120979ec66cfdcfa798b36fc5a7f0b:locales-en-US.xml from
   https://github.com/citation-style-language/locales
2021-10-02 00:52:27 -04:00
Kyle Meyer 0f11a44e01 org-cite-csl--etc-dir: Broaden docstring description
* lisp/oc-csl.el (org-cite-csl--etc-dir): Adjust docstring to describe
purpose without tying the variable to the repository install scenario.

Since 604bfd9d7 (oc-csl: be more caution about the csl etc location,
2021-07-15), this value hasn't been limited to the repository's
etc/csl/.
2021-10-02 00:52:27 -04:00
Kyle Meyer 60b178e596 oc-csl: Locate etc/csl for system installs and Emacs repo
* lisp/oc-csl.el (org-cite-csl--etc-dir): Add `data-directory' case,
using it as the fallback.  Also, use the more specific
file-directory-p rather than file-exists-p to inspect the candidates.

When using Org from the system installation, the CSL files will be
available in the etc/org/csl/ subdirectory underneath
`data-directory'.  (This requires the etc/csl/ files to be synced to
the Emacs repo under etc/org/csl.)

Give the Org repository and package cases precedence because they are
anchored to a specific oc.el location while, for Emacs releases with
Org 9.5 or later, the data-directory files will typically always be
present.
2021-10-02 00:52:27 -04:00
Kyle Meyer d0f774b0b4 Merge branch 'km/from-emacs-28' into bugfix 2021-10-02 00:51:56 -04:00
Ihor Radchenko fa315986a1
org-do-emphasis-faces: Never treat closing marker as next opening marker
* lisp/org.el (org-do-emphasis-faces): Make sure that we never match
ending marker of an emphasis as a beginning marker of another
emphasis.  For example, in "(~-~) test (~+~)" "~) test (~" is a valid
code match unless we move point to the end the first code emphasis
completely during parsing.

Fixes https://orgmode.org/list/87fsujp7mc.fsf@web.de
2021-10-02 12:47:42 +08:00
Glenn Morris e83ee601f2 Backport commit d50597189 from Emacs
; Standardize some license headers
d505971894d83e04e8d206be1dcee1cee5e8bb93
Glenn Morris
Fri Oct 1 18:07:45 2021 -0700
2021-10-01 21:57:10 -04:00
Glenn Morris 7dcdf98f1d Backport commit f1f57a541 from Emacs
* lisp/oc-csl.el (org-cite-csl-locales-dir)
(org-cite-csl-styles-dir):
* lisp/org-plot.el (org-plot/preset-plot-types): Fix :type.

Fix some custom types
f1f57a541e4c74eec68a27c47c7416ed6c7d75dd
Glenn Morris
Fri Oct 1 08:33:32 2021 -0700
2021-10-01 21:57:09 -04:00
Ihor Radchenko 60365a1641
orgtbl-to-generic: Mention that :fmt is ignored for empty cells
* lisp/org-table.el (orgtbl-to-generic): Amend docstring mentioning
that :fmt is ignored for empty table cells.
2021-10-01 11:56:30 +08:00
Ihor Radchenko d19660b05b
ob-gnuplot: Honour :missing argument
* lisp/ob-gnuplot.el (org-babel-gnuplot-table-to-data): Force applying
`org-babel-gnuplot-quote-tsv-field' to empty table cells when
converting org tables to gnuplot input.  By default,
`orgtbl-to-generic' ignores :fmt for empty table cells.  We need to
set :raw to non-nil AND :backend to non-nil to force custom formatting
of empty table cells.

Fixes https://orgmode.org/list/20210617211347.59e4de56@happy.intern.roklein.de
2021-10-01 11:44:52 +08:00
Ihor Radchenko ddee7b617c
ob-gnuplot: Honour :missing argument
* lisp/ob-gnuplot.el (org-babel-gnuplot-table-to-data): Force applying
`org-babel-gnuplot-quote-tsv-field' to empty table cells when
converting org tables to gnuplot input.  By default,
`orgtbl-to-generic' ignores :fmt for empty table cells.  We need to
set :raw to non-nil AND :backend to non-nil to force custom formatting
of empty table cells.

Fixes https://orgmode.org/list/20210617211347.59e4de56@happy.intern.roklein.de
2021-10-01 11:43:22 +08:00
Kyle Meyer d97223b244 Merge branch 'bugfix' 2021-09-30 21:27:57 -04:00
Kyle Meyer 8bc222bce6 org-src: Silence byte-compiler under 'make single'
This warning shows up when compiling in the Emacs repo, too.
2021-09-30 21:27:41 -04:00
Kyle Meyer 1c1614e9b7 Merge branch 'km/from-emacs-28' into bugfix 2021-09-30 21:18:30 -04:00
Mattias Engdegård 7de3d3cb32 Backport commit 2075411ed from Emacs
* lisp/org-element.el (org-element-citation-key-re):
* lisp/ox-org.el (org-org-identity):
Remove repeated chars in alternatives.
* lisp/ob-java.el (org-babel-execute:java):
Remove superfluous backslash.
* lisp/ob-java.el (org-babel-java--main-re)
(org-babel-java--any-method-re): Remove (0+ space) expressions
subsumed by adjacent expressions.

Fix regexp snags in org
2075411edbad954c0fdf2aa141757d834a6708b7
Mattias Engdegård
Thu Sep 30 17:16:41 2021 +0200
2021-09-30 21:18:08 -04:00
Mattias Engdegård c763b9ae61 Backport commit 58102466e from Emacs
* lisp/org-element.el (org-element-headline-parser):
Pretty sure this one should be `skip-chars-backward`, not
`skip-syntax-backward`, since \t isn't a valid syntax code.

org-element: use correct function
58102466e32d4dd9c7d816cdc3f4595a2145f332
Mattias Engdegård
Thu Sep 30 17:16:25 2021 +0200
2021-09-30 21:18:08 -04:00
Stefan Monnier 7325cf186a Backport commit b5e3cc3bc from Emacs
* lisp/ob-julia.el: Use lexical-binding.
(ess-eval-visibly-p): Declare.
(org-babel-julia-assign-elisp): Remove unused vars `header` and
`row-names` and corespondingly remove now unused args `colnames-p` and
`rownames-p`.
(org-babel-variable-assignments:julia): Adjust call to
`org-babel-julia-assign-elisp` accordingly.
(org-babel-julia-initiate-session): Use `bound-and-true-p`.
(org-babel-julia-evaluate-external-process)
(org-babel-julia-evaluate-session, org-babel-julia-evaluate):
Remove unused arg `row-names-p`.
(org-babel-execute:julia): Adjust call to
`org-babel-julia-evaluate` accordingly.

* lisp/org/ob-julia.el: Use lexical-binding
b5e3cc3bc597d56dfe09ee500717344649ea0354
Stefan Monnier
Thu Sep 30 10:02:29 2021 -0400

[ km: This was independently applied covered on the bugfix branch with
  the combination of a3b6728f9 and efa498b67.  I'm applying it here
  too for bookkeeping/traceability purposes, and to bring in one
  missing piece (see merge). ]
2021-09-30 21:17:02 -04:00
Stefan Monnier 15b09c1680 Backport commit a5b761ec3 from Emacs
* lisp/org/ox-koma-letter.el: Use lexical-binding
a5b761ec334cded8252e81c3887142a46752ec6a
Stefan Monnier
Thu Sep 30 09:58:04 2021 -0400

[ km: This was independently applied covered on the bugfix branch with
  the combination of 85e5540eb and f5b297292, but I'm applying it here
  too for bookkeeping/traceability purposes. ]
2021-09-30 21:16:41 -04:00
Bastien 6c8f8f6225 Merge branch 'bugfix' 2021-09-30 23:20:04 +02:00
Bastien f5b297292e lisp/ox-koma-letter.el: Backport Emacs commit a5b761ec
* lisp/org/ox-koma-letter.el: Remove redundant `:group` args.
2021-09-30 23:19:30 +02:00
Bastien efa498b679 lisp/ob-julia.el: Backport modifications from Emacs b5e3cc3
* (org-babel-julia-initiate-session): Use `bound-and-true-p`.
2021-09-30 23:15:24 +02:00
Bastien 2cdd930a7b Merge branch 'bugfix' 2021-09-30 19:33:27 +02:00
Bastien a3b6728f9a lisp/ob-julia.el: Use lexical-binding
* lisp/ob-julia.el: Use lexical-binding.
(ess-eval-visibly-p): Declare as dynamically scoped.
(org-babel-execute:julia, org-babel-julia-assign-elisp)
(org-babel-julia-evaluate, org-babel-julia-evaluate-session):
Remove unused references to `colnames-p' and `rownames-p'.

Thanks to Pedro Bruel for reviewing this patch.
2021-09-30 19:32:53 +02:00
Bastien 85e5540eb5 lisp/ox-koma-letter.el: Use lexical-binding
* lisp/ox-koma-letter.el (org-koma-letter-export-block)
(org-koma-letter-export-snippet): Silence the compiler.
Use lexical-binding.
2021-09-30 19:29:47 +02:00
Bastien 59cb39f53d Merge branch 'bugfix' 2021-09-30 16:17:02 +02:00