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
73df53f185
Merge branch 'maint'
2017-10-01 22:58:24 +02:00
Nicolas Goaziou
fcdcfe682f
Fix typo in comment
...
* testing/lisp/test-org.el (test-org/buffer-property-keys): Remove
spurious word.
2017-10-01 22:56:57 +02: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
9cfa907971
Merge branch 'maint'
2017-09-28 16:25:36 +02:00
Nicolas Goaziou
a563ccabe3
org.texi: Add missing information about `org-cycle-global-at-bob'
...
* doc/org.texi (Global and local cycling): Document special situation
when buffer begins with a headline.
Reported-by: Alain.Cochard@unistra.fr
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-09/msg00456.html >
2017-09-28 16:25:12 +02:00
Nicolas Goaziou
4f619fc200
Merge branch 'maint'
2017-09-28 16:06:57 +02:00
Nicolas Goaziou
40b82fdb8a
org.texi: Remove reference to removed variable
...
* doc/org.texi (Plain lists): Remove reference to
`org-list-empty-line-terminates-plain-lists'.
Reported-by: Alain.Cochard@unistra.fr
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-09/msg00603.html >
2017-09-28 16:06:11 +02:00
U-IHM-NOTEBOOK\Olli
731e1ca938
Version 5.6.1 of org-index
2017-09-27 22:10:04 +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
80eca1d31f
org.texi: Delete misplaced colon
2017-09-26 13:56:30 +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
6456febb0a
ORG-NEWS: Add an entry for supporting export in org-irc.el
2017-09-25 15:52:21 +02: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
039004ddee
Merge branch 'maint'
2017-09-21 21:17:04 +02:00
Nick Dokos
196ed7feff
Add publishing function to "Simple example"
...
The simple example project definition is missing a publishing
function. Added org-html-publish-to-html as the publishing function.
2017-09-21 21:16:45 +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
2faebbd2f0
Merge branch 'maint'
2017-09-20 12:56:17 +02:00
Nicolas Goaziou
1ef71bf7e0
Rephrase `org-cycle-global-at-bob' documantion
...
* doc/org.texi (Global and local cycling): Rephrase
`org-cycle-global-at-bob' documantion.
Reported-by: Alain.Cochard@unistra.fr
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-09/msg00447.html >
2017-09-20 12:55:50 +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