Nicolas Goaziou
0155441358
Merge branch 'maint'
2018-01-19 18:22:00 +01:00
Tim Landscheidt
b289a65be7
Use https for links to orgmode.org
...
TINYCHANGE
2018-01-19 18:14:58 +01:00
Nicolas Goaziou
c27d0f85e5
Merge branch 'maint'
2018-01-18 23:43:44 +01:00
Nicolas Goaziou
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
Nicolas Goaziou
2372276883
Merge branch 'maint'
2018-01-18 23:10:51 +01:00
Nicolas Goaziou
daceceb424
Fix `org-store-link'
...
* lisp/org.el (org-store-link): Fix parameter to `completing-read',
which expects a string, not a symbol.
Reported-by: "Stefan-W. Hahn" <stefan.hahn@s-hahn.de>
2018-01-18 23:09:12 +01:00
thibault
ba6c0f1ea9
ox-html: Add label and number to equations in HTML export
...
* lisp/ox-html.el (org-html--wrap-latex-environment): New function.
(org-html--math-environment-p): New function.
(org-html-latex-environment): Use `org-html--wrap-latex-environment' to
wrap equation in HTML container (non-MathJax modes). Make latex
environment unnumbered when compiling equations to images. Insert latex
label in environment in MathJax mode.
(org-html-link): Calculate equation number limiting counter to equation
environments. Use eqref for link when using MathJax
(org-html--make-unlabelled-latex-environment): New function.
2018-01-17 22:24:31 +01:00
Nicolas Goaziou
92176c90be
Merge branch 'maint'
2018-01-15 23:29:21 +01:00
Nicolas Goaziou
78e4be78cb
org-list: Silence byte-compiler
2018-01-15 23:28:52 +01:00
Nicolas Goaziou
21cf8d8e61
Merge branch 'maint'
2018-01-15 23:15:26 +01:00
Nicolas Goaziou
b74655a4e5
Fix `org-toggle-checkbox' on a headline.
...
* lisp/org-list.el (org-toggle-checkbox): When called with a prefix
argument, ignore all drawers after planning info line. Fix
docstring.
Reported-by: Samuel Wales <samologist@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2018-01/msg00278.html >
2018-01-15 23:13:51 +01:00
Nicolas Goaziou
c3fffcd8d2
Fix C-<return> binding
2018-01-15 22:59:40 +01:00
Bastien
0aeb66f64d
Merge branch 'master' of code.orgmode.org:bzg/org-mode
2018-01-15 16:39:37 +01:00
Bastien
ebb67cebe5
Merge branch 'maint'
2018-01-15 16:39:11 +01:00
Bastien
ad390e895a
ox-html.el (org-html-head): Fix docstring
...
* ox-html.el (org-html-head): Fix docstring.
Thanks to Adam Porter for reporting this.
2018-01-15 16:38:33 +01:00
Xu Chunyang
9f181d4404
org-agenda: Disable message logging for some messages
...
* lisp/org-agenda.el (org-agenda-filter-by-tag):
(org-agenda-view-mode-dispatch):
(org-agenda-diary-entry):
(org-agenda-bulk-action): Disable message logging for some messages.
TINYCHANGE
2018-01-15 16:34:25 +01:00
Nicolas Goaziou
6965098a53
Use a single keybinding representation
...
* lisp/org.el (org-replace-disputed-keys): Fix docstring.
Use `kbd' macro everywhere. Also add missing "ESC" equivalents for
"M-" bindings.
2018-01-15 16:13:37 +01:00
Nicolas Goaziou
a8a04348fd
org-timer: Add missing autoload cookies
...
* lisp/org-timer.el (org-timer-pause-or-continue):
(org-timer-stop): Add missing autoload cookies.
2018-01-15 16:13:19 +01:00
Nicolas Goaziou
d5b70fa68b
Silence byte-compiler
2018-01-13 14:19:50 +01:00
Nicolas Goaziou
000b943ebd
Re-order visibility functions in "org.el"
...
* lisp/org-macs.el (org-outline-overlay-data):
(org-set-outline-overlay-data): Moved from "org.el".
* lisp/org.el (org-remove-empty-overlays-at):
(org-show-empty-lines-in-parent):
(org-files-list):
(org-entry-beginning-position):
(org-entry-end-position):
(org-subtree-end-visible-p):
(org-first-headline-recenter):
(org-flag-region):
(org-show-entry):
(org-show-children):
(org-show-subtree):
(org-hide-block-toggle-maybe):
(org-hide-block-toggle):
(org-hide-block-toggle-all):
(org-hide-block-all):
(org-cycle-hide-drawers):
(org-flag-drawer):
(org-previous-block):
(org-next-block): Move functions.
2018-01-13 14:15:53 +01:00
Nicolas Goaziou
a8ee20d23d
Replace `outline-flag-region' with `org-flag-region'
...
* lisp/org-inlinetask.el (org-inlinetask-toggle-visibility):
* lisp/org-list.el (org-list-set-item-visibility):
* lisp/org.el (org-flag-subtree):
(org-cycle-internal-local):
(org-cycle-show-empty-lines):
(org-set-outline-overlay-data):
(org-move-subtree-down):
(org-set-tags):
(org-flag-heading):
(org-show-children):
(org-show-subtree):
(org-show-entry): Replace `outline-flag-region' with
`org-flag-region'.
2018-01-10 15:58:21 +01:00
Nicolas Goaziou
4dbb4a76a7
Implement `org-show-all'
...
* lisp/org.el (org-show-all): New function.
(org-cycle):
(org-cycle-internal-global):
(org-global-cycle):
(org-set-startup-visibility):
(org-set-outline-overlay-data):
(org-hide-block-all):
(org-mode-hook):
(org-tree-to-indirect-buffer):
(org-sort-entries):
(org-mode-map):
(org-org-menu):
* lisp/ob-lilypond.el (org-babel-lilypond-mark-error-line):
* lisp/org-archive.el (org-archive-subtree):
* lisp/org-capture.el (org-capture-place-template):
* lisp/org-mouse.el (org-mouse-popup-global-menu):
* lisp/ox-org.el (org-org-publish-to-org):
* testing/org-test.el (org-test-at-id):
(org-test-in-example-file): Use new function.
* lisp/org-compat.el (org-show-block-all): Mark as obsolete.
2018-01-10 15:58:21 +01:00
Nicolas Goaziou
d30bea7cee
Fold CLOCK and LOGBOOK drawers upon creating them
...
* lisp/org-clock.el (org-clock-find-position): Use a faster call to hide
clock drawer.
* lisp/org.el (org-log-beginning): Make sure logbook drawer is folded as
soon as inserted.
(org-store-log-note): Remove unnecessary call to
`org-cycle-hide-drawers'.
2018-01-10 15:58:21 +01:00
Nicolas Goaziou
4403d4685e
Give drawers their own invisibility spec
...
* lisp/org.el (org-mode): Add special invisibility spec for drawers.
(org-show-set-visibility): Handle new invisibility spec.
(org-clean-visibility-after-subtree-move): Fix argument for
`org-cycle-hide-drawers'. `overview' is a no-op.
(org-cycle-hook):
(org-cycle-internal-local):
(org-flag-drawer):
(org-move-subtree-down):
(org-show-entry):
* lisp/org-agenda.el (org-agenda-clock-in):
* lisp/org-clock.el (org-clock-goto):
* lisp/org-feed.el (org-feed-update):
* lisp/org-inlinetask.el (org-inlinetask-toggle-visibility): Do not hide
drawers when expanding a headline.
Drawers and headlines visibility are now unrelated. As a consequence,
there is no need to hide drawers every time a headline is expanded.
2018-01-10 15:58:21 +01:00
Nicolas Goaziou
4f74aa4c0e
Change signature for `org-set-visibility-according-to-property'
...
* lisp/org.el (org-set-visibility-according-to-property): Remove unused
argument.
(org-set-startup-visibility):
(org-overview): Apply signature change.
2018-01-10 15:58:21 +01:00
Nicolas Goaziou
e886d1566d
Implement `org-flag-region'
...
* lisp/org.el (org-flag-region): New function.
(org-hide-block-toggle): Use new function.
Unlike `outline-flag-region', this function handles multiple invisible
specs.
2018-01-10 15:55:46 +01:00
Nicolas Goaziou
bbf1c26aaf
Remove `org-hide-block-overlays' variable
...
* lisp/org.el (org-hide-block-overlays): Remove variable.
(org-show-block-all): Use `remove-overlays' to remove block-related
overlays instead of relying on a global state.
(org-hide-block-toggle): Do not update removed variable. Tiny
refactoring.
2018-01-10 15:55:46 +01:00
Nicolas Goaziou
728920a8ed
Rename `org-timestamp--to-internal-time' into `org-timestamp-to-time'
...
* lisp/org.el (org-timestamp-to-time): New function.
(org-timestamp--to-internal-time): Remove function.
(org-timestamp-format): Use new function.
* testing/lisp/test-org.el (test-org/timestamp-to-time): New test.
2018-01-10 15:05:11 +01:00
Nicolas Goaziou
ee27fb010e
Fix docstring
...
* lisp/org.el (org-timestamp-from-time): Fix docstring.
2018-01-10 14:37:02 +01:00
Nicolas Goaziou
d3cdc35e06
Implement `org-timestamp-from-string', `org-timestamp-from-time'
...
* lisp/org.el (org-timestamp-from-string):
(org-timestamp-from-time): New functions.
* testing/lisp/test-org.el (test-org/timestamp-from-string):
(test-org/timestamp-from-time): New tests.
2018-01-10 14:35:32 +01:00
Nicolas Goaziou
0c409d64d0
Merge branch 'maint'
2018-01-10 12:49:23 +01:00
Aliaksey Artamonau
0a8711a0a5
org-clock.el: Fix one time continuous clock in
...
* org-clock.el (org-clock-in): Abort after calling `org-clock-in'
recursively with `org-clock-continuously' set.
Without the change the recursive call to `org-clock-in' would
insert a clock of last clock-out, but then the original call
would continue by inserting another clock at
current-time. As a result of that, clocking out uses the latter
of the two clocks and leaves the other one dangling.
TINYCHANGE
2018-01-10 12:48:28 +01:00
Nicolas Goaziou
46e24f6830
Merge branch 'maint'
2018-01-09 19:51:17 +01:00
Nicolas Goaziou
8c7a14a850
org-clock: Consider hours when splitting the table with :steps
...
* lisp/org-clock.el (org-clocktable-steps): Check time when :tstart
and :tend are defined.
* testing/lisp/test-org-clock.el (test-org-clock/clocktable/step): Add
tests.
Reported-by: savoie@nsidc.org
<http://lists.gnu.org/r/emacs-orgmode/2018-01/msg00227.html >
2018-01-09 19:47:39 +01:00
Nicolas Goaziou
c82c21c7ac
Merge branch 'maint'
2018-01-08 20:40:16 +01:00
Nicolas Goaziou
ed2bcab0ea
ox: Fix typo in docstring
...
* lisp/ox.el (org-export-search-cells): Fix typo.
2018-01-08 20:39:31 +01:00
Nicolas Goaziou
857425e184
ox-org: Obey to `org-display-custom-times'
...
* lisp/ox-org.el (org-org-timestamp): New function.
(org): Use new function.
2018-01-08 15:39:01 +01:00
Nicolas Goaziou
c0a1fb4138
Merge branch 'maint'
2018-01-08 15:24:21 +01:00
Nicolas Goaziou
3566a3eeee
org-clock: Fix `org-clock-display' called with `C-u C-u C-u'
...
* lisp/org-clock.el (org-clock-display): Compute H and M when
necessary.
2018-01-08 15:22:33 +01:00
Nicolas Goaziou
7544f2b6d7
Merge branch 'maint'
2018-01-08 15:00:28 +01:00
Nicolas Goaziou
9c675b0727
org-clock: Small fixes
...
* lisp/org-clock.el (org-clock-display-default-range): Improve
docstring. Add :safe keyword.
(org-clock-display): Fix comparison function.
2018-01-08 14:59:53 +01:00
Nicolas Goaziou
b65fe0f7a2
Merge branch 'maint'
2018-01-07 10:56:02 +01:00
Nicolas Goaziou
0c93296f83
org-table: Obey to `org-table-formula-create-columns'
...
* lisp/org-table.el (org-table-recalculate): Return an error when the
formula cannot create a necessary column.
(org-table-formula-create-columns): Fix docstring.
* testing/lisp/test-org-table.el (test-org-table/field-formula-outside-table):
Fix tests.
2018-01-07 10:55:30 +01:00
Kyle Meyer
34bb61bf81
Update master-only copyright years
2018-01-07 00:28:44 -05:00
Kyle Meyer
d94f7024bc
Merge branch 'maint'
2018-01-07 00:28:35 -05:00
Kyle Meyer
3e1641ef0a
Update copyright years
2018-01-07 00:27:54 -05:00
Nicolas Goaziou
9bc6e644e9
Merge branch 'maint'
2018-01-07 01:34:59 +01:00
Ian Dunn
b306aa2245
org-agenda: Fix lprops when recreating sticky agendas
...
* lisp/org-agenda.el (org-agenda-lprops): New variable.
(org-agenda-local-vars): Add it.
(org-agenda-prepare): Set lprops from symbol property.
(org-agenda-redo): Get lprops from variable, not property.
2018-01-07 01:34:13 +01:00
Nicolas Goaziou
6b06a6238b
Merge branch 'maint'
2018-01-06 10:19:37 +01:00
Alex Branham
5dfab7957d
org-agenda: documentation addition
...
* lisp/org-agenda.el: Add docstring to `org-agenda-show-log'
2018-01-06 10:19:01 +01:00
Nicolas Goaziou
e2b47eb5e7
Merge branch 'maint'
2018-01-04 16:35:24 +01:00
Marco Wahl
6c3c06273e
org.el (org-copy-subtree): Correct typo
2018-01-04 16:26:08 +01:00
Nicolas Goaziou
fc1e7c2033
Merge branch 'maint'
2018-01-03 22:55:39 +01:00
Nicolas Goaziou
76ee7b7cdd
org-clock: Allow CLOCK_MODELINE_TOTAL inheritance
...
* lisp/org-clock.el (org-clock-get-sum-start): Allow
CLOCK_MODELINE_TOTAL inheritance.
2018-01-03 22:54:28 +01:00
Nicolas Goaziou
ff3d23e64e
Do not use `called-interactively-p' in `org-store-link'
...
* lisp/org.el (org-store-link): Do not use `called-interactively-p'.
Fixes: 19915
2018-01-03 18:04:55 +01:00
Nicolas Goaziou
c0ea20aab7
org-mobile: Save agenda files before pushing
...
* lisp/org-mobile.el (org-mobile-push): Save agenda files before
pushing.
Fixes: 19448
2018-01-03 15:45:53 +01:00
Nicolas Goaziou
837e1b4249
Merge branch 'maint'
2018-01-03 15:26:38 +01:00
Nicolas Goaziou
7e8e12be21
org-table: Improve a docstring
...
* lisp/org-table.el (org-table-import): Improve docstring.
Fixes: 22597
2018-01-03 15:25:33 +01:00
Nicolas Goaziou
d6369e9ac6
Use completion in `org-set-effort'
...
* contrib/manual.org: Document change.
* lisp/org.el (org-set-effort): Change signature.
(org-inc-effort): Apply signature change.
Fixes: 22776, 22597
2018-01-02 22:00:35 +01:00
Nicolas Goaziou
b030475575
Merge branch 'maint'
2018-01-02 14:14:18 +01:00
Nicolas Goaziou
16c7ae7996
Fix handling nested VISIBILITY properties
...
* lisp/org.el (org-set-visibility-according-to-property): Fix handling
nested VISIBILITY properties.
* testing/lisp/test-org.el (test-org/set-visibility-according-to-property):
New test.
Reported-by: Michael Maurer <maurer.michael@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2018-01/msg00012.html >
2018-01-02 14:13:46 +01:00
Nicolas Goaziou
1bf34d5b8a
Merge branch 'maint'
2018-01-02 12:43:36 +01:00
Nicolas Goaziou
ec6813157e
org-capture: Demote error when capturing `file+headline' in non-Org buffers
...
* lisp/org-capture.el (org-capture-set-target-location): Warn when
capturing a `file+headline' target and buffer is not in Org mode.
Fixes: 22352
2018-01-02 12:40:54 +01:00
Nicolas Goaziou
63e9f45238
Merge branch 'maint'
2018-01-02 11:51:52 +01:00
Nicolas Goaziou
4c9b5f600f
ox-beamer: Update copyright year
2018-01-02 11:51:26 +01:00
Nicolas Goaziou
c887e78c02
Merge branch 'maint'
2018-01-02 11:50:20 +01:00
Nicolas Goaziou
18cc1068a2
ox-beamer: Update default environment templates
...
* lisp/ox-beamer.el (org-beamer-environments-default): Update
templates wrt %U.
%U meaning changed in commit
f3168ff90a
(June 2013) but the variable
wasn't updated accordingly.
2018-01-02 11:00:58 +01:00
Bastien
9067b8427d
Merge branch 'maint' of code.orgmode.org:bzg/org-mode into maint
2018-01-01 13:06:12 +01:00
Nicolas Goaziou
e9f30779de
Merge branch 'maint'
2017-12-31 15:49:55 +01:00
Nicolas Goaziou
af58a6dbf7
Change Org-mode into Org mode
...
* lisp/ob-core.el (org-babel-result-to-file):
* lisp/ob-picolisp.el:
* lisp/org-agenda.el (org-check-for-org-mode):
(org-search-view):
(org-tags-view):
(org-agenda-cleanup-fancy-diary):
(org-agenda-get-day-entries):
* lisp/org-table.el (orgtbl-mode):
* lisp/org-w3m.el (org-w3m-copy-for-org-mode):
* lisp/org.el (org-modules):
(org-startup-options):
(org-fontify-meta-lines-and-blocks):
* mk/default.mk:
* mk/manfull.pl:
* mk/org-fixup.el (org-make-org-version):
(org-make-org-loaddefs):
* mk/orgcard2txt.pl (rep_esc):
* mk/targets.mk ($(info):
* testing/README:
(Example):
* testing/examples/no-heading.org:
* testing/examples/normal.org: Change Org-mode into Org mode
2017-12-31 15:48:09 +01:00
Nicolas Goaziou
a374b8b92a
Silence byte-compiler
2017-12-31 15:16:12 +01:00
Nicolas Goaziou
87eb9ab4e9
org-list: Remove radio lists
...
* lisp/org-list.el (org-list-radio-list-templates): Remove variable.
(org-list-insert-radio-list):
(org-list-send-list): Remove functions.
* contrib/manual.org: Remove references to radio lists.
2017-12-30 10:28:50 +01:00
Nicolas Goaziou
2b96b08eaf
Remove reference to Message mode
...
* lisp/org.el (org-adaptive-fill-function):
(org-fill-element): Remove reference to Message mode. These functions
are Org mode specific.
2017-12-30 10:28:50 +01:00
Nicolas Goaziou
eeb4c22090
Remove OrgStruct mode
...
* lisp/org.el (org-overview): Use `org-outline-regexp-bol' instead of
`outline-regexp'.
(org-heading-components): Ignore orgstruct-mode.
(orgstruct-heading-prefix-regexp):
(orgstruct-setup-hook):
(org-local-vars):
(orgstruct-mode):
(turn-on-orgstruct):
(orgstruct-is-++):
(org-fb-vars):
(orgstruct++-mode):
(turn-on-orgstruct++):
(orgstruct-error):
(orgstruct-setup):
(orgstruct-make-binding):
(org-run-like-in-org-mode):
(org-indent-line):
(org-fill-paragraph):
(org-show-children): Remove Orgstruct mode
* doc/org.texi (Orgstruct mode): Remove node.
2017-12-30 10:28:50 +01:00
Nicolas Goaziou
d4d9e90d19
org-table: Small optimization
...
* lisp/org-table.el (org-table-check-inside-data-field): Add optional
argument.
(org-table-find-dataline): Do not call `org-at-table-p' needlessly.
(org-table-delete-column):
(org-table-move-column):
(org-table-copy-region):
(org-table-eval-formula): Use new argument.
(org-table-force-dataline): Small refactoring.
This patch limits the number of calls to `org-at-table-p'.
2017-12-30 00:58:11 +01:00
Bastien
58c9bedfd5
Merge branch 'maint'
2017-12-29 18:58:41 +01:00
Bastien
199908ba62
org: Enhance non-interactive calls to `org-insert-link`
...
* org.el (org-insert-link): When called non-interactivily,
don't allow to edit the default description.
2017-12-29 18:43:40 +01:00
Bastien
29dd9a6605
org.el: New value for `org-todo-repeat-to-state'
...
* lisp/org.el (org-todo-repeat-to-state): Allow `t' to use
the previous TODO state.
* doc/org.texi (Repeated tasks): Document the new optional
value of `org-todo-repeat-to-state'.
2017-12-29 18:36:27 +01:00
Bastien
8983ac917b
org-colview: Allow to filter by tags/property when capturing colview
...
* org-colview.el (org-columns--capture-view): New
argument "match" to filter out unmatched entries.
(org-dblock-write:columnview): Use the new argument.
Thanks to Thierry Stoehr for proposing this.
2017-12-29 18:18:14 +01:00
Bastien
d792b57ffc
org-table: Correctly match ".[0-9]+" as a number
...
* lisp/org-table.el (org-table-copy-down): Correctly match
".[0-9]+" as a number.
2017-12-29 18:14:42 +01:00
Marco Wahl
144451143a
Merge branch 'maint'
2017-12-28 19:15:43 +01:00
Marco Wahl
e401afffde
inlinetask: Fix folding of directly consecutive inlinetask children
2017-12-28 19:12:36 +01:00
Marco Wahl
6311c12556
Merge branch 'maint'
2017-12-28 18:05:54 +01:00
Marco Wahl
b29a972307
org-inlinetask:Fix folding of inline tasks within plain list
...
This is the fix proposed by Nicolas. See
http://lists.gnu.org/archive/html/emacs-orgmode/2017-12/msg00564.html
Add and accommodate some tests.
2017-12-28 17:59:52 +01:00
Nicolas Goaziou
401890986c
Revert "org-table: Improve bidirectional reordering in tables"
...
This reverts commit f4ae1941c9
.
2017-12-28 12:29:04 +01:00
Nicolas Goaziou
a88bd87787
Merge branch 'maint'
2017-12-27 23:57:37 +01:00
Adrian Bradd
ff0f3e4723
Fix `org-todo'
...
* org.el (org-todo): Use marker `change-plist' position property to
permit triggering through "org-depend.el" with parent heading
statistics.
When TODO statistics in parent headings were updated it shifted the point
defining the :position property in `change-plist' causing headlines
with TRIGGER properties to fail to evaluate.
TINYCHANGE
2017-12-27 23:57:15 +01:00
Nicolas Goaziou
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
Nicolas Goaziou
b30afa39b0
Merge branch 'maint'
2017-12-27 23:24:08 +01:00
Nicolas Goaziou
f2c712a6a4
Fix inserting link
...
* lisp/org.el (org-insert-link): Fix when search option in a file link
contains two consecutive slashes.
Reported-by: Ag Ibragimov <agzam.ibragimov@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2017-12/msg00560.html >
2017-12-27 23:22:07 +01:00
Nicolas Goaziou
7b6ec64e0e
Merge branch 'maint'
2017-12-25 23:54:36 +01:00
Nicolas Goaziou
85ed1fd01d
Fix visibility cycling when point is invisible
...
* lisp/org.el (org-cycle-internal-local): Fix visibility cycling when
point is invisible.
Reported-by: Ruy Exel <ruyexel@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2017-12/msg00314.html >
2017-12-25 23:53:26 +01:00
Kyle Meyer
b9491c967c
Merge branch 'maint'
2017-12-25 12:35:42 -05:00
Kyle Meyer
5696f353dc
ob-haskell: Fix indentation from b46787743
...
This fails Emacs's pre-commit check (lisp/org/ob-haskell.el:77: space
before tab in indent).
2017-12-25 12:29:27 -05:00
Nicolas Goaziou
57a8dde8e3
Merge branch 'maint'
2017-12-25 00:14:51 +01:00
Nicolas Goaziou
b3ddb051e6
ob-exp: Fix source blocks generated by other source blocks
...
* lisp/ob-exp.el (org-babel-exp--at-source): Source blocks generated
by evaluating other source blocks may not be found in the original
buffer. In that case, do not move point.
Reported-by: "Berry, Charles" <ccberry@ucsd.edu>
<http://lists.gnu.org/r/emacs-orgmode/2017-12/msg00538.html >
2017-12-25 00:10:39 +01:00
Nicolas Goaziou
a343b0000a
org-table: Improve bidirectional reordering in tables
...
* lisp/org-table.el (org-table-separator-space): New variable.
(org-table-align): Use new variable.
2017-12-23 23:42:46 +01:00
Nicolas Goaziou
f4ae1941c9
org-table: Improve bidirectional reordering in tables
...
* lisp/org-table.el (org-table-separator-space): New variable.
(org-table-align): Use new variable.
2017-12-23 23:37:45 +01:00
Nicolas Goaziou
4d3e7a2a57
ob-core: All Noweb parameters are read at point of definition
...
* lisp/ob-core.el (org-babel-params-from-properties): Do not force
using `org-babel-current-src-block-location'. Extract properties
from point.
(org-babel--noweb-reference): Remove function.
(org-babel-expand-noweb-references): Apply function removal. Small
refactoring.
* lisp/ob-lob.el (org-babel-lob-get-info): Small refactoring.
2017-12-23 15:56:53 +01:00
Nicolas Goaziou
38be851245
ob-core: Do not always evaluate Lisp code in parameters
...
* lisp/ob-core.el (org-babel-get-src-block-info):
(org-babel-params-from-properties):
(org-babel-parse-header-arguments): Add optional argument disabling
Lisp evaluation in parameters.
2017-12-23 15:45:03 +01:00
Nicolas Goaziou
1e40dd6486
ob-core: Tiny refactoring
...
* lisp/ob-core.el (org-babel-expand-noweb-references): Tiny
refactoring.
2017-12-23 14:03:52 +01:00
Nicolas Goaziou
774e553f11
Merge branch 'maint'
2017-12-23 14:03:47 +01:00
Nicolas Goaziou
d9125e435f
Fix recursive Noweb expansion
...
* lisp/ob-core.el (org-babel-expand-noweb-references): Recursive Noweb
expansion obey to :noweb parameter.
* testing/lisp/test-ob.el (test-ob/noweb-expansion): Add tests.
Fixes: 17523
2017-12-23 13:58:25 +01:00
Nicolas Goaziou
7e77560ebb
Merge branch 'maint'
2017-12-22 19:22:06 +01:00
Nicolas Goaziou
bac8d25441
org-clock: Fix timezone in `org-clock-get-sum-start'
...
* lisp/org-clock.el (org-clock-get-sum-start): Remove timezone
argument from `encode-time'.
Reported-by: Ihor Radchenko <ihor_radchenko@mymail.sutd.edu.sg>
<http://lists.gnu.org/r/emacs-orgmode/2017-12/msg00499.html >
2017-12-22 19:19:49 +01:00
Kaushal Modi
6e95e088e8
Merge branch 'maint'
2017-12-20 17:15:52 -05:00
Kaushal Modi
4f3fc9cb20
Fix double-escaping of # and ![ in Markdown export
...
* lisp/ox-md.el (org-md-plain-text): Fix the order of replacements in
plain text.
<http://lists.gnu.org/r/emacs-orgmode/2017-12/msg00460.html >
2017-12-20 13:18:55 -05:00
Nicolas Goaziou
3acc212c8f
ob-core: Get :noweb-ref from definition instead of point of call
...
* lisp/ob-core.el (org-babel-expand-noweb-references): Get :noweb-ref
from definition instead of point of call.
* testing/lisp/test-ob.el (test-ob/noweb-expansion-1):
(test-ob/noweb-expansion-2): Merge tests. Add test.
2017-12-20 13:15:08 +01:00
Nicolas Goaziou
291d90c53e
ob-core: Correctly find Noweb reference
...
* lisp/ob-core.el (org-babel--noweb-reference): New function.
(org-babel-expand-noweb-references): Use new function.
2017-12-20 13:01:53 +01:00
Nicolas Goaziou
1822f6eb62
Merge branch 'maint'
2017-12-19 20:29:21 +01:00
Neil Jerram
4932e2197a
Fix Scheme evaluation in fresh Emacs
...
* lisp/ob-scheme.el: Require geiser-impl so that
geiser-default-implementation is defined. Otherwise, unless Geiser
has previously been run (e.g. with `run-geiser'), you'll see an
error that geiser-default-implementation is undefined.
2017-12-19 20:27:44 +01:00
Kyle Meyer
06b49cd837
Merge branch 'maint'
2017-12-19 00:00:49 -05:00
Jack Kamm
b506bb68d0
ob-python: Fix :session :results output multiline behavior
...
* lisp/ob-python.el (orb-babel-python-evaluate-session): When :session
:results output, send multiline code blocks to tmpfile and execute in
Python with exec().
(org-babel-python--exec-tmpfile): New variable.
* testing/lisp/test-ob-python.el (test-ob-python/session-multiline):
Test for :session with multiple lines and indentation.
2017-12-18 23:59:04 -05:00
Nicolas Goaziou
fdb2eb6701
Preserve file local variables during some operations
...
* lisp/org-macs.el (org-preserve-local-variables): New macro.
* lisp/org-footnote.el (org-footnote--clear-footnote-section):
(org-footnote--goto-local-insertion-point):
(org-footnote-create-definition):
(org-footnote-delete):
(org-footnote-renumber-fn:N):
(org-footnote-sort):
(org-footnote-normalize):
* lisp/org.el (org-move-subtree-down):
(org-copy-subtree):
(org-sort-entries):
(org-refile): Use new macro.
* testing/lisp/test-org-footnote.el (test-org-footnote/normalize):
(test-org-footnote/delete):
(test-org-footnote/sort):
(test-org-footnote/normalize):
* testing/lisp/test-org.el (test-org/sort-entries): Add tests.
Operations affected include copying, killing, refiling, archiving and
moving subtrees. It also affects sorting, creating and deleting
footnotes.
2017-12-18 16:01:41 +01:00
Nicolas Goaziou
9bbee7d3c8
Add some `:safe' keywords
...
* lisp/org-src.el (org-edit-src-content-indentation):
* lisp/org.el (org-adapt-indentation): Add :safe keyword.
2017-12-17 11:01:25 +01:00
Nicolas Goaziou
3ac619c8ac
org-macro: Placeholders in (eval ...) macros are always strings
...
* lisp/org-macro.el (org-macro-initialize-templates): Update
templates.
(org-macro-expand): Ensure placeholders in "eval" macros are strings.
* testing/lisp/test-org-macro.el (test-org/macro-replace-all): Update
tests.
2017-12-17 09:40:56 +01:00
Marco Wahl
3f2968c650
org: Insert a blank with structure template type "src"
2017-12-16 18:17:10 +01:00
Nicolas Goaziou
6ffcdcbf02
Merge branch 'maint'
2017-12-16 13:45:43 +01:00
Nicolas Goaziou
84cb63a44a
ox: Fix plain text export with `org-export-with-backend'
...
* lisp/ox.el (org-export-with-backend): Handle arity for plain text
transcoder.
* testing/lisp/test-ox.el (test-org-export/with-backend): Add test.
2017-12-16 13:44:56 +01:00
Nicolas Goaziou
1992394148
org-duration: Remove unnecessary declaration
2017-12-15 23:23:49 +01:00
Nicolas Goaziou
c9bbc4eca7
Merge branch 'maint'
2017-12-15 23:21:34 +01:00
Nicolas Goaziou
5e30bbcd34
Silence byte-compiler
2017-12-15 23:21:15 +01:00
Nicolas Goaziou
9a24977571
Merge branch 'maint'
2017-12-15 22:50:38 +01:00
Nicolas Goaziou
aab7f65a8b
ox-latex: Merge check-boxes with bullets
...
* lisp/ox-latex.el (org-latex-item): Do not display both bullet and
checkbox.
Reported-by: Ken Mankoff <mankoff@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2017-12/msg00225.html >
2017-12-15 22:48:57 +01:00
Nicolas Goaziou
2646271789
Merge branch 'maint'
2017-12-15 22:26:01 +01:00
Nicolas Goaziou
46124812d2
Fix function declarations
...
Fixes: 29722
2017-12-15 22:24:44 +01:00
Nicolas Goaziou
5d4691dfbf
Merge branch 'maint'
2017-12-15 00:00:55 +01:00
Nicolas Goaziou
327ca051ae
ob-ref: Fix parsing arguments with a newline character
...
* lisp/ob-ref.el (org-babel-ref-split-regexp): Remove variable.
(org-babel-ref-parse): Handle arguments containing a newline
character (e.g., strings).
* testing/lisp/test-ob-lob.el (test-ob-lob/assignment-with-newline):
New test.
2017-12-15 00:00:30 +01:00
Nicolas Goaziou
6fc4a1c53b
Merge branch 'maint'
2017-12-14 22:40:55 +01:00
Nicolas Goaziou
fe98379fce
Fix fuzzy link escaping
...
* lisp/org.el (org-make-link-string): Properly escape square brackets
and percent sings in fuzzy links.
* testing/lisp/test-org-clock.el (test-org-clock/clocktable/link):
Update tests.
Reported-by: Paulo Matos <paulo@matos-sorge.com>
<http://lists.gnu.org/r/emacs-orgmode/2017-12/msg00269.html >
2017-12-14 22:39:54 +01:00
Nicolas Goaziou
60831c4606
Merge branch 'maint'
2017-12-14 00:40:58 +01:00
Nicolas Goaziou
263a0cf00e
Fix defcustom type
...
* lisp/org-agenda.el (org-agenda-custom-commands-local-options):
* lisp/org-duration.el (org-duration-units):
* lisp/org.el (org-occur-case-fold-search): Remove spurious quote.
Fixes: 29694
lignes
2017-12-14 00:40:27 +01:00
Nicolas Goaziou
bbf39576f4
org-tempo: Fix typo
...
* lisp/org-tempo.el (org-tempo-tags): Fix typo
2017-12-14 00:25:59 +01:00
Nicolas Goaziou
5d2517ba5a
Merge branch 'maint'
2017-12-14 00:18:20 +01:00
Nicolas Goaziou
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
Nicolas Goaziou
a36d18caa4
Merge branch 'maint'
2017-12-13 23:52:06 +01:00
Nicolas Goaziou
08fa2ae056
Fix some defcustoms types
...
* lisp/ob-stan.el (org-babel-stan-cmdstan-directory):
* lisp/org.el (org-latex-default-packages-alist):
* lisp/ox-odt.el (org-odt-with-latex): Fix type mismatch.
Fixes: 29695
2017-12-13 23:51:10 +01:00
Nicolas Goaziou
2390b6302d
Merge branch 'maint'
2017-12-11 23:21:07 +01:00
Nicolas Goaziou
0dde39ccd3
org-archive: Fix point after archiving to sibling
...
* lisp/org-archive.el (org-archive-to-archive-sibling): Move point in
a consistent way upon archiving to a sibling.
Reported-by: Allen Li <vianchielfaura@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2017-12/msg00158.html >
2017-12-11 23:19:40 +01:00
Nicolas Goaziou
e8b71b86d2
Merge branch 'maint'
2017-12-11 15:14:01 +01:00
Doro Rose
b467877437
Fix ob-haskell.el to work with custom ghci prompts
...
* lisp/ob-haskell.el (haskell-prompt-regexp): Define defvar
`haskell-prompt-regexp`. This variable will override the variable set by
inf-haskell, when `org-babel-execute:haskell` is called.
(org-babel-execute:haskell): Make sure that
`comint-prompt-regexp` is set appropriately to enable correct parsing
of "λ"-prompts. Set `comint-preoutput-filter-functions` appropriately to
enable correct parsing of coloured ghci prompts.
The problem was that code sent back from the inf-haskell buffer to
org-babel wasn't parsed correctly in `org-babel-comint-with-output`.
This occured when the user uses the commonly used "λ"-prompt.
TINYCHANGE
2017-12-11 15:11:56 +01:00
Nicolas Goaziou
c3c1c52eb8
ox: Fix inline source block evaluation
...
* lisp/ox.el (org-export-as): Specifically expand {{{results}}} macro
after Babel code execution.
* testing/lisp/test-ox.el (test-org-export/expand-macro): Add test.
Reported-by: "Berry, Charles" <ccberry@ucsd.edu>
<http://lists.gnu.org/r/emacs-orgmode/2017-12/msg00202.html >
2017-12-11 14:56:57 +01:00
Nicolas Goaziou
076cba6b2d
Fix last commit
...
* lisp/org.el (org-show-all): Remove function.
2017-12-10 23:50:30 +01:00
Nicolas Goaziou
6f89177ee6
Move `org-unlogged-message' to "org-macs.el"
...
* lisp/org.el (org-unlogged-message): Move function to...
* lisp/org-macs.el: ... here.
2017-12-10 23:37:59 +01:00
Nicolas Goaziou
fc5abc2d55
ob-core: Insert lowercase results
...
* lisp/ob-core.el (org-babel-insert-result): Insert lower case blocks
and drawers.
* testing/lisp/test-ob.el (test-ob/org-babel-remove-result--results-wrap):
(test-ob/org-babel-remove-result--results-org):
(test-ob/org-babel-remove-result--results-html):
(test-ob/org-babel-remove-result--results-latex):
(test-ob/org-babel-remove-result--results-code): Update tests.
2017-12-10 23:05:32 +01:00
Nicolas Goaziou
a34431f6ea
org-tempo: Tiny refactoring
...
* lisp/org-tempo.el (org-tempo--include-file): Tiny refactoring.
2017-12-10 17:11:24 +01:00
Rasmus
3efb000739
org-tempo: Enable Tempo in all Org buffers after load
...
* lisp/org-tempo.el: Enable Org Tempo in all buffers after load.
Reported-by: Charles Berry <ccberry@ucsd.edu>
http://lists.gnu.org/archive/html/emacs-orgmode/2017-12/msg00172.html
2017-12-10 12:01:09 +01:00
Rasmus
94f1a58438
org-tempo.el: New file for expansion of templates
...
* lisp/org-tempo.el: New file.
* doc/org.texi (Structure templates):
* lisp/org.el (org-modules): Add org-tempo.
* testing/lisp/test-org-tempo.el: New file.
2017-12-08 00:29:08 +01:00
Nicolas Goaziou
d435c75f54
Merge branch 'maint'
2017-12-07 14:20:33 +01:00
Eric S Fraga
1187538a21
Allow gnuplot to generate plots in different directories
...
* lisp/ob-gnuplot.el (org-babel-expand-body:gnuplot) if the Org buffer
is associated with a file, direct gnuplot to change to the directory
for that file.
2017-12-07 14:20:06 +01:00
Nicolas Goaziou
3695415199
Merge branch 'maint'
2017-12-06 23:16:55 +01:00
Nicolas Goaziou
b570175d76
Fix `org-files-list'
...
* lisp/org.el (org-files-list): Prevent duplicates in result.
Reported-by: Renato Ferreira <renatofdds@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2017-12/msg00134.html >
2017-12-06 23:15:59 +01:00
Nicolas Goaziou
15df8db7ad
Merge branch 'maint'
2017-12-04 22:43:31 +01:00
Nicolas Goaziou
0e7e3bc6df
Remove some references to reserved keybinding prefix `C-c a'
...
* lisp/org-agenda.el (org-stuck-projects):
(org-agenda-menu):
* lisp/org.el (org-org-menu): Remove references to reserved keybinding
prefix `C-c a'.
Fixes: 28263
2017-12-04 22:42:16 +01:00
Nicolas Goaziou
494414028a
Merge branch 'maint'
2017-12-04 22:21:25 +01:00
Nicolas Goaziou
66754e9042
org-feed: Fix parsing <guid>
...
* lisp/org-feed.el (org-feed-parse-rss-feed): Fix regexp for <guid>.
Fixes: 27711
2017-12-04 22:20:25 +01:00
Nicolas Goaziou
f8db6e0295
Merge branch 'maint'
2017-12-04 18:55:29 +01:00
Nicolas Goaziou
d3f7309cbd
org-irc: Silence byte-compiler
2017-12-04 18:55:03 +01:00
Nicolas Goaziou
ada2f64b16
org-attach: Make `org-attach-directory' a safe variable
...
* lisp/org-attach.el (org-attach-directory): Add :safe keyword.
2017-12-04 14:55:20 +01:00
Nicolas Goaziou
0c691737aa
Merge branch 'maint'
2017-12-04 08:24:19 +01:00
thibault
e22ee8b8a3
Fix bug in HTML export of code blocks with starting blank lines
...
* lisp/ox-html.el (org-html-do-format-code): Preverse starting blank
lines when splitting code lines (use `split-string' instead of
`org-split-string').
(org-html-fontify-code): Preserve starting blank lines in returned
code string.
2017-12-04 08:24:02 +01:00
Nicolas Goaziou
a0e3f1d505
Merge branch 'maint'
2017-12-03 18:14:48 +01:00
Nicolas Goaziou
037db00f40
Fix last commit
...
* lisp/org.el (org-org-menu): Fix last commit.
2017-12-03 18:14:21 +01:00
Nicolas Goaziou
7fc901ca0f
Merge branch 'maint'
2017-12-03 18:04:18 +01:00
Nicolas Goaziou
b4079bb894
Activate CDLatex entry in menu only if `cdlatex' is loaded
...
* lisp/org.el (org-org-menu): Activate CDLatex entry in menu only if
`cdlatex' is loaded.
Fixes: 4068
2017-12-03 18:03:19 +01:00
Nicolas Goaziou
ff36e945ca
Merge branch 'maint'
2017-12-03 16:24:49 +01:00
Nicolas Goaziou
efe440adbe
org-gnus: Silence byte-compiler
...
Fixes: 29329
2017-12-03 16:22:45 +01:00
Nicolas Goaziou
259656a76e
Merge branch 'maint'
2017-12-03 09:03:37 +01:00
Nicolas Goaziou
2faaacfeeb
Revert the whole time zone mess
...
* lisp/org.el (org-time-string-to-time):
(org-time-string-to-seconds): Remove optional ZONE argument.
(org-2ft):
(org-check-before-date):
(org-check-after-date):
(org-check-dates-range):
(org-parse-time-string):
* lisp/org-clock.el (org-clock-get-sum-start):
(org-clock-out):
(org-clock-timestamps-change):
(org-clock-sum):
(org-clock-update-time-maybe):
* lisp/org-colview.el (org-columns--age-to-minutes): Apply change.
* testing/lisp/test-org-clock.el (org-test-clock-create-clock):
(test-org-clock/clocktable/scope):
* testing/lisp/test-org-colview.el (test-org-colview/columns-summary):
Apply change. Simplify tests to avoid daylight saving time issue.
2017-12-03 08:57:37 +01:00
Nicolas Goaziou
14620fdf0c
Yet another tweak to fontification
...
* lisp/org.el (org-do-emphasis-faces): Handle properly asterisks at
the beginning of line.
2017-12-02 23:21:36 +01:00
Nicolas Goaziou
8bd9839952
Revert "Fix headline fontification"
...
This reverts commit 5873d99121
.
2017-12-02 23:07:51 +01:00
Nicolas Goaziou
bdaf5dacf4
Merge branch 'maint'
2017-12-02 17:27:53 +01:00
Nicolas Goaziou
ca43c1f262
Fix RET past the last column of a table
...
* lisp/org.el (org-return): Split the table before first column or
after last one.
* lisp/org-table.el (org-table-next-row): Remove code handling split.
* testing/lisp/test-org.el (test-org/return): Add test.
2017-12-02 17:23:03 +01:00
Nicolas Goaziou
0ace32b045
Merge branch 'maint'
2017-12-02 12:23:02 +01:00
Nicolas Goaziou
f53d1e2005
Let `or-export-last-sibling-p' handle discontinuous headlines
...
* lisp/ox.el (org-export-last-sibling-p): Handle discontinuous
headlines.
* testing/lisp/test-ox.el (test-org-export/last-sibling-p): Add test.
Fixes: 24836
2017-12-02 12:22:32 +01:00
Nicolas Goaziou
7a3cae65a7
Merge branch 'maint'
2017-12-01 19:35:54 +01:00
Nicolas Goaziou
0cc231a7bb
Call store link functions only once
...
* lisp/org.el (org-store-link): Call store link functions only once.
Fixes: 19914
2017-12-01 19:33:35 +01:00
Nicolas Goaziou
1bb9cf1597
Merge branch 'maint'
2017-11-29 23:02:42 +01:00
Matt Lundin
dd3bf50adf
Preserve point when storing link in Gnus nnir groups
...
* lisp/org-gnus.el: (org-gnus-store-link) This fixes a similar issue
as commit 84b329516e
, but for
nnir search groups in gnus.
2017-11-29 21:05:19 +01:00
Nicolas Goaziou
326b2e85e4
Merge branch 'maint'
2017-11-29 19:03:22 +01:00
Matt Lundin
84b329516e
Preserve position of point in gnus virtual group
...
* lisp/org-gnus.el: (org-gnus-store-link) Add a save-excursion to
protect the position of point. Otherwise, when calling org-capture
in an article with a virtual group, the point is moved and the
region captured is incorrect.
2017-11-29 19:02:57 +01:00
Nicolas Goaziou
fada34bb97
Merge branch 'maint'
2017-11-29 15:10:48 +01:00
Nicolas Goaziou
45c4502713
org-capture: Re-introduce history list per prompt
...
* lisp/org-capture.el (org-capture--prompt-history-table):
(org-capture--prompt-history): New variables.
(org-capture-fill-template): Handle history list per prompt.
Reported-by: Karl Eichwalder <ke@gnu.franken.de>
<http://lists.gnu.org/r/emacs-orgmode/2017-11/msg00251.html >
2017-11-29 15:09:44 +01:00
Alex Branham
ee7ead62aa
Make `org-comment-dwim' check if on a heading
...
* lisp/org.el (org-comment-dwim): If on a heading, comment the
heading.
* testing/lisp/test-org.el: Add test.
TINYCHANGE
2017-11-29 14:41:12 +01:00
Nicolas Goaziou
819b2a1a3d
Merge branch 'maint'
2017-11-28 23:59:21 +01:00
Nicolas Goaziou
b4b2809eb1
ob-core: Fix `org-babel-src-block-names'
...
* lisp/ob-core.el (org-babel-src-block-names): Do not change
visibility or windows when called.
2017-11-28 23:57:18 +01:00
Nicolas Goaziou
e92732efd0
Merge branch 'maint'
2017-11-28 23:35:44 +01:00
Nicolas Goaziou
ebe9eb2423
ob-core: Fix last commit
...
* lisp/ob-core.el (org-babel-result-end): Add missing `example-block'
result type.
2017-11-28 23:35:01 +01:00
Nicolas Goaziou
c1d7b2cda3
Merge branch 'maint'
2017-11-27 23:26:38 +01:00
Nicolas Goaziou
d7940ae2a7
ob-core: Fix removal of elements after RESULTS
...
* lisp/ob-core.el (org-babel-result-end): Ignore elements that do not
correspond to a valid result type (e.g., a headline).
Fixes commit 1d8126385c
.
Reported-by: Kaushal Modi <kaushal.modi@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2017-11/msg00384.html >
2017-11-27 23:23:04 +01:00
Nicolas Goaziou
68544f4f21
Merge branch 'maint'
2017-11-27 23:02:26 +01:00
Nicolas Goaziou
5873d99121
Fix headline fontification
...
* lisp/org.el (org-do-emphasis-faces): Do not emphasize stars in
headlines.
Reported-by: swflint@flintfam.org (Samuel W. Flint)
<http://lists.gnu.org/r/emacs-orgmode/2017-11/msg00363.html >
2017-11-27 22:54:41 +01:00
Kyle Meyer
5cd7eb3d53
Merge branch 'maint'
2017-11-26 20:35:57 -05:00
Paul Eggert
adfbfd42b2
Backport commit a89f0b6f3 from Emacs
...
maint: shorten https://lists.gnu.org/archive/html/ ... links
a89f0b6f33f9eb8910a1fceda9028d76ef50b05d
Paul Eggert
Sat Nov 25 22:48:12 2017 -0800
2017-11-26 20:35:46 -05:00
Nicolas Goaziou
579fa12f50
Merge branch 'maint'
2017-11-26 11:02:14 +01:00
Nicolas Goaziou
ac4b756588
Silence byte-compiler
2017-11-26 11:01:55 +01:00
Nicolas Goaziou
18f6610b32
ox-html: Fix last commit
...
* lisp/ox-html.el (org-html-link): Fix last commit.
2017-11-26 10:57:02 +01:00
Matt Lundin
b186d1d723
Do not save target buffer after archiving subtree
...
* lisp/org-archive.el: (org-archive-subtree) Do not save buffer after
each archive. Saving the archive buffer after archiving each
subtree results in substantial slowdown and many writes to disk when
archiving an active region. This brings the behavior of
org-archive-subtree into line with org-refile, which does not save
the target buffer after refiling.
2017-11-26 10:52:31 +01:00
Matt Lundin
63f6e851bc
Do not save target buffer after archiving subtree
...
* lisp/org-archive.el: (org-archive-subtree) Do not save buffer after
each archive. Saving the archive buffer after archiving each
subtree results in substantial slowdown and many writes to disk when
archiving an active region. This brings the behavior of
org-archive-subtree into line with org-refile, which does not save
the target buffer after refiling.
2017-11-26 10:52:03 +01:00
Nicolas Goaziou
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
Nicolas Goaziou
b0ab7008df
Merge branch 'maint'
2017-11-26 10:47:55 +01:00
Nicolas Goaziou
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
Nicolas Goaziou
be1e807942
Merge branch 'maint'
2017-11-25 21:13:58 +01:00
Nicolas Goaziou
1d8126385c
ob-core: Fix results removal without blank line between source and results
...
* lisp/ob-core.el (org-babel-remove-result): Delete blank lines before
results.
(org-babel-result-end): Use `org-element-at-point'.
* testing/lisp/test-ob.el (test-ob-verify-result-and-removed-result):
Remove duplicate.
* testing/lisp/test-ob.el (test-ob/org-babel-remove-result--no-blank-line):
New test.
* testing/lisp/test-ob.el (test-ob/results-in-narrowed-buffer): Small
refactoring.
Reported-by: Ken Mankoff <mankoff@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-11/msg00338.html >
2017-11-25 21:07:52 +01:00
Nicolas Goaziou
d7f2c8b8e1
Merge branch 'maint'
2017-11-25 15:42:33 +01:00
Nicolas Goaziou
ed06b159c3
Small fix to emphasis fontification
...
* lisp/org.el (org-do-emphasis-faces): Do not span over paragraph
separators.
Reported-by: Kaushal Modi <kaushal.modi@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-11/msg00202.html >
2017-11-25 15:42:10 +01:00
Nicolas Goaziou
f67e62eb3f
Merge branch 'maint'
2017-11-25 15:33:22 +01:00
Nicolas Goaziou
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
Nicolas Goaziou
b6df86a303
org-macro: Silence byte-compiler
2017-11-22 23:35:50 +01:00
Nicolas Goaziou
51234f9555
org-macro: Implement "keyword" macro
...
* lisp/org-macro.el (org-macro-initialize-templates): Implement
"keyword" macro.
* doc/org.texi (Macro replacement): Document new macro.
* testing/lisp/test-org-macro.el (test-org-macro/keyword): New test.
2017-11-21 23:38:24 +01:00
Nicolas Goaziou
5f5d82ed51
Remove second pass for macro expansion
...
* lisp/org-macro.el (org-macro-initialize-templates): Initialize all
macros, including {{{title}}} and al.
(org-macro-replace-all): Change signature.
(org-macro--find-keyword-value): New function.
* lisp/ox.el (org-export-as): Remove second macro expansion
2017-11-21 22:27:42 +01:00
Nicolas Goaziou
7455f4bf83
ox: Allow a less strict UNNUMBERED inheritance
...
* lisp/ox.el (org-export-collect-headlines):
(org-export-excluded-from-toc-p): Allow to number headlines in the
middle of an otherwise unnumbered tree.
* testing/lisp/test-ox.el (test-org-export/collect-headlines):
(test-org-export/excluded-from-toc-p):
(test-org-export/toc-entry-backend): Update tests. Add more tests.
Reported-by: Akater <nuclearspace@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-11/msg00219.html >
2017-11-20 14:07:03 +01:00
Nicolas Goaziou
f482cfa785
Merge branch 'maint'
2017-11-20 00:14:05 +01:00
Nicolas Goaziou
82812ff086
ox: Fix UNNUMBERED strict inheritance
...
* lisp/ox.el (org-export-numbered-headline-p): Use a less opinionated
definition of inheritance.
* testing/lisp/test-ox.el (test-org-export/numbered-headline-p):
Update test.
* doc/org.texi (Export settings): Insist on UNNUMBERED inheritance.
It is now possible to number a headline within an unnumbered tree.
2017-11-20 00:09:59 +01:00
Nicolas Goaziou
b8d473a04f
org-table: Insert new column to the right instead of the left
...
* lisp/org-table.el (org-table-insert-column): Insert new column to
the right instead of the left.
* testing/lisp/test-org-table.el (test-org-table/insert-column): New
test.
2017-11-19 23:22:16 +01:00
Nicolas Goaziou
de289d1fe8
Merge branch 'maint'
2017-11-15 22:50:56 +01:00
Nicolas Goaziou
946f76d707
org-table: Better fix for `:org-untouchable'
...
* lisp/org-table.el (org-table-recalculate): Fix typo in existing
`remove-text-properties' call instead of adding a new one.
Also, cleaning property before processing formulas is more robust,
e.g., if last process raised an error.
2017-11-15 22:47:06 +01:00
Nicolas Goaziou
04e0532ef5
Merge branch 'maint'
2017-11-15 18:59:05 +01:00
Nicolas Goaziou
696ec60341
org-macs: Fix typos in docstrings
...
* lisp/org-macs.el (org-split-string):
(org-string-width): Fix typo in docstring.
2017-11-15 18:58:44 +01:00
Nicolas Goaziou
966af419f9
Merge branch 'maint'
2017-11-15 18:14:44 +01:00
Nicolas Goaziou
40f73953f6
Fix `org-string-display'
...
* lisp/org-macs.el (org-string-display): Preserve original string's
display property when computing displayed width.
* testing/lisp/test-org-macs.el (test-org/string-display): Add test.
Reported-by: Ruy Exel <ruyexel@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-11/msg00160.html >
2017-11-15 18:13:34 +01:00
Nicolas Goaziou
64ac3bb5b3
ox-ascii: Lighten numbering in table of contents
...
* lisp/ox-ascii.el (org-ascii--build-title): Use only last number in
headline numbering when building table of contents.
2017-11-15 17:43:08 +01:00
Nicolas Goaziou
8ff3673dfc
Merge branch 'maint'
2017-11-15 17:41:48 +01:00
Nicolas Goaziou
6059c3a057
org-table: Clean left-over `:org-untouchable' property
...
* lisp/org-table.el (org-table-recalculate): Clean `:org-untouchable'
property once we no longer need it.
* testing/lisp/test-org-table.el (test-org-table/formula-priority):
New test.
Reported-by: Ruy Exel <ruyexel@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-11/msg00159.html >
2017-11-15 17:40:22 +01:00
Marco Wahl
5c382f2ee2
org-attach,test-org-attach: Refactoring.
...
* lisp/org-attach.el (org-attach-dired-to-subtree): Renamed from
`org-attach-dired-attach-to-next-best-subtree'. Convenience
functions have been dropped.
* testing/lisp/test-org-attach.el: Tests use
`org-test-with-temp-text-in-file' now and are cleaner now.
2017-11-15 14:39:26 +01:00
Marco Wahl
a49ac98f3f
org-attach: Refactor. Replace self made with available function.
...
* lisp/org-attach.el (org-attach-dired-marked-files-or-file-at-cursor-in-dired)
(org-attach-dired-marked-files-in-dired): Removed. Use
`dired-get-marked-files' instead.
2017-11-15 12:21:18 +01:00
Marco Wahl
615b147031
org-attach: Attach files specified in a dired buffer.
...
* lisp/org-attach.el (org-attach-attach-files): New.
(org-attach-dired-marked-files-in-dired): New
(org-attach-dired-marked-files-or-file-at-cursor-in-dired): New.
(org-attach-dired-attach-to-next-best-subtree): New command.
(org-attach-dired-attach-to-next-best-subtree-cp): New command.
(org-attach-dired-attach-to-next-best-subtree-mv): New command.
(org-attach-dired-attach-to-next-best-subtree-ln): New command.
(org-attach-dired-attach-to-next-best-subtree-lns): New command.
* testing/lisp/test-org-attach.el: Tests.
2017-11-15 11:25:51 +01:00
Kyle Meyer
c029c4d45d
Merge branch 'maint'
2017-11-13 22:09:46 -05:00
Charles A. Roelli
18af0f88d7
Backport commit 98288ecaf from Emacs
...
* lisp/org-clock.el (org-clock--oldest-date): Fix an issue when
compiling on macOS 10.6 with a western time zone (a continuation of
Bug#27736).
Further workaround for faulty localtime() under macOS 10.6
98288ecaffbc0947ec3193088172ea85ad5e42a5
Charles A. Roelli
Wed Nov 8 20:51:48 2017 +0100
2017-11-13 22:07:59 -05:00
Nicolas Goaziou
9cac9d7bc7
Merge branch 'maint'
2017-11-12 23:29:38 +01:00
Chunyang Xu
3f8d67c490
ox-html: Allow disabling htmlize
...
* lisp/ox-html.el (org-html-fontify-code): Do it.
Disable htmlize by setting org-html-htmlize-output-type to nil.
TINYCHANGE
2017-11-12 23:28:57 +01:00
Nicolas Goaziou
4c703513a7
Merge branch 'maint'
2017-11-12 22:38:26 +01:00
Martin Šlouf
fcf4bb61ec
Add CS export translations
...
* lisp/ox.el (org-export-dictionary): Add translations for CS.
TINYCHANGE
2017-11-12 22:37:04 +01:00
Marco Wahl
44189a72d5
Merge branch 'maint'
2017-11-10 19:40:15 +01:00
Marco Wahl
12e41c445b
org-attach: Fix handling of ATTACH tag at sychronize
...
* lisp/org-attach.el (org-attach-sync): Remove ATTACH tag at
synchronize when no files left.
2017-11-10 19:35:35 +01:00
Nicolas Goaziou
d07ee7f7f2
Implement :pre-blank property for items and footnotes definitions
...
* lisp/org-element.el (org-element-footnote-definition-parser):
(org-element-item-parser): Add `:pre-blank' property.
(org-element-footnote-definition-interpreter):
(org-element-item-interpreter):
(org-element-interpret-data):
* lisp/ox.el (org-export-data): Use new property.
* testing/lisp/test-org-element.el (test-org-element/footnote-definition-parser):
(test-org-element/item-parser): Add tests.
2017-11-10 00:38:31 +01:00
Nicolas Goaziou
28ebfa6d77
Merge branch 'maint'
2017-11-06 23:10:13 +01:00
Nicolas Goaziou
0880fc580e
ox-ascii: Small fix to items that do not start with a paragraph
...
* lisp/ox-ascii.el (org-ascii-item): Use better heuristics to
determine if contents should follow bullet or start a new line.
Contents follow bullet when the first contributing line is
a paragraph. As a consequence, the following snippet
-
#+html: ...
This is a paragraph.
is exported as
- This is a paragraph.
instead of
-
This is a paragraph.
previously.
2017-11-06 23:07:17 +01:00
Nicolas Goaziou
76a9e1d01d
Merge branch 'maint'
2017-11-06 14:32:11 +01:00
Nicolas Goaziou
7000ed9ee0
ox-ascii: Fix descriptive lists
...
* lisp/ox-ascii.el (org-ascii-quote-margin): Update docstring.
(org-ascii--current-text-width): Properly handle width of text within
nested plain-list items.
(org-ascii-item): Always start a new line for description contents.
Indent them by `org-ascii-quote-margin' characters.
2017-11-06 14:27:45 +01:00
Nicolas Goaziou
8d43a0c49f
ox-texinfo: Gracefully handle node collision in the same hierarchy
...
* lisp/ox-texinfo.el (org-texinfo--get-node): Ensure the upper element
get the shorter node.
Considering the following document:
* Headline
** Headline
the level 1 headlines get "Headline" node and the other one
"Headline (1)".
2017-11-05 12:22:18 +01:00
Nicolas Goaziou
04f35fc473
ox-texinfo: Preserve target name as node.
...
* lisp/ox-texinfo.el (org-texinfo--get-node): Use target's value as
base for the node name, instead of using `org-export-get-reference'.
2017-11-05 10:32:13 +01:00
Eric Abrahamsen
c04e357f3d
Replace easy templates with org-insert-structure-template
...
* lisp/org.el (org-insert-structure-template): New function for
wrapping region (or element at point) in a begin/end block.
(org-structure-predefined-blocks): New option holding predefined
blocks, for completion.
(org-try-structure-completion,
org-complete-expand-structure-template): Remove functions.
* doc/org.texi (Inserting structure templates): Document.
* testing/lisp/test-org.el (test-org/insert-template): New test.
2017-11-05 09:56:26 +01:00
Nicolas Goaziou
fd50740c96
Merge branch 'maint'
2017-11-04 22:41:07 +01:00
Nicolas Goaziou
271e58f2dd
Fix characters conversion issue when loading `org-id-locations-file'
...
* lisp/org-id.el (org-id-locations-load): Use `insert-file-contents'
instead of `insert-file-contents-literally'.
Reported-by: Anders Johansson <mejlaandersj@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-11/msg00037.html >
2017-11-04 22:40:02 +01:00
Nicolas Goaziou
7ba058963e
Merge branch 'maint'
2017-11-04 21:51:40 +01:00
Nicolas Goaziou
6186ed3a22
org-element: Fix item parser
...
* lisp/org-element.el (org-element--list-struct): Correctly handle end
of sub-lists and end of last item.
* testing/lisp/test-org-element.el (test-org-element/item-parser):
(test-org-element/plain-list-parser): Add tests.
2017-11-04 21:50:11 +01:00
Nicolas Goaziou
db16370c0b
ox-texinfo: Fix @ref without description
...
* lisp/ox-texinfo.el (org-texinfo--@ref): Prefer @ref{} with a single
argument when no description is provided.
2017-11-04 21:50:00 +01:00
Nicolas Goaziou
9bee79a102
Merge branch 'maint'
2017-11-03 23:11:07 +01:00
Nicolas Goaziou
08c9de2a74
Fix typo in docstring
...
* lisp/org.el (org-speed-commands-user): Fix typo in docstring.
2017-11-03 23:10:38 +01:00
Nicolas Goaziou
6a273e30d7
Merge branch 'maint'
2017-11-03 22:20:46 +01:00
Xavier Martinez-Hidalgo
f38a7d433b
org-capture: Fix aborting after inserting text at end of buffer
...
* lisp/org-capture.el (org-capture-mark-kill-region): Set end marker
insertion type so that it advances when inserting text at the end of
the capture buffer.
* testing/lisp/test-org-capture.el (test-org-capture/insert-at-end-abort):
Add test case.
Inserting text at the end of the capture buffer does not advance the
end kill marker. This causes the narrowing region and the kill
markers to get out of sync, which prevents 'org-capture-finalize' from
correctly cleaning the target buffer when aborting the capture.
Setting the kill end marker insertion type fixes this.
TINYCHANGE
2017-11-03 22:20:11 +01:00
Nicolas Goaziou
902bfe1892
Merge branch 'maint'
2017-11-03 12:22:33 +01:00
Nicolas Goaziou
b5f075aa05
ox-texinfo: Fix spurious blank lines in detailed menu.
...
* lisp/ox-texinfo.el (org-texinfo--build-menu): Prevent spurious blank
lines in detailed menu.
2017-11-03 12:21:56 +01:00
Nicolas Goaziou
c470edba77
ox-texinfo: Prettify adjunct for indentical nodes.
...
* lisp/ox-texinfo.el (org-texinfo--get-node): Nicer adjunct for
identical nodes.
2017-11-03 11:35:53 +01:00
Nicolas Goaziou
f9c09b194f
ox-texinfo: Allow cross-references to headlines excluded from TOC
...
* lisp/ox-texinfo.el (org-texinfo-headline): Use @anchor instead of
@node for headlines outside TOC.
2017-11-03 11:34:21 +01:00
Nicolas Goaziou
36578fda46
Merge branch 'maint'
2017-10-31 19:34:35 +01:00
Nicolas Goaziou
8860fe2938
Fix `org-display-inline-images'
...
* lisp/org.el (org-display-inline-images): Fix regexp.
Reported-by: Leslie Watter <watter@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-10/msg00455.html >
2017-10-31 19:33:55 +01:00
Nicolas Goaziou
4388bdf852
Merge branch 'maint'
2017-10-30 00:51:31 +01:00
Nicolas Goaziou
2567fee3c9
Fix Org corruption when `org-agenda-files' is invalid
...
* lisp/org.el (org-install-agenda-files-menu): Prevent errors in
`org-agenda-files' from corrupting Org initialization.
Reported-by: Allen Li <vianchielfaura@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-10/msg00424.html >
2017-10-30 00:50:11 +01:00
Nicolas Goaziou
f474c7149b
org-table: Fix compatibility with Emacs 24.3
...
* lisp/org-table.el (org-table-align): Call `split-string' with the
expected number of arguments in Emacs 24.3.
Reported-by: thomas <thomas@friendlyvillagers.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-10/msg00430.html >
2017-10-29 09:15:01 +01:00
Nicolas Goaziou
99dbca3d4f
Remove `org-babel-use-quick-and-dirty-noweb-expansion'
...
* lisp/ob-core.el (org-babel-use-quick-and-dirty-noweb-expansion):
Remove variable.
(org-babel-expand-noweb-references): Update function.
* doc/org.texi (noweb-ref): Document new behaviour.
(Noweb reference syntax): Delete reference to removed variable.
`org-babel-use-quick-and-dirty-noweb-expansion' main use is to speed
up Noweb expansion when expanding only by name. By distinguishing
name and reference expansion, we no longer need this variable. In the
first case, the expansion is quicker anyway, and in the second case,
we most certainly need an accurate expansion.
2017-10-26 13:09:23 +02:00
Marco Wahl
22e7bc8e2b
org-agenda: Refactoring. Deactivate mark in case of a region.
...
* lisp/org-agenda.el (org-agenda-bulk-mark): Use region-beginning/end
defuns. And deactivate the mark in case.
2017-10-25 17:35:26 +02:00
Marco Wahl
78c6a299d2
org-agenda: Bulk mark lines in region
...
* lisp/org-agenda.el (org-agenda-bulk-mark): Added bulk mark for entries
in region. This is like in dired now.
* doc/org.texi (Agenda commands): Document bulk mark entries in region
2017-10-25 15:13:13 +02:00
Nicolas Goaziou
bebfd341af
Merge branch 'maint'
2017-10-24 13:56:56 +02:00
Nicolas Goaziou
5c91976b49
ox-texinfo: Remove TABs from output
...
* lisp/ox-texinfo.el (org-texinfo--untabify): New function.
(texinfo): Use new function as a final output filter.
See (info "(texinfo) Conventions").
2017-10-24 13:55:38 +02:00
Nicolas Goaziou
048169d270
org-goto: Fix wrong number of arguments error
...
* lisp/org-goto.el (org-goto-location): Fix
`isearch-search-fun-function' binding.
2017-10-24 10:28:43 +02:00
Nicolas Goaziou
3a5b75d4ee
org-goto: Fix keymapp error
...
* lisp/org-goto.el: Remove spurious `defvar.
2017-10-24 10:28:39 +02:00
Nicolas Goaziou
73a15d1bfb
ox-texinfo: Small refactoring
...
* lisp/ox-texinfo.el (org-texinfo--sanitize-title):
(org-texinfo--wrap-float): Use new `org-export-toc-entry-backend'
function.
2017-10-24 10:07:50 +02:00
Nicolas Goaziou
96c7fd7541
Merge branch 'maint'
2017-10-24 09:53:47 +02:00
Nicolas Goaziou
3aa4d44ba8
Fix comma escaping with multiple leading commas
...
* lisp/org-src.el (org-escape-code-in-region):
(org-escape-code-in-string):
(org-unescape-code-in-region):
(org-unescape-code-in-string): Fix comma escaping with multiple
leading commas.
* testing/lisp/test-org-src.el (test-org-src/escape-code-in-string):
(test-org-src/unescape-code-in-string): New tests.
Reported-by: Michal Politowski <mpol@meep.pl>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-10/msg00359.html >
2017-10-24 09:51:43 +02:00
Nicolas Goaziou
e59199e3a8
ox-texinfo: Fix missing contents in headings out of TOC
...
* lisp/ox-texinfo.el (org-texinfo-section): Include contents even in
headings out of TOC.
2017-10-23 14:55:05 +02:00
Nicolas Goaziou
c024bec29e
org-goto: Fix header
2017-10-23 09:57:13 +02:00
Nicolas Goaziou
e1c2db37ed
Extract "org-goto" code into a dedicated library
...
* lisp/org-goto.el: New file.
* lisp/org.el (org-goto-interface):
(org-goto-max-level):
(org-goto-auto-isearch):
(org-goto-local-auto-isearch):
(org-goto-ret):
(org-goto-left):
(org-goto-right):
(org-goto-quit):
(org-goto): Move to new file.
(org-goto-location): Change signature. Move to new file.
(org-goto-map): Remove function.
* lisp/org-id.el (org-id-get-with-outline-drilling): Update to new
`org-goto-location' signature.
2017-10-22 16:49:17 +02:00
Nicolas Goaziou
87116700e6
Move some invisibility check functions to "org-macs.el"
...
* lisp/org.el (org-invisible-p):
(org-truely-invisible-p):
(org-invisible-p2): Move...
* lisp/org-macs.el: ... there.
2017-10-22 16:20:58 +02:00
Nicolas Goaziou
fc551191a7
Silence byte-compiler
2017-10-22 15:41:02 +02:00
Nicolas Goaziou
59d21881b1
Revert "Move `org-key' and `org-defkey' into "org-macs.el""
...
This reverts commit 7f56a9920f
.
`org-key' is specific to Org keybinding, therefore not generic enough
to fit in "org-macs.el". So is `org-defkey'.
2017-10-22 15:38:35 +02:00
Nicolas Goaziou
486331e323
Move some generic functions into "org-macs.el"
...
* lisp/org.el (org-do-wrap): Remove function.
(org-base-buffer):
(org-find-base-buffer-visiting):
(org-overlay-display):
(org-overlay-before-string):
(org-find-overlays):
(org-reverse-string):
(org-shorten-string):
(org-remove-tabs):
(org-wrap):
(org-remove-indentation):
(org-do-remove-indentation):
(org-uniquify-alist):
(org-combine-plists):
(org-skip-whitespace):
(org-in-regexp):
(org-point-in-group):
(org-get-at-eol):
(org-find-text-property-in-string):
(org-display-warning):
(org-eval):
* lisp/org-compat.el (org-add-props): Move ...
* lisp/org-macs.el: ... there.
(org--do-wrap): New function.
2017-10-22 15:34:26 +02:00
Nicolas Goaziou
7f56a9920f
Move `org-key' and `org-defkey' into "org-macs.el"
...
* lisp/org.el (org-key):
(org-defkey): Move...
* lisp/org-macs.el: ... there.
2017-10-22 15:05:48 +02:00
Nicolas Goaziou
7554012cef
Move compatibility functions in "org-compat.el"
...
* lisp/org.el (org-imenu-and-speedbar):
(org-imenu-markers):
(org-imenu-new-marker):
(org-imenu-get-tree):
(org-speedbar-restriction-lock-overlay):
(org-speedbar-set-agenda-restriction):
(org--flyspell-object-check-p):
(org-mode-flyspell-verify):
(org-remove-flyspell-overlays-in):
(org-bookmark-jump-unhide):
(org-mark-jump-unhide): Move...
* lisp/org-compat.el: ... there.
2017-10-22 15:01:43 +02:00
Nicolas Goaziou
95b76608a6
Merge branch 'maint'
2017-10-22 14:40:45 +02:00
Nicolas Goaziou
a2a034f5b9
Prevent leaking fontification across table fields' borders
...
* lisp/org.el (org-do-emphasis-faces): Prevent leaking fontification
across table fields' borders.
Reported-by: Ryan <rct@thompsonclan.org>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-10/msg00321.html >
2017-10-22 14:39:36 +02:00
Nicolas Goaziou
bed03c4b42
Merge branch 'maint'
2017-10-22 12:42:35 +02:00
thibault
1613153aac
Fix tangling of org block with nested source block
...
* lisp/ob-tangle.el (org-babel-tangle-single-block): Prevent double unescaping
of source block by removing unnecessary call to `org-unescape-code-in-string'.
* testing/lisp/test-ob-tangle.el (ob-tangle/nested-block) New function.
2017-10-22 12:42:05 +02:00
Kyle Meyer
33ca07b5df
org-agenda: Fix the display of more key substitutions
...
* lisp/org-agenda.el (org-todo-list):
(org-tags-view): Specify the keymap for the substitute-command-keys
call because, as of b6c5a174d
, this call is made outside of the agenda
buffer.
The substitute-command-keys call in org-search-view is already taken
care of by 48f333805
.
2017-10-21 01:31:29 -04:00
Marco Wahl
620ba14460
Merge branch 'maint'
2017-10-20 12:24:07 +02:00
Marco Wahl
3df62457be
ox-man: Fix org-man--protect-text
2017-10-20 12:21:08 +02:00
Nicolas Goaziou
0cc59cea23
Merge branch 'maint'
2017-10-19 21:52:18 +02:00
Nicolas Goaziou
37142cea78
ox-man: Fix verbatim markup
...
* lisp/ox-man.el (org-man--protect-text): New function.
(org-man-code): Use new function.
(org-man-verbatim): Use inline markup.
2017-10-19 21:51:31 +02:00
Nicolas Goaziou
ff6fbaf395
Merge branch 'maint'
2017-10-18 22:55:18 +02:00
Nicolas Goaziou
ee24c0769b
ox-man: Fix code and verbatim export
...
* lisp/ox-man.el (org-man-code):
(org-man-verbatim): Fix functions.
Reported-by: Anthony Agelastos <iqgrande@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-10/msg00313.html >
2017-10-18 22:54:40 +02:00
Nicolas Goaziou
cd9cccb4b2
Merge branch 'maint'
2017-10-18 22:49:10 +02:00
Allen Li
8c5c030c64
Fix `org-insert-todo-heading'
...
* lisp/org.el (org-insert-todo-heading): Insert TODO keyword relative
to the original headline, not to the headline above.
* testing/lisp/test-org.el (test-org/insert-todo-heading-respect-content):
Add test.
2017-10-18 22:48:16 +02:00
Nicolas Goaziou
52d4ca4b29
Merge branch 'maint'
2017-10-17 23:31:45 +02:00
Allen Li
90d283f189
Update documentation on org-protocol template placeholders
...
* doc/org.texi (@code{capture} protocol): Fix placeholder names
(Template expansion): Add org-protocol placeholders
* lisp/org.el (org-store-link-plist): Fix docstring grammar
(org-store-link-props): Fix docstring grammar
2017-10-17 23:28:53 +02:00
Nicolas Goaziou
7ac8883394
Move `org-completing-read' into "org-macs.el"
...
* lisp/org-macs.el (org-completing-read): Moved here...
* lisp/org.el: ... from there.
2017-10-17 10:11:21 +02:00
Nicolas Goaziou
45a1918efe
Move `org-xor' into "org-macs.el"
...
* lisp/org.el (org-xor): Move...
* lisp/org-macs.el: ... there.
2017-10-17 09:37:34 +02:00
Nicolas Goaziou
5b2b8f3175
ox-texinfo: Handle "notoc" value
...
* lisp/ox-texinfo.el (org-texinfo-classes): Introduce @chapheading and
al. in default value.
(org-texinfo--structuring-command): Remove function.
(org-texinfo-headline): Handle unnumbered out of TOC headlines.
(org-texinfo-section): Do not add menu in unnumbered headings.
2017-10-15 16:51:13 +02:00
Nicolas Goaziou
b401d3a44b
Implement `org-export-excluded-from-toc-p'
...
* lisp/ox.el (org-export-excluded-from-toc-p): New function.
* testing/lisp/test-ox.el (test-org-export/excluded-from-toc-p): New
test.
2017-10-15 16:51:13 +02:00
Nicolas Goaziou
9b13e44ad7
ox: Implement "notoc" UNNUMBERED value
...
* lisp/ox.el (org-export-collect-headlines): Exclude headlines with
UNNUMBERED property set to "notoc".
* doc/org.texi (Export settings):
(Table of contents): Document new value.
* testing/lisp/test-ox.el (test-org-export/collect-headlines): Add
test.
2017-10-15 16:51:10 +02:00
Nicolas Goaziou
29b4134687
Improve a docstring
...
* lisp/org-element.el (org-element-lineage): Improve docstring.
2017-10-15 10:29:00 +02:00
Nicolas Goaziou
2525dc6c72
Merge branch 'maint'
2017-10-14 12:32:25 +02:00
Nicolas Goaziou
1d5142601a
Silence byte-compiler
2017-10-14 12:32:08 +02:00
Nicolas Goaziou
7df5d21f79
Merge branch 'maint'
2017-10-14 12:30:59 +02:00
Nicolas Goaziou
827af59873
Fix links without contents in table of contents' entries
...
* lisp/ox.el (org-export-toc-entry-backend): New function.
* lisp/ox-html.el (org-html--format-toc-headline):
* lisp/ox-md.el (org-md--build-toc):
* lisp/ox-odt.el (org-odt-toc): Use new function.
* lisp/ox-texinfo.el (org-texinfo--sanitize-title):
(org-texinfo--wrap-float): Handle links without contents.
* testing/lisp/test-ox.el (test-org-export/toc-entry-backend): New
test.
Reported-by: ConcreteVitamin <concretevitamin@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-10/msg00235.html >
2017-10-14 12:29:52 +02:00
Nicolas Goaziou
4ffddc2a93
Merge branch 'maint'
2017-10-14 11:01:32 +02:00
Nicolas Goaziou
5861a55740
`org-file-contents': Improve error message
...
* lisp/org.el (org-file-contents): Improve error message.
2017-10-14 10:59:51 +02:00
Kyle Meyer
8184de6e13
Merge branch 'maint'
2017-10-13 15:13:38 -04:00
Paul Eggert
3f1d5f9091
Backport commit 5d51403ce from Emacs
...
; Typo fixes, mostly repeated words
5d51403ceb9b86a1bfa66f00c7af39f1200e65f1
Paul Eggert
Mon Oct 9 22:55:06 2017 -0700
2017-10-13 15:12:27 -04:00
Paul Eggert
df0e3611f1
Backport commit 0d004ed01 from Emacs
...
; Spelling fixes
0d004ed01abb5fa025bdc9d58fce2a3abff0b6a4
Paul Eggert
Mon Oct 9 22:55:05 2017 -0700
2017-10-13 15:11:00 -04:00
Nicolas Goaziou
61c81e8255
Merge branch 'maint'
2017-10-12 01:01:14 +02:00
Nicolas Goaziou
76163e983b
ox-md: Export TODO keywords and priority cookies
...
* lisp/ox-md.el (org-md-headline): Export TODO keywords and priority
cookies.
Reported-by: Ganesh Krishnan <gkrishnan.gt@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-10/msg00171.html >
2017-10-12 01:00:14 +02:00
Kyle Meyer
0b83168465
Adjust version numbers of unreleased changes
...
* lisp/org-table.el (org-table-shrunk-column-indicator):
* lisp/org.el (org-startup-shrink-all-tables): Update Org version to 9.2
and Emacs version to 27.1.
(customize-package-emacs-version-alist): Map Org 9.2 to Emacs 27.1.
Emacs 26.1 is now in the pretest phase, and the version for Emacs's
development branch is 27.1.
2017-10-08 13:44:33 -04:00
Nicolas Goaziou
2a55d206e3
Merge branch 'maint'
2017-10-08 10:54:00 +02:00
Georgiy Tugai
07f939f419
org-clock: Fix clock report sometimes ignoring hours before :wstart
...
* lisp/org-clock (org-clocktable-steps): Fix weekly-step clock report
ignoring hours between start of period and start of week, when start
of period is on a day of week numerically less than start of week.
Clock report now always inserts a "week" starting at the start of
the period, if necessary; all following weeks start on the start of
the week as expected.
TINYCHANGE
2017-10-08 10:53:39 +02:00
Nicolas Goaziou
fa56da61a7
Merge branch 'maint'
2017-10-08 10:36:48 +02:00
Nicolas Goaziou
d747e51fbf
Consider headlines as sentences by themselves
...
* lisp/org.el (org-forward-sentence): Consider headlines as sentences
by themselves.
* testing/lisp/test-org.el (test-org/forward-sentence): Add test.
Reported-by: Mat Vibrys <vibrysec@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-10/msg00130.html >
2017-10-08 10:35:22 +02:00
Nicolas Goaziou
7f56bfe0c2
Merge branch 'maint'
2017-10-08 10:08:53 +02:00
Nicolas Goaziou
6432fcd433
C-c C-c on a planning info timestamp fixes day
...
* lisp/org.el (org-ctrl-c-ctrl-c): On a timestamp in a planning line,
fix day, like regular timestamps.
Reported-by: Aaron Jensen <aaronjensen@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-10/msg00132.html >
2017-10-08 10:07:36 +02:00
Marco Wahl
5a16dec5a4
org-inlinetask: Wrap region at insertion
...
* lisp/org-inlinetask.el (org-inlinetask-insert-task): If there is a
region at insertion time wrap it. This is similar to
`org-insert-drawer'.
2017-10-07 15:44:25 +02:00
Nicolas Goaziou
44e3745c78
Merge branch 'maint'
2017-10-06 19:35:25 +02:00
Nicolas Goaziou
fb403ca34e
Fix `org-backward-paragraph' on an empty heading
...
* lisp/org.el (org-backward-paragraph): Fix behavior on greater
elements without contents.
* testing/lisp/test-org.el (test-org/backward-paragraph): Add test.
Reported-by: Omar Antolin <omar.antolin@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-10/msg00099.html >
2017-10-06 19:34:28 +02:00
Nicolas Goaziou
9455c6910e
Merge branch 'maint'
2017-10-06 19:14:21 +02:00
Matt Lundin
ce536f6375
Fix interactive timestamp entry in capture templates
...
* lisp/org-capture.el: (org-capture-fill-template) Fix interactive
timestamp entry to match the behavior of org-time-stamp. This fixes
a bug related to the %^t and %^u template escapes which resulted in
incorrect timestamps (<2017-10-06 Fri-12:00>). The difference
between %^t and %^T now corresponds to the difference between
org-time-stamp called without and with a prefix argument.
2017-10-06 19:13:57 +02:00
Nicolas Goaziou
1b12ad5cf6
Merge branch 'maint'
2017-10-04 12:58:41 +02:00
Nicolas Goaziou
ef6dac812b
Fix `org-backward-paragraph' on block opening line
...
* lisp/org.el (org-backward-paragraph): Do not error when called from
a block opening line.
* testing/lisp/test-org.el (test-org/backward-paragraph): Add tests.
Reported-by: Omar Antolin <omar.antolin@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-10/msg00051.html >
2017-10-04 12:57:14 +02:00
Kyle Meyer
1a946d04e4
Merge branch 'maint'
2017-10-01 20:56:08 -04:00
Charles A. Roelli
24ea1b136a
Backport commit bd49b6f1b from Emacs
...
* lisp/org-clock.el (org-clock--oldest-date): Only execute
'decode-time' on times later than year -2**31 under macOS 10.6.
See Bug#27706.
Workaround for faulty localtime() under macOS 10.6
bd49b6f1b39cffeaf6098bc7b0182552683b1c07
Charles A. Roelli
Sun Oct 1 19:07:22 2017 +0200
2017-10-01 20:46:11 -04:00
Paul Eggert
5d3e17bf85
Backport commit bbda601d1 from Emacs
...
; Spelling fixes
bbda601d1d4e125c9d3c374b56eee3e2e9623f1d
Paul Eggert
Fri Sep 29 16:41:50 2017 -0700
2017-10-01 20:00:42 -04:00
Glenn Morris
eb8c088995
Backport commit 26d58f0c5 from Emacs
...
; Standardize license notices
26d58f0c5865c9132e2fc559e061ef704a086d30
Glenn Morris
Fri Sep 29 12:49:19 2017 -0400
2017-10-01 19:53:04 -04:00
Nicolas Goaziou
428368af2f
Merge branch 'maint'
2017-10-01 19:02:47 +02:00
Nicolas Goaziou
018fb0149d
Fix parsing properties with title or summary type
...
* testing/lisp/test-org.el (test-org/buffer-property-keys): Ignore
title and summary type when extracting name.
Reported-by: Adrian Bradd <adrian.bradd@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-10/msg00001.html >
2017-10-01 19:01:58 +02:00
Nicolas Goaziou
7f2b2557fe
Merge branch 'maint'
2017-09-29 22:02:10 +02:00
Nicolas Goaziou
4fdac06ef1
org-clock: Fix compilation error
...
Reported-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-09/msg00623.html >
2017-09-29 22:01:29 +02:00
Nicolas Goaziou
3c83f1f5ac
Merge branch 'maint'
2017-09-28 23:06:37 +02:00
Nicolas Goaziou
c1c5786c8a
ob-lob: Expand blocks before ingesting them
...
* lisp/ob-lob.el (org-babel-lob-ingest): Expand blocks before
ingesting them.
Reported-by: edgar@openmail.cc
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-09/msg00361.html >
2017-09-28 23:04:54 +02:00
Nicolas Goaziou
b8d89496fd
Merge branch 'maint'
2017-09-28 22:15:34 +02:00
Nicolas Goaziou
d417eac7ee
org-table: Fix formula correction when removing a hline
...
* lisp/org-table.el (org-table-kill-row): Do not correct formula when
removing a hline.
Reported-by: alan.wehmann@gmail.com
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-09/msg00429.html >
2017-09-28 22:13:49 +02:00
Nicolas Goaziou
fbf47cde94
Merge branch 'maint'
2017-09-26 20:05:07 +02:00
Nicolas Goaziou
226d2fcaa2
org-colview: Fix "wrong-type-argument markerp nil"
...
* lisp/org-colview.el (org-columns-remove-overlays): Fix
"wrong-type-argument markerp nil".
When calling `org-agenda-columns', `org-columns-top-level-marker' is
not set. Handle this situation.
Reported-by: Benjamin Beckwith <bnbeckwith@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-09/msg00566.html >
2017-09-26 20:03:03 +02:00
Marco Wahl
193d5b5c7a
Remove the overwrite of the C-c TAB binding
...
See also 44c46176e
.
2017-09-26 12:28:14 +02:00
Kyle Meyer
48f3338057
org-agenda: Fix search view's display of command keys
...
* lisp/org-agenda.el (org-search-view): Specify the keymap for the
substitute-command-keys call because, as of b6c5a174d
, this call is
made outside of the agenda buffer.
2017-09-25 11:55:10 -04:00
Jay Kamat
405555ec5c
org-irc.el: Add proper export functions for irc
...
* lisp/org-irc.el (org-irc-export): Add a new function,
org-irc-export, which properly exports irc links to html and markdown
* lisp/ox-md.el (org-md-link): Remove workaround to get irc links
working properly in ox-md, and use org-irc's export functions instead
2017-09-24 18:33:55 +02:00
Nicolas Goaziou
3056abe781
Merge branch 'maint'
2017-09-24 10:58:43 +02:00
Nicolas Goaziou
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
Nicolas Goaziou
ad0662bbe7
Revert "Table of contents ignore unnumbered headlines"
...
This reverts commit bd2378161e
.
2017-09-21 21:14:41 +02:00
Nicolas Goaziou
cf35109ad8
Merge branch 'maint'
2017-09-19 22:01:07 +02:00
N. Raghavendra
db1dab8abe
ox-html.el: Partially revert d5bbf36553
...
* lisp/ox-html.el (org-html-src-block): Unless klipse is used, export
source code blocks as content of `pre' elements, and not as content of
`code' children of `pre' elements. Restores the previous way of
exporting source code blocks, and fixes the display of language
indicators while hovering over the blocks in the exported HTML file,
when klipse is not used.
(org-html-keep-old-src): Remove it. Not needed because it is now the
default, unless klipse is used.
2017-09-19 22:00:32 +02:00
Nicolas Goaziou
6e7d152699
Move `org-get-at-bol' into "org-macs.el"
...
* lisp/org.el (org-get-at-bol): Move...
* lisp/org-macs.el: ... here.
2017-09-18 21:26:18 +02:00
Nicolas Goaziou
32890ea5a5
Move `org-uniquify' into "org-macs.el"
...
* lisp/org.el (org-uniquify): Move function...
* lisp/org-macs.el: ... here.
2017-09-18 21:25:15 +02:00
Nicolas Goaziou
794dfaa6e0
org-macs: Re-order functions and macros
2017-09-18 21:24:23 +02:00
Nicolas Goaziou
18ee77f62a
Silence byte-compiler
2017-09-18 21:15:31 +02:00
Nicolas Goaziou
442a2b430d
Move `org-trim' in "org-macs.el"
...
* lisp/org.el (org-trim): Move function...
* lisp/org-macs.el: ... here.
2017-09-18 21:07:13 +02:00
Nicolas Goaziou
44c46176ec
Re-bind `org-show-children' to C-c TAB
...
* lisp/org.el (org-ctrl-c-tab): New function.
2017-09-18 20:20:35 +02:00
Kyle Meyer
5bcaa4dd13
Merge branch 'maint'
2017-09-18 13:10:32 -04:00
Kyle Meyer
753f3f2842
ob-hledger.el: Correct file name in header
2017-09-18 13:09:56 -04:00
Nicolas Goaziou
ff6b380999
Merge branch 'maint'
2017-09-17 12:48:59 +02:00
Nicolas Goaziou
80cbf909ea
Remove useless binding
...
* lisp/org.el (org-mode-map): Remove [(meta return)] binding, handled
by (kbd "M-RET").
Suggested-by: Allen Li <vianchielfaura@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-09/msg00411.html >
2017-09-17 12:48:17 +02:00
Kyle Meyer
297acd7517
Merge branch 'maint'
2017-09-17 01:17:10 -04:00
Kyle Meyer
e4a0fd6b02
Adjust the license link in new lisp/*.el files
...
Emacs's bc511a64f6d made tree-wide changes to prefer https to http.
For Org, this resulted in the header of every lisp/*.el file being
changed. Make the same changes in lisp/*.el files that were added
since Org version 9.0.10 (the last version that was synced with
Emacs).
2017-09-17 01:15:11 -04:00
Paul Eggert
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
Paul Eggert
d4d7cda57f
Backport commit 5da53a019 from Emacs
...
* lisp/org-info.el (org-info-other-documents)
(org-info-map-html-url):
* lisp/ox-html.el (org-html-creator-string): Use HTTPS instead of
HTTP.
Prefer HTTPS to HTTP for gnu.org
5da53a01912c2f5d46f5df4ef8cc13a34b5017d4
Paul Eggert
Wed Sep 13 15:54:25 2017 -0700
2017-09-17 00:09:11 -04:00
Paul Eggert
d3912e7f32
Backport commit 74b8615fc from Emacs
...
* lisp/ob-tangle.el (org-babel-tangle-publish): Port to new copy-file
behavior.
Adjust ob-tangle to new copy-file behavior
74b8615fcceba7b92c4938e1bcc92015f10ae899
Paul Eggert
Sun Sep 10 22:31:23 2017 -0700
2017-09-17 00:05:20 -04:00
Nicolas Goaziou
2021b98b83
Merge branch 'maint'
2017-09-16 17:19:55 +02:00
Nicolas Goaziou
9fb98f4c9c
Add M-RET binding for terminal
...
* lisp/org.el (org-mode-map): Add M-RET binding.
Reported-by: Allen Li <vianchielfaura@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-09/msg00386.html >
2017-09-16 17:19:00 +02:00
Nicolas Goaziou
85acebdc2e
Remove auto-repair of malformed property drawers
...
* lisp/org.el (org-buffer-property-keys): Remove optional argument
IGNORE-MALFORMED.
* lisp/org-pcomplete.el (pcomplete/org-mode/prop): Update call to
previous function.
* testing/lisp/test-org.el (test-org/buffer-property-keys): Remove
a test.
More often than not, the question just gets in the way. Use `M-x
org-lint' instead.
2017-09-16 14:15:57 +02:00
Nicolas Goaziou
9f863a695b
ox-texinfo: Add missing autoload cookies
...
* lisp/ox-texinfo.el (org-texinfo-export-to-texinfo):
(org-texinfo-export-to-info): Add autoload cookie.
2017-09-15 21:11:55 +02:00
Nicolas Goaziou
9c4ee81a8b
ox-texinfo: Add missing autoload cookies
...
* lisp/ox-texinfo.el (org-texinfo-export-to-texinfo):
(org-texinfo-export-to-info): Add autoload cookie.
2017-09-15 21:10:29 +02:00
Nicolas Goaziou
8383f7e08b
Change emphasis regexp
...
* lisp/org.el (org-emphasis-regexp-components): Change emphasis
regexp.
Reported-by: Reuben Thomas <rrt@sc3d.org>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-09/msg00363.html >
2017-09-15 00:14:09 +02:00
Nicolas Goaziou
9e062df65d
Merge branch 'maint'
2017-09-14 15:44:06 +02:00
Nicolas Goaziou
25f12218d2
Fix `org-auto-repeat-maybe'
...
* lisp/org.el (org-auto-repeat-maybe): Fix `org-auto-repeat-maybe'.
* testing/lisp/test-org.el (test-org/auto-repeat-maybe): Add test.
Reported-by: Samuel Wales <samologist@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-09/msg00298.html >
2017-09-14 15:40:28 +02:00
Nicolas Goaziou
04498a4fbd
Merge branch 'maint'
2017-09-14 15:25:36 +02:00
Nicolas Goaziou
63f1ffac32
ob-scheme: Fix results error on unspecified and void values
...
* lisp/ob-scheme.el (org-babel-scheme-execute-with-geiser): Return
"#<void>" or "#<unspecified>" when the REPL says so.
* testing/lisp/test-ob-scheme.el (test-ob-scheme/unspecified): New
test.
(test-ob-scheme/prologue): Fix tests.
Reported-by: Lawrence Bottorff <borgauf@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-09/msg00346.html >
2017-09-14 15:25:04 +02:00
Nicolas Goaziou
3944547bf2
Merge branch 'maint'
2017-09-14 14:47:15 +02:00
Nicolas Goaziou
7584268314
ox-html: Fix missing Mathjax config with maths elements in captions
...
* lisp/ox-html.el (org-html--build-mathjax-config): Fix missing
Mathjax config with maths elements in captions.
Reported-by: Lawrence Bottorff <borgauf@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-09/msg00302.html >
2017-09-14 14:40:33 +02:00
Nicolas Goaziou
657302b97e
Merge branch 'maint'
2017-09-13 14:17:24 +02:00
Nicolas Goaziou
23c4716a94
org-table: Fix `org-table-copy-down' with timestamps
...
* lisp/org-table.el (org-table-copy-down): Allow matching inactive
timestamps.
Reported-by: Alan Schmitt <alan.schmitt@polytechnique.org>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-09/msg00304.html >
2017-09-13 14:17:00 +02:00
Nicolas Goaziou
c59cb987eb
Merge branch 'maint'
2017-09-12 09:02:43 +02:00
Nicolas Goaziou
95271315cc
Fix `org-forward-sentence' on a headline
...
* lisp/org.el (org-forward-sentence): Fix `org-forward-sentence' on a headline.
* testing/lisp/test-org.el (test-org/forward-sentence): Add tests.
Reported-by: Mat Vibrys <vibrysec@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-09/msg00282.html >
2017-09-12 09:02:02 +02:00
Nicolas Goaziou
c6e5639b7e
ox-texinfo: Do not add @node for unnumbered headings
...
* lisp/ox-texinfo.el (org-texinfo-headline): Do not add @node for
unnumbered headings.
2017-09-10 19:17:44 +02:00
Nicolas Goaziou
bd2378161e
Table of contents ignore unnumbered headlines
...
* doc/org.texi (Table of contents): Document behavior.
* lisp/ox-texinfo.el (org-texinfo-classes): Use @heading commands and
alike for unnumbered sections.
* lisp/ox.el (org-export-collect-headlines): Ignore unnumbered
headlines.
* testing/lisp/test-ox.el (test-org-export/collect-headlines): Add
test.
2017-09-10 15:53:20 +02:00
Nicolas Goaziou
7a47458b39
Merge branch 'maint'
2017-09-10 14:12:52 +02:00
Nicolas Goaziou
1168d085d2
org-agenda: Fix `org-agenda-skip-if-todo'
...
* lisp/org-agenda.el (org-agenda-skip-if-todo): Make sure TODO search
is case sensitive. Refactor function.
2017-09-10 14:10:49 +02:00
Nicolas Goaziou
27a03dd97f
org-agenda: Fix `org-agenda-skip-if'
...
* lisp/org-agenda.el (org-agenda-skip-if): Prevent some checks from
moving point, since this stops following checks from running
properly.
Reported-by: "cro cefisso" <crocefisso@gmx.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-09/msg00182.html >
2017-09-10 14:08:16 +02:00
Nicolas Goaziou
7b1fabbf88
org-colview: Fix defcustom type
...
* lisp/org-colview.el (org-columns-summary-types): Fix defcustom type.
2017-09-10 11:16:40 +02:00
Stig Brautaset
2b2314d46d
org-colview: Allow custom COLLECT functions for derived properties
...
* lisp/org-colview.el (org-columns-summary-types): Allow new format.
(org-columns--summarize): Update to new summary type format.
(org-columns--collect): New function.
(org-columns--compute-spec): Apply changes.
* testing/lisp/test-org-colview.el (test-org-colview/columns-summary):
Add test.
In addition to (LABEL . SUMMARIZE), org-columns-summary-types now
accepts (LABEL SUMMARIZE COLLECT) entries. The new COLLECT function is
called with one argument, the property being summarized.
TINYCHANGE
2017-09-10 11:06:43 +02:00
Nicolas Goaziou
3ab1afd0ea
Merge branch 'maint'
2017-09-10 09:39:50 +02:00
Matt Lundin
2dfbafa4a9
Ensure that top-level capture targets are pasted at level 1
...
* lisp/org-capture.el: (org-capture-place-entry) Ensure that level is
set to 1 (i.e., the top level) if there is no headline target
defined. Otherwise, captured items are improperly nested by context.
2017-09-10 09:39:24 +02:00
Nicolas Goaziou
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
Nicolas Goaziou
b3ab012d69
Merge branch 'maint'
2017-09-08 22:37:16 +02:00
Nicolas Goaziou
e0259f9374
org-agenda: Fix typo
...
* lisp/org-agenda.el (org-search-view): Add missing :test keyword.
2017-09-08 22:35:54 +02:00
Nicolas Goaziou
2a9d8653eb
Merge branch 'maint'
2017-09-08 21:19:53 +02:00
Nicolas Goaziou
d059b7895b
org-agenda: Better state change detection
...
* lisp/org-agenda.el (org-agenda-get-progress): Use appropriate regexp
as TODO keywords are not limited to alphanumeric characters.
Reported-by: email@edgar-kalkowski.de
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-09/msg00206.html >
2017-09-08 21:18:22 +02:00
Nicolas Goaziou
289539e119
Merge branch 'maint'
2017-09-08 07:00:00 +02:00
Reuben Thomas
a307011136
Fix logic of calling org-make-link-desciption-function
...
* lisp/org.el (org-insert-link): Simplify so that description is only
prompted for once, if auto-desc is not set, and takes as its default
value, in order, default-description, the return value of
org-make-link-description-function (if the variable is non-nil), and
the current desc. Update the docstring to reflect that
default-description takes precedence over
org-make-link-description-function.
(org-make-link-description-function): Remove from docstring the
statement that if the variable is nil, then the link will be used as
the default description. This is undesirable, and was not in any case
implemented.
2017-09-08 06:59:30 +02:00
Nicolas Goaziou
e21768d24b
Merge branch 'maint'
2017-09-08 06:49:34 +02:00
Neil Jerram
e09cb53bde
Improve Scheme code evaluation
...
* lisp/ob-scheme.el (org-babel-scheme-execute-with-geiser): Use
Geiser's explicit 'retort' object, instead of catching and parsing
an expected Emacs message (which for me is in any case overwritten
by a following "Mark set" message); this also means we don't need
the with-output-to-string approach for getting 'output' results.
Also 'let' Geiser variables so as to avoid popping up the REPL
and *Geiser dbg* buffers.
2017-09-08 06:48:15 +02:00
Kyle Meyer
88ffcf54d8
Merge branch 'maint'
2017-09-07 16:59:39 -04:00
Kyle Meyer
79d9f0c0ce
Update customize-package-emacs-version-alist
...
* lisp/org.el (customize-package-emacs-version-alist): Add entries for
all existing ":package-version" values, and remove entries for
versions that aren't used as ":package-version" values.
Note that this alist has a limited effect because we specify
":version" in almost all of our defcustoms. Two functions make use of
this alist: describe-variable-custom-version-info and
customize-changed-options. The former only looks at the alist if
:version isn't specified, and the latter only looks at :version if an
entry for :package-version isn't found in the alist.
We should consider removing the defcustom :version specifications so
that the package-version->version mapping only needs to be maintained
in one place.
2017-09-07 16:56:15 -04:00
Kyle Meyer
6496d0ca95
Correct defcustom version information
...
* lisp/ob-lilypond.el (org-babel-lilypond-commands):
* lisp/ob-lua.el (org-babel-lua-command):
(org-babel-lua-mode):
(org-babel-lua-hline-to):
(org-babel-lua-None-to):
* lisp/org-agenda.el (org-agenda-search-view-max-outline-level):
* lisp/org.el (org-mouse-1-follows-link):
(org-src-fontify-natively):
(orgstruct-heading-prefix-regexp):
* lisp/ox-ascii.el (org-ascii-format-inlinetask-function):
* lisp/ox-latex.el (org-latex-format-drawer-function):
(org-latex-listings-langs):
* lisp/ox-odt.el (org-odt-format-drawer-function):
* lisp/ox.el (org-export-with-properties): Correct ":version" value.
* lisp/org-attach.el (org-attach-annex-auto-get): Correct
":package-version" value.
2017-09-07 16:56:11 -04:00