e490d2766f
Merge branch 'maint'
2018-02-01 15:51:28 +01:00
b4cc12fc32
ob-core: Fix infloop when filling a region with a source block
...
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Do not move point.
Reported-by: Yasushi SHOJI <yasushi.shoji@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2018-02/msg00006.html >
2018-02-01 15:40:51 +01:00
0155441358
Merge branch 'maint'
2018-01-19 18:22:00 +01:00
b289a65be7
Use https for links to orgmode.org
...
TINYCHANGE
2018-01-19 18:14:58 +01:00
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
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
d94f7024bc
Merge branch 'maint'
2018-01-07 00:28:35 -05:00
3e1641ef0a
Update copyright years
2018-01-07 00:27:54 -05:00
e9f30779de
Merge branch 'maint'
2017-12-31 15:49:55 +01:00
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
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
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
1e40dd6486
ob-core: Tiny refactoring
...
* lisp/ob-core.el (org-babel-expand-noweb-references): Tiny
refactoring.
2017-12-23 14:03:52 +01:00
774e553f11
Merge branch 'maint'
2017-12-23 14:03:47 +01:00
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
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
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
2646271789
Merge branch 'maint'
2017-12-15 22:26:01 +01:00
46124812d2
Fix function declarations
...
Fixes: 29722
2017-12-15 22:24:44 +01:00
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
819b2a1a3d
Merge branch 'maint'
2017-11-28 23:59:21 +01:00
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
e92732efd0
Merge branch 'maint'
2017-11-28 23:35:44 +01:00
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
c1d7b2cda3
Merge branch 'maint'
2017-11-27 23:26:38 +01:00
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 1d8126385chttp://lists.gnu.org/r/emacs-orgmode/2017-11/msg00384.html >
2017-11-27 23:23:04 +01:00
be1e807942
Merge branch 'maint'
2017-11-25 21:13:58 +01:00
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
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
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
b16086d9af
Fix `org-confirm-babel-evaluate' with `org-sbe'
...
* lisp/ob-core.el (org-babel-check-confirm-evaluate): Do not move
point, as it is neither necessary nor expected by
`org-babel-check-confirm-evaluate'.
Reported-by: Alex Bennée <alex.bennee@linaro.org>
http://lists.gnu.org/archive/html/emacs-orgmode/2017-09/msg00167.html
2017-09-07 17:43:32 +02:00
ea4e3dac6d
Use `split-string' instead of `org-split-string'
...
* contrib/lisp/org-depend.el (org-depend-trigger-todo):
(org-depend-block-todo):
* contrib/lisp/ox-bibtex.el (org-bibtex-get-arguments):
* contrib/lisp/ox-koma-letter.el (org-koma-letter-template):
* contrib/lisp/ox-taskjuggler.el (org-taskjuggler--build-unique-id):
(org-taskjuggler-resolve-dependencies):
* lisp/ob-core.el (org-babel-insert-result):
* lisp/org-agenda.el (org-search-view):
* lisp/org-lint.el (org-lint-duplicate-target):
(org-lint-wrong-header-value):
* lisp/org.el (org--setup-collect-keywords):
(org-make-org-heading-search-string):
(org-search-radio-target):
(org-local-logging):
(org-entry-add-to-multivalued-property):
(org-entry-remove-from-multivalued-property):
(org-entry-member-in-multivalued-property):
(org-entry-get-multivalued-property):
(org-entry-put-multivalued-property):
(org-wrap):
* lisp/ox-beamer.el (org-beamer-allowed-property-values):
* lisp/ox.el (org-export--get-subtree-options):
(org-export--get-inbuffer-options): Use `split-string' instead of
`org-split-string'.
2017-09-07 14:36:50 +02:00
dd4a3d3b11
Merge branch 'maint'
2017-08-25 22:00:38 +02:00
21a8ec1c0f
ob-core: Fix going to a named block.
...
* lisp/ob-core.el (org-babel-find-named-block): Add missing argument.
Reported-by: Eric S Fraga <ucecesf@ucl.ac.uk>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-08/msg00576.html >
2017-08-25 21:59:28 +02:00
548b07741b
Merge branch 'maint'
2017-08-13 19:02:27 +02:00
b862c24b9f
ob-core: Fix `org-babel-goto-named-src-block' at point-min
...
* lisp/ob-core.el (org-babel-find-named-block):
(org-babel-src-block-names): Fix behaviour when match is at point-min.
Reported-by: "Berry, Charles" <ccberry@ucsd.edu>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-08/msg00324.html >
2017-08-13 19:02:10 +02:00
15e992c6da
Merge branch 'maint'
2017-08-13 16:21:21 +02:00
24a76fbe57
ob-core: Fix improper results indentation
...
* lisp/ob-core.el (org-babel-insert-result): Fix improper results
indentation.
* testing/lisp/test-ob.el (test-ob/preserve-results-indentation): Add
test.
Reported-by: Chunyang Xu <mail@xuchunyang.me>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-08/msg00308.html >
2017-08-13 16:20:20 +02:00
f776e65373
Move `org-split-string' to "org-macs.el"
...
* lisp/org.el (org-split-string): Move the function...
* lisp/org-macs.el (org-split-string): ... here. Also clarify
docstring with regards to `split-string'.
2017-07-27 13:39:52 +02:00
93b5e5087f
Merge branch 'maint'
2017-05-08 11:26:33 +02:00
f1da21f7d9
ob-core: Fix regression
...
* lisp/ob-core.el (org-babel-balanced-split): Fix regression
introduced in 500abcd7fbhttp://permalink.gmane.org/gmane.emacs.orgmode/113401 >
2017-05-08 11:25:17 +02:00
cecdb2bd67
Merge branch 'maint'
2017-05-02 08:24:24 +02:00
500abcd7fb
ob-core: Fix `org-babel-balanced-split'
...
* lisp/ob-core.el (org-babel-balanced-split): Rewrite function.
Reported-by: Moritz Heidkamp <moritz@twoticketsplease.de>
<http://permalink.gmane.org/gmane.emacs.orgmode/113204 >
2017-05-01 23:35:39 +02:00
823c821bc8
ob-core: Small refactoring
...
* lisp/ob-core.el (org-babel-read): Small refactoring.
(org-babel--string-to-number): Use `string-match-p' instead of
`string-match'.
* lisp/org-compat.el (org-babel-number-p): Move obsolete alias.
2017-05-01 15:33:09 +02:00
6251c87f66
Merge branch 'maint'
2017-03-01 22:19:29 +01:00
a4eb60931a
ob-core: Properly escape Org syntax when inserting results
...
* lisp/ob-core.el (org-babel-examplify-region): Escape Org syntax
before wrapping it.
* testing/lisp/test-ob.el (test-ob/org-babel-insert-result): Add test.
Renamed from `test-ob/org-babel-insert-result--improper-lists'.
Reported-by: D M German <dmg@turingmachine.org>
2017-03-01 22:19:04 +01:00
9c111f63d3
ob-core: Add org-babel-uppercase-example-markers option
...
* lisp/ob-core.el (org-babel-capitalize-example-region-markers): Mark
as obsolete.
(org-babel-uppercase-example-markers): New defcustom to replace defvar
org-babel-capitalize-example-region-markers.
(org-babel-examplify-region): Use new option.
Rather than moving org-babel-capitalize-example-region-markers to a
defcustom, give the option a new name that makes it clearer that all
characters, not just the first, will be in upper case.
Suggested-by: Vicente Vera <vicentemvp@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/111656 >
2017-01-26 20:06:39 -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
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
Nicolas Goaziou
Tim Landscheidt
Kyle Meyer
Paul Eggert
Michael Albinus