Changeset main,4 for main

Timestamp:

04/29/2020 02:41:49 AM (5 years ago)

Author:

David Owen <dsowen@…>

branch-nick:

org-autofocus

revision id:

dsowen@fugue88.ws-20200429024149-5kcbefgt36cjfb44

Message:

Disable marked items that have been passed over to other marked items

File:

• main/org-autofocus.el (modified) (2 diffs)

main/org-autofocus.el

@@ -30 +30 @@
   "Print the task OBJ in the current buffer at point."
   (with-slots (org marked passed) obj
-    (unless passed
-      (insert (if marked "*" " ") " " org "\n"))))
+    (when (or marked (not passed))
+      (insert (if marked "*" " ")
+              " "
+              (if passed
+                  (propertize org 'face 'org-agenda-dimmed-todo-face)
+                org)
+              "\n"))))
 
 
@@ -56 +61 @@
          (obj (ewoc-data node))
          changed)
-    (let ((marked (not (slot-value obj 'marked))))
-      (setf (slot-value obj 'marked) marked)
-      (push node changed)
-      (let ((node node))
-        (while (and (setq node (ewoc-prev org-af--ewoc node))
-                    (setq obj (ewoc-data node))
-                    (not (slot-value obj 'marked)))
-          (setf (slot-value obj 'passed) marked)
-          (push node changed))))
-    (apply 'ewoc-invalidate org-af--ewoc changed)
-    (ewoc-goto-node org-af--ewoc node)))
+    (unless (slot-value obj 'passed)
+      (let ((marked (not (slot-value obj 'marked))))
+        (setf (slot-value obj 'marked) marked)
+        (push node changed)
+        (let ((node node))
+          (while (and (setf node (ewoc-prev org-af--ewoc node))
+                      (setf obj (ewoc-data node))
+                      (not (slot-value obj 'marked)))
+            (setf (slot-value obj 'passed) marked)
+            (push node changed))
+          (when node
+            (setf (slot-value obj 'passed) marked)
+            (push node changed))))
+      (apply 'ewoc-invalidate org-af--ewoc changed)
+      (ewoc-goto-node org-af--ewoc node))))