summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien <bzg@gnu.org>2018-04-28 13:02:45 +0200
committerBastien <bzg@gnu.org>2018-04-28 13:02:45 +0200
commited50e13e919e8607481e54fed959835430e53100 (patch)
tree1294cf95e7d65efa5ad54bd6948adbfeaf28ccd5
parent4c14e0d1f2269a735e4bc93284ac2143a13c28a3 (diff)
downloadorg-mode-ed50e13e919e8607481e54fed959835430e53100.tar.gz
org-agenda.el: Only remove agenda restriction if it exists
* lisp/org-agenda.el (org-agenda-remove-restriction-lock): Only remove agenda restriction if it exists.
-rw-r--r--lisp/org-agenda.el24
1 files changed, 13 insertions, 11 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index e30201a..7dabcdf 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -7171,18 +7171,20 @@ subtree."
(org-agenda-maybe-redo))
(defun org-agenda-remove-restriction-lock (&optional noupdate)
- "Remove the agenda restriction lock."
+ "Remove agenda restriction lock."
(interactive "P")
- (delete-overlay org-agenda-restriction-lock-overlay)
- (delete-overlay org-speedbar-restriction-lock-overlay)
- (setq org-agenda-overriding-restriction nil)
- (setq org-agenda-restrict nil)
- (put 'org-agenda-files 'org-restrict nil)
- (move-marker org-agenda-restrict-begin nil)
- (move-marker org-agenda-restrict-end nil)
- (setq current-prefix-arg nil)
- (message "Agenda restriction lock removed")
- (or noupdate (org-agenda-maybe-redo)))
+ (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)
+ (setq org-agenda-restrict nil)
+ (put 'org-agenda-files 'org-restrict nil)
+ (move-marker org-agenda-restrict-begin nil)
+ (move-marker org-agenda-restrict-end nil)
+ (setq current-prefix-arg nil)
+ (message "Agenda restriction lock removed")
+ (or noupdate (org-agenda-maybe-redo))))
(defun org-agenda-maybe-redo ()
"If there is any window showing the agenda view, update it."