testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 17:21:37 -04:00
;;; test-org.el --- tests for org.el -*- lexical-binding: t -*-
2010-11-21 13:51:50 -05:00
2012-12-13 11:24:19 -05:00
;; Copyright (c) David Maus
2010-11-21 13:51:50 -05:00
;; Authors: David Maus
2012-12-13 11:24:19 -05:00
;; This file is not part of GNU Emacs.
2010-11-21 13:51:50 -05:00
2012-12-13 11:24:19 -05:00
;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
;; This program is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
2021-03-20 03:27:57 -04:00
;; along with this program. If not, see <https://www.gnu.org/licenses/>.
2012-12-13 11:24:19 -05:00
2016-08-23 16:13:56 -04:00
;; Template test file for Org tests
2010-11-21 13:51:50 -05:00
;;; Code:
2018-05-09 23:18:04 -04:00
( eval-and-compile ( require 'cl-lib ) )
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 17:21:37 -04:00
( eval-when-compile ( require 'org-macs ) ) ;For `org-with-gensyms'.
( require 'org )
( require 'org-inlinetask )
( require 'org-refile )
( require 'org-agenda )
2018-05-09 23:18:04 -04:00
2022-04-08 12:10:50 -04:00
;;; Helpers
( defmacro org-test-with-timezone ( tz &rest body )
" Evaluate BODY with TZ environment temporary set to the passed value. "
( declare ( indent 1 ) )
( org-with-gensyms ( tz-saved )
` ( let ( ( , tz-saved ( getenv " TZ " ) ) )
( unwind-protect
( progn
( setenv " TZ " , tz )
,@ body )
( setenv " TZ " , tz-saved ) ) ) ) )
2012-10-10 07:19:25 -04:00
;;; Comments
2010-11-21 13:51:50 -05:00
2014-03-24 16:46:00 -04:00
( ert-deftest test-org/toggle-comment ( )
" Test `org-toggle-comment' specifications. "
;; Simple headline.
( should
( equal " * Test "
( org-test-with-temp-text " * COMMENT Test "
( org-toggle-comment )
( buffer-string ) ) ) )
( should
( equal " * COMMENT Test "
( org-test-with-temp-text " * Test "
( org-toggle-comment )
( buffer-string ) ) ) )
;; Headline with a regular keyword.
( should
( equal " * TODO Test "
( org-test-with-temp-text " * TODO COMMENT Test "
( org-toggle-comment )
( buffer-string ) ) ) )
( should
( equal " * TODO COMMENT Test "
( org-test-with-temp-text " * TODO Test "
( org-toggle-comment )
( buffer-string ) ) ) )
;; Empty headline.
( should
( equal " * "
( org-test-with-temp-text " * COMMENT "
( org-toggle-comment )
( buffer-string ) ) ) )
( should
( equal " * COMMENT "
( org-test-with-temp-text " * "
( org-toggle-comment )
( buffer-string ) ) ) )
;; Headline with a single keyword.
( should
( equal " * TODO "
( org-test-with-temp-text " * TODO COMMENT "
( org-toggle-comment )
( buffer-string ) ) ) )
( should
( equal " * TODO COMMENT "
( org-test-with-temp-text " * TODO "
( org-toggle-comment )
( buffer-string ) ) ) )
;; Headline with a keyword, a priority cookie and contents.
( should
( equal " * TODO [#A] Headline "
( org-test-with-temp-text " * TODO [#A] COMMENT Headline "
( org-toggle-comment )
( buffer-string ) ) ) )
( should
( equal " * TODO [#A] COMMENT Headline "
( org-test-with-temp-text " * TODO [#A] Headline "
( org-toggle-comment )
( buffer-string ) ) ) ) )
2012-10-10 07:19:25 -04:00
( ert-deftest test-org/comment-dwim ( )
" Test `comment-dwim' behaviour in an Org buffer. "
;; No region selected, no comment on current line and line not
;; empty: insert comment on line above.
2010-11-21 13:51:50 -05:00
( should
2012-10-10 07:19:25 -04:00
( equal " # \n Comment "
( org-test-with-temp-text " Comment "
2017-11-29 08:37:12 -05:00
( call-interactively #' org-comment-dwim )
( buffer-string ) ) ) )
2012-10-10 07:19:25 -04:00
;; No region selected, no comment on current line and line empty:
;; insert comment on this line.
2010-11-21 13:51:50 -05:00
( should
2012-10-10 07:19:25 -04:00
( equal " # \n Paragraph "
( org-test-with-temp-text " \n Paragraph "
2017-11-29 08:37:12 -05:00
( call-interactively #' org-comment-dwim )
( buffer-string ) ) ) )
2012-10-10 07:19:25 -04:00
;; No region selected, and a comment on this line: indent it.
2010-11-29 15:04:41 -05:00
( should
2012-10-10 07:19:25 -04:00
( equal " * Headline \n # Comment "
2017-11-29 08:37:12 -05:00
( org-test-with-temp-text " * Headline \n # <point>Comment "
( let ( ( org-adapt-indentation t ) )
( call-interactively #' org-comment-dwim ) )
( buffer-string ) ) ) )
2012-10-10 07:19:25 -04:00
;; Also recognize single # at column 0 as comments.
2012-08-31 17:51:47 -04:00
( should
2012-10-10 07:19:25 -04:00
( equal " # Comment "
( org-test-with-temp-text " # Comment "
2017-11-29 08:37:12 -05:00
( call-interactively #' org-comment-dwim )
( buffer-string ) ) ) )
2012-10-10 07:19:25 -04:00
;; Region selected and only comments and blank lines within it:
;; un-comment all commented lines.
2012-08-31 17:51:47 -04:00
( should
2012-10-10 07:19:25 -04:00
( equal " Comment 1 \n \n Comment 2 "
( org-test-with-temp-text " # Comment 1 \n \n # Comment 2 "
2017-11-29 08:37:12 -05:00
( transient-mark-mode 1 )
( push-mark ( point ) t t )
( goto-char ( point-max ) )
( call-interactively #' org-comment-dwim )
( buffer-string ) ) ) )
2013-07-10 08:00:30 -04:00
;; Region selected without comments: comment all lines if
;; `comment-empty-lines' is non-nil, only non-blank lines otherwise.
2012-08-31 17:51:47 -04:00
( should
2012-10-10 07:19:25 -04:00
( equal " # Comment 1 \n \n # Comment 2 "
( org-test-with-temp-text " Comment 1 \n \n Comment 2 "
2017-11-29 08:37:12 -05:00
( transient-mark-mode 1 )
( push-mark ( point ) t t )
( goto-char ( point-max ) )
( let ( ( comment-empty-lines nil ) )
( call-interactively #' org-comment-dwim ) )
( buffer-string ) ) ) )
2013-07-10 08:00:30 -04:00
( should
( equal " # Comment 1 \n # \n # Comment 2 "
( org-test-with-temp-text " Comment 1 \n \n Comment 2 "
2017-11-29 08:37:12 -05:00
( transient-mark-mode 1 )
( push-mark ( point ) t t )
( goto-char ( point-max ) )
( let ( ( comment-empty-lines t ) )
( call-interactively #' org-comment-dwim ) )
( buffer-string ) ) ) )
2012-10-10 07:19:25 -04:00
;; In front of a keyword without region, insert a new comment.
2012-08-31 17:51:47 -04:00
( should
2012-10-10 07:19:25 -04:00
( equal " # \n #+KEYWORD: value "
( org-test-with-temp-text " #+KEYWORD: value "
2017-11-29 08:37:12 -05:00
( call-interactively #' org-comment-dwim )
( buffer-string ) ) ) )
2017-11-29 08:41:12 -05:00
;; Comment a heading
( should
( equal " * COMMENT Test "
( org-test-with-temp-text " * Test "
( call-interactively #' org-comment-dwim )
( buffer-string ) ) ) )
2013-11-04 12:00:40 -05:00
;; In a source block, use appropriate syntax.
( should
( equal " ;; "
2017-11-29 08:37:12 -05:00
( org-test-with-temp-text " #+BEGIN_SRC emacs-lisp \n <point> \n #+END_SRC "
2013-11-04 12:00:40 -05:00
( let ( ( org-edit-src-content-indentation 2 ) )
2017-11-29 08:37:12 -05:00
( call-interactively #' org-comment-dwim ) )
( buffer-substring-no-properties ( line-beginning-position )
( point ) ) ) ) )
2013-11-04 12:00:40 -05:00
( should
( equal " #+BEGIN_SRC emacs-lisp \n ;; a \n ;; b \n #+END_SRC "
2017-11-29 08:37:12 -05:00
( org-test-with-temp-text
" #+BEGIN_SRC emacs-lisp \n <point>a \n b \n #+END_SRC "
2013-11-04 12:00:40 -05:00
( transient-mark-mode 1 )
( push-mark ( point ) t t )
( forward-line 2 )
( let ( ( org-edit-src-content-indentation 2 ) )
2017-11-29 08:37:12 -05:00
( call-interactively #' org-comment-dwim ) )
2013-11-04 12:00:40 -05:00
( buffer-string ) ) ) ) )
2012-08-31 17:51:47 -04:00
2012-10-12 11:52:47 -04:00
2012-12-30 04:27:02 -05:00
;;; Date and time analysis
2012-10-12 11:52:47 -04:00
2022-04-08 12:10:50 -04:00
( ert-deftest test-org/org-encode-time ( )
" Test various ways to call `org-encode-time' "
( org-test-with-timezone " UTC "
;; list as the sole argument
( should ( string-equal
" 2022-03-24 23:30:01 "
( format-time-string
" %F %T "
( org-encode-time ' ( 1 30 23 24 3 2022 nil -1 nil ) ) ) ) )
;; SECOND...YEAR
( should ( string-equal
" 2022-03-24 23:30:02 "
( format-time-string
" %F %T "
( org-encode-time 2 30 23 24 3 2022 ) ) ) )
;; SECOND...YEAR IGNORED DST ZONE
( should ( string-equal
" 2022-03-24 23:30:03 "
( format-time-string
" %F %T "
( org-encode-time 3 30 23 24 3 2022 nil -1 nil ) ) ) )
;; function call
( should ( string-equal
" 2022-03-24 23:30:04 "
( format-time-string
" %F %T "
( org-encode-time ( apply #' list 4 30 23 ' ( 24 3 2022 nil -1 nil ) ) ) ) ) )
;; wrong number of arguments
( if ( not ( version< emacs-version " 27.1 " ) )
( should-error ( string-equal
" 2022-03-24 23:30:05 "
( format-time-string
" %F %T "
( org-encode-time 5 30 23 24 3 2022 nil ) ) ) ) ) )
;; daylight saving time
( if ( not ( version< emacs-version " 27.1 " ) )
;; DST value is not ignored for multiple arguments unlike for `encode-time'
( should ( string-equal
" 2022-04-01 00:30:06 +0200 CEST "
( format-time-string
" %F %T %z %Z "
( org-encode-time 6 30 23 31 3 2022 nil nil " Europe/Madrid " )
" Europe/Madrid " ) ) )
( should ( string-equal
" 2022-03-31 23:30:07 +0200 CEST "
( format-time-string
" %F %T %z %Z "
( org-encode-time 7 30 23 31 3 2022 nil t " Europe/Madrid " )
" Europe/Madrid " ) ) ) )
( org-test-with-timezone " Europe/Madrid "
;; Standard time is not forced when DST is not specified
( should ( string-equal
" 2022-03-31 23:30:08 "
( format-time-string
" %F %T "
( org-encode-time 8 30 23 31 3 2022 ) ) ) ) ) )
2022-05-05 10:54:03 -04:00
( ert-deftest test-org/org-time-string-to-time ( )
" Test `org-time-string-to-time' around DST transition. "
( org-test-with-timezone " UTC "
( should ( string-equal
" 2022-03-31 23:31:00 "
( format-time-string
" %F %T "
( org-time-string-to-time " 2022-03-31 23:31 " ) ) ) ) )
( org-test-with-timezone " Europe/Madrid "
( should ( string-equal
" 2022-03-24 23:32:00 +0100 CET "
( format-time-string
" %F %T %z %Z "
( org-time-string-to-time " 2022-03-24 23:32 " ) ) ) )
( should ( string-equal
" 2022-03-31 23:33:00 +0200 CEST "
( format-time-string
" %F %T %z %Z "
( org-time-string-to-time " 2022-03-31 23:33 " ) ) ) ) ) )
2012-10-12 11:52:47 -04:00
( ert-deftest test-org/org-read-date ( )
" Test `org-read-date' specifications. "
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 17:21:37 -04:00
( defvar org-time-was-given ) ; dynamically scoped parameter
2012-10-12 11:52:47 -04:00
;; Parse ISO date with abbreviated year and month.
( should ( equal " 2012-03-29 16:40 "
( let ( ( org-time-was-given t ) )
( org-read-date t nil " 12-3-29 16:40 " ) ) ) )
;; Parse Europeans dates.
( should ( equal " 2012-03-29 16:40 "
( let ( ( org-time-was-given t ) )
( org-read-date t nil " 29.03.2012 16:40 " ) ) ) )
;; Parse Europeans dates without year.
( should ( string-match " 2[0-9] \\ {3 \\ }-03-29 16:40 "
( let ( ( org-time-was-given t ) )
2015-01-06 17:19:42 -05:00
( org-read-date t nil " 29.03. 16:40 " ) ) ) )
;; Relative date applied to current time if there is single
;; plus/minus, or to default date when there are two of them.
( should
( equal
" 2015-03-04 "
2019-02-12 17:44:23 -05:00
( org-test-at-time " 2014-03-04 "
2015-01-06 17:19:42 -05:00
( org-read-date
t nil " +1y " nil
2022-05-02 06:41:34 -04:00
( org-time-string-to-time " 2012-03-29 " ) ) ) ) )
2015-01-06 17:19:42 -05:00
( should
( equal
" 2013-03-29 "
2019-02-12 17:44:23 -05:00
( org-test-at-time " 2014-03-04 "
2015-01-06 17:19:42 -05:00
( org-read-date
t nil " ++1y " nil
2022-05-02 06:41:34 -04:00
( org-time-string-to-time " 2012-03-29 " ) ) ) ) )
2015-01-06 17:19:42 -05:00
;; When `org-read-date-prefer-future' is non-nil, prefer future
;; dates (relatively to now) when incomplete. Otherwise, use
;; default date.
( should
( equal
" 2014-04-01 "
2019-02-12 17:44:23 -05:00
( org-test-at-time " 2014-03-04 "
2015-01-06 17:19:42 -05:00
( let ( ( org-read-date-prefer-future t ) )
( org-read-date t nil " 1 " ) ) ) ) )
( should
( equal
" 2013-03-04 "
2019-02-12 17:44:23 -05:00
( org-test-at-time " 2012-03-29 "
2015-01-06 17:19:42 -05:00
( let ( ( org-read-date-prefer-future t ) )
( org-read-date t nil " 3-4 " ) ) ) ) )
( should
( equal
" 2012-03-04 "
2019-02-12 17:44:23 -05:00
( org-test-at-time " 2012-03-29 "
2015-01-06 17:19:42 -05:00
( let ( ( org-read-date-prefer-future nil ) )
( org-read-date t nil " 3-4 " ) ) ) ) )
;; When set to `org-read-date-prefer-future' is set to `time', read
;; day is moved to tomorrow if specified hour is before current
;; time. However, it only happens in no other part of the date is
;; specified.
( should
( equal
" 2012-03-30 "
2019-02-12 17:44:23 -05:00
( org-test-at-time " 2012-03-29 16:40 "
2015-01-06 17:19:42 -05:00
( let ( ( org-read-date-prefer-future 'time ) )
( org-read-date t nil " 00:40 " nil ) ) ) ) )
( should-not
( equal
" 2012-03-30 "
2019-02-12 17:44:23 -05:00
( org-test-at-time " 2012-03-29 16:40 "
2015-01-06 17:19:42 -05:00
( let ( ( org-read-date-prefer-future 'time ) )
( org-read-date t nil " 29 00:40 " nil ) ) ) ) )
;; Caveat: `org-read-date-prefer-future' always refers to current
;; time, not default time, when they differ.
( should
( equal
" 2014-04-01 "
2019-02-12 17:44:23 -05:00
( org-test-at-time " 2014-03-04 "
2015-01-06 17:19:42 -05:00
( let ( ( org-read-date-prefer-future t ) )
( org-read-date
t nil " 1 " nil
2022-05-02 06:41:34 -04:00
( org-time-string-to-time " 2012-03-29 " ) ) ) ) ) )
2015-01-06 17:19:42 -05:00
( should
( equal
" 2014-03-25 "
2019-02-12 17:44:23 -05:00
( org-test-at-time " 2014-03-04 "
2015-01-06 17:19:42 -05:00
( let ( ( org-read-date-prefer-future t ) )
( org-read-date
t nil " 25 " nil
2022-05-02 06:41:34 -04:00
( org-time-string-to-time " 2012-03-29 " ) ) ) ) ) ) )
2012-10-12 11:52:47 -04:00
2012-12-30 04:27:02 -05:00
( ert-deftest test-org/org-parse-time-string ( )
" Test `org-parse-time-string' . "
( should ( equal ( org-parse-time-string " 2012-03-29 16:40 " )
2022-05-03 06:59:11 -04:00
' ( 0 40 16 29 3 2012 nil -1 nil ) ) )
2012-12-30 04:27:02 -05:00
( should ( equal ( org-parse-time-string " [2012-03-29 16:40] " )
2022-05-03 06:59:11 -04:00
' ( 0 40 16 29 3 2012 nil -1 nil ) ) )
2012-12-30 04:27:02 -05:00
( should ( equal ( org-parse-time-string " <2012-03-29 16:40> " )
2022-05-03 06:59:11 -04:00
' ( 0 40 16 29 3 2012 nil -1 nil ) ) )
2012-12-30 04:27:02 -05:00
( should ( equal ( org-parse-time-string " <2012-03-29> " )
2022-05-03 06:59:11 -04:00
' ( 0 0 0 29 3 2012 nil -1 nil ) ) )
2012-12-30 04:27:02 -05:00
( should ( equal ( org-parse-time-string " <2012-03-29> " t )
2022-05-03 06:59:11 -04:00
' ( 0 nil nil 29 3 2012 nil -1 nil ) ) ) )
2012-10-12 11:52:47 -04:00
2015-10-16 11:32:01 -04:00
( ert-deftest test-org/closest-date ( )
" Test `org-closest-date' specifications. "
( require 'calendar )
;; Time stamps without a repeater are returned unchanged.
( should
( equal
' ( 3 29 2012 )
( calendar-gregorian-from-absolute
( org-closest-date " <2012-03-29> " " <2014-03-04> " nil ) ) ) )
;; Time stamps with a null repeater are returned unchanged.
( should
( equal
' ( 3 29 2012 )
( calendar-gregorian-from-absolute
( org-closest-date " <2012-03-29 +0d> " " <2014-03-04> " nil ) ) ) )
;; if PREFER is set to `past' always return a date before, or equal
;; to CURRENT.
( should
( equal
' ( 3 1 2014 )
( calendar-gregorian-from-absolute
( org-closest-date " <2012-03-29 +1m> " " <2014-03-04> " 'past ) ) ) )
( should
( equal
' ( 3 4 2014 )
( calendar-gregorian-from-absolute
( org-closest-date " <2012-03-04 +1m> " " <2014-03-04> " 'past ) ) ) )
;; if PREFER is set to `future' always return a date before, or equal
;; to CURRENT.
( should
( equal
' ( 3 29 2014 )
( calendar-gregorian-from-absolute
( org-closest-date " <2012-03-29 +1m> " " <2014-03-04> " 'future ) ) ) )
( should
( equal
' ( 3 4 2014 )
( calendar-gregorian-from-absolute
( org-closest-date " <2012-03-04 +1m> " " <2014-03-04> " 'future ) ) ) )
;; If PREFER is neither `past' nor `future', select closest date.
( should
( equal
' ( 3 1 2014 )
( calendar-gregorian-from-absolute
( org-closest-date " <2012-03-29 +1m> " " <2014-03-04> " nil ) ) ) )
( should
( equal
' ( 5 4 2014 )
( calendar-gregorian-from-absolute
( org-closest-date " <2012-03-04 +1m> " " <2014-04-28> " nil ) ) ) )
;; Test "day" repeater.
( should
( equal ' ( 3 8 2014 )
( calendar-gregorian-from-absolute
( org-closest-date " <2014-03-04 +2d> " " <2014-03-09> " 'past ) ) ) )
( should
( equal ' ( 3 10 2014 )
( calendar-gregorian-from-absolute
( org-closest-date " <2014-03-04 +2d> " " <2014-03-09> " 'future ) ) ) )
;; Test "month" repeater.
( should
( equal ' ( 1 5 2015 )
( calendar-gregorian-from-absolute
( org-closest-date " <2014-03-05 +2m> " " <2015-02-04> " 'past ) ) ) )
( should
( equal ' ( 3 29 2014 )
( calendar-gregorian-from-absolute
( org-closest-date " <2012-03-29 +2m> " " <2014-03-04> " 'future ) ) ) )
;; Test "year" repeater.
( should
( equal ' ( 3 5 2014 )
( calendar-gregorian-from-absolute
( org-closest-date " <2014-03-05 +2y> " " <2015-02-04> " 'past ) ) ) )
( should
( equal ' ( 3 29 2014 )
( calendar-gregorian-from-absolute
( org-closest-date " <2012-03-29 +2y> " " <2014-03-04> " 'future ) ) ) ) )
2016-06-03 02:49:55 -04:00
( ert-deftest test-org/deadline-close-p ( )
" Test `org-deadline-close-p' specifications. "
2019-02-12 17:44:23 -05:00
( org-test-at-time " 2016-06-03 Fri 01:43 "
2016-06-01 00:05:12 -04:00
;; Timestamps are close if they are within `ndays' of lead time.
( org-test-with-temp-text " * Heading "
2016-06-03 02:49:55 -04:00
( should ( org-deadline-close-p " 2016-06-03 Fri " 0 ) )
( should ( org-deadline-close-p " 2016-06-02 Thu " 0 ) )
( should-not ( org-deadline-close-p " 2016-06-04 Sat " 0 ) )
( should ( org-deadline-close-p " 2016-06-04 Sat " 1 ) )
( should ( org-deadline-close-p " 2016-06-03 Fri 12:00 " 0 ) ) )
2016-06-01 00:05:12 -04:00
;; Read `ndays' from timestamp if argument not given.
( org-test-with-temp-text " * H "
2016-06-03 02:49:55 -04:00
( should ( org-deadline-close-p " 2016-06-04 Sat -1d " ) )
( should-not ( org-deadline-close-p " 2016-06-04 Sat -0d " ) )
( should ( org-deadline-close-p " 2016-06-10 Fri -1w " ) )
( should-not ( org-deadline-close-p " 2016-06-11 Sat -1w " ) ) )
2016-06-01 00:05:12 -04:00
;; Prefer `ndays' argument over lead time in timestamp.
( org-test-with-temp-text " * H "
2016-06-03 02:49:55 -04:00
( should ( org-deadline-close-p " 2016-06-04 Sat -0d " 1 ) )
( should-not ( org-deadline-close-p " 2016-06-04 Sat -0d " 0 ) ) )
2016-06-01 00:05:12 -04:00
;; Completed tasks are never close.
( let ( ( org-todo-keywords ' ( ( " TODO " " | " " DONE " ) ) ) )
( org-test-with-temp-text " * TODO Heading "
2016-06-03 02:49:55 -04:00
( should ( org-deadline-close-p " 2016-06-03 " ) ) )
2016-06-01 00:05:12 -04:00
( org-test-with-temp-text " * DONE Heading "
2016-06-03 02:49:55 -04:00
( should-not ( org-deadline-close-p " 2016-06-03 " ) ) ) ) ) )
2016-06-01 00:05:12 -04:00
2014-09-15 03:32:57 -04:00
;;; Drawers
Org document property-drawers
Add functionality to define property-blocks on document level, in
addition to at headline level.
* doc/org-manual.org:
* etc/ORG-NEWS: Document new functionality.
* lisp/org.el (org-keyword-regexp): Define constant instead of
hardcoding.
(org-file-properties): Renamed, see next line.
(org-keyword-properties): Renamed from above. Due to the fact that
properties can be defined for the whole document using property
drawers this local variable needs a rename to make its name less
ambigous.
(org-refresh-properties, org-refresh-property, org-entry-properties)
(org-refresh-category-properties, org-get-property-block)
(org-entry-get-with-inheritance, org-entry-put)
(org-insert-property-drawer, org-end-of-subtree): Made to work before
first headline.
(org-at-property-block-p): New function to validate if point is at the
start of a property block.
(org-property-global-value): Renamed, see next line.
(org-property-global-or-keyword-value): Renamed from above to match
its functionality better.
(org-back-to-heading-or-point-min): New function to make a document
work as a level 0 node in the outline.
(org-at-keyword-p): Predicate function to answer to if we're currently
at a keyword line or not.
(org-up-heading-or-point-min): New function to make a document work as
a level 0 node in the outline.
* lisp/org-element.el (org-element--current-element): Can now detect
property-blocks before first headline according to it's positional
rules.
* lisp/org-attach.el (org-attach): Make it possible to call the
attachment dispatcher also before the first headline, since document
property drawers make attachments possible for the whole document
now.
* lisp/org-capture.el: Modified only due to rename of function in
org.el.
* lisp/org-compat.el (org-file-properties)
(org-property-global-value): Renamed functions declared obsolete.
* testing/lisp/test-org.el (org/insert-property-drawer)
(org/set-property, org/delete-property, org/delete-property-globally):
Additions of tests to check if they work before first headline.
(org/at-property-p, org/at-property-block-p, org/get-property-block)
(org/entry-get, org/refresh-properties): New tests
* testing/examples/property-inheritance.org: Switch from
property-keywords to a property-drawer in the testfile.
Functionality should be the same, but now using a document drawer
instead of property-keywords.
Reason for switching is that I'd like us to slowly depricate
property-keywords.
* testing/lisp/test-org-element.el:
* contrib/lisp/ox-taskjuggler.el: A comment is modified only due to
rename of function in org.el.
2019-05-26 16:13:09 -04:00
( ert-deftest test-org/at-property-p ( )
" Test `org-at-property-p' specifications. "
( should
( equal 't
( org-test-with-temp-text " * H \n :PROPERTIES: \n <point>:PROP: t \n :END: \n "
( org-at-property-p ) ) ) )
( should
( equal 't
( org-test-with-temp-text " :PROPERTIES: \n <point>:PROP: t \n :END: \n "
( org-at-property-p ) ) ) ) )
2020-05-09 06:58:09 -04:00
( ert-deftest test-org/at-property-drawer-p ( )
" Test `org-at-property-drawer-p' specifications. "
Org document property-drawers
Add functionality to define property-blocks on document level, in
addition to at headline level.
* doc/org-manual.org:
* etc/ORG-NEWS: Document new functionality.
* lisp/org.el (org-keyword-regexp): Define constant instead of
hardcoding.
(org-file-properties): Renamed, see next line.
(org-keyword-properties): Renamed from above. Due to the fact that
properties can be defined for the whole document using property
drawers this local variable needs a rename to make its name less
ambigous.
(org-refresh-properties, org-refresh-property, org-entry-properties)
(org-refresh-category-properties, org-get-property-block)
(org-entry-get-with-inheritance, org-entry-put)
(org-insert-property-drawer, org-end-of-subtree): Made to work before
first headline.
(org-at-property-block-p): New function to validate if point is at the
start of a property block.
(org-property-global-value): Renamed, see next line.
(org-property-global-or-keyword-value): Renamed from above to match
its functionality better.
(org-back-to-heading-or-point-min): New function to make a document
work as a level 0 node in the outline.
(org-at-keyword-p): Predicate function to answer to if we're currently
at a keyword line or not.
(org-up-heading-or-point-min): New function to make a document work as
a level 0 node in the outline.
* lisp/org-element.el (org-element--current-element): Can now detect
property-blocks before first headline according to it's positional
rules.
* lisp/org-attach.el (org-attach): Make it possible to call the
attachment dispatcher also before the first headline, since document
property drawers make attachments possible for the whole document
now.
* lisp/org-capture.el: Modified only due to rename of function in
org.el.
* lisp/org-compat.el (org-file-properties)
(org-property-global-value): Renamed functions declared obsolete.
* testing/lisp/test-org.el (org/insert-property-drawer)
(org/set-property, org/delete-property, org/delete-property-globally):
Additions of tests to check if they work before first headline.
(org/at-property-p, org/at-property-block-p, org/get-property-block)
(org/entry-get, org/refresh-properties): New tests
* testing/examples/property-inheritance.org: Switch from
property-keywords to a property-drawer in the testfile.
Functionality should be the same, but now using a document drawer
instead of property-keywords.
Reason for switching is that I'd like us to slowly depricate
property-keywords.
* testing/lisp/test-org-element.el:
* contrib/lisp/ox-taskjuggler.el: A comment is modified only due to
rename of function in org.el.
2019-05-26 16:13:09 -04:00
( should
2020-05-09 06:58:09 -04:00
( org-test-with-temp-text " * H \n <point>:PROPERTIES: \n :PROP: t \n :END: \n "
( org-at-property-drawer-p ) ) )
Org document property-drawers
Add functionality to define property-blocks on document level, in
addition to at headline level.
* doc/org-manual.org:
* etc/ORG-NEWS: Document new functionality.
* lisp/org.el (org-keyword-regexp): Define constant instead of
hardcoding.
(org-file-properties): Renamed, see next line.
(org-keyword-properties): Renamed from above. Due to the fact that
properties can be defined for the whole document using property
drawers this local variable needs a rename to make its name less
ambigous.
(org-refresh-properties, org-refresh-property, org-entry-properties)
(org-refresh-category-properties, org-get-property-block)
(org-entry-get-with-inheritance, org-entry-put)
(org-insert-property-drawer, org-end-of-subtree): Made to work before
first headline.
(org-at-property-block-p): New function to validate if point is at the
start of a property block.
(org-property-global-value): Renamed, see next line.
(org-property-global-or-keyword-value): Renamed from above to match
its functionality better.
(org-back-to-heading-or-point-min): New function to make a document
work as a level 0 node in the outline.
(org-at-keyword-p): Predicate function to answer to if we're currently
at a keyword line or not.
(org-up-heading-or-point-min): New function to make a document work as
a level 0 node in the outline.
* lisp/org-element.el (org-element--current-element): Can now detect
property-blocks before first headline according to it's positional
rules.
* lisp/org-attach.el (org-attach): Make it possible to call the
attachment dispatcher also before the first headline, since document
property drawers make attachments possible for the whole document
now.
* lisp/org-capture.el: Modified only due to rename of function in
org.el.
* lisp/org-compat.el (org-file-properties)
(org-property-global-value): Renamed functions declared obsolete.
* testing/lisp/test-org.el (org/insert-property-drawer)
(org/set-property, org/delete-property, org/delete-property-globally):
Additions of tests to check if they work before first headline.
(org/at-property-p, org/at-property-block-p, org/get-property-block)
(org/entry-get, org/refresh-properties): New tests
* testing/examples/property-inheritance.org: Switch from
property-keywords to a property-drawer in the testfile.
Functionality should be the same, but now using a document drawer
instead of property-keywords.
Reason for switching is that I'd like us to slowly depricate
property-keywords.
* testing/lisp/test-org-element.el:
* contrib/lisp/ox-taskjuggler.el: A comment is modified only due to
rename of function in org.el.
2019-05-26 16:13:09 -04:00
( should
2020-05-09 06:58:09 -04:00
( org-test-with-temp-text " :PROPERTIES: \n :PROP: t \n :END: \n "
( org-at-property-drawer-p ) ) )
;; The function only returns t if point is at the first line of
;; a property block.
Org document property-drawers
Add functionality to define property-blocks on document level, in
addition to at headline level.
* doc/org-manual.org:
* etc/ORG-NEWS: Document new functionality.
* lisp/org.el (org-keyword-regexp): Define constant instead of
hardcoding.
(org-file-properties): Renamed, see next line.
(org-keyword-properties): Renamed from above. Due to the fact that
properties can be defined for the whole document using property
drawers this local variable needs a rename to make its name less
ambigous.
(org-refresh-properties, org-refresh-property, org-entry-properties)
(org-refresh-category-properties, org-get-property-block)
(org-entry-get-with-inheritance, org-entry-put)
(org-insert-property-drawer, org-end-of-subtree): Made to work before
first headline.
(org-at-property-block-p): New function to validate if point is at the
start of a property block.
(org-property-global-value): Renamed, see next line.
(org-property-global-or-keyword-value): Renamed from above to match
its functionality better.
(org-back-to-heading-or-point-min): New function to make a document
work as a level 0 node in the outline.
(org-at-keyword-p): Predicate function to answer to if we're currently
at a keyword line or not.
(org-up-heading-or-point-min): New function to make a document work as
a level 0 node in the outline.
* lisp/org-element.el (org-element--current-element): Can now detect
property-blocks before first headline according to it's positional
rules.
* lisp/org-attach.el (org-attach): Make it possible to call the
attachment dispatcher also before the first headline, since document
property drawers make attachments possible for the whole document
now.
* lisp/org-capture.el: Modified only due to rename of function in
org.el.
* lisp/org-compat.el (org-file-properties)
(org-property-global-value): Renamed functions declared obsolete.
* testing/lisp/test-org.el (org/insert-property-drawer)
(org/set-property, org/delete-property, org/delete-property-globally):
Additions of tests to check if they work before first headline.
(org/at-property-p, org/at-property-block-p, org/get-property-block)
(org/entry-get, org/refresh-properties): New tests
* testing/examples/property-inheritance.org: Switch from
property-keywords to a property-drawer in the testfile.
Functionality should be the same, but now using a document drawer
instead of property-keywords.
Reason for switching is that I'd like us to slowly depricate
property-keywords.
* testing/lisp/test-org-element.el:
* contrib/lisp/ox-taskjuggler.el: A comment is modified only due to
rename of function in org.el.
2019-05-26 16:13:09 -04:00
( should-not
2020-05-09 06:58:09 -04:00
( org-test-with-temp-text " :PROPERTIES: \n <point>:PROP: t \n :END: \n "
( org-at-property-drawer-p ) ) )
;; The function ignores incomplete drawers.
( should-not
( org-test-with-temp-text " :PROPERTIES: \n <point>:PROP: t \n "
2021-10-11 08:08:01 -04:00
( org-at-property-drawer-p ) ) )
;; tab separating the value.
( should
( org-test-with-temp-text " :PROPERTIES: \n :PROP: t \n :END: \n "
2020-05-09 06:58:09 -04:00
( org-at-property-drawer-p ) ) ) )
Org document property-drawers
Add functionality to define property-blocks on document level, in
addition to at headline level.
* doc/org-manual.org:
* etc/ORG-NEWS: Document new functionality.
* lisp/org.el (org-keyword-regexp): Define constant instead of
hardcoding.
(org-file-properties): Renamed, see next line.
(org-keyword-properties): Renamed from above. Due to the fact that
properties can be defined for the whole document using property
drawers this local variable needs a rename to make its name less
ambigous.
(org-refresh-properties, org-refresh-property, org-entry-properties)
(org-refresh-category-properties, org-get-property-block)
(org-entry-get-with-inheritance, org-entry-put)
(org-insert-property-drawer, org-end-of-subtree): Made to work before
first headline.
(org-at-property-block-p): New function to validate if point is at the
start of a property block.
(org-property-global-value): Renamed, see next line.
(org-property-global-or-keyword-value): Renamed from above to match
its functionality better.
(org-back-to-heading-or-point-min): New function to make a document
work as a level 0 node in the outline.
(org-at-keyword-p): Predicate function to answer to if we're currently
at a keyword line or not.
(org-up-heading-or-point-min): New function to make a document work as
a level 0 node in the outline.
* lisp/org-element.el (org-element--current-element): Can now detect
property-blocks before first headline according to it's positional
rules.
* lisp/org-attach.el (org-attach): Make it possible to call the
attachment dispatcher also before the first headline, since document
property drawers make attachments possible for the whole document
now.
* lisp/org-capture.el: Modified only due to rename of function in
org.el.
* lisp/org-compat.el (org-file-properties)
(org-property-global-value): Renamed functions declared obsolete.
* testing/lisp/test-org.el (org/insert-property-drawer)
(org/set-property, org/delete-property, org/delete-property-globally):
Additions of tests to check if they work before first headline.
(org/at-property-p, org/at-property-block-p, org/get-property-block)
(org/entry-get, org/refresh-properties): New tests
* testing/examples/property-inheritance.org: Switch from
property-keywords to a property-drawer in the testfile.
Functionality should be the same, but now using a document drawer
instead of property-keywords.
Reason for switching is that I'd like us to slowly depricate
property-keywords.
* testing/lisp/test-org-element.el:
* contrib/lisp/ox-taskjuggler.el: A comment is modified only due to
rename of function in org.el.
2019-05-26 16:13:09 -04:00
( ert-deftest test-org/get-property-block ( )
" Test `org-get-property-block' specifications. "
( should
( equal ' ( 14 . 14 )
( org-test-with-temp-text " :PROPERTIES: \n :END: \n * H \n "
( org-get-property-block ) ) ) )
( should
( equal ' ( 14 . 14 )
( org-test-with-temp-text " :PROPERTIES: \n :END: \n "
( org-get-property-block ) ) ) )
;; Comments above a document property block is ok.
( should
( equal ' ( 18 . 18 )
( org-test-with-temp-text " # C \n :PROPERTIES: \n :END: \n "
( org-get-property-block ) ) ) )
;; Keywords above a document property block is ok.
( should
( equal ' ( 22 . 22 )
( org-test-with-temp-text " # C \n # C \n :PROPERTIES: \n :END: \n "
( org-get-property-block ) ) ) )
;; Comments and keywords are allowed before a document property block.
( should
( equal ' ( 18 . 27 )
( org-test-with-temp-text " # C \n :PROPERTIES: \n :KEY: V: \n :END: \n "
( org-get-property-block ) ) ) )
;; A document property block will not be valid if there are lines
;; with whitespace above it
( should-not
( org-test-with-temp-text " \n :PROPERTIES: \n :END: \n "
( org-get-property-block ) ) )
( should
( equal ' ( 18 . 18 )
( org-test-with-temp-text " * H \n :PROPERTIES: \n :END: \n <point> "
( org-get-property-block ) ) ) )
( should
( equal " * H \n :PROPERTIES: \n :END: \n "
( org-test-with-temp-text " * H "
( let ( ( org-adapt-indentation nil ) )
( org-get-property-block nil 'force ) )
( buffer-string ) ) ) )
( should
( equal " :PROPERTIES: \n :END: \n "
( org-test-with-temp-text " "
( org-get-property-block nil 'force )
( buffer-string ) ) ) )
( should
( equal " * H1 \n :PROPERTIES: \n :END: \n * H2 "
( org-test-with-temp-text " * H1 \n * H2 "
( let ( ( org-adapt-indentation t ) )
( org-get-property-block nil 'force ) )
( buffer-string ) ) ) ) )
2014-09-15 03:32:57 -04:00
( ert-deftest test-org/insert-property-drawer ( )
" Test `org-insert-property-drawer' specifications. "
Org document property-drawers
Add functionality to define property-blocks on document level, in
addition to at headline level.
* doc/org-manual.org:
* etc/ORG-NEWS: Document new functionality.
* lisp/org.el (org-keyword-regexp): Define constant instead of
hardcoding.
(org-file-properties): Renamed, see next line.
(org-keyword-properties): Renamed from above. Due to the fact that
properties can be defined for the whole document using property
drawers this local variable needs a rename to make its name less
ambigous.
(org-refresh-properties, org-refresh-property, org-entry-properties)
(org-refresh-category-properties, org-get-property-block)
(org-entry-get-with-inheritance, org-entry-put)
(org-insert-property-drawer, org-end-of-subtree): Made to work before
first headline.
(org-at-property-block-p): New function to validate if point is at the
start of a property block.
(org-property-global-value): Renamed, see next line.
(org-property-global-or-keyword-value): Renamed from above to match
its functionality better.
(org-back-to-heading-or-point-min): New function to make a document
work as a level 0 node in the outline.
(org-at-keyword-p): Predicate function to answer to if we're currently
at a keyword line or not.
(org-up-heading-or-point-min): New function to make a document work as
a level 0 node in the outline.
* lisp/org-element.el (org-element--current-element): Can now detect
property-blocks before first headline according to it's positional
rules.
* lisp/org-attach.el (org-attach): Make it possible to call the
attachment dispatcher also before the first headline, since document
property drawers make attachments possible for the whole document
now.
* lisp/org-capture.el: Modified only due to rename of function in
org.el.
* lisp/org-compat.el (org-file-properties)
(org-property-global-value): Renamed functions declared obsolete.
* testing/lisp/test-org.el (org/insert-property-drawer)
(org/set-property, org/delete-property, org/delete-property-globally):
Additions of tests to check if they work before first headline.
(org/at-property-p, org/at-property-block-p, org/get-property-block)
(org/entry-get, org/refresh-properties): New tests
* testing/examples/property-inheritance.org: Switch from
property-keywords to a property-drawer in the testfile.
Functionality should be the same, but now using a document drawer
instead of property-keywords.
Reason for switching is that I'd like us to slowly depricate
property-keywords.
* testing/lisp/test-org-element.el:
* contrib/lisp/ox-taskjuggler.el: A comment is modified only due to
rename of function in org.el.
2019-05-26 16:13:09 -04:00
;; Insert drawer in empty buffer
( should
( equal " :PROPERTIES: \n :END: \n "
( org-test-with-temp-text " "
( let ( ( org-adapt-indentation nil ) ) ( org-insert-property-drawer ) )
( buffer-string ) ) ) )
;; Insert drawer in document header with existing comment and
;; keyword.
( should
( equal " # C \n :PROPERTIES: \n :END: \n #+TITLE: T "
( org-test-with-temp-text " # C \n #+TITLE: T "
( let ( ( org-adapt-indentation nil ) ) ( org-insert-property-drawer ) )
( buffer-string ) ) ) )
2019-10-31 18:56:03 -04:00
;; Insert drawer in document header with existing keyword.
( should
( equal " :PROPERTIES: \n :END: \n #+TITLE: T "
( org-test-with-temp-text " #+TITLE: T "
( let ( ( org-adapt-indentation nil ) ) ( org-insert-property-drawer ) )
( buffer-string ) ) ) )
Org document property-drawers
Add functionality to define property-blocks on document level, in
addition to at headline level.
* doc/org-manual.org:
* etc/ORG-NEWS: Document new functionality.
* lisp/org.el (org-keyword-regexp): Define constant instead of
hardcoding.
(org-file-properties): Renamed, see next line.
(org-keyword-properties): Renamed from above. Due to the fact that
properties can be defined for the whole document using property
drawers this local variable needs a rename to make its name less
ambigous.
(org-refresh-properties, org-refresh-property, org-entry-properties)
(org-refresh-category-properties, org-get-property-block)
(org-entry-get-with-inheritance, org-entry-put)
(org-insert-property-drawer, org-end-of-subtree): Made to work before
first headline.
(org-at-property-block-p): New function to validate if point is at the
start of a property block.
(org-property-global-value): Renamed, see next line.
(org-property-global-or-keyword-value): Renamed from above to match
its functionality better.
(org-back-to-heading-or-point-min): New function to make a document
work as a level 0 node in the outline.
(org-at-keyword-p): Predicate function to answer to if we're currently
at a keyword line or not.
(org-up-heading-or-point-min): New function to make a document work as
a level 0 node in the outline.
* lisp/org-element.el (org-element--current-element): Can now detect
property-blocks before first headline according to it's positional
rules.
* lisp/org-attach.el (org-attach): Make it possible to call the
attachment dispatcher also before the first headline, since document
property drawers make attachments possible for the whole document
now.
* lisp/org-capture.el: Modified only due to rename of function in
org.el.
* lisp/org-compat.el (org-file-properties)
(org-property-global-value): Renamed functions declared obsolete.
* testing/lisp/test-org.el (org/insert-property-drawer)
(org/set-property, org/delete-property, org/delete-property-globally):
Additions of tests to check if they work before first headline.
(org/at-property-p, org/at-property-block-p, org/get-property-block)
(org/entry-get, org/refresh-properties): New tests
* testing/examples/property-inheritance.org: Switch from
property-keywords to a property-drawer in the testfile.
Functionality should be the same, but now using a document drawer
instead of property-keywords.
Reason for switching is that I'd like us to slowly depricate
property-keywords.
* testing/lisp/test-org-element.el:
* contrib/lisp/ox-taskjuggler.el: A comment is modified only due to
rename of function in org.el.
2019-05-26 16:13:09 -04:00
( should
( equal " :PROPERTIES: \n :END: "
( org-test-with-temp-text " :PROPERTIES: \n :END: "
( let ( ( org-adapt-indentation nil ) ) ( org-insert-property-drawer ) )
( buffer-string ) ) ) )
;; Insert drawer in document header with one existing heading in buffer.
( should
2019-10-31 18:56:03 -04:00
( equal " :PROPERTIES: \n :END: \n \n * T \n "
( org-test-with-temp-text " \n * T \n "
Org document property-drawers
Add functionality to define property-blocks on document level, in
addition to at headline level.
* doc/org-manual.org:
* etc/ORG-NEWS: Document new functionality.
* lisp/org.el (org-keyword-regexp): Define constant instead of
hardcoding.
(org-file-properties): Renamed, see next line.
(org-keyword-properties): Renamed from above. Due to the fact that
properties can be defined for the whole document using property
drawers this local variable needs a rename to make its name less
ambigous.
(org-refresh-properties, org-refresh-property, org-entry-properties)
(org-refresh-category-properties, org-get-property-block)
(org-entry-get-with-inheritance, org-entry-put)
(org-insert-property-drawer, org-end-of-subtree): Made to work before
first headline.
(org-at-property-block-p): New function to validate if point is at the
start of a property block.
(org-property-global-value): Renamed, see next line.
(org-property-global-or-keyword-value): Renamed from above to match
its functionality better.
(org-back-to-heading-or-point-min): New function to make a document
work as a level 0 node in the outline.
(org-at-keyword-p): Predicate function to answer to if we're currently
at a keyword line or not.
(org-up-heading-or-point-min): New function to make a document work as
a level 0 node in the outline.
* lisp/org-element.el (org-element--current-element): Can now detect
property-blocks before first headline according to it's positional
rules.
* lisp/org-attach.el (org-attach): Make it possible to call the
attachment dispatcher also before the first headline, since document
property drawers make attachments possible for the whole document
now.
* lisp/org-capture.el: Modified only due to rename of function in
org.el.
* lisp/org-compat.el (org-file-properties)
(org-property-global-value): Renamed functions declared obsolete.
* testing/lisp/test-org.el (org/insert-property-drawer)
(org/set-property, org/delete-property, org/delete-property-globally):
Additions of tests to check if they work before first headline.
(org/at-property-p, org/at-property-block-p, org/get-property-block)
(org/entry-get, org/refresh-properties): New tests
* testing/examples/property-inheritance.org: Switch from
property-keywords to a property-drawer in the testfile.
Functionality should be the same, but now using a document drawer
instead of property-keywords.
Reason for switching is that I'd like us to slowly depricate
property-keywords.
* testing/lisp/test-org-element.el:
* contrib/lisp/ox-taskjuggler.el: A comment is modified only due to
rename of function in org.el.
2019-05-26 16:13:09 -04:00
( let ( ( org-adapt-indentation nil ) ) ( org-insert-property-drawer ) )
( buffer-string ) ) ) )
2014-09-15 03:32:57 -04:00
;; Insert drawer right after headline if there is no planning line,
;; or after it otherwise.
( should
( equal " * H \n :PROPERTIES: \n :END: \n Paragraph "
( org-test-with-temp-text " * H \n Paragraph<point> "
( let ( ( org-adapt-indentation nil ) ) ( org-insert-property-drawer ) )
( buffer-string ) ) ) )
( should
( equal " * H \n DEADLINE: <2014-03-04 tue.> \n :PROPERTIES: \n :END: \n Paragraph "
( org-test-with-temp-text
" * H \n DEADLINE: <2014-03-04 tue.> \n Paragraph<point> "
( let ( ( org-adapt-indentation nil ) ) ( org-insert-property-drawer ) )
( buffer-string ) ) ) )
;; Indent inserted drawer.
( should
( equal " * H \n :PROPERTIES: \n :END: \n Paragraph "
( org-test-with-temp-text " * H \n Paragraph<point> "
( let ( ( org-adapt-indentation t ) ) ( org-insert-property-drawer ) )
( buffer-string ) ) ) )
;; Handle insertion at eob.
( should
( equal " * H \n :PROPERTIES: \n :END: \n "
( org-test-with-temp-text " * H "
( let ( ( org-adapt-indentation nil ) ) ( org-insert-property-drawer ) )
( buffer-string ) ) ) )
;; Skip inlinetasks before point.
( when ( featurep 'org-inlinetask )
( should
( equal " * H \n :PROPERTIES: \n :END: \n *************** I \n *************** END \n P "
( org-test-with-temp-text
" * H \n *************** I \n *************** END \n P<point> "
( let ( ( org-adapt-indentation nil )
( org-inlinetask-min-level 15 ) )
( org-insert-property-drawer ) )
( buffer-string ) ) ) ) )
;; Correctly set drawer in an inlinetask.
( when ( featurep 'org-inlinetask )
( should
( equal " * H \n *************** I \n :PROPERTIES: \n :END: \n P \n *************** END "
( org-test-with-temp-text
" * H \n *************** I \n P<point> \n *************** END "
( let ( ( org-adapt-indentation nil )
( org-inlinetask-min-level 15 ) )
( org-insert-property-drawer ) )
( buffer-string ) ) ) ) ) )
2012-07-28 04:24:08 -04:00
;;; Filling
2017-05-22 09:01:25 -04:00
( ert-deftest test-org/fill-element ( )
" Test `org-fill-element' specifications. "
2012-07-28 04:24:08 -04:00
;; At an Org table, align it.
2013-04-26 08:27:38 -04:00
( should
( equal " | a | \n "
( org-test-with-temp-text " |a| "
2017-05-22 09:01:25 -04:00
( org-fill-element )
2013-04-26 08:27:38 -04:00
( buffer-string ) ) ) )
( should
( equal " #+name: table \n | a | \n "
2015-07-09 11:53:33 -04:00
( org-test-with-temp-text " #+name: table \n | a | \n "
2017-05-22 09:01:25 -04:00
( org-fill-element )
2013-04-26 08:27:38 -04:00
( buffer-string ) ) ) )
2012-07-28 04:24:08 -04:00
;; At a paragraph, preserve line breaks.
( org-test-with-temp-text " some \\ \\ \n long \n text "
( let ( ( fill-column 20 ) )
2017-05-22 09:01:25 -04:00
( org-fill-element )
2012-07-28 04:24:08 -04:00
( should ( equal ( buffer-string ) " some \\ \\ \n long text " ) ) ) )
2012-07-31 14:49:11 -04:00
;; Correctly fill a paragraph when point is at its very end.
2012-07-31 09:27:58 -04:00
( should
( equal " A B "
( org-test-with-temp-text " A \n B "
( let ( ( fill-column 20 ) )
( goto-char ( point-max ) )
2017-05-22 09:01:25 -04:00
( org-fill-element )
2012-07-31 09:27:58 -04:00
( buffer-string ) ) ) ) )
2012-08-08 03:54:56 -04:00
;; Correctly fill the last paragraph of a greater element.
( should
( equal " #+BEGIN_CENTER \n - 012345 \n 789 \n #+END_CENTER "
( org-test-with-temp-text " #+BEGIN_CENTER \n - 012345 789 \n #+END_CENTER "
( let ( ( fill-column 8 ) )
( forward-line )
( end-of-line )
2017-05-22 09:01:25 -04:00
( org-fill-element )
2012-08-08 03:54:56 -04:00
( buffer-string ) ) ) ) )
2012-08-19 06:56:57 -04:00
;; Correctly fill an element in a narrowed buffer.
( should
( equal " 01234 \n 6 "
( org-test-with-temp-text " 01234 6789 "
( let ( ( fill-column 5 ) )
( narrow-to-region 1 8 )
2017-05-22 09:01:25 -04:00
( org-fill-element )
2012-08-19 06:56:57 -04:00
( buffer-string ) ) ) ) )
2013-07-28 04:14:35 -04:00
;; Handle `adaptive-fill-regexp' in paragraphs.
( should
( equal " > a b "
( org-test-with-temp-text " > a \n > b "
( let ( ( fill-column 5 )
( adaptive-fill-regexp " [ \t ]*>+[ \t ]* " ) )
2017-05-22 09:01:25 -04:00
( org-fill-element )
2013-07-28 04:14:35 -04:00
( buffer-string ) ) ) ) )
2012-07-31 14:49:11 -04:00
;; Special case: Fill first paragraph when point is at an item or
;; a plain-list or a footnote reference.
( should
( equal " - A B "
( org-test-with-temp-text " - A \n B "
( let ( ( fill-column 20 ) )
2017-05-22 09:01:25 -04:00
( org-fill-element )
2012-07-31 14:49:11 -04:00
( buffer-string ) ) ) ) )
( should
( equal " [fn:1] A B "
( org-test-with-temp-text " [fn:1] A \n B "
( let ( ( fill-column 20 ) )
2017-05-22 09:01:25 -04:00
( org-fill-element )
2012-07-31 14:49:11 -04:00
( buffer-string ) ) ) ) )
2012-07-28 04:24:08 -04:00
( org-test-with-temp-text " #+BEGIN_VERSE \n Some \\ \\ \n long \n text \n #+END_VERSE "
( let ( ( fill-column 20 ) )
2017-05-22 09:01:25 -04:00
( org-fill-element )
2012-07-28 04:24:08 -04:00
( should ( equal ( buffer-string )
" #+BEGIN_VERSE \n Some \\ \\ \n long \n text \n #+END_VERSE " ) ) ) )
;; Fill contents of `comment-block' elements.
( should
( equal
( org-test-with-temp-text " #+BEGIN_COMMENT \n Some \n text \n #+END_COMMENT "
( let ( ( fill-column 20 ) )
( forward-line )
2017-05-22 09:01:25 -04:00
( org-fill-element )
2012-07-28 04:24:08 -04:00
( buffer-string ) ) )
" #+BEGIN_COMMENT \n Some text \n #+END_COMMENT " ) )
2012-07-31 19:27:27 -04:00
;; Fill `comment' elements.
2012-07-30 09:23:22 -04:00
( should
2012-07-31 19:27:27 -04:00
( equal " # A B "
( org-test-with-temp-text " # A \n # B "
2012-07-30 09:23:22 -04:00
( let ( ( fill-column 20 ) )
2017-05-22 09:01:25 -04:00
( org-fill-element )
2012-07-30 09:23:22 -04:00
( buffer-string ) ) ) ) )
2013-07-09 07:49:17 -04:00
;; Do not mix consecutive comments when filling one of them.
( should
( equal " # A B \n \n # C "
( org-test-with-temp-text " # A \n # B \n \n # C "
( let ( ( fill-column 20 ) )
2017-05-22 09:01:25 -04:00
( org-fill-element )
2013-07-09 07:49:17 -04:00
( buffer-string ) ) ) ) )
2013-07-10 08:00:30 -04:00
;; Use commented empty lines as separators when filling comments.
( should
( equal " # A B \n # \n # C "
( org-test-with-temp-text " # A \n # B \n # \n # C "
( let ( ( fill-column 20 ) )
2017-05-22 09:01:25 -04:00
( org-fill-element )
2013-07-10 08:00:30 -04:00
( buffer-string ) ) ) ) )
2013-07-28 04:14:35 -04:00
;; Handle `adaptive-fill-regexp' in comments.
( should
( equal " # > a b "
( org-test-with-temp-text " # > a \n # > b "
( let ( ( fill-column 20 )
( adaptive-fill-regexp " [ \t ]*>+[ \t ]* " ) )
2017-05-22 09:01:25 -04:00
( org-fill-element )
2013-07-28 04:14:35 -04:00
( buffer-string ) ) ) ) )
2012-07-28 04:24:08 -04:00
;; Do nothing at affiliated keywords.
2017-05-22 09:36:28 -04:00
( should
( equal " #+NAME: para \n Some \n text. "
( org-test-with-temp-text " #+NAME: para \n Some \n text. "
( let ( ( fill-column 20 ) )
( org-fill-element )
( buffer-string ) ) ) ) )
2013-02-25 04:06:58 -05:00
;; Do not move point after table when filling a table.
( should-not
( org-test-with-temp-text " | a | b | \n | c | d | \n "
( forward-char )
2017-05-22 09:01:25 -04:00
( org-fill-element )
2017-05-22 09:36:28 -04:00
( eobp ) ) )
;; Do not fill "n" macro, with or without arguments, followed by
;; a dot or a closing parenthesis since it could be confused with
;; a numbered bullet.
( should-not
( equal " 123456789 \n {{{n}}}. "
( org-test-with-temp-text " 123456789 {{{n}}}. "
( let ( ( fill-column 10 ) )
( org-fill-element )
( buffer-string ) ) ) ) )
( should-not
( equal " 123456789 \n {{{n}}} \) "
( org-test-with-temp-text " 123456789 {{{n}}} \) "
( let ( ( fill-column 10 ) )
( org-fill-element )
( buffer-string ) ) ) ) )
( should-not
( equal " 123456789 \n {{{n()}}}. "
( org-test-with-temp-text " 123456789 {{{n()}}}. "
( let ( ( fill-column 10 ) )
( org-fill-element )
( buffer-string ) ) ) ) )
( should-not
( equal " 123456789 \n {{{n(counter)}}}. "
( org-test-with-temp-text " 123456789 {{{n(counter)}}}. "
( let ( ( fill-column 10 ) )
( org-fill-element )
( buffer-string ) ) ) ) ) )
2012-07-28 04:24:08 -04:00
2020-07-07 04:37:35 -04:00
( ert-deftest test-org/fill-paragraph ( )
" Test `org-fill-paragraph' specifications. "
;; Regular test.
( should
( equal " 012345678 \n 9 "
( org-test-with-temp-text " 012345678 9 "
( let ( ( fill-column 10 ) )
( org-fill-paragraph )
( buffer-string ) ) ) ) )
;; Fill paragraph even at end of buffer.
( should
( equal " 012345678 \n 9 \n "
( org-test-with-temp-text " 012345678 9 \n <point> "
( let ( ( fill-column 10 ) )
( org-fill-paragraph )
( buffer-string ) ) ) ) )
;; Between two paragraphs, fill the next one.
( should
( equal " 012345678 9 \n \n 012345678 \n 9 "
( org-test-with-temp-text " 012345678 9 \n <point> \n 012345678 9 "
( let ( ( fill-column 10 ) )
( org-fill-paragraph )
( buffer-string ) ) ) ) )
( should
( equal " 012345678 \n 9 \n \n 012345678 9 "
( org-test-with-temp-text " 012345678 9<point> \n \n 012345678 9 "
( let ( ( fill-column 10 ) )
( org-fill-paragraph )
( buffer-string ) ) ) ) )
;; Fill paragraph in a comment block.
( should
( equal " #+begin_comment \n 012345678 \n 9 \n #+end_comment "
( org-test-with-temp-text
" #+begin_comment \n <point>012345678 9 \n #+end_comment "
( let ( ( fill-column 10 ) )
( org-fill-paragraph )
( buffer-string ) ) ) ) )
;; When a region is selected, fill every paragraph in the region.
( should
( equal " 012345678 \n 9 \n \n 012345678 \n 9 "
( org-test-with-temp-text " 012345678 9 \n \n 012345678 9 "
( let ( ( fill-column 10 ) )
( transient-mark-mode 1 )
( push-mark ( point-min ) t t )
( goto-char ( point-max ) )
( call-interactively #' org-fill-paragraph )
( buffer-string ) ) ) ) )
( should
( equal " 012345678 \n 9 \n \n 012345678 9 "
( org-test-with-temp-text " 012345678 9 \n <point> \n 012345678 9 "
( let ( ( fill-column 10 ) )
( transient-mark-mode 1 )
( push-mark ( point ) t t )
( goto-char ( point-min ) )
( call-interactively #' org-fill-paragraph )
2020-07-14 05:46:38 -04:00
( buffer-string ) ) ) ) )
( should
( equal " 012345678 9 \n \n 012345678 \n 9 "
( org-test-with-temp-text " 012345678 9 \n <point> \n 012345678 9 "
( let ( ( fill-column 10 ) )
( transient-mark-mode 1 )
( push-mark ( point ) t t )
( goto-char ( point-max ) )
( call-interactively #' org-fill-paragraph )
2021-11-06 17:41:20 -04:00
( buffer-string ) ) ) ) )
;; Fill every list item in a region
( should
( equal " \n - 2345678 \n 9 \n - 2345678 \n 9 "
( org-test-with-temp-text " \n - 2345678 9 \n - 2345678 9 "
( let ( ( fill-column 10 ) )
( transient-mark-mode 1 )
( push-mark ( point-min ) t t )
( goto-char ( point-max ) )
( call-interactively #' org-fill-paragraph )
( buffer-string ) ) ) ) )
( should
( equal " \n - 2345678 \n 9 \n - 2345678 "
( org-test-with-temp-text " \n - 2345678 9 \n - 2345678 "
( let ( ( fill-column 10 ) )
( transient-mark-mode 1 )
( push-mark ( point-min ) t t )
( goto-char ( point-max ) )
( call-interactively #' org-fill-paragraph )
2020-07-07 04:37:35 -04:00
( buffer-string ) ) ) ) ) )
2021-11-06 17:41:20 -04:00
( ert-deftest test-org/fill-region ( )
" Test `fill-region' behaviour. "
;; fill-region should fill every item of a list
( should
( equal " \n - 2345678 \n 9 \n - 2345678 \n 9 "
( org-test-with-temp-text " \n - 2345678 9 \n - 2345678 9 "
( let ( ( fill-column 10 ) )
( transient-mark-mode 1 )
( push-mark ( point-min ) t t )
( goto-char ( point-max ) )
( call-interactively #' fill-region )
( buffer-string ) ) ) ) )
( should
( equal " \n - 1 2 \n - 1 2 "
( org-test-with-temp-text " \n - 1 \n 2 \n - 1 \n 2 "
( let ( ( fill-column 10 ) )
( transient-mark-mode 1 )
( push-mark ( point-min ) t t )
( goto-char ( point-max ) )
( call-interactively #' fill-region )
( buffer-string ) ) ) ) ) )
2012-07-30 09:23:22 -04:00
( ert-deftest test-org/auto-fill-function ( )
" Test auto-filling features. "
;; Auto fill paragraph.
( should
( equal " 12345 \n 7890 "
( org-test-with-temp-text " 12345 7890 "
( let ( ( fill-column 5 ) )
( end-of-line )
( org-auto-fill-function )
( buffer-string ) ) ) ) )
;; Auto fill first paragraph in an item.
( should
( equal " - 12345 \n 7890 "
( org-test-with-temp-text " - 12345 7890 "
( let ( ( fill-column 7 ) )
( end-of-line )
( org-auto-fill-function )
( buffer-string ) ) ) ) )
2013-07-28 04:14:35 -04:00
;; Auto fill paragraph when `adaptive-fill-regexp' matches.
( should
2013-08-22 15:45:28 -04:00
( equal " > 12345 \n 7890 "
2013-07-28 04:14:35 -04:00
( org-test-with-temp-text " > 12345 7890 "
2013-08-22 15:45:28 -04:00
( let ( ( fill-column 10 )
( adaptive-fill-regexp " [ \t ]*>+[ \t ]* " )
( adaptive-fill-first-line-regexp " \\ ` [ ]* \\ ' " ) )
2013-07-28 04:14:35 -04:00
( end-of-line )
( org-auto-fill-function )
( buffer-string ) ) ) ) )
2013-08-22 15:45:28 -04:00
( should
( equal " > 12345 \n > 12345 \n > 7890 "
( org-test-with-temp-text " > 12345 \n > 12345 7890 "
( let ( ( fill-column 10 )
( adaptive-fill-regexp " [ \t ]*>+[ \t ]* " ) )
( goto-char ( point-max ) )
( org-auto-fill-function )
( buffer-string ) ) ) ) )
( should-not
( equal " 12345 \n *12345 \n *12345 "
( org-test-with-temp-text " 12345 \n *12345 12345 "
( let ( ( fill-column 10 )
( adaptive-fill-regexp " [ \t ]*>+[ \t ]* " ) )
( goto-char ( point-max ) )
2013-07-28 04:14:35 -04:00
( org-auto-fill-function )
( buffer-string ) ) ) ) )
2012-07-31 19:27:27 -04:00
;; Auto fill comments.
2012-07-30 09:23:22 -04:00
( should
2012-07-31 19:27:27 -04:00
( equal " # 12345 \n # 7890 "
( org-test-with-temp-text " # 12345 7890 "
2012-07-30 09:23:22 -04:00
( let ( ( fill-column 10 ) )
( end-of-line )
( org-auto-fill-function )
( buffer-string ) ) ) ) )
2012-10-20 05:58:16 -04:00
;; A hash within a line isn't a comment.
( should-not
( equal " 12345 # 7890 \n # 1 "
( org-test-with-temp-text " 12345 # 7890 1 "
( let ( ( fill-column 12 ) )
( end-of-line )
( org-auto-fill-function )
( buffer-string ) ) ) ) )
;; Correctly interpret empty prefix.
( should-not
( equal " # a \n # b \n Regular \n # paragraph "
( org-test-with-temp-text " # a \n # b \n Regular paragraph "
( let ( ( fill-column 12 ) )
( end-of-line 3 )
( org-auto-fill-function )
( buffer-string ) ) ) ) )
2012-08-24 06:55:25 -04:00
;; Comment block: auto fill contents.
2012-07-30 09:23:22 -04:00
( should
2012-08-24 06:55:25 -04:00
( equal " #+BEGIN_COMMENT \n 12345 \n 7890 \n #+END_COMMENT "
( org-test-with-temp-text " #+BEGIN_COMMENT \n 12345 7890 \n #+END_COMMENT "
2012-07-30 09:23:22 -04:00
( let ( ( fill-column 5 ) )
( forward-line )
( end-of-line )
( org-auto-fill-function )
( buffer-string ) ) ) ) )
( should
( equal " #+BEGIN_COMMENT \n 12345 \n 7890 \n #+END_COMMENT "
( org-test-with-temp-text " #+BEGIN_COMMENT \n 12345 7890 \n #+END_COMMENT "
( let ( ( fill-column 5 ) )
( forward-line )
( end-of-line )
( org-auto-fill-function )
( buffer-string ) ) ) ) )
;; Do not fill if a new item could be created.
( should-not
( equal " 12345 \n - 90 "
( org-test-with-temp-text " 12345 - 90 "
( let ( ( fill-column 5 ) )
( end-of-line )
( org-auto-fill-function )
( buffer-string ) ) ) ) )
;; Do not fill if a line break could be introduced.
( should-not
( equal " 123 \\ \\ \n 7890 "
( org-test-with-temp-text " 123 \\ \\ 7890 "
( let ( ( fill-column 6 ) )
( end-of-line )
( org-auto-fill-function )
( buffer-string ) ) ) ) )
;; Do not fill affiliated keywords.
( should-not
( equal " #+ATTR_LATEX: ABC \n DEFGHIJKL "
( org-test-with-temp-text " #+ATTR_LATEX: ABC DEFGHIJKL "
( let ( ( fill-column 20 ) )
( end-of-line )
( org-auto-fill-function )
( buffer-string ) ) ) ) ) )
2012-07-28 04:24:08 -04:00
2013-12-24 08:04:17 -05:00
;;; Indentation
( ert-deftest test-org/indent-line ( )
" Test `org-indent-line' specifications. "
2015-04-02 04:29:36 -04:00
;; Do not indent diary sexps, footnote definitions or headlines.
2013-12-24 08:04:17 -05:00
( should
( zerop
2015-04-02 04:29:36 -04:00
( org-test-with-temp-text " %%(org-calendar-holiday) "
2013-12-24 08:04:17 -05:00
( org-indent-line )
( org-get-indentation ) ) ) )
( should
( zerop
( org-test-with-temp-text " [fn:1] fn "
( let ( ( org-adapt-indentation t ) ) ( org-indent-line ) )
( org-get-indentation ) ) ) )
2015-04-02 04:29:36 -04:00
( should
( zerop
( org-test-with-temp-text " * H "
( org-indent-line )
( org-get-indentation ) ) ) )
2013-12-24 08:04:17 -05:00
;; Do not indent before first headline.
( should
( zerop
( org-test-with-temp-text " "
( org-indent-line )
( org-get-indentation ) ) ) )
;; Indent according to headline level otherwise, unless
;; `org-adapt-indentation' is nil.
( should
( = 2
2017-02-03 15:59:08 -05:00
( org-test-with-temp-text " * H \n <point>A "
2013-12-24 08:04:17 -05:00
( let ( ( org-adapt-indentation t ) ) ( org-indent-line ) )
( org-get-indentation ) ) ) )
( should
( = 2
2017-02-03 15:59:08 -05:00
( org-test-with-temp-text " * H \n <point> \n A "
2013-12-24 08:04:17 -05:00
( let ( ( org-adapt-indentation t ) ) ( org-indent-line ) )
( org-get-indentation ) ) ) )
( should
( zerop
2017-02-03 15:59:08 -05:00
( org-test-with-temp-text " * H \n <point>A "
2013-12-24 08:04:17 -05:00
( let ( ( org-adapt-indentation nil ) ) ( org-indent-line ) )
( org-get-indentation ) ) ) )
;; Indenting preserves point position.
( should
2017-02-03 15:59:08 -05:00
( org-test-with-temp-text " * H \n A<point>B "
2013-12-24 08:04:17 -05:00
( let ( ( org-adapt-indentation t ) ) ( org-indent-line ) )
( looking-at " B " ) ) )
2017-02-03 15:59:08 -05:00
;; Do not change indentation at an item or a LaTeX environment.
2013-12-24 08:04:17 -05:00
( should
( = 1
2017-02-03 15:59:08 -05:00
( org-test-with-temp-text " * H \n <point> - A "
2013-12-24 08:04:17 -05:00
( let ( ( org-adapt-indentation t ) ) ( org-indent-line ) )
( org-get-indentation ) ) ) )
2017-02-03 15:59:08 -05:00
( should
( = 1
( org-test-with-temp-text
" \\ begin{equation} \n <point>1+1=2 \n \\ end{equation} "
( org-indent-line )
( org-get-indentation ) ) ) )
2013-12-24 08:04:17 -05:00
;; On blank lines at the end of a list, indent like last element
2015-05-08 04:08:11 -04:00
;; within it if the line is still in the list. If the last element
;; is an item, indent like its contents. Otherwise, indent like the
;; whole list.
2013-12-24 08:04:17 -05:00
( should
( = 4
2016-02-24 14:58:55 -05:00
( org-test-with-temp-text " * H \n - A \n - AA \n <point> "
2013-12-24 08:04:17 -05:00
( let ( ( org-adapt-indentation t ) ) ( org-indent-line ) )
( org-get-indentation ) ) ) )
2016-03-30 09:34:24 -04:00
( should
( = 4
( org-test-with-temp-text " * H \n - A \n - \n \n <point> "
( let ( ( org-adapt-indentation t ) ) ( org-indent-line ) )
2013-12-24 08:04:17 -05:00
( org-get-indentation ) ) ) )
( should
( zerop
2016-02-24 14:58:55 -05:00
( org-test-with-temp-text " * H \n - A \n - AA \n \n \n \n <point> "
2013-12-24 08:04:17 -05:00
( let ( ( org-adapt-indentation t ) ) ( org-indent-line ) )
( org-get-indentation ) ) ) )
2015-05-08 04:08:11 -04:00
( should
( = 4
2016-02-24 14:58:55 -05:00
( org-test-with-temp-text " * H \n - A \n - \n <point> "
( let ( ( org-adapt-indentation t ) ) ( org-indent-line ) )
( org-get-indentation ) ) ) )
( should
( = 4
( org-test-with-temp-text
" * H \n - \n #+BEGIN_SRC emacs-lisp \n t \n #+END_SRC \n <point> "
2015-05-08 04:08:11 -04:00
( let ( ( org-adapt-indentation t ) ) ( org-indent-line ) )
( org-get-indentation ) ) ) )
2016-03-17 11:50:54 -04:00
( should
( = 2
( org-test-with-temp-text " - A \n B \n \n <point> "
( let ( ( org-adapt-indentation nil ) ) ( org-indent-line ) )
( org-get-indentation ) ) ) )
2017-04-30 16:26:10 -04:00
( should
( = 2
( org-test-with-temp-text
" - A \n \b egin{cases} 1 + 1 \n \e nd{cases} \n \n <point> "
( let ( ( org-adapt-indentation nil ) ) ( org-indent-line ) )
( org-get-indentation ) ) ) )
2013-12-24 08:04:17 -05:00
;; Likewise, on a blank line at the end of a footnote definition,
;; indent at column 0 if line belongs to the definition. Otherwise,
;; indent like the definition itself.
( should
( zerop
2017-04-30 16:26:10 -04:00
( org-test-with-temp-text " * H \n [fn:1] Definition \n <point> "
2013-12-24 08:04:17 -05:00
( let ( ( org-adapt-indentation t ) ) ( org-indent-line ) )
( org-get-indentation ) ) ) )
( should
( zerop
2017-04-30 16:26:10 -04:00
( org-test-with-temp-text " * H \n [fn:1] Definition \n \n \n \n <point> "
2013-12-24 08:04:17 -05:00
( let ( ( org-adapt-indentation t ) ) ( org-indent-line ) )
( org-get-indentation ) ) ) )
;; After the end of the contents of a greater element, indent like
;; the beginning of the element.
( should
( = 1
2017-04-30 16:26:10 -04:00
( org-test-with-temp-text
" #+BEGIN_CENTER \n Contents \n <point>#+END_CENTER "
2013-12-24 08:04:17 -05:00
( org-indent-line )
( org-get-indentation ) ) ) )
2014-11-16 11:39:04 -05:00
;; On blank lines after a paragraph, indent like its last non-empty
;; line.
( should
( = 1
( org-test-with-temp-text " Paragraph \n \n <point> "
( org-indent-line )
( org-get-indentation ) ) ) )
2013-12-24 08:04:17 -05:00
;; At the first line of an element, indent like previous element's
;; first line, ignoring footnotes definitions and inline tasks, or
;; according to parent.
2021-05-09 12:20:11 -04:00
( let ( ( org-adapt-indentation t ) )
( should
( = 2
( org-test-with-temp-text " A \n \n B \n \n C<point> "
( org-indent-line )
( org-get-indentation ) ) ) )
( should
( = 1
( org-test-with-temp-text " A \n \n [fn:1] B \n \n \n C<point> "
( org-indent-line )
( org-get-indentation ) ) ) )
( should
( = 1
( org-test-with-temp-text
" #+BEGIN_CENTER \n <point> Contents \n #+END_CENTER "
( org-indent-line )
( org-get-indentation ) ) ) ) )
2013-12-24 08:04:17 -05:00
;; Within code part of a source block, use language major mode if
2014-05-19 07:33:28 -04:00
;; `org-src-tab-acts-natively' is non-nil. Otherwise, indent
;; according to line above.
2013-12-24 08:04:17 -05:00
( should
( = 6
2017-04-30 16:26:10 -04:00
( org-test-with-temp-text
" #+BEGIN_SRC emacs-lisp \n (and A \n <point>B) \n #+END_SRC "
2013-12-24 08:04:17 -05:00
( let ( ( org-src-tab-acts-natively t )
( org-edit-src-content-indentation 0 ) )
( org-indent-line ) )
( org-get-indentation ) ) ) )
( should
2014-05-19 07:33:28 -04:00
( = 1
2017-04-30 16:26:10 -04:00
( org-test-with-temp-text
" #+BEGIN_SRC emacs-lisp \n (and A \n <point>B) \n #+END_SRC "
2014-05-19 07:33:28 -04:00
( let ( ( org-src-tab-acts-natively nil )
( org-edit-src-content-indentation 0 ) )
( org-indent-line ) )
( org-get-indentation ) ) ) )
2013-12-24 08:04:17 -05:00
;; Otherwise, indent like the first non-blank line above.
( should
( zerop
2017-04-30 16:26:10 -04:00
( org-test-with-temp-text
" #+BEGIN_CENTER \n line1 \n \n <point> line2 \n #+END_CENTER "
2013-12-24 08:04:17 -05:00
( org-indent-line )
( org-get-indentation ) ) ) )
;; Align node properties according to `org-property-format'. Handle
;; nicely empty values.
( should
2014-09-13 16:43:45 -04:00
( equal " * H \n :PROPERTIES: \n :key: value \n :END: "
2017-04-30 16:26:10 -04:00
( org-test-with-temp-text
" * H \n :PROPERTIES: \n <point>:key: value \n :END: "
2014-09-13 16:43:45 -04:00
( let ( ( org-property-format " %-10s %s " ) ) ( org-indent-line ) )
( buffer-string ) ) ) )
2013-12-24 08:04:17 -05:00
( should
2014-09-13 16:43:45 -04:00
( equal " * H \n :PROPERTIES: \n :key: \n :END: "
( org-test-with-temp-text " * H \n :PROPERTIES: \n <point>:key: \n :END: "
( let ( ( org-property-format " %-10s %s " ) ) ( org-indent-line ) )
( buffer-string ) ) ) ) )
2013-12-24 08:04:17 -05:00
2014-04-27 10:48:02 -04:00
( ert-deftest test-org/indent-region ( )
" Test `org-indent-region' specifications. "
;; Indent paragraph.
2021-05-09 12:20:11 -04:00
( let ( ( org-adapt-indentation t ) )
( should
( equal " A \n B \n C "
( org-test-with-temp-text " A \n B \n C "
( org-indent-region ( point-min ) ( point-max ) )
( buffer-string ) ) ) ) )
2014-04-27 10:48:02 -04:00
;; Indent greater elements along with their contents.
( should
( equal " #+BEGIN_CENTER \n A \n B \n #+END_CENTER "
( org-test-with-temp-text " #+BEGIN_CENTER \n A \n B \n #+END_CENTER "
( org-indent-region ( point-min ) ( point-max ) )
( buffer-string ) ) ) )
2017-02-03 15:59:08 -05:00
;; Ignore contents of verse blocks. Only indent block delimiters.
2014-04-27 10:48:02 -04:00
( should
( equal " #+BEGIN_VERSE \n A \n B \n #+END_VERSE "
( org-test-with-temp-text " #+BEGIN_VERSE \n A \n B \n #+END_VERSE "
( org-indent-region ( point-min ) ( point-max ) )
( buffer-string ) ) ) )
2021-05-09 12:20:11 -04:00
( let ( ( org-adapt-indentation t ) )
( should
( equal " #+BEGIN_VERSE \n A \n B \n #+END_VERSE "
( org-test-with-temp-text " #+BEGIN_VERSE \n A \n B \n #+END_VERSE "
( org-indent-region ( point-min ) ( point-max ) )
( buffer-string ) ) ) ) )
2017-02-03 15:59:08 -05:00
;; Indent example blocks as a single block, unless indentation
;; should be preserved. In this case only indent the block markers.
2014-04-27 10:48:02 -04:00
( should
( equal " #+BEGIN_EXAMPLE \n A \n B \n #+END_EXAMPLE "
( org-test-with-temp-text " #+BEGIN_EXAMPLE \n A \n B \n #+END_EXAMPLE "
( org-indent-region ( point-min ) ( point-max ) )
( buffer-string ) ) ) )
2021-05-09 12:20:11 -04:00
( let ( ( org-adapt-indentation t ) )
( should
( equal " #+BEGIN_EXAMPLE \n A \n B \n #+END_EXAMPLE "
( org-test-with-temp-text " #+BEGIN_EXAMPLE \n A \n B \n #+END_EXAMPLE "
( org-indent-region ( point-min ) ( point-max ) )
( buffer-string ) ) ) )
( should
( equal " #+BEGIN_EXAMPLE -i \n A \n B \n #+END_EXAMPLE "
( org-test-with-temp-text
" #+BEGIN_EXAMPLE -i \n A \n B \n #+END_EXAMPLE "
( org-indent-region ( point-min ) ( point-max ) )
( buffer-string ) ) ) )
( should
( equal " #+BEGIN_EXAMPLE \n A \n B \n #+END_EXAMPLE "
( org-test-with-temp-text
" #+BEGIN_EXAMPLE \n A \n B \n #+END_EXAMPLE "
( let ( ( org-src-preserve-indentation t ) )
( org-indent-region ( point-min ) ( point-max ) ) )
( buffer-string ) ) ) ) )
2017-02-03 15:59:08 -05:00
;; Treat export blocks as a whole.
( should
( equal " #+BEGIN_EXPORT latex \n A \n B \n #+END_EXPORT "
( org-test-with-temp-text " #+BEGIN_EXPORT latex \n A \n B \n #+END_EXPORT "
( org-indent-region ( point-min ) ( point-max ) )
( buffer-string ) ) ) )
2021-05-09 12:20:11 -04:00
( let ( ( org-adapt-indentation t ) )
( should
( equal " #+BEGIN_EXPORT latex \n A \n B \n #+END_EXPORT "
( org-test-with-temp-text
" #+BEGIN_EXPORT latex \n A \n B \n #+END_EXPORT "
( org-indent-region ( point-min ) ( point-max ) )
( buffer-string ) ) ) ) )
2014-04-27 10:48:02 -04:00
;; Indent according to mode if `org-src-tab-acts-natively' is
;; non-nil. Otherwise, do not indent code at all.
( should
( equal " #+BEGIN_SRC emacs-lisp \n (and A \n B) \n #+END_SRC "
( org-test-with-temp-text
" #+BEGIN_SRC emacs-lisp \n (and A \n B) \n #+END_SRC "
( let ( ( org-src-tab-acts-natively t )
( org-edit-src-content-indentation 0 ) )
( org-indent-region ( point-min ) ( point-max ) ) )
( buffer-string ) ) ) )
( should
( equal " #+BEGIN_SRC emacs-lisp \n (and A \n B) \n #+END_SRC "
( org-test-with-temp-text
" #+BEGIN_SRC emacs-lisp \n (and A \n B) \n #+END_SRC "
( let ( ( org-src-tab-acts-natively nil )
( org-edit-src-content-indentation 0 ) )
( org-indent-region ( point-min ) ( point-max ) ) )
( buffer-string ) ) ) )
;; Align node properties according to `org-property-format'. Handle
;; nicely empty values.
( should
2014-09-13 16:43:45 -04:00
( equal " * H \n :PROPERTIES: \n :key: value \n :END: "
( org-test-with-temp-text " * H \n <point>:PROPERTIES: \n :key: value \n :END: "
( let ( ( org-property-format " %-10s %s " )
( org-adapt-indentation nil ) )
( org-indent-region ( point ) ( point-max ) ) )
2014-04-27 10:48:02 -04:00
( buffer-string ) ) ) )
( should
2014-09-13 16:43:45 -04:00
( equal " * H \n :PROPERTIES: \n :key: \n :END: "
( org-test-with-temp-text " * H \n <point>:PROPERTIES: \n :key: \n :END: "
( let ( ( org-property-format " %-10s %s " )
( org-adapt-indentation nil ) )
( org-indent-region ( point ) ( point-max ) ) )
2014-04-27 10:48:02 -04:00
( buffer-string ) ) ) )
2021-10-24 07:25:24 -04:00
;; Indent property drawers according to `org-adapt-indentation'.
( let ( ( org-adapt-indentation 'headline-data ) )
( should
( equal " * H \n :PROPERTIES: \n :key: \n :END: "
( org-test-with-temp-text " * H \n :PROPERTIES: \n :key: \n :END: "
( org-indent-region ( point-min ) ( point-max ) )
( buffer-string ) ) ) ) )
2022-09-24 02:07:31 -04:00
;; Indent planning according to `org-adapt-indentation'.
( let ( ( org-adapt-indentation 'headline-data ) )
( should
( equal " * H \n SCHEDULED: <2022-11-03> "
( org-test-with-temp-text " * H \n SCHEDULED: <2022-11-03> "
( org-indent-region ( point-min ) ( point-max ) )
( buffer-string ) ) ) ) )
;; Indent LOGBOOK according to `org-adapt-indentation'.
( let ( ( org-adapt-indentation 'headline-data ) )
( should
( equal " * H \n :LOGBOOK:
CLOCK: [ 2022-09-17 sam. 11:00 ] -- [ 2022-09-17 sam. 11:46 ] => 0:46
:END: "
( org-test-with-temp-text " * H \n :LOGBOOK:
CLOCK: [ 2022-09-17 sam. 11:00 ] -- [ 2022-09-17 sam. 11:46 ] => 0:46
:END: "
( org-indent-region ( point-min ) ( point-max ) )
( buffer-string ) ) ) ) )
;; Indent clock lines according to `org-adapt-indentation'.
( let ( ( org-adapt-indentation 'headline-data ) )
( should
( equal " * H
CLOCK: [ 2022-09-17 sam. 11:00 ] -- [ 2022-09-17 sam. 11:46 ] => 0:46 "
( org-test-with-temp-text " * H
CLOCK: [ 2022-09-17 sam. 11:00 ] -- [ 2022-09-17 sam. 11:46 ] => 0:46 "
( org-indent-region ( point-min ) ( point-max ) )
( buffer-string ) ) ) ) )
;; Do not indent beyond headline data.
( let ( ( org-adapt-indentation 'headline-data ) )
( should
( equal " * H \n SCHEDULED: <2022-11-03> \n Paragraph "
( org-test-with-temp-text " * H \n SCHEDULED: <2022-11-03> \n Paragraph "
( org-indent-region ( point-min ) ( point-max ) )
( buffer-string ) ) ) ) )
( let ( ( org-adapt-indentation 'headline-data )
( org-log-into-drawer t ) )
( should
( equal " * TODO A task
:PROPERTIES:
:CAPTURED: [ 2022-09-11 dim. 21:25 ]
:END:
:LOGBOOK:
CLOCK: [ 2022-09-17 sam. 11:00 ] -- [ 2022-09-17 sam. 11:46 ] => 0:46
:END:
Paragraph "
( org-test-with-temp-text " * TODO A task
:PROPERTIES:
:CAPTURED: [ 2022-09-11 dim. 21:25 ]
:END:
:LOGBOOK:
CLOCK: [ 2022-09-17 sam. 11:00 ] -- [ 2022-09-17 sam. 11:46 ] => 0:46
:END:
Paragraph "
( org-indent-region ( point-min ) ( point-max ) )
( buffer-string ) ) ) ) )
( let ( ( org-adapt-indentation 'headline-data ) )
( should
( equal " * TODO A task
CLOCK: [ 2022-09-17 sam. 11:00 ] -- [ 2022-09-17 sam. 11:46 ] => 0:46
Paragraph
CLOCK: [ 2022-09-17 sam. 11:00 ] -- [ 2022-09-17 sam. 11:46 ] => 0:46 "
( org-test-with-temp-text " * TODO A task
CLOCK: [ 2022-09-17 sam. 11:00 ] -- [ 2022-09-17 sam. 11:46 ] => 0:46
Paragraph
CLOCK: [ 2022-09-17 sam. 11:00 ] -- [ 2022-09-17 sam. 11:46 ] => 0:46 "
( org-indent-region ( point-min ) ( point-max ) )
( buffer-string ) ) ) ) )
2014-10-13 13:03:14 -04:00
;; Indent plain lists.
2021-05-09 12:20:11 -04:00
( let ( ( org-adapt-indentation t ) )
( should
( equal " - A \n B \n - C \n \n D "
( org-test-with-temp-text " - A \n B \n - C \n \n D "
( org-indent-region ( point-min ) ( point-max ) )
( buffer-string ) ) ) )
( should
( equal " - A \n \n - B "
( org-test-with-temp-text " - A \n \n - B "
( org-indent-region ( point-min ) ( point-max ) )
( buffer-string ) ) ) ) )
2014-10-13 13:03:14 -04:00
;; Indent footnote definitions.
2014-04-27 10:48:02 -04:00
( should
( equal " [fn:1] Definition \n \n Definition "
( org-test-with-temp-text " [fn:1] Definition \n \n Definition "
2014-10-13 13:03:14 -04:00
( org-indent-region ( point-min ) ( point-max ) )
( buffer-string ) ) ) )
;; Special case: Start indenting on a blank line.
( should
( equal " \n Paragraph "
( org-test-with-temp-text " \n Paragraph "
2014-04-27 10:48:02 -04:00
( org-indent-region ( point-min ) ( point-max ) )
( buffer-string ) ) ) ) )
2022-09-29 01:02:46 -04:00
( ert-deftest test-org/default-indent-new-line ( )
" Test behavior of default binding `M-j' . "
;; Calling `M-j' when point is not in an Org comment:
( should
( equal " * Some heading \n "
( org-test-with-temp-text " * Some heading<point> "
( call-interactively #' default-indent-new-line )
( buffer-string ) ) ) )
;; Calling `M-j' when point is in an Org comment:
( should
( equal " # Some Org comment \n # "
( org-test-with-temp-text " # Some Org comment<point> "
( call-interactively #' default-indent-new-line )
( buffer-string ) ) ) )
( should
( equal " # Some Org \n # comment "
( org-test-with-temp-text " # Some Org <point>comment "
( call-interactively #' default-indent-new-line )
( buffer-string ) ) ) ) )
2014-04-27 10:48:02 -04:00
2013-09-12 16:48:16 -04:00
;;; Editing
2015-05-16 11:19:03 -04:00
( ert-deftest test-org/delete-indentation ( )
" Test `org-delete-indentation' specifications. "
;; Regular test.
( should ( equal " foo bar "
( org-test-with-temp-text
" foo \n bar<point> "
( org-delete-indentation )
( buffer-string ) ) ) )
;; With optional argument.
( should ( equal " foo bar "
( org-test-with-temp-text
" foo<point> \n bar "
( org-delete-indentation t )
( buffer-string ) ) ) )
;; At headline text should be appended to the headline text.
( should
( equal " * foo bar :tag: "
( let ( org-auto-align-tags )
( org-test-with-temp-text
" * foo :tag: \n bar<point> "
( org-delete-indentation )
( buffer-string ) ) ) ) )
( should
( equal " * foo bar :tag: "
( let ( org-auto-align-tags )
( org-test-with-temp-text
" * foo <point>:tag: \n bar "
( org-delete-indentation t )
( buffer-string ) ) ) ) ) )
2014-11-16 07:57:21 -05:00
( ert-deftest test-org/return ( )
2015-05-15 07:08:11 -04:00
" Test `org-return' specifications. "
2014-11-16 07:57:21 -05:00
;; Regular test.
( should
( equal " Para \n graph "
( org-test-with-temp-text " Para<point>graph "
( org-return )
( buffer-string ) ) ) )
;; With optional argument, indent line.
( should
( equal " Para \n graph "
( org-test-with-temp-text " Para<point>graph "
( org-return t )
( buffer-string ) ) ) )
;; On a table, call `org-table-next-row'.
( should
( org-test-with-temp-text " | <point>a | \n | b | "
( org-return )
Remove final parts of XEmacs compatibility code
* lisp/org-compat.el: Declare `org-add-hook', `org-decompose-region',
`org-detach-overlay', `org-file-equal-p', `org-float-time',
`org-indent-line-to', `org-indent-to-column', `org-looking-at-p',
`org-looking-back', `org-propertize', `org-re' and
`org-select-frame-set-input-focus' as obsolete.
(org-overlay-display, org-overlay-before-string, org-find-overlays):
Move to "org.el"
(org-xemacs-key-equivalents, org-xemacs-p): Remove variables.
(org-region-active-p): Drop XEmacs support.
(org-xemacs-without-invisibility): Remove macro.
(org-get-x-clipboard-compat): Remove function.
* lisp/org-macs.el (org-match-string-no-properties): Remove function.
* lisp/ob-core.el:
* lisp/org-agenda.el:
* lisp/org-archive.el:
* lisp/org-clock.el:
* lisp/org-colview.el:
* lisp/org-crypt.el:
* lisp/org-element.el:
* lisp/org-faces.el:
* lisp/org-feed.el:
* lisp/org-footnote.el:
* lisp/org-habit.el:
* lisp/org-id.el:
* lisp/org-indent.el:
* lisp/org-inlinetask.el:
* lisp/org-lint.el:
* lisp/org-list.el:
* lisp/org-mouse.el:
* lisp/org-pcomplete.el:
* lisp/org-src.el:
* lisp/org-table.el:
* lisp/org-timer.el:
* lisp/org.el:
* lisp/ox-ascii.el:
* lisp/ox-odt.el:
* lisp/ox.el:
* contrib/lisp/org-notify.el:
* contrib/lisp/ox-taskjuggler.el:
* contrib/lisp/org-wikinodes.el:
* testing/lisp/test-org-src.el:
* testing/lisp/test-org.el: Silence byte-compiler.
2016-05-26 06:18:00 -04:00
( looking-at-p " b " ) ) )
2014-11-16 07:57:21 -05:00
;; Open link or timestamp under point when `org-return-follows-link'
;; is non-nil.
( should
( org-test-with-temp-text " Link [[target<point>]] <<target>> "
2015-08-02 19:06:32 -04:00
( let ( ( org-return-follows-link t )
2015-10-18 03:36:15 -04:00
( org-link-search-must-match-exact-headline nil ) )
( org-return ) )
Remove final parts of XEmacs compatibility code
* lisp/org-compat.el: Declare `org-add-hook', `org-decompose-region',
`org-detach-overlay', `org-file-equal-p', `org-float-time',
`org-indent-line-to', `org-indent-to-column', `org-looking-at-p',
`org-looking-back', `org-propertize', `org-re' and
`org-select-frame-set-input-focus' as obsolete.
(org-overlay-display, org-overlay-before-string, org-find-overlays):
Move to "org.el"
(org-xemacs-key-equivalents, org-xemacs-p): Remove variables.
(org-region-active-p): Drop XEmacs support.
(org-xemacs-without-invisibility): Remove macro.
(org-get-x-clipboard-compat): Remove function.
* lisp/org-macs.el (org-match-string-no-properties): Remove function.
* lisp/ob-core.el:
* lisp/org-agenda.el:
* lisp/org-archive.el:
* lisp/org-clock.el:
* lisp/org-colview.el:
* lisp/org-crypt.el:
* lisp/org-element.el:
* lisp/org-faces.el:
* lisp/org-feed.el:
* lisp/org-footnote.el:
* lisp/org-habit.el:
* lisp/org-id.el:
* lisp/org-indent.el:
* lisp/org-inlinetask.el:
* lisp/org-lint.el:
* lisp/org-list.el:
* lisp/org-mouse.el:
* lisp/org-pcomplete.el:
* lisp/org-src.el:
* lisp/org-table.el:
* lisp/org-timer.el:
* lisp/org.el:
* lisp/ox-ascii.el:
* lisp/ox-odt.el:
* lisp/ox.el:
* contrib/lisp/org-notify.el:
* contrib/lisp/ox-taskjuggler.el:
* contrib/lisp/org-wikinodes.el:
* testing/lisp/test-org-src.el:
* testing/lisp/test-org.el: Silence byte-compiler.
2016-05-26 06:18:00 -04:00
( looking-at-p " <<target>> " ) ) )
2014-11-16 07:57:21 -05:00
( should-not
( org-test-with-temp-text " Link [[target<point>]] <<target>> "
( let ( ( org-return-follows-link nil ) ) ( org-return ) )
Remove final parts of XEmacs compatibility code
* lisp/org-compat.el: Declare `org-add-hook', `org-decompose-region',
`org-detach-overlay', `org-file-equal-p', `org-float-time',
`org-indent-line-to', `org-indent-to-column', `org-looking-at-p',
`org-looking-back', `org-propertize', `org-re' and
`org-select-frame-set-input-focus' as obsolete.
(org-overlay-display, org-overlay-before-string, org-find-overlays):
Move to "org.el"
(org-xemacs-key-equivalents, org-xemacs-p): Remove variables.
(org-region-active-p): Drop XEmacs support.
(org-xemacs-without-invisibility): Remove macro.
(org-get-x-clipboard-compat): Remove function.
* lisp/org-macs.el (org-match-string-no-properties): Remove function.
* lisp/ob-core.el:
* lisp/org-agenda.el:
* lisp/org-archive.el:
* lisp/org-clock.el:
* lisp/org-colview.el:
* lisp/org-crypt.el:
* lisp/org-element.el:
* lisp/org-faces.el:
* lisp/org-feed.el:
* lisp/org-footnote.el:
* lisp/org-habit.el:
* lisp/org-id.el:
* lisp/org-indent.el:
* lisp/org-inlinetask.el:
* lisp/org-lint.el:
* lisp/org-list.el:
* lisp/org-mouse.el:
* lisp/org-pcomplete.el:
* lisp/org-src.el:
* lisp/org-table.el:
* lisp/org-timer.el:
* lisp/org.el:
* lisp/ox-ascii.el:
* lisp/ox-odt.el:
* lisp/ox.el:
* contrib/lisp/org-notify.el:
* contrib/lisp/ox-taskjuggler.el:
* contrib/lisp/org-wikinodes.el:
* testing/lisp/test-org-src.el:
* testing/lisp/test-org.el: Silence byte-compiler.
2016-05-26 06:18:00 -04:00
( looking-at-p " <<target>> " ) ) )
2015-08-12 16:02:49 -04:00
( should
( org-test-with-temp-text " * [[b][a<point>]] \n * b "
( let ( ( org-return-follows-link t ) ) ( org-return ) )
Remove final parts of XEmacs compatibility code
* lisp/org-compat.el: Declare `org-add-hook', `org-decompose-region',
`org-detach-overlay', `org-file-equal-p', `org-float-time',
`org-indent-line-to', `org-indent-to-column', `org-looking-at-p',
`org-looking-back', `org-propertize', `org-re' and
`org-select-frame-set-input-focus' as obsolete.
(org-overlay-display, org-overlay-before-string, org-find-overlays):
Move to "org.el"
(org-xemacs-key-equivalents, org-xemacs-p): Remove variables.
(org-region-active-p): Drop XEmacs support.
(org-xemacs-without-invisibility): Remove macro.
(org-get-x-clipboard-compat): Remove function.
* lisp/org-macs.el (org-match-string-no-properties): Remove function.
* lisp/ob-core.el:
* lisp/org-agenda.el:
* lisp/org-archive.el:
* lisp/org-clock.el:
* lisp/org-colview.el:
* lisp/org-crypt.el:
* lisp/org-element.el:
* lisp/org-faces.el:
* lisp/org-feed.el:
* lisp/org-footnote.el:
* lisp/org-habit.el:
* lisp/org-id.el:
* lisp/org-indent.el:
* lisp/org-inlinetask.el:
* lisp/org-lint.el:
* lisp/org-list.el:
* lisp/org-mouse.el:
* lisp/org-pcomplete.el:
* lisp/org-src.el:
* lisp/org-table.el:
* lisp/org-timer.el:
* lisp/org.el:
* lisp/ox-ascii.el:
* lisp/ox-odt.el:
* lisp/ox.el:
* contrib/lisp/org-notify.el:
* contrib/lisp/ox-taskjuggler.el:
* contrib/lisp/org-wikinodes.el:
* testing/lisp/test-org-src.el:
* testing/lisp/test-org.el: Silence byte-compiler.
2016-05-26 06:18:00 -04:00
( looking-at-p " * b " ) ) )
2015-10-18 03:36:15 -04:00
( should
( org-test-with-temp-text " Link [[target][/descipt<point>ion/]] <<target>> "
( let ( ( org-return-follows-link t )
( org-link-search-must-match-exact-headline nil ) )
( org-return ) )
Remove final parts of XEmacs compatibility code
* lisp/org-compat.el: Declare `org-add-hook', `org-decompose-region',
`org-detach-overlay', `org-file-equal-p', `org-float-time',
`org-indent-line-to', `org-indent-to-column', `org-looking-at-p',
`org-looking-back', `org-propertize', `org-re' and
`org-select-frame-set-input-focus' as obsolete.
(org-overlay-display, org-overlay-before-string, org-find-overlays):
Move to "org.el"
(org-xemacs-key-equivalents, org-xemacs-p): Remove variables.
(org-region-active-p): Drop XEmacs support.
(org-xemacs-without-invisibility): Remove macro.
(org-get-x-clipboard-compat): Remove function.
* lisp/org-macs.el (org-match-string-no-properties): Remove function.
* lisp/ob-core.el:
* lisp/org-agenda.el:
* lisp/org-archive.el:
* lisp/org-clock.el:
* lisp/org-colview.el:
* lisp/org-crypt.el:
* lisp/org-element.el:
* lisp/org-faces.el:
* lisp/org-feed.el:
* lisp/org-footnote.el:
* lisp/org-habit.el:
* lisp/org-id.el:
* lisp/org-indent.el:
* lisp/org-inlinetask.el:
* lisp/org-lint.el:
* lisp/org-list.el:
* lisp/org-mouse.el:
* lisp/org-pcomplete.el:
* lisp/org-src.el:
* lisp/org-table.el:
* lisp/org-timer.el:
* lisp/org.el:
* lisp/ox-ascii.el:
* lisp/ox-odt.el:
* lisp/ox.el:
* contrib/lisp/org-notify.el:
* contrib/lisp/ox-taskjuggler.el:
* contrib/lisp/org-wikinodes.el:
* testing/lisp/test-org-src.el:
* testing/lisp/test-org.el: Silence byte-compiler.
2016-05-26 06:18:00 -04:00
( looking-at-p " <<target>> " ) ) )
2015-10-31 18:32:47 -04:00
( should-not
( org-test-with-temp-text " Link [[target]]<point> <<target>> "
( let ( ( org-return-follows-link t )
( org-link-search-must-match-exact-headline nil ) )
( org-return ) )
Remove final parts of XEmacs compatibility code
* lisp/org-compat.el: Declare `org-add-hook', `org-decompose-region',
`org-detach-overlay', `org-file-equal-p', `org-float-time',
`org-indent-line-to', `org-indent-to-column', `org-looking-at-p',
`org-looking-back', `org-propertize', `org-re' and
`org-select-frame-set-input-focus' as obsolete.
(org-overlay-display, org-overlay-before-string, org-find-overlays):
Move to "org.el"
(org-xemacs-key-equivalents, org-xemacs-p): Remove variables.
(org-region-active-p): Drop XEmacs support.
(org-xemacs-without-invisibility): Remove macro.
(org-get-x-clipboard-compat): Remove function.
* lisp/org-macs.el (org-match-string-no-properties): Remove function.
* lisp/ob-core.el:
* lisp/org-agenda.el:
* lisp/org-archive.el:
* lisp/org-clock.el:
* lisp/org-colview.el:
* lisp/org-crypt.el:
* lisp/org-element.el:
* lisp/org-faces.el:
* lisp/org-feed.el:
* lisp/org-footnote.el:
* lisp/org-habit.el:
* lisp/org-id.el:
* lisp/org-indent.el:
* lisp/org-inlinetask.el:
* lisp/org-lint.el:
* lisp/org-list.el:
* lisp/org-mouse.el:
* lisp/org-pcomplete.el:
* lisp/org-src.el:
* lisp/org-table.el:
* lisp/org-timer.el:
* lisp/org.el:
* lisp/ox-ascii.el:
* lisp/ox-odt.el:
* lisp/ox.el:
* contrib/lisp/org-notify.el:
* contrib/lisp/ox-taskjuggler.el:
* contrib/lisp/org-wikinodes.el:
* testing/lisp/test-org-src.el:
* testing/lisp/test-org.el: Silence byte-compiler.
2016-05-26 06:18:00 -04:00
( looking-at-p " <<target>> " ) ) )
2015-10-18 03:36:15 -04:00
;; When `org-return-follows-link' is non-nil, tolerate links and
;; timestamps in comments, node properties, etc.
( should
( org-test-with-temp-text " # Comment [[target<point>]] \n <<target>> "
( let ( ( org-return-follows-link t )
( org-link-search-must-match-exact-headline nil ) )
( org-return ) )
Remove final parts of XEmacs compatibility code
* lisp/org-compat.el: Declare `org-add-hook', `org-decompose-region',
`org-detach-overlay', `org-file-equal-p', `org-float-time',
`org-indent-line-to', `org-indent-to-column', `org-looking-at-p',
`org-looking-back', `org-propertize', `org-re' and
`org-select-frame-set-input-focus' as obsolete.
(org-overlay-display, org-overlay-before-string, org-find-overlays):
Move to "org.el"
(org-xemacs-key-equivalents, org-xemacs-p): Remove variables.
(org-region-active-p): Drop XEmacs support.
(org-xemacs-without-invisibility): Remove macro.
(org-get-x-clipboard-compat): Remove function.
* lisp/org-macs.el (org-match-string-no-properties): Remove function.
* lisp/ob-core.el:
* lisp/org-agenda.el:
* lisp/org-archive.el:
* lisp/org-clock.el:
* lisp/org-colview.el:
* lisp/org-crypt.el:
* lisp/org-element.el:
* lisp/org-faces.el:
* lisp/org-feed.el:
* lisp/org-footnote.el:
* lisp/org-habit.el:
* lisp/org-id.el:
* lisp/org-indent.el:
* lisp/org-inlinetask.el:
* lisp/org-lint.el:
* lisp/org-list.el:
* lisp/org-mouse.el:
* lisp/org-pcomplete.el:
* lisp/org-src.el:
* lisp/org-table.el:
* lisp/org-timer.el:
* lisp/org.el:
* lisp/ox-ascii.el:
* lisp/ox-odt.el:
* lisp/ox.el:
* contrib/lisp/org-notify.el:
* contrib/lisp/ox-taskjuggler.el:
* contrib/lisp/org-wikinodes.el:
* testing/lisp/test-org-src.el:
* testing/lisp/test-org.el: Silence byte-compiler.
2016-05-26 06:18:00 -04:00
( looking-at-p " <<target>> " ) ) )
2015-10-31 18:32:47 -04:00
( should-not
( org-test-with-temp-text " # Comment [[target<point>]] \n <<target>> "
( let ( ( org-return-follows-link nil ) ) ( org-return ) )
Remove final parts of XEmacs compatibility code
* lisp/org-compat.el: Declare `org-add-hook', `org-decompose-region',
`org-detach-overlay', `org-file-equal-p', `org-float-time',
`org-indent-line-to', `org-indent-to-column', `org-looking-at-p',
`org-looking-back', `org-propertize', `org-re' and
`org-select-frame-set-input-focus' as obsolete.
(org-overlay-display, org-overlay-before-string, org-find-overlays):
Move to "org.el"
(org-xemacs-key-equivalents, org-xemacs-p): Remove variables.
(org-region-active-p): Drop XEmacs support.
(org-xemacs-without-invisibility): Remove macro.
(org-get-x-clipboard-compat): Remove function.
* lisp/org-macs.el (org-match-string-no-properties): Remove function.
* lisp/ob-core.el:
* lisp/org-agenda.el:
* lisp/org-archive.el:
* lisp/org-clock.el:
* lisp/org-colview.el:
* lisp/org-crypt.el:
* lisp/org-element.el:
* lisp/org-faces.el:
* lisp/org-feed.el:
* lisp/org-footnote.el:
* lisp/org-habit.el:
* lisp/org-id.el:
* lisp/org-indent.el:
* lisp/org-inlinetask.el:
* lisp/org-lint.el:
* lisp/org-list.el:
* lisp/org-mouse.el:
* lisp/org-pcomplete.el:
* lisp/org-src.el:
* lisp/org-table.el:
* lisp/org-timer.el:
* lisp/org.el:
* lisp/ox-ascii.el:
* lisp/ox-odt.el:
* lisp/ox.el:
* contrib/lisp/org-notify.el:
* contrib/lisp/ox-taskjuggler.el:
* contrib/lisp/org-wikinodes.el:
* testing/lisp/test-org-src.el:
* testing/lisp/test-org.el: Silence byte-compiler.
2016-05-26 06:18:00 -04:00
( looking-at-p " <<target>> " ) ) )
2015-10-31 18:32:47 -04:00
( should-not
( org-test-with-temp-text " # Comment [[target]]<point> \n <<target>> "
( let ( ( org-return-follows-link t )
( org-link-search-must-match-exact-headline nil ) )
( org-return ) )
Remove final parts of XEmacs compatibility code
* lisp/org-compat.el: Declare `org-add-hook', `org-decompose-region',
`org-detach-overlay', `org-file-equal-p', `org-float-time',
`org-indent-line-to', `org-indent-to-column', `org-looking-at-p',
`org-looking-back', `org-propertize', `org-re' and
`org-select-frame-set-input-focus' as obsolete.
(org-overlay-display, org-overlay-before-string, org-find-overlays):
Move to "org.el"
(org-xemacs-key-equivalents, org-xemacs-p): Remove variables.
(org-region-active-p): Drop XEmacs support.
(org-xemacs-without-invisibility): Remove macro.
(org-get-x-clipboard-compat): Remove function.
* lisp/org-macs.el (org-match-string-no-properties): Remove function.
* lisp/ob-core.el:
* lisp/org-agenda.el:
* lisp/org-archive.el:
* lisp/org-clock.el:
* lisp/org-colview.el:
* lisp/org-crypt.el:
* lisp/org-element.el:
* lisp/org-faces.el:
* lisp/org-feed.el:
* lisp/org-footnote.el:
* lisp/org-habit.el:
* lisp/org-id.el:
* lisp/org-indent.el:
* lisp/org-inlinetask.el:
* lisp/org-lint.el:
* lisp/org-list.el:
* lisp/org-mouse.el:
* lisp/org-pcomplete.el:
* lisp/org-src.el:
* lisp/org-table.el:
* lisp/org-timer.el:
* lisp/org.el:
* lisp/ox-ascii.el:
* lisp/ox-odt.el:
* lisp/ox.el:
* contrib/lisp/org-notify.el:
* contrib/lisp/ox-taskjuggler.el:
* contrib/lisp/org-wikinodes.el:
* testing/lisp/test-org-src.el:
* testing/lisp/test-org.el: Silence byte-compiler.
2016-05-26 06:18:00 -04:00
( looking-at-p " <<target>> " ) ) )
2020-05-14 17:23:28 -04:00
;; Non-nil `org-return-follows-link' ignores read-only state of
;; a buffer.
( should
( org-test-with-temp-text " Link [[target<point>]] <<target>> "
( let ( ( org-return-follows-link t )
( org-link-search-must-match-exact-headline nil ) )
( setq buffer-read-only t )
2020-05-14 18:48:26 -04:00
( call-interactively #' org-return ) )
2020-05-14 17:23:28 -04:00
( looking-at-p " <<target>> " ) ) )
2018-04-08 12:35:40 -04:00
;; `org-return-follows-link' handle multi-line lines.
( should
( org-test-with-temp-text
" [[target][This is a very \n long description<point>]] \n <<target>> "
( let ( ( org-return-follows-link t )
( org-link-search-must-match-exact-headline nil ) )
( org-return ) )
( looking-at-p " <<target>> " ) ) )
( should-not
( org-test-with-temp-text
" [[target][This is a very \n long description]]<point> \n <<target>> "
( let ( ( org-return-follows-link t )
( org-link-search-must-match-exact-headline nil ) )
2015-10-31 18:32:47 -04:00
( org-return ) )
Remove final parts of XEmacs compatibility code
* lisp/org-compat.el: Declare `org-add-hook', `org-decompose-region',
`org-detach-overlay', `org-file-equal-p', `org-float-time',
`org-indent-line-to', `org-indent-to-column', `org-looking-at-p',
`org-looking-back', `org-propertize', `org-re' and
`org-select-frame-set-input-focus' as obsolete.
(org-overlay-display, org-overlay-before-string, org-find-overlays):
Move to "org.el"
(org-xemacs-key-equivalents, org-xemacs-p): Remove variables.
(org-region-active-p): Drop XEmacs support.
(org-xemacs-without-invisibility): Remove macro.
(org-get-x-clipboard-compat): Remove function.
* lisp/org-macs.el (org-match-string-no-properties): Remove function.
* lisp/ob-core.el:
* lisp/org-agenda.el:
* lisp/org-archive.el:
* lisp/org-clock.el:
* lisp/org-colview.el:
* lisp/org-crypt.el:
* lisp/org-element.el:
* lisp/org-faces.el:
* lisp/org-feed.el:
* lisp/org-footnote.el:
* lisp/org-habit.el:
* lisp/org-id.el:
* lisp/org-indent.el:
* lisp/org-inlinetask.el:
* lisp/org-lint.el:
* lisp/org-list.el:
* lisp/org-mouse.el:
* lisp/org-pcomplete.el:
* lisp/org-src.el:
* lisp/org-table.el:
* lisp/org-timer.el:
* lisp/org.el:
* lisp/ox-ascii.el:
* lisp/ox-odt.el:
* lisp/ox.el:
* contrib/lisp/org-notify.el:
* contrib/lisp/ox-taskjuggler.el:
* contrib/lisp/org-wikinodes.el:
* testing/lisp/test-org-src.el:
* testing/lisp/test-org.el: Silence byte-compiler.
2016-05-26 06:18:00 -04:00
( looking-at-p " <<target>> " ) ) )
2014-11-16 07:57:21 -05:00
;; However, do not open link when point is in a table.
( should
( org-test-with-temp-text " | [[target<point>]] | \n | between | \n | <<target>> | "
( let ( ( org-return-follows-link t ) ) ( org-return ) )
Remove final parts of XEmacs compatibility code
* lisp/org-compat.el: Declare `org-add-hook', `org-decompose-region',
`org-detach-overlay', `org-file-equal-p', `org-float-time',
`org-indent-line-to', `org-indent-to-column', `org-looking-at-p',
`org-looking-back', `org-propertize', `org-re' and
`org-select-frame-set-input-focus' as obsolete.
(org-overlay-display, org-overlay-before-string, org-find-overlays):
Move to "org.el"
(org-xemacs-key-equivalents, org-xemacs-p): Remove variables.
(org-region-active-p): Drop XEmacs support.
(org-xemacs-without-invisibility): Remove macro.
(org-get-x-clipboard-compat): Remove function.
* lisp/org-macs.el (org-match-string-no-properties): Remove function.
* lisp/ob-core.el:
* lisp/org-agenda.el:
* lisp/org-archive.el:
* lisp/org-clock.el:
* lisp/org-colview.el:
* lisp/org-crypt.el:
* lisp/org-element.el:
* lisp/org-faces.el:
* lisp/org-feed.el:
* lisp/org-footnote.el:
* lisp/org-habit.el:
* lisp/org-id.el:
* lisp/org-indent.el:
* lisp/org-inlinetask.el:
* lisp/org-lint.el:
* lisp/org-list.el:
* lisp/org-mouse.el:
* lisp/org-pcomplete.el:
* lisp/org-src.el:
* lisp/org-table.el:
* lisp/org-timer.el:
* lisp/org.el:
* lisp/ox-ascii.el:
* lisp/ox-odt.el:
* lisp/ox.el:
* contrib/lisp/org-notify.el:
* contrib/lisp/ox-taskjuggler.el:
* contrib/lisp/org-wikinodes.el:
* testing/lisp/test-org-src.el:
* testing/lisp/test-org.el: Silence byte-compiler.
2016-05-26 06:18:00 -04:00
( looking-at-p " between " ) ) )
2014-11-16 07:57:21 -05:00
;; Special case: in a list, when indenting, do not break structure.
( should
( equal " - A \n B "
( org-test-with-temp-text " - A <point>B "
( org-return t )
( buffer-string ) ) ) )
2015-02-13 20:07:18 -05:00
( should
( equal " - A \n \n - B "
( org-test-with-temp-text " - A \n <point>- B "
( org-return t )
( buffer-string ) ) ) )
2015-05-15 07:08:11 -04:00
;; On tags part of a headline, add a newline below it instead of
;; breaking it.
2014-11-16 07:57:21 -05:00
( should
( equal " * H :tag: \n "
( org-test-with-temp-text " * H :<point>tag: "
2015-05-15 07:08:11 -04:00
( org-return )
( buffer-string ) ) ) )
;; Before headline text, add a newline below it instead of breaking
;; it.
( should
( equal " * TODO H :tag: \n "
( org-test-with-temp-text " * <point>TODO H :tag: "
( org-return )
( buffer-string ) ) ) )
( should
( equal " * TODO [#B] H :tag: \n "
( org-test-with-temp-text " * TODO<point> [#B] H :tag: "
( org-return )
( buffer-string ) ) ) )
2016-10-28 18:00:32 -04:00
( should ;TODO are case-sensitive
( equal " * \n Todo "
( org-test-with-temp-text " * <point>Todo "
( org-return )
( buffer-string ) ) ) )
2015-05-15 07:08:11 -04:00
;; At headline text, break headline text but preserve tags.
( should
( equal " * TODO [#B] foo :tag: \n bar "
( let ( org-auto-align-tags )
( org-test-with-temp-text " * TODO [#B] foo<point>bar :tag: "
( org-return )
( buffer-string ) ) ) ) )
;; At bol of headline insert newline.
( should
( equal " \n * h "
( org-test-with-temp-text " <point>* h "
2015-08-12 20:23:40 -04:00
( org-return )
( buffer-string ) ) ) )
;; Refuse to leave invalid headline in buffer.
( should
( equal " * h \n "
( org-test-with-temp-text " *<point> h "
2017-12-02 11:23:03 -05:00
( org-return )
( buffer-string ) ) ) )
;; Before first column or after last one in a table, split the
;; table.
( should
( equal " | a | \n \n | b | "
( org-test-with-temp-text " | a | \n <point>| b | "
( org-return )
( buffer-string ) ) ) )
( should
( equal " | a | \n \n | b | "
( org-test-with-temp-text " | a |<point> \n | b | "
2018-02-11 14:37:10 -05:00
( org-return )
( buffer-string ) ) ) )
;; Do not auto-fill on hitting <RET> inside a property drawer.
( should
( equal " * Heading \n :PROPERTIES: \n :SOME_PROP: This is a very long property value that goes beyond the fill-column. But this is inside a property drawer, so the auto-filling should be disabled. \n \n :END: "
( org-test-with-temp-text " * Heading \n :PROPERTIES: \n :SOME_PROP: This is a very long property value that goes beyond the fill-column. But this is inside a property drawer, so the auto-filling should be disabled.<point> \n :END: "
( setq-local fill-column 10 )
( auto-fill-mode 1 )
2014-11-16 07:57:21 -05:00
( org-return )
( buffer-string ) ) ) ) )
2013-09-12 16:48:16 -04:00
2020-05-05 13:01:07 -04:00
( ert-deftest test-org/with-electric-indent ( )
" Test RET and C-j specifications with `electric-indent-mode' on. "
;; Call commands interactively, since this is how `newline' knows it
;; must run `post-self-insert-hook'.
;;
;; RET, like `newline', should indent.
( should
( equal " Para \n graph "
( org-test-with-temp-text " Para<point>graph "
( electric-indent-local-mode 1 )
( call-interactively 'org-return )
( buffer-string ) ) ) )
( should
( equal " - item1 \n item2 "
( org-test-with-temp-text " - item1<point>item2 "
( electric-indent-local-mode 1 )
( call-interactively 'org-return )
( buffer-string ) ) ) )
2021-05-09 12:05:35 -04:00
;; TODO: test more values of `org-adapt-indentation'.
( let ( ( org-adapt-indentation t ) )
( should
( equal " * heading \n body "
( org-test-with-temp-text " * heading<point>body "
( electric-indent-local-mode 1 )
( call-interactively 'org-return )
( buffer-string ) ) ) ) )
2020-05-05 13:01:07 -04:00
;; C-j, like `electric-newline-and-maybe-indent', should not indent.
( should
( equal " Para \n graph "
( org-test-with-temp-text " Para<point>graph "
( electric-indent-local-mode 1 )
( call-interactively 'org-return-and-maybe-indent )
( buffer-string ) ) ) )
( should
( equal " - item1 \n item2 "
( org-test-with-temp-text " - item1<point>item2 "
( electric-indent-local-mode 1 )
( call-interactively 'org-return-and-maybe-indent )
( buffer-string ) ) ) )
2021-05-09 12:05:35 -04:00
;; TODO: test more values of `org-adapt-indentation'.
( let ( ( org-adapt-indentation t ) )
( should
( equal " * heading \n body "
( org-test-with-temp-text " * heading<point>body "
( electric-indent-local-mode 1 )
( call-interactively 'org-return-and-maybe-indent )
( buffer-string ) ) ) ) ) )
2020-05-05 13:01:07 -04:00
( ert-deftest test-org/without-electric-indent ( )
" Test RET and C-j specifications with `electric-indent-mode' off. "
;; Call commands interactively, since this is how `newline' knows it
;; must run `post-self-insert-hook'.
;;
;; RET, like `newline', should not indent.
( should
( equal " Para \n graph "
( org-test-with-temp-text " Para<point>graph "
( electric-indent-local-mode 0 )
( call-interactively 'org-return )
( buffer-string ) ) ) )
( should
( equal " - item1 \n item2 "
( org-test-with-temp-text " - item1<point>item2 "
( electric-indent-local-mode 0 )
( call-interactively 'org-return )
( buffer-string ) ) ) )
( should
( equal " * heading \n body "
( org-test-with-temp-text " * heading<point>body "
( electric-indent-local-mode 0 )
( call-interactively 'org-return )
( buffer-string ) ) ) )
;; C-j, like `electric-newline-and-maybe-indent', should indent.
( should
( equal " Para \n graph "
( org-test-with-temp-text " Para<point>graph "
( electric-indent-local-mode 0 )
( call-interactively 'org-return-and-maybe-indent )
( buffer-string ) ) ) )
( should
( equal " - item1 \n item2 "
( org-test-with-temp-text " - item1<point>item2 "
( electric-indent-local-mode 0 )
( call-interactively 'org-return-and-maybe-indent )
( buffer-string ) ) ) )
2021-05-09 12:05:35 -04:00
;; TODO: test more values of `org-adapt-indentation'.
( let ( ( org-adapt-indentation t ) )
( should
( equal " * heading \n body "
( org-test-with-temp-text " * heading<point>body "
( electric-indent-local-mode 0 )
( call-interactively 'org-return-and-maybe-indent )
( buffer-string ) ) ) ) ) )
2020-05-05 13:01:07 -04:00
2013-09-12 16:48:16 -04:00
( ert-deftest test-org/meta-return ( )
2014-11-16 07:57:21 -05:00
" Test M-RET ( `org-meta-return' ) specifications. "
2013-09-12 16:48:16 -04:00
;; In a table field insert a row above.
( should
( org-test-with-temp-text " | a | "
( forward-char )
( org-meta-return )
( forward-line -1 )
( looking-at " | |$ " ) ) )
;; In a paragraph change current line into a header.
( should
( org-test-with-temp-text " a "
( org-meta-return )
( beginning-of-line )
( looking-at " \* a$ " ) ) )
;; In an item insert an item, in this case above.
( should
( org-test-with-temp-text " - a "
( org-meta-return )
( beginning-of-line )
( looking-at " - $ " ) ) )
;; In a drawer and item insert an item, in this case above.
( should
2013-10-20 08:40:09 -04:00
( org-test-with-temp-text " :MYDRAWER: \n - a \n :END: "
( forward-line )
2022-01-16 02:18:53 -05:00
( org-fold-reveal )
2013-10-20 08:40:09 -04:00
( org-meta-return )
( beginning-of-line )
( looking-at " - $ " ) ) ) )
2013-09-12 16:48:16 -04:00
2014-06-09 12:07:07 -04:00
( ert-deftest test-org/insert-heading ( )
" Test `org-insert-heading' specifications. "
;; In an empty buffer, insert a new headline.
( should
( equal " * "
( org-test-with-temp-text " "
( org-insert-heading )
( buffer-string ) ) ) )
2016-12-14 18:15:12 -05:00
;; At the beginning of a line, turn it into a headline.
2014-06-09 12:07:07 -04:00
( should
( equal " * P "
( org-test-with-temp-text " <point>P "
( org-insert-heading )
( buffer-string ) ) ) )
;; In the middle of a line, split the line if allowed, otherwise,
;; insert the headline at its end.
( should
( equal " Para \n * graph "
( org-test-with-temp-text " Para<point>graph "
( let ( ( org-M-RET-may-split-line ' ( ( default . t ) ) ) )
( org-insert-heading ) )
( buffer-string ) ) ) )
( should
( equal " Paragraph \n * "
( org-test-with-temp-text " Para<point>graph "
( let ( ( org-M-RET-may-split-line ' ( ( default . nil ) ) ) )
( org-insert-heading ) )
2014-09-19 14:55:50 -04:00
( buffer-string ) ) ) )
2016-10-04 05:35:57 -04:00
;; At the beginning of a headline, create one above.
( should
( equal " * \n * H "
( org-test-with-temp-text " * H "
( org-insert-heading )
( buffer-string ) ) ) )
;; In the middle of a headline, split it if allowed.
( should
2019-02-15 16:46:49 -05:00
( equal " * H \n * 1 "
2016-10-04 05:35:57 -04:00
( org-test-with-temp-text " * H<point>1 "
( let ( ( org-M-RET-may-split-line ' ( ( headline . t ) ) ) )
( org-insert-heading ) )
( buffer-string ) ) ) )
( should
2019-02-15 16:46:49 -05:00
( equal " * H1 \n * "
2016-10-04 05:35:57 -04:00
( org-test-with-temp-text " * H<point>1 "
( let ( ( org-M-RET-may-split-line ' ( ( headline . nil ) ) ) )
( org-insert-heading ) )
( buffer-string ) ) ) )
;; However, splitting cannot happen on TODO keywords, priorities or
;; tags.
( should
2019-02-15 16:46:49 -05:00
( equal " * TODO H1 \n * "
2016-10-04 05:35:57 -04:00
( org-test-with-temp-text " * TO<point>DO H1 "
( let ( ( org-M-RET-may-split-line ' ( ( headline . t ) ) ) )
( org-insert-heading ) )
( buffer-string ) ) ) )
( should
2019-02-15 16:46:49 -05:00
( equal " * [#A] H1 \n * "
2016-10-04 05:35:57 -04:00
( org-test-with-temp-text " * [#<point>A] H1 "
( let ( ( org-M-RET-may-split-line ' ( ( headline . t ) ) ) )
( org-insert-heading ) )
( buffer-string ) ) ) )
( should
2019-02-15 16:46:49 -05:00
( equal " * H1 :tag: \n * "
2016-10-04 05:35:57 -04:00
( org-test-with-temp-text " * H1 :ta<point>g: "
( let ( ( org-M-RET-may-split-line ' ( ( headline . t ) ) ) )
( org-insert-heading ) )
( buffer-string ) ) ) )
2016-12-14 18:15:12 -05:00
;; New headline level depends on the level of the headline above.
( should
( equal " ** H \n ** P "
( org-test-with-temp-text " ** H \n <point>P "
( org-insert-heading )
( buffer-string ) ) ) )
( should
( equal " ** H \n Para \n ** graph "
( org-test-with-temp-text " ** H \n Para<point>graph "
( let ( ( org-M-RET-may-split-line ' ( ( default . t ) ) ) )
( org-insert-heading ) )
( buffer-string ) ) ) )
( should
( equal " ** \n ** H "
( org-test-with-temp-text " ** H "
( org-insert-heading )
( buffer-string ) ) ) )
2016-10-04 05:35:57 -04:00
;; When called with one universal argument, insert a new headline at
;; the end of the current subtree, independently on the position of
;; point.
2021-09-18 08:44:17 -04:00
( should
( equal
" * "
( org-test-with-temp-text " "
( let ( ( org-insert-heading-respect-content nil ) )
( org-insert-heading ' ( 4 ) ) )
( buffer-string ) ) ) )
( should
( equal
" entry
* "
( org-test-with-temp-text " entry "
( let ( ( org-insert-heading-respect-content nil ) )
( org-insert-heading ' ( 4 ) ) )
( buffer-string ) ) ) )
2016-10-04 05:35:57 -04:00
( should
( equal
2019-02-15 16:46:49 -05:00
" * H1 \n ** H2 \n * "
2016-10-04 05:35:57 -04:00
( org-test-with-temp-text " * H1 \n ** H2 "
( let ( ( org-insert-heading-respect-content nil ) )
( org-insert-heading ' ( 4 ) ) )
( buffer-string ) ) ) )
( should
( equal
2019-02-15 16:46:49 -05:00
" * H1 \n ** H2 \n * "
2016-10-04 05:35:57 -04:00
( org-test-with-temp-text " * H<point>1 \n ** H2 "
( let ( ( org-insert-heading-respect-content nil ) )
( org-insert-heading ' ( 4 ) ) )
( buffer-string ) ) ) )
2014-11-16 09:47:40 -05:00
;; When called with two universal arguments, insert a new headline
;; at the end of the grandparent subtree.
( should
2019-02-15 16:46:49 -05:00
( equal " * H1 \n ** H3 \n - item \n ** H2 \n ** "
2014-11-16 09:47:40 -05:00
( org-test-with-temp-text " * H1 \n ** H3 \n - item<point> \n ** H2 "
( let ( ( org-insert-heading-respect-content nil ) )
( org-insert-heading ' ( 16 ) ) )
( buffer-string ) ) ) )
2015-02-07 19:43:30 -05:00
;; When optional TOP-LEVEL argument is non-nil, always insert
;; a level 1 heading.
( should
2019-02-15 16:46:49 -05:00
( equal " * H1 \n ** H2 \n * "
2015-02-07 19:43:30 -05:00
( org-test-with-temp-text " * H1 \n ** H2<point> "
( org-insert-heading nil nil t )
( buffer-string ) ) ) )
( should
( equal " * H1 \n - item \n * "
( org-test-with-temp-text " * H1 \n - item<point> "
( org-insert-heading nil nil t )
( buffer-string ) ) ) )
2017-01-02 17:21:53 -05:00
;; Obey `org-blank-before-new-entry'.
( should
2019-02-15 16:46:49 -05:00
( equal " * H1 \n \n * "
2017-01-02 17:21:53 -05:00
( org-test-with-temp-text " * H1<point> "
( let ( ( org-blank-before-new-entry ' ( ( heading . t ) ) ) )
( org-insert-heading ) )
( buffer-string ) ) ) )
( should
2019-02-15 16:46:49 -05:00
( equal " * H1 \n * "
2017-01-02 17:21:53 -05:00
( org-test-with-temp-text " * H1<point> "
( let ( ( org-blank-before-new-entry ' ( ( heading . nil ) ) ) )
( org-insert-heading ) )
( buffer-string ) ) ) )
( should
2019-02-15 16:46:49 -05:00
( equal " * H1 \n * H2 \n * "
2017-01-02 17:21:53 -05:00
( org-test-with-temp-text " * H1 \n * H2<point> "
( let ( ( org-blank-before-new-entry ' ( ( heading . auto ) ) ) )
( org-insert-heading ) )
( buffer-string ) ) ) )
( should
2019-02-15 16:46:49 -05:00
( equal " * H1 \n \n * H2 \n \n * "
2017-01-02 17:21:53 -05:00
( org-test-with-temp-text " * H1 \n \n * H2<point> "
( let ( ( org-blank-before-new-entry ' ( ( heading . auto ) ) ) )
( org-insert-heading ) )
( buffer-string ) ) ) )
2014-09-19 14:55:50 -04:00
;; Corner case: correctly insert a headline after an empty one.
( should
2019-02-15 16:46:49 -05:00
( equal " * \n * "
2014-09-19 14:55:50 -04:00
( org-test-with-temp-text " * <point> "
2017-02-17 15:51:16 -05:00
( org-insert-heading )
( buffer-string ) ) ) )
( should
( org-test-with-temp-text " * <point> \n "
( org-insert-heading )
( looking-at-p " \n \\ ' " ) ) )
;; Do not insert spurious headlines when inserting a new headline.
( should
( equal " * H1 \n * H2 \n * \n "
( org-test-with-temp-text " * H1 \n * H2<point> \n "
2014-09-19 14:55:50 -04:00
( org-insert-heading )
2017-03-16 08:01:39 -04:00
( buffer-string ) ) ) )
;; Preserve visibility at beginning of line. In particular, when
;; removing spurious blank lines, do not visually merge heading with
;; the line visible above.
( should-not
( org-test-with-temp-text " * H1<point> \n Contents \n \n * H2 \n "
( org-overview )
( let ( ( org-blank-before-new-entry ' ( ( heading . nil ) ) ) )
( org-insert-heading ' ( 4 ) ) )
2017-05-12 11:45:46 -04:00
( invisible-p ( line-end-position 0 ) ) ) )
;; Properly handle empty lines when forcing a headline below current
;; one.
( should
2019-02-15 16:46:49 -05:00
( equal " * H1 \n \n * H \n \n * "
2017-05-12 11:45:46 -04:00
( org-test-with-temp-text " * H1 \n \n * H<point> "
( let ( ( org-blank-before-new-entry ' ( ( heading . t ) ) ) )
( org-insert-heading ' ( 4 ) )
( buffer-string ) ) ) ) ) )
2014-06-09 12:07:07 -04:00
2013-10-29 04:55:01 -04:00
( ert-deftest test-org/insert-todo-heading-respect-content ( )
" Test `org-insert-todo-heading-respect-content' specifications. "
;; Create a TODO heading.
( should
( org-test-with-temp-text " * H1 \n Body "
( org-insert-todo-heading-respect-content )
( nth 2 ( org-heading-components ) ) ) )
2014-04-22 06:08:15 -04:00
;; Add headline at the end of the first subtree
2013-10-29 04:55:01 -04:00
( should
2016-10-27 18:35:01 -04:00
( equal
2019-02-15 16:46:49 -05:00
" * TODO "
2016-10-27 18:35:01 -04:00
( org-test-with-temp-text " * H1 \n H1Body<point> \n ** H2 \n H2Body "
( org-insert-todo-heading-respect-content )
( buffer-substring-no-properties ( line-beginning-position ) ( point-max ) ) ) ) )
2013-10-29 04:55:01 -04:00
;; In a list, do not create a new item.
( should
2016-10-27 18:35:01 -04:00
( equal
2019-02-15 16:46:49 -05:00
" * TODO "
2016-10-27 18:35:01 -04:00
( org-test-with-temp-text " * H \n - an item \n - another one "
( search-forward " an " )
2017-10-18 16:48:16 -04:00
( org-insert-todo-heading-respect-content )
( buffer-substring-no-properties ( line-beginning-position ) ( point-max ) ) ) ) )
;; Use the same TODO keyword as current heading.
( should
( equal
" * TODO \n "
( org-test-with-temp-text " * TODO \n ** WAITING \n "
2016-10-27 18:35:01 -04:00
( org-insert-todo-heading-respect-content )
( buffer-substring-no-properties ( line-beginning-position ) ( point-max ) ) ) ) ) )
2013-09-12 16:48:16 -04:00
2015-06-21 21:46:54 -04:00
( ert-deftest test-org/clone-with-time-shift ( )
" Test `org-clone-subtree-with-time-shift' . "
2017-01-16 16:26:47 -05:00
;; Raise an error before first heading.
( should-error
( org-test-with-temp-text " "
( org-clone-subtree-with-time-shift 1 ) ) )
2017-01-17 03:49:48 -05:00
;; Raise an error on invalid number of clones.
( should-error
( org-test-with-temp-text " * Clone me "
( org-clone-subtree-with-time-shift -1 ) ) )
2015-06-21 21:46:54 -04:00
;; Clone non-repeating once.
( should
( equal " \
* H1\n<2015-06-21>
* H1\n<2015-06-23>
"
( org-test-with-temp-text " * H1 \n <2015-06-21 Sun> "
( org-clone-subtree-with-time-shift 1 " +2d " )
( replace-regexp-in-string
" \\ ( [.A-Za-z]+ \\ ) \\ ( \\ +[0-9][hdmwy] \\ )?> " " " ( buffer-string )
nil nil 1 ) ) ) )
;; Clone repeating once.
( should
( equal " \
* H1\n<2015-06-21>
* H1\n<2015-06-23>
* H1\n<2015-06-25 +1w>
"
( org-test-with-temp-text " * H1 \n <2015-06-21 Sun +1w> "
( org-clone-subtree-with-time-shift 1 " +2d " )
( replace-regexp-in-string
2019-01-13 20:19:50 -05:00
" \\ ( [.A-Za-z]+ \\ ) \\ ( \\ +[0-9][hdmwy] \\ )?> " " " ( buffer-string )
nil nil 1 ) ) ) )
;; Clone repeating once in backward.
( should
( equal " \
* H1\n<2015-06-21>
* H1\n<2015-06-19>
* H1\n<2015-06-17 +1w>
"
( org-test-with-temp-text " * H1 \n <2015-06-21 Sun +1w> "
( org-clone-subtree-with-time-shift 1 " -2d " )
( replace-regexp-in-string
2015-06-21 21:46:54 -04:00
" \\ ( [.A-Za-z]+ \\ ) \\ ( \\ +[0-9][hdmwy] \\ )?> " " " ( buffer-string )
nil nil 1 ) ) ) )
;; Clone non-repeating zero times.
( should
( equal " \
* H1\n<2015-06-21>
"
( org-test-with-temp-text " * H1 \n <2015-06-21 Sun> "
( org-clone-subtree-with-time-shift 0 " +2d " )
( replace-regexp-in-string
" \\ ( [.A-Za-z]+ \\ ) \\ ( \\ +[0-9][hdmwy] \\ )?> " " " ( buffer-string )
nil nil 1 ) ) ) )
;; Clone repeating "zero" times.
( should
( equal " \
* H1\n<2015-06-21>
* H1\n<2015-06-23 +1w>
"
( org-test-with-temp-text " * H1 \n <2015-06-21 Sun +1w> "
( org-clone-subtree-with-time-shift 0 " +2d " )
( replace-regexp-in-string
" \\ ( [.A-Za-z]+ \\ ) \\ ( \\ +[0-9][hdmwy] \\ )?> " " " ( buffer-string )
2017-01-17 03:49:48 -05:00
nil nil 1 ) ) ) )
2017-01-17 20:46:06 -05:00
;; Clone with blank SHIFT argument.
( should
( string-prefix-p
" * H <2012-03-29 "
( org-test-with-temp-text " * H <2012-03-29 Thu><point> "
( org-clone-subtree-with-time-shift 1 " " )
( buffer-substring-no-properties ( line-beginning-position 2 )
( line-end-position 2 ) ) ) ) )
2017-01-17 03:49:48 -05:00
;; Find time stamps before point. If SHIFT is not specified, ask
;; for a time shift.
( should
( string-prefix-p
" * H <2012-03-30 "
( org-test-with-temp-text " * H <2012-03-29 Thu><point> "
( org-clone-subtree-with-time-shift 1 " +1d " )
( buffer-substring-no-properties ( line-beginning-position 2 )
( line-end-position 2 ) ) ) ) )
( should
( string-prefix-p
" * H <2014-03-05 "
( org-test-with-temp-text " * H <2014-03-04 Tue><point> "
( cl-letf ( ( ( symbol-function 'read-from-minibuffer )
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 17:21:37 -04:00
( lambda ( &rest _args ) " +1d " ) ) )
2017-01-17 20:59:49 -05:00
( org-clone-subtree-with-time-shift 1 ) )
2017-01-17 03:49:48 -05:00
( buffer-substring-no-properties ( line-beginning-position 2 )
2021-02-25 00:02:41 -05:00
( line-end-position 2 ) ) ) ) )
;; Hour shift.
( should
( equal " \
* H1\n<2015-06-21 20:00>
* H1\n<2015-06-21 23:00>
* H1\n<2015-06-22 02:00>
"
( org-test-with-temp-text " * H1 \n <2015-06-21 Sun 20:00> "
( org-clone-subtree-with-time-shift 2 " +3h " )
( replace-regexp-in-string
" \\ ( [.A-Za-z]+ \\ ) \\ ( [0-9][0-9]:[0-9][0-9] \\ )?> " " "
( buffer-substring-no-properties ( point-min ) ( point-max ) )
nil nil 1 ) ) ) )
( should
( equal " \
* H1\n<2015-06-21 20:00>
* H1\n<2015-06-21 18:00>
"
( org-test-with-temp-text " * H1 \n <2015-06-21 Sun 20:00> "
( org-clone-subtree-with-time-shift 1 " -2h " )
( replace-regexp-in-string
" \\ ( [.A-Za-z]+ \\ ) \\ ( [0-9][0-9]:[0-9][0-9] \\ )?> " " "
( buffer-substring-no-properties ( point-min ) ( point-max ) )
nil nil 1 ) ) ) ) )
2013-09-12 16:48:16 -04:00
2014-02-06 06:11:06 -05:00
;;; Fixed-Width Areas
2014-05-16 16:14:59 -04:00
( ert-deftest test-org/toggle-fixed-width ( )
2014-02-06 06:11:06 -05:00
" Test `org-toggle-fixed-width' specifications. "
;; No region: Toggle on fixed-width marker in paragraphs.
( should
( equal " : A "
( org-test-with-temp-text " A "
( org-toggle-fixed-width )
( buffer-string ) ) ) )
;; No region: Toggle off fixed-width markers in fixed-width areas.
( should
( equal " A "
( org-test-with-temp-text " : A "
( org-toggle-fixed-width )
( buffer-string ) ) ) )
;; No region: Toggle on marker in blank lines after elements or just
;; after a headline.
( should
( equal " * H \n : "
( org-test-with-temp-text " * H \n "
( forward-line )
( org-toggle-fixed-width )
( buffer-string ) ) ) )
( should
( equal " #+BEGIN_EXAMPLE \n Contents \n #+END_EXAMPLE \n : "
( org-test-with-temp-text " #+BEGIN_EXAMPLE \n Contents \n #+END_EXAMPLE \n "
( goto-char ( point-max ) )
( org-toggle-fixed-width )
( buffer-string ) ) ) )
;; No region: Toggle on marker in front of one line elements (e.g.,
;; headlines, clocks)
( should
( equal " : * Headline "
( org-test-with-temp-text " * Headline "
( org-toggle-fixed-width )
( buffer-string ) ) ) )
( should
( equal " : #+KEYWORD: value "
( org-test-with-temp-text " #+KEYWORD: value "
( org-toggle-fixed-width )
( buffer-string ) ) ) )
;; No region: error in other situations.
( should-error
( org-test-with-temp-text " #+BEGIN_EXAMPLE \n : A \n #+END_EXAMPLE "
( forward-line )
( org-toggle-fixed-width )
( buffer-string ) ) )
;; No region: Indentation is preserved.
( should
( equal " - A \n : B "
( org-test-with-temp-text " - A \n B "
( forward-line )
( org-toggle-fixed-width )
( buffer-string ) ) ) )
;; Region: If it contains only fixed-width elements and blank lines,
;; toggle off fixed-width markup.
( should
( equal " A \n \n B "
( org-test-with-temp-text " : A \n \n : B "
( transient-mark-mode 1 )
( push-mark ( point ) t t )
( goto-char ( point-max ) )
( org-toggle-fixed-width )
( buffer-string ) ) ) )
;; Region: If it contains anything else, toggle on fixed-width but
;; not on fixed-width areas.
( should
( equal " : A \n : \n : B \n : \n : C "
( org-test-with-temp-text " A \n \n : B \n \n C "
( transient-mark-mode 1 )
( push-mark ( point ) t t )
( goto-char ( point-max ) )
( org-toggle-fixed-width )
( buffer-string ) ) ) )
;; Region: Ignore blank lines at its end, unless it contains only
;; such lines.
( should
( equal " : A \n \n "
( org-test-with-temp-text " A \n \n "
( transient-mark-mode 1 )
( push-mark ( point ) t t )
( goto-char ( point-max ) )
( org-toggle-fixed-width )
( buffer-string ) ) ) )
( should
( equal " : \n : \n "
( org-test-with-temp-text " \n \n "
( transient-mark-mode 1 )
( push-mark ( point ) t t )
( goto-char ( point-max ) )
( org-toggle-fixed-width )
( buffer-string ) ) ) ) )
2018-07-17 16:24:01 -04:00
( ert-deftest test-org/kill-line ( )
" Test `org-kill-line' specifications. "
;; At the beginning of a line, kill whole line.
( should
( equal " "
( org-test-with-temp-text " abc "
( org-kill-line )
( buffer-string ) ) ) )
;; In the middle of a line, kill line until its end.
( should
( equal " a "
( org-test-with-temp-text " a<point>bc "
( org-kill-line )
( buffer-string ) ) ) )
;; Do not kill newline character.
( should
( equal " \n 123 "
( org-test-with-temp-text " abc \n 123 "
( org-kill-line )
( buffer-string ) ) ) )
( should
( equal " a \n 123 "
( org-test-with-temp-text " a<point>bc \n 123 "
( org-kill-line )
( buffer-string ) ) ) )
;; When `org-special-ctrl-k' is non-nil and point is at a headline,
;; kill until tags.
( should
( equal " * A :tag: "
( org-test-with-temp-text " * A<point>B :tag: "
( let ( ( org-special-ctrl-k t )
( org-tags-column 0 ) )
( org-kill-line ) )
( buffer-string ) ) ) )
;; If point is on tags, only kill part left until the end of line.
( should
( equal " * A :tag: "
( org-test-with-temp-text " * A :tag:<point>tag2: "
( let ( ( org-special-ctrl-k t )
( org-tags-column 0 ) )
( org-kill-line ) )
( buffer-string ) ) ) )
;; However, if point is at the beginning of the line, kill whole
;; headline.
( should
( equal " "
( org-test-with-temp-text " * AB :tag: "
( let ( ( org-special-ctrl-k t )
( org-tags-column 0 ) )
( org-kill-line ) )
( buffer-string ) ) ) )
;; When `org-ctrl-k-protect-subtree' is non-nil, and point is in
;; invisible text, ask before removing it. When set to `error',
;; throw an error.
( should-error
( org-test-with-temp-text " * H \n ** <point>H2 \n Contents \n * H3 "
( org-overview )
( let ( ( org-special-ctrl-k nil )
( org-ctrl-k-protect-subtree t ) )
( cl-letf ( ( ( symbol-function 'y-or-n-p ) 'ignore ) )
( org-kill-line ) ) ) ) )
( should-error
( org-test-with-temp-text " * H \n ** <point>H2 \n Contents \n * H3 "
( org-overview )
( let ( ( org-special-ctrl-k nil )
( org-ctrl-k-protect-subtree 'error ) )
( org-kill-line ) ) ) ) )
2014-02-06 06:11:06 -05:00
2014-03-24 11:12:12 -04:00
;;; Headline
2016-06-01 08:49:59 -04:00
( ert-deftest test-org/get-heading ( )
" Test `org-get-heading' specifications. "
;; Return current heading, even if point is not on it.
( should
( equal " H "
( org-test-with-temp-text " * H "
( org-get-heading ) ) ) )
( should
( equal " H "
( org-test-with-temp-text " * H \n Text<point> "
( org-get-heading ) ) ) )
2017-01-18 18:14:16 -05:00
;; Without any optional argument, return TODO keyword, priority
;; cookie, COMMENT keyword and tags.
2016-06-01 08:49:59 -04:00
( should
( equal " TODO H "
( org-test-with-temp-text " #+TODO: TODO | DONE \n * TODO H<point> "
( org-get-heading ) ) ) )
2017-01-18 18:14:16 -05:00
( should
( equal " [#A] H "
( org-test-with-temp-text " * [#A] H "
( org-get-heading ) ) ) )
( should
( equal " COMMENT H "
( org-test-with-temp-text " * COMMENT H "
( org-get-heading ) ) ) )
2016-06-01 08:49:59 -04:00
( should
( equal " H :tag: "
( org-test-with-temp-text " * H :tag: "
( org-get-heading ) ) ) )
;; With NO-TAGS argument, ignore tags.
( should
( equal " TODO H "
( org-test-with-temp-text " #+TODO: TODO | DONE \n * TODO H<point> "
( org-get-heading t ) ) ) )
( should
( equal " H "
( org-test-with-temp-text " * H :tag: "
( org-get-heading t ) ) ) )
;; With NO-TODO, ignore TODO keyword.
( should
( equal " H "
( org-test-with-temp-text " #+TODO: TODO | DONE \n * TODO H<point> "
( org-get-heading nil t ) ) ) )
( should
( equal " H :tag: "
( org-test-with-temp-text " * H :tag: "
( org-get-heading nil t ) ) ) )
;; TODO keywords are case-sensitive.
( should
( equal " Todo H "
( org-test-with-temp-text " #+TODO: TODO | DONE \n * Todo H<point> "
2016-07-30 16:30:19 -04:00
( org-get-heading nil t ) ) ) )
2017-01-18 18:14:16 -05:00
;; With NO-PRIORITY, ignore priority.
( should
( equal " H "
( org-test-with-temp-text " * [#A] H "
( org-get-heading nil nil t ) ) ) )
( should
( equal " H "
( org-test-with-temp-text " * H "
( org-get-heading nil nil t ) ) ) )
( should
( equal " TODO H "
( org-test-with-temp-text " * TODO [#A] H "
( org-get-heading nil nil t ) ) ) )
;; With NO-COMMENT, ignore COMMENT keyword.
( should
( equal " H "
( org-test-with-temp-text " * COMMENT H "
( org-get-heading nil nil nil t ) ) ) )
( should
( equal " H "
( org-test-with-temp-text " * H "
( org-get-heading nil nil nil t ) ) ) )
( should
( equal " TODO [#A] H "
( org-test-with-temp-text " * TODO [#A] COMMENT H "
( org-get-heading nil nil nil t ) ) ) )
2016-07-30 16:30:19 -04:00
;; On an empty headline, return value is consistent.
( should ( equal " " ( org-test-with-temp-text " * " ( org-get-heading ) ) ) )
( should ( equal " " ( org-test-with-temp-text " * " ( org-get-heading t ) ) ) )
( should ( equal " " ( org-test-with-temp-text " * " ( org-get-heading nil t ) ) ) )
2017-01-18 18:14:16 -05:00
( should ( equal " " ( org-test-with-temp-text " * " ( org-get-heading nil nil t ) ) ) )
( should
( equal " " ( org-test-with-temp-text " * " ( org-get-heading nil nil nil t ) ) ) ) )
2016-06-01 08:49:59 -04:00
2014-03-24 11:12:12 -04:00
( ert-deftest test-org/in-commented-heading-p ( )
" Test `org-in-commented-heading-p' specifications. "
;; Commented headline.
( should
( org-test-with-temp-text " * COMMENT Headline \n Body "
( goto-char ( point-max ) )
( org-in-commented-heading-p ) ) )
;; Commented ancestor.
( should
( org-test-with-temp-text " * COMMENT Headline \n ** Level 2 \n Body "
( goto-char ( point-max ) )
( org-in-commented-heading-p ) ) )
;; Comment keyword is case-sensitive.
( should-not
( org-test-with-temp-text " * Comment Headline \n Body "
( goto-char ( point-max ) )
( org-in-commented-heading-p ) ) )
;; Keyword is standalone.
( should-not
( org-test-with-temp-text " * COMMENTHeadline \n Body "
( goto-char ( point-max ) )
( org-in-commented-heading-p ) ) )
;; Optional argument.
( should-not
( org-test-with-temp-text " * COMMENT Headline \n ** Level 2 \n Body "
( goto-char ( point-max ) )
( org-in-commented-heading-p t ) ) ) )
2020-09-07 00:49:12 -04:00
( ert-deftest test-org/in-archived-heading-p ( )
" Test `org-in-archived-heading-p' specifications. "
;; Archived headline.
( should
( org-test-with-temp-text " * Headline :ARCHIVE: \n Body "
( goto-char ( point-max ) )
( org-in-archived-heading-p ) ) )
;; Archived ancestor.
( should
( org-test-with-temp-text " * Headline :ARCHIVE: \n ** Level 2 \n Body "
( goto-char ( point-max ) )
( org-in-archived-heading-p ) ) )
;; Optional argument.
( should-not
( org-test-with-temp-text " * Headline :ARCHIVE: \n ** Level 2 \n Body "
( goto-char ( point-max ) )
2020-12-09 03:59:58 -05:00
( org-in-archived-heading-p t ) ) )
;; Archive tag containing ARCHIVE as substring
( should-not
( org-test-with-temp-text " * Headline :NOARCHIVE: \n ** Level 2 \n Body "
( goto-char ( point-max ) )
( org-in-archived-heading-p ) ) ) )
2014-03-24 11:12:12 -04:00
2015-08-06 10:56:41 -04:00
( ert-deftest test-org/entry-blocked-p ( )
;; Check other dependencies.
( should
( org-test-with-temp-text " * TODO Blocked \n ** DONE one \n ** TODO two "
( let ( ( org-enforce-todo-dependencies t )
( org-blocker-hook
' ( org-block-todo-from-children-or-siblings-or-parent ) ) )
( org-entry-blocked-p ) ) ) )
( should-not
( org-test-with-temp-text " * TODO Blocked \n ** DONE one \n ** DONE two "
( let ( ( org-enforce-todo-dependencies t )
( org-blocker-hook
' ( org-block-todo-from-children-or-siblings-or-parent ) ) )
( org-entry-blocked-p ) ) ) )
;; Entry without a TODO keyword or with a DONE keyword cannot be
;; blocked.
( should-not
( org-test-with-temp-text " * Blocked \n ** TODO one "
( let ( ( org-enforce-todo-dependencies t )
( org-blocker-hook
' ( org-block-todo-from-children-or-siblings-or-parent ) ) )
( org-entry-blocked-p ) ) ) )
( should-not
( org-test-with-temp-text " * DONE Blocked \n ** TODO one "
( let ( ( org-enforce-todo-dependencies t )
( org-blocker-hook
' ( org-block-todo-from-children-or-siblings-or-parent ) ) )
( org-entry-blocked-p ) ) ) )
;; Follow :ORDERED: specifications.
( should
( org-test-with-temp-text
" * H \n :PROPERTIES: \n :ORDERED: t \n :END: \n ** TODO one \n ** <point>TODO two "
( let ( ( org-enforce-todo-dependencies t )
( org-blocker-hook
' ( org-block-todo-from-children-or-siblings-or-parent ) ) )
( org-entry-blocked-p ) ) ) )
( should-not
( org-test-with-temp-text
" * H \n :PROPERTIES: \n :ORDERED: t \n :END: \n ** <point>TODO one \n ** DONE two "
( let ( ( org-enforce-todo-dependencies t )
( org-blocker-hook
' ( org-block-todo-from-children-or-siblings-or-parent ) ) )
( org-entry-blocked-p ) ) ) ) )
2014-03-24 11:12:12 -04:00
2016-02-25 08:32:57 -05:00
( ert-deftest test-org/get-outline-path ( )
" Test `org-get-outline-path' specifications. "
2016-02-29 19:01:07 -05:00
;; Top-level headlines have no outline path.
( should-not
( org-test-with-temp-text " * H "
( org-get-outline-path ) ) )
;; Otherwise, outline path is the path leading to the headline.
2016-02-25 08:32:57 -05:00
( should
( equal ' ( " H " )
( org-test-with-temp-text " * H \n ** S<point> "
( org-get-outline-path ) ) ) )
;; Find path even when point is not on a headline.
( should
2016-02-29 19:01:07 -05:00
( equal ' ( " H " )
2016-02-25 08:32:57 -05:00
( org-test-with-temp-text " * H \n ** S \n Text<point> "
( org-get-outline-path ) ) ) )
2016-02-29 19:01:07 -05:00
;; TODO keywords, tags and statistics cookies are ignored.
( should
( equal ' ( " H " )
( org-test-with-temp-text " * TODO H [0/1] :tag: \n ** S<point> "
( org-get-outline-path ) ) ) )
;; Links are replaced with their description or their path.
( should
( equal ' ( " Org " )
( org-test-with-temp-text
2018-01-16 13:42:57 -05:00
" * [[https://orgmode.org][Org]] \n ** S<point> "
2016-02-29 19:01:07 -05:00
( org-get-outline-path ) ) ) )
( should
2018-01-16 13:42:57 -05:00
( equal ' ( " https://orgmode.org " )
2016-02-29 19:01:07 -05:00
( org-test-with-temp-text
2018-01-16 13:42:57 -05:00
" * [[https://orgmode.org]] \n ** S<point> "
2016-02-29 19:01:07 -05:00
( org-get-outline-path ) ) ) )
;; When WITH-SELF is non-nil, include current heading.
( should
( equal ' ( " H " )
( org-test-with-temp-text " * H "
( org-get-outline-path t ) ) ) )
2016-02-25 08:32:57 -05:00
( should
( equal ' ( " H " " S " )
2016-02-29 19:01:07 -05:00
( org-test-with-temp-text " * H \n ** S \n Text<point> "
( org-get-outline-path t ) ) ) )
;; Using cache is transparent to the user.
( should
( equal ' ( " H " )
2016-02-25 08:32:57 -05:00
( org-test-with-temp-text " * H \n ** S<point> "
( setq org-outline-path-cache nil )
2016-02-29 19:01:07 -05:00
( org-get-outline-path nil t ) ) ) )
2016-02-25 08:32:57 -05:00
;; Do not corrupt cache when finding outline path in distant part of
;; the buffer.
( should
2016-02-29 19:01:07 -05:00
( equal ' ( " H2 " )
( org-test-with-temp-text " * H \n ** S<point> \n * H2 \n ** S2 "
2016-02-25 08:32:57 -05:00
( setq org-outline-path-cache nil )
2016-02-29 19:01:07 -05:00
( org-get-outline-path nil t )
2016-02-25 08:32:57 -05:00
( search-forward " S2 " )
2016-02-29 19:01:07 -05:00
( org-get-outline-path nil t ) ) ) )
2016-02-29 10:25:24 -05:00
;; Do not choke on empty headlines.
( should
2016-02-29 19:01:07 -05:00
( org-test-with-temp-text " * H \n ** <point> "
( org-get-outline-path ) ) )
( should
( org-test-with-temp-text " * \n ** H<point> "
( org-get-outline-path ) ) ) )
2016-02-25 08:32:57 -05:00
2015-10-26 22:49:45 -04:00
( ert-deftest test-org/format-outline-path ( )
2016-02-25 08:32:57 -05:00
" Test `org-format-outline-path' specifications. "
2015-10-26 22:49:45 -04:00
( should
( string= ( org-format-outline-path ( list " one " " two " " three " ) )
" one/two/three " ) )
;; Empty path.
( should
( string= ( org-format-outline-path ' ( ) )
" " ) )
2015-10-31 12:36:16 -04:00
( should
( string= ( org-format-outline-path ' ( nil ) )
" " ) )
2015-10-26 22:49:45 -04:00
;; Empty path and prefix.
( should
( string= ( org-format-outline-path ' ( ) nil " >> " )
" >> " ) )
;; Trailing whitespace in headings.
( should
( string= ( org-format-outline-path ( list " one \t " " tw o " " three " ) )
" one/tw o/three " ) )
;; Non-default prefix and separators.
( should
( string= ( org-format-outline-path ( list " one " " two " " three " ) nil " >> " " | " )
" >>|one|two|three " ) )
;; Truncate.
( should
( string= ( org-format-outline-path ( list " one " " two " " three " " four " ) 10 )
" one/two/.. " ) )
;; Give a very narrow width.
( should
( string= ( org-format-outline-path ( list " one " " two " " three " " four " ) 2 )
" on " ) )
;; Give a prefix that extends beyond the width.
( should
( string= ( org-format-outline-path ( list " one " " two " " three " " four " ) 10
" >>>>>>>>>> " )
" >>>>>>>>.. " ) ) )
2022-05-08 06:21:01 -04:00
( ert-deftest test-org/org-find-olp ( )
" Test `org-find-olp' specifications. "
( org-test-with-temp-text
"
* Headline
** COMMENT headline2
** TODO headline3
*** [ # A ] headline4 :tags:
** [ # A ] headline5
** [ 0% ] headline6
** headline7 [ 100% ]
** headline8 [ 1/5 ] :some:more:tags:
* Test
"
( should ( org-find-olp ' ( " Headline " ) t ) )
( should-error ( org-find-olp ' ( " Headline " " Test " ) t ) )
( should-error ( org-find-olp ' ( " Headlinealksjd " ) t ) )
( should ( org-find-olp ' ( " Headline " " headline2 " ) t ) )
( should ( org-find-olp ' ( " Headline " " headline3 " ) t ) )
( should ( org-find-olp ' ( " Headline " " headline3 " " headline4 " ) t ) )
( should-error ( org-find-olp ' ( " Headline " " headline5 " ) t ) )
( should ( org-find-olp ' ( " Headline " " headline6 " ) t ) )
( should ( org-find-olp ' ( " Headline " " headline7 " ) t ) )
( should ( org-find-olp ' ( " Headline " " headline8 " ) t ) ) ) )
2016-01-13 08:48:10 -05:00
( ert-deftest test-org/map-entries ( )
" Test `org-map-entries' specifications. "
;; Full match.
( should
( equal ' ( 1 11 )
( org-test-with-temp-text " * Level 1 \n ** Level 2 "
( org-map-entries #' point ) ) ) )
;; Level match.
( should
( equal ' ( 1 )
( org-test-with-temp-text " * Level 1 \n ** Level 2 "
( let ( org-odd-levels-only ) ( org-map-entries #' point " LEVEL=1 " ) ) ) ) )
( should
( equal ' ( 11 )
( org-test-with-temp-text " * Level 1 \n ** Level 2 "
( let ( org-odd-levels-only ) ( org-map-entries #' point " LEVEL>1 " ) ) ) ) )
;; Tag match.
( should
( equal ' ( 11 )
( org-test-with-temp-text " * H1 :no: \n * H2 :yes: "
( org-map-entries #' point " yes " ) ) ) )
( should
( equal ' ( 14 )
( org-test-with-temp-text " * H1 :yes:a: \n * H2 :yes:b: "
( org-map-entries #' point " +yes-a " ) ) ) )
( should
( equal ' ( 11 23 )
( org-test-with-temp-text " * H1 :no: \n * H2 :yes1: \n * H3 :yes2: "
( org-map-entries #' point " {yes?} " ) ) ) )
;; Priority match.
( should
( equal ' ( 1 )
( org-test-with-temp-text " * [#A] H1 \n * [#B] H2 "
( org-map-entries #' point " PRIORITY= \" A \" " ) ) ) )
;; Date match.
( should
( equal ' ( 36 )
( org-test-with-temp-text "
* H1
SCHEDULED: <2012-03-29 thu.>
* H2
SCHEDULED: <2014-03-04 tue.> "
( org-map-entries #' point " SCHEDULED= \" <2014-03-04 tue.> \" " ) ) ) )
( should
( equal ' ( 2 )
( org-test-with-temp-text "
* H1
SCHEDULED: <2012-03-29 thu.>
* H2
SCHEDULED: <2014-03-04 tue.> "
( org-map-entries #' point " SCHEDULED< \" <2013-01-01> \" " ) ) ) )
;; Regular property match.
( should
( equal ' ( 2 )
( org-test-with-temp-text "
* H1
:PROPERTIES:
:TEST: 1
:END:
* H2
:PROPERTIES:
:TEST: 2
:END: "
( org-map-entries #' point " TEST=1 " ) ) ) )
;; Multiple criteria.
( should
( equal ' ( 23 )
( org-test-with-temp-text " * H1 :no: \n ** H2 :yes: \n * H3 :yes: "
( let ( org-odd-levels-only
( org-use-tag-inheritance nil ) )
( org-map-entries #' point " yes+LEVEL=1 " ) ) ) ) )
;; "or" criteria.
( should
( equal ' ( 12 24 )
( org-test-with-temp-text " * H1 :yes: \n ** H2 :yes: \n ** H3 :no: "
( let ( org-odd-levels-only )
( org-map-entries #' point " LEVEL=2|no " ) ) ) ) )
( should
( equal ' ( 1 12 )
( org-test-with-temp-text " * H1 :yes: \n * H2 :no: \n * H3 :maybe: "
( let ( org-odd-levels-only )
( org-map-entries #' point " yes|no " ) ) ) ) )
;; "and" criteria.
( should
( equal ' ( 22 )
( org-test-with-temp-text " * H1 :yes: \n * H2 :no: \n * H3 :yes:no: "
( let ( org-odd-levels-only )
2022-01-01 01:10:28 -05:00
( org-map-entries #' point " yes&no " ) ) ) ) )
;; Setting `org-map-continue-from'
( should
( string= " "
( org-test-with-temp-text " * H1 \n * H2 \n * H3n* H4 "
( org-map-entries
( lambda ( )
( org-cut-subtree )
( setq org-map-continue-from ( point ) ) ) )
2022-01-07 09:10:22 -05:00
( buffer-string ) ) ) )
( should
( string= " * H1 \n * H2 \n * H3 \n "
( org-test-with-temp-text " * H1 \n * H2 \n * H3 \n * H4 "
( org-map-entries
( lambda ( )
( when ( string= " H4 "
( org-element-property
:raw-value ( org-element-at-point ) ) )
( org-cut-subtree )
( setq org-map-continue-from
( org-element-property
:begin ( org-element-at-point ) ) ) ) ) )
2022-01-01 01:10:28 -05:00
( buffer-string ) ) ) ) )
2016-01-13 08:48:10 -05:00
2016-02-22 17:50:41 -05:00
( ert-deftest test-org/edit-headline ( )
" Test `org-edit-headline' specifications. "
( should
( equal " * B "
( org-test-with-temp-text " * A "
( org-edit-headline " B " )
( buffer-string ) ) ) )
;; Handle empty headings.
( should
( equal " * "
( org-test-with-temp-text " * A "
( org-edit-headline " " )
( buffer-string ) ) ) )
( should
( equal " * A "
( org-test-with-temp-text " * "
( org-edit-headline " A " )
( buffer-string ) ) ) )
;; Handle TODO keywords and priority cookies.
( should
( equal " * TODO B "
( org-test-with-temp-text " * TODO A "
( org-edit-headline " B " )
( buffer-string ) ) ) )
( should
( equal " * [#A] B "
( org-test-with-temp-text " * [#A] A "
( org-edit-headline " B " )
( buffer-string ) ) ) )
( should
( equal " * TODO [#A] B "
( org-test-with-temp-text " * TODO [#A] A "
( org-edit-headline " B " )
( buffer-string ) ) ) )
;; Handle tags.
( equal " * B :tag: "
( org-test-with-temp-text " * A :tag: "
( let ( ( org-tags-column 4 ) ) ( org-edit-headline " B " ) )
( buffer-string ) ) ) )
2016-01-13 08:48:10 -05:00
2014-10-14 04:53:47 -04:00
;;; Keywords
( ert-deftest test-org/set-regexps-and-options ( )
" Test `org-set-regexps-and-options' specifications. "
;; TAGS keyword.
2016-04-17 14:42:08 -04:00
( should
( equal ' ( ( " A " ) )
( let ( ( org-tag-alist ' ( ( " A " ) ) )
( org-tag-persistent-alist nil ) )
( org-test-with-temp-text " "
( org-mode-restart )
org-current-tag-alist ) ) ) )
( should
( equal ' ( ( " B " ) )
( let ( ( org-tag-alist ' ( ( " A " ) ) )
( org-tag-persistent-alist nil ) )
( org-test-with-temp-text " #+TAGS: B "
( org-mode-restart )
org-current-tag-alist ) ) ) )
( should
( equal ' ( ( " C " ) ( " B " ) )
( let ( ( org-tag-alist ' ( ( " A " ) ) )
( org-tag-persistent-alist ' ( ( " C " ) ) ) )
( org-test-with-temp-text " #+TAGS: B "
( org-mode-restart )
org-current-tag-alist ) ) ) )
( should
( equal ' ( ( " B " ) )
( let ( ( org-tag-alist ' ( ( " A " ) ) )
( org-tag-persistent-alist ' ( ( " C " ) ) ) )
( org-test-with-temp-text " #+STARTUP: noptag \n #+TAGS: B "
( org-mode-restart )
org-current-tag-alist ) ) ) )
2014-10-14 04:53:47 -04:00
( should
( equal ' ( ( " A " . ?a ) ( " B " ) ( " C " ) )
2022-09-15 23:30:16 -04:00
( let ( ( org-tag-persistent-alist nil ) )
2016-04-17 14:42:08 -04:00
( org-test-with-temp-text " #+TAGS: A(a) B C "
( org-mode-restart )
org-current-tag-alist ) ) ) )
2014-10-14 04:53:47 -04:00
( should
( equal ' ( ( " A " ) ( :newline ) ( " B " ) )
2016-04-17 14:42:08 -04:00
( let ( ( org-tag-persistent-alist nil ) )
( org-test-with-temp-text " #+TAGS: A \n #+TAGS: B "
( org-mode-restart )
org-current-tag-alist ) ) ) )
2014-10-14 04:53:47 -04:00
( should
( equal ' ( ( :startgroup ) ( " A " ) ( " B " ) ( :endgroup ) ( " C " ) )
2016-04-17 14:42:08 -04:00
( let ( ( org-tag-persistent-alist nil ) )
( org-test-with-temp-text " #+TAGS: { A B } C "
( org-mode-restart )
org-current-tag-alist ) ) ) )
2014-10-14 04:53:47 -04:00
( should
( equal ' ( ( :startgroup ) ( " A " ) ( :grouptags ) ( " B " ) ( " C " ) ( :endgroup ) )
2016-04-17 14:42:08 -04:00
( let ( ( org-tag-persistent-alist nil ) )
( org-test-with-temp-text " #+TAGS: { A : B C } "
( org-mode-restart )
org-current-tag-alist ) ) ) )
2014-10-14 04:53:47 -04:00
( should
( equal ' ( ( " A " " B " " C " ) )
2016-04-17 14:42:08 -04:00
( let ( ( org-tag-persistent-alist nil ) )
( org-test-with-temp-text " #+TAGS: { A : B C } "
( org-mode-restart )
org-tag-groups-alist ) ) ) )
2015-01-23 20:47:26 -05:00
( should
( equal ' ( ( :startgrouptag ) ( " A " ) ( :grouptags ) ( " B " ) ( " C " ) ( :endgrouptag ) )
2016-04-17 14:42:08 -04:00
( let ( ( org-tag-persistent-alist nil ) )
( org-test-with-temp-text " #+TAGS: [ A : B C ] "
( org-mode-restart )
org-current-tag-alist ) ) ) )
2015-01-23 20:47:26 -05:00
( should
( equal ' ( ( " A " " B " " C " ) )
2016-04-17 14:42:08 -04:00
( let ( ( org-tag-persistent-alist nil ) )
( org-test-with-temp-text " #+TAGS: [ A : B C ] "
( org-mode-restart )
org-tag-groups-alist ) ) ) )
2020-09-17 00:16:14 -04:00
( should-not
( let ( ( org-tag-alist ' ( ( " A " ) ) ) )
( org-test-with-temp-text " #+TAGS: "
( org-mode-restart )
org-current-tag-alist ) ) )
2014-10-14 04:53:47 -04:00
;; FILETAGS keyword.
( should
( equal ' ( " A " " B " " C " )
( org-test-with-temp-text " #+FILETAGS: :A:B:C: "
( org-mode-restart )
org-file-tags ) ) )
;; PROPERTY keyword. Property names are case-insensitive.
( should
( equal " foo=1 "
( org-test-with-temp-text " #+PROPERTY: var foo=1 "
( org-mode-restart )
Org document property-drawers
Add functionality to define property-blocks on document level, in
addition to at headline level.
* doc/org-manual.org:
* etc/ORG-NEWS: Document new functionality.
* lisp/org.el (org-keyword-regexp): Define constant instead of
hardcoding.
(org-file-properties): Renamed, see next line.
(org-keyword-properties): Renamed from above. Due to the fact that
properties can be defined for the whole document using property
drawers this local variable needs a rename to make its name less
ambigous.
(org-refresh-properties, org-refresh-property, org-entry-properties)
(org-refresh-category-properties, org-get-property-block)
(org-entry-get-with-inheritance, org-entry-put)
(org-insert-property-drawer, org-end-of-subtree): Made to work before
first headline.
(org-at-property-block-p): New function to validate if point is at the
start of a property block.
(org-property-global-value): Renamed, see next line.
(org-property-global-or-keyword-value): Renamed from above to match
its functionality better.
(org-back-to-heading-or-point-min): New function to make a document
work as a level 0 node in the outline.
(org-at-keyword-p): Predicate function to answer to if we're currently
at a keyword line or not.
(org-up-heading-or-point-min): New function to make a document work as
a level 0 node in the outline.
* lisp/org-element.el (org-element--current-element): Can now detect
property-blocks before first headline according to it's positional
rules.
* lisp/org-attach.el (org-attach): Make it possible to call the
attachment dispatcher also before the first headline, since document
property drawers make attachments possible for the whole document
now.
* lisp/org-capture.el: Modified only due to rename of function in
org.el.
* lisp/org-compat.el (org-file-properties)
(org-property-global-value): Renamed functions declared obsolete.
* testing/lisp/test-org.el (org/insert-property-drawer)
(org/set-property, org/delete-property, org/delete-property-globally):
Additions of tests to check if they work before first headline.
(org/at-property-p, org/at-property-block-p, org/get-property-block)
(org/entry-get, org/refresh-properties): New tests
* testing/examples/property-inheritance.org: Switch from
property-keywords to a property-drawer in the testfile.
Functionality should be the same, but now using a document drawer
instead of property-keywords.
Reason for switching is that I'd like us to slowly depricate
property-keywords.
* testing/lisp/test-org-element.el:
* contrib/lisp/ox-taskjuggler.el: A comment is modified only due to
rename of function in org.el.
2019-05-26 16:13:09 -04:00
( cdr ( assoc " var " org-keyword-properties ) ) ) ) )
2014-10-14 04:53:47 -04:00
( should
( equal
" foo=1 bar=2 "
( org-test-with-temp-text " #+PROPERTY: var foo=1 \n #+PROPERTY: var+ bar=2 "
( org-mode-restart )
Org document property-drawers
Add functionality to define property-blocks on document level, in
addition to at headline level.
* doc/org-manual.org:
* etc/ORG-NEWS: Document new functionality.
* lisp/org.el (org-keyword-regexp): Define constant instead of
hardcoding.
(org-file-properties): Renamed, see next line.
(org-keyword-properties): Renamed from above. Due to the fact that
properties can be defined for the whole document using property
drawers this local variable needs a rename to make its name less
ambigous.
(org-refresh-properties, org-refresh-property, org-entry-properties)
(org-refresh-category-properties, org-get-property-block)
(org-entry-get-with-inheritance, org-entry-put)
(org-insert-property-drawer, org-end-of-subtree): Made to work before
first headline.
(org-at-property-block-p): New function to validate if point is at the
start of a property block.
(org-property-global-value): Renamed, see next line.
(org-property-global-or-keyword-value): Renamed from above to match
its functionality better.
(org-back-to-heading-or-point-min): New function to make a document
work as a level 0 node in the outline.
(org-at-keyword-p): Predicate function to answer to if we're currently
at a keyword line or not.
(org-up-heading-or-point-min): New function to make a document work as
a level 0 node in the outline.
* lisp/org-element.el (org-element--current-element): Can now detect
property-blocks before first headline according to it's positional
rules.
* lisp/org-attach.el (org-attach): Make it possible to call the
attachment dispatcher also before the first headline, since document
property drawers make attachments possible for the whole document
now.
* lisp/org-capture.el: Modified only due to rename of function in
org.el.
* lisp/org-compat.el (org-file-properties)
(org-property-global-value): Renamed functions declared obsolete.
* testing/lisp/test-org.el (org/insert-property-drawer)
(org/set-property, org/delete-property, org/delete-property-globally):
Additions of tests to check if they work before first headline.
(org/at-property-p, org/at-property-block-p, org/get-property-block)
(org/entry-get, org/refresh-properties): New tests
* testing/examples/property-inheritance.org: Switch from
property-keywords to a property-drawer in the testfile.
Functionality should be the same, but now using a document drawer
instead of property-keywords.
Reason for switching is that I'd like us to slowly depricate
property-keywords.
* testing/lisp/test-org-element.el:
* contrib/lisp/ox-taskjuggler.el: A comment is modified only due to
rename of function in org.el.
2019-05-26 16:13:09 -04:00
( cdr ( assoc " var " org-keyword-properties ) ) ) ) )
2014-10-14 04:53:47 -04:00
( should
( equal
" foo=1 bar=2 "
( org-test-with-temp-text " #+PROPERTY: var foo=1 \n #+PROPERTY: VAR+ bar=2 "
( org-mode-restart )
Org document property-drawers
Add functionality to define property-blocks on document level, in
addition to at headline level.
* doc/org-manual.org:
* etc/ORG-NEWS: Document new functionality.
* lisp/org.el (org-keyword-regexp): Define constant instead of
hardcoding.
(org-file-properties): Renamed, see next line.
(org-keyword-properties): Renamed from above. Due to the fact that
properties can be defined for the whole document using property
drawers this local variable needs a rename to make its name less
ambigous.
(org-refresh-properties, org-refresh-property, org-entry-properties)
(org-refresh-category-properties, org-get-property-block)
(org-entry-get-with-inheritance, org-entry-put)
(org-insert-property-drawer, org-end-of-subtree): Made to work before
first headline.
(org-at-property-block-p): New function to validate if point is at the
start of a property block.
(org-property-global-value): Renamed, see next line.
(org-property-global-or-keyword-value): Renamed from above to match
its functionality better.
(org-back-to-heading-or-point-min): New function to make a document
work as a level 0 node in the outline.
(org-at-keyword-p): Predicate function to answer to if we're currently
at a keyword line or not.
(org-up-heading-or-point-min): New function to make a document work as
a level 0 node in the outline.
* lisp/org-element.el (org-element--current-element): Can now detect
property-blocks before first headline according to it's positional
rules.
* lisp/org-attach.el (org-attach): Make it possible to call the
attachment dispatcher also before the first headline, since document
property drawers make attachments possible for the whole document
now.
* lisp/org-capture.el: Modified only due to rename of function in
org.el.
* lisp/org-compat.el (org-file-properties)
(org-property-global-value): Renamed functions declared obsolete.
* testing/lisp/test-org.el (org/insert-property-drawer)
(org/set-property, org/delete-property, org/delete-property-globally):
Additions of tests to check if they work before first headline.
(org/at-property-p, org/at-property-block-p, org/get-property-block)
(org/entry-get, org/refresh-properties): New tests
* testing/examples/property-inheritance.org: Switch from
property-keywords to a property-drawer in the testfile.
Functionality should be the same, but now using a document drawer
instead of property-keywords.
Reason for switching is that I'd like us to slowly depricate
property-keywords.
* testing/lisp/test-org-element.el:
* contrib/lisp/ox-taskjuggler.el: A comment is modified only due to
rename of function in org.el.
2019-05-26 16:13:09 -04:00
( cdr ( assoc " var " org-keyword-properties ) ) ) ) )
2014-10-14 04:53:47 -04:00
;; ARCHIVE keyword.
( should
( equal " %s_done:: "
( org-test-with-temp-text " #+ARCHIVE: %s_done:: "
( org-mode-restart )
org-archive-location ) ) )
;; CATEGORY keyword.
( should
( eq 'test
( org-test-with-temp-text " #+CATEGORY: test "
( org-mode-restart )
org-category ) ) )
( should
( equal " test "
( org-test-with-temp-text " #+CATEGORY: test "
( org-mode-restart )
Org document property-drawers
Add functionality to define property-blocks on document level, in
addition to at headline level.
* doc/org-manual.org:
* etc/ORG-NEWS: Document new functionality.
* lisp/org.el (org-keyword-regexp): Define constant instead of
hardcoding.
(org-file-properties): Renamed, see next line.
(org-keyword-properties): Renamed from above. Due to the fact that
properties can be defined for the whole document using property
drawers this local variable needs a rename to make its name less
ambigous.
(org-refresh-properties, org-refresh-property, org-entry-properties)
(org-refresh-category-properties, org-get-property-block)
(org-entry-get-with-inheritance, org-entry-put)
(org-insert-property-drawer, org-end-of-subtree): Made to work before
first headline.
(org-at-property-block-p): New function to validate if point is at the
start of a property block.
(org-property-global-value): Renamed, see next line.
(org-property-global-or-keyword-value): Renamed from above to match
its functionality better.
(org-back-to-heading-or-point-min): New function to make a document
work as a level 0 node in the outline.
(org-at-keyword-p): Predicate function to answer to if we're currently
at a keyword line or not.
(org-up-heading-or-point-min): New function to make a document work as
a level 0 node in the outline.
* lisp/org-element.el (org-element--current-element): Can now detect
property-blocks before first headline according to it's positional
rules.
* lisp/org-attach.el (org-attach): Make it possible to call the
attachment dispatcher also before the first headline, since document
property drawers make attachments possible for the whole document
now.
* lisp/org-capture.el: Modified only due to rename of function in
org.el.
* lisp/org-compat.el (org-file-properties)
(org-property-global-value): Renamed functions declared obsolete.
* testing/lisp/test-org.el (org/insert-property-drawer)
(org/set-property, org/delete-property, org/delete-property-globally):
Additions of tests to check if they work before first headline.
(org/at-property-p, org/at-property-block-p, org/get-property-block)
(org/entry-get, org/refresh-properties): New tests
* testing/examples/property-inheritance.org: Switch from
property-keywords to a property-drawer in the testfile.
Functionality should be the same, but now using a document drawer
instead of property-keywords.
Reason for switching is that I'd like us to slowly depricate
property-keywords.
* testing/lisp/test-org-element.el:
* contrib/lisp/ox-taskjuggler.el: A comment is modified only due to
rename of function in org.el.
2019-05-26 16:13:09 -04:00
( cdr ( assoc " CATEGORY " org-keyword-properties ) ) ) ) )
2014-10-14 04:53:47 -04:00
;; COLUMNS keyword.
( should
( equal " %25ITEM %TAGS %PRIORITY %TODO "
( org-test-with-temp-text " #+COLUMNS: %25ITEM %TAGS %PRIORITY %TODO "
( org-mode-restart )
org-columns-default-format ) ) )
;; CONSTANTS keyword. Constants names are case sensitive.
( should
( equal ' ( " 299792458. " " 3.14 " )
( org-test-with-temp-text " #+CONSTANTS: c=299792458. pi=3.14 "
( org-mode-restart )
( mapcar
( lambda ( n ) ( cdr ( assoc n org-table-formula-constants-local ) ) )
' ( " c " " pi " ) ) ) ) )
( should
( equal " 3.14 "
( org-test-with-temp-text " #+CONSTANTS: pi=22/7 pi=3.14 "
( org-mode-restart )
( cdr ( assoc " pi " org-table-formula-constants-local ) ) ) ) )
( should
( equal " 22/7 "
( org-test-with-temp-text " #+CONSTANTS: PI=22/7 pi=3.14 "
( org-mode-restart )
( cdr ( assoc " PI " org-table-formula-constants-local ) ) ) ) )
;; LINK keyword.
( should
( equal
' ( " url1 " " url2 " )
( org-test-with-temp-text " #+LINK: a url1 \n #+LINK: b url2 "
( org-mode-restart )
( mapcar ( lambda ( abbrev ) ( cdr ( assoc abbrev org-link-abbrev-alist-local ) ) )
' ( " a " " b " ) ) ) ) )
;; PRIORITIES keyword. Incomplete priorities sets are ignored.
( should
( equal
' ( ?X ?Z ?Y )
( org-test-with-temp-text " #+PRIORITIES: X Z Y "
( org-mode-restart )
2020-01-30 08:56:38 -05:00
( list org-priority-highest org-priority-lowest org-priority-default ) ) ) )
2014-10-14 04:53:47 -04:00
( should
( equal
' ( ?A ?C ?B )
( org-test-with-temp-text " #+PRIORITIES: X Z "
( org-mode-restart )
2020-01-30 08:56:38 -05:00
( list org-priority-highest org-priority-lowest org-priority-default ) ) ) )
2014-10-14 04:53:47 -04:00
;; STARTUP keyword.
( should
( equal ' ( t t )
( org-test-with-temp-text " #+STARTUP: fold odd "
( org-mode-restart )
( list org-startup-folded org-odd-levels-only ) ) ) )
;; TODO keywords.
( should
( equal ' ( ( " A " " B " ) ( " C " ) )
( org-test-with-temp-text " #+TODO: A B | C "
( org-mode-restart )
( list org-not-done-keywords org-done-keywords ) ) ) )
2014-10-15 04:49:40 -04:00
( should
( equal ' ( ( " A " " C " ) ( " B " " D " ) )
( org-test-with-temp-text " #+TODO: A | B \n #+TODO: C | D "
( org-mode-restart )
( list org-not-done-keywords org-done-keywords ) ) ) )
2014-10-14 04:53:47 -04:00
( should
( equal ' ( ( " A " " B " ) ( " C " ) )
( org-test-with-temp-text " #+TYP_TODO: A B | C "
( org-mode-restart )
( list org-not-done-keywords org-done-keywords ) ) ) )
( should
( equal ' ( ( :startgroup ) ( " A " . ?a ) ( :endgroup ) )
( org-test-with-temp-text " #+TODO: A(a) "
( org-mode-restart )
org-todo-key-alist ) ) )
( should
( equal ' ( ( " D " note nil ) ( " C " time nil ) ( " B " note time ) )
( org-test-with-temp-text " #+TODO: A(a) B(b@/!) | C(c!) D(d@) "
( org-mode-restart )
org-todo-log-states ) ) )
;; Enter SETUPFILE keyword.
( should
( equal " 1 "
( org-test-with-temp-text
( format " #+SETUPFILE: \" %s/examples/setupfile.org \" " org-test-dir )
( org-mode-restart )
Org document property-drawers
Add functionality to define property-blocks on document level, in
addition to at headline level.
* doc/org-manual.org:
* etc/ORG-NEWS: Document new functionality.
* lisp/org.el (org-keyword-regexp): Define constant instead of
hardcoding.
(org-file-properties): Renamed, see next line.
(org-keyword-properties): Renamed from above. Due to the fact that
properties can be defined for the whole document using property
drawers this local variable needs a rename to make its name less
ambigous.
(org-refresh-properties, org-refresh-property, org-entry-properties)
(org-refresh-category-properties, org-get-property-block)
(org-entry-get-with-inheritance, org-entry-put)
(org-insert-property-drawer, org-end-of-subtree): Made to work before
first headline.
(org-at-property-block-p): New function to validate if point is at the
start of a property block.
(org-property-global-value): Renamed, see next line.
(org-property-global-or-keyword-value): Renamed from above to match
its functionality better.
(org-back-to-heading-or-point-min): New function to make a document
work as a level 0 node in the outline.
(org-at-keyword-p): Predicate function to answer to if we're currently
at a keyword line or not.
(org-up-heading-or-point-min): New function to make a document work as
a level 0 node in the outline.
* lisp/org-element.el (org-element--current-element): Can now detect
property-blocks before first headline according to it's positional
rules.
* lisp/org-attach.el (org-attach): Make it possible to call the
attachment dispatcher also before the first headline, since document
property drawers make attachments possible for the whole document
now.
* lisp/org-capture.el: Modified only due to rename of function in
org.el.
* lisp/org-compat.el (org-file-properties)
(org-property-global-value): Renamed functions declared obsolete.
* testing/lisp/test-org.el (org/insert-property-drawer)
(org/set-property, org/delete-property, org/delete-property-globally):
Additions of tests to check if they work before first headline.
(org/at-property-p, org/at-property-block-p, org/get-property-block)
(org/entry-get, org/refresh-properties): New tests
* testing/examples/property-inheritance.org: Switch from
property-keywords to a property-drawer in the testfile.
Functionality should be the same, but now using a document drawer
instead of property-keywords.
Reason for switching is that I'd like us to slowly depricate
property-keywords.
* testing/lisp/test-org-element.el:
* contrib/lisp/ox-taskjuggler.el: A comment is modified only due to
rename of function in org.el.
2019-05-26 16:13:09 -04:00
( cdr ( assoc " a " org-keyword-properties ) ) ) ) ) )
2014-10-14 04:53:47 -04:00
2021-10-23 05:18:10 -04:00
( ert-deftest test-org/collect-keywords ( )
" Test `org-collect-keywords' . "
( should-not
( org-test-with-temp-text " #+begin_example \n #+foo: bar \n #+end_example "
( org-collect-keywords ' ( " FOO " ) ) ) ) )
2014-10-14 04:53:47 -04:00
2012-07-31 07:21:38 -04:00
2012-10-10 07:19:25 -04:00
;;; Links
2012-07-31 07:21:38 -04:00
2014-03-21 09:51:34 -04:00
;;;; Coderefs
( ert-deftest test-org/coderef ( )
" Test coderef links specifications. "
( should
( org-test-with-temp-text "
# +BEGIN_SRC emacs-lisp
\(+ 1 1 ) ( ref:sc )
# +END_SRC
2015-10-31 18:32:47 -04:00
\[ [ ( sc ) <point> ] ] "
2015-08-02 19:06:32 -04:00
( org-open-at-point )
( looking-at " (ref:sc) " ) ) )
;; Find coderef even with alternate label format.
( should
( org-test-with-temp-text "
# +BEGIN_SRC emacs-lisp -l \"{ref:%s}\"
\(+ 1 1 ) {ref:sc}
# +END_SRC
2015-10-31 18:32:47 -04:00
\[ [ ( sc ) <point> ] ] "
2014-03-21 09:51:34 -04:00
( org-open-at-point )
2015-08-02 19:06:32 -04:00
( looking-at " {ref:sc} " ) ) ) )
2014-03-21 09:51:34 -04:00
2014-02-23 05:35:34 -05:00
;;;; Custom ID
( ert-deftest test-org/custom-id ( )
" Test custom ID links specifications. "
( should
( org-test-with-temp-text
2015-10-31 18:32:47 -04:00
" * H1 \n :PROPERTIES: \n :CUSTOM_ID: custom \n :END: \n * H2 \n [[#custom<point>]] "
2014-02-23 05:35:34 -05:00
( org-open-at-point )
Remove final parts of XEmacs compatibility code
* lisp/org-compat.el: Declare `org-add-hook', `org-decompose-region',
`org-detach-overlay', `org-file-equal-p', `org-float-time',
`org-indent-line-to', `org-indent-to-column', `org-looking-at-p',
`org-looking-back', `org-propertize', `org-re' and
`org-select-frame-set-input-focus' as obsolete.
(org-overlay-display, org-overlay-before-string, org-find-overlays):
Move to "org.el"
(org-xemacs-key-equivalents, org-xemacs-p): Remove variables.
(org-region-active-p): Drop XEmacs support.
(org-xemacs-without-invisibility): Remove macro.
(org-get-x-clipboard-compat): Remove function.
* lisp/org-macs.el (org-match-string-no-properties): Remove function.
* lisp/ob-core.el:
* lisp/org-agenda.el:
* lisp/org-archive.el:
* lisp/org-clock.el:
* lisp/org-colview.el:
* lisp/org-crypt.el:
* lisp/org-element.el:
* lisp/org-faces.el:
* lisp/org-feed.el:
* lisp/org-footnote.el:
* lisp/org-habit.el:
* lisp/org-id.el:
* lisp/org-indent.el:
* lisp/org-inlinetask.el:
* lisp/org-lint.el:
* lisp/org-list.el:
* lisp/org-mouse.el:
* lisp/org-pcomplete.el:
* lisp/org-src.el:
* lisp/org-table.el:
* lisp/org-timer.el:
* lisp/org.el:
* lisp/ox-ascii.el:
* lisp/ox-odt.el:
* lisp/ox.el:
* contrib/lisp/org-notify.el:
* contrib/lisp/ox-taskjuggler.el:
* contrib/lisp/org-wikinodes.el:
* testing/lisp/test-org-src.el:
* testing/lisp/test-org.el: Silence byte-compiler.
2016-05-26 06:18:00 -04:00
( looking-at-p " \\ * H1 " ) ) )
2018-11-26 17:55:05 -05:00
;; Handle escape characters.
( should
( org-test-with-temp-text
2019-12-22 08:52:53 -05:00
" * H1 \n :PROPERTIES: \n :CUSTOM_ID: [%] \n :END: \n * H2 \n [[# \\ [% \\ ]<point>]] "
2018-11-26 17:55:05 -05:00
( org-open-at-point )
( looking-at-p " \\ * H1 " ) ) )
2015-08-02 19:06:32 -04:00
;; Throw an error on false positives.
( should-error
2015-03-15 07:07:40 -04:00
( org-test-with-temp-text
2015-10-31 18:32:47 -04:00
" * H1 \n :DRAWER: \n :CUSTOM_ID: custom \n :END: \n * H2 \n [[#custom<point>]] "
2015-08-02 19:06:32 -04:00
( org-open-at-point )
Remove final parts of XEmacs compatibility code
* lisp/org-compat.el: Declare `org-add-hook', `org-decompose-region',
`org-detach-overlay', `org-file-equal-p', `org-float-time',
`org-indent-line-to', `org-indent-to-column', `org-looking-at-p',
`org-looking-back', `org-propertize', `org-re' and
`org-select-frame-set-input-focus' as obsolete.
(org-overlay-display, org-overlay-before-string, org-find-overlays):
Move to "org.el"
(org-xemacs-key-equivalents, org-xemacs-p): Remove variables.
(org-region-active-p): Drop XEmacs support.
(org-xemacs-without-invisibility): Remove macro.
(org-get-x-clipboard-compat): Remove function.
* lisp/org-macs.el (org-match-string-no-properties): Remove function.
* lisp/ob-core.el:
* lisp/org-agenda.el:
* lisp/org-archive.el:
* lisp/org-clock.el:
* lisp/org-colview.el:
* lisp/org-crypt.el:
* lisp/org-element.el:
* lisp/org-faces.el:
* lisp/org-feed.el:
* lisp/org-footnote.el:
* lisp/org-habit.el:
* lisp/org-id.el:
* lisp/org-indent.el:
* lisp/org-inlinetask.el:
* lisp/org-lint.el:
* lisp/org-list.el:
* lisp/org-mouse.el:
* lisp/org-pcomplete.el:
* lisp/org-src.el:
* lisp/org-table.el:
* lisp/org-timer.el:
* lisp/org.el:
* lisp/ox-ascii.el:
* lisp/ox-odt.el:
* lisp/ox.el:
* contrib/lisp/org-notify.el:
* contrib/lisp/ox-taskjuggler.el:
* contrib/lisp/org-wikinodes.el:
* testing/lisp/test-org-src.el:
* testing/lisp/test-org.el: Silence byte-compiler.
2016-05-26 06:18:00 -04:00
( looking-at-p " \\ * H1 " ) ) ) )
2014-02-23 05:35:34 -05:00
2012-10-10 07:19:25 -04:00
;;;; Fuzzy Links
;; Fuzzy links [[text]] encompass links to a target (<<text>>), to
;; a named element (#+name: text) and to headlines (* Text).
( ert-deftest test-org/fuzzy-links ( )
" Test fuzzy links specifications. "
2014-03-21 09:51:34 -04:00
;; Fuzzy link goes in priority to a matching target.
2013-04-04 13:23:07 -04:00
( should
2015-08-02 19:06:32 -04:00
( org-test-with-temp-text
" #+NAME: Test \n |a|b| \n <<Test>> \n * Test \n <point>[[Test]] "
( let ( ( org-link-search-must-match-exact-headline nil ) ) ( org-open-at-point ) )
2013-04-04 13:23:07 -04:00
( looking-at " <<Test>> " ) ) )
2014-03-21 09:51:34 -04:00
;; Then fuzzy link points to an element with a given name.
2013-04-04 13:23:07 -04:00
( should
2015-08-02 19:06:32 -04:00
( org-test-with-temp-text " Test \n #+NAME: Test \n |a|b| \n * Test \n <point>[[Test]] "
( let ( ( org-link-search-must-match-exact-headline nil ) ) ( org-open-at-point ) )
2013-04-04 13:23:07 -04:00
( looking-at " # \\ +NAME: Test " ) ) )
2014-03-21 09:51:34 -04:00
;; A target still lead to a matching headline otherwise.
2013-04-04 13:23:07 -04:00
( should
2015-08-02 19:06:32 -04:00
( org-test-with-temp-text " * Head1 \n * Head2 \n *Head3 \n <point>[[Head2]] "
( let ( ( org-link-search-must-match-exact-headline nil ) ) ( org-open-at-point ) )
2013-04-04 13:23:07 -04:00
( looking-at " \\ * Head2 " ) ) )
2014-03-21 09:51:34 -04:00
;; With a leading star in link, enforce heading match.
2013-04-04 13:23:07 -04:00
( should
2015-08-02 19:06:32 -04:00
( org-test-with-temp-text " * Test \n <<Test>> \n <point>[[*Test]] "
( let ( ( org-link-search-must-match-exact-headline nil ) ) ( org-open-at-point ) )
2014-03-21 09:51:34 -04:00
( looking-at " \\ * Test " ) ) )
2014-12-12 02:26:05 -05:00
;; With a leading star in link, enforce exact heading match, even
;; with `org-link-search-must-match-exact-headline' set to nil.
( should-error
( org-test-with-temp-text " * Test 1 \n Foo Bar \n <point>[[*Test]] "
( let ( ( org-link-search-must-match-exact-headline nil ) )
( org-open-at-point ) ) ) )
2015-08-02 19:06:32 -04:00
;; Handle non-nil `org-link-search-must-match-exact-headline'.
( should
( org-test-with-temp-text " * Test \n Foo Bar \n <point>[[Test]] "
( let ( ( org-link-search-must-match-exact-headline t ) ) ( org-open-at-point ) )
( looking-at " \\ * Test " ) ) )
( should
( org-test-with-temp-text " * Test \n Foo Bar \n <point>[[*Test]] "
( let ( ( org-link-search-must-match-exact-headline t ) ) ( org-open-at-point ) )
( looking-at " \\ * Test " ) ) )
;; Heading match should not care about spaces, cookies, TODO
2016-11-13 04:58:23 -05:00
;; keywords, priorities, and tags. However, TODO keywords are
;; case-sensitive.
2014-12-12 02:26:05 -05:00
( should
( let ( ( first-line
" ** TODO [#A] [/] Test [1/2] [33%] 1 \t 2 [%] :work:urgent: " ) )
( org-test-with-temp-text
( concat first-line " \n Foo Bar \n <point>[[*Test 1 2]] " )
( let ( ( org-link-search-must-match-exact-headline nil )
( org-todo-regexp " TODO " ) )
( org-open-at-point ) )
( looking-at ( regexp-quote first-line ) ) ) ) )
2016-11-13 04:58:23 -05:00
( should-error
( org-test-with-temp-text " ** todo Test 1 2 \n Foo Bar \n <point>[[*Test 1 2]] "
( let ( ( org-link-search-must-match-exact-headline nil )
( org-todo-regexp " TODO " ) )
( org-open-at-point ) ) ) )
2014-12-12 02:26:05 -05:00
;; Heading match should still be exact.
( should-error
2016-11-13 04:58:23 -05:00
( org-test-with-temp-text "
** TODO [ # A ] [ / ] Test [ 1/2 ] [ 33% ] 1 \t 2 [ % ] :work:urgent:
Foo Bar
<point> [ [ *Test 1 ] ] "
( let ( ( org-link-search-must-match-exact-headline nil )
( org-todo-regexp " TODO " ) )
( org-open-at-point ) ) ) )
( should
( org-test-with-temp-text " * Test 1 2 3 \n ** Test 1 2 \n <point>[[*Test 1 2]] "
( let ( ( org-link-search-must-match-exact-headline nil )
( org-todo-regexp " TODO " ) )
( org-open-at-point ) )
( looking-at-p ( regexp-quote " ** Test 1 2 " ) ) ) )
2015-03-26 16:05:27 -04:00
;; Heading match ignores COMMENT keyword.
( should
( org-test-with-temp-text " [[*Test]] \n * COMMENT Test "
( org-open-at-point )
( looking-at " \\ * COMMENT Test " ) ) )
2016-12-26 04:29:54 -05:00
( should
( org-test-with-temp-text " [[*Test]] \n * TODO COMMENT Test "
( org-open-at-point )
( looking-at " \\ * TODO COMMENT Test " ) ) )
2019-03-09 04:58:41 -05:00
;; Correctly un-escape fuzzy links.
2014-03-21 09:51:34 -04:00
( should
2019-12-22 08:52:53 -05:00
( org-test-with-temp-text " * [foo] \n [[* \\ [foo \\ ]][With escaped characters]] "
2014-03-21 09:51:34 -04:00
( org-open-at-point )
2017-03-27 07:34:04 -04:00
( bobp ) ) )
2017-03-29 08:17:50 -04:00
;; Match search strings containing newline characters, including
;; blank lines.
2017-03-27 07:34:04 -04:00
( should
( org-test-with-temp-text-in-file " Paragraph \n \n line1 \n line2 \n \n "
2017-03-29 08:17:50 -04:00
( let ( ( file ( buffer-file-name ) ) )
( goto-char ( point-max ) )
( insert ( format " [[file:%s::line1 line2]] " file ) )
( beginning-of-line )
( let ( ( org-link-search-must-match-exact-headline nil ) )
2017-04-07 11:41:47 -04:00
( org-open-at-point 0 ) )
2017-03-29 08:17:50 -04:00
( looking-at-p " line1 " ) ) ) )
( should
( org-test-with-temp-text-in-file " Paragraph \n \n line1 \n \n line2 \n \n "
2017-03-27 07:34:04 -04:00
( let ( ( file ( buffer-file-name ) ) )
( goto-char ( point-max ) )
( insert ( format " [[file:%s::line1 line2]] " file ) )
( beginning-of-line )
( let ( ( org-link-search-must-match-exact-headline nil ) )
2017-04-07 11:41:47 -04:00
( org-open-at-point 0 ) )
2017-03-27 07:34:04 -04:00
( looking-at-p " line1 " ) ) ) ) )
2012-10-10 07:19:25 -04:00
2014-06-01 07:35:48 -04:00
;;;; Open at point
2017-06-22 04:32:40 -04:00
( ert-deftest test-org/open-at-point/keyword ( )
2015-04-05 08:15:23 -04:00
" Does `org-open-at-point' open link in a keyword line? "
( should
( org-test-with-temp-text
2016-05-20 15:59:50 -04:00
" <<top>> \n #+KEYWORD: <point>[[top]] "
2017-06-22 04:32:40 -04:00
( org-open-at-point ) t ) )
( should
( org-test-with-temp-text
" * H \n <<top>> \n #+KEYWORD: <point>[[top]] "
2015-04-05 08:15:23 -04:00
( org-open-at-point ) t ) ) )
2017-06-22 04:32:40 -04:00
( ert-deftest test-org/open-at-point/property ( )
2014-06-02 16:33:28 -04:00
" Does `org-open-at-point' open link in property drawer? "
2014-06-02 15:05:46 -04:00
( should
2014-06-02 16:33:28 -04:00
( org-test-with-temp-text
2015-04-05 08:15:23 -04:00
" * Headline
2014-06-01 07:35:48 -04:00
:PROPERTIES:
2016-05-20 15:59:50 -04:00
:URL: <point> [ [ *Headline ] ]
2014-06-01 07:35:48 -04:00
:END: "
2015-04-05 08:15:23 -04:00
( org-open-at-point ) t ) ) )
2014-06-01 07:35:48 -04:00
2017-06-22 04:32:40 -04:00
( ert-deftest test-org/open-at-point/comment ( )
2014-06-02 16:33:28 -04:00
" Does `org-open-at-point' open link in a commented line? "
( should
( org-test-with-temp-text
2016-05-20 15:59:50 -04:00
" <<top>> \n # <point>[[top]] "
2017-06-22 04:32:40 -04:00
( org-open-at-point ) t ) )
( should
( org-test-with-temp-text
" * H \n <<top>> \n # <point>[[top]] "
2014-06-02 16:33:28 -04:00
( org-open-at-point ) t ) ) )
2014-11-20 17:35:28 -05:00
( ert-deftest test-org/open-at-point/inline-image ( )
" Test `org-open-at-point' on nested links. "
( should
2016-05-20 15:59:50 -04:00
( org-test-with-temp-text " <<top>> \n [[top][file:<point>unicorn.jpg]] "
2014-11-20 17:35:28 -05:00
( org-open-at-point )
2016-05-20 15:59:50 -04:00
( bobp ) ) ) )
2014-11-20 17:35:28 -05:00
2015-08-02 20:45:25 -04:00
( ert-deftest test-org/open-at-point/radio-target ( )
" Test `org-open-at-point' on radio targets. "
( should
( org-test-with-temp-text " <<<target>>> <point>target "
( org-update-radio-target-regexp )
( org-open-at-point )
( eq ( org-element-type ( org-element-context ) ) 'radio-target ) ) ) )
2022-04-23 05:39:33 -04:00
( ert-deftest test-org/open-at-point/radio-target-shadowed ( )
" Test `org-open-at-point' on shadowed radio targets. "
( should
( org-test-with-temp-text
" <<<target shadowed>>> <<<target>>> <point>target shadowed "
( org-update-radio-target-regexp )
( org-open-at-point )
( string=
( org-element-property :value
( org-element-radio-target-parser ) )
" target shadowed " ) ) ) )
2017-08-10 06:41:54 -04:00
( ert-deftest test-org/open-at-point/tag ( )
" Test `org-open-at-point' on tags. "
( should
( org-test-with-temp-text " * H :<point>tag: "
( catch :result
( cl-letf ( ( ( symbol-function 'org-tags-view )
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 17:21:37 -04:00
( lambda ( &rest _args ) ( throw :result t ) ) ) )
2017-08-10 06:41:54 -04:00
( org-open-at-point )
nil ) ) ) )
( should-not
( org-test-with-temp-text-in-file " * H<point> :tag: "
( catch :result
( cl-letf ( ( ( symbol-function 'org-tags-view )
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 17:21:37 -04:00
( lambda ( &rest _args ) ( throw :result t ) ) ) )
org-attach*, org, org-manual, org-news, ox-html, testing/*
* lisp/org-attach.el
Changed the way attachments deal with property-inheritance. It now
adheres to the =org-use-property-inheritance= setting by default but
it can be customized if needed (I recommend to enable it!).
The property ATTACH_DIR is deprecated in favour of the shorter and simpler
property DIR.
Added an explicit option to =org-attach= for unsetting
attachment-directories (i.e. remove DIR property and deal with the
attachments by interaction).
Added attachment link type with the prefix "attachment:".
Added customizations:
- org-attach-dir-relative
- org-attach-preferred-new-method
- org-attach-use-inheritance
- org-attach-id-to-path-function
Hooks added:
- org-attach-after-change-hook
- org-attach-open-hook
A new linktype "attachment" is added in order to reduce
link-duplication when wanting to link to files in attached folders of
nodes. This works for both ID and DIR properties. The goal is to
make the functionality for attachment links mirror the functionality
for file links.
* lisp/org-attach-git.el
New file, existing functionality. Code here has been factored out
from org-attach.el and if GIT-functionality is to be used this module
needs to be required sepatately. It extends org-attach by use of its
hooks.
Activating git functionality in org-attach is done by loading
org-attach-git from now on, instead of customizing a variable.
Naming of both functions and tests has been modified to match the move
of functionality into its own module.
* lisp/org.el
Inline images are shown also using attachment-links, exactly the same
as it works for file-links today.
Make org-open-at-point respect ARG when opening attachment-dir.
* lisp/org-compat.el
org-attach-directory has been deprecated in favour for
org-attach-id-dir. The new name matches its purpose better.
* lisp/ox-html.el
Export attachment links to images as inline images, in the same way as
file links work today.
* etc/ORG-NEWS
Mention the changes in this patch.
* doc/org-manual.org
The chapter "Refile, Copy, Archive" has been split into two separate
chapters.
- "Refile, Copy and Archiving" for information related to moving
existing data around.
- "Capture, Attachments, RSS Feeds and Protocols" for information
related to working with external data.
The attachment-part has been rewritten and extended to match the
changes in this patch.
The new attachment link type is mentioned both inside the attachments
chapter and in the chapter dealing with links.
Documentation related to external links has been improved.
* testing/lisp/test-org-attach-annex.el
Require org-attach-git instead of org-attach, since this file tests
the GIT-functionality.
* testing/lisp/test-org-attach.el
Add tests for org-attach.
* testing/org-test.el
Define a symbol for a file to test attachments with.
* testing/examples/*
A bunch of new example files and folders are created and are used in
testing of org-attach to verify its functionality.
2018-11-25 15:38:44 -05:00
;; When point isn't on a tag it's going to try other things,
;; possibly trying to open attachments which will return an
2019-11-12 08:44:05 -05:00
;; error if there isn't an attachment. Suppress that error.
org-attach*, org, org-manual, org-news, ox-html, testing/*
* lisp/org-attach.el
Changed the way attachments deal with property-inheritance. It now
adheres to the =org-use-property-inheritance= setting by default but
it can be customized if needed (I recommend to enable it!).
The property ATTACH_DIR is deprecated in favour of the shorter and simpler
property DIR.
Added an explicit option to =org-attach= for unsetting
attachment-directories (i.e. remove DIR property and deal with the
attachments by interaction).
Added attachment link type with the prefix "attachment:".
Added customizations:
- org-attach-dir-relative
- org-attach-preferred-new-method
- org-attach-use-inheritance
- org-attach-id-to-path-function
Hooks added:
- org-attach-after-change-hook
- org-attach-open-hook
A new linktype "attachment" is added in order to reduce
link-duplication when wanting to link to files in attached folders of
nodes. This works for both ID and DIR properties. The goal is to
make the functionality for attachment links mirror the functionality
for file links.
* lisp/org-attach-git.el
New file, existing functionality. Code here has been factored out
from org-attach.el and if GIT-functionality is to be used this module
needs to be required sepatately. It extends org-attach by use of its
hooks.
Activating git functionality in org-attach is done by loading
org-attach-git from now on, instead of customizing a variable.
Naming of both functions and tests has been modified to match the move
of functionality into its own module.
* lisp/org.el
Inline images are shown also using attachment-links, exactly the same
as it works for file-links today.
Make org-open-at-point respect ARG when opening attachment-dir.
* lisp/org-compat.el
org-attach-directory has been deprecated in favour for
org-attach-id-dir. The new name matches its purpose better.
* lisp/ox-html.el
Export attachment links to images as inline images, in the same way as
file links work today.
* etc/ORG-NEWS
Mention the changes in this patch.
* doc/org-manual.org
The chapter "Refile, Copy, Archive" has been split into two separate
chapters.
- "Refile, Copy and Archiving" for information related to moving
existing data around.
- "Capture, Attachments, RSS Feeds and Protocols" for information
related to working with external data.
The attachment-part has been rewritten and extended to match the
changes in this patch.
The new attachment link type is mentioned both inside the attachments
chapter and in the chapter dealing with links.
Documentation related to external links has been improved.
* testing/lisp/test-org-attach-annex.el
Require org-attach-git instead of org-attach, since this file tests
the GIT-functionality.
* testing/lisp/test-org-attach.el
Add tests for org-attach.
* testing/org-test.el
Define a symbol for a file to test attachments with.
* testing/examples/*
A bunch of new example files and folders are created and are used in
testing of org-attach to verify its functionality.
2018-11-25 15:38:44 -05:00
( ignore-errors
( org-open-at-point ) )
2017-08-10 06:41:54 -04:00
nil ) ) ) ) )
2012-10-10 07:19:25 -04:00
;;; Node Properties
( ert-deftest test-org/accumulated-properties-in-drawers ( )
" Ensure properties accumulate in subtree drawers. "
( org-test-at-id " 75282ba2-f77a-4309-a970-e87c149fe125 "
( org-babel-next-src-block )
( should ( equal ' ( 2 1 ) ( org-babel-execute-src-block ) ) ) ) )
2014-10-16 03:27:10 -04:00
( ert-deftest test-org/custom-properties ( )
" Test custom properties specifications. "
;; Standard test.
( should
( let ( ( org-custom-properties ' ( " FOO " ) ) )
( org-test-with-temp-text " * H \n :PROPERTIES: \n <point>:FOO: val \n :END: \n "
( org-toggle-custom-properties-visibility )
( org-invisible-p2 ) ) ) )
;; Properties are case-insensitive.
( should
( let ( ( org-custom-properties ' ( " FOO " ) ) )
( org-test-with-temp-text " * H \n :PROPERTIES: \n <point>:foo: val \n :END: \n "
( org-toggle-custom-properties-visibility )
( org-invisible-p2 ) ) ) )
( should
( let ( ( org-custom-properties ' ( " foo " ) ) )
( org-test-with-temp-text " * H \n :PROPERTIES: \n <point>:FOO: val \n :END: \n "
( org-toggle-custom-properties-visibility )
( org-invisible-p2 ) ) ) )
;; Multiple custom properties in the same drawer.
( should
( let ( ( org-custom-properties ' ( " FOO " " BAR " ) ) )
( org-test-with-temp-text
" * H \n :PROPERTIES: \n <point>:FOO: val \n :P: 1 \n :BAR: baz \n :END: \n "
2022-01-16 02:18:53 -05:00
( org-fold-reveal )
2014-10-16 03:27:10 -04:00
( org-toggle-custom-properties-visibility )
( and ( org-invisible-p2 )
( not ( progn ( forward-line ) ( org-invisible-p2 ) ) )
( progn ( forward-line ) ( org-invisible-p2 ) ) ) ) ) )
;; Hide custom properties with an empty value.
( should
( let ( ( org-custom-properties ' ( " FOO " ) ) )
( org-test-with-temp-text " * H \n :PROPERTIES: \n <point>:FOO: \n :END: \n "
( org-toggle-custom-properties-visibility )
( org-invisible-p2 ) ) ) )
;; Do not hide fake properties.
( should-not
( let ( ( org-custom-properties ' ( " FOO " ) ) )
( org-test-with-temp-text " :FOO: val \n "
( org-toggle-custom-properties-visibility )
( org-invisible-p2 ) ) ) )
( should-not
( let ( ( org-custom-properties ' ( " A " ) ) )
( org-test-with-temp-text
" * H \n :PROPERTIES: \n :A: 1 \n :END: \n \n :PROPERTIES: \n <point>:A: 2 \n :END: "
2022-01-16 02:18:53 -05:00
( org-fold-reveal )
2014-10-16 03:27:10 -04:00
( org-toggle-custom-properties-visibility )
( org-invisible-p2 ) ) ) ) )
2012-10-10 07:19:25 -04:00
;;; Mark Region
2012-08-07 07:30:09 -04:00
2020-05-31 07:55:47 -04:00
( ert-deftest test-org/mark-element ( )
" Test `org-mark-element' specifications. "
;; Mark beginning and end of element.
( should
( equal ' ( t t )
( org-test-with-temp-text " Para<point>graph "
( org-mark-element )
( list ( bobp ) ( = ( mark ) ( point-max ) ) ) ) ) )
( should
( equal ' ( t t )
( org-test-with-temp-text " P1 \n \n Para<point>graph \n \n P2 "
( org-mark-element )
( list ( looking-at " Paragraph " )
( org-with-point-at ( mark ) ( looking-at " P2 " ) ) ) ) ) )
;; Do not set mark past (point-max).
( should
( org-test-with-temp-text " Para<point>graph "
( narrow-to-region 2 6 )
( org-mark-element )
( = 6 ( mark ) ) ) ) )
2012-08-07 07:30:09 -04:00
( ert-deftest test-org/mark-subtree ( )
" Test `org-mark-subtree' specifications. "
;; Error when point is before first headline.
( should-error
( org-test-with-temp-text " Paragraph \n * Headline \n Body "
( progn ( transient-mark-mode 1 )
( org-mark-subtree ) ) ) )
;; Without argument, mark current subtree.
( should
( equal
' ( 12 32 )
( org-test-with-temp-text " * Headline \n ** Sub-headline \n Body "
( progn ( transient-mark-mode 1 )
( forward-line 2 )
( org-mark-subtree )
( list ( region-beginning ) ( region-end ) ) ) ) ) )
;; With an argument, move ARG up.
( should
( equal
' ( 1 32 )
( org-test-with-temp-text " * Headline \n ** Sub-headline \n Body "
( progn ( transient-mark-mode 1 )
( forward-line 2 )
( org-mark-subtree 1 )
2012-08-08 05:43:39 -04:00
( list ( region-beginning ) ( region-end ) ) ) ) ) )
2012-10-10 07:19:25 -04:00
;; Do not get fooled by inlinetasks.
2012-08-08 05:43:39 -04:00
( when ( featurep 'org-inlinetask )
( should
( = 1
( org-test-with-temp-text " * Headline \n *************** Task \n Contents "
( progn ( transient-mark-mode 1 )
( forward-line 1 )
( let ( ( org-inlinetask-min-level 15 ) ) ( org-mark-subtree ) )
2012-08-08 07:55:18 -04:00
( region-beginning ) ) ) ) ) ) )
2015-10-31 18:19:51 -04:00
;;; Miscellaneous
2017-05-09 14:40:19 -04:00
( ert-deftest test-org/sort-entries ( )
" Test `org-sort-entries' . "
;; Sort alphabetically.
( should
( equal " \n * abc \n * def \n * xyz \n "
( org-test-with-temp-text " \n * def \n * xyz \n * abc \n "
( org-sort-entries nil ?a )
( buffer-string ) ) ) )
( should
( equal " \n * xyz \n * def \n * abc \n "
( org-test-with-temp-text " \n * def \n * xyz \n * abc \n "
( org-sort-entries nil ?A )
( buffer-string ) ) ) )
2018-03-13 12:51:44 -04:00
( should
( equal " \n * \n * klm \n * xyz \n "
( org-test-with-temp-text " \n * xyz \n * \n * klm \n "
( org-sort-entries nil ?a )
( buffer-string ) ) ) )
2017-05-09 14:40:19 -04:00
;; Sort numerically.
( should
( equal " \n * 1 \n * 2 \n * 10 \n "
( org-test-with-temp-text " \n * 10 \n * 1 \n * 2 \n "
( org-sort-entries nil ?n )
( buffer-string ) ) ) )
( should
( equal " \n * 10 \n * 2 \n * 1 \n "
( org-test-with-temp-text " \n * 10 \n * 1 \n * 2 \n "
( org-sort-entries nil ?N )
( buffer-string ) ) ) )
2018-03-13 12:51:44 -04:00
( should
( equal " \n * \n * 1 \n * 2 \n "
( org-test-with-temp-text " \n * 1 \n * \n * 2 \n "
( org-sort-entries nil ?n )
( buffer-string ) ) ) )
2017-05-09 14:40:19 -04:00
;; Sort by custom function.
( should
( equal " \n * b \n * aa \n * ccc \n "
( org-test-with-temp-text " \n * ccc \n * b \n * aa \n "
( org-sort-entries nil ?f
( lambda ( )
( length ( buffer-substring ( point-at-bol )
( point-at-eol ) ) ) )
#' < )
( buffer-string ) ) ) )
( should
( equal " \n * ccc \n * aa \n * b \n "
( org-test-with-temp-text " \n * ccc \n * b \n * aa \n "
( org-sort-entries nil ?F
( lambda ( )
( length ( buffer-substring ( point-at-bol )
( point-at-eol ) ) ) )
#' < )
( buffer-string ) ) ) )
;; Sort by TODO keyword.
( should
( equal " \n * TODO h1 \n * TODO h3 \n * DONE h2 \n "
( org-test-with-temp-text
" \n * TODO h1 \n * DONE h2 \n * TODO h3 \n "
( org-sort-entries nil ?o )
( buffer-string ) ) ) )
( should
( equal " \n * DONE h2 \n * TODO h1 \n * TODO h3 \n "
( org-test-with-temp-text
" \n * TODO h1 \n * DONE h2 \n * TODO h3 \n "
( org-sort-entries nil ?O )
( buffer-string ) ) ) )
;; Sort by priority.
( should
( equal " \n * [#A] h2 \n * [#B] h3 \n * [#C] h1 \n "
( org-test-with-temp-text
" \n * [#C] h1 \n * [#A] h2 \n * [#B] h3 \n "
( org-sort-entries nil ?p )
( buffer-string ) ) ) )
( should
( equal " \n * [#C] h1 \n * [#B] h3 \n * [#A] h2 \n "
( org-test-with-temp-text
" \n * [#C] h1 \n * [#A] h2 \n * [#B] h3 \n "
( org-sort-entries nil ?P )
( buffer-string ) ) ) )
;; Sort by creation time.
( should
( equal "
* h3
[ 2017-05-08 Mon ]
* h2
[ 2017-05-09 Tue ]
* h1
[ 2018-05-09 Wed ]
"
( org-test-with-temp-text
"
* h1
[ 2018-05-09 Wed ]
* h2
[ 2017-05-09 Tue ]
* h3
[ 2017-05-08 Mon ]
"
( org-sort-entries nil ?c )
( buffer-string ) ) ) )
;; Sort by scheduled date.
( should
( equal "
* TODO h4
SCHEDULED: <2017-05-06 Sat>
* TODO h3
SCHEDULED: <2017-05-08 Mon>
* TODO h2
DEADLINE: <2017-05-09 Tue>
* TODO h1
DEADLINE: <2017-05-07 Sun>
"
( org-test-with-temp-text
"
* TODO h2
DEADLINE: <2017-05-09 Tue>
* TODO h1
DEADLINE: <2017-05-07 Sun>
* TODO h3
SCHEDULED: <2017-05-08 Mon>
* TODO h4
SCHEDULED: <2017-05-06 Sat>
"
( org-sort-entries nil ?s )
( buffer-string ) ) ) )
;; Sort by deadline date.
( should
( equal "
* TODO h1
DEADLINE: <2017-05-07 Sun>
* TODO h2
DEADLINE: <2017-05-09 Tue>
* TODO h3
SCHEDULED: <2017-05-08 Mon>
* TODO h4
SCHEDULED: <2017-05-06 Sat>
"
( org-test-with-temp-text
"
* TODO h2
DEADLINE: <2017-05-09 Tue>
* TODO h1
DEADLINE: <2017-05-07 Sun>
* TODO h3
SCHEDULED: <2017-05-08 Mon>
* TODO h4
SCHEDULED: <2017-05-06 Sat>
"
( org-sort-entries nil ?d )
( buffer-string ) ) ) )
;; Sort by any date/time
( should
( equal "
* TODO h4
SCHEDULED: <2017-05-06 Sat>
* TODO h1
DEADLINE: <2017-05-07 Sun>
* TODO h3
SCHEDULED: <2017-05-08 Mon>
* TODO h2
DEADLINE: <2017-05-09 Tue>
"
( org-test-with-temp-text
"
* TODO h2
DEADLINE: <2017-05-09 Tue>
* TODO h1
DEADLINE: <2017-05-07 Sun>
* TODO h3
SCHEDULED: <2017-05-08 Mon>
* TODO h4
SCHEDULED: <2017-05-06 Sat>
"
( org-sort-entries nil ?t )
( buffer-string ) ) ) )
;; Sort by clocking time.
( should
( equal "
* clocked h2
:LOGBOOK:
CLOCK: [ 2017-05-09 Tue 00:15 ] -- [ 2017-05-09 Tue 00:22 ] => 0:07
CLOCK: [ 2017-05-09 Tue 00:00 ] -- [ 2017-05-09 Tue 00:10 ] => 0:10
:END:
* clocked h1
:LOGBOOK:
CLOCK: [ 2017-05-09 Tue 00:15 ] -- [ 2017-05-09 Tue 00:22 ] => 0:07
CLOCK: [ 2017-05-09 Tue 00:00 ] -- [ 2017-05-09 Tue 00:12 ] => 0:12
:END:
"
( org-test-with-temp-text
"
* clocked h1
:LOGBOOK:
CLOCK: [ 2017-05-09 Tue 00:15 ] -- [ 2017-05-09 Tue 00:22 ] => 0:07
CLOCK: [ 2017-05-09 Tue 00:00 ] -- [ 2017-05-09 Tue 00:12 ] => 0:12
:END:
* clocked h2
:LOGBOOK:
CLOCK: [ 2017-05-09 Tue 00:15 ] -- [ 2017-05-09 Tue 00:22 ] => 0:07
CLOCK: [ 2017-05-09 Tue 00:00 ] -- [ 2017-05-09 Tue 00:10 ] => 0:10
:END:
"
( org-sort-entries nil ?k )
2017-12-18 09:50:51 -05:00
( buffer-string ) ) ) )
;; Preserve file local variables when sorting.
( should
( equal " \n * A \n * B \n # Local Variables: \n # foo: t \n # End: \n "
( org-test-with-temp-text
" \n * B \n * A \n # Local Variables: \n # foo: t \n # End: "
( org-sort-entries nil ?a )
2017-05-09 14:40:19 -04:00
( buffer-string ) ) ) ) )
2018-02-12 03:46:04 -05:00
( ert-deftest test-org/string-collate-greaterp ( )
" Test `org-string-collate-greaterp' specifications. "
( should ( org-string-collate-greaterp " def " " abc " ) )
( should-not ( org-string-collate-greaterp " abc " " def " ) ) )
2017-08-25 18:12:46 -04:00
( ert-deftest test-org/file-contents ( )
" Test `org-file-contents' specifications. "
;; Open files.
( should
( string= " #+BIND: variable value
# +DESCRIPTION: l2
# +LANGUAGE: en
# +SELECT_TAGS: b
# +TITLE: b
# +PROPERTY: a 1
" (org-file-contents (expand-file-name " setupfile3.org "
( concat org-test-dir " examples/ " ) ) ) ) )
;; Throw error when trying to access an invalid file.
( should-error ( org-file-contents " this-file-must-not-exist " ) )
;; Try to access an invalid file, but do not throw an error.
( should
( progn ( org-file-contents " this-file-must-not-exist " :noerror ) t ) )
;; Open URL.
( should
2022-07-20 11:35:38 -04:00
( let ( ( org-resource-download-policy t ) )
( string= " foo "
( let ( ( buffer ( generate-new-buffer " url-retrieve-output " ) ) )
( unwind-protect
;; Simulate successful retrieval of a URL.
( cl-letf ( ( ( symbol-function 'url-retrieve-synchronously )
( lambda ( &rest_ )
( with-current-buffer buffer
( insert " HTTP/1.1 200 OK \n \n foo " ) )
buffer ) ) )
( org-file-contents " http://some-valid-url " ) )
( kill-buffer buffer ) ) ) ) ) )
2017-08-25 18:12:46 -04:00
;; Throw error when trying to access an invalid URL.
( should-error
( let ( ( buffer ( generate-new-buffer " url-retrieve-output " ) ) )
( unwind-protect
;; Simulate unsuccessful retrieval of a URL.
( cl-letf ( ( ( symbol-function 'url-retrieve-synchronously )
( lambda ( &rest_ )
( with-current-buffer buffer
( insert " HTTP/1.1 404 Not found \n \n does not matter " ) )
buffer ) ) )
( org-file-contents " http://this-url-must-not-exist " ) )
( kill-buffer buffer ) ) ) )
;; Try to access an invalid URL, but do not throw an error.
( should-error
( let ( ( buffer ( generate-new-buffer " url-retrieve-output " ) ) )
( unwind-protect
;; Simulate unsuccessful retrieval of a URL.
( cl-letf ( ( ( symbol-function 'url-retrieve-synchronously )
( lambda ( &rest_ )
( with-current-buffer buffer
( insert " HTTP/1.1 404 Not found \n \n does not matter " ) )
buffer ) ) )
( org-file-contents " http://this-url-must-not-exist " ) )
( kill-buffer buffer ) ) ) )
( should
( let ( ( buffer ( generate-new-buffer " url-retrieve-output " ) ) )
( unwind-protect
;; Simulate unsuccessful retrieval of a URL.
( cl-letf ( ( ( symbol-function 'url-retrieve-synchronously )
( lambda ( &rest_ )
( with-current-buffer buffer
( insert " HTTP/1.1 404 Not found \n \n does not matter " ) )
buffer ) ) )
( org-file-contents " http://this-url-must-not-exist " :noerror ) )
( kill-buffer buffer ) )
t ) ) )
2015-10-31 18:19:51 -04:00
2012-10-10 07:19:25 -04:00
;;; Navigation
2012-08-08 07:55:18 -04:00
2020-05-31 06:55:08 -04:00
( ert-deftest test-org/next-visible-heading ( )
" Test `org-next-visible-heading' specifications. "
;; Move to the beginning of the next headline, taking into
;; consideration ARG.
( should
( org-test-with-temp-text " * H1 \n * H2 "
( org-next-visible-heading 1 )
( looking-at " \\ * H2 " ) ) )
( should
( org-test-with-temp-text " * H1 \n * H2 \n * H3 "
( org-next-visible-heading 2 )
( looking-at " \\ * H3 " ) ) )
;; Ignore invisible headlines.
( should
( org-test-with-temp-text " * H1 \n ** H2 \n * H3 "
( org-cycle )
( org-next-visible-heading 1 )
( looking-at " \\ * H3 " ) ) )
;; Move point between headlines, not on blank lines between.
( should
( org-test-with-temp-text " * H1 \n ** H2 \n \n \n \n * H3 "
( let ( ( org-cycle-separator-lines 1 ) )
( org-cycle )
( org-next-visible-heading 1 ) )
( looking-at " \\ * H3 " ) ) )
;; Move at end of buffer when there is no more headline.
( should
( org-test-with-temp-text " * H1 "
( org-next-visible-heading 1 )
( eobp ) ) )
( should
( org-test-with-temp-text " * H1 \n * H2 "
( org-next-visible-heading 2 )
( eobp ) ) )
;; With a negative argument, move backwards.
( should
( org-test-with-temp-text " * H1 \n * H2 \n <point>* H3 "
( org-next-visible-heading -1 )
( looking-at " \\ * H2 " ) ) )
( should
( org-test-with-temp-text " * H1 \n * H2 \n <point>* H3 "
( org-next-visible-heading -2 )
( looking-at " \\ * H1 " ) ) ) )
2020-06-04 10:08:40 -04:00
( ert-deftest test-org/previous-visible-heading ( )
" Test `org-previous-visible-heading' specifications. "
;; Move to the beginning of the next headline, taking into
;; consideration ARG.
( should
( org-test-with-temp-text " * H1 \n <point>* H2 "
( org-previous-visible-heading 1 )
( looking-at " \\ * H1 " ) ) )
( should
( org-test-with-temp-text " * H1 \n * H2 \n <point>* H3 "
( org-previous-visible-heading 2 )
( looking-at " \\ * H1 " ) ) )
;; Ignore invisible headlines.
( should
( org-test-with-temp-text " * H1 \n ** H2 \n <point>* H3 "
( org-overview )
( org-previous-visible-heading 1 )
( looking-at " \\ * H1 " ) ) )
;; Move point between headlines, not on blank lines between.
( should
( org-test-with-temp-text " * H1 \n \n \n \n ** H2 \n <point>* H3 "
( let ( ( org-cycle-separator-lines 1 ) )
( org-overview )
( org-previous-visible-heading 1 ) )
( looking-at " \\ * H1 " ) ) )
;; Move at end of buffer when there is no more headline.
( should
( org-test-with-temp-text " * H1 "
( org-previous-visible-heading 1 )
( bobp ) ) )
( should
( org-test-with-temp-text " * H1 \n * <point>H2 "
( org-previous-visible-heading 2 )
( bobp ) ) )
;; Invisible parts may not start at a headline, i.e., when revealing
;; parts of the buffer. Handle this.
( should
( org-test-with-temp-text " * Main \n ** H1 \n Foo \n ** H2 \n Bar \n ** H3 \n Baz "
( org-overview )
( search-forward " H1 " )
( org-show-context 'minimal )
( org-cycle )
( search-forward " H3 " )
( org-show-context 'minimal )
;; At this point, buffer displays, with point at "|",
;;
;; * Main
;; ** H1
;; Foo
;; ** H3|
( org-previous-visible-heading 1 )
( looking-at " \\ *+ H1 " ) ) ) )
2017-04-15 10:51:33 -04:00
( ert-deftest test-org/forward-heading-same-level ( )
" Test `org-forward-heading-same-level' specifications. "
;; Test navigation at top level, forward and backward.
( should
( equal " * H2 "
( org-test-with-temp-text " * H1 \n * H2 "
( org-forward-heading-same-level 1 )
( buffer-substring-no-properties ( point ) ( line-end-position ) ) ) ) )
( should
( equal " * H1 "
( org-test-with-temp-text " * H1 \n <point>* H2 "
( org-forward-heading-same-level -1 )
( buffer-substring-no-properties ( point ) ( line-end-position ) ) ) ) )
;; Test navigation in a sub-tree, forward and backward.
( should
( equal " * H2 "
( org-test-with-temp-text " * H1 \n ** H11 \n ** H12 \n * H2 "
( org-forward-heading-same-level 1 )
( buffer-substring-no-properties ( point ) ( line-end-position ) ) ) ) )
( should
( equal " * H1 "
( org-test-with-temp-text " * H1 \n ** H11 \n ** H12 \n <point>* H2 "
( org-forward-heading-same-level -1 )
( buffer-substring-no-properties ( point ) ( line-end-position ) ) ) ) )
;; Stop at first or last sub-heading.
( should-not
( equal " * H2 "
( org-test-with-temp-text " * H1 \n ** H11 \n <point>** H12 \n * H2 "
( org-forward-heading-same-level 1 )
( buffer-substring-no-properties ( point ) ( line-end-position ) ) ) ) )
( should-not
( equal " * H2 "
( org-test-with-temp-text " * H1 \n <point>** H11 \n ** H12 \n * H2 "
( org-forward-heading-same-level -1 )
( buffer-substring-no-properties ( point ) ( line-end-position ) ) ) ) )
;; Allow multiple moves.
( should
( equal " * H3 "
( org-test-with-temp-text " * H1 \n * H2 \n * H3 "
( org-forward-heading-same-level 2 )
( buffer-substring-no-properties ( point ) ( line-end-position ) ) ) ) )
( should
( equal " * H1 "
( org-test-with-temp-text " * H1 \n * H2 \n <point>* H3 "
( org-forward-heading-same-level -2 )
( buffer-substring-no-properties ( point ) ( line-end-position ) ) ) ) )
;; Ignore spurious moves when first (or last) sibling is reached.
( should
( equal " ** H3 "
( org-test-with-temp-text " * First \n <point>** H1 \n ** H2 \n ** H3 \n * Last "
( org-forward-heading-same-level 100 )
( buffer-substring-no-properties ( point ) ( line-end-position ) ) ) ) )
( should
( equal " ** H1 "
( org-test-with-temp-text " * First \n ** H1 \n ** H2 \n <point>** H3 \n * Last "
( org-forward-heading-same-level -100 )
( buffer-substring-no-properties ( point ) ( line-end-position ) ) ) ) ) )
2015-01-30 13:26:36 -05:00
( ert-deftest test-org/end-of-meta-data ( )
" Test `org-end-of-meta-data' specifications. "
;; Skip planning line.
( should
( org-test-with-temp-text " * Headline \n SCHEDULED: <2014-03-04 tue.> "
( org-end-of-meta-data )
( eobp ) ) )
;; Skip properties drawer.
( should
( org-test-with-temp-text
" * Headline \n SCHEDULED: <2014-03-04 tue.> \n :PROPERTIES: \n :A: 1 \n :END: "
( org-end-of-meta-data )
( eobp ) ) )
;; Skip both.
( should
( org-test-with-temp-text " * Headline \n :PROPERTIES: \n :A: 1 \n :END: "
( org-end-of-meta-data )
( eobp ) ) )
;; Nothing to skip, go to first line.
( should
( org-test-with-temp-text " * Headline \n Contents "
( org-end-of-meta-data )
( looking-at " Contents " ) ) )
;; With option argument, skip empty lines, regular drawers and
;; clocking lines.
( should
( org-test-with-temp-text " * Headline \n \n Contents "
( org-end-of-meta-data t )
( looking-at " Contents " ) ) )
( should
( org-test-with-temp-text " * Headline \n CLOCK: \n Contents "
( org-end-of-meta-data t )
( looking-at " Contents " ) ) )
( should
( org-test-with-temp-text " * Headline \n :LOGBOOK: \n logging \n :END: \n Contents "
( org-end-of-meta-data t )
( looking-at " Contents " ) ) )
;; Special case: do not skip incomplete drawers.
( should
( org-test-with-temp-text " * Headline \n :LOGBOOK: \n logging \n Contents "
( org-end-of-meta-data t )
( looking-at " :LOGBOOK: " ) ) )
;; Special case: Be careful about consecutive headlines.
( should-not
( org-test-with-temp-text " * H1 \n *H2 \n Contents "
( org-end-of-meta-data t )
( looking-at " Contents " ) ) ) )
2020-06-28 02:07:39 -04:00
( ert-deftest test-org/shiftright-heading ( )
" Test `org-shiftright' on headings. "
( let ( ( org-todo-keywords ' ( ( sequence " TODO " " DONE " ) ) ) )
( should
( equal " * TODO a1 \n ** a2 \n * DONE b1 \n "
( org-test-with-temp-text " * a1 \n ** a2 \n * DONE b1 \n "
( org-shiftright )
( buffer-string ) ) ) )
( should
( equal " * TODO a1 \n ** TODO a2 \n * b1 \n "
( org-test-with-temp-text " * a1 \n ** a2 \n * DONE b1 \n "
( let ( ( org-loop-over-headlines-in-active-region t ) )
( transient-mark-mode 1 )
( push-mark ( point ) t t )
( search-forward " * DONE b1 " )
( org-shiftright ) )
( buffer-string ) ) ) )
( should
( equal " * TODO a1 \n ** a2 \n * b1 \n "
( org-test-with-temp-text " * a1 \n ** a2 \n * DONE b1 \n "
( let ( ( org-loop-over-headlines-in-active-region 'start-level ) )
( transient-mark-mode 1 )
( push-mark ( point ) t t )
( search-forward " * DONE b1 " )
( org-shiftright ) )
( buffer-string ) ) ) ) ) )
2012-11-06 13:06:26 -05:00
( ert-deftest test-org/beginning-of-line ( )
" Test `org-beginning-of-line' specifications. "
2016-10-15 05:24:16 -04:00
;; Move to beginning of line. If current line in invisible, move to
;; beginning of visible line instead.
2012-11-06 13:06:26 -05:00
( should
2016-10-13 03:33:39 -04:00
( org-test-with-temp-text " Some text \n Some other text<point> "
2016-10-15 05:24:16 -04:00
( org-beginning-of-line )
( bolp ) ) )
( should
( org-test-with-temp-text " * H1 \n ** H2<point> "
( org-overview )
( org-beginning-of-line )
( = ( line-beginning-position ) 1 ) ) )
;; With `visual-line-mode' active, move to beginning of visual line.
2012-11-06 13:06:26 -05:00
( should-not
2016-10-13 03:33:39 -04:00
( org-test-with-temp-text " A <point>long line of text \n Some other text "
2016-10-15 05:24:16 -04:00
( visual-line-mode )
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 17:21:37 -04:00
( dotimes ( _ 1000 ) ( insert " very " ) )
2016-10-15 05:24:16 -04:00
( org-beginning-of-line )
( bolp ) ) )
;; In a wide headline, with `visual-line-mode', prefer going to the
;; beginning of a visual line than to the logical beginning of line,
;; even if special movement is active.
( should-not
( org-test-with-temp-text " * A <point>long headline "
( visual-line-mode )
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 17:21:37 -04:00
( dotimes ( _ 1000 ) ( insert " very " ) )
2016-10-15 05:24:16 -04:00
( goto-char ( point-max ) )
( org-beginning-of-line )
( bobp ) ) )
( should-not
( org-test-with-temp-text " * A <point>long headline "
( visual-line-mode )
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 17:21:37 -04:00
( dotimes ( _ 1000 ) ( insert " very " ) )
2016-10-15 05:24:16 -04:00
( goto-char ( point-max ) )
( let ( ( org-special-ctrl-a/e t ) ) ( org-beginning-of-line ) )
( bobp ) ) )
;; At an headline with special movement, first move at beginning of
;; title, then at the beginning of line, rinse, repeat.
2012-11-06 13:06:26 -05:00
( should
2016-10-13 03:33:39 -04:00
( org-test-with-temp-text " * TODO Headline<point> "
2012-11-06 13:06:26 -05:00
( let ( ( org-special-ctrl-a/e t ) )
2016-10-18 03:30:50 -04:00
( and ( progn ( org-beginning-of-line ) ( looking-at-p " Headline " ) )
2012-11-06 13:06:26 -05:00
( progn ( org-beginning-of-line ) ( bolp ) )
2016-10-18 03:30:50 -04:00
( progn ( org-beginning-of-line ) ( looking-at-p " Headline " ) ) ) ) ) )
2016-10-15 05:24:16 -04:00
( should
( org-test-with-temp-text " * TODO [#A] Headline<point> "
( let ( ( org-special-ctrl-a/e t ) )
( org-beginning-of-line )
( looking-at " Headline " ) ) ) )
2016-10-18 03:30:50 -04:00
( should
( org-test-with-temp-text " * TODO [#A] Headline<point> "
( let ( ( org-special-ctrl-a/e ' ( t . nil ) ) )
( org-beginning-of-line )
( looking-at " Headline " ) ) ) )
( should-not
( org-test-with-temp-text " * TODO [#A] Headline<point> "
( let ( ( org-special-ctrl-a/e ' ( nil . nil ) ) )
( org-beginning-of-line )
( looking-at " Headline " ) ) ) )
2016-10-15 05:24:16 -04:00
;; At an headline with reversed movement, first move to beginning of
;; line, then to the beginning of title.
( should
( org-test-with-temp-text " * TODO Headline<point> "
( let ( ( org-special-ctrl-a/e 'reversed )
( this-command last-command ) )
( and ( progn ( org-beginning-of-line ) ( bolp ) )
2016-10-18 03:30:50 -04:00
( progn ( org-beginning-of-line ) ( looking-at-p " Headline " ) ) ) ) ) )
( should
( org-test-with-temp-text " * TODO Headline<point> "
( let ( ( org-special-ctrl-a/e ' ( reversed . nil ) )
( this-command last-command ) )
( and ( progn ( org-beginning-of-line ) ( bolp ) )
( progn ( org-beginning-of-line ) ( looking-at-p " Headline " ) ) ) ) ) )
( should-not
( org-test-with-temp-text " * TODO Headline<point> "
( let ( ( org-special-ctrl-a/e ' ( t . nil ) )
( this-command last-command ) )
( and ( progn ( org-beginning-of-line ) ( bolp ) )
( progn ( org-beginning-of-line ) ( looking-at-p " Headline " ) ) ) ) ) )
2016-10-15 05:24:16 -04:00
;; At an item with special movement, first move after to beginning
;; of title, then to the beginning of line, rinse, repeat.
( should
( org-test-with-temp-text " - [ ] Item<point> "
( let ( ( org-special-ctrl-a/e t ) )
2016-10-18 03:30:50 -04:00
( and ( progn ( org-beginning-of-line ) ( looking-at-p " Item " ) )
2016-10-15 05:24:16 -04:00
( progn ( org-beginning-of-line ) ( bolp ) )
2016-10-18 03:30:50 -04:00
( progn ( org-beginning-of-line ) ( looking-at-p " Item " ) ) ) ) ) )
2016-10-15 05:24:16 -04:00
;; At an item with reversed movement, first move to beginning of
;; line, then to the beginning of title.
( should
( org-test-with-temp-text " - [X] Item<point> "
( let ( ( org-special-ctrl-a/e 'reversed )
( this-command last-command ) )
( and ( progn ( org-beginning-of-line ) ( bolp ) )
2016-10-18 03:30:50 -04:00
( progn ( org-beginning-of-line ) ( looking-at-p " Item " ) ) ) ) ) )
2016-10-13 03:33:39 -04:00
;; Leave point before invisible characters at column 0.
( should
2018-01-16 13:42:57 -05:00
( org-test-with-temp-text " [[https://orgmode.org]]<point> "
2016-10-13 03:33:39 -04:00
( let ( ( org-special-ctrl-a/e nil ) )
( org-beginning-of-line )
( bolp ) ) ) )
( should
2018-01-16 13:42:57 -05:00
( org-test-with-temp-text " [[https://orgmode.org]]<point> "
2016-10-13 03:33:39 -04:00
( let ( ( org-special-ctrl-a/e t ) )
( org-beginning-of-line )
( bolp ) ) ) )
2016-10-15 05:24:16 -04:00
( should
( org-test-with-temp-text " [[http<point>://orgmode.org]] "
( visual-line-mode )
( org-beginning-of-line )
( bolp ) ) )
2015-07-22 03:39:07 -04:00
;; Special case: Do not error when the buffer contains only a single
;; asterisk.
( should
( org-test-with-temp-text " *<point> "
2016-10-14 04:42:24 -04:00
( let ( ( org-special-ctrl-a/e t ) ) ( org-beginning-of-line ) t ) ) )
2015-07-22 03:39:07 -04:00
( should
( org-test-with-temp-text " *<point> "
2016-10-14 04:42:24 -04:00
( let ( ( org-special-ctrl-a/e nil ) ) ( org-beginning-of-line ) t ) ) ) )
2012-11-06 13:06:26 -05:00
2012-10-16 14:18:57 -04:00
( ert-deftest test-org/end-of-line ( )
" Test `org-end-of-line' specifications. "
;; Standard test.
( should
( org-test-with-temp-text " Some text \n Some other text "
2016-10-18 03:30:50 -04:00
( org-end-of-line )
( eolp ) ) )
2016-10-14 18:48:47 -04:00
;; With `visual-line-mode' active, move to end of visible line.
;; However, never go past ellipsis.
2012-11-06 13:06:26 -05:00
( should-not
2016-10-14 18:48:47 -04:00
( org-test-with-temp-text " A <point>long line of text \n Some other text "
( visual-line-mode )
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 17:21:37 -04:00
( dotimes ( _ 1000 ) ( insert " very " ) )
2016-10-14 18:48:47 -04:00
( goto-char ( point-min ) )
( org-end-of-line )
( eolp ) ) )
( should-not
( org-test-with-temp-text " * A short headline \n Some contents "
( visual-line-mode )
( org-overview )
( org-end-of-line )
( eobp ) ) )
;; In a wide headline, with `visual-line-mode', prefer going to end
;; of visible line if tags, or end of line, are farther.
( should-not
( org-test-with-temp-text " * A <point>long headline "
( visual-line-mode )
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 17:21:37 -04:00
( dotimes ( _ 1000 ) ( insert " very " ) )
2016-10-14 18:48:47 -04:00
( goto-char ( point-min ) )
( org-end-of-line )
( eolp ) ) )
( should-not
( org-test-with-temp-text " * A <point>long headline :tag: "
( visual-line-mode )
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 17:21:37 -04:00
( dotimes ( _ 1000 ) ( insert " very " ) )
2016-10-14 18:48:47 -04:00
( goto-char ( point-min ) )
( org-end-of-line )
( eolp ) ) )
;; At an headline without special movement, go to end of line.
;; However, never go past ellipsis.
( should
( org-test-with-temp-text " * Headline2b :tag: \n "
( let ( ( org-special-ctrl-a/e nil ) )
( and ( progn ( org-end-of-line ) ( eolp ) )
( progn ( org-end-of-line ) ( eolp ) ) ) ) ) )
2016-10-18 03:30:50 -04:00
( should
( org-test-with-temp-text " * Headline2b :tag: \n "
( let ( ( org-special-ctrl-a/e ' ( t . nil ) ) )
( and ( progn ( org-end-of-line ) ( eolp ) )
( progn ( org-end-of-line ) ( eolp ) ) ) ) ) )
2016-10-14 18:48:47 -04:00
( should
( org-test-with-temp-text " * Headline2a :tag: \n ** Sub "
( org-overview )
( let ( ( org-special-ctrl-a/e nil ) )
( org-end-of-line )
( = 1 ( line-beginning-position ) ) ) ) )
;; At an headline with special movement, first move before tags,
;; then at the end of line, rinse, repeat. However, never go past
;; ellipsis.
2012-10-16 14:18:57 -04:00
( should
2012-11-28 10:51:47 -05:00
( org-test-with-temp-text " * Headline1 :tag: \n "
2012-10-16 14:18:57 -04:00
( let ( ( org-special-ctrl-a/e t ) )
2016-10-18 03:30:50 -04:00
( and ( progn ( org-end-of-line ) ( looking-at-p " :tag: " ) )
( progn ( org-end-of-line ) ( eolp ) )
( progn ( org-end-of-line ) ( looking-at-p " :tag: " ) ) ) ) ) )
( should
( org-test-with-temp-text " * Headline1 :tag: \n "
( let ( ( org-special-ctrl-a/e ' ( nil . t ) ) )
( and ( progn ( org-end-of-line ) ( looking-at-p " :tag: " ) )
( progn ( org-end-of-line ) ( eolp ) )
( progn ( org-end-of-line ) ( looking-at-p " :tag: " ) ) ) ) ) )
( should-not
( org-test-with-temp-text " * Headline1 :tag: \n "
( let ( ( org-special-ctrl-a/e ' ( nil . nil ) ) )
( and ( progn ( org-end-of-line ) ( looking-at-p " :tag: " ) )
2012-10-16 14:18:57 -04:00
( progn ( org-end-of-line ) ( eolp ) )
2016-10-18 03:30:50 -04:00
( progn ( org-end-of-line ) ( looking-at-p " :tag: " ) ) ) ) ) )
2012-10-16 14:18:57 -04:00
( should
2016-10-14 18:48:47 -04:00
( org-test-with-temp-text " * Headline2a :tag: \n ** Sub "
( org-overview )
( let ( ( org-special-ctrl-a/e t ) )
( org-end-of-line )
( org-end-of-line )
( = 1 ( line-beginning-position ) ) ) ) )
;; At an headline, with reversed movement, first go to end of line,
;; then before tags. However, never go past ellipsis.
2012-10-16 14:18:57 -04:00
( should
2012-11-28 10:51:47 -05:00
( org-test-with-temp-text " * Headline3 :tag: \n "
2012-10-16 14:18:57 -04:00
( let ( ( org-special-ctrl-a/e 'reversed )
( this-command last-command ) )
( and ( progn ( org-end-of-line ) ( eolp ) )
2016-10-18 03:30:50 -04:00
( progn ( org-end-of-line ) ( looking-at-p " :tag: " ) ) ) ) ) )
( should
( org-test-with-temp-text " * Headline3 :tag: \n "
( let ( ( org-special-ctrl-a/e ' ( nil . reversed ) )
( this-command last-command ) )
( and ( progn ( org-end-of-line ) ( eolp ) )
( progn ( org-end-of-line ) ( looking-at-p " :tag: " ) ) ) ) ) )
( should-not
( org-test-with-temp-text " * Headline3 :tag: \n "
( let ( ( org-special-ctrl-a/e ' ( nil . t ) )
( this-command last-command ) )
( and ( progn ( org-end-of-line ) ( eolp ) )
( progn ( org-end-of-line ) ( looking-at-p " :tag: " ) ) ) ) ) )
2016-10-14 18:48:47 -04:00
( should
( org-test-with-temp-text " * Headline2a :tag: \n ** Sub "
( org-overview )
( let ( ( org-special-ctrl-a/e 'reversed ) )
( org-end-of-line )
( = 1 ( line-beginning-position ) ) ) ) )
2012-10-16 14:18:57 -04:00
;; At a block without hidden contents.
( should
( org-test-with-temp-text " #+BEGIN_CENTER \n Contents \n #+END_CENTER "
( progn ( org-end-of-line ) ( eolp ) ) ) )
;; At a block with hidden contents.
( should-not
( org-test-with-temp-text " #+BEGIN_CENTER \n Contents \n #+END_CENTER "
2012-11-06 13:06:26 -05:00
( let ( ( org-special-ctrl-a/e t ) )
2022-01-16 02:07:25 -05:00
( org-fold-hide-block-toggle )
2012-11-06 13:06:26 -05:00
( org-end-of-line )
2016-10-14 18:48:47 -04:00
( eobp ) ) ) )
;; Get past invisible characters at the end of line.
( should
2018-01-16 13:42:57 -05:00
( org-test-with-temp-text " [[https://orgmode.org]] "
2016-10-14 18:48:47 -04:00
( org-end-of-line )
( eolp ) ) ) )
2012-10-16 14:18:57 -04:00
2016-09-18 11:22:48 -04:00
( ert-deftest test-org/open-line ( )
" Test `org-open-line' specifications. "
;; Call `open-line' outside of tables.
( should
( equal " \n Text "
( org-test-with-temp-text " Text "
( org-open-line 1 )
( buffer-string ) ) ) )
;; At a table, create a row above.
( should
( equal " \n | | \n | a | "
( org-test-with-temp-text " \n <point>| a | "
( org-open-line 1 )
( buffer-string ) ) ) )
;; At the very first character of the buffer, also call `open-line'.
( should
( equal " \n | a | "
( org-test-with-temp-text " | a | "
( org-open-line 1 )
( buffer-string ) ) ) )
;; Narrowing does not count.
( should
( equal " Text \n | | \n | a | "
( org-test-with-temp-text " Text \n <point>| a | "
( narrow-to-region ( point ) ( point-max ) )
( org-open-line 1 )
( widen )
( buffer-string ) ) ) ) )
2015-03-27 13:12:46 -04:00
( ert-deftest test-org/forward-sentence ( )
" Test `org-forward-sentence' specifications. "
;; At the end of a table cell, move to the end of the next one.
( should
( org-test-with-temp-text " | a<point> | b | "
( org-forward-sentence )
( looking-at " |$ " ) ) )
;; Elsewhere in a cell, move to its end.
( should
( org-test-with-temp-text " | a<point>c | b | "
( org-forward-sentence )
( looking-at " | b |$ " ) ) )
;; Otherwise, simply call `forward-sentence'.
( should
( org-test-with-temp-text " Sentence<point> 1. Sentence 2. "
( org-forward-sentence )
( looking-at " Sentence 2. " ) ) )
( should
( org-test-with-temp-text " Sentence<point> 1. Sentence 2. "
( org-forward-sentence )
( org-forward-sentence )
( eobp ) ) )
;; At the end of an element, jump to the next one, without stopping
;; on blank lines in-between.
( should
( org-test-with-temp-text " Paragraph 1.<point> \n \n Paragraph 2. "
2017-09-12 03:02:02 -04:00
( org-forward-sentence )
( eobp ) ) )
2017-10-08 04:35:22 -04:00
;; Headlines are considered to be sentences by themselves, even if
;; they do not end with a full stop.
2017-09-12 03:02:02 -04:00
( should
( equal
" * Headline "
( org-test-with-temp-text " * <point>Headline \n Sentence. "
( org-forward-sentence )
( buffer-substring-no-properties ( line-beginning-position ) ( point ) ) ) ) )
( should
( org-test-with-temp-text " * Headline<point> \n Sentence. "
2015-03-27 13:12:46 -04:00
( org-forward-sentence )
2017-10-08 04:35:22 -04:00
( eobp ) ) )
( should
( org-test-with-temp-text " Sentence.<point> \n \n * Headline \n \n Sentence 2. "
( org-forward-sentence )
( and ( org-at-heading-p ) ( eolp ) ) ) ) )
2015-03-27 13:12:46 -04:00
( ert-deftest test-org/backward-sentence ( )
" Test `org-backward-sentence' specifications. "
;; At the beginning of a table cell, move to the beginning of the
;; previous one.
( should
( org-test-with-temp-text " | a | <point>b | "
( org-backward-sentence )
( looking-at " a | b |$ " ) ) )
;; Elsewhere in a cell, move to its beginning.
( should
( org-test-with-temp-text " | a | b<point>c | "
( org-backward-sentence )
( looking-at " bc |$ " ) ) )
;; Otherwise, simply call `backward-sentence'.
( should
( org-test-with-temp-text " Sentence 1. Sentence<point> 2. "
( org-backward-sentence )
( looking-at " Sentence 2. " ) ) )
( should
( org-test-with-temp-text " Sentence 1. Sentence<point> 2. "
( org-backward-sentence )
( org-backward-sentence )
( bobp ) ) )
;; Make sure to hit the beginning of a sentence on the same line as
;; an item.
( should
( org-test-with-temp-text " - Line 1 \n line <point>2. "
( org-backward-sentence )
( looking-at " Line 1 " ) ) ) )
2013-09-13 18:02:12 -04:00
( ert-deftest test-org/forward-paragraph ( )
" Test `org-forward-paragraph' specifications. "
2017-07-28 04:07:53 -04:00
;; At end of buffer, do not return an error.
( should
2013-09-13 18:02:12 -04:00
( org-test-with-temp-text " Paragraph "
( goto-char ( point-max ) )
2017-07-28 04:07:53 -04:00
( org-forward-paragraph )
t ) )
2013-09-13 18:02:12 -04:00
;; Standard test.
( should
2020-04-30 10:00:18 -04:00
( = 2
( org-test-with-temp-text " P1 \n \n P2 "
( org-forward-paragraph )
( org-current-line ) ) ) )
2013-09-13 18:02:12 -04:00
( should
2020-04-30 10:00:18 -04:00
( = 2
( org-test-with-temp-text " P1 \n \n P2 \n \n P3 "
( org-forward-paragraph )
( org-current-line ) ) ) )
;; Enter greater elements.
( should
( = 2
( org-test-with-temp-text " #+begin_center \n P1 \n #+end_center \n P2 "
( org-forward-paragraph )
( org-current-line ) ) ) )
2013-09-13 18:02:12 -04:00
;; Do not enter elements with invisible contents.
( should
2020-04-30 10:00:18 -04:00
( = 4
( org-test-with-temp-text " * H1 \n P1 \n \n * H2 "
( org-cycle )
( org-forward-paragraph )
( org-current-line ) ) ) )
2013-09-13 18:02:12 -04:00
( should
2020-04-30 10:00:18 -04:00
( = 6
( org-test-with-temp-text " #+begin_center \n P1 \n \n P2 \n #+end_center \n P3 "
2022-01-16 02:07:25 -05:00
( org-fold-hide-block-toggle )
2020-04-30 10:00:18 -04:00
( org-forward-paragraph )
( org-current-line ) ) ) )
;; On an item or a footnote definition, move past the first element
2013-09-13 18:02:12 -04:00
;; inside, if any.
( should
2020-04-30 10:00:18 -04:00
( = 2
( org-test-with-temp-text " - Item1 \n \n Paragraph \n - Item2 "
( org-forward-paragraph )
( org-current-line ) ) ) )
2013-09-13 18:02:12 -04:00
( should
2020-04-30 10:00:18 -04:00
( = 2
( org-test-with-temp-text " [fn:1] Def1 \n \n Paragraph \n \n [fn:2] Def2 "
( org-forward-paragraph )
( org-current-line ) ) ) )
2013-09-13 18:02:12 -04:00
;; On a table (resp. a property drawer) do not move through table
;; rows (resp. node properties).
( should
( org-test-with-temp-text " | a | b | \n | c | d | \n Paragraph "
( org-forward-paragraph )
( looking-at " Paragraph " ) ) )
( should
2014-09-13 16:43:45 -04:00
( org-test-with-temp-text
" * H \n <point>:PROPERTIES: \n :prop: value \n :END: \n Paragraph "
2013-09-13 18:02:12 -04:00
( org-forward-paragraph )
( looking-at " Paragraph " ) ) )
2020-04-30 10:00:18 -04:00
;; Skip consecutive keywords, clocks and diary S-exps.
( should
( org-test-with-temp-text " #+key: val \n #+key2: val \n #+key3: val \n "
( org-forward-paragraph )
( eobp ) ) )
( should
( org-test-with-temp-text " CLOCK: val \n CLOCK: val \n CLOCK: val \n "
( org-forward-paragraph )
( eobp ) ) )
( should
( org-test-with-temp-text " %%(foo) \n %%(bar) \n %%(baz) \n "
( org-forward-paragraph )
( eobp ) ) )
( should-not
( org-test-with-temp-text " #+key: val \n #+key2: val \n \n #+key3: val \n "
( org-forward-paragraph )
( eobp ) ) )
( should-not
( org-test-with-temp-text " #+key: val \n CLOCK: ... \n "
( org-forward-paragraph )
( eobp ) ) )
;; In a plain list with one item every line, skip the whole list,
;; even with point in the middle of the list.
( should
( org-test-with-temp-text " - A \n - B \n - C \n "
( org-forward-paragraph )
( eobp ) ) )
2013-09-13 18:02:12 -04:00
( should
2020-04-30 10:00:18 -04:00
( org-test-with-temp-text " - A \n - <point>B \n - C \n "
2013-09-13 18:02:12 -04:00
( org-forward-paragraph )
2020-04-30 10:00:18 -04:00
( eobp ) ) )
;; On a comment, verse or source block, stop at "contents"
;; boundaries and blank lines.
( should
( = 2
( org-test-with-temp-text " #+begin_src emacs-lisp \n L1 \n \n L2 \n #+end_src "
( org-forward-paragraph )
( org-current-line ) ) ) )
( should
( = 3
( org-test-with-temp-text " #+begin_verse \n <point>L1 \n \n L2 \n #+end_verse "
( org-forward-paragraph )
( org-current-line ) ) ) )
( should
( = 5
( org-test-with-temp-text " #+begin_comment \n L1 \n \n <point>L2 \n #+end_comment "
( org-forward-paragraph )
( org-current-line ) ) ) )
;; Being on an affiliated keyword shouldn't make any difference.
2013-09-13 18:02:12 -04:00
( should
2020-04-30 10:00:18 -04:00
( org-test-with-temp-text " #+name: para \n #+caption: caption \n Para "
2013-09-13 18:02:12 -04:00
( org-forward-paragraph )
2020-04-30 10:00:18 -04:00
( eobp ) ) ) )
2013-09-13 18:02:12 -04:00
( ert-deftest test-org/backward-paragraph ( )
" Test `org-backward-paragraph' specifications. "
2017-07-28 04:07:53 -04:00
;; Do not error at beginning of buffer.
( should
2013-09-13 18:02:12 -04:00
( org-test-with-temp-text " Paragraph "
2017-07-28 04:07:53 -04:00
( org-backward-paragraph )
t ) )
2020-04-30 10:00:18 -04:00
;; At blank lines at the very beginning of a buffer, move to
;; point-min.
2013-09-13 18:02:12 -04:00
( should
2020-04-30 10:00:18 -04:00
( org-test-with-temp-text " \n \n <point> \n \n Paragraph "
2013-09-13 18:02:12 -04:00
( org-backward-paragraph )
2020-04-30 10:00:18 -04:00
( bobp ) ) )
;; Regular test.
2013-09-13 18:02:12 -04:00
( should
2020-04-30 10:00:18 -04:00
( = 2
( org-test-with-temp-text " P1 \n \n P2<point> "
( org-backward-paragraph )
( org-current-line ) ) ) )
2013-09-13 18:02:12 -04:00
( should
2020-04-30 10:00:18 -04:00
( = 4
( org-test-with-temp-text " P1 \n \n P2 \n \n P3<point> "
( org-backward-paragraph )
( org-current-line ) ) ) )
;; Try to move on the line above current element.
( should
( = 2
( org-test-with-temp-text " \n \n <point>Paragraph "
( org-backward-paragraph )
( org-current-line ) ) ) )
;; Do not leave point in an invisible area.
2013-09-13 18:02:12 -04:00
( should
2020-04-30 10:00:18 -04:00
( org-test-with-temp-text " * H1 \n P1 \n \n * H2 "
2013-09-13 18:02:12 -04:00
( org-cycle )
( goto-char ( point-max ) )
( beginning-of-line )
( org-backward-paragraph )
( bobp ) ) )
( should
2020-04-30 10:00:18 -04:00
( org-test-with-temp-text " #+begin_center \n P1 \n \n P2 \n #+end_center \n "
2022-01-16 02:07:25 -05:00
( org-fold-hide-block-toggle )
2020-04-30 10:00:18 -04:00
( goto-char ( point-max ) )
2013-09-13 18:02:12 -04:00
( org-backward-paragraph )
2020-04-30 10:00:18 -04:00
( bobp ) ) )
;; On the first element in an item or a footnote definition, jump
;; before the footnote or the item.
2013-09-13 18:02:12 -04:00
( should
2020-04-30 10:00:18 -04:00
( org-test-with-temp-text " - line1<point> "
2013-09-13 18:02:12 -04:00
( org-backward-paragraph )
2020-04-30 10:00:18 -04:00
( bobp ) ) )
2013-09-13 18:02:12 -04:00
( should
2020-04-30 10:00:18 -04:00
( org-test-with-temp-text " [fn:1] line1n<point> "
2013-09-13 18:02:12 -04:00
( org-backward-paragraph )
2020-04-30 10:00:18 -04:00
( bobp ) ) )
;; On the second element in an item or a footnote definition, jump
;; to item or the definition.
( should
( = 2
( org-test-with-temp-text " - line1 \n \n <point> line2 "
( org-backward-paragraph )
( org-current-line ) ) ) )
( should
( = 2
( org-test-with-temp-text " [fn:1] line1 \n \n <point> line2 "
( org-backward-paragraph )
( org-current-line ) ) ) )
2013-09-13 18:02:12 -04:00
;; On a table (resp. a property drawer), ignore table rows
;; (resp. node properties).
( should
2017-10-04 06:57:14 -04:00
( org-test-with-temp-text " | a | b | \n | c | d | \n <point>P1 "
2013-09-13 18:02:12 -04:00
( org-backward-paragraph )
( bobp ) ) )
( should
2020-04-30 10:00:18 -04:00
( = 2
( org-test-with-temp-text
" * H \n :PROPERTIES: \n :prop: value \n :END: \n <point>P1 "
( org-backward-paragraph )
( org-current-line ) ) ) )
;; In a plain list with one item every line, skip the whole list,
;; even with point in the middle of the list.
( should
( org-test-with-temp-text " - A \n - B \n - C \n <point> "
2013-09-13 18:02:12 -04:00
( org-backward-paragraph )
2020-04-30 10:00:18 -04:00
( bobp ) ) )
2013-09-13 18:02:12 -04:00
( should
2020-04-30 10:00:18 -04:00
( org-test-with-temp-text " - A \n - B \n - <point>C \n "
2013-09-13 18:02:12 -04:00
( org-backward-paragraph )
2020-04-30 10:00:18 -04:00
( bobp ) ) )
;; Skip consecutive keywords, clocks and diary S-exps.
2013-09-13 18:02:12 -04:00
( should
2020-04-30 10:00:18 -04:00
( org-test-with-temp-text " #+key: val \n #+key2: val \n #+key3: val \n <point> "
2013-09-13 18:02:12 -04:00
( org-backward-paragraph )
2020-04-30 10:00:18 -04:00
( bobp ) ) )
2017-10-04 06:57:14 -04:00
( should
2020-04-30 10:00:18 -04:00
( org-test-with-temp-text " CLOCK: val \n CLOCK: val \n CLOCK: val \n <point> "
2017-10-04 06:57:14 -04:00
( org-backward-paragraph )
2020-04-30 10:00:18 -04:00
( bobp ) ) )
2017-10-04 06:57:14 -04:00
( should
2020-04-30 10:00:18 -04:00
( org-test-with-temp-text " %%(foo) \n %%(bar) \n %%(baz) \n <point> "
( org-backward-paragraph )
( bobp ) ) )
( should-not
( org-test-with-temp-text " #+key: val \n #+key2: val \n \n #+key3: val \n <point> "
( org-backward-paragraph )
( bobp ) ) )
( should-not
( org-test-with-temp-text " #+key: val \n CLOCK: ... \n <point> "
2017-10-04 06:57:14 -04:00
( org-backward-paragraph )
2020-04-30 10:00:18 -04:00
( bobp ) ) )
;; On a comment, example, source and verse blocks, stop at blank
;; lines.
( should
( = 1
( org-test-with-temp-text
" #+begin_comment \n <point>L1 \n \n L2 \n \n L3 \n #+end_comment "
( org-backward-paragraph )
( org-current-line ) ) ) )
( should
( = 2
( org-test-with-temp-text
" #+begin_verse \n L1 \n \n <point>L2 \n \n L3 \n #+end_verse "
( org-backward-paragraph )
( org-current-line ) ) ) )
( should
( = 3
( org-test-with-temp-text
" #+begin_src emacs-lisp \n L1 \n \n L2 \n \n <point>L3 \n #+end_src "
( org-backward-paragraph )
( org-current-line ) ) ) )
2017-10-04 06:57:14 -04:00
;; When called from the opening line itself, however, move to
;; beginning of block.
( should
2020-04-30 10:00:18 -04:00
( org-test-with-temp-text " #+begin_<point>example \n L1 \n #+end_example "
( org-backward-paragraph )
( bobp ) ) )
;; On an empty heading, move above it.
( should
( org-test-with-temp-text " \n * <point> "
2017-10-06 13:34:28 -04:00
( org-backward-paragraph )
( bobp ) ) )
( should
2020-04-30 10:00:18 -04:00
( org-test-with-temp-text " \n * \n <point> "
2017-10-04 06:57:14 -04:00
( org-backward-paragraph )
( bobp ) ) ) )
2013-09-13 18:02:12 -04:00
2012-08-08 07:55:18 -04:00
( ert-deftest test-org/forward-element ( )
" Test `org-forward-element' specifications. "
;; 1. At EOB: should error.
( org-test-with-temp-text " Some text \n "
( goto-char ( point-max ) )
( should-error ( org-forward-element ) ) )
;; 2. Standard move: expected to ignore blank lines.
( org-test-with-temp-text " First paragraph. \n \n \n Second paragraph. "
( org-forward-element )
2013-02-11 11:09:53 -05:00
( should ( looking-at ( regexp-quote " Second paragraph. " ) ) ) )
2012-08-08 07:55:18 -04:00
;; 3. Headline tests.
( org-test-with-temp-text "
* Head 1
** Head 1.1
*** Head 1.1.1
** Head 1.2 "
;; 3.1. At an headline beginning: move to next headline at the
;; same level.
( goto-line 3 )
( org-forward-element )
2013-02-11 11:09:53 -05:00
( should ( looking-at ( regexp-quote " ** Head 1.2 " ) ) )
2012-08-08 07:55:18 -04:00
;; 3.2. At an headline beginning: move to parent headline if no
;; headline at the same level.
( goto-line 3 )
( org-forward-element )
2013-02-11 11:09:53 -05:00
( should ( looking-at ( regexp-quote " ** Head 1.2 " ) ) ) )
2012-08-08 07:55:18 -04:00
;; 4. Greater element tests.
( org-test-with-temp-text
" #+BEGIN_CENTER \n Inside. \n #+END_CENTER \n \n Outside. "
;; 4.1. At a greater element: expected to skip contents.
( org-forward-element )
2013-02-11 11:09:53 -05:00
( should ( looking-at ( regexp-quote " Outside. " ) ) )
2012-08-08 07:55:18 -04:00
;; 4.2. At the end of greater element contents: expected to skip
;; to the end of the greater element.
( goto-line 2 )
( org-forward-element )
2013-02-11 11:09:53 -05:00
( should ( looking-at ( regexp-quote " Outside. " ) ) ) )
2012-08-08 07:55:18 -04:00
;; 5. List tests.
( org-test-with-temp-text "
- item1
- sub1
- sub2
- sub3
Inner paragraph.
- item2
Outside. "
;; 5.1. At list top point: expected to move to the element after
;; the list.
( goto-line 2 )
( org-forward-element )
2013-02-11 11:09:53 -05:00
( should ( looking-at ( regexp-quote " Outside. " ) ) )
2012-08-08 07:55:18 -04:00
;; 5.2. Special case: at the first line of a sub-list, but not at
;; beginning of line, move to next item.
( goto-line 2 )
( forward-char )
( org-forward-element )
( should ( looking-at " - item2 " ) )
( goto-line 4 )
( forward-char )
( org-forward-element )
( should ( looking-at " - sub2 " ) )
;; 5.3 At sub-list beginning: expected to move after the sub-list.
( goto-line 4 )
( org-forward-element )
2013-02-11 11:09:53 -05:00
( should ( looking-at ( regexp-quote " Inner paragraph. " ) ) )
2012-08-08 07:55:18 -04:00
;; 5.4. At sub-list end: expected to move outside the sub-list.
( goto-line 8 )
( org-forward-element )
2013-02-11 11:09:53 -05:00
( should ( looking-at ( regexp-quote " Inner paragraph. " ) ) )
2012-08-08 07:55:18 -04:00
;; 5.5. At an item: expected to move to next item, if any.
( goto-line 6 )
( org-forward-element )
( should ( looking-at " - sub3 " ) ) ) )
( ert-deftest test-org/backward-element ( )
" Test `org-backward-element' specifications. "
2012-08-26 17:32:46 -04:00
;; 1. Should error at BOB.
2012-08-08 07:55:18 -04:00
( org-test-with-temp-text " \n Paragraph. "
( should-error ( org-backward-element ) ) )
2012-08-26 17:32:46 -04:00
;; 2. Should move at BOB when called on the first element in buffer.
( should
( org-test-with-temp-text " \n #+TITLE: test "
( progn ( forward-line )
( org-backward-element )
( bobp ) ) ) )
;; 3. Not at the beginning of an element: move at its beginning.
2012-08-08 07:55:18 -04:00
( org-test-with-temp-text " Paragraph1. \n \n Paragraph2. "
( goto-line 3 )
( end-of-line )
( org-backward-element )
2013-02-11 11:09:53 -05:00
( should ( looking-at ( regexp-quote " Paragraph2. " ) ) ) )
2012-08-26 17:32:46 -04:00
;; 4. Headline tests.
2012-08-08 07:55:18 -04:00
( org-test-with-temp-text "
* Head 1
** Head 1.1
*** Head 1.1.1
** Head 1.2 "
2012-08-26 17:32:46 -04:00
;; 4.1. At an headline beginning: move to previous headline at the
2012-08-08 07:55:18 -04:00
;; same level.
( goto-line 5 )
( org-backward-element )
2013-02-11 11:09:53 -05:00
( should ( looking-at ( regexp-quote " ** Head 1.1 " ) ) )
2012-08-26 17:32:46 -04:00
;; 4.2. At an headline beginning: move to parent headline if no
2012-08-08 07:55:18 -04:00
;; headline at the same level.
( goto-line 3 )
( org-backward-element )
2013-02-11 11:09:53 -05:00
( should ( looking-at ( regexp-quote " * Head 1 " ) ) )
2012-08-26 17:32:46 -04:00
;; 4.3. At the first top-level headline: should error.
2012-08-08 07:55:18 -04:00
( goto-line 2 )
( should-error ( org-backward-element ) ) )
2012-08-26 17:32:46 -04:00
;; 5. At beginning of first element inside a greater element:
2012-08-08 07:55:18 -04:00
;; expected to move to greater element's beginning.
2012-09-30 06:22:40 -04:00
( org-test-with-temp-text " Before. \n #+BEGIN_CENTER \n Inside. \n #+END_CENTER "
2012-08-08 07:55:18 -04:00
( goto-line 3 )
( org-backward-element )
( should ( looking-at " # \\ +BEGIN_CENTER " ) ) )
2012-08-26 17:32:46 -04:00
;; 6. At the beginning of the first element in a section: should
;; move back to headline, if any.
( should
( org-test-with-temp-text " #+TITLE: test \n * Headline \n \n Paragraph "
( progn ( goto-char ( point-max ) )
( beginning-of-line )
( org-backward-element )
( org-at-heading-p ) ) ) )
;; 7. List tests.
2012-08-08 07:55:18 -04:00
( org-test-with-temp-text "
- item1
- sub1
- sub2
- sub3
Inner paragraph.
- item2
Outside. "
2012-08-26 17:32:46 -04:00
;; 7.1. At beginning of sub-list: expected to move to the
2012-08-08 07:55:18 -04:00
;; paragraph before it.
( goto-line 4 )
( org-backward-element )
( should ( looking-at " item1 " ) )
2012-08-26 17:32:46 -04:00
;; 7.2. At an item in a list: expected to move at previous item.
2012-08-08 07:55:18 -04:00
( goto-line 8 )
( org-backward-element )
( should ( looking-at " - sub2 " ) )
( goto-line 12 )
( org-backward-element )
( should ( looking-at " - item1 " ) )
2012-08-26 17:32:46 -04:00
;; 7.3. At end of list/sub-list: expected to move to list/sub-list
2012-08-08 07:55:18 -04:00
;; beginning.
( goto-line 10 )
( org-backward-element )
( should ( looking-at " - sub1 " ) )
( goto-line 15 )
( org-backward-element )
( should ( looking-at " - item1 " ) )
2012-08-26 17:32:46 -04:00
;; 7.4. At blank-lines before list end: expected to move to top
2012-08-08 07:55:18 -04:00
;; item.
( goto-line 14 )
( org-backward-element )
( should ( looking-at " - item1 " ) ) ) )
( ert-deftest test-org/up-element ( )
" Test `org-up-element' specifications. "
;; 1. At BOB or with no surrounding element: should error.
( org-test-with-temp-text " Paragraph. "
( should-error ( org-up-element ) ) )
( org-test-with-temp-text " * Head1 \n * Head2 "
( goto-line 2 )
( should-error ( org-up-element ) ) )
( org-test-with-temp-text " Paragraph1. \n \n Paragraph2. "
( goto-line 3 )
( should-error ( org-up-element ) ) )
;; 2. At an headline: move to parent headline.
( org-test-with-temp-text " * Head1 \n ** Sub-Head1 \n ** Sub-Head2 "
( goto-line 3 )
( org-up-element )
( should ( looking-at " \\ * Head1 " ) ) )
;; 3. Inside a greater element: move to greater element beginning.
( org-test-with-temp-text
" Before. \n #+BEGIN_CENTER \n Paragraph1 \n Paragraph2 \n #+END_CENTER \n "
( goto-line 3 )
( org-up-element )
( should ( looking-at " # \\ +BEGIN_CENTER " ) ) )
;; 4. List tests.
( org-test-with-temp-text " * Top
- item1
- sub1
- sub2
Paragraph within sub2.
- item2 "
;; 4.1. Within an item: move to the item beginning.
( goto-line 8 )
( org-up-element )
( should ( looking-at " - sub2 " ) )
;; 4.2. At an item in a sub-list: move to parent item.
( goto-line 4 )
( org-up-element )
( should ( looking-at " - item1 " ) )
;; 4.3. At an item in top list: move to beginning of whole list.
( goto-line 10 )
( org-up-element )
( should ( looking-at " - item1 " ) )
;; 4.4. Special case. At very top point: should move to parent of
;; list.
( goto-line 2 )
( org-up-element )
( should ( looking-at " \\ * Top " ) ) ) )
( ert-deftest test-org/down-element ( )
" Test `org-down-element' specifications. "
;; Error when the element hasn't got a recursive type.
( org-test-with-temp-text " Paragraph. "
( should-error ( org-down-element ) ) )
;; Error when the element has no contents
( org-test-with-temp-text " * Headline "
( should-error ( org-down-element ) ) )
;; When at a plain-list, move to first item.
( org-test-with-temp-text " - Item 1 \n - Item 1.1 \n - Item 2.2 "
( goto-line 2 )
( org-down-element )
( should ( looking-at " - Item 1.1 " ) ) )
( org-test-with-temp-text " #+NAME: list \n - Item 1 "
( org-down-element )
( should ( looking-at " Item 1 " ) ) )
;; When at a table, move to first row
( org-test-with-temp-text " #+NAME: table \n | a | b | "
( org-down-element )
( should ( looking-at " a | b | " ) ) )
;; Otherwise, move inside the greater element.
( org-test-with-temp-text " #+BEGIN_CENTER \n Paragraph. \n #+END_CENTER "
( org-down-element )
( should ( looking-at " Paragraph " ) ) ) )
( ert-deftest test-org/drag-element-backward ( )
" Test `org-drag-element-backward' specifications. "
2014-06-25 04:49:52 -04:00
;; Standard test.
( should
( equal
" #+key2: val2 \n #+key1: val1 \n #+key3: val3 "
( org-test-with-temp-text " #+key1: val1 \n <point>#+key2: val2 \n #+key3: val3 "
( org-drag-element-backward )
( buffer-string ) ) ) )
( should
( equal
" #+BEGIN_CENTER \n #+B: 2 \n #+A: 1 \n #+END_CENTER "
( org-test-with-temp-text
" #+BEGIN_CENTER \n #+A: 1 \n <point>#+B: 2 \n #+END_CENTER "
( org-drag-element-backward )
( buffer-string ) ) ) )
;; Preserve blank lines.
( should
( equal " Paragraph 2 \n \n \n Para1 \n \n Para3 "
( org-test-with-temp-text " Para1 \n \n \n <point>Paragraph 2 \n \n Para3 "
( org-drag-element-backward )
( buffer-string ) ) ) )
;; Preserve column.
( should
( org-test-with-temp-text " #+key1: v \n #+key<point>2: v \n #+key3: v "
( org-drag-element-backward )
Remove final parts of XEmacs compatibility code
* lisp/org-compat.el: Declare `org-add-hook', `org-decompose-region',
`org-detach-overlay', `org-file-equal-p', `org-float-time',
`org-indent-line-to', `org-indent-to-column', `org-looking-at-p',
`org-looking-back', `org-propertize', `org-re' and
`org-select-frame-set-input-focus' as obsolete.
(org-overlay-display, org-overlay-before-string, org-find-overlays):
Move to "org.el"
(org-xemacs-key-equivalents, org-xemacs-p): Remove variables.
(org-region-active-p): Drop XEmacs support.
(org-xemacs-without-invisibility): Remove macro.
(org-get-x-clipboard-compat): Remove function.
* lisp/org-macs.el (org-match-string-no-properties): Remove function.
* lisp/ob-core.el:
* lisp/org-agenda.el:
* lisp/org-archive.el:
* lisp/org-clock.el:
* lisp/org-colview.el:
* lisp/org-crypt.el:
* lisp/org-element.el:
* lisp/org-faces.el:
* lisp/org-feed.el:
* lisp/org-footnote.el:
* lisp/org-habit.el:
* lisp/org-id.el:
* lisp/org-indent.el:
* lisp/org-inlinetask.el:
* lisp/org-lint.el:
* lisp/org-list.el:
* lisp/org-mouse.el:
* lisp/org-pcomplete.el:
* lisp/org-src.el:
* lisp/org-table.el:
* lisp/org-timer.el:
* lisp/org.el:
* lisp/ox-ascii.el:
* lisp/ox-odt.el:
* lisp/ox.el:
* contrib/lisp/org-notify.el:
* contrib/lisp/ox-taskjuggler.el:
* contrib/lisp/org-wikinodes.el:
* testing/lisp/test-org-src.el:
* testing/lisp/test-org.el: Silence byte-compiler.
2016-05-26 06:18:00 -04:00
( looking-at-p " 2 " ) ) )
2014-06-25 04:49:52 -04:00
;; Error when trying to move first element of buffer.
( should-error
( org-test-with-temp-text " Paragraph 1. \n \n Paragraph 2. "
2016-11-28 18:30:16 -05:00
( org-drag-element-backward ) )
:type 'user-error )
2014-06-25 04:49:52 -04:00
;; Error when trying to swap nested elements.
( should-error
2017-01-14 17:23:26 -05:00
( org-test-with-temp-text " #+BEGIN_CENTER \n <point>Test. \n #+END_CENTER "
2016-11-28 18:30:16 -05:00
( org-drag-element-backward ) )
:type 'user-error )
2014-06-25 04:49:52 -04:00
;; Error when trying to swap an headline element and a non-headline
;; element.
( should-error
2017-01-14 17:23:26 -05:00
( org-test-with-temp-text " Test. \n <point>* Head 1 "
2016-11-28 18:30:16 -05:00
( org-drag-element-backward ) )
2017-01-14 17:23:26 -05:00
:type 'error )
2016-11-28 18:30:16 -05:00
;; Error when called before first element.
( should-error
2017-01-14 17:23:26 -05:00
( org-test-with-temp-text " \n <point> "
2016-11-28 18:30:16 -05:00
( org-drag-element-backward ) )
:type 'user-error )
2014-06-25 04:49:52 -04:00
;; Preserve visibility of elements and their contents.
( should
( equal ' ( ( 63 . 82 ) ( 26 . 48 ) )
2022-01-16 02:41:53 -05:00
( let ( ( org-fold-core-style 'text-properties ) )
( org-test-with-temp-text
"
2012-08-08 07:55:18 -04:00
# +BEGIN_CENTER
Text.
# +END_CENTER
- item 1
# +BEGIN_QUOTE
Text.
# +END_QUOTE "
2022-01-16 02:41:53 -05:00
( while ( search-forward " BEGIN_ " nil t ) ( org-cycle ) )
( search-backward " - item 1 " )
( org-drag-element-backward )
( let ( regions )
( goto-char ( point-min ) )
( while ( < ( point ) ( point-max ) )
( let ( ( region ( org-fold-get-region-at-point ) ) )
( if ( not region )
( goto-char ( org-fold-next-folding-state-change ) )
( goto-char ( cdr region ) )
( push region regions ) ) ) )
regions ) ) ) ) )
( should
2022-08-13 03:03:28 -04:00
( equal ' ( ( 26 . 48 ) ( 63 . 82 ) )
2022-01-16 02:41:53 -05:00
( let ( ( org-fold-core-style 'overlays ) )
( org-test-with-temp-text
"
# +BEGIN_CENTER
Text.
# +END_CENTER
- item 1
# +BEGIN_QUOTE
Text.
# +END_QUOTE "
( while ( search-forward " BEGIN_ " nil t ) ( org-cycle ) )
( search-backward " - item 1 " )
( org-drag-element-backward )
( mapcar ( lambda ( ov ) ( cons ( overlay-start ov ) ( overlay-end ov ) ) )
( overlays-in ( point-min ) ( point-max ) ) ) ) ) ) )
2017-01-14 17:23:26 -05:00
;; Pathological case: handle call with point in blank lines right
;; after a headline.
( should
2018-04-11 08:55:00 -04:00
( equal " * H2 \n \n * H1 \n Text \n "
2017-01-14 17:23:26 -05:00
( org-test-with-temp-text " * H1 \n Text \n * H2 \n \n <point> "
( org-drag-element-backward )
( buffer-string ) ) ) ) )
2012-08-08 07:55:18 -04:00
( ert-deftest test-org/drag-element-forward ( )
" Test `org-drag-element-forward' specifications. "
;; 1. Error when trying to move first element of buffer.
( org-test-with-temp-text " Paragraph 1. \n \n Paragraph 2. "
( goto-line 3 )
( should-error ( org-drag-element-forward ) ) )
;; 2. Error when trying to swap nested elements.
( org-test-with-temp-text " #+BEGIN_CENTER \n Test. \n #+END_CENTER "
( forward-line )
( should-error ( org-drag-element-forward ) ) )
;; 3. Error when trying to swap a non-headline element and an
;; headline.
( org-test-with-temp-text " Test. \n * Head 1 "
( should-error ( org-drag-element-forward ) ) )
2016-11-28 18:30:16 -05:00
;; 4. Error when called before first element.
( should-error
( org-test-with-temp-text " \n "
( forward-line )
( org-drag-element-backward ) )
:type 'user-error )
;; 5. Otherwise, swap elements, preserving column and blank lines
2012-08-08 07:55:18 -04:00
;; between elements.
( org-test-with-temp-text " Paragraph 1 \n \n \n Para2 \n \n Para3 "
( search-forward " graph " )
( org-drag-element-forward )
( should ( equal ( buffer-string ) " Para2 \n \n \n Paragraph 1 \n \n Para3 " ) )
( should ( looking-at " 1 " ) ) )
;; 5. Preserve visibility of elements and their contents.
2022-01-16 02:41:53 -05:00
( let ( ( org-fold-core-style 'text-properties ) )
( org-test-with-temp-text
"
2012-08-08 07:55:18 -04:00
# +BEGIN_CENTER
Text.
# +END_CENTER
- item 1
# +BEGIN_QUOTE
Text.
# +END_QUOTE "
2022-01-16 02:41:53 -05:00
( while ( search-forward " BEGIN_ " nil t ) ( org-cycle ) )
( search-backward " #+BEGIN_CENTER " )
( org-drag-element-forward )
( should
( equal
' ( ( 63 . 82 ) ( 26 . 48 ) )
( let ( regions )
( goto-char ( point-min ) )
( while ( < ( point ) ( point-max ) )
( let ( ( region ( org-fold-get-region-at-point ) ) )
( if ( not region )
( goto-char ( org-fold-next-folding-state-change ) )
( goto-char ( cdr region ) )
( push region regions ) ) ) )
regions ) ) ) ) )
( let ( ( org-fold-core-style 'overlays ) )
( org-test-with-temp-text
"
# +BEGIN_CENTER
Text.
# +END_CENTER
- item 1
# +BEGIN_QUOTE
Text.
# +END_QUOTE "
( while ( search-forward " BEGIN_ " nil t ) ( org-cycle ) )
( search-backward " #+BEGIN_CENTER " )
( org-drag-element-forward )
( should
( equal
2022-08-13 03:03:28 -04:00
' ( ( 26 . 48 ) ( 63 . 82 ) )
2022-01-16 02:41:53 -05:00
( mapcar ( lambda ( ov ) ( cons ( overlay-start ov ) ( overlay-end ov ) ) )
( overlays-in ( point-min ) ( point-max ) ) ) ) ) ) ) )
2012-08-08 05:43:39 -04:00
2015-05-01 06:08:57 -04:00
( ert-deftest test-org/next-block ( )
" Test `org-next-block' specifications. "
;; Regular test.
( should
( org-test-with-temp-text " Paragraph \n #+BEGIN_CENTER \n contents \n #+END_CENTER "
( org-next-block 1 )
( looking-at " # \\ +BEGIN_CENTER " ) ) )
;; Ignore case.
( should
( org-test-with-temp-text " Paragraph \n #+begin_center \n contents \n #+end_center "
( let ( ( case-fold-search nil ) )
( org-next-block 1 )
( looking-at " # \\ +begin_center " ) ) ) )
;; Ignore current line.
( should
( org-test-with-temp-text
" #+BEGIN_QUOTE \n #+END_QUOTE \n #+BEGIN_CENTER \n #+END_CENTER "
( org-next-block 1 )
( looking-at " # \\ +BEGIN_CENTER " ) ) )
;; Throw an error when no block is found.
( should-error
( org-test-with-temp-text " Paragraph "
( org-next-block 1 ) ) )
;; With an argument, skip many blocks at once.
( should
( org-test-with-temp-text
" Start \n #+BEGIN_CENTER \n A \n #+END_CENTER \n #+BEGIN_QUOTE \n B \n #+END_QUOTE "
( org-next-block 2 )
( looking-at " # \\ +BEGIN_QUOTE " ) ) )
;; With optional argument BLOCK-REGEXP, filter matched blocks.
( should
( org-test-with-temp-text
" Start \n #+BEGIN_CENTER \n A \n #+END_CENTER \n #+BEGIN_QUOTE \n B \n #+END_QUOTE "
( org-next-block 1 nil " ^[ \t ]*# \\ +BEGIN_QUOTE " )
( looking-at " # \\ +BEGIN_QUOTE " ) ) )
;; Optional argument is also case-insensitive.
( should
( org-test-with-temp-text
" Start \n #+BEGIN_CENTER \n A \n #+END_CENTER \n #+begin_quote \n B \n #+end_quote "
( let ( ( case-fold-search nil ) )
( org-next-block 1 nil " ^[ \t ]*# \\ +BEGIN_QUOTE " )
( looking-at " # \\ +begin_quote " ) ) ) ) )
2018-06-02 17:41:56 -04:00
( ert-deftest test-org/insert-structure-template ( )
2017-11-05 03:25:15 -05:00
" Test `org-insert-structure-template' . "
;; Test in empty buffer.
( should
2018-06-02 17:41:56 -04:00
( string= " #+begin_foo \n #+end_foo \n "
2017-11-05 03:25:15 -05:00
( org-test-with-temp-text " "
( org-insert-structure-template " foo " )
( buffer-string ) ) ) )
;; Test with multiple lines in buffer.
( should
2018-06-02 17:41:56 -04:00
( string= " #+begin_foo \n I'm a paragraph \n #+end_foo \n \n I'm a second paragraph "
2017-11-05 03:25:15 -05:00
( org-test-with-temp-text " I'm a paragraph \n \n I'm a second paragraph "
2018-06-02 17:41:56 -04:00
( transient-mark-mode 1 )
2017-11-05 03:25:15 -05:00
( org-mark-element )
( org-insert-structure-template " foo " )
( buffer-string ) ) ) )
2017-12-21 08:37:06 -05:00
;; Mark only the current line.
( should
( string= " #+begin_foo \n I'm a paragraph \n #+end_foo \n \n I'm a second paragraph "
( org-test-with-temp-text " I'm a paragraph \n \n I'm a second paragraph "
2018-06-02 17:41:56 -04:00
( transient-mark-mode 1 )
2017-12-21 08:37:06 -05:00
( set-mark ( point-min ) )
( end-of-line )
( org-insert-structure-template " foo " )
( buffer-string ) ) ) )
2018-06-02 17:41:56 -04:00
;; Middle of paragraph.
2017-12-21 08:37:06 -05:00
( should
( string= " p1 \n #+begin_foo \n p2 \n #+end_foo \n p3 "
( org-test-with-temp-text " p1 \n <point>p2 \n p3 "
( set-mark ( line-beginning-position ) )
( end-of-line )
( activate-mark )
( org-insert-structure-template " foo " )
( buffer-string ) ) ) )
2017-11-05 03:25:15 -05:00
;; Test with text in buffer, no region, no final newline.
( should
( string= " #+begin_foo \n I'm a paragraph. \n #+end_foo \n "
( org-test-with-temp-text " I'm a paragraph. "
( org-mark-element )
( org-insert-structure-template " foo " )
( buffer-string ) ) ) )
;; Test with text in buffer and region set.
( should
( string= " #+begin_foo \n I'm a paragraph \n \n I'm a second paragrah \n #+end_foo \n "
( org-test-with-temp-text " I'm a paragraph \n \n I'm a second paragrah "
( set-mark ( point ) )
( goto-char ( point-max ) )
( org-insert-structure-template " foo " )
( buffer-string ) ) ) )
;; Test with example escaping.
( should
( string= " #+begin_example \n ,* Heading \n #+end_example \n "
( org-test-with-temp-text " * Heading "
( org-mark-element )
( org-insert-structure-template " example " )
( buffer-string ) ) ) )
;; Test with indentation.
( should
( string= " #+begin_foo \n This is a paragraph \n #+end_foo \n "
( org-test-with-temp-text " This is a paragraph "
( org-mark-element )
( org-insert-structure-template " foo " )
2017-12-21 08:37:06 -05:00
( buffer-string ) ) ) )
2018-06-12 03:03:33 -04:00
( should
( string= " #+begin_foo \n Line 1 \n Line2 \n #+end_foo \n "
( org-test-with-temp-text " Line 1 \n Line2 "
( org-mark-element )
( org-insert-structure-template " foo " )
( buffer-string ) ) ) )
2017-12-21 08:37:06 -05:00
;; Test point location.
( should
2018-06-02 17:41:56 -04:00
( string= " #+begin_foo \n "
( org-test-with-temp-text " "
( org-insert-structure-template " foo " )
( buffer-substring ( point-min ) ( point ) ) ) ) )
2017-12-21 08:37:06 -05:00
( should
2018-06-02 17:41:56 -04:00
( string= " #+begin_src "
( org-test-with-temp-text " "
( org-insert-structure-template " src " )
( buffer-substring ( point-min ) ( point ) ) ) ) ) )
2017-11-05 03:25:15 -05:00
2015-05-01 06:08:57 -04:00
( ert-deftest test-org/previous-block ( )
" Test `org-previous-block' specifications. "
;; Regular test.
( should
( org-test-with-temp-text " #+BEGIN_CENTER \n contents \n #+END_CENTER \n <point> "
( org-previous-block 1 )
( looking-at " # \\ +BEGIN_CENTER " ) ) )
;; Ignore case.
( should
( org-test-with-temp-text " #+begin_center \n contents \n #+end_center \n <point> "
( let ( ( case-fold-search nil ) )
( org-previous-block 1 )
( looking-at " # \\ +begin_center " ) ) ) )
;; Ignore current line.
( should
( org-test-with-temp-text
" #+BEGIN_QUOTE \n #+END_QUOTE \n #+BEGIN_CENTER<point> \n #+END_CENTER "
( org-previous-block 1 )
( looking-at " # \\ +BEGIN_QUOTE " ) ) )
;; Throw an error when no block is found.
( should-error
( org-test-with-temp-text " Paragraph<point> "
( org-previous-block 1 ) ) )
;; With an argument, skip many blocks at once.
( should
( org-test-with-temp-text
" #+BEGIN_CENTER \n A \n #+END_CENTER \n #+BEGIN_QUOTE \n B \n #+END_QUOTE \n <point> "
( org-previous-block 2 )
( looking-at " # \\ +BEGIN_CENTER " ) ) )
;; With optional argument BLOCK-REGEXP, filter matched blocks.
( should
( org-test-with-temp-text
" #+BEGIN_CENTER \n A \n #+END_CENTER \n #+BEGIN_QUOTE \n B \n #+END_QUOTE \n <point> "
( org-previous-block 1 " ^[ \t ]*# \\ +BEGIN_QUOTE " )
( looking-at " # \\ +BEGIN_QUOTE " ) ) )
;; Optional argument is also case-insensitive.
( should
( org-test-with-temp-text
" #+BEGIN_CENTER \n A \n #+END_CENTER \n #+begin_quote \n B \n #+end_quote \n <point> "
( let ( ( case-fold-search nil ) )
( org-next-block 1 " ^[ \t ]*# \\ +BEGIN_QUOTE " )
( looking-at " # \\ +begin_quote " ) ) ) ) )
2014-11-08 08:35:24 -05:00
;;; Outline structure
( ert-deftest test-org/demote ( )
" Test `org-demote' specifications. "
;; Add correct number of stars according to `org-odd-levels-only'.
( should
( = 2
( org-test-with-temp-text " * H "
( let ( ( org-odd-levels-only nil ) ) ( org-demote ) )
( org-current-level ) ) ) )
( should
( = 3
( org-test-with-temp-text " * H "
( let ( ( org-odd-levels-only t ) ) ( org-demote ) )
( org-current-level ) ) ) )
;; When `org-auto-align-tags' is non-nil, move tags accordingly.
( should
( org-test-with-temp-text " * H :tag: "
( let ( ( org-tags-column 10 )
( org-auto-align-tags t )
( org-odd-levels-only nil ) )
( org-demote ) )
( org-move-to-column 10 )
Remove final parts of XEmacs compatibility code
* lisp/org-compat.el: Declare `org-add-hook', `org-decompose-region',
`org-detach-overlay', `org-file-equal-p', `org-float-time',
`org-indent-line-to', `org-indent-to-column', `org-looking-at-p',
`org-looking-back', `org-propertize', `org-re' and
`org-select-frame-set-input-focus' as obsolete.
(org-overlay-display, org-overlay-before-string, org-find-overlays):
Move to "org.el"
(org-xemacs-key-equivalents, org-xemacs-p): Remove variables.
(org-region-active-p): Drop XEmacs support.
(org-xemacs-without-invisibility): Remove macro.
(org-get-x-clipboard-compat): Remove function.
* lisp/org-macs.el (org-match-string-no-properties): Remove function.
* lisp/ob-core.el:
* lisp/org-agenda.el:
* lisp/org-archive.el:
* lisp/org-clock.el:
* lisp/org-colview.el:
* lisp/org-crypt.el:
* lisp/org-element.el:
* lisp/org-faces.el:
* lisp/org-feed.el:
* lisp/org-footnote.el:
* lisp/org-habit.el:
* lisp/org-id.el:
* lisp/org-indent.el:
* lisp/org-inlinetask.el:
* lisp/org-lint.el:
* lisp/org-list.el:
* lisp/org-mouse.el:
* lisp/org-pcomplete.el:
* lisp/org-src.el:
* lisp/org-table.el:
* lisp/org-timer.el:
* lisp/org.el:
* lisp/ox-ascii.el:
* lisp/ox-odt.el:
* lisp/ox.el:
* contrib/lisp/org-notify.el:
* contrib/lisp/ox-taskjuggler.el:
* contrib/lisp/org-wikinodes.el:
* testing/lisp/test-org-src.el:
* testing/lisp/test-org.el: Silence byte-compiler.
2016-05-26 06:18:00 -04:00
( looking-at-p " :tag:$ " ) ) )
2014-11-08 08:35:24 -05:00
( should-not
( org-test-with-temp-text " * H :tag: "
( let ( ( org-tags-column 10 )
( org-auto-align-tags nil )
( org-odd-levels-only nil ) )
( org-demote ) )
( org-move-to-column 10 )
Remove final parts of XEmacs compatibility code
* lisp/org-compat.el: Declare `org-add-hook', `org-decompose-region',
`org-detach-overlay', `org-file-equal-p', `org-float-time',
`org-indent-line-to', `org-indent-to-column', `org-looking-at-p',
`org-looking-back', `org-propertize', `org-re' and
`org-select-frame-set-input-focus' as obsolete.
(org-overlay-display, org-overlay-before-string, org-find-overlays):
Move to "org.el"
(org-xemacs-key-equivalents, org-xemacs-p): Remove variables.
(org-region-active-p): Drop XEmacs support.
(org-xemacs-without-invisibility): Remove macro.
(org-get-x-clipboard-compat): Remove function.
* lisp/org-macs.el (org-match-string-no-properties): Remove function.
* lisp/ob-core.el:
* lisp/org-agenda.el:
* lisp/org-archive.el:
* lisp/org-clock.el:
* lisp/org-colview.el:
* lisp/org-crypt.el:
* lisp/org-element.el:
* lisp/org-faces.el:
* lisp/org-feed.el:
* lisp/org-footnote.el:
* lisp/org-habit.el:
* lisp/org-id.el:
* lisp/org-indent.el:
* lisp/org-inlinetask.el:
* lisp/org-lint.el:
* lisp/org-list.el:
* lisp/org-mouse.el:
* lisp/org-pcomplete.el:
* lisp/org-src.el:
* lisp/org-table.el:
* lisp/org-timer.el:
* lisp/org.el:
* lisp/ox-ascii.el:
* lisp/ox-odt.el:
* lisp/ox.el:
* contrib/lisp/org-notify.el:
* contrib/lisp/ox-taskjuggler.el:
* contrib/lisp/org-wikinodes.el:
* testing/lisp/test-org-src.el:
* testing/lisp/test-org.el: Silence byte-compiler.
2016-05-26 06:18:00 -04:00
( looking-at-p " :tag:$ " ) ) )
2014-11-08 08:35:24 -05:00
;; When `org-adapt-indentation' is non-nil, always indent planning
;; info and property drawers accordingly.
( should
( = 3
( org-test-with-temp-text " * H \n SCHEDULED: <2014-03-04 tue.> "
( let ( ( org-odd-levels-only nil )
( org-adapt-indentation t ) )
( org-demote ) )
( forward-line )
( org-get-indentation ) ) ) )
( should
( = 3
( org-test-with-temp-text " * H \n :PROPERTIES: \n :FOO: Bar \n :END: "
( let ( ( org-odd-levels-only nil )
( org-adapt-indentation t ) )
( org-demote ) )
( forward-line )
( org-get-indentation ) ) ) )
( should-not
( = 3
( org-test-with-temp-text " * H \n SCHEDULED: <2014-03-04 tue.> "
( let ( ( org-odd-levels-only nil )
( org-adapt-indentation nil ) )
( org-demote ) )
( forward-line )
( org-get-indentation ) ) ) )
;; When `org-adapt-indentation' is non-nil, shift all lines in
;; section accordingly. Ignore, however, footnote definitions and
;; inlinetasks boundaries.
( should
( = 3
( org-test-with-temp-text " * H \n Paragraph "
( let ( ( org-odd-levels-only nil )
( org-adapt-indentation t ) )
( org-demote ) )
( forward-line )
( org-get-indentation ) ) ) )
( should
( = 2
( org-test-with-temp-text " * H \n Paragraph "
( let ( ( org-odd-levels-only nil )
( org-adapt-indentation nil ) )
( org-demote ) )
( forward-line )
( org-get-indentation ) ) ) )
( should
( zerop
2014-11-10 14:36:01 -05:00
( org-test-with-temp-text " * H \n [fn:1] def line 1 \n def line 2 "
2014-11-08 08:35:24 -05:00
( let ( ( org-odd-levels-only nil )
( org-adapt-indentation t ) )
( org-demote ) )
2014-11-10 14:36:01 -05:00
( goto-char ( point-max ) )
2014-11-08 08:35:24 -05:00
( org-get-indentation ) ) ) )
( should
( = 3
( org-test-with-temp-text " * H \n [fn:1] Def. \n \n \n After def. "
( let ( ( org-odd-levels-only nil )
( org-adapt-indentation t ) )
( org-demote ) )
( goto-char ( point-max ) )
( org-get-indentation ) ) ) )
( when ( featurep 'org-inlinetask )
( should
( zerop
( let ( ( org-inlinetask-min-level 5 )
( org-adapt-indentation t ) )
( org-test-with-temp-text " * H \n ***** I \n ***** END "
( org-demote )
( forward-line )
( org-get-indentation ) ) ) ) ) )
( when ( featurep 'org-inlinetask )
( should
( = 3
( let ( ( org-inlinetask-min-level 5 )
( org-adapt-indentation t ) )
( org-test-with-temp-text " * H \n ***** I \n Contents \n ***** END "
( org-demote )
( forward-line 2 )
2014-11-10 14:36:01 -05:00
( org-get-indentation ) ) ) ) ) )
2020-12-08 23:47:55 -05:00
;; When `org-adapt-indentation' is non-nil, log drawers are
;; adjusted.
( should
( equal
" ** H \n :LOGBOOK: \n - a \n :END: \n b "
( org-test-with-temp-text " * H \n :LOGBOOK: \n - a \n :END: \n b "
( let ( ( org-odd-levels-only nil )
( org-adapt-indentation t ) )
( org-demote ) )
( buffer-string ) ) ) )
( should
( equal
" ** H \n :LOGBOOK: \n - a \n :END: \n b "
( org-test-with-temp-text " * H \n :LOGBOOK: \n - a \n :END: \n b "
( let ( ( org-odd-levels-only nil )
( org-adapt-indentation 'headline-data ) )
( org-demote ) )
( buffer-string ) ) ) )
( should
( equal
" ** H \n :LOGBOOK: \n - a \n :END: "
( org-test-with-temp-text " * H \n :LOGBOOK: \n - a \n :END: "
( let ( ( org-odd-levels-only nil )
( org-adapt-indentation t ) )
( org-demote ) )
( buffer-string ) ) ) )
2014-11-10 14:36:01 -05:00
;; Ignore contents of source blocks or example blocks when
;; indentation should be preserved (through
;; `org-src-preserve-indentation' or "-i" flag).
( should-not
( zerop
( org-test-with-temp-text " * H \n #+BEGIN_SRC emacs-lisp \n (+ 1 1) \n #+END_SRC "
( let ( ( org-adapt-indentation t )
( org-src-preserve-indentation nil ) )
( org-demote ) )
( forward-line 2 )
( org-get-indentation ) ) ) )
( should
( zerop
( org-test-with-temp-text " * H \n #+BEGIN_EXAMPLE \n (+ 1 1) \n #+END_EXAMPLE "
( let ( ( org-adapt-indentation t )
( org-src-preserve-indentation t ) )
( org-demote ) )
( forward-line 2 )
( org-get-indentation ) ) ) )
( should
( zerop
( org-test-with-temp-text " * H \n #+BEGIN_SRC emacs-lisp \n (+ 1 1) \n #+END_SRC "
( let ( ( org-adapt-indentation t )
( org-src-preserve-indentation t ) )
( org-demote ) )
( forward-line 2 )
( org-get-indentation ) ) ) )
( should
( zerop
( org-test-with-temp-text
" * H \n #+BEGIN_SRC emacs-lisp -i \n (+ 1 1) \n #+END_SRC "
( let ( ( org-adapt-indentation t )
( org-src-preserve-indentation nil ) )
( org-demote ) )
( forward-line 2 )
( org-get-indentation ) ) ) ) )
2014-11-08 08:35:24 -05:00
( ert-deftest test-org/promote ( )
" Test `org-promote' specifications. "
;; Return an error if headline is to be promoted to level 0, unless
;; `org-allow-promoting-top-level-subtree' is non-nil, in which case
;; headline becomes a comment.
( should-error
( org-test-with-temp-text " * H "
( let ( ( org-allow-promoting-top-level-subtree nil ) ) ( org-promote ) ) ) )
( should
( equal " # H "
( org-test-with-temp-text " * H "
( let ( ( org-allow-promoting-top-level-subtree t ) ) ( org-promote ) )
( buffer-string ) ) ) )
;; Remove correct number of stars according to
;; `org-odd-levels-only'.
( should
( = 2
( org-test-with-temp-text " *** H "
( let ( ( org-odd-levels-only nil ) ) ( org-promote ) )
( org-current-level ) ) ) )
( should
( = 1
( org-test-with-temp-text " *** H "
( let ( ( org-odd-levels-only t ) ) ( org-promote ) )
( org-current-level ) ) ) )
;; When `org-auto-align-tags' is non-nil, move tags accordingly.
( should
( org-test-with-temp-text " ** H :tag: "
( let ( ( org-tags-column 10 )
( org-auto-align-tags t )
( org-odd-levels-only nil ) )
( org-promote ) )
( org-move-to-column 10 )
Remove final parts of XEmacs compatibility code
* lisp/org-compat.el: Declare `org-add-hook', `org-decompose-region',
`org-detach-overlay', `org-file-equal-p', `org-float-time',
`org-indent-line-to', `org-indent-to-column', `org-looking-at-p',
`org-looking-back', `org-propertize', `org-re' and
`org-select-frame-set-input-focus' as obsolete.
(org-overlay-display, org-overlay-before-string, org-find-overlays):
Move to "org.el"
(org-xemacs-key-equivalents, org-xemacs-p): Remove variables.
(org-region-active-p): Drop XEmacs support.
(org-xemacs-without-invisibility): Remove macro.
(org-get-x-clipboard-compat): Remove function.
* lisp/org-macs.el (org-match-string-no-properties): Remove function.
* lisp/ob-core.el:
* lisp/org-agenda.el:
* lisp/org-archive.el:
* lisp/org-clock.el:
* lisp/org-colview.el:
* lisp/org-crypt.el:
* lisp/org-element.el:
* lisp/org-faces.el:
* lisp/org-feed.el:
* lisp/org-footnote.el:
* lisp/org-habit.el:
* lisp/org-id.el:
* lisp/org-indent.el:
* lisp/org-inlinetask.el:
* lisp/org-lint.el:
* lisp/org-list.el:
* lisp/org-mouse.el:
* lisp/org-pcomplete.el:
* lisp/org-src.el:
* lisp/org-table.el:
* lisp/org-timer.el:
* lisp/org.el:
* lisp/ox-ascii.el:
* lisp/ox-odt.el:
* lisp/ox.el:
* contrib/lisp/org-notify.el:
* contrib/lisp/ox-taskjuggler.el:
* contrib/lisp/org-wikinodes.el:
* testing/lisp/test-org-src.el:
* testing/lisp/test-org.el: Silence byte-compiler.
2016-05-26 06:18:00 -04:00
( looking-at-p " :tag:$ " ) ) )
2014-11-08 08:35:24 -05:00
( should-not
( org-test-with-temp-text " ** H :tag: "
( let ( ( org-tags-column 10 )
( org-auto-align-tags nil )
( org-odd-levels-only nil ) )
( org-promote ) )
( org-move-to-column 10 )
Remove final parts of XEmacs compatibility code
* lisp/org-compat.el: Declare `org-add-hook', `org-decompose-region',
`org-detach-overlay', `org-file-equal-p', `org-float-time',
`org-indent-line-to', `org-indent-to-column', `org-looking-at-p',
`org-looking-back', `org-propertize', `org-re' and
`org-select-frame-set-input-focus' as obsolete.
(org-overlay-display, org-overlay-before-string, org-find-overlays):
Move to "org.el"
(org-xemacs-key-equivalents, org-xemacs-p): Remove variables.
(org-region-active-p): Drop XEmacs support.
(org-xemacs-without-invisibility): Remove macro.
(org-get-x-clipboard-compat): Remove function.
* lisp/org-macs.el (org-match-string-no-properties): Remove function.
* lisp/ob-core.el:
* lisp/org-agenda.el:
* lisp/org-archive.el:
* lisp/org-clock.el:
* lisp/org-colview.el:
* lisp/org-crypt.el:
* lisp/org-element.el:
* lisp/org-faces.el:
* lisp/org-feed.el:
* lisp/org-footnote.el:
* lisp/org-habit.el:
* lisp/org-id.el:
* lisp/org-indent.el:
* lisp/org-inlinetask.el:
* lisp/org-lint.el:
* lisp/org-list.el:
* lisp/org-mouse.el:
* lisp/org-pcomplete.el:
* lisp/org-src.el:
* lisp/org-table.el:
* lisp/org-timer.el:
* lisp/org.el:
* lisp/ox-ascii.el:
* lisp/ox-odt.el:
* lisp/ox.el:
* contrib/lisp/org-notify.el:
* contrib/lisp/ox-taskjuggler.el:
* contrib/lisp/org-wikinodes.el:
* testing/lisp/test-org-src.el:
* testing/lisp/test-org.el: Silence byte-compiler.
2016-05-26 06:18:00 -04:00
( looking-at-p " :tag:$ " ) ) )
2014-11-08 08:35:24 -05:00
;; When `org-adapt-indentation' is non-nil, always indent planning
;; info and property drawers.
( should
( = 2
( org-test-with-temp-text " ** H \n SCHEDULED: <2014-03-04 tue.> "
( let ( ( org-odd-levels-only nil )
( org-adapt-indentation t ) )
( org-promote ) )
( forward-line )
( org-get-indentation ) ) ) )
( should
( = 2
( org-test-with-temp-text " ** H \n :PROPERTIES: \n :FOO: Bar \n :END: "
( let ( ( org-odd-levels-only nil )
( org-adapt-indentation t ) )
( org-promote ) )
( forward-line )
( org-get-indentation ) ) ) )
( should-not
( = 2
( org-test-with-temp-text " ** H \n SCHEDULED: <2014-03-04 tue.> "
( let ( ( org-odd-levels-only nil )
( org-adapt-indentation nil ) )
( org-promote ) )
( forward-line )
( org-get-indentation ) ) ) )
;; When `org-adapt-indentation' is non-nil, shift all lines in
;; section accordingly. Ignore, however, footnote definitions and
;; inlinetasks boundaries.
( should
( = 2
( org-test-with-temp-text " ** H \n Paragraph "
( let ( ( org-odd-levels-only nil )
( org-adapt-indentation t ) )
( org-promote ) )
( forward-line )
( org-get-indentation ) ) ) )
( should-not
( = 2
( org-test-with-temp-text " ** H \n Paragraph "
( let ( ( org-odd-levels-only nil )
( org-adapt-indentation nil ) )
( org-promote ) )
( forward-line )
( org-get-indentation ) ) ) )
( should
( = 2
2014-11-10 14:36:01 -05:00
( org-test-with-temp-text " ** H \n Paragraph \n [fn:1] line1 \n line2 "
2014-11-08 08:35:24 -05:00
( let ( ( org-odd-levels-only nil )
( org-adapt-indentation t ) )
( org-promote ) )
( forward-line )
( org-get-indentation ) ) ) )
( when ( featurep 'org-inlinetask )
( should
( zerop
( let ( ( org-inlinetask-min-level 5 )
( org-adapt-indentation t ) )
( org-test-with-temp-text " ** H \n ***** I \n ***** END "
( org-promote )
( forward-line )
( org-get-indentation ) ) ) ) ) )
( when ( featurep 'org-inlinetask )
( should
( = 2
( let ( ( org-inlinetask-min-level 5 )
( org-adapt-indentation t ) )
( org-test-with-temp-text " ** H \n ***** I \n Contents \n ***** END "
( org-promote )
( forward-line 2 )
( org-get-indentation ) ) ) ) ) )
;; Give up shifting if it would break document's structure
;; otherwise.
( should
( = 3
( org-test-with-temp-text " ** H \n Paragraph \n [fn:1] Def. "
( let ( ( org-odd-levels-only nil )
( org-adapt-indentation t ) )
( org-promote ) )
( forward-line )
( org-get-indentation ) ) ) )
( should
( = 3
( org-test-with-temp-text " ** H \n Paragraph \n * list. "
( let ( ( org-odd-levels-only nil )
( org-adapt-indentation t ) )
( org-promote ) )
( forward-line )
2014-11-10 14:36:01 -05:00
( org-get-indentation ) ) ) )
2020-12-08 23:47:55 -05:00
;; When `org-adapt-indentation' is non-nil, log drawers are
;; adjusted.
( should
( equal
" * H \n :LOGBOOK: \n - a \n :END: \n b "
( org-test-with-temp-text " ** H \n :LOGBOOK: \n - a \n :END: \n b "
( let ( ( org-odd-levels-only nil )
( org-adapt-indentation t ) )
( org-promote ) )
( buffer-string ) ) ) )
( should
( equal
" * H \n :LOGBOOK: \n - a \n :END: \n b "
( org-test-with-temp-text " ** H \n :LOGBOOK: \n - a \n :END: \n b "
( let ( ( org-odd-levels-only nil )
( org-adapt-indentation 'headline-data ) )
( org-promote ) )
( buffer-string ) ) ) )
( should
( equal
" * H \n :LOGBOOK: \n - a \n :END: "
( org-test-with-temp-text " ** H \n :LOGBOOK: \n - a \n :END: "
( let ( ( org-odd-levels-only nil )
( org-adapt-indentation t ) )
( org-promote ) )
( buffer-string ) ) ) )
( should
( equal
" # H \n :LOGBOOK: \n - a \n :END: "
( org-test-with-temp-text " * H \n :LOGBOOK: \n - a \n :END: "
( let ( ( org-odd-levels-only nil )
( org-allow-promoting-top-level-subtree t )
( org-adapt-indentation t ) )
( org-promote ) )
( buffer-string ) ) ) )
2014-11-10 14:36:01 -05:00
;; Ignore contents of source blocks or example blocks when
;; indentation should be preserved (through
;; `org-src-preserve-indentation' or "-i" flag).
( should-not
( zerop
( org-test-with-temp-text
" ** H \n #+BEGIN_SRC emacs-lisp \n (+ 1 1) \n #+END_SRC "
( let ( ( org-adapt-indentation t )
( org-src-preserve-indentation nil )
( org-odd-levels-only nil ) )
( org-promote ) )
( forward-line )
( org-get-indentation ) ) ) )
( should
( zerop
( org-test-with-temp-text
" ** H \n #+BEGIN_EXAMPLE \n Contents \n #+END_EXAMPLE "
( let ( ( org-adapt-indentation t )
( org-src-preserve-indentation t )
( org-odd-levels-only nil ) )
( org-promote ) )
( forward-line )
( org-get-indentation ) ) ) )
( should
( zerop
( org-test-with-temp-text
" ** H \n #+BEGIN_SRC emacs-lisp \n (+ 1 1) \n #+END_SRC "
( let ( ( org-adapt-indentation t )
( org-src-preserve-indentation t )
( org-odd-levels-only nil ) )
( org-promote ) )
( forward-line )
( org-get-indentation ) ) ) )
( should
( zerop
( org-test-with-temp-text
" ** H \n #+BEGIN_SRC emacs-lisp -i \n (+ 1 1) \n #+END_SRC "
( let ( ( org-adapt-indentation t )
( org-src-preserve-indentation nil )
( org-odd-levels-only nil ) )
( org-promote ) )
( forward-line )
( org-get-indentation ) ) ) ) )
2014-11-08 08:35:24 -05:00
2017-01-17 16:59:48 -05:00
( ert-deftest test-org/org-get-valid-level ( )
" Test function `org-get-valid-level' specifications. "
( let ( ( org-odd-levels-only nil ) )
( should ( equal 1 ( org-get-valid-level 0 0 ) ) )
( should ( equal 1 ( org-get-valid-level 0 1 ) ) )
( should ( equal 2 ( org-get-valid-level 0 2 ) ) )
( should ( equal 3 ( org-get-valid-level 0 3 ) ) )
( should ( equal 1 ( org-get-valid-level 1 0 ) ) )
( should ( equal 2 ( org-get-valid-level 1 1 ) ) )
( should ( equal 23 ( org-get-valid-level 1 22 ) ) )
( should ( equal 1 ( org-get-valid-level 1 -1 ) ) )
( should ( equal 1 ( org-get-valid-level 2 -1 ) ) ) )
( let ( ( org-odd-levels-only t ) )
( should ( equal 1 ( org-get-valid-level 0 0 ) ) )
( should ( equal 1 ( org-get-valid-level 0 1 ) ) )
( should ( equal 3 ( org-get-valid-level 0 2 ) ) )
( should ( equal 5 ( org-get-valid-level 0 3 ) ) )
( should ( equal 1 ( org-get-valid-level 1 0 ) ) )
( should ( equal 3 ( org-get-valid-level 1 1 ) ) )
( should ( equal 3 ( org-get-valid-level 2 1 ) ) )
( should ( equal 5 ( org-get-valid-level 3 1 ) ) )
( should ( equal 5 ( org-get-valid-level 4 1 ) ) )
( should ( equal 43 ( org-get-valid-level 1 21 ) ) )
( should ( equal 1 ( org-get-valid-level 1 -1 ) ) )
( should ( equal 1 ( org-get-valid-level 2 -1 ) ) )
( should ( equal 1 ( org-get-valid-level 3 -1 ) ) )
( should ( equal 3 ( org-get-valid-level 4 -1 ) ) )
( should ( equal 3 ( org-get-valid-level 5 -1 ) ) ) ) )
2013-01-10 15:42:21 -05:00
;;; Planning
2014-12-23 06:10:55 -05:00
( ert-deftest test-org/at-planning-p ( )
" Test `org-at-planning-p' specifications. "
2013-01-10 15:42:21 -05:00
;; Regular test.
( should
2014-12-23 06:10:55 -05:00
( org-test-with-temp-text " * Headline \n <point>DEADLINE: <2014-03-04 tue.> "
( org-at-planning-p ) ) )
( should-not
( org-test-with-temp-text " DEADLINE: <2014-03-04 tue.> "
( org-at-planning-p ) ) )
;; Correctly find planning attached to inlinetasks.
( when ( featurep 'org-inlinetask )
( should
( org-test-with-temp-text
" *** Inlinetask \n <point>DEADLINE: <2014-03-04 tue.> \n *** END "
( let ( ( org-inlinetask-min-level 3 ) ) ( org-at-planning-p ) ) ) )
( should-not
( org-test-with-temp-text
" *** Inlinetask \n <point>DEADLINE: <2014-03-04 tue.> "
( let ( ( org-inlinetask-min-level 3 ) ) ( org-at-planning-p ) ) ) )
( should-not
( org-test-with-temp-text
" * Headline \n *** Inlinetask \n <point>DEADLINE: <2014-03-04 tue.> "
( let ( ( org-inlinetask-min-level 3 ) ) ( org-at-planning-p ) ) ) )
( should-not
( org-test-with-temp-text
" * Headline \n *** Inlinetask \n *** END \n <point>DEADLINE: <2014-03-04 tue.> "
( let ( ( org-inlinetask-min-level 3 ) ) ( org-at-planning-p ) ) ) ) ) )
2013-01-10 15:42:21 -05:00
2015-06-26 21:33:34 -04:00
( ert-deftest test-org/add-planning-info ( )
" Test `org-add-planning-info' . "
;; Create deadline when `org-adapt-indentation' is non-nil.
( should
( equal " * H \n DEADLINE: <2015-06-25> \n Paragraph "
( org-test-with-temp-text " * H \n Paragraph<point> "
( let ( ( org-adapt-indentation t ) )
( org-add-planning-info 'deadline " <2015-06-25 Thu> " ) )
( replace-regexp-in-string
" \\ ( [.A-Za-z]+ \\ )> " " " ( buffer-string )
nil nil 1 ) ) ) )
;; Create deadline when `org-adapt-indentation' is nil.
( should
( equal " * H \n DEADLINE: <2015-06-25> \n Paragraph "
( org-test-with-temp-text " * H \n Paragraph<point> "
( let ( ( org-adapt-indentation nil ) )
( org-add-planning-info 'deadline " <2015-06-25 Thu> " ) )
( replace-regexp-in-string
" \\ ( [.A-Za-z]+ \\ )> " " " ( buffer-string )
nil nil 1 ) ) ) )
;; Update deadline when `org-adapt-indentation' is non-nil.
( should
( equal " * H \n DEADLINE: <2015-06-25> \n Paragraph "
( org-test-with-temp-text " \
* H
DEADLINE: <2015-06-24 Wed>
Paragraph<point> "
( let ( ( org-adapt-indentation t ) )
( org-add-planning-info 'deadline " <2015-06-25 Thu> " ) )
( replace-regexp-in-string
" \\ ( [.A-Za-z]+ \\ )> " " " ( buffer-string )
nil nil 1 ) ) ) )
;; Update deadline when `org-adapt-indentation' is nil.
( should
( equal " * H \n DEADLINE: <2015-06-25> \n Paragraph "
( org-test-with-temp-text " \
* H
DEADLINE: <2015-06-24 Wed>
Paragraph<point> "
( let ( ( org-adapt-indentation nil ) )
( org-add-planning-info 'deadline " <2015-06-25 Thu> " ) )
( replace-regexp-in-string
" \\ ( [.A-Za-z]+ \\ )> " " " ( buffer-string )
nil nil 1 ) ) ) )
;; Schedule when `org-adapt-indentation' is non-nil.
( should
( equal " * H \n SCHEDULED: <2015-06-25> \n Paragraph "
( org-test-with-temp-text " * H \n Paragraph<point> "
( let ( ( org-adapt-indentation t ) )
( org-add-planning-info 'scheduled " <2015-06-25 Thu> " ) )
( replace-regexp-in-string
" \\ ( [.A-Za-z]+ \\ )> " " " ( buffer-string )
nil nil 1 ) ) ) )
;; Schedule when `org-adapt-indentation' is nil.
( should
( equal " * H \n SCHEDULED: <2015-06-25> \n Paragraph "
( org-test-with-temp-text " * H \n Paragraph<point> "
( let ( ( org-adapt-indentation nil ) )
( org-add-planning-info 'scheduled " <2015-06-25 Thu> " ) )
( replace-regexp-in-string
" \\ ( [.A-Za-z]+ \\ )> " " " ( buffer-string )
nil nil 1 ) ) ) )
;; Add deadline when scheduled.
( should
( equal " \
* H
DEADLINE: <2015-06-25> SCHEDULED: <2015-06-24>
Paragraph "
( org-test-with-temp-text " \
* H
SCHEDULED: <2015-06-24 Wed>
Paragraph<point> "
( let ( ( org-adapt-indentation t ) )
( org-add-planning-info 'deadline " <2015-06-25 Thu> " ) )
( replace-regexp-in-string
" \\ ( [.A-Za-z]+ \\ )> " " " ( buffer-string )
nil nil 1 ) ) ) )
;; Remove middle entry.
( should
( equal " \
* H
CLOSED: [ 2015-06-24 ] SCHEDULED: <2015-06-24>
Paragraph "
( org-test-with-temp-text " \
* H
CLOSED: [ 2015-06-24 Wed ] DEADLINE: <2015-06-25 Thu> SCHEDULED: <2015-06-24 Wed>
Paragraph<point> "
( let ( ( org-adapt-indentation t ) )
( org-add-planning-info nil nil 'deadline ) )
( replace-regexp-in-string
" \\ ( [.A-Za-z]+ \\ )[]>] " " " ( buffer-string )
nil nil 1 ) ) ) )
;; Remove last entry and then middle entry (order should not
;; matter).
( should
( equal " \
* H
CLOSED: [ 2015-06-24 ]
Paragraph "
( org-test-with-temp-text " \
* H
CLOSED: [ 2015-06-24 Wed ] DEADLINE: <2015-06-25 Thu> SCHEDULED: <2015-06-24 Wed>
Paragraph<point> "
( let ( ( org-adapt-indentation t ) )
( org-add-planning-info nil nil 'scheduled 'deadline ) )
( replace-regexp-in-string
" \\ ( [.A-Za-z]+ \\ )[]>] " " " ( buffer-string )
nil nil 1 ) ) ) )
;; Remove closed when `org-adapt-indentation' is non-nil.
( should
( equal " * H \n DEADLINE: <2015-06-25> \n Paragraph "
( org-test-with-temp-text " \
* H
CLOSED: [ 2015-06-25 Thu ] DEADLINE: <2015-06-25 Thu>
Paragraph<point> "
( let ( ( org-adapt-indentation t ) )
( org-add-planning-info nil nil 'closed ) )
( replace-regexp-in-string
" \\ ( [.A-Za-z]+ \\ )> " " " ( buffer-string )
nil nil 1 ) ) ) )
2015-09-03 17:03:28 -04:00
( should
( equal " * H \n Paragraph "
( org-test-with-temp-text " \
* H
CLOSED: [ 2015-06-25 Thu ]
Paragraph<point> "
( let ( ( org-adapt-indentation t ) )
( org-add-planning-info nil nil 'closed ) )
( replace-regexp-in-string
" \\ ( [.A-Za-z]+ \\ )> " " " ( buffer-string )
nil nil 1 ) ) ) )
2015-06-26 21:33:34 -04:00
;; Remove closed when `org-adapt-indentation' is nil.
( should
( equal " * H \n DEADLINE: <2015-06-25> \n Paragraph "
( org-test-with-temp-text " \
* H
CLOSED: [ 2015-06-25 Thu ] DEADLINE: <2015-06-25 Thu>
2015-09-03 17:03:28 -04:00
Paragraph<point> "
( let ( ( org-adapt-indentation nil ) )
( org-add-planning-info nil nil 'closed ) )
( replace-regexp-in-string
" \\ ( [.A-Za-z]+ \\ )> " " " ( buffer-string )
nil nil 1 ) ) ) )
( should
( equal " * H \n Paragraph "
( org-test-with-temp-text " \
* H
CLOSED: [ 2015-06-25 Thu ]
2015-06-26 21:33:34 -04:00
Paragraph<point> "
( let ( ( org-adapt-indentation nil ) )
( org-add-planning-info nil nil 'closed ) )
( replace-regexp-in-string
" \\ ( [.A-Za-z]+ \\ )> " " " ( buffer-string )
nil nil 1 ) ) ) )
;; Remove closed entry and delete empty line.
( should
( equal " \
* H
Paragraph "
( org-test-with-temp-text " \
* H
CLOSED: [ 2015-06-24 Wed ]
Paragraph<point> "
( let ( ( org-adapt-indentation t ) )
( org-add-planning-info nil nil 'closed ) )
( replace-regexp-in-string
" \\ ( [.A-Za-z]+ \\ )> " " " ( buffer-string )
nil nil 1 ) ) ) )
;; Remove one entry and update another.
( should
( equal " * H \n DEADLINE: <2015-06-25> \n Paragraph "
( org-test-with-temp-text " \
* H
SCHEDULED: <2015-06-23 Tue> DEADLINE: <2015-06-24 Wed>
Paragraph<point> "
( let ( ( org-adapt-indentation t ) )
( org-add-planning-info 'deadline " <2015-06-25 Thu> " 'scheduled ) )
( replace-regexp-in-string
" \\ ( [.A-Za-z]+ \\ )> " " " ( buffer-string )
nil nil 1 ) ) ) ) )
2017-01-25 17:27:33 -05:00
( ert-deftest test-org/deadline ( )
" Test `org-deadline' specifications. "
;; Insert a new value or replace existing one.
( should
2020-05-05 20:43:42 -04:00
( equal " * H \n DEADLINE: <2012-03-29> "
2017-01-25 17:27:33 -05:00
( org-test-with-temp-text " * H "
( let ( ( org-adapt-indentation nil )
( org-last-inserted-timestamp nil ) )
( org-deadline nil " <2012-03-29 Tue> " ) )
( replace-regexp-in-string
" \\ ( [.A-Za-z]+ \\ )> " " " ( buffer-string )
nil nil 1 ) ) ) )
( should
( equal " * H \n DEADLINE: <2014-03-04> "
( org-test-with-temp-text " * H \n DEADLINE: <2012-03-29> "
( let ( ( org-adapt-indentation nil )
( org-last-inserted-timestamp nil ) )
( org-deadline nil " <2014-03-04 Thu> " ) )
( replace-regexp-in-string
" \\ ( [.A-Za-z]+ \\ )> " " " ( buffer-string )
nil nil 1 ) ) ) )
;; Accept delta time, e.g., "+2d".
( should
2020-05-05 20:43:42 -04:00
( equal " * H \n DEADLINE: <2015-03-04> "
2019-02-12 17:44:23 -05:00
( org-test-at-time " 2014-03-04 "
2017-01-25 17:27:33 -05:00
( org-test-with-temp-text " * H "
( let ( ( org-adapt-indentation nil )
( org-last-inserted-timestamp nil ) )
( org-deadline nil " +1y " ) )
( replace-regexp-in-string
" \\ ( [.A-Za-z]+ \\ )> " " " ( buffer-string ) nil nil 1 ) ) ) ) )
;; Preserve repeater.
( should
2020-05-05 20:43:42 -04:00
( equal " * H \n DEADLINE: <2012-03-29 +2y> "
2017-01-25 17:27:33 -05:00
( org-test-with-temp-text " * H "
( let ( ( org-adapt-indentation nil )
( org-last-inserted-timestamp nil ) )
( org-deadline nil " <2012-03-29 Tue +2y> " ) )
( replace-regexp-in-string
" \\ ( [.A-Za-z]+ \\ ) " " " ( buffer-string ) nil nil 1 ) ) ) )
2022-05-15 02:49:10 -04:00
;; Preserve warning period.
( should
( equal " * H \n DEADLINE: <2021-07-20 -1d> "
( org-test-with-temp-text " * H "
( let ( ( org-adapt-indentation nil )
( org-last-inserted-timestamp nil ) )
( org-deadline nil " <2021-07-20 Tue -1d> " ) )
( replace-regexp-in-string
" \\ ( [.A-Za-z]+ \\ ) " " " ( buffer-string ) nil nil 1 ) ) ) )
( should
( equal " * H \n DEADLINE: <2021-07-20 +1m -3d> "
( org-test-with-temp-text " * H "
( let ( ( org-adapt-indentation nil )
( org-last-inserted-timestamp nil ) )
( org-deadline nil " <2021-07-20 Tue +1m -3d> " ) )
( replace-regexp-in-string
" \\ ( [.A-Za-z]+ \\ ) " " " ( buffer-string ) nil nil 1 ) ) ) )
2017-01-25 17:27:33 -05:00
;; Remove CLOSED keyword, if any.
( should
( equal " * H \n DEADLINE: <2012-03-29> "
( org-test-with-temp-text " * H \n CLOSED: [2017-01-25 Wed] "
( let ( ( org-adapt-indentation nil )
( org-last-inserted-timestamp nil ) )
( org-deadline nil " <2012-03-29 Tue> " ) )
( replace-regexp-in-string
" \\ ( [.A-Za-z]+ \\ )> " " " ( buffer-string ) nil nil 1 ) ) ) )
;; With C-u argument, remove DEADLINE keyword.
( should
( equal " * H \n "
( org-test-with-temp-text " * H \n DEADLINE: <2012-03-29> "
( let ( ( org-adapt-indentation nil )
( org-last-inserted-timestamp nil ) )
( org-deadline ' ( 4 ) ) )
( buffer-string ) ) ) )
( should
( equal " * H "
( org-test-with-temp-text " * H "
( let ( ( org-adapt-indentation nil )
( org-last-inserted-timestamp nil ) )
( org-deadline ' ( 4 ) ) )
( buffer-string ) ) ) )
;; With C-u C-u argument, prompt for a delay cookie.
( should
( equal " * H \n DEADLINE: <2012-03-29 -705d> "
( cl-letf ( ( ( symbol-function 'org-read-date )
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 17:21:37 -04:00
( lambda ( &rest _args )
2022-05-02 06:41:34 -04:00
( org-time-string-to-time " 2014-03-04 " ) ) ) )
2017-01-25 17:27:33 -05:00
( org-test-with-temp-text " * H \n DEADLINE: <2012-03-29> "
( let ( ( org-adapt-indentation nil )
( org-last-inserted-timestamp nil ) )
( org-deadline ' ( 16 ) ) )
( buffer-string ) ) ) ) )
( should-error
( cl-letf ( ( ( symbol-function 'org-read-date )
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 17:21:37 -04:00
( lambda ( &rest _args )
2022-05-02 06:41:34 -04:00
( org-time-string-to-time " 2014-03-04 " ) ) ) )
2017-01-25 17:27:33 -05:00
( org-test-with-temp-text " * H "
( let ( ( org-adapt-indentation nil )
( org-last-inserted-timestamp nil ) )
( org-deadline ' ( 16 ) ) )
( buffer-string ) ) ) )
;; When a region is active and
;; `org-loop-over-headlines-in-active-region' is non-nil, insert the
;; same value in all headlines in region.
( should
2020-05-05 20:43:42 -04:00
( equal " * H1 \n DEADLINE: <2012-03-29> \n * H2 \n DEADLINE: <2012-03-29> "
2017-01-25 17:27:33 -05:00
( org-test-with-temp-text " * H1 \n * H2 "
( let ( ( org-adapt-indentation nil )
( org-last-inserted-timestamp nil )
( org-loop-over-headlines-in-active-region t ) )
( transient-mark-mode 1 )
( push-mark ( point ) t t )
( goto-char ( point-max ) )
( org-deadline nil " 2012-03-29 " ) )
( replace-regexp-in-string
" \\ ( [.A-Za-z]+ \\ )> " " " ( buffer-string ) nil nil 1 ) ) ) )
( should-not
2020-05-05 20:43:42 -04:00
( equal " * H1 \n DEADLINE: <2012-03-29> \n * H2 \n DEADLINE: <2012-03-29> "
2017-01-25 17:27:33 -05:00
( org-test-with-temp-text " * H1 \n * H2 "
( let ( ( org-adapt-indentation nil )
( org-last-inserted-timestamp nil )
( org-loop-over-headlines-in-active-region nil ) )
( transient-mark-mode 1 )
( push-mark ( point ) t t )
( goto-char ( point-max ) )
( org-deadline nil " 2012-03-29 " ) )
( replace-regexp-in-string
" \\ ( [.A-Za-z]+ \\ )> " " " ( buffer-string ) nil nil 1 ) ) ) ) )
( ert-deftest test-org/schedule ( )
" Test `org-schedule' specifications. "
;; Insert a new value or replace existing one.
( should
2020-05-05 20:43:42 -04:00
( equal " * H \n SCHEDULED: <2012-03-29> "
2017-01-25 17:27:33 -05:00
( org-test-with-temp-text " * H "
( let ( ( org-adapt-indentation nil )
( org-last-inserted-timestamp nil ) )
( org-schedule nil " <2012-03-29 Tue> " ) )
( replace-regexp-in-string
" \\ ( [.A-Za-z]+ \\ )> " " " ( buffer-string )
nil nil 1 ) ) ) )
( should
( equal " * H \n SCHEDULED: <2014-03-04> "
( org-test-with-temp-text " * H \n SCHEDULED: <2012-03-29> "
( let ( ( org-adapt-indentation nil )
( org-last-inserted-timestamp nil ) )
( org-schedule nil " <2014-03-04 Thu> " ) )
( replace-regexp-in-string
" \\ ( [.A-Za-z]+ \\ )> " " " ( buffer-string )
nil nil 1 ) ) ) )
;; Accept delta time, e.g., "+2d".
( should
2020-05-05 20:43:42 -04:00
( equal " * H \n SCHEDULED: <2015-03-04> "
2019-02-12 17:44:23 -05:00
( org-test-at-time " 2014-03-04 "
2017-01-25 17:27:33 -05:00
( org-test-with-temp-text " * H "
( let ( ( org-adapt-indentation nil )
( org-last-inserted-timestamp nil ) )
( org-schedule nil " +1y " ) )
( replace-regexp-in-string
" \\ ( [.A-Za-z]+ \\ )> " " " ( buffer-string ) nil nil 1 ) ) ) ) )
;; Preserve repeater.
( should
2020-05-05 20:43:42 -04:00
( equal " * H \n SCHEDULED: <2012-03-29 +2y> "
2017-01-25 17:27:33 -05:00
( org-test-with-temp-text " * H "
( let ( ( org-adapt-indentation nil )
( org-last-inserted-timestamp nil ) )
( org-schedule nil " <2012-03-29 Tue +2y> " ) )
( replace-regexp-in-string
" \\ ( [.A-Za-z]+ \\ ) " " " ( buffer-string ) nil nil 1 ) ) ) )
;; Remove CLOSED keyword, if any.
( should
( equal " * H \n SCHEDULED: <2012-03-29> "
( org-test-with-temp-text " * H \n CLOSED: [2017-01-25 Wed] "
( let ( ( org-adapt-indentation nil )
( org-last-inserted-timestamp nil ) )
( org-schedule nil " <2012-03-29 Tue> " ) )
( replace-regexp-in-string
" \\ ( [.A-Za-z]+ \\ )> " " " ( buffer-string ) nil nil 1 ) ) ) )
;; With C-u argument, remove SCHEDULED keyword.
( should
( equal " * H \n "
( org-test-with-temp-text " * H \n SCHEDULED: <2012-03-29> "
( let ( ( org-adapt-indentation nil )
( org-last-inserted-timestamp nil ) )
( org-schedule ' ( 4 ) ) )
( buffer-string ) ) ) )
( should
( equal " * H "
( org-test-with-temp-text " * H "
( let ( ( org-adapt-indentation nil )
( org-last-inserted-timestamp nil ) )
( org-schedule ' ( 4 ) ) )
( buffer-string ) ) ) )
;; With C-u C-u argument, prompt for a delay cookie.
( should
( equal " * H \n SCHEDULED: <2012-03-29 -705d> "
( cl-letf ( ( ( symbol-function 'org-read-date )
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 17:21:37 -04:00
( lambda ( &rest _args )
2022-05-02 06:41:34 -04:00
( org-time-string-to-time " 2014-03-04 " ) ) ) )
2017-01-25 17:27:33 -05:00
( org-test-with-temp-text " * H \n SCHEDULED: <2012-03-29> "
( let ( ( org-adapt-indentation nil )
( org-last-inserted-timestamp nil ) )
( org-schedule ' ( 16 ) ) )
( buffer-string ) ) ) ) )
( should-error
( cl-letf ( ( ( symbol-function 'org-read-date )
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 17:21:37 -04:00
( lambda ( &rest _args )
2022-05-02 06:41:34 -04:00
( org-time-string-to-time " 2014-03-04 " ) ) ) )
2017-01-25 17:27:33 -05:00
( org-test-with-temp-text " * H "
( let ( ( org-adapt-indentation nil )
( org-last-inserted-timestamp nil ) )
( org-schedule ' ( 16 ) ) )
( buffer-string ) ) ) )
;; When a region is active and
;; `org-loop-over-headlines-in-active-region' is non-nil, insert the
;; same value in all headlines in region.
( should
2020-05-05 20:43:42 -04:00
( equal " * H1 \n SCHEDULED: <2012-03-29> \n * H2 \n SCHEDULED: <2012-03-29> "
2017-01-25 17:27:33 -05:00
( org-test-with-temp-text " * H1 \n * H2 "
( let ( ( org-adapt-indentation nil )
( org-last-inserted-timestamp nil )
( org-loop-over-headlines-in-active-region t ) )
( transient-mark-mode 1 )
( push-mark ( point ) t t )
( goto-char ( point-max ) )
( org-schedule nil " 2012-03-29 " ) )
( replace-regexp-in-string
" \\ ( [.A-Za-z]+ \\ )> " " " ( buffer-string ) nil nil 1 ) ) ) )
( should-not
2020-05-05 20:43:42 -04:00
( equal " * H1 \n SCHEDULED: <2012-03-29> \n * H2 \n SCHEDULED: <2012-03-29> "
2017-01-25 17:27:33 -05:00
( org-test-with-temp-text " * H1 \n * H2 "
( let ( ( org-adapt-indentation nil )
( org-last-inserted-timestamp nil )
( org-loop-over-headlines-in-active-region nil ) )
( transient-mark-mode 1 )
( push-mark ( point ) t t )
( goto-char ( point-max ) )
( org-schedule nil " 2012-03-29 " ) )
( replace-regexp-in-string
2017-01-29 10:04:03 -05:00
" \\ ( [.A-Za-z]+ \\ )> " " " ( buffer-string ) nil nil 1 ) ) ) )
( should
;; check if a repeater survives re-scheduling.
( string-match-p
" \\ * H \n SCHEDULED: <2017-02-01 [.A-Za-z]* \\ + \\ +7d> \n "
( org-test-with-temp-text " * H \n SCHEDULED: <2017-01-19 ++7d> \n "
( let ( ( org-adapt-indentation nil )
( org-last-inserted-timestamp nil ) )
( org-schedule nil " 2017-02-01 " ) )
( buffer-string ) ) ) ) )
2017-01-25 17:27:33 -05:00
2014-09-15 03:32:57 -04:00
;;; Property API
( ert-deftest test-org/buffer-property-keys ( )
" Test `org-buffer-property-keys' specifications. "
2019-11-12 08:44:05 -05:00
;; Retrieve properties across siblings.
2014-09-15 03:32:57 -04:00
( should
( equal ' ( " A " " B " )
( org-test-with-temp-text "
* H1
:PROPERTIES:
:A: 1
:END:
* H2
:PROPERTIES:
:B: 1
:END: "
( org-buffer-property-keys ) ) ) )
2019-11-12 08:44:05 -05:00
;; Retrieve properties across children.
2014-09-15 03:32:57 -04:00
( should
( equal ' ( " A " " B " )
( org-test-with-temp-text "
* H1
:PROPERTIES:
:A: 1
:END:
** H2
:PROPERTIES:
:B: 1
:END: "
( org-buffer-property-keys ) ) ) )
;; Retrieve muliple properties in the same drawer.
( should
( equal ' ( " A " " B " )
( org-test-with-temp-text " * H \n :PROPERTIES: \n :A: 1 \n :B: 2 \n :END: "
( org-buffer-property-keys ) ) ) )
;; Ignore extension symbol in property name.
( should
( equal ' ( " A " )
( org-test-with-temp-text " * H \n :PROPERTIES: \n :A: 1 \n :A+: 2 \n :END: "
( org-buffer-property-keys ) ) ) )
2020-07-06 21:49:41 -04:00
;; Add bare property if xxx_ALL property is there
( should
( equal ' ( " A " " B " " B_ALL " )
( org-test-with-temp-text " * H \n :PROPERTIES: \n :A: 1 \n :A+: 2 \n :B_ALL: foo bar \n :END: "
( org-buffer-property-keys ) ) ) )
;; Add bare property if xxx_ALL property is there - check dupes
( should
( equal ' ( " A " " B " " B_ALL " )
( org-test-with-temp-text " * H \n :PROPERTIES: \n :A: 1 \n :B: 2 \n :B_ALL: foo bar \n :END: "
( org-buffer-property-keys ) ) ) )
;; Retrieve properties from #+PROPERTY keyword lines
( should
( equal ' ( " A " " C " )
( org-test-with-temp-text " #+PROPERTY: C foo \n * H \n :PROPERTIES: \n :A: 1 \n :A+: 2 \n :END: "
( org-buffer-property-keys ) ) ) )
;; Retrieve properties from #+PROPERTY keyword lines - make sure an _ALL property also
;; adds the bare property
( should
( equal ' ( " A " " C " " C_ALL " )
( org-test-with-temp-text " #+PROPERTY: C_ALL foo bar \n * H \n :PROPERTIES: \n :A: 1 \n :A+: 2 \n :END: "
( org-buffer-property-keys ) ) ) )
2014-09-15 03:32:57 -04:00
;; With non-nil COLUMNS, extract property names from columns.
( should
( equal ' ( " A " " B " )
( org-test-with-temp-text " #+COLUMNS: %25ITEM %A %20B "
( org-buffer-property-keys nil nil t ) ) ) )
( should
( equal ' ( " A " " B " " COLUMNS " )
( org-test-with-temp-text
" * H \n :PROPERTIES: \n :COLUMNS: %25ITEM %A %20B \n :END: "
2015-12-29 05:20:09 -05:00
( org-buffer-property-keys nil nil t ) ) ) )
2017-10-01 16:56:57 -04:00
;; In COLUMNS, ignore title and summary-type.
2017-10-01 12:57:50 -04:00
( should
( equal ' ( " A " )
( org-test-with-temp-text " #+COLUMNS: %A(Foo) "
( org-buffer-property-keys nil nil t ) ) ) )
( should
( equal ' ( " A " )
( org-test-with-temp-text " #+COLUMNS: %A{Foo} "
( org-buffer-property-keys nil nil t ) ) ) )
( should
( equal ' ( " A " )
( org-test-with-temp-text " #+COLUMNS: %A(Foo){Bar} "
2017-09-16 08:14:46 -04:00
( org-buffer-property-keys nil nil t ) ) ) ) )
2014-09-15 03:32:57 -04:00
( ert-deftest test-org/property-values ( )
" Test `org-property-values' specifications. "
;; Regular test.
( should
( equal ' ( " 2 " " 1 " )
( org-test-with-temp-text
" * H \n :PROPERTIES: \n :A: 1 \n :END: \n * H \n :PROPERTIES: \n :A: 2 \n :END: "
( org-property-values " A " ) ) ) )
;; Ignore empty values.
( should-not
( org-test-with-temp-text
" * H1 \n :PROPERTIES: \n :A: \n :END: \n * H2 \n :PROPERTIES: \n :A: \n :END: "
( org-property-values " A " ) ) )
;; Take into consideration extended values.
( should
( equal ' ( " 1 2 " )
( org-test-with-temp-text " * H \n :PROPERTIES: \n :A: 1 \n :A+: 2 \n :END: "
( org-property-values " A " ) ) ) ) )
Org document property-drawers
Add functionality to define property-blocks on document level, in
addition to at headline level.
* doc/org-manual.org:
* etc/ORG-NEWS: Document new functionality.
* lisp/org.el (org-keyword-regexp): Define constant instead of
hardcoding.
(org-file-properties): Renamed, see next line.
(org-keyword-properties): Renamed from above. Due to the fact that
properties can be defined for the whole document using property
drawers this local variable needs a rename to make its name less
ambigous.
(org-refresh-properties, org-refresh-property, org-entry-properties)
(org-refresh-category-properties, org-get-property-block)
(org-entry-get-with-inheritance, org-entry-put)
(org-insert-property-drawer, org-end-of-subtree): Made to work before
first headline.
(org-at-property-block-p): New function to validate if point is at the
start of a property block.
(org-property-global-value): Renamed, see next line.
(org-property-global-or-keyword-value): Renamed from above to match
its functionality better.
(org-back-to-heading-or-point-min): New function to make a document
work as a level 0 node in the outline.
(org-at-keyword-p): Predicate function to answer to if we're currently
at a keyword line or not.
(org-up-heading-or-point-min): New function to make a document work as
a level 0 node in the outline.
* lisp/org-element.el (org-element--current-element): Can now detect
property-blocks before first headline according to it's positional
rules.
* lisp/org-attach.el (org-attach): Make it possible to call the
attachment dispatcher also before the first headline, since document
property drawers make attachments possible for the whole document
now.
* lisp/org-capture.el: Modified only due to rename of function in
org.el.
* lisp/org-compat.el (org-file-properties)
(org-property-global-value): Renamed functions declared obsolete.
* testing/lisp/test-org.el (org/insert-property-drawer)
(org/set-property, org/delete-property, org/delete-property-globally):
Additions of tests to check if they work before first headline.
(org/at-property-p, org/at-property-block-p, org/get-property-block)
(org/entry-get, org/refresh-properties): New tests
* testing/examples/property-inheritance.org: Switch from
property-keywords to a property-drawer in the testfile.
Functionality should be the same, but now using a document drawer
instead of property-keywords.
Reason for switching is that I'd like us to slowly depricate
property-keywords.
* testing/lisp/test-org-element.el:
* contrib/lisp/ox-taskjuggler.el: A comment is modified only due to
rename of function in org.el.
2019-05-26 16:13:09 -04:00
( ert-deftest test-org/set-property ( )
" Test `org-set-property' specifications. "
( should
( equal
" :PROPERTIES: \n :TEST: t \n :END: \n "
( org-test-with-temp-text " "
( let ( ( org-property-format " %s %s " ) )
( org-set-property " TEST " " t " ) )
( buffer-string ) ) ) )
( should
( equal
" * H \n :PROPERTIES: \n :TEST: t \n :END: \n "
( org-test-with-temp-text " * H "
( let ( ( org-adapt-indentation nil )
( org-property-format " %s %s " ) )
( org-set-property " TEST " " t " ) )
( buffer-string ) ) ) ) )
( ert-deftest test-org/delete-property ( )
" Test `org-delete-property' specifications. "
( should
( equal
" "
( org-test-with-temp-text " :PROPERTIES: \n :TEST: t \n :END: \n "
( org-delete-property " TEST " )
( buffer-string ) ) ) )
( should
( equal
" :PROPERTIES: \n :TEST1: t \n :END: \n "
( org-test-with-temp-text " :PROPERTIES: \n :TEST1: t \n :TEST2: t \n :END: \n "
( org-delete-property " TEST2 " )
( buffer-string ) ) ) )
( should
( equal
" * H \n "
( org-test-with-temp-text " * H \n :PROPERTIES: \n :TEST: t \n :END: \n "
( org-delete-property " TEST " )
( buffer-string ) ) ) )
( should
( equal
" * H \n :PROPERTIES: \n :TEST1: t \n :END: \n "
( org-test-with-temp-text " * H \n :PROPERTIES: \n :TEST1: t \n :TEST2: t \n :END: \n "
( org-delete-property " TEST2 " )
( buffer-string ) ) ) ) )
( ert-deftest test-org/delete-property-globally ( )
" Test `org-delete-property-global' specifications. "
( should
( equal
" "
( org-test-with-temp-text " :PROPERTIES: \n :TEST: t \n :END: \n "
( org-delete-property-globally " TEST " )
( buffer-string ) ) ) )
( should
( equal
" * H \n "
( org-test-with-temp-text " :PROPERTIES: \n :TEST: t \n :END: \n * H \n :PROPERTIES: \n :TEST: nil \n :END: "
( org-delete-property-globally " TEST " )
( buffer-string ) ) ) ) )
2015-03-15 06:15:43 -04:00
( ert-deftest test-org/find-property ( )
" Test `org-find-property' specifications. "
;; Regular test.
( should
( = 1
( org-test-with-temp-text " * H \n :PROPERTIES: \n :PROP: value \n :END: "
( org-find-property " prop " ) ) ) )
2020-05-07 18:50:16 -04:00
;; Find properties in top-level property drawer.
( should
( = 1
( org-test-with-temp-text " :PROPERTIES: \n :PROP: value \n :END: "
( org-find-property " prop " ) ) ) )
2015-03-15 06:15:43 -04:00
;; Ignore false positives.
( should
( = 27
( org-test-with-temp-text
" * H1 \n :DRAWER: \n :A: 1 \n :END: \n * H2 \n :PROPERTIES: \n :A: 1 \n :END: "
( org-find-property " A " ) ) ) )
;; Return first entry found in buffer.
( should
( = 1
( org-test-with-temp-text
" * H1 \n :PROPERTIES: \n :A: 1 \n :END: \n * H2 \n :PROPERTIES: \n :<point>A: 1 \n :END: "
( org-find-property " A " ) ) ) )
;; Only search visible part of the buffer.
( should
( = 31
( org-test-with-temp-text
" * H1 \n :PROPERTIES: \n :A: 1 \n :END: \n * H2 \n :PROPERTIES: \n :<point>A: 1 \n :END: "
( org-narrow-to-subtree )
( org-find-property " A " ) ) ) )
;; With optional argument, only find entries with a specific value.
( should-not
( org-test-with-temp-text " * H \n :PROPERTIES: \n :A: 1 \n :END: "
( org-find-property " A " " 2 " ) ) )
( should
( = 31
( org-test-with-temp-text
" * H1 \n :PROPERTIES: \n :A: 1 \n :END: \n * H2 \n :PROPERTIES: \n :A: 2 \n :END: "
( org-find-property " A " " 2 " ) ) ) )
;; Use "nil" for explicit nil values.
( should
( = 31
( org-test-with-temp-text
" * H1 \n :PROPERTIES: \n :A: 1 \n :END: \n * H2 \n :PROPERTIES: \n :A: nil \n :END: "
2015-03-31 10:32:54 -04:00
( org-find-property " A " " nil " ) ) ) ) )
2015-03-15 06:15:43 -04:00
2014-09-15 03:32:57 -04:00
( ert-deftest test-org/entry-delete ( )
" Test `org-entry-delete' specifications. "
;; Regular test.
( should
( string-match
" *:PROPERTIES: \n *:B: +2 \n *:END: "
( org-test-with-temp-text " * H \n :PROPERTIES: \n :A: 1 \n :B: 2 \n :END: "
( org-entry-delete ( point ) " A " )
( buffer-string ) ) ) )
2015-03-15 11:06:42 -04:00
;; Also remove accumulated properties.
( should-not
( string-match
" :A "
( org-test-with-temp-text " * H \n :PROPERTIES: \n :A: 1 \n :A+: 2 \n :B: 3 \n :END: "
( org-entry-delete ( point ) " A " )
( buffer-string ) ) ) )
2014-09-15 03:32:57 -04:00
;; When last property is removed, remove the property drawer.
( should-not
( string-match
" :PROPERTIES: "
( org-test-with-temp-text " * H \n :PROPERTIES: \n :A: 1 \n :END: \n Paragraph "
( org-entry-delete ( point ) " A " )
2015-03-15 11:06:42 -04:00
( buffer-string ) ) ) )
;; Return a non-nil value when some property was removed.
( should
( org-test-with-temp-text " * H \n :PROPERTIES: \n :A: 1 \n :B: 2 \n :END: "
( org-entry-delete ( point ) " A " ) ) )
( should-not
( org-test-with-temp-text " * H \n :PROPERTIES: \n :A: 1 \n :B: 2 \n :END: "
2017-01-22 08:28:02 -05:00
( org-entry-delete ( point ) " C " ) ) )
;; Special properties cannot be located in a drawer. Allow to
;; remove them anyway, in case of user error.
( should
( org-test-with-temp-text " * H \n :PROPERTIES: \n :SCHEDULED: 1 \n :END: "
( org-entry-delete ( point ) " SCHEDULED " ) ) ) )
2014-09-15 03:32:57 -04:00
( ert-deftest test-org/entry-get ( )
" Test `org-entry-get' specifications. "
;; Regular test.
Org document property-drawers
Add functionality to define property-blocks on document level, in
addition to at headline level.
* doc/org-manual.org:
* etc/ORG-NEWS: Document new functionality.
* lisp/org.el (org-keyword-regexp): Define constant instead of
hardcoding.
(org-file-properties): Renamed, see next line.
(org-keyword-properties): Renamed from above. Due to the fact that
properties can be defined for the whole document using property
drawers this local variable needs a rename to make its name less
ambigous.
(org-refresh-properties, org-refresh-property, org-entry-properties)
(org-refresh-category-properties, org-get-property-block)
(org-entry-get-with-inheritance, org-entry-put)
(org-insert-property-drawer, org-end-of-subtree): Made to work before
first headline.
(org-at-property-block-p): New function to validate if point is at the
start of a property block.
(org-property-global-value): Renamed, see next line.
(org-property-global-or-keyword-value): Renamed from above to match
its functionality better.
(org-back-to-heading-or-point-min): New function to make a document
work as a level 0 node in the outline.
(org-at-keyword-p): Predicate function to answer to if we're currently
at a keyword line or not.
(org-up-heading-or-point-min): New function to make a document work as
a level 0 node in the outline.
* lisp/org-element.el (org-element--current-element): Can now detect
property-blocks before first headline according to it's positional
rules.
* lisp/org-attach.el (org-attach): Make it possible to call the
attachment dispatcher also before the first headline, since document
property drawers make attachments possible for the whole document
now.
* lisp/org-capture.el: Modified only due to rename of function in
org.el.
* lisp/org-compat.el (org-file-properties)
(org-property-global-value): Renamed functions declared obsolete.
* testing/lisp/test-org.el (org/insert-property-drawer)
(org/set-property, org/delete-property, org/delete-property-globally):
Additions of tests to check if they work before first headline.
(org/at-property-p, org/at-property-block-p, org/get-property-block)
(org/entry-get, org/refresh-properties): New tests
* testing/examples/property-inheritance.org: Switch from
property-keywords to a property-drawer in the testfile.
Functionality should be the same, but now using a document drawer
instead of property-keywords.
Reason for switching is that I'd like us to slowly depricate
property-keywords.
* testing/lisp/test-org-element.el:
* contrib/lisp/ox-taskjuggler.el: A comment is modified only due to
rename of function in org.el.
2019-05-26 16:13:09 -04:00
( should
( equal " 1 "
( org-test-with-temp-text " :PROPERTIES: \n :A: 1 \n :END: "
( org-entry-get ( point ) " A " ) ) ) )
2014-09-15 03:32:57 -04:00
( should
( equal " 1 "
( org-test-with-temp-text " * H \n :PROPERTIES: \n :A: 1 \n :END: "
( org-entry-get ( point ) " A " ) ) ) )
;; Ignore case.
( should
( equal " 1 "
( org-test-with-temp-text " * H \n :PROPERTIES: \n :A: 1 \n :END: "
( org-entry-get ( point ) " a " ) ) ) )
;; Handle extended values, both before and after base value.
( should
( equal " 1 2 3 "
( org-test-with-temp-text
" * H \n :PROPERTIES: \n :A+: 2 \n :A: 1 \n :A+: 3 \n :END: "
( org-entry-get ( point ) " A " ) ) ) )
;; Empty values are returned as the empty string.
( should
( equal " "
( org-test-with-temp-text " * H \n :PROPERTIES: \n :A: \n :END: "
( org-entry-get ( point ) " A " ) ) ) )
;; Special nil value. If LITERAL-NIL is non-nil, return "nil",
;; otherwise, return nil.
( should-not
( org-test-with-temp-text " * H \n :PROPERTIES: \n :A: nil \n :END: "
( org-entry-get ( point ) " A " ) ) )
( should
( equal " nil "
( org-test-with-temp-text " * H \n :PROPERTIES: \n :A: nil \n :END: "
( org-entry-get ( point ) " A " nil t ) ) ) )
;; Return nil when no property is found, independently on the
;; LITERAL-NIL argument.
( should-not
( org-test-with-temp-text " * H \n :PROPERTIES: \n :A: 1 \n :END: "
( org-entry-get ( point ) " B " ) ) )
( should-not
( org-test-with-temp-text " * H \n :PROPERTIES: \n :A: 1 \n :END: "
( org-entry-get ( point ) " B " nil t ) ) )
2015-07-03 09:34:47 -04:00
;; Handle inheritance, when allowed. Include extended values and
;; possibly global values.
Org document property-drawers
Add functionality to define property-blocks on document level, in
addition to at headline level.
* doc/org-manual.org:
* etc/ORG-NEWS: Document new functionality.
* lisp/org.el (org-keyword-regexp): Define constant instead of
hardcoding.
(org-file-properties): Renamed, see next line.
(org-keyword-properties): Renamed from above. Due to the fact that
properties can be defined for the whole document using property
drawers this local variable needs a rename to make its name less
ambigous.
(org-refresh-properties, org-refresh-property, org-entry-properties)
(org-refresh-category-properties, org-get-property-block)
(org-entry-get-with-inheritance, org-entry-put)
(org-insert-property-drawer, org-end-of-subtree): Made to work before
first headline.
(org-at-property-block-p): New function to validate if point is at the
start of a property block.
(org-property-global-value): Renamed, see next line.
(org-property-global-or-keyword-value): Renamed from above to match
its functionality better.
(org-back-to-heading-or-point-min): New function to make a document
work as a level 0 node in the outline.
(org-at-keyword-p): Predicate function to answer to if we're currently
at a keyword line or not.
(org-up-heading-or-point-min): New function to make a document work as
a level 0 node in the outline.
* lisp/org-element.el (org-element--current-element): Can now detect
property-blocks before first headline according to it's positional
rules.
* lisp/org-attach.el (org-attach): Make it possible to call the
attachment dispatcher also before the first headline, since document
property drawers make attachments possible for the whole document
now.
* lisp/org-capture.el: Modified only due to rename of function in
org.el.
* lisp/org-compat.el (org-file-properties)
(org-property-global-value): Renamed functions declared obsolete.
* testing/lisp/test-org.el (org/insert-property-drawer)
(org/set-property, org/delete-property, org/delete-property-globally):
Additions of tests to check if they work before first headline.
(org/at-property-p, org/at-property-block-p, org/get-property-block)
(org/entry-get, org/refresh-properties): New tests
* testing/examples/property-inheritance.org: Switch from
property-keywords to a property-drawer in the testfile.
Functionality should be the same, but now using a document drawer
instead of property-keywords.
Reason for switching is that I'd like us to slowly depricate
property-keywords.
* testing/lisp/test-org-element.el:
* contrib/lisp/ox-taskjuggler.el: A comment is modified only due to
rename of function in org.el.
2019-05-26 16:13:09 -04:00
( should
( equal
" 1 "
( org-test-with-temp-text " :PROPERTIES: \n :A: 1 \n :END: \n * H "
( org-entry-get ( point-max ) " A " t ) ) ) )
2014-09-15 03:32:57 -04:00
( should
( equal
" 1 "
2019-05-25 21:34:34 -04:00
( org-test-with-temp-text " * H \n :PROPERTIES: \n :A: 1 \n :END: \n ** H2 "
( org-entry-get ( point-max ) " A " t ) ) ) )
2014-09-15 03:32:57 -04:00
( should
( equal
" 1 "
2019-05-25 21:34:34 -04:00
( org-test-with-temp-text " * H \n :PROPERTIES: \n :A: 1 \n :END: \n ** H2 "
2014-09-15 03:32:57 -04:00
( let ( ( org-use-property-inheritance t ) )
2019-05-25 21:34:34 -04:00
( org-entry-get ( point-max ) " A " 'selective ) ) ) ) )
2014-09-15 03:32:57 -04:00
( should-not
2019-05-25 21:34:34 -04:00
( org-test-with-temp-text " * H \n :PROPERTIES: \n :A: 1 \n :END: \n ** H2 "
2014-09-15 03:32:57 -04:00
( let ( ( org-use-property-inheritance nil ) )
2019-05-25 21:34:34 -04:00
( org-entry-get ( point-max ) " A " 'selective ) ) ) )
2022-01-15 06:48:24 -05:00
( should-not
( org-test-with-temp-text " * H \n :PROPERTIES: \n :A: 1 \n :END: \n * H2 "
( let ( ( org-use-property-inheritance t ) )
( org-entry-get ( point-max ) " A " t ) ) ) )
Org document property-drawers
Add functionality to define property-blocks on document level, in
addition to at headline level.
* doc/org-manual.org:
* etc/ORG-NEWS: Document new functionality.
* lisp/org.el (org-keyword-regexp): Define constant instead of
hardcoding.
(org-file-properties): Renamed, see next line.
(org-keyword-properties): Renamed from above. Due to the fact that
properties can be defined for the whole document using property
drawers this local variable needs a rename to make its name less
ambigous.
(org-refresh-properties, org-refresh-property, org-entry-properties)
(org-refresh-category-properties, org-get-property-block)
(org-entry-get-with-inheritance, org-entry-put)
(org-insert-property-drawer, org-end-of-subtree): Made to work before
first headline.
(org-at-property-block-p): New function to validate if point is at the
start of a property block.
(org-property-global-value): Renamed, see next line.
(org-property-global-or-keyword-value): Renamed from above to match
its functionality better.
(org-back-to-heading-or-point-min): New function to make a document
work as a level 0 node in the outline.
(org-at-keyword-p): Predicate function to answer to if we're currently
at a keyword line or not.
(org-up-heading-or-point-min): New function to make a document work as
a level 0 node in the outline.
* lisp/org-element.el (org-element--current-element): Can now detect
property-blocks before first headline according to it's positional
rules.
* lisp/org-attach.el (org-attach): Make it possible to call the
attachment dispatcher also before the first headline, since document
property drawers make attachments possible for the whole document
now.
* lisp/org-capture.el: Modified only due to rename of function in
org.el.
* lisp/org-compat.el (org-file-properties)
(org-property-global-value): Renamed functions declared obsolete.
* testing/lisp/test-org.el (org/insert-property-drawer)
(org/set-property, org/delete-property, org/delete-property-globally):
Additions of tests to check if they work before first headline.
(org/at-property-p, org/at-property-block-p, org/get-property-block)
(org/entry-get, org/refresh-properties): New tests
* testing/examples/property-inheritance.org: Switch from
property-keywords to a property-drawer in the testfile.
Functionality should be the same, but now using a document drawer
instead of property-keywords.
Reason for switching is that I'd like us to slowly depricate
property-keywords.
* testing/lisp/test-org-element.el:
* contrib/lisp/ox-taskjuggler.el: A comment is modified only due to
rename of function in org.el.
2019-05-26 16:13:09 -04:00
( should
( equal
" 1 2 "
( org-test-with-temp-text
" :PROPERTIES: \n :A: 1 \n :END: \n * H \n :PROPERTIES: \n :A+: 2 \n :END: "
( org-entry-get ( point-max ) " A " t ) ) ) )
2015-07-03 09:34:47 -04:00
( should
( equal
" 1 2 "
( org-test-with-temp-text
" * H \n :PROPERTIES: \n :A: 1 \n :END: \n ** H2 \n :PROPERTIES: \n :A+: 2 \n :END: "
( org-entry-get ( point-max ) " A " t ) ) ) )
Org document property-drawers
Add functionality to define property-blocks on document level, in
addition to at headline level.
* doc/org-manual.org:
* etc/ORG-NEWS: Document new functionality.
* lisp/org.el (org-keyword-regexp): Define constant instead of
hardcoding.
(org-file-properties): Renamed, see next line.
(org-keyword-properties): Renamed from above. Due to the fact that
properties can be defined for the whole document using property
drawers this local variable needs a rename to make its name less
ambigous.
(org-refresh-properties, org-refresh-property, org-entry-properties)
(org-refresh-category-properties, org-get-property-block)
(org-entry-get-with-inheritance, org-entry-put)
(org-insert-property-drawer, org-end-of-subtree): Made to work before
first headline.
(org-at-property-block-p): New function to validate if point is at the
start of a property block.
(org-property-global-value): Renamed, see next line.
(org-property-global-or-keyword-value): Renamed from above to match
its functionality better.
(org-back-to-heading-or-point-min): New function to make a document
work as a level 0 node in the outline.
(org-at-keyword-p): Predicate function to answer to if we're currently
at a keyword line or not.
(org-up-heading-or-point-min): New function to make a document work as
a level 0 node in the outline.
* lisp/org-element.el (org-element--current-element): Can now detect
property-blocks before first headline according to it's positional
rules.
* lisp/org-attach.el (org-attach): Make it possible to call the
attachment dispatcher also before the first headline, since document
property drawers make attachments possible for the whole document
now.
* lisp/org-capture.el: Modified only due to rename of function in
org.el.
* lisp/org-compat.el (org-file-properties)
(org-property-global-value): Renamed functions declared obsolete.
* testing/lisp/test-org.el (org/insert-property-drawer)
(org/set-property, org/delete-property, org/delete-property-globally):
Additions of tests to check if they work before first headline.
(org/at-property-p, org/at-property-block-p, org/get-property-block)
(org/entry-get, org/refresh-properties): New tests
* testing/examples/property-inheritance.org: Switch from
property-keywords to a property-drawer in the testfile.
Functionality should be the same, but now using a document drawer
instead of property-keywords.
Reason for switching is that I'd like us to slowly depricate
property-keywords.
* testing/lisp/test-org-element.el:
* contrib/lisp/ox-taskjuggler.el: A comment is modified only due to
rename of function in org.el.
2019-05-26 16:13:09 -04:00
( should
( equal
" 1 2 "
( org-test-with-temp-text
" :PROPERTIES: \n :A: 1 \n :END: \n * H1 \n * H2 \n :PROPERTIES: \n :A+: 2 \n :END: "
( org-entry-get ( point-max ) " A " t ) ) ) )
( should
( equal
" 1 2 "
( org-test-with-temp-text
2021-10-16 12:00:21 -04:00
" * H1 \n :PROPERTIES: \n :A: 1 \n :END: \n ** H2.1 \n ** H2.2 \n :PROPERTIES: \n :A+: 2 \n :END: "
Org document property-drawers
Add functionality to define property-blocks on document level, in
addition to at headline level.
* doc/org-manual.org:
* etc/ORG-NEWS: Document new functionality.
* lisp/org.el (org-keyword-regexp): Define constant instead of
hardcoding.
(org-file-properties): Renamed, see next line.
(org-keyword-properties): Renamed from above. Due to the fact that
properties can be defined for the whole document using property
drawers this local variable needs a rename to make its name less
ambigous.
(org-refresh-properties, org-refresh-property, org-entry-properties)
(org-refresh-category-properties, org-get-property-block)
(org-entry-get-with-inheritance, org-entry-put)
(org-insert-property-drawer, org-end-of-subtree): Made to work before
first headline.
(org-at-property-block-p): New function to validate if point is at the
start of a property block.
(org-property-global-value): Renamed, see next line.
(org-property-global-or-keyword-value): Renamed from above to match
its functionality better.
(org-back-to-heading-or-point-min): New function to make a document
work as a level 0 node in the outline.
(org-at-keyword-p): Predicate function to answer to if we're currently
at a keyword line or not.
(org-up-heading-or-point-min): New function to make a document work as
a level 0 node in the outline.
* lisp/org-element.el (org-element--current-element): Can now detect
property-blocks before first headline according to it's positional
rules.
* lisp/org-attach.el (org-attach): Make it possible to call the
attachment dispatcher also before the first headline, since document
property drawers make attachments possible for the whole document
now.
* lisp/org-capture.el: Modified only due to rename of function in
org.el.
* lisp/org-compat.el (org-file-properties)
(org-property-global-value): Renamed functions declared obsolete.
* testing/lisp/test-org.el (org/insert-property-drawer)
(org/set-property, org/delete-property, org/delete-property-globally):
Additions of tests to check if they work before first headline.
(org/at-property-p, org/at-property-block-p, org/get-property-block)
(org/entry-get, org/refresh-properties): New tests
* testing/examples/property-inheritance.org: Switch from
property-keywords to a property-drawer in the testfile.
Functionality should be the same, but now using a document drawer
instead of property-keywords.
Reason for switching is that I'd like us to slowly depricate
property-keywords.
* testing/lisp/test-org-element.el:
* contrib/lisp/ox-taskjuggler.el: A comment is modified only due to
rename of function in org.el.
2019-05-26 16:13:09 -04:00
( org-entry-get ( point-max ) " A " t ) ) ) )
2015-07-03 09:34:47 -04:00
( should
( equal " 1 "
( org-test-with-temp-text
" #+PROPERTY: A 0 \n * H \n :PROPERTIES: \n :A: 1 \n :END: "
( org-mode-restart )
( org-entry-get ( point-max ) " A " t ) ) ) )
( should
( equal " 0 1 "
( org-test-with-temp-text
" #+PROPERTY: A 0 \n * H \n :PROPERTIES: \n :A+: 1 \n :END: "
( org-mode-restart )
Org document property-drawers
Add functionality to define property-blocks on document level, in
addition to at headline level.
* doc/org-manual.org:
* etc/ORG-NEWS: Document new functionality.
* lisp/org.el (org-keyword-regexp): Define constant instead of
hardcoding.
(org-file-properties): Renamed, see next line.
(org-keyword-properties): Renamed from above. Due to the fact that
properties can be defined for the whole document using property
drawers this local variable needs a rename to make its name less
ambigous.
(org-refresh-properties, org-refresh-property, org-entry-properties)
(org-refresh-category-properties, org-get-property-block)
(org-entry-get-with-inheritance, org-entry-put)
(org-insert-property-drawer, org-end-of-subtree): Made to work before
first headline.
(org-at-property-block-p): New function to validate if point is at the
start of a property block.
(org-property-global-value): Renamed, see next line.
(org-property-global-or-keyword-value): Renamed from above to match
its functionality better.
(org-back-to-heading-or-point-min): New function to make a document
work as a level 0 node in the outline.
(org-at-keyword-p): Predicate function to answer to if we're currently
at a keyword line or not.
(org-up-heading-or-point-min): New function to make a document work as
a level 0 node in the outline.
* lisp/org-element.el (org-element--current-element): Can now detect
property-blocks before first headline according to it's positional
rules.
* lisp/org-attach.el (org-attach): Make it possible to call the
attachment dispatcher also before the first headline, since document
property drawers make attachments possible for the whole document
now.
* lisp/org-capture.el: Modified only due to rename of function in
org.el.
* lisp/org-compat.el (org-file-properties)
(org-property-global-value): Renamed functions declared obsolete.
* testing/lisp/test-org.el (org/insert-property-drawer)
(org/set-property, org/delete-property, org/delete-property-globally):
Additions of tests to check if they work before first headline.
(org/at-property-p, org/at-property-block-p, org/get-property-block)
(org/entry-get, org/refresh-properties): New tests
* testing/examples/property-inheritance.org: Switch from
property-keywords to a property-drawer in the testfile.
Functionality should be the same, but now using a document drawer
instead of property-keywords.
Reason for switching is that I'd like us to slowly depricate
property-keywords.
* testing/lisp/test-org-element.el:
* contrib/lisp/ox-taskjuggler.el: A comment is modified only due to
rename of function in org.el.
2019-05-26 16:13:09 -04:00
( org-entry-get ( point-max ) " A " t ) ) ) )
;; document level property-drawer has precedance over
;; global-property by PROPERTY-keyword.
( should
( equal " 0 2 "
( org-test-with-temp-text
" :PROPERTIES: \n :A: 0 \n :END: \n #+PROPERTY: A 1 \n * H \n :PROPERTIES: \n :A+: 2 \n :END: "
( org-mode-restart )
2022-05-09 15:52:58 -04:00
( org-entry-get ( point-max ) " A " t ) ) ) )
;; Use alternate separators
( should
( equal " 0~2 "
( org-test-with-temp-text
" :PROPERTIES: \n :A: 0 \n :A+: 2 \n :END: "
( let ( ( org-property-separators ' ( ( ( " A " ) . " ~ " ) ) ) )
( org-entry-get ( point ) " A " ) ) ) ) )
;; Default separator is single space
( should
( equal " 0 2 "
( org-test-with-temp-text
" :PROPERTIES: \n :A: 0 \n :B: 1 \n :A+: 2 \n :B+: 3 \n :END: "
( let ( ( org-property-separators ' ( ( ( " B " ) . " ~ " ) ) ) )
( org-entry-get ( point ) " A " ) ) ) ) )
;; Regular expression matching for separator
( should
( equal " 0/2 "
( org-test-with-temp-text
" :PROPERTIES: \n :A: 0 \n :A+: 2 \n :END: "
( let ( ( org-property-separators ' ( ( ( " B " ) . " ~ " ) ( " [AC] " . " / " ) ) ) )
( org-entry-get ( point ) " A " ) ) ) ) )
;; Separator works with inheritance
( should
( equal " 1~2 "
( org-test-with-temp-text
" * H \n :PROPERTIES: \n :A: 1 \n :END: \n ** H2 \n :PROPERTIES: \n :A+: 2 \n :END: "
( let ( ( org-property-separators ' ( ( ( " A " ) . " ~ " ) ) ) )
( org-entry-get ( point-max ) " A " t ) ) ) ) ) )
2014-09-15 03:32:57 -04:00
( ert-deftest test-org/entry-properties ( )
" Test `org-entry-properties' specifications. "
2014-11-10 05:22:14 -05:00
;; Get "ITEM" property.
( should
2016-02-04 07:50:44 -05:00
( equal " H "
2014-11-10 05:22:14 -05:00
( org-test-with-temp-text " * TODO H "
( cdr ( assoc " ITEM " ( org-entry-properties nil " ITEM " ) ) ) ) ) )
2014-11-18 04:11:35 -05:00
( should
2016-02-04 07:50:44 -05:00
( equal " H "
2014-11-18 04:11:35 -05:00
( org-test-with-temp-text " * TODO H "
( cdr ( assoc " ITEM " ( org-entry-properties ) ) ) ) ) )
2015-08-09 17:56:57 -04:00
;; Get "TODO" property. TODO keywords are case sensitive.
2014-09-15 03:32:57 -04:00
( should
( equal " TODO "
( org-test-with-temp-text " * TODO H "
( cdr ( assoc " TODO " ( org-entry-properties nil " TODO " ) ) ) ) ) )
2014-11-18 04:11:35 -05:00
( should
( equal " TODO "
( org-test-with-temp-text " * TODO H "
( cdr ( assoc " TODO " ( org-entry-properties ) ) ) ) ) )
2014-09-15 03:32:57 -04:00
( should-not
( org-test-with-temp-text " * H "
( assoc " TODO " ( org-entry-properties nil " TODO " ) ) ) )
2015-08-09 17:56:57 -04:00
( should-not
( org-test-with-temp-text " * todo H "
( assoc " TODO " ( org-entry-properties nil " TODO " ) ) ) )
2014-09-15 03:32:57 -04:00
;; Get "PRIORITY" property.
( should
( equal " A "
( org-test-with-temp-text " * [#A] H "
( cdr ( assoc " PRIORITY " ( org-entry-properties nil " PRIORITY " ) ) ) ) ) )
2014-11-18 04:11:35 -05:00
( should
( equal " A "
( org-test-with-temp-text " * [#A] H "
( cdr ( assoc " PRIORITY " ( org-entry-properties ) ) ) ) ) )
2015-08-19 05:12:43 -04:00
( should
2020-01-30 08:56:38 -05:00
( equal ( char-to-string org-priority-default )
2015-08-19 05:12:43 -04:00
( org-test-with-temp-text " * H "
( cdr ( assoc " PRIORITY " ( org-entry-properties nil " PRIORITY " ) ) ) ) ) )
2014-09-15 03:32:57 -04:00
;; Get "FILE" property.
( should
( org-test-with-temp-text-in-file " * H \n Paragraph "
Remove final parts of XEmacs compatibility code
* lisp/org-compat.el: Declare `org-add-hook', `org-decompose-region',
`org-detach-overlay', `org-file-equal-p', `org-float-time',
`org-indent-line-to', `org-indent-to-column', `org-looking-at-p',
`org-looking-back', `org-propertize', `org-re' and
`org-select-frame-set-input-focus' as obsolete.
(org-overlay-display, org-overlay-before-string, org-find-overlays):
Move to "org.el"
(org-xemacs-key-equivalents, org-xemacs-p): Remove variables.
(org-region-active-p): Drop XEmacs support.
(org-xemacs-without-invisibility): Remove macro.
(org-get-x-clipboard-compat): Remove function.
* lisp/org-macs.el (org-match-string-no-properties): Remove function.
* lisp/ob-core.el:
* lisp/org-agenda.el:
* lisp/org-archive.el:
* lisp/org-clock.el:
* lisp/org-colview.el:
* lisp/org-crypt.el:
* lisp/org-element.el:
* lisp/org-faces.el:
* lisp/org-feed.el:
* lisp/org-footnote.el:
* lisp/org-habit.el:
* lisp/org-id.el:
* lisp/org-indent.el:
* lisp/org-inlinetask.el:
* lisp/org-lint.el:
* lisp/org-list.el:
* lisp/org-mouse.el:
* lisp/org-pcomplete.el:
* lisp/org-src.el:
* lisp/org-table.el:
* lisp/org-timer.el:
* lisp/org.el:
* lisp/ox-ascii.el:
* lisp/ox-odt.el:
* lisp/ox.el:
* contrib/lisp/org-notify.el:
* contrib/lisp/ox-taskjuggler.el:
* contrib/lisp/org-wikinodes.el:
* testing/lisp/test-org-src.el:
* testing/lisp/test-org.el: Silence byte-compiler.
2016-05-26 06:18:00 -04:00
( file-equal-p ( cdr ( assoc " FILE " ( org-entry-properties nil " FILE " ) ) )
( buffer-file-name ) ) ) )
2014-11-18 04:11:35 -05:00
( should
( org-test-with-temp-text-in-file " * H \n Paragraph "
Remove final parts of XEmacs compatibility code
* lisp/org-compat.el: Declare `org-add-hook', `org-decompose-region',
`org-detach-overlay', `org-file-equal-p', `org-float-time',
`org-indent-line-to', `org-indent-to-column', `org-looking-at-p',
`org-looking-back', `org-propertize', `org-re' and
`org-select-frame-set-input-focus' as obsolete.
(org-overlay-display, org-overlay-before-string, org-find-overlays):
Move to "org.el"
(org-xemacs-key-equivalents, org-xemacs-p): Remove variables.
(org-region-active-p): Drop XEmacs support.
(org-xemacs-without-invisibility): Remove macro.
(org-get-x-clipboard-compat): Remove function.
* lisp/org-macs.el (org-match-string-no-properties): Remove function.
* lisp/ob-core.el:
* lisp/org-agenda.el:
* lisp/org-archive.el:
* lisp/org-clock.el:
* lisp/org-colview.el:
* lisp/org-crypt.el:
* lisp/org-element.el:
* lisp/org-faces.el:
* lisp/org-feed.el:
* lisp/org-footnote.el:
* lisp/org-habit.el:
* lisp/org-id.el:
* lisp/org-indent.el:
* lisp/org-inlinetask.el:
* lisp/org-lint.el:
* lisp/org-list.el:
* lisp/org-mouse.el:
* lisp/org-pcomplete.el:
* lisp/org-src.el:
* lisp/org-table.el:
* lisp/org-timer.el:
* lisp/org.el:
* lisp/ox-ascii.el:
* lisp/ox-odt.el:
* lisp/ox.el:
* contrib/lisp/org-notify.el:
* contrib/lisp/ox-taskjuggler.el:
* contrib/lisp/org-wikinodes.el:
* testing/lisp/test-org-src.el:
* testing/lisp/test-org.el: Silence byte-compiler.
2016-05-26 06:18:00 -04:00
( file-equal-p ( cdr ( assoc " FILE " ( org-entry-properties ) ) )
( buffer-file-name ) ) ) )
2014-09-15 03:32:57 -04:00
( should-not
( org-test-with-temp-text " * H \n Paragraph "
( cdr ( assoc " FILE " ( org-entry-properties nil " FILE " ) ) ) ) )
;; Get "TAGS" property.
( should
( equal " :tag1:tag2: "
( org-test-with-temp-text " * H :tag1:tag2: "
( cdr ( assoc " TAGS " ( org-entry-properties nil " TAGS " ) ) ) ) ) )
2014-11-18 04:11:35 -05:00
( should
( equal " :tag1:tag2: "
( org-test-with-temp-text " * H :tag1:tag2: "
( cdr ( assoc " TAGS " ( org-entry-properties ) ) ) ) ) )
2014-09-15 03:32:57 -04:00
( should-not
( org-test-with-temp-text " * H "
( cdr ( assoc " TAGS " ( org-entry-properties nil " TAGS " ) ) ) ) )
;; Get "ALLTAGS" property.
( should
( equal " :tag1:tag2: "
( org-test-with-temp-text " * H :tag1: \n <point>** H2 :tag2: "
( cdr ( assoc " ALLTAGS " ( org-entry-properties nil " ALLTAGS " ) ) ) ) ) )
2014-11-18 04:11:35 -05:00
( should
( equal " :tag1:tag2: "
( org-test-with-temp-text " * H :tag1: \n <point>** H2 :tag2: "
( cdr ( assoc " ALLTAGS " ( org-entry-properties ) ) ) ) ) )
2014-09-15 03:32:57 -04:00
( should-not
( org-test-with-temp-text " * H "
( cdr ( assoc " ALLTAGS " ( org-entry-properties nil " ALLTAGS " ) ) ) ) )
;; Get "BLOCKED" property.
( should
( equal " t "
2015-08-06 10:56:41 -04:00
( org-test-with-temp-text " * TODO Blocked \n ** DONE one \n ** TODO two "
2014-09-15 03:32:57 -04:00
( let ( ( org-enforce-todo-dependencies t )
( org-blocker-hook
' ( org-block-todo-from-children-or-siblings-or-parent ) ) )
( cdr ( assoc " BLOCKED " ( org-entry-properties nil " BLOCKED " ) ) ) ) ) ) )
2014-11-18 04:11:35 -05:00
( should
2015-08-06 10:56:41 -04:00
( equal " "
( org-test-with-temp-text " * TODO Blocked \n ** DONE one \n ** DONE two "
2014-11-18 04:11:35 -05:00
( let ( ( org-enforce-todo-dependencies t )
( org-blocker-hook
' ( org-block-todo-from-children-or-siblings-or-parent ) ) )
2014-09-15 03:32:57 -04:00
( cdr ( assoc " BLOCKED " ( org-entry-properties nil " BLOCKED " ) ) ) ) ) ) )
;; Get "CLOSED", "DEADLINE" and "SCHEDULED" properties.
( should
( equal
" [2012-03-29 thu.] "
( org-test-with-temp-text " * H \n CLOSED: [2012-03-29 thu.] "
( cdr ( assoc " CLOSED " ( org-entry-properties nil " CLOSED " ) ) ) ) ) )
2014-11-18 04:11:35 -05:00
( should
( equal
" [2012-03-29 thu.] "
( org-test-with-temp-text " * H \n CLOSED: [2012-03-29 thu.] "
( cdr ( assoc " CLOSED " ( org-entry-properties ) ) ) ) ) )
2014-09-15 03:32:57 -04:00
( should-not
( org-test-with-temp-text " * H "
( cdr ( assoc " CLOSED " ( org-entry-properties nil " CLOSED " ) ) ) ) )
( should
( equal
" <2014-03-04 tue.> "
( org-test-with-temp-text " * H \n DEADLINE: <2014-03-04 tue.> "
( cdr ( assoc " DEADLINE " ( org-entry-properties nil " DEADLINE " ) ) ) ) ) )
2014-11-18 04:11:35 -05:00
( should
( equal
" <2014-03-04 tue.> "
( org-test-with-temp-text " * H \n DEADLINE: <2014-03-04 tue.> "
( cdr ( assoc " DEADLINE " ( org-entry-properties ) ) ) ) ) )
2014-09-15 03:32:57 -04:00
( should-not
( org-test-with-temp-text " * H "
( cdr ( assoc " DEADLINE " ( org-entry-properties nil " DEADLINE " ) ) ) ) )
( should
( equal
" <2014-03-04 tue.> "
( org-test-with-temp-text " * H \n SCHEDULED: <2014-03-04 tue.> "
( cdr ( assoc " SCHEDULED " ( org-entry-properties nil " SCHEDULED " ) ) ) ) ) )
2014-11-18 04:11:35 -05:00
( should
( equal
" <2014-03-04 tue.> "
( org-test-with-temp-text " * H \n SCHEDULED: <2014-03-04 tue.> "
( cdr ( assoc " SCHEDULED " ( org-entry-properties ) ) ) ) ) )
2014-09-15 03:32:57 -04:00
( should-not
( org-test-with-temp-text " * H "
( cdr ( assoc " SCHEDULED " ( org-entry-properties nil " SCHEDULED " ) ) ) ) )
;; Get "CATEGORY"
2014-11-18 04:27:45 -05:00
( should
( equal " cat "
( org-test-with-temp-text " #+CATEGORY: cat \n <point>* H "
( cdr ( assoc " CATEGORY " ( org-entry-properties ) ) ) ) ) )
2014-09-15 03:32:57 -04:00
( should
( equal " cat "
( org-test-with-temp-text " #+CATEGORY: cat \n <point>* H "
( cdr ( assoc " CATEGORY " ( org-entry-properties nil " CATEGORY " ) ) ) ) ) )
( should
( equal " cat "
( org-test-with-temp-text " * H \n :PROPERTIES: \n :CATEGORY: cat \n :END: "
( cdr ( assoc " CATEGORY " ( org-entry-properties nil " CATEGORY " ) ) ) ) ) )
2015-04-28 02:55:10 -04:00
( should
( equal " cat2 "
( org-test-with-temp-text
( concat " * H \n :PROPERTIES: \n :CATEGORY: cat1 \n :END: "
" \n "
" ** H2 \n :PROPERTIES: \n :CATEGORY: cat2 \n :END:<point> " )
( cdr ( assoc " CATEGORY " ( org-entry-properties nil " CATEGORY " ) ) ) ) ) )
2015-06-22 04:01:51 -04:00
;; Get "TIMESTAMP" and "TIMESTAMP_IA" properties.
( should
( equal " <2012-03-29 thu.> "
2015-08-06 10:56:41 -04:00
( org-test-with-temp-text " * Entry \n <2012-03-29 thu.> "
( cdr ( assoc " TIMESTAMP " ( org-entry-properties ) ) ) ) ) )
2015-06-22 04:01:51 -04:00
( should
( equal " [2012-03-29 thu.] "
2015-08-06 10:56:41 -04:00
( org-test-with-temp-text " * Entry \n [2012-03-29 thu.] "
( cdr ( assoc " TIMESTAMP_IA " ( org-entry-properties ) ) ) ) ) )
2015-06-22 04:01:51 -04:00
( should
( equal " <2012-03-29 thu.> "
2015-08-06 10:56:41 -04:00
( org-test-with-temp-text " * Entry \n [2014-03-04 tue.]<2012-03-29 thu.> "
( cdr ( assoc " TIMESTAMP " ( org-entry-properties nil " TIMESTAMP " ) ) ) ) ) )
2015-06-22 04:01:51 -04:00
( should
( equal " [2014-03-04 tue.] "
2015-08-06 10:56:41 -04:00
( org-test-with-temp-text " * Entry \n <2012-03-29 thu.>[2014-03-04 tue.] "
2017-01-24 16:01:19 -05:00
( cdr ( assoc " TIMESTAMP_IA "
( org-entry-properties nil " TIMESTAMP_IA " ) ) ) ) ) )
( should-not
( equal " <2012-03-29 thu.> "
( org-test-with-temp-text " * Current \n * Next \n <2012-03-29 thu.> "
( cdr ( assoc " TIMESTAMP " ( org-entry-properties ) ) ) ) ) )
2014-09-15 03:32:57 -04:00
;; Get standard properties.
( should
( equal " 1 "
( org-test-with-temp-text " * H \n :PROPERTIES: \n :A: 1 \n :END: "
( cdr ( assoc " A " ( org-entry-properties nil 'standard ) ) ) ) ) )
;; Handle extended properties.
( should
( equal " 1 2 3 "
( org-test-with-temp-text
" * H \n :PROPERTIES: \n :A+: 2 \n :A: 1 \n :A+: 3 \n :END: "
( cdr ( assoc " A " ( org-entry-properties nil 'standard ) ) ) ) ) )
( should
( equal " 1 2 3 "
( org-test-with-temp-text
" * H \n :PROPERTIES: \n :A+: 2 \n :A: 1 \n :a+: 3 \n :END: "
( cdr ( assoc " A " ( org-entry-properties nil 'standard ) ) ) ) ) )
;; Ignore forbidden (special) properties.
( should-not
( org-test-with-temp-text " * H \n :PROPERTIES: \n :TODO: foo \n :END: "
( cdr ( assoc " TODO " ( org-entry-properties nil 'standard ) ) ) ) ) )
( ert-deftest test-org/entry-put ( )
" Test `org-entry-put' specifications. "
;; Error when not a string or nil.
( should-error
( org-test-with-temp-text " * H \n :PROPERTIES: \n :test: 1 \n :END: "
( org-entry-put 1 " test " 2 ) ) )
2016-01-06 08:43:37 -05:00
;; Error when property name is invalid.
( should-error
( org-test-with-temp-text " * H \n :PROPERTIES: \n :test: 1 \n :END: "
( org-entry-put 1 " no space " " value " ) ) )
( should-error
( org-test-with-temp-text " * H \n :PROPERTIES: \n :test: 1 \n :END: "
( org-entry-put 1 " " " value " ) ) )
2014-09-15 03:32:57 -04:00
;; Set "TODO" property.
( should
( string-match ( regexp-quote " TODO H " )
( org-test-with-temp-text " #+TODO: TODO | DONE \n <point>* H "
( org-entry-put ( point ) " TODO " " TODO " )
( buffer-string ) ) ) )
( should
( string-match ( regexp-quote " * H " )
( org-test-with-temp-text " #+TODO: TODO | DONE \n <point>* H "
( org-entry-put ( point ) " TODO " nil )
( buffer-string ) ) ) )
;; Set "PRIORITY" property.
( should
( equal " * [#A] H "
( org-test-with-temp-text " * [#B] H "
( org-entry-put ( point ) " PRIORITY " " A " )
( buffer-string ) ) ) )
( should
( equal " * H "
( org-test-with-temp-text " * [#B] H "
( org-entry-put ( point ) " PRIORITY " nil )
( buffer-string ) ) ) )
;; Set "SCHEDULED" property.
( should
( string-match " * H \n *SCHEDULED: <2014-03-04 .*?> "
( org-test-with-temp-text " * H "
( org-entry-put ( point ) " SCHEDULED " " 2014-03-04 " )
( buffer-string ) ) ) )
( should
( string= " * H \n "
( org-test-with-temp-text " * H \n SCHEDULED: <2014-03-04 tue.> "
( org-entry-put ( point ) " SCHEDULED " nil )
( buffer-string ) ) ) )
( should
( string-match " * H \n *SCHEDULED: <2014-03-03 .*?> "
( org-test-with-temp-text " * H \n SCHEDULED: <2014-03-04 tue.> "
( org-entry-put ( point ) " SCHEDULED " " earlier " )
( buffer-string ) ) ) )
( should
( string-match " ^ *SCHEDULED: <2014-03-05 .*?> "
( org-test-with-temp-text " * H \n SCHEDULED: <2014-03-04 tue.> "
( org-entry-put ( point ) " SCHEDULED " " later " )
( buffer-string ) ) ) )
;; Set "DEADLINE" property.
( should
( string-match " ^ *DEADLINE: <2014-03-04 .*?> "
( org-test-with-temp-text " * H "
( org-entry-put ( point ) " DEADLINE " " 2014-03-04 " )
( buffer-string ) ) ) )
( should
( string= " * H \n "
( org-test-with-temp-text " * H \n DEADLINE: <2014-03-04 tue.> "
( org-entry-put ( point ) " DEADLINE " nil )
( buffer-string ) ) ) )
( should
( string-match " ^ *DEADLINE: <2014-03-03 .*?> "
( org-test-with-temp-text " * H \n DEADLINE: <2014-03-04 tue.> "
( org-entry-put ( point ) " DEADLINE " " earlier " )
( buffer-string ) ) ) )
( should
( string-match " ^ *DEADLINE: <2014-03-05 .*?> "
( org-test-with-temp-text " * H \n DEADLINE: <2014-03-04 tue.> "
( org-entry-put ( point ) " DEADLINE " " later " )
( buffer-string ) ) ) )
2015-03-11 12:12:49 -04:00
;; Set "CATEGORY" property
( should
( string-match " ^ *:CATEGORY: cat "
( org-test-with-temp-text " * H "
( org-entry-put ( point ) " CATEGORY " " cat " )
( buffer-string ) ) ) )
2014-09-15 03:32:57 -04:00
;; Regular properties, with or without pre-existing drawer.
( should
( string-match " ^ *:A: +2$ "
( org-test-with-temp-text " * H \n :PROPERTIES: \n :A: 1 \n :END: "
( org-entry-put ( point ) " A " " 2 " )
( buffer-string ) ) ) )
( should
( string-match " ^ *:A: +1$ "
( org-test-with-temp-text " * H "
( org-entry-put ( point ) " A " " 1 " )
2014-10-14 15:18:44 -04:00
( buffer-string ) ) ) )
;; Special case: two consecutive headlines.
( should
( string-match " \\ * A \n *:PROPERTIES: "
2015-03-11 12:12:49 -04:00
( org-test-with-temp-text " * A \n ** B "
( org-entry-put ( point ) " A " " 1 " )
( buffer-string ) ) ) ) )
2014-09-15 03:32:57 -04:00
2017-01-26 18:21:42 -05:00
( ert-deftest test-org/refresh-properties ( )
" Test `org-refresh-properties' specifications. "
( should
( equal " 1 "
( org-test-with-temp-text " * H \n :PROPERTIES: \n :A: 1 \n :END: "
( org-refresh-properties " A " 'org-test )
( get-text-property ( point ) 'org-test ) ) ) )
( should-not
( org-test-with-temp-text " * H \n :PROPERTIES: \n :A: 1 \n :END: "
( org-refresh-properties " B " 'org-test )
( get-text-property ( point ) 'org-test ) ) )
;; Handle properties only defined with extension syntax, i.e.,
;; "PROPERTY+".
( should
( equal " 1 "
( org-test-with-temp-text " * H \n :PROPERTIES: \n :A+: 1 \n :END: "
( org-refresh-properties " A " 'org-test )
( get-text-property ( point ) 'org-test ) ) ) )
;; When property is inherited, add text property to the whole
;; sub-tree.
( should
( equal " 1 "
( org-test-with-temp-text
" * H1 \n :PROPERTIES: \n :A: 1 \n :END: \n <point>** H2 "
( let ( ( org-use-property-inheritance t ) )
( org-refresh-properties " A " 'org-test ) )
( get-text-property ( point ) 'org-test ) ) ) )
Org document property-drawers
Add functionality to define property-blocks on document level, in
addition to at headline level.
* doc/org-manual.org:
* etc/ORG-NEWS: Document new functionality.
* lisp/org.el (org-keyword-regexp): Define constant instead of
hardcoding.
(org-file-properties): Renamed, see next line.
(org-keyword-properties): Renamed from above. Due to the fact that
properties can be defined for the whole document using property
drawers this local variable needs a rename to make its name less
ambigous.
(org-refresh-properties, org-refresh-property, org-entry-properties)
(org-refresh-category-properties, org-get-property-block)
(org-entry-get-with-inheritance, org-entry-put)
(org-insert-property-drawer, org-end-of-subtree): Made to work before
first headline.
(org-at-property-block-p): New function to validate if point is at the
start of a property block.
(org-property-global-value): Renamed, see next line.
(org-property-global-or-keyword-value): Renamed from above to match
its functionality better.
(org-back-to-heading-or-point-min): New function to make a document
work as a level 0 node in the outline.
(org-at-keyword-p): Predicate function to answer to if we're currently
at a keyword line or not.
(org-up-heading-or-point-min): New function to make a document work as
a level 0 node in the outline.
* lisp/org-element.el (org-element--current-element): Can now detect
property-blocks before first headline according to it's positional
rules.
* lisp/org-attach.el (org-attach): Make it possible to call the
attachment dispatcher also before the first headline, since document
property drawers make attachments possible for the whole document
now.
* lisp/org-capture.el: Modified only due to rename of function in
org.el.
* lisp/org-compat.el (org-file-properties)
(org-property-global-value): Renamed functions declared obsolete.
* testing/lisp/test-org.el (org/insert-property-drawer)
(org/set-property, org/delete-property, org/delete-property-globally):
Additions of tests to check if they work before first headline.
(org/at-property-p, org/at-property-block-p, org/get-property-block)
(org/entry-get, org/refresh-properties): New tests
* testing/examples/property-inheritance.org: Switch from
property-keywords to a property-drawer in the testfile.
Functionality should be the same, but now using a document drawer
instead of property-keywords.
Reason for switching is that I'd like us to slowly depricate
property-keywords.
* testing/lisp/test-org-element.el:
* contrib/lisp/ox-taskjuggler.el: A comment is modified only due to
rename of function in org.el.
2019-05-26 16:13:09 -04:00
;; When a document level property-drawer is used, those properties
;; should work exactly like headline-properties as if at a
;; headline-level 0.
( should
( equal " 1 "
( org-test-with-temp-text
" :PROPERTIES: \n :A: 1 \n :END: \n "
( org-mode-restart )
( let ( ( org-use-property-inheritance t ) )
( org-refresh-properties " A " 'org-test ) )
( get-text-property ( point ) 'org-test ) ) ) )
( should-not
( equal " 1 "
( org-test-with-temp-text
" :PROPERTIES: \n :A: 1 \n :END: \n <point>* H1 "
( org-mode-restart )
( let ( ( org-use-property-inheritance nil ) )
( org-refresh-properties " A " 'org-test ) )
( get-text-property ( point ) 'org-test ) ) ) )
( should
( equal " 1 "
( org-test-with-temp-text
" :PROPERTIES: \n :A: 1 \n :END: \n <point>* H1 "
( org-mode-restart )
( let ( ( org-use-property-inheritance t ) )
( org-refresh-properties " A " 'org-test ) )
( get-text-property ( point ) 'org-test ) ) ) )
( should
( equal " 2 "
( org-test-with-temp-text
" :PROPERTIES: \n :A: 1 \n :END: \n <point>* H1 \n :PROPERTIES: \n :A: 2 \n :END: "
( org-mode-restart )
( let ( ( org-use-property-inheritance t ) )
( org-refresh-properties " A " 'org-test ) )
( get-text-property ( point ) 'org-test ) ) ) )
2017-01-26 18:21:42 -05:00
;; When property is inherited, use global value across the whole
Org document property-drawers
Add functionality to define property-blocks on document level, in
addition to at headline level.
* doc/org-manual.org:
* etc/ORG-NEWS: Document new functionality.
* lisp/org.el (org-keyword-regexp): Define constant instead of
hardcoding.
(org-file-properties): Renamed, see next line.
(org-keyword-properties): Renamed from above. Due to the fact that
properties can be defined for the whole document using property
drawers this local variable needs a rename to make its name less
ambigous.
(org-refresh-properties, org-refresh-property, org-entry-properties)
(org-refresh-category-properties, org-get-property-block)
(org-entry-get-with-inheritance, org-entry-put)
(org-insert-property-drawer, org-end-of-subtree): Made to work before
first headline.
(org-at-property-block-p): New function to validate if point is at the
start of a property block.
(org-property-global-value): Renamed, see next line.
(org-property-global-or-keyword-value): Renamed from above to match
its functionality better.
(org-back-to-heading-or-point-min): New function to make a document
work as a level 0 node in the outline.
(org-at-keyword-p): Predicate function to answer to if we're currently
at a keyword line or not.
(org-up-heading-or-point-min): New function to make a document work as
a level 0 node in the outline.
* lisp/org-element.el (org-element--current-element): Can now detect
property-blocks before first headline according to it's positional
rules.
* lisp/org-attach.el (org-attach): Make it possible to call the
attachment dispatcher also before the first headline, since document
property drawers make attachments possible for the whole document
now.
* lisp/org-capture.el: Modified only due to rename of function in
org.el.
* lisp/org-compat.el (org-file-properties)
(org-property-global-value): Renamed functions declared obsolete.
* testing/lisp/test-org.el (org/insert-property-drawer)
(org/set-property, org/delete-property, org/delete-property-globally):
Additions of tests to check if they work before first headline.
(org/at-property-p, org/at-property-block-p, org/get-property-block)
(org/entry-get, org/refresh-properties): New tests
* testing/examples/property-inheritance.org: Switch from
property-keywords to a property-drawer in the testfile.
Functionality should be the same, but now using a document drawer
instead of property-keywords.
Reason for switching is that I'd like us to slowly depricate
property-keywords.
* testing/lisp/test-org-element.el:
* contrib/lisp/ox-taskjuggler.el: A comment is modified only due to
rename of function in org.el.
2019-05-26 16:13:09 -04:00
;; buffer. However local values have precedence, as well as the
;; document level property-drawer.
2017-01-26 18:21:42 -05:00
( should-not
( equal " 1 "
( org-test-with-temp-text " #+PROPERTY: A 1 \n <point>* H1 "
( org-mode-restart )
( let ( ( org-use-property-inheritance nil ) )
( org-refresh-properties " A " 'org-test ) )
( get-text-property ( point ) 'org-test ) ) ) )
( should
( equal " 1 "
( org-test-with-temp-text " #+PROPERTY: A 1 \n <point>* H1 "
( org-mode-restart )
( let ( ( org-use-property-inheritance t ) )
( org-refresh-properties " A " 'org-test ) )
( get-text-property ( point ) 'org-test ) ) ) )
( should
( equal " 2 "
( org-test-with-temp-text
" #+PROPERTY: A 1 \n <point>* H \n :PROPERTIES: \n :A: 2 \n :END: "
( org-mode-restart )
Org document property-drawers
Add functionality to define property-blocks on document level, in
addition to at headline level.
* doc/org-manual.org:
* etc/ORG-NEWS: Document new functionality.
* lisp/org.el (org-keyword-regexp): Define constant instead of
hardcoding.
(org-file-properties): Renamed, see next line.
(org-keyword-properties): Renamed from above. Due to the fact that
properties can be defined for the whole document using property
drawers this local variable needs a rename to make its name less
ambigous.
(org-refresh-properties, org-refresh-property, org-entry-properties)
(org-refresh-category-properties, org-get-property-block)
(org-entry-get-with-inheritance, org-entry-put)
(org-insert-property-drawer, org-end-of-subtree): Made to work before
first headline.
(org-at-property-block-p): New function to validate if point is at the
start of a property block.
(org-property-global-value): Renamed, see next line.
(org-property-global-or-keyword-value): Renamed from above to match
its functionality better.
(org-back-to-heading-or-point-min): New function to make a document
work as a level 0 node in the outline.
(org-at-keyword-p): Predicate function to answer to if we're currently
at a keyword line or not.
(org-up-heading-or-point-min): New function to make a document work as
a level 0 node in the outline.
* lisp/org-element.el (org-element--current-element): Can now detect
property-blocks before first headline according to it's positional
rules.
* lisp/org-attach.el (org-attach): Make it possible to call the
attachment dispatcher also before the first headline, since document
property drawers make attachments possible for the whole document
now.
* lisp/org-capture.el: Modified only due to rename of function in
org.el.
* lisp/org-compat.el (org-file-properties)
(org-property-global-value): Renamed functions declared obsolete.
* testing/lisp/test-org.el (org/insert-property-drawer)
(org/set-property, org/delete-property, org/delete-property-globally):
Additions of tests to check if they work before first headline.
(org/at-property-p, org/at-property-block-p, org/get-property-block)
(org/entry-get, org/refresh-properties): New tests
* testing/examples/property-inheritance.org: Switch from
property-keywords to a property-drawer in the testfile.
Functionality should be the same, but now using a document drawer
instead of property-keywords.
Reason for switching is that I'd like us to slowly depricate
property-keywords.
* testing/lisp/test-org-element.el:
* contrib/lisp/ox-taskjuggler.el: A comment is modified only due to
rename of function in org.el.
2019-05-26 16:13:09 -04:00
( let ( ( org-use-property-inheritance t ) )
( org-refresh-properties " A " 'org-test ) )
( get-text-property ( point ) 'org-test ) ) ) )
;; When both keyword-property and document-level property-block is
;; defined, the property-block has precedance.
( should
( equal " 1 "
( org-test-with-temp-text
" :PROPERTIES: \n :A: 1 \n :END: \n #+PROPERTY: A 2 \n <point>* H1 "
( org-mode-restart )
2017-01-26 18:21:42 -05:00
( let ( ( org-use-property-inheritance t ) )
( org-refresh-properties " A " 'org-test ) )
( get-text-property ( point ) 'org-test ) ) ) ) )
Org document property-drawers
Add functionality to define property-blocks on document level, in
addition to at headline level.
* doc/org-manual.org:
* etc/ORG-NEWS: Document new functionality.
* lisp/org.el (org-keyword-regexp): Define constant instead of
hardcoding.
(org-file-properties): Renamed, see next line.
(org-keyword-properties): Renamed from above. Due to the fact that
properties can be defined for the whole document using property
drawers this local variable needs a rename to make its name less
ambigous.
(org-refresh-properties, org-refresh-property, org-entry-properties)
(org-refresh-category-properties, org-get-property-block)
(org-entry-get-with-inheritance, org-entry-put)
(org-insert-property-drawer, org-end-of-subtree): Made to work before
first headline.
(org-at-property-block-p): New function to validate if point is at the
start of a property block.
(org-property-global-value): Renamed, see next line.
(org-property-global-or-keyword-value): Renamed from above to match
its functionality better.
(org-back-to-heading-or-point-min): New function to make a document
work as a level 0 node in the outline.
(org-at-keyword-p): Predicate function to answer to if we're currently
at a keyword line or not.
(org-up-heading-or-point-min): New function to make a document work as
a level 0 node in the outline.
* lisp/org-element.el (org-element--current-element): Can now detect
property-blocks before first headline according to it's positional
rules.
* lisp/org-attach.el (org-attach): Make it possible to call the
attachment dispatcher also before the first headline, since document
property drawers make attachments possible for the whole document
now.
* lisp/org-capture.el: Modified only due to rename of function in
org.el.
* lisp/org-compat.el (org-file-properties)
(org-property-global-value): Renamed functions declared obsolete.
* testing/lisp/test-org.el (org/insert-property-drawer)
(org/set-property, org/delete-property, org/delete-property-globally):
Additions of tests to check if they work before first headline.
(org/at-property-p, org/at-property-block-p, org/get-property-block)
(org/entry-get, org/refresh-properties): New tests
* testing/examples/property-inheritance.org: Switch from
property-keywords to a property-drawer in the testfile.
Functionality should be the same, but now using a document drawer
instead of property-keywords.
Reason for switching is that I'd like us to slowly depricate
property-keywords.
* testing/lisp/test-org-element.el:
* contrib/lisp/ox-taskjuggler.el: A comment is modified only due to
rename of function in org.el.
2019-05-26 16:13:09 -04:00
( ert-deftest test-org/refresh-category-properties ( )
" Test `org-refresh-category-properties' specifications "
( should
( equal " cat1 "
( org-test-with-temp-text
" :PROPERTIES: \n :CATEGORY: cat1 \n :END: "
( org-refresh-category-properties )
2021-10-16 11:50:21 -04:00
( org-get-category ) ) ) )
Org document property-drawers
Add functionality to define property-blocks on document level, in
addition to at headline level.
* doc/org-manual.org:
* etc/ORG-NEWS: Document new functionality.
* lisp/org.el (org-keyword-regexp): Define constant instead of
hardcoding.
(org-file-properties): Renamed, see next line.
(org-keyword-properties): Renamed from above. Due to the fact that
properties can be defined for the whole document using property
drawers this local variable needs a rename to make its name less
ambigous.
(org-refresh-properties, org-refresh-property, org-entry-properties)
(org-refresh-category-properties, org-get-property-block)
(org-entry-get-with-inheritance, org-entry-put)
(org-insert-property-drawer, org-end-of-subtree): Made to work before
first headline.
(org-at-property-block-p): New function to validate if point is at the
start of a property block.
(org-property-global-value): Renamed, see next line.
(org-property-global-or-keyword-value): Renamed from above to match
its functionality better.
(org-back-to-heading-or-point-min): New function to make a document
work as a level 0 node in the outline.
(org-at-keyword-p): Predicate function to answer to if we're currently
at a keyword line or not.
(org-up-heading-or-point-min): New function to make a document work as
a level 0 node in the outline.
* lisp/org-element.el (org-element--current-element): Can now detect
property-blocks before first headline according to it's positional
rules.
* lisp/org-attach.el (org-attach): Make it possible to call the
attachment dispatcher also before the first headline, since document
property drawers make attachments possible for the whole document
now.
* lisp/org-capture.el: Modified only due to rename of function in
org.el.
* lisp/org-compat.el (org-file-properties)
(org-property-global-value): Renamed functions declared obsolete.
* testing/lisp/test-org.el (org/insert-property-drawer)
(org/set-property, org/delete-property, org/delete-property-globally):
Additions of tests to check if they work before first headline.
(org/at-property-p, org/at-property-block-p, org/get-property-block)
(org/entry-get, org/refresh-properties): New tests
* testing/examples/property-inheritance.org: Switch from
property-keywords to a property-drawer in the testfile.
Functionality should be the same, but now using a document drawer
instead of property-keywords.
Reason for switching is that I'd like us to slowly depricate
property-keywords.
* testing/lisp/test-org-element.el:
* contrib/lisp/ox-taskjuggler.el: A comment is modified only due to
rename of function in org.el.
2019-05-26 16:13:09 -04:00
( should
( equal " cat1 "
( org-test-with-temp-text
" * H \n :PROPERTIES: \n :CATEGORY: cat1 \n :END: "
( org-refresh-category-properties )
2021-10-16 11:50:21 -04:00
( org-get-category ) ) ) )
Org document property-drawers
Add functionality to define property-blocks on document level, in
addition to at headline level.
* doc/org-manual.org:
* etc/ORG-NEWS: Document new functionality.
* lisp/org.el (org-keyword-regexp): Define constant instead of
hardcoding.
(org-file-properties): Renamed, see next line.
(org-keyword-properties): Renamed from above. Due to the fact that
properties can be defined for the whole document using property
drawers this local variable needs a rename to make its name less
ambigous.
(org-refresh-properties, org-refresh-property, org-entry-properties)
(org-refresh-category-properties, org-get-property-block)
(org-entry-get-with-inheritance, org-entry-put)
(org-insert-property-drawer, org-end-of-subtree): Made to work before
first headline.
(org-at-property-block-p): New function to validate if point is at the
start of a property block.
(org-property-global-value): Renamed, see next line.
(org-property-global-or-keyword-value): Renamed from above to match
its functionality better.
(org-back-to-heading-or-point-min): New function to make a document
work as a level 0 node in the outline.
(org-at-keyword-p): Predicate function to answer to if we're currently
at a keyword line or not.
(org-up-heading-or-point-min): New function to make a document work as
a level 0 node in the outline.
* lisp/org-element.el (org-element--current-element): Can now detect
property-blocks before first headline according to it's positional
rules.
* lisp/org-attach.el (org-attach): Make it possible to call the
attachment dispatcher also before the first headline, since document
property drawers make attachments possible for the whole document
now.
* lisp/org-capture.el: Modified only due to rename of function in
org.el.
* lisp/org-compat.el (org-file-properties)
(org-property-global-value): Renamed functions declared obsolete.
* testing/lisp/test-org.el (org/insert-property-drawer)
(org/set-property, org/delete-property, org/delete-property-globally):
Additions of tests to check if they work before first headline.
(org/at-property-p, org/at-property-block-p, org/get-property-block)
(org/entry-get, org/refresh-properties): New tests
* testing/examples/property-inheritance.org: Switch from
property-keywords to a property-drawer in the testfile.
Functionality should be the same, but now using a document drawer
instead of property-keywords.
Reason for switching is that I'd like us to slowly depricate
property-keywords.
* testing/lisp/test-org-element.el:
* contrib/lisp/ox-taskjuggler.el: A comment is modified only due to
rename of function in org.el.
2019-05-26 16:13:09 -04:00
;; Even though property-inheritance is deactivated, category
;; property should be inherited. As described in
;; `org-use-property-inheritance'.
( should
( equal " cat1 "
( org-test-with-temp-text
" :PROPERTIES: \n :CATEGORY: cat1 \n :END: \n <point>* H "
( org-mode-restart )
( let ( ( org-use-property-inheritance nil ) )
( org-refresh-category-properties ) )
2021-10-16 11:50:21 -04:00
( org-get-category ) ) ) )
Org document property-drawers
Add functionality to define property-blocks on document level, in
addition to at headline level.
* doc/org-manual.org:
* etc/ORG-NEWS: Document new functionality.
* lisp/org.el (org-keyword-regexp): Define constant instead of
hardcoding.
(org-file-properties): Renamed, see next line.
(org-keyword-properties): Renamed from above. Due to the fact that
properties can be defined for the whole document using property
drawers this local variable needs a rename to make its name less
ambigous.
(org-refresh-properties, org-refresh-property, org-entry-properties)
(org-refresh-category-properties, org-get-property-block)
(org-entry-get-with-inheritance, org-entry-put)
(org-insert-property-drawer, org-end-of-subtree): Made to work before
first headline.
(org-at-property-block-p): New function to validate if point is at the
start of a property block.
(org-property-global-value): Renamed, see next line.
(org-property-global-or-keyword-value): Renamed from above to match
its functionality better.
(org-back-to-heading-or-point-min): New function to make a document
work as a level 0 node in the outline.
(org-at-keyword-p): Predicate function to answer to if we're currently
at a keyword line or not.
(org-up-heading-or-point-min): New function to make a document work as
a level 0 node in the outline.
* lisp/org-element.el (org-element--current-element): Can now detect
property-blocks before first headline according to it's positional
rules.
* lisp/org-attach.el (org-attach): Make it possible to call the
attachment dispatcher also before the first headline, since document
property drawers make attachments possible for the whole document
now.
* lisp/org-capture.el: Modified only due to rename of function in
org.el.
* lisp/org-compat.el (org-file-properties)
(org-property-global-value): Renamed functions declared obsolete.
* testing/lisp/test-org.el (org/insert-property-drawer)
(org/set-property, org/delete-property, org/delete-property-globally):
Additions of tests to check if they work before first headline.
(org/at-property-p, org/at-property-block-p, org/get-property-block)
(org/entry-get, org/refresh-properties): New tests
* testing/examples/property-inheritance.org: Switch from
property-keywords to a property-drawer in the testfile.
Functionality should be the same, but now using a document drawer
instead of property-keywords.
Reason for switching is that I'd like us to slowly depricate
property-keywords.
* testing/lisp/test-org-element.el:
* contrib/lisp/ox-taskjuggler.el: A comment is modified only due to
rename of function in org.el.
2019-05-26 16:13:09 -04:00
( should
( equal " cat1 "
( org-test-with-temp-text
" :PROPERTIES: \n :CATEGORY: cat1 \n :END: \n <point>* H "
( org-mode-restart )
( let ( ( org-use-property-inheritance t ) )
( org-refresh-category-properties ) )
2021-10-16 11:50:21 -04:00
( org-get-category ) ) ) )
Org document property-drawers
Add functionality to define property-blocks on document level, in
addition to at headline level.
* doc/org-manual.org:
* etc/ORG-NEWS: Document new functionality.
* lisp/org.el (org-keyword-regexp): Define constant instead of
hardcoding.
(org-file-properties): Renamed, see next line.
(org-keyword-properties): Renamed from above. Due to the fact that
properties can be defined for the whole document using property
drawers this local variable needs a rename to make its name less
ambigous.
(org-refresh-properties, org-refresh-property, org-entry-properties)
(org-refresh-category-properties, org-get-property-block)
(org-entry-get-with-inheritance, org-entry-put)
(org-insert-property-drawer, org-end-of-subtree): Made to work before
first headline.
(org-at-property-block-p): New function to validate if point is at the
start of a property block.
(org-property-global-value): Renamed, see next line.
(org-property-global-or-keyword-value): Renamed from above to match
its functionality better.
(org-back-to-heading-or-point-min): New function to make a document
work as a level 0 node in the outline.
(org-at-keyword-p): Predicate function to answer to if we're currently
at a keyword line or not.
(org-up-heading-or-point-min): New function to make a document work as
a level 0 node in the outline.
* lisp/org-element.el (org-element--current-element): Can now detect
property-blocks before first headline according to it's positional
rules.
* lisp/org-attach.el (org-attach): Make it possible to call the
attachment dispatcher also before the first headline, since document
property drawers make attachments possible for the whole document
now.
* lisp/org-capture.el: Modified only due to rename of function in
org.el.
* lisp/org-compat.el (org-file-properties)
(org-property-global-value): Renamed functions declared obsolete.
* testing/lisp/test-org.el (org/insert-property-drawer)
(org/set-property, org/delete-property, org/delete-property-globally):
Additions of tests to check if they work before first headline.
(org/at-property-p, org/at-property-block-p, org/get-property-block)
(org/entry-get, org/refresh-properties): New tests
* testing/examples/property-inheritance.org: Switch from
property-keywords to a property-drawer in the testfile.
Functionality should be the same, but now using a document drawer
instead of property-keywords.
Reason for switching is that I'd like us to slowly depricate
property-keywords.
* testing/lisp/test-org-element.el:
* contrib/lisp/ox-taskjuggler.el: A comment is modified only due to
rename of function in org.el.
2019-05-26 16:13:09 -04:00
( should
( equal " cat2 "
( org-test-with-temp-text
" :PROPERTIES: \n :CATEGORY: cat1 \n :END: \n <point>* H \n :PROPERTIES: \n :CATEGORY: cat2 \n :END: \n "
( org-mode-restart )
( let ( ( org-use-property-inheritance t ) )
( org-refresh-category-properties ) )
2021-10-16 11:50:21 -04:00
( org-get-category ) ) ) ) )
Org document property-drawers
Add functionality to define property-blocks on document level, in
addition to at headline level.
* doc/org-manual.org:
* etc/ORG-NEWS: Document new functionality.
* lisp/org.el (org-keyword-regexp): Define constant instead of
hardcoding.
(org-file-properties): Renamed, see next line.
(org-keyword-properties): Renamed from above. Due to the fact that
properties can be defined for the whole document using property
drawers this local variable needs a rename to make its name less
ambigous.
(org-refresh-properties, org-refresh-property, org-entry-properties)
(org-refresh-category-properties, org-get-property-block)
(org-entry-get-with-inheritance, org-entry-put)
(org-insert-property-drawer, org-end-of-subtree): Made to work before
first headline.
(org-at-property-block-p): New function to validate if point is at the
start of a property block.
(org-property-global-value): Renamed, see next line.
(org-property-global-or-keyword-value): Renamed from above to match
its functionality better.
(org-back-to-heading-or-point-min): New function to make a document
work as a level 0 node in the outline.
(org-at-keyword-p): Predicate function to answer to if we're currently
at a keyword line or not.
(org-up-heading-or-point-min): New function to make a document work as
a level 0 node in the outline.
* lisp/org-element.el (org-element--current-element): Can now detect
property-blocks before first headline according to it's positional
rules.
* lisp/org-attach.el (org-attach): Make it possible to call the
attachment dispatcher also before the first headline, since document
property drawers make attachments possible for the whole document
now.
* lisp/org-capture.el: Modified only due to rename of function in
org.el.
* lisp/org-compat.el (org-file-properties)
(org-property-global-value): Renamed functions declared obsolete.
* testing/lisp/test-org.el (org/insert-property-drawer)
(org/set-property, org/delete-property, org/delete-property-globally):
Additions of tests to check if they work before first headline.
(org/at-property-p, org/at-property-block-p, org/get-property-block)
(org/entry-get, org/refresh-properties): New tests
* testing/examples/property-inheritance.org: Switch from
property-keywords to a property-drawer in the testfile.
Functionality should be the same, but now using a document drawer
instead of property-keywords.
Reason for switching is that I'd like us to slowly depricate
property-keywords.
* testing/lisp/test-org-element.el:
* contrib/lisp/ox-taskjuggler.el: A comment is modified only due to
rename of function in org.el.
2019-05-26 16:13:09 -04:00
2017-05-21 20:17:32 -04:00
;;; Refile
( ert-deftest test-org/refile-get-targets ( )
" Test `org-refile-get-targets' specifications. "
;; :maxlevel includes all headings above specified value.
( should
( equal ' ( " H1 " " H2 " " H3 " )
( org-test-with-temp-text " * H1 \n ** H2 \n *** H3 "
( let ( ( org-refile-use-outline-path nil )
( org-refile-targets ` ( ( nil :maxlevel . 3 ) ) ) )
( mapcar #' car ( org-refile-get-targets ) ) ) ) ) )
( should
( equal ' ( " H1 " " H2 " )
( org-test-with-temp-text " * H1 \n ** H2 \n *** H3 "
( let ( ( org-refile-use-outline-path nil )
( org-refile-targets ` ( ( nil :maxlevel . 2 ) ) ) )
( mapcar #' car ( org-refile-get-targets ) ) ) ) ) )
;; :level limits targets to headlines with the specified level.
( should
( equal ' ( " H2 " )
( org-test-with-temp-text " * H1 \n ** H2 \n *** H3 "
( let ( ( org-refile-use-outline-path nil )
( org-refile-targets ` ( ( nil :level . 2 ) ) ) )
( mapcar #' car ( org-refile-get-targets ) ) ) ) ) )
;; :tag limits targets to headlines with specified tag.
( should
( equal ' ( " H1 " )
( org-test-with-temp-text " * H1 :foo: \n ** H2 \n *** H3 :bar: "
( let ( ( org-refile-use-outline-path nil )
( org-refile-targets ` ( ( nil :tag . " foo " ) ) ) )
( mapcar #' car ( org-refile-get-targets ) ) ) ) ) )
;; :todo limits targets to headlines with specified TODO keyword.
( should
( equal ' ( " H2 " )
( org-test-with-temp-text " * H1 \n ** TODO H2 \n *** DONE H3 "
( let ( ( org-refile-use-outline-path nil )
( org-refile-targets ` ( ( nil :todo . " TODO " ) ) ) )
( mapcar #' car ( org-refile-get-targets ) ) ) ) ) )
;; :regexp filters targets matching provided regexp.
( should
( equal ' ( " F2 " " F3 " )
( org-test-with-temp-text " * H1 \n ** F2 \n *** F3 "
( let ( ( org-refile-use-outline-path nil )
( org-refile-targets ` ( ( nil :regexp . " F " ) ) ) )
( mapcar #' car ( org-refile-get-targets ) ) ) ) ) )
;; A nil `org-refile-targets' includes only top level headlines in
;; current buffer.
( should
( equal ' ( " H1 " " H2 " )
( org-test-with-temp-text " * H1 \n ** S1 \n * H2 "
( let ( ( org-refile-use-outline-path nil )
( org-refile-targets nil ) )
( mapcar #' car ( org-refile-get-targets ) ) ) ) ) )
;; Return value is the union of the targets according to all the
2017-05-22 02:21:50 -04:00
;; defined rules. However, prevent duplicates.
2017-05-21 20:17:32 -04:00
( should
( equal ' ( " F2 " " F3 " " H1 " )
( org-test-with-temp-text " * TODO H1 \n ** F2 \n *** F3 "
( let ( ( org-refile-use-outline-path nil )
( org-refile-targets ` ( ( nil :regexp . " F " )
( nil :todo . " TODO " ) ) ) )
( mapcar #' car ( org-refile-get-targets ) ) ) ) ) )
2017-05-22 02:21:50 -04:00
( should
2017-05-22 02:26:22 -04:00
( equal ' ( " F2 " " F3 " " H1 " )
2017-05-22 02:21:50 -04:00
( org-test-with-temp-text " * TODO H1 \n ** TODO F2 \n *** F3 "
( let ( ( org-refile-use-outline-path nil )
( org-refile-targets ` ( ( nil :regexp . " F " )
( nil :todo . " TODO " ) ) ) )
( mapcar #' car ( org-refile-get-targets ) ) ) ) ) )
2017-05-21 20:17:32 -04:00
;; When `org-refile-use-outline-path' is non-nil, provide targets as
;; paths.
( should
( equal ' ( " H1 " " H1/H2 " " H1/H2/H3 " )
( org-test-with-temp-text " * H1 \n ** H2 \n *** H3 "
( let ( ( org-refile-use-outline-path t )
( org-refile-targets ` ( ( nil :maxlevel . 3 ) ) ) )
( mapcar #' car ( org-refile-get-targets ) ) ) ) ) )
;; When providing targets as paths, escape forward slashes in
;; headings with backslashes.
( should
( equal ' ( " H1 \\ /foo " )
( org-test-with-temp-text " * H1/foo "
( let ( ( org-refile-use-outline-path t )
( org-refile-targets ` ( ( nil :maxlevel . 1 ) ) ) )
( mapcar #' car ( org-refile-get-targets ) ) ) ) ) )
;; When `org-refile-use-outline-path' is `file', include file name
;; without directory in targets.
( should
( org-test-with-temp-text-in-file " * H1 "
( let* ( ( filename ( buffer-file-name ) )
( org-refile-use-outline-path 'file )
( org-refile-targets ` ( ( ( , filename ) :level . 1 ) ) ) )
( member ( file-name-nondirectory filename )
( mapcar #' car ( org-refile-get-targets ) ) ) ) ) )
;; When `org-refile-use-outline-path' is `full-file-path', include
;; full file name.
( should
( org-test-with-temp-text-in-file " * H1 "
2017-08-10 16:43:39 -04:00
( let* ( ( filename ( file-truename ( buffer-file-name ) ) )
2017-05-21 20:17:32 -04:00
( org-refile-use-outline-path 'full-file-path )
( org-refile-targets ` ( ( ( , filename ) :level . 1 ) ) ) )
( member filename ( mapcar #' car ( org-refile-get-targets ) ) ) ) ) )
;; When `org-refile-use-outline-path' is `buffer-name', include
;; buffer name.
( should
( org-test-with-temp-text " * H1 "
( let* ( ( org-refile-use-outline-path 'buffer-name )
( org-refile-targets ` ( ( nil :level . 1 ) ) ) )
2020-09-21 08:53:13 -04:00
( member ( buffer-name ) ( mapcar #' car ( org-refile-get-targets ) ) ) ) ) )
;; When `org-refile-use-outline-path' is `title', return extracted
;; document title
( should
( equal ' ( " T " " T/H1 " )
( org-test-with-temp-text-in-file " #+title: T \n * H1 "
( let* ( ( org-refile-use-outline-path 'title )
( org-refile-targets ` ( ( nil :level . 1 ) ) ) )
( mapcar #' car ( org-refile-get-targets ) ) ) ) ) )
;; When `org-refile-use-outline-path' is `title' validate that
;; deeper levels are correctly reported too (the same behaviour as
;; 'file)
( should
( equal ' ( " T " " T/H1 " " T/H1/H2 " " T/H1/H2/H3 " " T/H1 " )
( org-test-with-temp-text-in-file " #+title: T \n * H1 \n ** H2 \n *** H3 \n * H1 "
( let ( ( org-refile-use-outline-path 'title )
( org-refile-targets ` ( ( nil :maxlevel . 3 ) ) ) )
( mapcar #' car ( org-refile-get-targets ) ) ) ) ) )
;; When `org-refile-use-outline-path' is `title' and document do not
;; have an extracted document title, return just the file name
( should
( org-test-with-temp-text-in-file " * H1 "
( let* ( ( filename ( buffer-file-name ) )
( org-refile-use-outline-path 'title )
( org-refile-targets ` ( ( nil :level . 1 ) ) ) )
( member ( file-name-nondirectory filename )
( mapcar #' car ( org-refile-get-targets ) ) ) ) ) )
;; When `org-refile-use-outline-path' is `title' and document is a
;; temporary buffer without a file, it is still possible to extract
;; a title
( should
( equal ' ( " T " " T/H1 " )
( org-test-with-temp-text " #+title: T \n * H1 \n ** H2 "
( let* ( ( org-refile-use-outline-path 'title )
( org-refile-targets ` ( ( nil :level . 1 ) ) ) )
( mapcar #' car ( org-refile-get-targets ) ) ) ) ) )
;; When `org-refile-use-outline-path' is `title' and there are two
;; title keywords in the file, titles are concatenated into a single
;; one.
( should
( equal ' ( " T1 T2 " " T1 T2/H1 " )
( org-test-with-temp-text " #+title: T1 \n #+title: T2 \n * H1 \n ** H2 "
( let* ( ( org-refile-use-outline-path 'title )
( org-refile-targets ` ( ( nil :level . 1 ) ) ) )
( mapcar #' car ( org-refile-get-targets ) ) ) ) ) )
;; When `org-refile-use-outline-path' is `title' and there are two
;; title keywords in the file, titles are concatenated into a single
;; one even if they are in the middle of the file.
( should
( equal ' ( " T1 T2 " " T1 T2/H1 " )
( org-test-with-temp-text " #+title: T1 \n * H1 \n ** H2 \n #+title: T2 \n "
( let* ( ( org-refile-use-outline-path 'title )
( org-refile-targets ` ( ( nil :level . 1 ) ) ) )
( mapcar #' car ( org-refile-get-targets ) ) ) ) ) ) )
2017-05-21 20:17:32 -04:00
2014-12-06 15:20:55 -05:00
;;; Sparse trees
( ert-deftest test-org/match-sparse-tree ( )
" Test `org-match-sparse-tree' specifications. "
;; Match tags.
( should-not
( org-test-with-temp-text " * H \n ** H1 :tag: "
( org-match-sparse-tree nil " tag " )
( search-forward " H1 " )
( org-invisible-p2 ) ) )
( should
( org-test-with-temp-text " * H \n ** H1 :tag: \n ** H2 :tag2: "
( org-match-sparse-tree nil " tag " )
( search-forward " H2 " )
( org-invisible-p2 ) ) )
;; "-" operator for tags.
( should-not
( org-test-with-temp-text " * H \n ** H1 :tag1: \n ** H2 :tag1:tag2: "
( org-match-sparse-tree nil " tag1-tag2 " )
( search-forward " H1 " )
( org-invisible-p2 ) ) )
( should
( org-test-with-temp-text " * H \n ** H1 :tag1: \n ** H2 :tag1:tag2: "
( org-match-sparse-tree nil " tag1-tag2 " )
( search-forward " H2 " )
( org-invisible-p2 ) ) )
;; "&" operator for tags.
( should
( org-test-with-temp-text " * H \n ** H1 :tag1: \n ** H2 :tag1:tag2: "
( org-match-sparse-tree nil " tag1&tag2 " )
( search-forward " H1 " )
( org-invisible-p2 ) ) )
( should-not
( org-test-with-temp-text " * H \n ** H1 :tag1: \n ** H2 :tag1:tag2: "
( org-match-sparse-tree nil " tag1&tag2 " )
( search-forward " H2 " )
( org-invisible-p2 ) ) )
;; "|" operator for tags.
( should-not
( org-test-with-temp-text " * H \n ** H1 :tag1: \n ** H2 :tag1:tag2: "
( org-match-sparse-tree nil " tag1|tag2 " )
( search-forward " H1 " )
( org-invisible-p2 ) ) )
( should-not
( org-test-with-temp-text " * H \n ** H1 :tag1: \n ** H2 :tag1:tag2: "
( org-match-sparse-tree nil " tag1|tag2 " )
( search-forward " H2 " )
( org-invisible-p2 ) ) )
;; Regexp match on tags.
( should-not
( org-test-with-temp-text " * H \n ** H1 :tag1: \n ** H2 :foo: "
( org-match-sparse-tree nil " {^tag.*} " )
( search-forward " H1 " )
( org-invisible-p2 ) ) )
( should
( org-test-with-temp-text " * H \n ** H1 :tag1: \n ** H2 :foo: "
( org-match-sparse-tree nil " {^tag.*} " )
( search-forward " H2 " )
( org-invisible-p2 ) ) )
;; Match group tags.
( should-not
( org-test-with-temp-text
" #+TAGS: { work : lab } \n * H \n ** H1 :work: \n ** H2 :lab: "
( org-match-sparse-tree nil " work " )
( search-forward " H1 " )
( org-invisible-p2 ) ) )
( should-not
( org-test-with-temp-text
" #+TAGS: { work : lab } \n * H \n ** H1 :work: \n ** H2 :lab: "
( org-match-sparse-tree nil " work " )
( search-forward " H2 " )
( org-invisible-p2 ) ) )
2015-01-23 20:47:26 -05:00
;; Match group tags with hard brackets.
( should-not
( org-test-with-temp-text
" #+TAGS: [ work : lab ] \n * H \n ** H1 :work: \n ** H2 :lab: "
( org-match-sparse-tree nil " work " )
( search-forward " H1 " )
( org-invisible-p2 ) ) )
( should-not
( org-test-with-temp-text
" #+TAGS: [ work : lab ] \n * H \n ** H1 :work: \n ** H2 :lab: "
( org-match-sparse-tree nil " work " )
( search-forward " H2 " )
( org-invisible-p2 ) ) )
2015-01-23 20:47:47 -05:00
;; Match tags in hierarchies
( should-not
( org-test-with-temp-text
" #+TAGS: [ Lev_1 : Lev_2 ] \n
# +TAGS: [ Lev_2 : Lev_3 ] \n
# +TAGS: { Lev_3 : Lev_4 }\n
* H\n** H1 :Lev_1:\n** H2 :Lev_2:\n** H3 :Lev_3:\n** H4 :Lev_4: "
( org-match-sparse-tree nil " Lev_1 " )
( search-forward " H4 " )
( org-invisible-p2 ) ) )
2018-03-22 01:20:31 -04:00
( should-not
( org-test-with-temp-text
" #+TAGS: [ Lev_1 : Lev_2 ] \n
# +TAGS: [ Lev_2 : Lev_3 ] \n
# +TAGS: { Lev_3 : Lev_4 }\n
* H\n** H1 :Lev_1:\n** H2 :Lev_2:\n** H3 :Lev_3:\n** H4 :Lev_4: "
( org-match-sparse-tree nil " Lev_1+Lev_3 " )
( search-forward " H4 " )
( org-invisible-p2 ) ) )
2015-01-23 20:47:26 -05:00
;; Match regular expressions in tags
( should-not
( org-test-with-temp-text
" #+TAGS: [ Lev : {Lev_[0-9]} ] \n * H \n ** H1 :Lev_1: "
( org-match-sparse-tree nil " Lev " )
( search-forward " H1 " )
( org-invisible-p2 ) ) )
( should
( org-test-with-temp-text
" #+TAGS: [ Lev : {Lev_[0-9]} ] \n * H \n ** H1 :Lev_n: "
( org-match-sparse-tree nil " Lev " )
( search-forward " H1 " )
( org-invisible-p2 ) ) )
2014-12-06 15:20:55 -05:00
;; Match properties.
( should
( org-test-with-temp-text
" * H \n ** H1 \n :PROPERTIES: \n :A: 1 \n :END: \n ** H2 \n :PROPERTIES: \n :A: 2 \n :END: "
( org-match-sparse-tree nil " A= \" 1 \" " )
( search-forward " H2 " )
( org-invisible-p2 ) ) )
( should-not
( org-test-with-temp-text " * H1 \n ** H2 \n :PROPERTIES: \n :A: 1 \n :END: "
( org-match-sparse-tree nil " A= \" 1 \" " )
( search-forward " H2 " )
( org-invisible-p2 ) ) )
;; Case is not significant when matching properties.
( should-not
( org-test-with-temp-text " * H1 \n ** H2 \n :PROPERTIES: \n :A: 1 \n :END: "
( org-match-sparse-tree nil " a= \" 1 \" " )
( search-forward " H2 " )
( org-invisible-p2 ) ) )
( should-not
( org-test-with-temp-text " * H1 \n ** H2 \n :PROPERTIES: \n :a: 1 \n :END: "
( org-match-sparse-tree nil " A= \" 1 \" " )
( search-forward " H2 " )
( org-invisible-p2 ) ) )
;; Match special LEVEL property.
( should-not
( org-test-with-temp-text " * H \n ** H1 \n *** H2 "
( let ( ( org-odd-levels-only nil ) ) ( org-match-sparse-tree nil " LEVEL=2 " ) )
( search-forward " H1 " )
( org-invisible-p2 ) ) )
( should
( org-test-with-temp-text " * H \n ** H1 \n *** H2 "
( let ( ( org-odd-levels-only nil ) ) ( org-match-sparse-tree nil " LEVEL=2 " ) )
( search-forward " H2 " )
( org-invisible-p2 ) ) )
;; Comparison operators when matching properties.
( should
( org-test-with-temp-text
" * H \n ** H1 \n SCHEDULED: <2014-03-04 tue.> \n ** H2 \n SCHEDULED: <2012-03-29 thu.> "
( org-match-sparse-tree nil " SCHEDULED<= \" <2013-01-01> \" " )
( search-forward " H1 " )
( org-invisible-p2 ) ) )
( should-not
( org-test-with-temp-text
" * H \n ** H1 \n SCHEDULED: <2014-03-04 tue.> \n ** H2 \n SCHEDULED: <2012-03-29 thu.> "
( org-match-sparse-tree nil " SCHEDULED<= \" <2013-01-01> \" " )
( search-forward " H2 " )
( org-invisible-p2 ) ) )
;; Regexp match on properties values.
( should-not
( org-test-with-temp-text
" * H \n ** H1 \n :PROPERTIES: \n :A: foo \n :END: \n ** H2 \n :PROPERTIES: \n :A: bar \n :END: "
( org-match-sparse-tree nil " A={f.*} " )
( search-forward " H1 " )
( org-invisible-p2 ) ) )
( should
( org-test-with-temp-text
" * H \n ** H1 \n :PROPERTIES: \n :A: foo \n :END: \n ** H2 \n :PROPERTIES: \n :A: bar \n :END: "
( org-match-sparse-tree nil " A={f.*} " )
( search-forward " H2 " )
( org-invisible-p2 ) ) )
;; With an optional argument, limit match to TODO entries.
( should-not
( org-test-with-temp-text " * H \n ** TODO H1 :tag: \n ** H2 :tag: "
( org-match-sparse-tree t " tag " )
( search-forward " H1 " )
( org-invisible-p2 ) ) )
( should
( org-test-with-temp-text " * H \n ** TODO H1 :tag: \n ** H2 :tag: "
( org-match-sparse-tree t " tag " )
( search-forward " H2 " )
( org-invisible-p2 ) ) ) )
2016-05-05 04:18:21 -04:00
( ert-deftest test-org/occur ( )
" Test `org-occur' specifications. "
;; Count number of matches.
( should
( = 1
( org-test-with-temp-text " * H \n A \n * H2 "
( org-occur " A " ) ) ) )
( should
( = 2
( org-test-with-temp-text " * H \n A \n * H2 \n A "
( org-occur " A " ) ) ) )
;; Test CALLBACK optional argument.
( should
( = 0
( org-test-with-temp-text " * H \n A \n * H2 "
( org-occur " A " nil ( lambda ( ) ( equal ( org-get-heading ) " H2 " ) ) ) ) ) )
( should
( = 1
( org-test-with-temp-text " * H \n A \n * H2 \n A "
2016-05-20 07:58:41 -04:00
( org-occur " A " nil ( lambda ( ) ( equal ( org-get-heading ) " H2 " ) ) ) ) ) )
;; Case-fold searches according to `org-occur-case-fold-search'.
( should
( = 2
( org-test-with-temp-text " Aa "
( let ( ( org-occur-case-fold-search t ) ) ( org-occur " A " ) ) ) ) )
( should
( = 2
( org-test-with-temp-text " Aa "
( let ( ( org-occur-case-fold-search t ) ) ( org-occur " a " ) ) ) ) )
( should
( = 1
( org-test-with-temp-text " Aa "
( let ( ( org-occur-case-fold-search nil ) ) ( org-occur " A " ) ) ) ) )
( should
( = 1
( org-test-with-temp-text " Aa "
( let ( ( org-occur-case-fold-search nil ) ) ( org-occur " a " ) ) ) ) )
( should
( = 1
( org-test-with-temp-text " Aa "
( let ( ( org-occur-case-fold-search 'smart ) ) ( org-occur " A " ) ) ) ) )
( should
( = 2
( org-test-with-temp-text " Aa "
( let ( ( org-occur-case-fold-search 'smart ) ) ( org-occur " a " ) ) ) ) ) )
2016-05-05 04:18:21 -04:00
2016-04-17 11:00:14 -04:00
;;; Tags
( ert-deftest test-org/tag-string-to-alist ( )
" Test `org-tag-string-to-alist' specifications. "
;; Tag without selection key.
( should ( equal ( org-tag-string-to-alist " tag1 " ) ' ( ( " tag1 " ) ) ) )
;; Tag with selection key.
( should ( equal ( org-tag-string-to-alist " tag1(t) " ) ' ( ( " tag1 " . ?t ) ) ) )
;; Tag group.
( should
( equal
( org-tag-string-to-alist " [ group : t1 t2 ] " )
' ( ( :startgrouptag ) ( " group " ) ( :grouptags ) ( " t1 " ) ( " t2 " ) ( :endgrouptag ) ) ) )
;; Mutually exclusive tags.
( should ( equal ( org-tag-string-to-alist " { tag1 tag2 } " )
' ( ( :startgroup ) ( " tag1 " ) ( " tag2 " ) ( :endgroup ) ) ) )
( should
( equal
( org-tag-string-to-alist " { group : tag1 tag2 } " )
' ( ( :startgroup ) ( " group " ) ( :grouptags ) ( " tag1 " ) ( " tag2 " ) ( :endgroup ) ) ) ) )
( ert-deftest test-org/tag-alist-to-string ( )
" Test `org-tag-alist-to-string' specifications. "
( should ( equal ( org-tag-alist-to-string ' ( ( " tag1 " ) ) ) " tag1 " ) )
( should ( equal ( org-tag-alist-to-string ' ( ( " tag1 " . ?t ) ) ) " tag1(t) " ) )
( should
( equal
( org-tag-alist-to-string
' ( ( :startgrouptag ) ( " group " ) ( :grouptags ) ( " t1 " ) ( " t2 " ) ( :endgrouptag ) ) )
" [ group : t1 t2 ] " ) )
( should
( equal ( org-tag-alist-to-string
' ( ( :startgroup ) ( " tag1 " ) ( " tag2 " ) ( :endgroup ) ) )
" { tag1 tag2 } " ) )
( should
( equal
( org-tag-alist-to-string
' ( ( :startgroup ) ( " group " ) ( :grouptags ) ( " tag1 " ) ( " tag2 " ) ( :endgroup ) ) )
" { group : tag1 tag2 } " ) ) )
( ert-deftest test-org/tag-alist-to-groups ( )
" Test `org-tag-alist-to-groups' specifications. "
( should
( equal ( org-tag-alist-to-groups
' ( ( :startgroup ) ( " group " ) ( :grouptags ) ( " t1 " ) ( " t2 " ) ( :endgroup ) ) )
' ( ( " group " " t1 " " t2 " ) ) ) )
( should
( equal
( org-tag-alist-to-groups
' ( ( :startgrouptag ) ( " group " ) ( :grouptags ) ( " t1 " ) ( " t2 " ) ( :endgrouptag ) ) )
' ( ( " group " " t1 " " t2 " ) ) ) )
( should-not
( org-tag-alist-to-groups
' ( ( :startgroup ) ( " group " ) ( " t1 " ) ( " t2 " ) ( :endgroup ) ) ) ) )
2016-05-31 03:25:42 -04:00
( ert-deftest test-org/tag-align ( )
2016-10-05 05:54:49 -04:00
" Test tags alignment. "
2016-09-29 18:56:58 -04:00
;; Test aligning tags with different display width.
2016-05-31 03:25:42 -04:00
( should
;; 12345678901234567890
( equal " * Test :abc: "
( org-test-with-temp-text " * Test :abc: "
( let ( ( org-tags-column -20 )
( indent-tabs-mode nil ) )
2016-09-29 18:56:58 -04:00
( org-fix-tags-on-the-fly ) )
2016-05-31 03:25:42 -04:00
( buffer-string ) ) ) )
( should
;; 12345678901234567890
( equal " * Test :日本語: "
( org-test-with-temp-text " * Test :日本語: "
( let ( ( org-tags-column -20 )
( indent-tabs-mode nil ) )
2016-09-29 18:56:58 -04:00
( org-fix-tags-on-the-fly ) )
( buffer-string ) ) ) )
;; Make sure aligning tags do not skip invisible text.
( should
( equal " * [[linkx]] :tag: "
( org-test-with-temp-text " * [[link<point>]] :tag: "
( let ( ( org-tags-column 0 ) )
( org-fix-tags-on-the-fly )
( insert " x " )
2018-06-22 12:49:11 -04:00
( buffer-string ) ) ) ) )
;; Aligning tags preserve position.
( should
( = 6 ( org-test-with-temp-text " * 345 <point> :tag: "
( let ( ( org-tags-column 78 )
( indent-tabs-mode nil ) )
( org-fix-tags-on-the-fly ) )
2019-01-04 08:50:08 -05:00
( current-column ) ) ) )
;; Aligning all tags in visible buffer.
( should
;; 12345678901234567890
( equal ( concat " * Level 1 :abc: \n "
" ** Level 2 :def: " )
( org-test-with-temp-text ( concat " * Level 1 :abc: \n "
" ** Level 2 :def: " )
( let ( ( org-tags-column -20 )
( indent-tabs-mode nil ) )
;; (org-align-tags :all) must work even when the point
;; is at the end of the buffer.
( goto-char ( point-max ) )
( org-align-tags :all ) )
( buffer-string ) ) ) ) )
2016-05-31 03:25:42 -04:00
2018-04-18 11:28:52 -04:00
( ert-deftest test-org/get-tags ( )
" Test `org-get-tags' specifications. "
;; Standard test.
( should
( equal ' ( " foo " )
( org-test-with-temp-text " * Test :foo: " ( org-get-tags ) ) ) )
2016-06-09 03:39:38 -04:00
( should
( equal ' ( " foo " " bar " )
2018-04-18 11:28:52 -04:00
( org-test-with-temp-text " * Test :foo:bar: " ( org-get-tags ) ) ) )
2021-11-22 06:26:26 -05:00
;; Tags for inlinetasks.
( should
( equal ' ( " foo " " bar " )
( progn
( require 'org-inlinetask )
( org-test-with-temp-text ( concat ( make-string org-inlinetask-min-level ?* ) " Test :foo:bar: " )
( org-get-tags ( org-element-at-point ) ) ) ) ) )
( should
( equal ' ( " foo " " bar " )
( progn
( require 'org-inlinetask )
( org-test-with-temp-text ( concat ( make-string org-inlinetask-min-level ?* ) " Test :foo:bar: " )
( org-get-tags nil ) ) ) ) )
2018-04-18 11:28:52 -04:00
;; Return nil when there is no tag.
( should-not
( org-test-with-temp-text " * Test " ( org-get-tags ) ) )
;; Tags are inherited from parent headlines.
( should
( equal ' ( " tag " )
( let ( ( org-use-tag-inheritance t ) )
( org-test-with-temp-text " * H0 :foo: \n * H1 :tag: \n <point>** H2 "
( org-get-tags ) ) ) ) )
;; Tags are inherited from `org-file-tags'.
( should
( equal ' ( " tag " )
( org-test-with-temp-text " * H1 "
( let ( ( org-file-tags ' ( " tag " ) )
( org-use-tag-inheritance t ) )
( org-get-tags ) ) ) ) )
;; Only inherited tags have the `inherited' text property.
( should
( get-text-property 0 'inherited
( org-test-with-temp-text " * H1 :foo: \n ** <point>H2 :bar: "
( let ( ( org-use-tag-inheritance t ) )
( assoc-string " foo " ( org-get-tags ) ) ) ) ) )
( should-not
( get-text-property 0 'inherited
( org-test-with-temp-text " * H1 :foo: \n ** <point>H2 :bar: "
( let ( ( org-use-tag-inheritance t ) )
( assoc-string " bar " ( org-get-tags ) ) ) ) ) )
;; Obey to `org-use-tag-inheritance'.
( should-not
( org-test-with-temp-text " * H1 :foo: \n ** <point>H2 :bar: "
( let ( ( org-use-tag-inheritance nil ) )
( assoc-string " foo " ( org-get-tags ) ) ) ) )
( should-not
( org-test-with-temp-text " * H1 :foo: \n ** <point>H2 :bar: "
( let ( ( org-use-tag-inheritance nil )
( org-file-tags ' ( " foo " ) ) )
( assoc-string " foo " ( org-get-tags ) ) ) ) )
( should-not
( org-test-with-temp-text " * H1 :foo:bar: \n ** <point>H2 :baz: "
( let ( ( org-use-tag-inheritance ' ( " bar " ) ) )
( assoc-string " foo " ( org-get-tags ) ) ) ) )
( should
( org-test-with-temp-text " * H1 :foo:bar: \n ** <point>H2 :baz: "
( let ( ( org-use-tag-inheritance ' ( " bar " ) ) )
( assoc-string " bar " ( org-get-tags ) ) ) ) )
( should-not
( org-test-with-temp-text " * H1 :foo:bar: \n ** <point>H2 :baz: "
( let ( ( org-use-tag-inheritance " b.* " ) )
( assoc-string " foo " ( org-get-tags ) ) ) ) )
( should
( org-test-with-temp-text " * H1 :foo:bar: \n ** <point>H2 :baz: "
( let ( ( org-use-tag-inheritance " b.* " ) )
( assoc-string " bar " ( org-get-tags ) ) ) ) )
;; When optional argument LOCAL is non-nil, ignore tag inheritance.
( should
( equal ' ( " baz " )
( org-test-with-temp-text " * H1 :foo:bar: \n ** <point>H2 :baz: "
( let ( ( org-use-tag-inheritance t ) )
( org-get-tags nil t ) ) ) ) )
;; When optional argument POS is non-nil, get tags there instead.
( should
( equal ' ( " foo " )
( org-test-with-temp-text " * H1 :foo: \n * <point>H2 :bar: "
( org-get-tags 1 ) ) ) )
2018-07-25 08:48:10 -04:00
;; Make sure tags excluded from inheritance are returned if local
( should
( equal ' ( " foo " )
( org-test-with-temp-text " * Test :foo: "
( let ( ( org-use-tag-inheritance t )
( org-tags-exclude-from-inheritance ' ( " foo " ) ) )
( org-get-tags ) ) ) ) )
2019-01-04 16:43:10 -05:00
;; Test the collection of tags from #+filetags and parent tags.
( should
( equal ' ( " a " " b " " c " " d " )
( org-test-with-temp-text ( concat " #+filetags: a \n "
" * Level 1 :b: \n "
" ** Level 2 :c: \n "
" *** Level 3 :d: \n "
" <point> " )
( let ( ( org-use-tag-inheritance t ) )
( org-mode-restart ) ;So that `org-file-tags' get populated from #+filetags
( org-get-tags ) ) ) ) )
2018-04-18 11:28:52 -04:00
;; Pathological case: tagged headline with an empty body.
( should ( org-test-with-temp-text " * :tag: " ( org-get-tags ) ) ) )
2016-06-09 03:39:38 -04:00
2018-03-17 09:55:28 -04:00
( ert-deftest test-org/set-tags ( )
" Test `org-set-tags' specifications. "
;; Throw an error on invalid data.
( should-error
( org-test-with-temp-text " * H "
2018-04-20 04:45:19 -04:00
( org-set-tags 'foo ) ) )
2018-03-17 09:55:28 -04:00
;; `nil', an empty, and a blank string remove all tags.
( should
( equal " * H "
( org-test-with-temp-text " * H :tag1:tag2: "
2018-04-20 04:45:19 -04:00
( org-set-tags nil )
2018-03-17 09:55:28 -04:00
( buffer-string ) ) ) )
( should
( equal " * H "
( org-test-with-temp-text " * H :tag1:tag2: "
2018-04-20 04:45:19 -04:00
( org-set-tags " " )
2018-03-17 09:55:28 -04:00
( buffer-string ) ) ) )
( should
( equal " * H "
( org-test-with-temp-text " * H :tag1:tag2: "
2018-04-20 04:45:19 -04:00
( org-set-tags " " )
2018-03-17 09:55:28 -04:00
( buffer-string ) ) ) )
;; If there's nothing to remove, just bail out.
( should
( equal " * H "
( org-test-with-temp-text " * H "
2018-04-20 04:45:19 -04:00
( org-set-tags nil )
2018-03-17 09:55:28 -04:00
( buffer-string ) ) ) )
( should
( equal " * "
( org-test-with-temp-text " * "
2018-04-20 04:45:19 -04:00
( org-set-tags nil )
2018-03-17 09:55:28 -04:00
( buffer-string ) ) ) )
;; If DATA is a tag string, set current tags to it, even if it means
;; replacing old tags.
( should
( equal " * H :tag0: "
( org-test-with-temp-text " * H :tag1:tag2: "
2018-04-20 04:45:19 -04:00
( let ( ( org-tags-column 1 ) ) ( org-set-tags " :tag0: " ) )
2018-03-17 09:55:28 -04:00
( buffer-string ) ) ) )
( should
( equal " * H :tag0: "
( org-test-with-temp-text " * H "
2018-04-20 04:45:19 -04:00
( let ( ( org-tags-column 1 ) ) ( org-set-tags " :tag0: " ) )
2018-03-17 09:55:28 -04:00
( buffer-string ) ) ) )
;; If DATA is a list, set tags to this list, even if it means
;; replacing old tags.
( should
( equal " * H :tag0: "
( org-test-with-temp-text " * H :tag1:tag2: "
2018-04-20 04:45:19 -04:00
( let ( ( org-tags-column 1 ) ) ( org-set-tags ' ( " tag0 " ) ) )
2018-03-17 09:55:28 -04:00
( buffer-string ) ) ) )
( should
( equal " * H :tag0: "
( org-test-with-temp-text " * H "
2018-04-20 04:45:19 -04:00
( let ( ( org-tags-column 1 ) ) ( org-set-tags ' ( " tag0 " ) ) )
2018-03-17 09:55:28 -04:00
( buffer-string ) ) ) )
2018-04-20 04:45:19 -04:00
;; When set, apply `org-tags-sort-function'.
( should
( equal " * H :a:b: "
( org-test-with-temp-text " * H "
( let ( ( org-tags-column 1 )
( org-tags-sort-function #' string< ) )
( org-set-tags ' ( " b " " a " ) )
( buffer-string ) ) ) ) )
;; When new tags are identical to the previous ones, still align.
( should
( equal " * H :foo: "
( org-test-with-temp-text " * H :foo: "
( let ( ( org-tags-column 1 ) )
( org-set-tags ' ( " foo " ) )
( buffer-string ) ) ) ) )
;; When tags have been changed, run `org-after-tags-change-hook'.
( should
( catch :return
( org-test-with-temp-text " * H :foo: "
( let ( ( org-after-tags-change-hook ( lambda ( ) ( throw :return t ) ) ) )
( org-set-tags ' ( " bar " ) )
nil ) ) ) )
( should-not
( catch :return
( org-test-with-temp-text " * H :foo: "
( let ( ( org-after-tags-change-hook ( lambda ( ) ( throw :return t ) ) ) )
( org-set-tags ' ( " foo " ) )
nil ) ) ) )
2018-03-17 09:55:28 -04:00
;; Special case: handle empty headlines.
( should
( equal " * :tag0: "
( org-test-with-temp-text " * "
2018-04-20 04:45:19 -04:00
( let ( ( org-tags-column 1 ) ) ( org-set-tags ' ( " tag0 " ) ) )
( buffer-string ) ) ) )
2018-06-19 03:40:00 -04:00
;; Modify buffer only when a tag change happens or alignment is
;; done.
( should-not
( org-test-with-temp-text " * H :foo: "
( set-buffer-modified-p nil )
( let ( ( org-tags-column 1 ) ) ( org-set-tags ' ( " foo " ) ) )
( buffer-modified-p ) ) )
( should
( org-test-with-temp-text " * H :foo: "
( set-buffer-modified-p nil )
( let ( ( org-tags-column 10 ) ) ( org-set-tags ' ( " foo " ) ) )
( buffer-modified-p ) ) )
( should
( org-test-with-temp-text " * H :foo: "
( set-buffer-modified-p nil )
( let ( ( org-tags-column 10 ) ) ( org-set-tags ' ( " bar " ) ) )
( buffer-modified-p ) ) )
2018-04-20 04:45:19 -04:00
;; Pathological case: when setting tags of a folded headline, do not
;; let new tags being sucked into invisibility.
( should-not
( org-test-with-temp-text " * H1 \n Content \n * H2 \n \n Other Content "
;; Show only headlines
( org-content )
;; Set NEXT tag on current entry
( org-set-tags " :NEXT: " )
;; Move point to that NEXT tag
( search-forward " NEXT " ) ( backward-word )
;; And it should be visible (i.e. no overlays)
( overlays-at ( point ) ) ) ) )
( ert-deftest test-org/set-tags-command ( )
" Test `org-set-tags-command' specifications "
;; Set tags at current headline.
( should
( equal " * H1 :foo: "
( org-test-with-temp-text " * H1 "
2021-07-09 01:26:07 -04:00
( cl-letf ( ( ( symbol-function 'completing-read-multiple )
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 17:21:37 -04:00
( lambda ( &rest _args ) ' ( " foo " ) ) ) )
2018-04-20 04:45:19 -04:00
( let ( ( org-use-fast-tag-selection nil )
( org-tags-column 1 ) )
( org-set-tags-command ) ) )
( buffer-string ) ) ) )
2018-04-28 17:42:31 -04:00
;; Preserve position when called from the section below.
2018-04-20 04:45:19 -04:00
( should
( equal " * H1 :foo: \n Contents "
( org-test-with-temp-text " * H1 \n <point>Contents "
2021-07-09 01:26:07 -04:00
( cl-letf ( ( ( symbol-function 'completing-read-multiple )
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 17:21:37 -04:00
( lambda ( &rest _args ) ' ( " foo " ) ) ) )
2018-04-20 04:45:19 -04:00
( let ( ( org-use-fast-tag-selection nil )
( org-tags-column 1 ) )
( org-set-tags-command ) ) )
( buffer-string ) ) ) )
2018-04-28 17:42:31 -04:00
( should-not
( equal " * H1 :foo: \n Contents2 "
( org-test-with-temp-text " * H1 \n <point>Contents2 "
2021-07-09 01:26:07 -04:00
( cl-letf ( ( ( symbol-function 'completing-read-multiple )
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 17:21:37 -04:00
( lambda ( &rest _args ) ' ( " foo " ) ) ) )
2018-04-28 17:42:31 -04:00
( let ( ( org-use-fast-tag-selection nil )
( org-tags-column 1 ) )
( org-set-tags-command ) ) )
( org-at-heading-p ) ) ) )
2018-04-20 04:45:19 -04:00
;; When a region is active and
;; `org-loop-over-headlines-in-active-region' is non-nil, insert the
;; same value in all headlines in region.
( should
( equal " * H1 :foo: \n Contents \n * H2 :foo: "
( org-test-with-temp-text " * H1 \n Contents \n * H2 "
2021-07-09 01:26:07 -04:00
( cl-letf ( ( ( symbol-function 'completing-read-multiple )
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 17:21:37 -04:00
( lambda ( &rest _args ) ' ( " foo " ) ) ) )
2018-04-20 04:45:19 -04:00
( let ( ( org-use-fast-tag-selection nil )
( org-loop-over-headlines-in-active-region t )
( org-tags-column 1 ) )
( transient-mark-mode 1 )
( push-mark ( point ) t t )
( goto-char ( point-max ) )
( org-set-tags-command ) ) )
( buffer-string ) ) ) )
( should
( equal " * H1 \n Contents \n * H2 :foo: "
( org-test-with-temp-text " * H1 \n Contents \n * H2 "
2021-07-09 01:26:07 -04:00
( cl-letf ( ( ( symbol-function 'completing-read-multiple )
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 17:21:37 -04:00
( lambda ( &rest _args ) ' ( " foo " ) ) ) )
2018-04-20 04:45:19 -04:00
( let ( ( org-use-fast-tag-selection nil )
( org-loop-over-headlines-in-active-region nil )
( org-tags-column 1 ) )
( transient-mark-mode 1 )
( push-mark ( point ) t t )
( goto-char ( point-max ) )
( org-set-tags-command ) ) )
( buffer-string ) ) ) )
2019-01-05 07:45:04 -05:00
;; With a C-u prefix argument, align all tags in the buffer.
2018-04-20 04:45:19 -04:00
( should
( equal " * H1 :foo: \n * H2 :bar: "
( org-test-with-temp-text " * H1 :foo: \n * H2 :bar: "
2019-01-05 07:45:04 -05:00
( let ( ( org-tags-column 1 ) ) ( org-set-tags-command ' ( 4 ) ) )
2020-05-07 20:06:08 -04:00
( buffer-string ) ) ) )
;; Point does not move with empty headline.
( should
( equal " :foo: "
( org-test-with-temp-text " * <point> "
2021-07-09 01:26:07 -04:00
( cl-letf ( ( ( symbol-function 'completing-read-multiple )
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 17:21:37 -04:00
( lambda ( &rest _args ) ' ( " foo " ) ) ) )
2020-05-07 20:06:08 -04:00
( let ( ( org-use-fast-tag-selection nil )
( org-tags-column 1 ) )
( org-set-tags-command ) ) )
( buffer-substring ( point ) ( line-end-position ) ) ) ) )
;; Point does not move at start of line.
( should
( equal " * H1 :foo: "
( org-test-with-temp-text " * H1 "
2021-07-09 01:26:07 -04:00
( cl-letf ( ( ( symbol-function 'completing-read-multiple )
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 17:21:37 -04:00
( lambda ( &rest _args ) ' ( " foo " ) ) ) )
2020-05-07 20:06:08 -04:00
( let ( ( org-use-fast-tag-selection nil )
( org-tags-column 1 ) )
( org-set-tags-command ) ) )
( buffer-substring ( point ) ( line-end-position ) ) ) ) )
;; Point does not move when within *'s.
( should
( equal " * H1 :foo: "
( org-test-with-temp-text " *<point>* H1 "
2021-07-09 01:26:07 -04:00
( cl-letf ( ( ( symbol-function 'completing-read-multiple )
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 17:21:37 -04:00
( lambda ( &rest _args ) ' ( " foo " ) ) ) )
2020-05-07 20:06:08 -04:00
( let ( ( org-use-fast-tag-selection nil )
( org-tags-column 1 ) )
( org-set-tags-command ) ) )
( buffer-substring ( point ) ( line-end-position ) ) ) ) )
;; Point workaround does not get fooled when looking at a space.
( should
( equal " b :foo: "
( org-test-with-temp-text " * a<point> b "
2021-07-09 01:26:07 -04:00
( cl-letf ( ( ( symbol-function 'completing-read-multiple )
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 17:21:37 -04:00
( lambda ( &rest _args ) ' ( " foo " ) ) ) )
2020-05-07 20:06:08 -04:00
( let ( ( org-use-fast-tag-selection nil )
( org-tags-column 1 ) )
( org-set-tags-command ) ) )
2020-08-18 18:34:38 -04:00
( buffer-substring ( point ) ( line-end-position ) ) ) ) )
;; Handle tags both set locally and inherited.
( should
( equal " b :foo: "
( org-test-with-temp-text " * a :foo: \n ** <point>b :foo: "
2021-07-09 01:26:07 -04:00
( cl-letf ( ( ( symbol-function 'completing-read-multiple )
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 17:21:37 -04:00
( lambda ( _prompt _coll &optional _pred _req initial &rest _ )
2021-07-09 01:26:07 -04:00
( list initial ) ) ) )
2020-08-18 18:34:38 -04:00
( let ( ( org-use-fast-tag-selection nil )
( org-tags-column 1 ) )
( org-set-tags-command ) ) )
2020-05-07 20:06:08 -04:00
( buffer-substring ( point ) ( line-end-position ) ) ) ) ) )
2018-03-17 09:55:28 -04:00
2018-04-27 20:04:06 -04:00
( ert-deftest test-org/toggle-tag ( )
" Test `org-toggle-tag' specifications. "
;; Insert missing tag.
( should
( equal " * H :tag: "
( org-test-with-temp-text " * H "
( let ( ( org-tags-column 1 ) ) ( org-toggle-tag " tag " ) )
( buffer-string ) ) ) )
( should
( equal " * H :tag1:tag2: "
( org-test-with-temp-text " * H :tag1: "
( let ( ( org-tags-column 1 ) ) ( org-toggle-tag " tag2 " ) )
( buffer-string ) ) ) )
;; Remove existing tag.
( should
( equal " * H "
( org-test-with-temp-text " * H :tag: "
( org-toggle-tag " tag " )
( buffer-string ) ) ) )
( should
( equal " * H :tag1: "
( org-test-with-temp-text " * H :tag1:tag2: "
( let ( ( org-tags-column 1 ) ) ( org-toggle-tag " tag2 " ) )
( buffer-string ) ) ) )
( should
( equal " * H :tag2: "
( org-test-with-temp-text " * H :tag1:tag2: "
( let ( ( org-tags-column 1 ) ) ( org-toggle-tag " tag1 " ) )
( buffer-string ) ) ) )
;; With optional argument ONOFF set to `on', try to insert the tag,
;; even if its already there.
( should
( equal " * H :tag: "
( org-test-with-temp-text " * H "
( let ( ( org-tags-column 1 ) ) ( org-toggle-tag " tag " 'on ) )
( buffer-string ) ) ) )
( should
( equal " * H :tag: "
( org-test-with-temp-text " * H :tag: "
( let ( ( org-tags-column 1 ) ) ( org-toggle-tag " tag " 'on ) )
( buffer-string ) ) ) )
;; With optional argument ONOFF set to `off', try to remove the tag,
;; even if its not there.
( should
( equal " * H "
( org-test-with-temp-text " * H :tag: "
( org-toggle-tag " tag " 'off )
( buffer-string ) ) ) )
( should
( equal " * H :tag: "
( org-test-with-temp-text " * H :tag: "
( let ( ( org-tags-column 1 ) ) ( org-toggle-tag " foo " 'off ) )
( buffer-string ) ) ) )
;; Special case: Handle properly tag inheritance. In particular, do
;; not set inherited tags.
( should
( equal " * H1 :tag: \n ** H2 :tag2:tag: "
( org-test-with-temp-text " * H1 :tag: \n ** <point>H2 :tag2: "
( let ( ( org-use-tag-inheritance t )
( org-tags-column 1 ) )
( org-toggle-tag " tag " ) )
( buffer-string ) ) ) )
( should
( equal " * H1 :tag1:tag2: \n ** H2 :foo: "
( org-test-with-temp-text " * H1 :tag1:tag2: \n ** <point>H2 "
( let ( ( org-use-tag-inheritance t )
( org-tags-column 1 ) )
( org-toggle-tag " foo " ) )
( buffer-string ) ) ) ) )
2018-11-08 12:20:57 -05:00
( ert-deftest test-org/tags-expand ( )
" Test `org-tags-expand' specifications. "
2019-11-12 08:44:05 -05:00
;; Expand tag groups as a regexp enclosed within curly brackets.
2018-11-08 12:20:57 -05:00
( should
( equal " { \\ <[ABC] \\ >} "
( org-test-with-temp-text " #+TAGS: [ A : B C ] "
( org-mode-restart )
( let ( ( org-tag-alist-for-agenda nil ) ) ( org-tags-expand " A " ) ) ) ) )
( should
( equal " { \\ < \\ (?:Aa \\ |Bb \\ |Cc \\ ) \\ >} "
( org-test-with-temp-text " #+TAGS: [ Aa : Bb Cc ] "
( org-mode-restart )
( let ( ( org-tag-alist-for-agenda nil ) ) ( org-tags-expand " Aa " ) ) ) ) )
;; Preserve operator before the regexp.
( should
( equal " +{ \\ <[ABC] \\ >} "
( org-test-with-temp-text " #+TAGS: [ A : B C ] "
( org-mode-restart )
( let ( ( org-tag-alist-for-agenda nil ) ) ( org-tags-expand " +A " ) ) ) ) )
( should
( equal " -{ \\ <[ABC] \\ >} "
( org-test-with-temp-text " #+TAGS: [ A : B C ] "
( org-mode-restart )
( let ( ( org-tag-alist-for-agenda nil ) ) ( org-tags-expand " -A " ) ) ) ) )
;; Handle "|" syntax.
( should
( equal " { \\ <[ABC] \\ >}|D "
( org-test-with-temp-text " #+TAGS: [ A : B C ] "
( org-mode-restart )
( let ( ( org-tag-alist-for-agenda nil ) ) ( org-tags-expand " A|D " ) ) ) ) )
;; Handle nested groups.
( should
( equal " { \\ <[A-D] \\ >} "
( org-test-with-temp-text " #+TAGS: [ A : B C ] \n #+TAGS: [ B : D ] "
( org-mode-restart )
( let ( ( org-tag-alist-for-agenda nil ) ) ( org-tags-expand " A " ) ) ) ) )
;; Expand multiple occurrences of the same group.
( should
( equal " { \\ <[ABC] \\ >}|{ \\ <[ABC] \\ >} "
( org-test-with-temp-text " #+TAGS: [ A : B C ] "
( org-mode-restart )
( let ( ( org-tag-alist-for-agenda nil ) ) ( org-tags-expand " A|A " ) ) ) ) )
;; Preserve regexp matches.
( should
( equal " {A+} "
( org-test-with-temp-text " #+TAGS: [ A : B C ] "
( org-mode-restart )
2021-04-27 03:41:26 -04:00
( let ( ( org-tag-alist-for-agenda nil ) ) ( org-tags-expand " {A+} " ) ) ) ) ) )
2018-04-20 04:45:19 -04:00
2017-02-02 18:36:05 -05:00
;;; TODO keywords
( ert-deftest test-org/auto-repeat-maybe ( )
" Test `org-auto-repeat-maybe' specifications. "
;; Do not auto repeat when there is no valid time stamp with
;; a repeater in the entry.
( should-not
( string-prefix-p
" * TODO H "
( let ( ( org-todo-keywords ' ( ( sequence " TODO " " DONE " ) ) ) )
( org-test-with-temp-text " * TODO H \n <2012-03-29 Thu> "
( org-todo " DONE " )
( buffer-string ) ) ) ) )
( should-not
( string-prefix-p
" * TODO H "
( let ( ( org-todo-keywords ' ( ( sequence " TODO " " DONE " ) ) ) )
( org-test-with-temp-text " * TODO H \n # <2012-03-29 Thu> "
( org-todo " DONE " )
( buffer-string ) ) ) ) )
;; When switching to DONE state, switch back to first TODO keyword
;; in sequence, or the same keyword if they have different types.
( should
( string-prefix-p
" * TODO H "
( let ( ( org-todo-keywords ' ( ( sequence " TODO " " DONE " ) ) ) )
( org-test-with-temp-text " * TODO H \n <2012-03-29 Thu +2y> "
( org-todo " DONE " )
( buffer-string ) ) ) ) )
( should
( string-prefix-p
" * KWD1 H "
( let ( ( org-todo-keywords ' ( ( sequence " KWD1 " " KWD2 " " DONE " ) ) ) )
( org-test-with-temp-text " * KWD2 H \n <2012-03-29 Thu +2y> "
( org-todo " DONE " )
( buffer-string ) ) ) ) )
( should
( string-prefix-p
" * KWD2 H "
( let ( ( org-todo-keywords ' ( ( type " KWD1 " " KWD2 " " DONE " ) ) ) )
( org-test-with-temp-text " * KWD2 H \n <2012-03-29 Thu +2y> "
( org-todo " DONE " )
( buffer-string ) ) ) ) )
;; If there was no TODO keyword in the first place, do not insert
;; any either.
( should
( string-prefix-p
" * H "
( let ( ( org-todo-keywords ' ( ( sequence " TODO " " DONE " ) ) ) )
( org-test-with-temp-text " * H \n <2012-03-29 Thu +2y> "
( org-todo " DONE " )
( buffer-string ) ) ) ) )
;; Revert to REPEAT_TO_STATE, if set.
( should
( string-prefix-p
" * KWD2 H "
( let ( ( org-todo-keywords ' ( ( sequence " KWD1 " " KWD2 " " DONE " ) ) ) )
( org-test-with-temp-text
" * KWD2 H
:PROPERTIES:
:REPEAT_TO_STATE: KWD2
:END:
<2012-03-29 Thu +2y> "
( org-todo " DONE " )
( buffer-string ) ) ) ) )
;; When switching to DONE state, update base date. If there are
;; multiple repeated time stamps, update them all.
( should
( string-match-p
" <2014-03-29 .* \\ +2y> "
( let ( ( org-todo-keywords ' ( ( sequence " TODO " " DONE " ) ) ) )
( org-test-with-temp-text " * TODO H \n <2012-03-29 Thu +2y> "
( org-todo " DONE " )
( buffer-string ) ) ) ) )
( should
( string-match-p
" <2015-03-04 .* \\ +1y> "
( let ( ( org-todo-keywords ' ( ( sequence " TODO " " DONE " ) ) ) )
( org-test-with-temp-text
" * TODO H \n <2012-03-29 Thu. +2y> \n <2014-03-04 Tue +1y> "
( org-todo " DONE " )
( buffer-string ) ) ) ) )
;; Throw an error if repeater unit is the hour and no time is
;; provided in the time-stamp.
( should-error
( let ( ( org-todo-keywords ' ( ( sequence " TODO " " DONE " ) ) ) )
( org-test-with-temp-text " * TODO H \n <2012-03-29 Thu +2h> "
( org-todo " DONE " )
( buffer-string ) ) ) )
2020-04-06 09:18:48 -04:00
;; Handle every repeater type using hours step.
( should
( string-match-p
" 2014-03-04 .* 02:00 "
( org-test-at-time " <2014-03-04 02:35> "
( org-test-with-temp-text " * TODO H \n <2014-03-03 18:00 +8h> "
( org-todo " DONE " )
( buffer-string ) ) ) ) )
( should
( string-match-p
" 2014-03-04 .* 10:00 "
( org-test-at-time " <2014-03-04 02:35> "
( org-test-with-temp-text " * TODO H \n <2014-03-03 18:00 ++8h> "
( org-todo " DONE " )
( buffer-string ) ) ) ) )
( should
( string-match-p
" 2014-03-04 .* 10:35 "
( org-test-at-time " <2014-03-04 02:35> "
( org-test-with-temp-text " * TODO H \n <2014-03-03 18:00 .+8h> "
( org-todo " DONE " )
( buffer-string ) ) ) ) )
2019-01-30 16:19:28 -05:00
;; Do not repeat inactive time stamps with a repeater.
( should-not
2018-11-10 12:46:20 -05:00
( string-match-p
" \\ [2014-03-29 .* \\ +2y \\ ] "
( let ( ( org-todo-keywords ' ( ( sequence " TODO " " DONE " ) ) ) )
( org-test-with-temp-text
" * TODO H \n [2012-03-29 Thu. +2y] "
( org-todo " DONE " )
( buffer-string ) ) ) ) )
2017-02-02 18:36:05 -05:00
;; Do not repeat commented time stamps.
( should-not
( string-prefix-p
" <2015-03-04 .* \\ +1y> "
( let ( ( org-todo-keywords ' ( ( sequence " TODO " " DONE " ) ) ) )
( org-test-with-temp-text
" * TODO H \n <2012-03-29 Thu +2y> \n # <2014-03-04 Tue +1y> "
( org-todo " DONE " )
( buffer-string ) ) ) ) )
( should-not
( string-prefix-p
" <2015-03-04 .* \\ +1y> "
( let ( ( org-todo-keywords ' ( ( sequence " TODO " " DONE " ) ) ) )
( org-test-with-temp-text
" * TODO H
<2012-03-29 Thu. +2y>
# +BEGIN_EXAMPLE
<2014-03-04 Tue +1y>
# +END_EXAMPLE "
( org-todo " DONE " )
( buffer-string ) ) ) ) )
;; When `org-log-repeat' is non-nil or there is a CLOCK in the
;; entry, record time of last repeat.
( should-not
( string-match-p
" :LAST_REPEAT: "
( let ( ( org-todo-keywords ' ( ( sequence " TODO " " DONE " ) ) )
( org-log-repeat nil ) )
( cl-letf ( ( ( symbol-function 'org-add-log-setup )
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 17:21:37 -04:00
( lambda ( &rest _args ) nil ) ) )
2017-02-02 18:36:05 -05:00
( org-test-with-temp-text " * TODO H \n <2012-03-29 Thu. +2y> "
( org-todo " DONE " )
( buffer-string ) ) ) ) ) )
( should
( string-match-p
" :LAST_REPEAT: "
( let ( ( org-todo-keywords ' ( ( sequence " TODO " " DONE " ) ) )
( org-log-repeat t ) )
( cl-letf ( ( ( symbol-function 'org-add-log-setup )
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 17:21:37 -04:00
( lambda ( &rest _args ) nil ) ) )
2017-02-02 18:36:05 -05:00
( org-test-with-temp-text " * TODO H \n <2012-03-29 Thu. +2y> "
( org-todo " DONE " )
( buffer-string ) ) ) ) ) )
( should
( string-match-p
" :LAST_REPEAT: "
( let ( ( org-todo-keywords ' ( ( sequence " TODO " " DONE " ) ) ) )
( cl-letf ( ( ( symbol-function 'org-add-log-setup )
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 17:21:37 -04:00
( lambda ( &rest _args ) nil ) ) )
2017-02-02 18:36:05 -05:00
( org-test-with-temp-text
2017-09-14 09:33:51 -04:00
" * TODO H \n <2012-03-29 Thu +2y> \n CLOCK: [2012-03-29 Thu 16:40] "
2017-02-02 18:36:05 -05:00
( org-todo " DONE " )
( buffer-string ) ) ) ) ) )
;; When a SCHEDULED entry has no repeater, remove it upon repeating
;; the entry as it is no longer relevant.
( should-not
( string-match-p
" ^SCHEDULED: "
( let ( ( org-todo-keywords ' ( ( sequence " TODO " " DONE " ) ) ) )
( org-test-with-temp-text
" * TODO H \n SCHEDULED: <2014-03-04 Tue> \n <2012-03-29 Thu +2y> "
( org-todo " DONE " )
2017-09-14 09:33:51 -04:00
( buffer-string ) ) ) ) )
;; Properly advance repeater even when a clock entry is specified
;; and `org-log-repeat' is nil.
( should
( string-match-p
" SCHEDULED: <2014-03-29 "
( let ( ( org-log-repeat nil )
( org-todo-keywords ' ( ( sequence " TODO " " DONE " ) ) ) )
( org-test-with-temp-text
" * TODO H
SCHEDULED: <2012-03-29 Thu +2y>
CLOCK: [ 2012-03-29 Thu 10:00 ] -- [ 2012-03-29 Thu 16:40 ] => 6:40 "
( org-todo " DONE " )
2021-07-10 09:43:44 -04:00
( buffer-string ) ) ) ) )
;; Make sure that logbook state change record does not get
;; duplicated when `org-log-repeat' `org-log-done' are non-nil.
( should
( string-match-p
( rx " * TODO Read book
2021-11-26 05:43:20 -05:00
SCHEDULED: <2021-06-16 " (1+ (not space)) " +1d>
2021-07-10 09:43:44 -04:00
:PROPERTIES:
:LAST_REPEAT: " (1+ nonl) "
:END:
- State \"DONE\" from \"TODO\" " (1+ nonl) buffer-end)
( let ( ( org-log-repeat 'time )
( org-todo-keywords ' ( ( sequence " TODO " " | " " DONE(d!) " ) ) )
( org-log-into-drawer nil ) )
( org-test-with-temp-text
" * TODO Read book
SCHEDULED: <2021-06-15 Tue +1d> "
( org-todo " DONE " )
( when ( memq 'org-add-log-note post-command-hook )
( org-add-log-note ) )
( buffer-string ) ) ) ) ) )
2021-07-11 01:38:07 -04:00
( ert-deftest test-org/org-log-done ( )
" Test `org-log-done' specifications. "
;; nil value.
( should
( string=
" * DONE task "
( let ( ( org-log-done nil )
( org-todo-keywords ' ( ( sequence " TODO " " DONE " ) ) ) )
( org-test-with-temp-text
" * TODO task "
( org-todo " DONE " )
( when ( memq 'org-add-log-note post-command-hook )
( org-add-log-note ) )
( buffer-string ) ) ) ) )
;; `time' value.
( should
( string=
( format
" * DONE task
CLOSED: %s "
( org-test-with-temp-text " "
( org-insert-time-stamp ( current-time ) t t )
( buffer-string ) ) )
( let ( ( org-log-done 'time )
( org-log-done-with-time t )
( org-todo-keywords ' ( ( sequence " TODO " " DONE " ) ) ) )
( org-test-with-temp-text
" * TODO task "
( org-todo " DONE " )
( when ( memq 'org-add-log-note post-command-hook )
( org-add-log-note ) )
( buffer-string ) ) ) ) )
( should
( string=
( format
" * DONE task
CLOSED: %s "
( org-test-with-temp-text " "
( org-insert-time-stamp ( current-time ) nil t )
( buffer-string ) ) )
( let ( ( org-log-done 'time )
( org-log-done-with-time nil )
( org-todo-keywords ' ( ( sequence " TODO " " DONE " ) ) ) )
( org-test-with-temp-text
" * TODO task "
( org-todo " DONE " )
( when ( memq 'org-add-log-note post-command-hook )
( org-add-log-note ) )
( buffer-string ) ) ) ) )
;; TODO: Test `note' value.
;; Test startup overrides.
( should
( string=
" #+STARTUP: nologdone
* DONE task "
( let ( ( org-log-done 'time )
( org-todo-keywords ' ( ( sequence " TODO " " DONE " ) ) ) )
( org-test-with-temp-text
" #+STARTUP: nologdone
<point>* TODO task "
( org-set-regexps-and-options )
( org-todo " DONE " )
( when ( memq 'org-add-log-note post-command-hook )
( org-add-log-note ) )
( buffer-string ) ) ) ) )
( should
( string=
( format
" #+STARTUP: logdone
* DONE task
CLOSED: %s "
( org-test-with-temp-text " "
( org-insert-time-stamp ( current-time ) t t )
( buffer-string ) ) )
( let ( ( org-log-done nil )
( org-log-done-with-time t )
( org-todo-keywords ' ( ( sequence " TODO " " DONE " ) ) ) )
( org-test-with-temp-text
" #+STARTUP: logdone
<point>* TODO task "
( org-set-regexps-and-options )
( org-todo " DONE " )
( when ( memq 'org-add-log-note post-command-hook )
( org-add-log-note ) )
( buffer-string ) ) ) ) )
;; Test local property overrides.
( should
( string=
" * DONE task
:PROPERTIES:
:LOGGING: nil
:END: "
( let ( ( org-log-done 'time )
( org-todo-keywords ' ( ( sequence " TODO " " DONE " ) ) ) )
( org-test-with-temp-text
" * TODO task
:PROPERTIES:
:LOGGING: nil
:END: "
( org-todo " DONE " )
( when ( memq 'org-add-log-note post-command-hook )
( org-add-log-note ) )
( buffer-string ) ) ) ) )
( should
( string=
( format
" * DONE task
CLOSED: %s
:PROPERTIES:
:LOGGING: logdone
:END: "
( org-test-with-temp-text " "
( org-insert-time-stamp ( current-time ) t t )
( buffer-string ) ) )
( let ( ( org-log-done nil )
( org-log-done-with-time t )
( org-todo-keywords ' ( ( sequence " TODO " " DONE " ) ) ) )
( org-test-with-temp-text
" * TODO task
:PROPERTIES:
:LOGGING: logdone
:END: "
( org-todo " DONE " )
( when ( memq 'org-add-log-note post-command-hook )
( org-add-log-note ) )
( buffer-string ) ) ) ) ) )
2017-02-02 18:36:05 -05:00
2022-06-26 00:27:20 -04:00
( ert-deftest test-org/org-todo-prefix ( )
" Test `org-todo' prefix arg behavior. "
;; FIXME: Add tests for all other allowed prefix arguments.
;; -1 prefix arg should cancel repeater and mark DONE.
( should
( string-match-p
" DONE H \\ (.* \n \\ )*<2012-03-29 Thu \\ +0y> "
( let ( ( org-todo-keywords ' ( ( sequence " TODO " " DONE " ) ) ) )
( org-test-with-temp-text " * TODO H \n <2012-03-29 Thu +2y> "
( org-todo -1 )
( buffer-string ) ) ) ) )
;; - prefix arg should cancel repeater and mark DONE.
( should
( string-match-p
" DONE H \\ (.* \n \\ )*<2012-03-29 Thu \\ +0y> "
( let ( ( org-todo-keywords ' ( ( sequence " TODO " " DONE " ) ) ) )
( org-test-with-temp-text " * TODO H \n <2012-03-29 Thu +2y> "
( org-todo '- )
( buffer-string ) ) ) ) ) )
2014-12-23 06:10:55 -05:00
;;; Timestamps API
2017-02-02 18:36:05 -05:00
( ert-deftest test-org/at-timestamp-p ( )
" Test `org-at-timestamp-p' specifications. "
( should
( org-test-with-temp-text " <2012-03-29 Thu> "
( org-at-timestamp-p ) ) )
( should-not
( org-test-with-temp-text " 2012-03-29 Thu "
( org-at-timestamp-p ) ) )
;; Test return values.
( should
( eq 'bracket
( org-test-with-temp-text " <2012-03-29 Thu> "
( org-at-timestamp-p ) ) ) )
( should
( eq 'year
( org-test-with-temp-text " <<point>2012-03-29 Thu> "
( org-at-timestamp-p ) ) ) )
( should
( eq 'month
( org-test-with-temp-text " <2012-<point>03-29 Thu> "
( org-at-timestamp-p ) ) ) )
( should
( eq 'day
( org-test-with-temp-text " <2012-03-<point>29 Thu> "
( org-at-timestamp-p ) ) ) )
( should
( eq 'day
( org-test-with-temp-text " <2012-03-29 T<point>hu> "
( org-at-timestamp-p ) ) ) )
( should
( wholenump
( org-test-with-temp-text " <2012-03-29 Thu +2<point>y> "
( org-at-timestamp-p ) ) ) )
( should
( eq 'bracket
( org-test-with-temp-text " <2012-03-29 Thu<point>> "
( org-at-timestamp-p ) ) ) )
( should
( eq 'after
( org-test-with-temp-text " <2012-03-29 Thu><point>» "
( org-at-timestamp-p ) ) ) )
2017-05-14 04:38:26 -04:00
;; Test `inactive' optional argument.
2017-02-02 18:36:05 -05:00
( should
( org-test-with-temp-text " [2012-03-29 Thu] "
2017-05-14 04:38:26 -04:00
( org-at-timestamp-p 'inactive ) ) )
2017-02-02 18:36:05 -05:00
( should-not
( org-test-with-temp-text " [2012-03-29 Thu] "
( org-at-timestamp-p ) ) )
2017-05-14 04:38:26 -04:00
;; When optional argument is `agenda', recognize time-stamps in
;; planning info line, property drawers and clocks.
2017-02-02 18:36:05 -05:00
( should
2017-05-14 04:38:26 -04:00
( org-test-with-temp-text " * H \n SCHEDULED: <point><2012-03-29 Thu> "
( org-at-timestamp-p 'agenda ) ) )
( should-not
2017-02-02 18:36:05 -05:00
( org-test-with-temp-text " * H \n SCHEDULED: <point><2012-03-29 Thu> "
( org-at-timestamp-p ) ) )
( should
2017-05-14 04:38:26 -04:00
( org-test-with-temp-text
" * H \n :PROPERTIES: \n :PROP: <point><2012-03-29 Thu> \n :END: "
( org-at-timestamp-p 'agenda ) ) )
( should-not
2017-02-02 18:36:05 -05:00
( org-test-with-temp-text
" * H \n :PROPERTIES: \n :PROP: <point><2012-03-29 Thu> \n :END: "
( org-at-timestamp-p ) ) )
( should
( org-test-with-temp-text " CLOCK: <point>[2012-03-29 Thu] "
2017-05-14 04:38:26 -04:00
( let ( ( org-agenda-include-inactive-timestamps t ) )
( org-at-timestamp-p 'agenda ) ) ) )
( should-not
( org-test-with-temp-text " CLOCK: <point>[2012-03-29 Thu] "
( let ( ( org-agenda-include-inactive-timestamps t ) )
( org-at-timestamp-p ) ) ) )
( should-not
( org-test-with-temp-text " CLOCK: <point>[2012-03-29 Thu] "
( let ( ( org-agenda-include-inactive-timestamps t ) )
( org-at-timestamp-p 'inactive ) ) ) )
;; When optional argument is `lax', match any part of the document
;; with Org timestamp syntax.
( should
( org-test-with-temp-text " # <2012-03-29 Thu><point> "
( org-at-timestamp-p 'lax ) ) )
( should-not
( org-test-with-temp-text " # <2012-03-29 Thu><point> "
( org-at-timestamp-p ) ) )
( should
( org-test-with-temp-text " : <2012-03-29 Thu><point> "
( org-at-timestamp-p 'lax ) ) )
( should-not
( org-test-with-temp-text " : <2012-03-29 Thu><point> "
( org-at-timestamp-p ) ) )
( should
( org-test-with-temp-text
" #+BEGIN_EXAMPLE \n <2012-03-29 Thu><point> \n #+END_EXAMPLE "
( org-at-timestamp-p 'lax ) ) )
( should-not
( org-test-with-temp-text
" #+BEGIN_EXAMPLE \n <2012-03-29 Thu><point> \n #+END_EXAMPLE "
( org-at-timestamp-p ) ) )
;; Optional argument `lax' also matches inactive timestamps.
( should
( org-test-with-temp-text " # [2012-03-29 Thu]<point> "
( org-at-timestamp-p 'lax ) ) ) )
2017-02-02 18:36:05 -05:00
2015-02-13 15:54:21 -05:00
( ert-deftest test-org/time-stamp ( )
" Test `org-time-stamp' specifications. "
;; Insert chosen time stamp at point.
( should
( string-match
" Te<2014-03-04 .*?>xt "
( org-test-with-temp-text " Te<point>xt "
2016-06-04 15:12:30 -04:00
( cl-letf ( ( ( symbol-function 'org-read-date )
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 17:21:37 -04:00
( lambda ( &rest _args )
2022-05-02 06:41:34 -04:00
( org-time-string-to-time " 2014-03-04 " ) ) ) )
2015-02-13 15:54:21 -05:00
( org-time-stamp nil )
( buffer-string ) ) ) ) )
;; With a prefix argument, also insert time.
( should
( string-match
" Te<2014-03-04 .*? 00:41>xt "
( org-test-with-temp-text " Te<point>xt "
2016-06-04 15:12:30 -04:00
( cl-letf ( ( ( symbol-function 'org-read-date )
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 17:21:37 -04:00
( lambda ( &rest _args )
2022-05-02 06:41:34 -04:00
( org-time-string-to-time " 2014-03-04 00:41 " ) ) ) )
2015-02-13 15:54:21 -05:00
( org-time-stamp ' ( 4 ) )
( buffer-string ) ) ) ) )
;; With two universal prefix arguments, insert an active timestamp
;; with the current time without prompting the user.
( should
( string-match
" Te<2014-03-04 .*? 00:41>xt "
( org-test-with-temp-text " Te<point>xt "
2019-02-12 17:44:23 -05:00
( org-test-at-time " 2014-03-04 00:41 "
2015-02-13 15:54:21 -05:00
( org-time-stamp ' ( 16 ) )
( buffer-string ) ) ) ) )
;; When optional argument is non-nil, insert an inactive timestamp.
( should
( string-match
" Te \\ [2014-03-04 .*? \\ ]xt "
( org-test-with-temp-text " Te<point>xt "
2016-06-04 15:12:30 -04:00
( cl-letf ( ( ( symbol-function 'org-read-date )
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 17:21:37 -04:00
( lambda ( &rest _args )
2022-05-02 06:41:34 -04:00
( org-time-string-to-time " 2014-03-04 " ) ) ) )
2015-02-13 15:54:21 -05:00
( org-time-stamp nil t )
( buffer-string ) ) ) ) )
;; When called from a timestamp, replace existing one.
( should
( string-match
" <2014-03-04 .*?> "
( org-test-with-temp-text " <2012-03-29<point> thu.> "
2016-06-04 15:12:30 -04:00
( cl-letf ( ( ( symbol-function 'org-read-date )
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 17:21:37 -04:00
( lambda ( &rest _args )
2022-05-02 06:41:34 -04:00
( org-time-string-to-time " 2014-03-04 " ) ) ) )
2015-02-13 15:54:21 -05:00
( org-time-stamp nil )
( buffer-string ) ) ) ) )
( should
( string-match
" <2014-03-04 .*?>--<2014-03-04 .*?> "
( org-test-with-temp-text " <2012-03-29<point> thu.>--<2014-03-04 tue.> "
2016-06-04 15:12:30 -04:00
( cl-letf ( ( ( symbol-function 'org-read-date )
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 17:21:37 -04:00
( lambda ( &rest _args )
2022-05-02 06:41:34 -04:00
( org-time-string-to-time " 2014-03-04 " ) ) ) )
2015-02-13 15:54:21 -05:00
( org-time-stamp nil )
( buffer-string ) ) ) ) )
;; When replacing a timestamp, preserve repeater, if any.
( should
( string-match
" <2014-03-04 .*? \\ +2y> "
( org-test-with-temp-text " <2012-03-29<point> thu. +2y> "
2016-06-04 15:12:30 -04:00
( cl-letf ( ( ( symbol-function 'org-read-date )
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 17:21:37 -04:00
( lambda ( &rest _args )
2022-05-02 06:41:34 -04:00
( org-time-string-to-time " 2014-03-04 " ) ) ) )
2015-02-13 15:54:21 -05:00
( org-time-stamp nil )
( buffer-string ) ) ) ) )
;; When called twice in a raw, build a date range.
( should
( string-match
" <2012-03-29 .*?>--<2014-03-04 .*?> "
( org-test-with-temp-text " <2012-03-29 thu.><point> "
2016-06-04 15:12:30 -04:00
( cl-letf ( ( ( symbol-function 'org-read-date )
testing: Make all files use `lexical-binding`
Mainly, add the corresponding cookie, but also add various `require`s
so that the compiler knows which vars should be trated as dynbound.
This does not fix all the warnings, but does try to eliminate
all those about "unused" variables. For the variables truly unused,
the patch usually adds an underscore to their name to silence the warning.
Some of the fixes affect files which already used `lexical-binding`.
Not sure why the test worked before: maybe because the tests were run
without compiling them first (which could cause some of the
missing `require`d packages to be autoloaded before we got to the
problematic code, thus hiding the problem)?
I found some suspicious code, for which I added FIXMEs.
There are also a few changes to the main files.
* lisp/org-protocol.el (org-protocol-check-filename-for-protocol):
Don't call `server-edit` if it's not yet defined. [ Needed to get
the tests to pass. ]
* lisp/ob-core.el (org-babel-temporary-directory)
(org-babel-temporary-stable-directory): Always define (and use nil
if we don't want to create a directory for it). Simplify the code based
on the fact that (defvar V E) only evaluates E if V is not yet `boundp`.
(org-babel-temp-file, org-babel-temp-stable-file)
(org-babel-remove-temporary-directory)
(org-babel-remove-temporary-stable-directory): Adjust accordingly.
* lisp/org.el (org-log-beginning): Add FIXME.
* testing/org-test.el: Require `org` and `org-id`.
(org-id-locations-file): Don't `defconst` it.
(org-test-at-id, org-test-in-example-file, org-test-at-marker)
(org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug
specs into `declare` (and simplify them).
(org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars.
(org--compile-when): Fix quoting of `exp`.
(org-test-load): Tweak regexps.
* testing/org-batch-test-init.el: Tweak regexp, remove dead code and
add a FIXME about it.
* testing/lisp/test-ox.el: Require `ox` instead of
erroring out if it's not already loaded. Also require `org-inlinetask`.
(org-test-with-parsed-data): Silence warnings when `info` is not used.
(test-org-export/bind-keyword): Add FIXME.
* testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`.
(test-org-publish/resolve-external-link): Expose lambdas to
the compiler. Remove unused var `ids`.
(test-org-publish/get-project-from-filename): Remove unused var `file`.
* testing/lisp/test-org.el: Require `org-macs`, `org`,
`org-inlinetask`, `org-refile`, and `org-agenda`.
(test-org/org-read-date): Declare `org-time-was-given` as dynbound.
(test-org/set-regexps-and-options): Add FIXME.
* testing/lisp/test-org-timer.el: Require `org-timer`.
* testing/lisp/test-org-table.el: Require `ox`.
* testing/lisp/test-org-protocol.el: Require `org-protocol` instead of
erroring out if it's not already loaded. Also require `capture`, and
add missing `provide` statement.
* testing/lisp/test-org-pcomplete.el: Require `org`.
* testing/lisp/test-org-list.el: Require `org-list` and `org`.
* testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`.
* testing/lisp/test-org-footnote.el: Require `org-footnote`.
* testing/lisp/test-org-element.el: Require `org-element` instead of
erroring out if it's not already loaded. Also require `org` and
`org-inlinetask`.
* testing/lisp/test-org-duration.el: Require `org-duration`.
* testing/lisp/test-org-datetree.el: Require `org-datetree`.
* testing/lisp/test-org-colview.el: Require `org-colview`,
`org-duration`, and `org-inlinetask`.
* testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`.
* testing/lisp/test-org-archive.el: Require `org-archive`.
* testing/lisp/test-org-agenda.el
(test-org-agenda/bulk-custom-arg-func): Add FIXME.
* testing/lisp/test-ol.el: Require `ol` and `org-id`.
(test-org-link/store-link): Declare `org-store-link-props` and add FIXME.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME.
* testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`,
and `org-table`.
(test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and
declare it as dynbound.
(test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME.
(test-ob/noweb-expansions-in-cache):
Declare `noweb-expansions-in-cache-var` as dynbound.
* testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`.
* testing/lisp/test-ob-shell.el:
* testing/lisp/test-ob-python.el: Require `ob-core`.
* testing/lisp/test-ob-lob.el: Require `ob-lob`.
(temporary-value-for-test): Declare as dynbound.
* testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of
erroring out if it's not already loaded.
* testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of
erroring out if it's not already loaded. Use `with-current-buffer`.
* testing/lisp/test-ob-julia.el: Require `ob-core`.
* testing/lisp/test-ob-java.el (org-babel-temporary-directory):
Remove dead code now that `org-babel-temporary-directory` is always bound.
* testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`.
(ob-exp/evaluate-all-executables-in-order):
Declare `*evaluation-collector*` as dynbound.
* testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit)
(ob-emacs-lisp/dynamic-lexical-execute):
Rename dynbound var to `ob-emacs--x` and declare it as such.
* testing/lisp/test-ob-R.el: Require `ob-core`.
(ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 17:21:37 -04:00
( lambda ( &rest _args )
2022-05-02 06:41:34 -04:00
( org-time-string-to-time " 2014-03-04 " ) ) ) )
2015-02-13 15:54:21 -05:00
( let ( ( last-command 'org-time-stamp )
( this-command 'org-time-stamp ) )
( org-time-stamp nil ) )
( buffer-string ) ) ) ) ) )
2014-12-23 06:10:55 -05:00
( ert-deftest test-org/timestamp-has-time-p ( )
" Test `org-timestamp-has-time-p' specifications. "
;; With time.
( should
( org-test-with-temp-text " <2012-03-29 Thu 16:40> "
( org-timestamp-has-time-p ( org-element-context ) ) ) )
;; Without time.
( should-not
( org-test-with-temp-text " <2012-03-29 Thu> "
( org-timestamp-has-time-p ( org-element-context ) ) ) ) )
2017-02-04 15:13:40 -05:00
( ert-deftest test-org/get-repeat ( )
" Test `org-get-repeat' specifications. "
( should
( org-test-with-temp-text " * H \n <2012-03-29 Thu 16:40 +2y> "
( org-get-repeat ) ) )
( should-not
( org-test-with-temp-text " * H \n <2012-03-29 Thu 16:40> "
( org-get-repeat ) ) )
;; Return proper repeat string.
( should
( equal " +2y "
( org-test-with-temp-text " * H \n <2014-03-04 Tue 16:40 +2y> "
( org-get-repeat ) ) ) )
;; Prevent false positive (commented or verbatim time stamps)
( should-not
( org-test-with-temp-text " * H \n # <2012-03-29 Thu 16:40> "
( org-get-repeat ) ) )
( should-not
( org-test-with-temp-text
" * H \n #+BEGIN_EXAMPLE \n <2012-03-29 Thu 16:40> \n #+END_EXAMPLE "
2017-02-04 15:45:35 -05:00
( org-get-repeat ) ) )
;; Return nil when called before first heading.
( should-not
( org-test-with-temp-text " <2012-03-29 Thu 16:40 +2y> "
( org-get-repeat ) ) )
;; When called with an optional argument, extract repeater from that
;; string instead.
( should ( equal " +2y " ( org-get-repeat " <2012-03-29 Thu 16:40 +2y> " ) ) )
( should-not ( org-get-repeat " <2012-03-29 Thu 16:40> " ) ) )
2017-02-04 15:13:40 -05:00
2014-12-23 06:10:55 -05:00
( ert-deftest test-org/timestamp-format ( )
" Test `org-timestamp-format' specifications. "
;; Regular test.
( should
( equal
" 2012-03-29 16:40 "
( org-test-with-temp-text " <2012-03-29 Thu 16:40> "
( org-timestamp-format ( org-element-context ) " %Y-%m-%d %R " ) ) ) )
;; Range end.
( should
( equal
" 2012-03-29 "
( org-test-with-temp-text " [2011-07-14 Thu]--[2012-03-29 Thu] "
( org-timestamp-format ( org-element-context ) " %Y-%m-%d " t ) ) ) ) )
( ert-deftest test-org/timestamp-split-range ( )
" Test `org-timestamp-split-range' specifications. "
;; Extract range start (active).
( should
( equal ' ( 2012 3 29 )
( org-test-with-temp-text " <2012-03-29 Thu>--<2012-03-30 Fri> "
( let ( ( ts ( org-timestamp-split-range ( org-element-context ) ) ) )
( mapcar ( lambda ( p ) ( org-element-property p ts ) )
' ( :year-end :month-end :day-end ) ) ) ) ) )
;; Extract range start (inactive)
( should
( equal ' ( 2012 3 29 )
( org-test-with-temp-text " [2012-03-29 Thu]--[2012-03-30 Fri] "
( let ( ( ts ( org-timestamp-split-range ( org-element-context ) ) ) )
( mapcar ( lambda ( p ) ( org-element-property p ts ) )
' ( :year-end :month-end :day-end ) ) ) ) ) )
;; Extract range end (active).
( should
( equal ' ( 2012 3 30 )
( org-test-with-temp-text " <2012-03-29 Thu>--<2012-03-30 Fri> "
( let ( ( ts ( org-timestamp-split-range
( org-element-context ) t ) ) )
( mapcar ( lambda ( p ) ( org-element-property p ts ) )
' ( :year-end :month-end :day-end ) ) ) ) ) )
;; Extract range end (inactive)
( should
( equal ' ( 2012 3 30 )
( org-test-with-temp-text " [2012-03-29 Thu]--[2012-03-30 Fri] "
( let ( ( ts ( org-timestamp-split-range
( org-element-context ) t ) ) )
( mapcar ( lambda ( p ) ( org-element-property p ts ) )
' ( :year-end :month-end :day-end ) ) ) ) ) )
;; Return the timestamp if not a range.
( should
( org-test-with-temp-text " [2012-03-29 Thu] "
( let* ( ( ts-orig ( org-element-context ) )
( ts-copy ( org-timestamp-split-range ts-orig ) ) )
( eq ts-orig ts-copy ) ) ) )
( should
( org-test-with-temp-text " <%%(org-float t 4 2)> "
( let* ( ( ts-orig ( org-element-context ) )
( ts-copy ( org-timestamp-split-range ts-orig ) ) )
2015-02-09 04:13:50 -05:00
( eq ts-orig ts-copy ) ) ) ) )
2014-12-23 06:10:55 -05:00
( ert-deftest test-org/timestamp-translate ( )
" Test `org-timestamp-translate' specifications. "
;; Translate whole date range.
( should
( equal " <29>--<30> "
( org-test-with-temp-text " <2012-03-29 Thu>--<2012-03-30 Fri> "
( let ( ( org-display-custom-times t )
( org-time-stamp-custom-formats ' ( " <%d> " . " <%d> " ) ) )
( org-timestamp-translate ( org-element-context ) ) ) ) ) )
;; Translate date range start.
( should
( equal " <29> "
( org-test-with-temp-text " <2012-03-29 Thu>--<2012-03-30 Fri> "
( let ( ( org-display-custom-times t )
( org-time-stamp-custom-formats ' ( " <%d> " . " <%d> " ) ) )
( org-timestamp-translate ( org-element-context ) 'start ) ) ) ) )
;; Translate date range end.
( should
( equal " <30> "
( org-test-with-temp-text " <2012-03-29 Thu>--<2012-03-30 Fri> "
( let ( ( org-display-custom-times t )
( org-time-stamp-custom-formats ' ( " <%d> " . " <%d> " ) ) )
( org-timestamp-translate ( org-element-context ) 'end ) ) ) ) )
;; Translate time range.
( should
( equal " <08>--<16> "
( org-test-with-temp-text " <2012-03-29 Thu 8:30-16:40> "
( let ( ( org-display-custom-times t )
( org-time-stamp-custom-formats ' ( " <%d> " . " <%H> " ) ) )
( org-timestamp-translate ( org-element-context ) ) ) ) ) )
;; Translate non-range timestamp.
( should
( equal " <29> "
( org-test-with-temp-text " <2012-03-29 Thu> "
( let ( ( org-display-custom-times t )
( org-time-stamp-custom-formats ' ( " <%d> " . " <%d> " ) ) )
( org-timestamp-translate ( org-element-context ) ) ) ) ) )
;; Do not change `diary' timestamps.
( should
( equal " <%%(org-float t 4 2)> "
( org-test-with-temp-text " <%%(org-float t 4 2)> "
( let ( ( org-display-custom-times t )
( org-time-stamp-custom-formats ' ( " <%d> " . " <%d> " ) ) )
( org-timestamp-translate ( org-element-context ) ) ) ) ) ) )
2018-01-10 08:35:32 -05:00
( ert-deftest test-org/timestamp-from-string ( )
" Test `org-timestamp-from-string' specifications. "
;; Return nil if argument is not a valid Org timestamp.
( should-not ( org-timestamp-from-string " " ) )
( should-not ( org-timestamp-from-string nil ) )
( should-not ( org-timestamp-from-string " <2012-03-29 " ) )
;; Otherwise, return a valid Org timestamp object.
( should
2019-08-20 08:21:21 -04:00
( string-match-p " <2012-03-29 .+> "
( org-element-interpret-data
( org-timestamp-from-string " <2012-03-29 Thu> " ) ) ) )
2018-01-10 08:35:32 -05:00
( should
2019-08-20 08:21:21 -04:00
( string-match-p " [2014-03-04 .+] "
( org-element-interpret-data
( org-timestamp-from-string " [2014-03-04 Tue] " ) ) ) ) )
2018-01-10 08:35:32 -05:00
( ert-deftest test-org/timestamp-from-time ( )
" Test `org-timestamp-from-time' specifications. "
;; Standard test.
( should
2019-08-20 08:21:21 -04:00
( string-match-p
" <2012-03-29 .+> "
( org-element-interpret-data
( org-timestamp-from-time
2022-05-02 06:41:34 -04:00
( org-time-string-to-time " <2012-03-29 Thu 16:40> " ) ) ) ) )
2018-01-10 08:35:32 -05:00
;; When optional argument WITH-TIME is non-nil, provide time
;; information.
( should
2019-08-20 08:21:21 -04:00
( string-match-p
" <2012-03-29 .+ 16:40> "
( org-element-interpret-data
( org-timestamp-from-time
2022-05-02 06:41:34 -04:00
( org-time-string-to-time " <2012-03-29 Thu 16:40> " )
2019-08-20 08:21:21 -04:00
t ) ) ) )
2018-01-10 08:35:32 -05:00
;; When optional argument INACTIVE is non-nil, return an inactive
;; timestamp.
( should
2019-08-20 08:21:21 -04:00
( string-match-p
" [2012-03-29 .+] "
( org-element-interpret-data
( org-timestamp-from-time
2022-05-02 06:41:34 -04:00
( org-time-string-to-time " <2012-03-29 Thu 16:40> " )
2019-08-20 08:21:21 -04:00
nil t ) ) ) ) )
2018-01-10 08:35:32 -05:00
2018-01-10 08:39:09 -05:00
( ert-deftest test-org/timestamp-to-time ( )
" Test `org-timestamp-to-time' specifications. "
( should
( equal " 2014-03-04 "
( format-time-string
" %Y-%m-%d "
( org-timestamp-to-time
( org-timestamp-from-string " <2014-03-04 Tue> " ) ) ) ) )
( should
( equal " 2014-03-04 "
( format-time-string
" %Y-%m-%d "
( org-timestamp-to-time
( org-timestamp-from-string " [2014-03-04 Tue] " ) ) ) ) )
( should
( equal " 2012-03-29 08:30 "
( format-time-string
" %Y-%m-%d %H:%M "
( org-timestamp-to-time
( org-timestamp-from-string " <2012-03-29 Thu 08:30-16:40> " ) ) ) ) )
( should
( equal " 2012-03-29 "
( format-time-string
" %Y-%m-%d "
( org-timestamp-to-time
( org-timestamp-from-string " <2012-03-29 Thu>--<2014-03-04 Tue> " ) ) ) ) )
( should
( equal " 2012-03-29 "
( format-time-string
" %Y-%m-%d "
( org-timestamp-to-time
( org-timestamp-from-string " [2012-03-29 Thu]--[2014-03-04 Tue] " ) ) ) ) )
;; When optional argument END is non-nil, use end of date range or
;; time range.
( should
( equal " 2012-03-29 16:40 "
( format-time-string
" %Y-%m-%d %H:%M "
( org-timestamp-to-time
( org-timestamp-from-string " <2012-03-29 Thu 08:30-16:40> " )
t ) ) ) )
( should
( equal " 2014-03-04 "
( format-time-string
" %Y-%m-%d "
( org-timestamp-to-time
( org-timestamp-from-string " <2012-03-29 Thu>--<2014-03-04 Tue> " )
t ) ) ) )
( should
( equal " 2014-03-04 "
( format-time-string
" %Y-%m-%d "
( org-timestamp-to-time
( org-timestamp-from-string " [2012-03-29 Thu]--[2014-03-04 Tue] " )
t ) ) ) ) )
2014-12-23 06:10:55 -05:00
2018-02-26 18:03:31 -05:00
;;; Yank and Kill
( ert-deftest test-org/paste-subtree ( )
" Test `org-paste-subtree' specifications. "
;; Return an error if text to yank is not a set of subtrees.
( should-error ( org-paste-subtree nil " Text " ) )
;; Adjust level according to current one.
( should
( equal " * H \n * Text \n "
( org-test-with-temp-text " * H \n <point> "
( org-paste-subtree nil " * Text " )
( buffer-string ) ) ) )
( should
( equal " * H1 \n ** H2 \n ** Text \n "
( org-test-with-temp-text " * H1 \n ** H2 \n <point> "
( org-paste-subtree nil " * Text " )
( buffer-string ) ) ) )
;; When not on a heading, move to next heading before yanking.
( should
( equal " * H1 \n Paragraph \n * Text \n * H2 "
( org-test-with-temp-text " * H1 \n <point>Paragraph \n * H2 "
( org-paste-subtree nil " * Text " )
( buffer-string ) ) ) )
;; If point is between two headings, use the deepest level.
( should
( equal " * H1 \n \n * Text \n * H2 "
( org-test-with-temp-text " * H1 \n <point> \n * H2 "
( org-paste-subtree nil " * Text " )
( buffer-string ) ) ) )
( should
( equal " ** H1 \n \n ** Text \n * H2 "
( org-test-with-temp-text " ** H1 \n <point> \n * H2 "
( org-paste-subtree nil " * Text " )
( buffer-string ) ) ) )
( should
( equal " * H1 \n \n ** Text \n ** H2 "
( org-test-with-temp-text " * H1 \n <point> \n ** H2 "
( org-paste-subtree nil " * Text " )
( buffer-string ) ) ) )
;; When on an empty heading, after the stars, deduce the new level
;; from the number of stars.
( should
( equal " *** Text \n "
( org-test-with-temp-text " *** <point> "
( org-paste-subtree nil " * Text " )
( buffer-string ) ) ) )
;; Optional argument LEVEL forces a level for the subtree.
( should
( equal " * H \n *** Text \n "
( org-test-with-temp-text " * H<point> "
( org-paste-subtree 3 " * Text " )
( buffer-string ) ) ) ) )
2012-10-10 07:19:25 -04:00
2018-10-04 17:49:00 -04:00
( ert-deftest test-org/cut-and-paste-subtree ( )
" Test `org-cut-subtree' and `org-paste-subtree' . "
( should
( equal
" * Two
two
* One
"
( org-test-with-temp-text
" * One
<point>* Two
two
"
( call-interactively #' org-cut-subtree )
( goto-char ( point-min ) )
( call-interactively #' org-paste-subtree )
( buffer-string ) ) ) )
( should
( equal
" * One
* Two
"
( org-test-with-temp-text
" * One
<point>* Two
"
( call-interactively #' org-cut-subtree )
( backward-char )
( call-interactively #' org-paste-subtree )
( buffer-string ) ) ) ) )
2022-08-27 12:51:24 -04:00
( ert-deftest test-org/org--open-file-format-command ( )
" Test `org--open-file-format-command' helper for `org-open-file' . "
( let ( ( system-type 'gnu/linux ) ) ; Fix behavior of `shell-quote-argument'.
;; No additional groups in `org-file-apps' key.
( let ( ( file " /file.pdf " )
( pattern " \\ .pdf \\ ' " ) )
( should
( equal " simple /file.pdf "
( and ( string-match pattern file )
( org--open-file-format-command
" simple %s " file file ( match-data ) ) ) ) )
( should
( equal " single-quotes /file.pdf "
( and ( string-match pattern file )
( org--open-file-format-command
" single-quotes '%s' " file file ( match-data ) ) ) ) )
( should
( equal " double-quotes /file.pdf "
( and ( string-match pattern file )
( org--open-file-format-command
" double-quotes \" %s \" " file file ( match-data ) ) ) ) )
( should
( equal " quotes 'mismatch \" /file.pdf' "
( and ( string-match pattern file )
( org--open-file-format-command
" quotes 'mismatch \" %s' " file file ( match-data ) ) ) ) )
( should
( equal " no subst "
( and ( string-match pattern file )
( org--open-file-format-command
" no subst " file file ( match-data ) ) ) ) )
( should
( equal " % literal percent 100% %s "
( and ( string-match pattern file )
( org--open-file-format-command
" \\ % literal percent 100 \\ % \\ %s " file file ( match-data ) ) ) ) )
( should
( equal " escape \" /file.pdf \" \\ more "
( and ( string-match pattern file )
( org--open-file-format-command
;; Second quote is not escaped.
" escape \\ \" %s \" \\ \\ more " file file ( match-data ) ) ) ) )
( should
( equal " /file.pdf file at start "
( and ( string-match pattern file )
( org--open-file-format-command
" %s file at start " file file ( match-data ) ) ) ) )
( should
( equal " backslash-newline \n /file.pdf "
( and ( string-match pattern file )
( org--open-file-format-command
" backslash-newline \\ \n %s " file file ( match-data ) ) ) ) ) )
;; Anchors within target file.
( let ( ( file " /page-search.pdf " )
( link " /page-search.pdf::10::some words " )
( pattern " \\ .pdf:: \\ ([0-9]+ \\ ):: \\ (.* \\ ) \\ ' " ) )
( should
( equal " zathura --page 10 --find some \\ words /page-search.pdf "
( and ( string-match pattern link )
( org--open-file-format-command
" zathura --page '%1' --find %2 \" %s \" " file link ( match-data ) ) ) ) )
;; Unused %2.
( should
( equal " firefox file:///page-search.pdf \\ #page=10 "
( and ( string-match pattern link )
( org--open-file-format-command
" firefox file://%s \\ \\ #page=%1 " file link ( match-data ) ) ) ) )
( should
( equal " adjucent-subst /page-search.pdfsome \\ words10some \\ words "
( and ( string-match pattern link )
( org--open-file-format-command
" adjucent-subst %s%2'%1'%2 " file link ( match-data ) ) ) ) ) )
;; No more than 9 substitutions are supported.
( let ( ( file " /many.pdf " )
( link " /many.pdf::one:2:3:4:5:6:7:8:9:a:b:c " )
( pattern ( concat " \\ .pdf: "
( mapconcat ( lambda ( _ ) " : \\ ([^:]+ \\ ) " )
( number-sequence 1 12 )
" " )
" \\ ' " ) ) )
( should
( equal " overflow /many.pdf::one:2:3:4:5:6:7:8:9:one0:one1:one2 "
( and ( string-match pattern link )
( org--open-file-format-command
" overflow %s::%1:%2:%3:%4:%5:%6:%7:%8:%9:%10:%11:%12 "
file link ( match-data ) ) ) ) ) )
;; Percent character in link fields does not cause any problem.
( let ( ( file " /file-%2.pdf " )
( link " /file-%2.pdf::anchor-%3::search %1 " )
( pattern " \\ .pdf:: \\ ([^:]+ \\ ):: \\ (.+ \\ ) \\ ' " ) )
( should
( equal " percents --find search \\ \\ %1 file:///file- \\ %2.pdf \\ #anchor- \\ %3 "
( and ( string-match pattern link )
( org--open-file-format-command
" percents --find %2 file://%s \\ \\ #%1 "
file link ( match-data ) ) ) ) ) )
;; Errors.
( let ( ( file " /error.pdf " )
( pattern " \\ .pdf \\ ' " ) )
( let* ( ( err ( should-error
( and ( string-match pattern file )
( org--open-file-format-command
" trailing-percent %s % " file file ( match-data ) ) )
:type 'error ) )
( err-text ( cadr err ) ) )
( should-not ( unless ( and ( stringp err-text )
( string-match-p " \\ ` Invalid format .*% " err-text ) )
err ) ) )
( let* ( ( err ( should-error
( and ( string-match pattern file )
( org--open-file-format-command
" trailing-backslash %s \\ " file file ( match-data ) ) )
:type 'error ) )
( err-text ( cadr err ) ) )
( should-not ( unless ( and ( stringp err-text )
( string-match-p " \\ ` Invalid format .* \\ \\ " err-text ) )
err ) ) )
( let* ( ( err ( should-error
( and ( string-match pattern file )
( org--open-file-format-command
" percent-newline % \n %s " file file ( match-data ) ) )
:type 'error ) )
( err-text ( cadr err ) ) )
( should-not ( unless ( and ( stringp err-text )
( string-match-p " \\ ` Invalid format .*% \n " err-text ) )
err ) ) )
;; Mailcap escape for "%" is "\%", not "%%".
( let* ( ( err ( should-error
( and ( string-match pattern file )
( org--open-file-format-command
" percent-percent %s%% " file file ( match-data ) ) )
:type 'error ) )
( err-text ( cadr err ) ) )
( should-not ( unless ( and ( stringp err-text )
( string-match-p " \\ ` Invalid format .*%% " err-text ) )
err ) ) )
;; Mailcap allows "%t" for MIME type, but Org has no such information.
( let* ( ( err ( should-error
( and ( string-match pattern file )
( org--open-file-format-command
" percent-t-unsupported --type '%t' %s " file file ( match-data ) ) )
:type 'error ) )
( err-text ( cadr err ) ) )
( should-not ( unless ( and ( stringp err-text )
( string-match-p " \\ ` Invalid format .*%t " err-text ) )
err ) ) ) )
;; Optional regular expression groups have no point in `org-file-apps' patterns.
( let* ( ( file " /error.pdf " )
( link " /error.pdf::1 " )
( pattern " \\ .pdf:: \\ ([^:]+ \\ ) \\ (?::: \\ (.+ \\ ) \\ )? \\ ' " )
( err ( should-error
( and ( string-match pattern link )
( org--open-file-format-command
" no-such-match --search %2 %s " file link ( match-data ) ) )
:type 'error ) )
( err-text ( cadr err ) ) )
( should-not ( unless ( and ( stringp err-text )
( string-match-p " \\ ` Invalid format.*%2 " err-text ) )
err ) ) ) ) )
2012-08-08 07:55:18 -04:00
( provide 'test-org )
2010-11-21 13:51:50 -05:00
;;; test-org.el ends here
