From f4e46051fbb13adadbbafeebab343383e1bca35a Mon Sep 17 00:00:00 2001 From: Liu Hui Date: Sun, 9 Oct 2022 15:00:50 +0800 Subject: [PATCH] org-agenda: Make sure file restriction can be removed * lisp/org-agenda.el: (org-agenda): (org-agenda-set-restriction-lock): Set `org-agenda-restrict' non-nil during both temporary and extended file restriction. (org-agenda-remove-restriction-lock): Revert commit df0e96ba4. * testing/lisp/test-org-agenda.el (test-org-agenda/file-restriction): Add a test. --- lisp/org-agenda.el | 19 ++++++++----------- testing/lisp/test-org-agenda.el | 28 ++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 11 deletions(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 86ed6a5f5..a4f766cd9 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -2962,12 +2962,12 @@ Pressing `<' twice means to restrict to the current subtree or region (move-marker org-agenda-restrict-begin (point)) (move-marker org-agenda-restrict-end (progn (org-end-of-subtree t))))) - ((and (eq restriction 'buffer) - (or (< 1 (point-min)) - (< (point-max) (1+ (buffer-size))))) - (setq org-agenda-restrict (current-buffer)) - (move-marker org-agenda-restrict-begin (point-min)) - (move-marker org-agenda-restrict-end (point-max))))) + ((eq restriction 'buffer) + (if (not (buffer-narrowed-p)) + (setq org-agenda-restrict t) + (setq org-agenda-restrict (current-buffer)) + (move-marker org-agenda-restrict-begin (point-min)) + (move-marker org-agenda-restrict-end (point-max)))))) ;; For example the todo list should not need it (but does...) (cond @@ -7958,7 +7958,7 @@ subtree." (message "Locking agenda restriction to subtree")) (put 'org-agenda-files 'org-restrict (list (buffer-file-name (buffer-base-buffer)))) - (setq org-agenda-restrict nil) + (setq org-agenda-restrict t) (setq org-agenda-overriding-restriction 'file) (move-marker org-agenda-restrict-begin nil) (move-marker org-agenda-restrict-end nil) @@ -7969,14 +7969,11 @@ subtree." (defun org-agenda-remove-restriction-lock (&optional noupdate) "Remove agenda restriction lock." (interactive "P") - (if (not (or org-agenda-restrict org-agenda-overriding-restriction)) + (if (not org-agenda-restrict) (message "No agenda restriction to remove.") (delete-overlay org-agenda-restriction-lock-overlay) (delete-overlay org-speedbar-restriction-lock-overlay) (setq org-agenda-overriding-restriction nil) - (unless org-agenda-keep-restricted-file-list - ;; There is a request to keep the file list in place - (put 'org-agenda-files 'org-restrict nil)) (setq org-agenda-restrict nil) (put 'org-agenda-files 'org-restrict nil) (move-marker org-agenda-restrict-begin nil) diff --git a/testing/lisp/test-org-agenda.el b/testing/lisp/test-org-agenda.el index 256f701df..bd96163e9 100644 --- a/testing/lisp/test-org-agenda.el +++ b/testing/lisp/test-org-agenda.el @@ -255,6 +255,34 @@ See https://list.orgmode.org/06d301d83d9e$f8b44340$ea1cc9c0$@tomdavey.com" (get-text-property (point) 'day)))) (org-test-agenda--kill-all-agendas))) +(ert-deftest test-org-agenda/file-restriction () + "Test file restriction for org agenda." + (org-test-with-temp-text-in-file "* TODO Foo" + (org-agenda-set-restriction-lock t) + (org-agenda nil "t") + (should (search-forward "Foo")) + (should (org-agenda-files)) + (should-not (org-agenda-files t)) + (org-agenda-remove-restriction-lock) + (goto-char (point-min)) + (should-not (search-forward "Foo" nil t)) + (should-not (org-agenda-files))) + (org-test-with-temp-text-in-file "* TODO Bar" + (org-agenda nil "t" 'buffer) + (should (search-forward "Bar")) + (should (org-agenda-files)) + (should-not (org-agenda-files t)) + (org-agenda-remove-restriction-lock) + (goto-char (point-min)) + (should-not (search-forward "Bar" nil t)) + (should-not (org-agenda-files))) + (org-test-with-temp-text-in-file "* TODO Bar" + (org-agenda nil "t" 'buffer) + (org-agenda nil "t") + (should-not (search-forward "Bar" nil t)) + (should-not (org-agenda-files))) + (org-test-agenda--kill-all-agendas)) + ;; agenda redo -- 2.25.1