diff options
author | Bastien <bzg@gnu.org> | 2018-10-14 12:13:20 +0200 |
---|---|---|
committer | Bastien <bzg@gnu.org> | 2018-10-14 12:13:20 +0200 |
commit | 83f97cbd875ec335f2f97ec89b9dd63080f08df0 (patch) | |
tree | 5c7651972d126914c936b0c3a5f03daf4a315bc2 | |
parent | 0aa25891858067e6f23478087389055fb8d878bc (diff) | |
parent | f12f9b4f28109c30364c0b379db5d8bbe5850a2d (diff) | |
download | org-mode-83f97cbd875ec335f2f97ec89b9dd63080f08df0.tar.gz |
Merge branch 'master' of code.orgmode.org:bzg/org-mode
-rw-r--r-- | doc/org-manual.org | 2 | ||||
-rw-r--r-- | lisp/org-agenda.el | 2 | ||||
-rw-r--r-- | lisp/org-clock.el | 2 | ||||
-rw-r--r-- | lisp/org.el | 4 | ||||
-rw-r--r-- | testing/examples/agenda-file.org | 1 | ||||
-rw-r--r-- | testing/lisp/test-ob-tangle.el | 29 | ||||
-rw-r--r-- | testing/lisp/test-org-agenda.el | 17 |
7 files changed, 53 insertions, 4 deletions
diff --git a/doc/org-manual.org b/doc/org-manual.org index 3500562..7945b73 100644 --- a/doc/org-manual.org +++ b/doc/org-manual.org @@ -20030,7 +20030,7 @@ number. Here are tips to speed up: #+vindex: org-agenda-inhibit-startup #+begin_src emacs-lisp - (setq org-agenda-inhibit-startup nil) + (setq org-agenda-inhibit-startup t) #+end_src - Disable tag inheritance for agendas: diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 5c34b8c..180a061 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -1227,7 +1227,7 @@ These days get the special face `org-agenda-date-weekend' in the agenda." "Non-nil means jump to today when moving a past date forward in time. When using S-right in the agenda to move a a date forward, and the date stamp currently points to the past, the first key press will move it -to today. WHen nil, just move one day forward even if the date stays +to today. When nil, just move one day forward even if the date stays in the past." :group 'org-agenda-daily/weekly :version "24.1" diff --git a/lisp/org-clock.el b/lisp/org-clock.el index ca05dfd..420fdad 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -2121,7 +2121,7 @@ time. The return value is a list containing two internal times, one for the beginning of the range and one for its end, like the ones -returned by `current time' or `encode-time' and a string used to +returned by `current-time' or `encode-time' and a string used to display information. If AS-STRINGS is non-nil, the returned times will be formatted strings. diff --git a/lisp/org.el b/lisp/org.el index 2b7d16c..c0eaecd 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -5808,7 +5808,9 @@ This should be called after the variable `org-link-parameters' has changed." (match-beginning 2) (match-end 2) 'face face) (when verbatim? (org-remove-flyspell-overlays-in - (match-beginning 0) (match-end 0))) + (match-beginning 0) (match-end 0)) + (remove-text-properties (match-beginning 2) (match-end 2) + '(display t invisible t intangible t))) (add-text-properties (match-beginning 2) (match-end 2) '(font-lock-multiline t org-emphasis t)) (when org-hide-emphasis-markers diff --git a/testing/examples/agenda-file.org b/testing/examples/agenda-file.org index 6579b1c..1c72649 100644 --- a/testing/examples/agenda-file.org +++ b/testing/examples/agenda-file.org @@ -3,3 +3,4 @@ <2017-03-10 Fri> * test agenda SCHEDULED: <2017-07-19 Wed> +** subnote diff --git a/testing/lisp/test-ob-tangle.el b/testing/lisp/test-ob-tangle.el index 1dfd1a9..2eb2c96 100644 --- a/testing/lisp/test-ob-tangle.el +++ b/testing/lisp/test-ob-tangle.el @@ -265,6 +265,35 @@ another block (with-temp-buffer (insert-file-contents file) (org-split-string (buffer-string)))) + (delete-file file))))) + ;; Preserve order with mixed languages. + (should + (equal '("1" "3" "2" "4") + (let ((file (make-temp-file "org-tangle-"))) + (unwind-protect + (progn + (org-test-with-temp-text-in-file + (format "#+property: header-args :tangle %S +#+begin_src foo +1 +#+end_src + +#+begin_src bar +2 +#+end_src + +#+begin_src foo +3 +#+end_src + +#+begin_src bar +4 +#+end_src" + file) + (org-babel-tangle)) + (with-temp-buffer + (insert-file-contents file) + (org-split-string (buffer-string)))) (delete-file file)))))) (provide 'test-ob-tangle) diff --git a/testing/lisp/test-org-agenda.el b/testing/lisp/test-org-agenda.el index 6aaa88f..b28e122 100644 --- a/testing/lisp/test-org-agenda.el +++ b/testing/lisp/test-org-agenda.el @@ -85,6 +85,23 @@ (looking-at " *agenda-file:Scheduled: *test agenda")))) (org-test-agenda--kill-all-agendas)) +(ert-deftest test-org-agenda/set-priority () + "One informative line in the agenda. Check that org-agenda-priority updates the agenda." + (cl-assert (not org-agenda-sticky) nil "precondition violation") + (cl-assert (not (org-test-agenda--agenda-buffers)) + nil "precondition violation") + (let ((org-agenda-span 'day) + (org-agenda-files `(,(expand-file-name "examples/agenda-file.org" + org-test-dir)))) + (org-agenda-list nil "<2017-07-19 Wed>") + (set-buffer org-agenda-buffer-name) + + (should + (progn (goto-line 3) + (org-agenda-priority ?B) + (looking-at-p " *agenda-file:Scheduled: *\\[#B\\] test agenda")))) + (org-test-agenda--kill-all-agendas)) + (ert-deftest test-org-agenda/sticky-agenda-name () "Agenda buffer name after having created one sticky agenda buffer." (cl-assert (not org-agenda-sticky) nil "precondition violation") |