f979ce47ca
Merge branch 'master' of code.orgmode.org:bzg/org-mode
2018-10-26 22:52:42 +02:00
dabcddfb85
Merge branch 'master' into next
2018-10-26 17:36:19 +02:00
4b905774ac
org-macs: Fix last commit
...
* lisp/org-macs.el (org--string-from-props): Do not raise an error on
unsupported display properties. Change signature to avoid creating
new strings unnecessarily. Update docstring accordingly.
(org-string-width): Apply signature change.
* testing/lisp/test-org-macs.el (test-org/string-width): Add test.
Reported-by: Colin Baxter <m43cap@yandex.com>
<http://lists.gnu.org/r/emacs-orgmode/2018-10/msg00346.html >
2018-10-26 14:37:57 +02:00
9b9fa671b5
Merge branch 'master' into next
2018-10-25 16:55:17 +02:00
4832a432f0
ox-ascii: Add missing ASCII and UTF-8 conversion functions
...
* lisp/ox-ascii.el (org-ascii-convert-region-to-ascii):
(org-ascii-convert-region-to-utf8): New functions.
* doc/org-manual.org (Export in Foreign Buffers): Document new
functions.
Reported-by: Alexander Adolf <alexander.adolf@condition-alpha.com>
<http://lists.gnu.org/r/emacs-orgmode/2018-10/msg00294.html >
2018-10-25 16:53:30 +02:00
7776482e36
Merge branch 'master' into next
2018-10-25 16:47:25 +02:00
b886ebbc89
org-macs: `org-string-width' handles images
...
* lisp/org-macs.el (org--string-from-props): Handle image display
properties.
(org-string-width): Improve docstring.
2018-10-25 15:34:05 +02:00
2c5df17ed1
ob-clojure: Support new CIDER using sesman to manage sessions
...
* ob-clojure.el (org-babel-clojure-initiate-session): Improve ob-clojure
initialize session way to support CIDER new API.
* etc/ORG-NEWS: Add declare for new :session support feature.
2018-10-25 10:33:16 +02:00
4456dc8809
ob-clojure: Support `org-babel-initiate-session'
...
* ob-clojure.el (org-babel-clojure-initiate-session): Initialize session
for source block.
(org-babel-prep-session:clojure): Prepare Clojure session.
(org-babel-clojure-var-to-clojure): Convert header argument :var into
clojure variables definitions.
(org-babel-variable-assignments:clojure): Support assigning variables
when initializing a session.
2018-10-25 10:28:41 +02:00
12232c5cd0
org-manual: Small rewording
...
* doc/org-manual.org (Link Format): Small rewording.
2018-10-24 14:25:40 +02:00
2412044aa7
org-manual: Fix typo
...
* doc/org-manual.org (Exporting): Fix typo.
2018-10-24 09:02:32 +02:00
8da5168dd1
Merge branch 'master' into next
2018-10-23 23:28:38 +02:00
17e28d6467
org-capture: Various fixes to item capture
...
* lisp/org-capture.el (org-capture-place-item): Rewrite function.
* testing/lisp/test-org-capture.el (test-org-capture/abort): Add test.
(test-org-capture/item): New test.
2018-10-23 23:27:28 +02:00
ea47ed0d76
Merge branch 'master' into next
2018-10-23 01:53:54 +02:00
9dbd2993f6
org-capture: Tiny refactoring
...
* lisp/org-capture.el (org-capture-place-entry): Tiny refactoring.
2018-10-23 01:53:18 +02:00
b46d4e7b1c
org-capture: Remove unnecessary checks
...
* lisp/org-capture.el (org-capture-place-plain-text): Remove
unnecessary checks.
2018-10-23 01:46:57 +02:00
c76486d4e4
org-capture: Fix off-by-one error
...
* lisp/org-capture.el (org-capture-place-table-line): Fix narrowing.
2018-10-23 01:32:55 +02:00
7a4a10dea0
org-capture: Fix plain capture at the end of the buffer.
...
* lisp/org-capture.el (org-capture-place-plain-text): Fix plain
capture at the end of the buffer.
* testing/lisp/test-org-capture.el (test-org-capture/plain): New test.
2018-10-23 01:26:17 +02:00
ad0fce50eb
org-capture: Small fix to table line capture
...
* lisp/org-capture.el (org-capture-place-table-line): Handle abort
table line insertion more gracefully.
* testing/lisp/test-org-capture.el (test-org-capture/abort): Add tests
2018-10-23 00:43:59 +02:00
e7b5cc4d29
Merge branch 'master' into next
2018-10-22 23:42:07 +02:00
aaa3372b8b
org-capture: Fix capture aborting
...
* lisp/org-capture.el (org-capture-place-entry): Fix delimiters for
region to delete when aborting capture.
* testing/lisp/test-org-capture.el (test-org-capture/abort): Add test.
2018-10-22 23:40:49 +02:00
796a7c4c0e
Merge branch 'master' into next
2018-10-22 22:26:41 +02:00
0fa8bb4c51
org-capture: Inserting an entry doesn't break structure
...
* lisp/org-capture.el (org-capture-place-entry): Carefully narrow
buffer to not alter following headline. Also include leading empty
lines in region to remove when cancelling capture.
* testing/lisp/test-org-capture.el (test-org-caputre/entry): New test.
(test-org-capture/abort): Rename test.
Reported-by: Martin Yrjölä <martin.yrjola@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2018-10/msg00256.html >
2018-10-22 22:22:21 +02:00
e2be0491d0
Merge branch 'master' into next
2018-10-22 14:13:02 +02:00
bddd287cce
org-manual: Reference "davs" Tramp's protocol
...
* doc/org-manual.org (Setting up the staging area): Reference "davs"
Tramp's protocol as an example to access a WebDAV server.
2018-10-22 14:12:48 +02:00
bb29ee41b3
org-manual: Reference "davs" Tramp's protocol
...
* doc/org-manual.org (Setting up the staging area): Reference "davs"
Tramp's protocol as an example to access a WebDAV server.
2018-10-22 14:06:04 +02:00
d70131e321
Merge branch 'master' of code.orgmode.org:bzg/org-mode
2018-10-21 05:23:05 +02:00
42abd18c6d
Merge branch 'master' into next
2018-10-20 10:53:01 +02:00
4a2e7c8db9
ox-beamer: Do not add automatic label when "allowframebreaks" is set
...
* lisp/ox-beamer.el (org-beamer--format-frame): Do not add automatic
label when "allowframebreaks" is set in default options. Do not
check only headline properties.
2018-10-20 10:51:06 +02:00
eb806aa503
ox-odt: Add support for text:start-value
...
* lisp/ox-odt.el (org-odt-item): Support starting lists at a set
number via "text:start-value". Without this, ODF files just restart
numbering when they should continue with the specified number.
2018-10-19 21:49:54 +02:00
f4785b0a19
Merge branch 'master' of code.orgmode.org:bzg/org-mode
2018-10-19 10:19:08 +02:00
1f913ecc36
Merge branch 'master' into next
2018-10-18 18:15:59 +02:00
9e05a6ac8a
org-pcomplete: Small reorganization
2018-10-18 18:15:30 +02:00
102ab1a245
org-pcomplete: Add tests
...
* testing/lisp/test-org-pcomplete.el (test-org-pcomplete/clocktable):
(test-org-pcomplete/drawer):
(test-org-pcomplete/entity):
(test-org-pcomplete/link):
(test-org-pcomplete/search-heading):
(test-org-pcomplete/todo): New tests.
2018-10-18 18:01:33 +02:00
a6a7edc1cb
org-pcomplete: Silence byte-compiler
2018-10-18 18:01:33 +02:00
c25ac5ecd4
org-pcomplete: Fix search string completion
...
* lisp/org-pcomplete.el (pcomplete/org-mode/tag): Use
`org-get-heading'.
2018-10-18 17:54:35 +02:00
961367bf6a
org-pcomplete: Add colons when completing abbrev links
...
* lisp/org-pcomplete.el (pcomplete/org-mode/todo): Add colons when
completing abbrev links.
2018-10-18 17:54:35 +02:00
ccfb9d44de
org-pcomplete: Complete drawer names
...
* lisp/org-pcomplete.el (pcomplete/org-mode/drawer): New function.
2018-10-18 17:54:35 +02:00
9d4af29feb
org-pcomplete: Complete lower case node properties
...
* lisp/org-pcomplete.el (pcomplete/org-mode/block-option/src):
Complete lower case node properties.
2018-10-18 17:54:35 +02:00
2c7ea57ede
org-pcomplete: Fix glitches in completion
...
* lisp/org-pcomplete.el (org-thing-at-point): Fix various parts of the
function.
2018-10-18 17:54:33 +02:00
99b6a481ca
Merge branch 'master' of code.orgmode.org:bzg/org-mode
2018-10-15 22:49:46 +02:00
2a1179a946
Merge branch 'master' into next
2018-10-14 16:52:25 +02:00
823d9048e7
org-goto: Fix fontification in deep levels
...
* lisp/org-goto.el (org-goto-local-auto-isearch): Sill fontify when
diving in deeper outline levels.
2018-10-14 16:51:06 +02:00
83f97cbd87
Merge branch 'master' of code.orgmode.org:bzg/org-mode
2018-10-14 12:13:20 +02:00
1315315465
Merge branch 'maint' of code.orgmode.org:bzg/org-mode into maint
2018-10-14 12:13:11 +02:00
9d6a9e1739
Merge branch 'master' into next
2018-10-14 09:58:55 +02:00
f12f9b4f28
Fix fontification of links within verbatim markup
...
* lisp/org.el (org-do-emphasis-faces): Prevent fontification of links
within verbatim markup.
2018-10-14 09:57:47 +02:00
4d8c78a0ef
Merge branch 'master' into next
2018-10-14 09:09:23 +02:00
085f150372
ob-tangle: Add a test
...
* testing/lisp/test-ob-tangle.el (ob-tangle/block-order): Add test.
2018-10-14 09:08:44 +02:00
b9d0e7e7f6
Merge branch 'master' into next
2018-10-13 23:31:09 +02:00
Bastien
Nicolas Goaziou
stardiviner
Mark A. Hershberger