Merge branch 'master' of code.orgmode.org:bzg/org-mode

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:

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"

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.
 

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

testing/examples/agenda-file.org

@@ -3,3 +3,4 @@
 <2017-03-10 Fri>
 * test agenda
 SCHEDULED: <2017-07-19 Wed>
+** subnote

testing/lisp/test-ob-tangle.el

@@ -259,6 +259,35 @@ another block
 
 #+begin_src bar
 2
+#+end_src"
+			      file)
+		    (org-babel-tangle))
+		  (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))

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")