7278899697
Merge branch 'maint'
2017-01-26 00:05:29 -05:00
7c710f6f57
Change :version in defcustoms from "25.2" to "26.1"
...
* lisp/ob-J.el (org-babel-J-command):
* lisp/ob-core.el (org-babel-hash-show-time):
* lisp/ob-exp.el (org-babel-exp-inline-code-template):
* lisp/ob-lisp.el (org-babel-lisp-eval-fn):
* lisp/org-agenda.el (org-agenda-view-columns-initially):
* lisp/org-attach.el (org-attach-commit):
(org-attach-archive-delete):
(org-attach-annex-auto-get):
* lisp/org-bibtex.el (org-bibtex-inherit-tags):
* lisp/org-clock.el (org-clock-into-drawer):
* lisp/org-colview.el (org-columns-summary-types):
* lisp/org-faces.el (org-block):
* lisp/org-src.el (org-src-block-faces):
* lisp/org-table.el (org-table-copy-increment):
(org-table-formula-create-columns):
(org-table-convert-region-max-lines):
* lisp/org-timer.el (org-timer-default-timer):
* lisp/org.el (org-export-backends):
(org-show-context-detail):
(org-cycle-hook):
(org-occur-case-fold-search):
(org-preview-latex-default-process):
(org-preview-latex-process-alist):
(org-preview-latex-image-directory):
(org-latex-default-packages-alist):
(org-sparse-tree-default-date-type):
(org-structure-template-alist):
(org-effort-durations):
(org-agenda-ignore-properties): Change :version from "25.2" to "26.1".
(customize-package-emacs-version-alist): Fix associations between Org
and Emacs releases.
* lisp/ox-ascii.el (org-ascii-list-margin):
* lisp/ox-beamer.el (org-beamer-subtitle-format):
* lisp/ox-html.el (org-html-format-headline-function):
(org-html-format-inlinetask-function):
(org-html-viewport):
* lisp/ox-latex.el (org-latex-caption-above):
(org-latex-prefer-user-labels):
(org-latex-subtitle-format):
(org-latex-hyperref-template):
(org-latex-footnote-defined-format):
(org-latex-images-centered):
(org-latex-default-figure-position):
(org-latex-text-markup-alist):
(org-latex-format-inlinetask-function):
(org-latex-custom-lang-environments):
(org-latex-compiler-file-string):
(org-latex-compiler):
(org-latex-bib-compiler):
(org-latex-logfiles-extensions):
(org-latex-known-warnings):
* lisp/ox-md.el (org-md-footnotes-section):
(org-md-footnote-format):
* lisp/ox-odt.el (org-odt-format-headline-function):
(org-odt-format-inlinetask-function):
(org-odt-inline-image-rules):
* lisp/ox-texinfo.el (org-texinfo-format-headline-function):
* lisp/ox.el (org-export-with-creator):
(org-export-with-title):
(org-export-with-broken-links):
(org-export-copy-to-kill-ring): Change :version from "25.2" to "26.1".
It looks like the goal is to sync Org 9.0.* (maint) with the Emacs
master branch (what will be version 26.1):
https://lists.gnu.org/archive/html/emacs-orgmode/2017-01/msg00558.html
2017-01-26 00:02:03 -05:00
c1822e5560
Clean up spacing to pass Emacs's pre-commit check
...
Like 00dacdcc5
2017-01-25 22:21:59 -05:00
63aaffdc11
Merge branch 'maint'
2017-01-25 22:00:57 -05:00
ffa4502771
ob-core: Move org-babel-local-file-name to org-compat.el
...
* lisp/ob-core.el (org-babel-process-file-name): Move to
org-compat.el.
* lisp/org-compat.el (org-babel-local-file-name): Add compatibility
alias.
2017-01-25 22:00:48 -05:00
e97f04de8e
Backport commit 22946702b from Emacs
...
* lisp/ob-core.el (org-babel-local-file-name): Use `file-local-name'
when available.
22946702b4296c0e42e4baf6221e205b52d05cbf
Michael Albinus
Sun Nov 20 16:29:47 2016 +0100
2017-01-25 22:00:48 -05:00
ec834812f7
org-clock: Correct file name in header
...
* lisp/org-clock.el (org-clock-save): Use the variable
org-clock-persist-file as the file name in the header rather than
hardcoding it to "org-persist.el".
From the introduction of org-clock-save in 6ca205398
2017-01-25 22:00:40 -05:00
33e8a3b5d7
org-agenda: Fix docstring typo
...
* lisp/org-agenda.el (org-agenda-custom-commands): Fix docstring typo.
2017-01-25 20:48:41 -05:00
ff212d8528
org-clock: Small refactoring
...
* lisp/org-clock.el (org-clock-in): Use
`org-refresh-effort-properties'.
2017-01-25 23:35:35 +01:00
3d7c221a45
Merge branch 'maint'
2017-01-25 23:29:40 +01:00
7d52a8c3cc
Fix `org-schedule' with repeater
...
* lisp/org.el (org--deadline-or-schedule): New function.
(org-schedule):
(org-deadline): Use new function.
* testing/lisp/test-org.el (test-org/deadline):
(test-org/schedule): New tests.
Reported-by: Michael Welle <mwe012008@gmx.net>
<http://permalink.gmane.org/gmane.emacs.orgmode/111569 >
2017-01-25 23:27:33 +01:00
dcad3499af
Merge branch 'maint'
2017-01-25 17:58:54 +01:00
b6b1e35f33
ox-html: Remove <p> tag around block images when using HTML5
...
* lisp/ox-html.el (org-html--wrap-image): Do not add a spurious <p>
tag when using <figure> to mark images.
Reported-by: Matt Price <moptop99@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/111568 >
2017-01-25 17:58:07 +01:00
2348d18343
Merge branch 'maint'
2017-01-24 22:02:47 +01:00
c77b658b39
Fix `org-entry-get' with "TIMESTAMP" or "TIMESTAMP_IA"
...
* lisp/org.el (org-entry-properties): Fix special property value in
current entry, do not leak into next entry.
* testing/lisp/test-org.el (test-org/entry-properties): Add test.
Reported-by: Samuel Wales <samologist@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/111648 >
2017-01-24 22:01:19 +01:00
969d14deef
Merge branch 'maint'
2017-01-24 18:20:22 +01:00
9f4c77cb6c
ox-html: Fix missing space in coderef links
...
* lisp/ox-html.el (org-html-link): Add missing space.
Reported-by: dmg <dmg@turingmachine.org>
<http://permalink.gmane.org/gmane.emacs.orgmode/111625 >
2017-01-24 18:19:23 +01:00
c6a74d4a58
Merge branch 'maint'
2017-01-24 18:15:53 +01:00
4370ee4e44
org-agenda: Fix `org-agenda-list-stuck-projects'
...
* lisp/org-agenda.el (org-agenda-list-stuck-projects): Fix thinko
introduced in 7c3e0b0fdhttp://permalink.gmane.org/gmane.emacs.orgmode/111633 >
2017-01-24 18:14:39 +01:00
5210de7f16
org-index.el with new command 'focus'
2017-01-22 21:14:58 +01:00
4696d6e71d
org-compat: Silence byte-compiler
2017-01-22 14:46:35 +01:00
eda4684d35
Merge branch 'maint'
2017-01-22 14:29:05 +01:00
12a23d6c61
`org-entry-delete' can remove erroneous special properties
...
* lisp/org.el (org-entry-delete): Also remove erroneously inserted
special properties in properties drawer. Small refactoring.
* testing/lisp/test-org.el (test-org/entry-delete): Add test.
Reported-by: Michael Welle <mwe012008@gmx.net>
<http://permalink.gmane.org/gmane.emacs.orgmode/111564 >
2017-01-22 14:28:02 +01:00
9dafef9fa8
Merge branch 'maint'
2017-01-22 13:54:26 +01:00
7c3e0b0fdf
org-agenda: TODO keywords are case sensitive in stuck projects
...
* lisp/org-agenda.el (org-agenda-list-stuck-projects): Search for
stuck projects is case sensitive since TODO keywords are.
Reported-by: Guy Mayraz <guy.mayraz@unimelb.edu.au>
<http://permalink.gmane.org/gmane.emacs.orgmode/111529 >
2017-01-22 13:53:20 +01:00
3553c0a524
org-agenda: Make `org-agenda-skip-(entry|subtree)-when.*' obsolete
...
* lisp/org-agenda.el (org-agenda-skip-entry-if):
(org-agenda-skip-entry-if):
(org-agenda-skip-entry-if): Move to...
* lisp/org-compat.el (org-agenda-skip-entry-when-regexp-matches):
(org-agenda-skip-subtree-when-regexp-matches):
(org-agenda-skip-entry-when-regexp-matches-in-subtree): ... here and
mark as obsolete.
These functions are not used in code base anymore, and they are easily
replaced with `org-agenda-skip-if'.
2017-01-22 13:52:43 +01:00
7289293e4e
ox-texinfo: Delegate "info" links handling to "org-info.el"
...
* lisp/org-info.el (org-info-export): Handle links when exporting to
"texinfo" back-end.
* lisp/ox-texinfo.el (org-texinfo-link): Delegate "info" links
handling to the function above.
2017-01-21 14:19:29 +01:00
dbd7d995e8
Merge branch 'maint'
2017-01-21 13:58:03 +01:00
2950be040d
org-info: Add tests
...
* testing/lisp/test-org-info.el: New file.
2017-01-21 13:56:58 +01:00
9a952ab18a
org-info: Fix HTML export of info link
...
* org-info.el (org-info--map-node-url): New function.
(org-info-export): Use the new function.
TINYCHANGE
2017-01-21 13:48:27 +01:00
37bffbb347
Merge branch 'maint'
2017-01-21 11:59:12 +01:00
ade36c4b50
org-element: Fix failing test
...
* testing/lisp/test-org-element.el (test-org-element/cache): Fix
failing test.
2017-01-21 11:58:42 +01:00
4b3fbeef2b
ox: Add some autoload cookies
...
* lisp/ox.el (org-export-get-backend): Autoload. Small refactoring.
(org-export-get-environment): Autoload.
2017-01-21 11:44:29 +01:00
53bc58c433
Rename `org-latex--make-preamble' into `org-latex-make-preamble'
...
* contrib/lisp/ox-koma-letter.el (org-koma-letter-template):
* lisp/org.el (org-create-formula-image):
* lisp/ox-beamer.el (org-beamer-template):
* lisp/ox-latex.el (org-latex-make-preamble): Renamed from
`org-latex--make-preamble'. Add an optional argument. Autoload
function.
(org-latex-template): Use new function name.
2017-01-21 11:31:25 +01:00
de0d933c4d
Merge branch 'maint'
2017-01-21 10:42:55 +01:00
bbdecd1e64
org-element: Disable cache by default
...
* lisp/org-element.el (org-element-use-cache): Set default value to
nil.
Using cache introduces Emacs' freezes under not well known
circumstances. Until this is sorted out, this variable should be nil,
at least on "maint" branch.
2017-01-21 10:40:39 +01:00
6dc6eb3b02
Fix failing test
...
* lisp/org.el (org-link-search): Remove priority cookie from headlines
during a fuzzy search. Tiny optimization.
* testing/lisp/test-org.el (test-org/get-heading): Add tests.
2017-01-19 00:22:49 +01:00
53ee147f45
Add support for new switches to org-get-heading
...
* lisp/org.el (org-get-heading): NO-COMMENT tag, if non-nil, will not
return the COMMENT string with heading. Likewise, NO-PRIORITY, if
non-nil, will not return the priority cookie.
2017-01-19 00:07:03 +01:00
4353deb0de
Merge branch 'maint'
2017-01-18 23:36:54 +01:00
35e90ced24
ox-latex: Fix insertion of line breaks at invalid locations
...
* lisp/ox-latex.el (org-latex-clean-invalid-line-breaks): New function.
Reported-by: Takeshi Teshima <takeshi.diadochos@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/111313 >
2017-01-18 23:30:01 +01:00
c3d67b3556
Merge branch 'maint'
2017-01-17 21:22:11 -05:00
1fbc7a424f
org-clone-subtree-with-time-shift: Fix SHIFT check
...
* lisp/org.el (org-clone-subtree-with-time-shift): Don't choke on a
blank SHIFT argument.
* testing/lisp/test-org.el (test-org/clone-with-time-shift): Add
test.
This fixes a regression introduced by c31462f33
2017-01-17 21:16:24 -05:00
4255837c92
Correct an org-clone-subtree-with-time-shift test
...
* testing/lisp/test-org.el (test-org/clone-with-time-shift): Remove
the SHIFT argument from a test case to match the intention of the
test.
2017-01-17 21:14:33 -05:00
69b22b6590
org: Improved consistency + tests
...
* lisp/org.el (org-get-valid-level): The function now returns 1 for
parameters level=0, change=1 and `org-odd-levels-only'=t. Before
it returned 3.
2017-01-17 23:06:56 +01:00
738d3b4def
org: Delete useless code line
...
* lisp/org.el (org-refile): Dropped useless call of `looking-at'.
2017-01-17 21:59:49 +01:00
4d0609f8af
Merge branch 'maint'
2017-01-17 12:02:02 +01:00
d2af251077
org-colview: Fix summary computation in agenda
...
* lisp/org-colview.el (org-agenda-colview-summarize): Do not include
already summarized values in current summary.
2017-01-17 12:00:49 +01:00
c1c510ffe0
Merge branch 'maint'
2017-01-17 11:36:40 +01:00
b223c099f0
org-colview: Fix missing agenda summary if org-agenda-overriding-header is set
...
* lisp/org-colview.el (org-agenda-colview-summarize): Do not ignore
first agenda line when displaying summaries.
This fixes a regression introduced in
279902ca4dhttp://permalink.gmane.org/gmane.emacs.orgmode/111473 >
2017-01-17 11:35:05 +01:00
9e45783661
Save position before searching for a search option in case of error
...
* lisp/org.el (org-open-file): Save position with `org-mark-ring-push'
before calling `org-link-search'.
2017-01-17 10:42:13 +01:00
Kyle Meyer
Michael Albinus
Nicolas Goaziou
U-IHM-NOTEBOOK\Olli
Chunyang Xu
Matt Price
Marco Wahl