81920b3f86
Merge branch 'maint'
2019-06-09 21:39:18 -04:00
96f439226e
Backport commit bef1be873 from Emacs
...
Fixes for "Maintainer:" and related lines
bef1be873009d6e9f5a097396179f63a565bb6fd
Paul Eggert
Sun May 19 21:34:27 2019 -0700
2019-06-09 21:25:24 -04:00
cded785a6a
Merge branch 'maint'
2019-03-03 22:55:07 -05:00
1b15d5ef8e
Backport commit eba66c1ea from Emacs
...
* lisp/ox-publish.el (org-publish-sitemap):
Simplify and remove assumptions about timestamp format.
Don’t assume that current-time and plain encode-time return
timestamps in (HI LO US PS) format.
Remove some timestamp format assumptions
eba66c1eafeef6512259c9b46face2b03c7433b8
Paul Eggert
Fri Feb 22 13:31:01 2019 -0800
2019-03-03 22:25:22 -05:00
819864aebb
Merge branch 'maint'
2019-02-27 21:56:36 +01:00
cc7c4a6732
Rationalize `org-link-(un)escape'
...
* contrib/lisp/org-contacts.el (org-contacts-vcard-format):
* contrib/lisp/org-link-edit.el (org-link-edit--link-data):
* contrib/lisp/org-notmuch.el (org-notmuch-search-store-link):
(org-notmuch-search-follow-link):
(org-notmuch-tree-follow-link):
* lisp/org-docview.el (org-docview-export):
* lisp/org-element.el (org-element-link-parser):
* lisp/org-lint.el (org-lint-link-to-local-file):
* lisp/org-protocol.el (org-protocol-split-data):
(org-protocol-parse-parameters):
* lisp/org.el (org-open-at-point):
(org-display-inline-images):
* lisp/ox-ascii.el (org-ascii-link):
* lisp/ox-html.el (org-html-link):
* lisp/ox-latex.el (org-latex--inline-image):
(org-latex-link):
* lisp/ox-publish.el (org-publish-resolve-external-link):
* lisp/ox.el (org-export-custom-protocol-maybe):
(org-export-resolve-fuzzy-link): Do not call `org-link-unescape' when
the link is obtained through the parser or as a user input.
* doc/org-manual.org (Link Format): Document escape syntax.
See <http://lists.gnu.org/r/emacs-orgmode/2019-02/msg00320.html >
2019-02-27 20:22:51 +01:00
bb53c61816
Merge branch 'maint'
2019-02-13 15:09:35 +01:00
20c0c49d09
ox-publish: Fix arithmetic range error on some systems
...
* lisp/ox-publish.el (org-publish-cache-file-needs-publishing):
(org-publish-cache-ctime-of-src): Use internal time format for
timestamps.
Reported-by: Colin Baxter <m43cap@yandex.com>
<http://lists.gnu.org/r/emacs-orgmode/2019-02/msg00072.html >
2019-02-13 15:07:47 +01:00
d4d681cc15
ox-publish: Fix previous patch
...
* lisp/ox-publish.el (org-publish-cache-file-needs-publishing): Remove
unnecessary code, since `time-less-p' also handles integers.
Reported-by: Paul Eggert <eggert@cs.ucla.edu>
<http://lists.gnu.org/r/emacs-orgmode/2019-02/msg00074.html >
2019-02-10 13:57:40 +01:00
67d25049ed
ox-publish: Use `org-strip-quotes'
...
* lisp/ox-publish.el (org-publish-cache-file-needs-publishing): Use
`org-strip-quotes'.
2019-02-09 00:36:12 +01:00
c7f4e85389
ox-publish: Fix arithmetic range error on some systems
...
* lisp/ox-publish.el (org-publish-cache-file-needs-publishing):
(org-publish-cache-ctime-of-src): Use internal time format for
timestamps.
Reported-by: Colin Baxter <m43cap@yandex.com>
<http://lists.gnu.org/r/emacs-orgmode/2019-02/msg00072.html >
2019-02-09 00:32:13 +01:00
d64c9a996b
Backport commit 662bee7d7 from Emacs
...
* lisp/ob-eval.el (org-babel--shell-command-on-region):
* lisp/org-attach.el (org-attach-commit):
* lisp/org-macro.el (org-macro-initialize-templates):
* lisp/org.el (org-babel-load-file)
(org-file-newer-than-p):
* lisp/ox-html.el (org-html-format-spec):
* lisp/ox-publish.el (org-publish-find-date)
(org-publish-cache-ctime-of-src):
Prefer (file-attribute-size A) to (nth 7 A), and similarly
for other file attributes accessors.
* lisp/ox-publish.el (org-publish-cache-ctime-of-src):
Prefer float-time to doing time arithmetic by hand.
file-attributes cleanup
662bee7d70ccd3903e123b08c7ec9108a1a2ce0b
Paul Eggert
Sun Sep 23 18:32:59 2018 -0700
2019-01-13 12:43:04 -05:00
28d2c81709
Backport commit f18af6cd5 from Emacs
...
* lisp/org.el:
* lisp/ox-publish.el:
Prefer ash to lsh when either will do.
Audit use of lsh and fix glitches
f18af6cd5cb7dbbf7420ec2d3efed4e202c4f0dd
Paul Eggert
Tue Aug 21 13:44:32 2018 -0700
2019-01-13 12:43:04 -05:00
f584d37a67
Update copyright year
2019-01-01 11:50:56 +01:00
673165c035
ox-*: single-armed “if” -> “when”
...
* lisp/ox-html.el (org-html-htmlize-generate-css):
(org-html-template, org-html-final-function):
* lisp/ox-publish.el (org-publish-cache-set-file-property):
* lisp/ox-texinfo.el (org-texinfo-quote-block): Transform ‘if’ with no
else to ‘when’.
2018-05-10 01:17:12 +01:00
bbcf2f939c
Merge branch 'maint'
2018-02-15 15:04:59 +01:00
1562d4e293
ox-publish: Fix last commit
...
* lisp/ox-publish.el (org-publish-org-to):
(org-publish-collect-index):
(org-publish--store-crossrefs):
(org-publish-resolve-external-link): Use `file-truename' instead of
`expand-file-name'.
Do not preserve symbolic links when a unique identifier is needed,
e.g., when storing or retrieving file properties from cache.
2018-02-15 14:51:26 +01:00
2a7a4a65ad
Merge branch 'maint'
2018-02-13 14:10:28 +01:00
7c21dfc771
ox-publish: Follow symlink directories
...
* lisp/org-compat.el (directory-files-recursively): Remove
compatibility function, no longer needed.
* lisp/ox-publish.el (org-publish--expand-file-name):
(org-publish-org-to):
(org-publish-collect-index):
(org-publish--store-crossrefs):
(org-publish-resolve-external-link): Preserve symlinks in file name.
(org-publish-get-base-files): Follow symlink directories.
(org-publish-get-project-from-filename): Preserve symlinks in file
name. Do not use `file-in-directory-p', which ignores symlinks.
Reported-by: Michel Damiens <michel.damiens@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2018-02/msg00186.html >
2018-02-13 14:06:56 +01:00
c27d0f85e5
Merge branch 'maint'
2018-01-18 23:43:44 +01:00
bdc220ca17
ox-publish: Fix including files with a search option
...
* lisp/ox-publish.el (org-publish-cache-file-needs-publishing): Remove
double quotes prior to pruning search options.
Reported-by: Joseph Carter Osborn <jcosborn@ucsc.edu>
<http://lists.gnu.org/r/emacs-orgmode/2018-01/msg00317.html >
2018-01-18 23:40:55 +01:00
d94f7024bc
Merge branch 'maint'
2018-01-07 00:28:35 -05:00
3e1641ef0a
Update copyright years
2018-01-07 00:27:54 -05:00
01e150eb59
ox-publish: Cache results for `org-publish-find-date'
...
* lisp/ox-publish.el (org-publish-find-date): Cache results.
(org-publish-find-title): Tiny refactoring.
Reported-by: Lorenzo Bolla <lbolla@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2017-12/msg00561.html >
2017-12-27 23:44:55 +01:00
5d2517ba5a
Merge branch 'maint'
2017-12-14 00:18:20 +01:00
d9a6408baf
Fix defgroups
...
* lisp/org.el (org-structure-template-alist): Use `org-edit-structure'
instead of non-existent `org-completion'.
* lisp/ox-publish.el (org-export-publish): Rename from `org-publish'.
* lisp/org-pcomplete.el (org-complete): Remove unused group.
Fixes: 29698
2017-12-14 00:16:18 +01:00
26c2ad99cf
ox-publish: Fix resolving url-encoded external links
...
* lisp/ox-publish.el (org-publish-resolve-external-link): Handle
url-encoded links. Do not ask to create a new headline if none is
found.
2017-11-26 10:49:28 +01:00
b0ab7008df
Merge branch 'maint'
2017-11-26 10:47:55 +01:00
6aac798f25
Fix publishing links to absolute file names belonging to project
...
* lisp/ox-publish.el (org-publish-file-relative-name): New function.
* lisp/ox-html.el (org-html-link): Use new function.
* testing/lisp/test-ox-publish.el (test-org-publish/file-relative-name):
New test.
2017-11-26 10:46:53 +01:00
f67e62eb3f
Merge branch 'maint'
2017-11-25 15:33:22 +01:00
1b1966a144
Fix cross-references from %-encoded links in publishing
...
* lisp/ox-publish.el (org-publish-resolve-external-link): Decode
search string.
Reported-by: Martin Hans <martinhansdk@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-11/msg00328.html >
2017-11-25 15:30:56 +01:00
3056abe781
Merge branch 'maint'
2017-09-24 10:58:43 +02:00
d40deb6967
ox-publish: Fix :base-extension any with :recursive t
...
* lisp/ox-publish.el (org-publish-get-base-files): Ensure MATCH regexp
is always a string since `directory-files-recursively' requires it.
* testing/lisp/test-ox-publish.el (test-org-publish/get-project-from-filename):
Add test.
Suggested-by: Jens Lechtenboerger <lechten@wi.uni-muenster.de>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-09/msg00528.html >
2017-09-24 10:57:11 +02:00
297acd7517
Merge branch 'maint'
2017-09-17 01:17:10 -04:00
ff0dcf52a5
Backport commit bc511a64f from Emacs
...
Prefer HTTPS to FTP and HTTP in documentation
bc511a64f6da9ab51acc7c8865e80c4a4cb655c2
Paul Eggert
Wed Sep 13 15:54:37 2017 -0700
2017-09-17 00:28:38 -04:00
007bbddbcc
ox-html: Prevent spurious target below headlines
...
* lisp/ox-html.el (org-html-headline):
(org-html-link): Do not insert an additional target.
* lisp/ox-publish.el (org-publish-resolve-external-link): Add an
optional argument.
* lisp/ox.el (org-export-get-reference): Improve docstring.
* testing/examples/pub/a.org:
* testing/examples/pub/b.org: New files.
* testing/lisp/test-ox-publish.el (test-org-publish/resolve-external-link):
New test.
2017-09-10 00:23:42 +02:00
d39ccc17d4
Merge branch 'maint'
2017-07-09 11:28:54 -04:00
b7fdc30388
Backport commit 20e9a00fb from Emacs
...
* lisp/org-table.el (org-table-sort-lines): Fix misspelling in prompt.
* lisp/ox-ascii.el (org-ascii--describe-datum): Fix misspelling in
call to org-element-lineage.
Spelling fixes
20e9a00fb5d12ad408f9dd15adcfcd205783c1b0
Paul Eggert
Thu Jul 6 00:24:56 2017 -0700
2017-07-09 11:27:12 -04:00
6b6476b89c
Merge branch 'maint'
2017-05-25 11:10:19 +02:00
118ec40c53
ox-publish: Fix symlink publishing
...
* lisp/ox-publish.el (org-publish-file): Do not expand symlinks so as
to get proper publishing directory.
Reported-by: Julien Cubizolles <j.cubizolles@free.fr>
<http://permalink.gmane.org/gmane.emacs.orgmode/113611 >
2017-05-25 11:08:02 +02:00
31cf5b2a9a
ox-publish: Add missing `file-truename'
...
* lisp/ox-publish.el (org-publish--expand-file-name): Add missing
`file-truename'.
2017-05-08 08:48:40 +02:00
449f97abbb
Merge branch 'maint'
2017-05-05 23:23:29 +02:00
250b64b3cb
ox-publish: Consistently cache properties
...
* lisp/ox-publish.el (org-publish-org-to):
(org-publish-collect-index):
(org-publish--store-crossrefs):
(org-publish-resolve-external-link): Use `file-truename' so that
caching keys do not depend on links in the file name.
2017-05-05 23:22:23 +02:00
c55770006a
ox-publish: Fix last commit
...
* lisp/ox-publish.el (org-publish-get-project-from-filename): Fix last
commit.
2017-05-05 19:56:58 +02:00
6a4d3988b9
Merge branch 'maint'
2017-05-05 19:52:55 +02:00
d9c0a810f7
ox-publish: Use file true name as reference
...
* lisp/ox-publish.el (org-publish-file): Use file true name as
reference.
2017-05-05 17:47:30 +02:00
018ce94d88
ox-publish: Small refactoring
...
* lisp/ox-publish.el (org-publish-file): Use function dedicated to
files instead of string related ones. Small refactoring.
(org-publish-cache-get-file-property): Small refactoring.
2017-05-05 17:47:30 +02:00
6539c41589
ox-publish: Fix publishing filenames with symbolic links
...
* lisp/ox-publish.el (org-publish-get-project-from-filename):
(org-publish-attachment):
(org-publish-projects):
(org-publish-org-sitemap): Use file comparison functions instead of
string ones so as to properly handle symbolic links in filenames.
2017-05-05 17:47:30 +02:00
9227445899
ox-publish: Raise an error on undefined components (take 2)
...
* lisp/ox-publish.el (org-publish-expand-projects): Raise an error on
undefined components.
2017-03-17 09:32:21 +01:00
147b4646d2
Revert "ox-publish: Raise an error when encountering undefined component"
...
This reverts commit 6e1d174d0a
2017-03-17 09:30:38 +01:00
Kyle Meyer
Paul Eggert
Nicolas Goaziou
Bastien
Aaron Ecay