[elpa] externals/org a9b2e262cd: Merge branch 'bugfix'

[ELPA Syncer]

branch: externals/org
commit a9b2e262cdee302486cfe65ce64720879af27b4b
Merge: 1f48d2d751 65f9524136
Author: Ihor Radchenko <yantar92@gmail.com>
Commit: Ihor Radchenko <yantar92@gmail.com>

    Merge branch 'bugfix'
---
 lisp/org-agenda.el               |  5 ++++-
 lisp/org.el                      | 20 +++++++++++---------
 lisp/ox-koma-letter.el           |  2 +-
 testing/examples/agenda-file.org | 10 ++++++++++
 testing/lisp/test-org-agenda.el  | 14 ++++++++++++++
 5 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 7bcaf7117c..607cf7d22c 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -89,6 +89,8 @@
 (declare-function org-capture "org-capture" (&optional goto keys))
 (declare-function org-clock-modify-effort-estimate "org-clock" (&optional 
value))
 
+(declare-function org-element-type "org-element" (&optional element))
+
 (defvar calendar-mode-map)
 (defvar org-clock-current-task)
 (defvar org-current-tag-alist)
@@ -5743,7 +5745,8 @@ displayed in agenda view."
                    (org-at-planning-p)
                    (org-before-first-heading-p)
                    (and org-agenda-include-inactive-timestamps
-                        (org-at-clock-log-p)))
+                        (org-at-clock-log-p))
+                    (not (eq 'timestamp (org-element-type 
(org-element-context)))))
            (throw :skip nil))
          (org-agenda-skip))
        (let* ((pos (match-beginning 0))
diff --git a/lisp/org.el b/lisp/org.el
index 913842bf3f..df8a5e6098 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -18951,17 +18951,19 @@ With prefix arg UNCOMPILED, load the uncompiled 
versions."
   "Is S an ID created by UUIDGEN?"
   (string-match 
"\\`[0-9a-f]\\{8\\}-[0-9a-f]\\{4\\}-[0-9a-f]\\{4\\}-[0-9a-f]\\{4\\}-[0-9a-f]\\{12\\}\\'"
 (downcase s)))
 
-(defun org-in-src-block-p (&optional inside)
+(defun org-in-src-block-p (&optional inside element)
   "Whether point is in a code source block.
 When INSIDE is non-nil, don't consider we are within a source
-block when point is at #+BEGIN_SRC or #+END_SRC."
-  (let ((case-fold-search t))
-    (or (and (eq (get-char-property (point) 'src-block) t))
-       (and (not inside)
-            (save-match-data
-              (save-excursion
-                (beginning-of-line)
-                (looking-at ".*#\\+\\(begin\\|end\\)_src")))))))
+block when point is at #+BEGIN_SRC or #+END_SRC.
+When ELEMENT is provided, it is considered to be element at point."
+  (save-match-data (setq element (or element (org-element-at-point))))
+  (when (eq 'src-block (org-element-type element))
+    (or (not inside)
+        (not (or (= (line-beginning-position)
+                  (org-element-property :post-affiliated element))
+               (= (1+ (line-end-position))
+                  (- (org-element-property :end element)
+                     (org-element-property :post-blank element))))))))
 
 (defun org-context ()
   "Return a list of contexts of the current cursor position.
diff --git a/lisp/ox-koma-letter.el b/lisp/ox-koma-letter.el
index b605156c8a..5f62cd1c04 100644
--- a/lisp/ox-koma-letter.el
+++ b/lisp/ox-koma-letter.el
@@ -1,6 +1,6 @@
 ;;; ox-koma-letter.el --- KOMA Scrlttr2 Back-End for Org Export Engine  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2007-2022  Free Software Foundation, Inc.
+;; Copyright (C) 2007-2022 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Goaziou <n.goaziou AT gmail DOT com>
 ;;         Alan Schmitt <alan.schmitt AT polytechnique DOT org>
diff --git a/testing/examples/agenda-file.org b/testing/examples/agenda-file.org
index b3b8725748..5c42cc5794 100644
--- a/testing/examples/agenda-file.org
+++ b/testing/examples/agenda-file.org
@@ -6,3 +6,13 @@ SCHEDULED: <2017-07-19 Wed>
 ** subnote
 * test code 216bc1ff1d862e78183e38ee9a4da504919b9878
 <2019-01-08 Tue>
+* test agenda non-scheduled
+#+begin_src org
+SCHEDULED: <2022-01-03 Mon>
+#+end_src
+* colon scheduled entry
+: SCHEDULED: <2022-01-03 Mon>
+* begin_example scheduled entry
+#+begin_example
+SCHEDULED: <2022-01-03 Mon>
+#+end_example
diff --git a/testing/lisp/test-org-agenda.el b/testing/lisp/test-org-agenda.el
index 57cc18b430..f4cf5788b1 100644
--- a/testing/lisp/test-org-agenda.el
+++ b/testing/lisp/test-org-agenda.el
@@ -92,6 +92,20 @@
            (looking-at " *agenda-file:Scheduled: *test agenda"))))
   (org-test-agenda--kill-all-agendas))
 
+(ert-deftest test-org-agenda/non-scheduled-re-matces ()
+  "Make sure that scheduled-looking elements do not appear in agenda.
+See https://list.orgmode.org/20220101200103.GB29829@itccanarias.org/T/#t.";
+  (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 "<2022-01-03 Mon>")
+    (set-buffer org-agenda-buffer-name)
+    (should (= 2 (count-lines (point-min) (point-max)))))
+  (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")