forked from mirrors/org-mode
org-agenda.el (org-agenda-filter-apply): Deactive `org-agenda-entry-text-mode' when filtering
* org-agenda.el (org-agenda-filter-apply): Deactive `org-agenda-entry-text-mode' when filtering. (org-agenda-entry-text-mode): Don't allow in filtered views. Don't show the maximum number of lines when turning off. Thanks to Sébastien Vauban for pointing a related issue.
This commit is contained in:
parent
7afbf870f2
commit
c8d5674562
|
@ -6987,6 +6987,8 @@ If the line does not have an effort defined, return nil."
|
||||||
|
|
||||||
(defun org-agenda-filter-apply (filter type)
|
(defun org-agenda-filter-apply (filter type)
|
||||||
"Set FILTER as the new agenda filter and apply it."
|
"Set FILTER as the new agenda filter and apply it."
|
||||||
|
;; Deactivate `org-agenda-entry-text-mode' when filtering
|
||||||
|
(if org-agenda-entry-text-mode (org-agenda-entry-text-mode))
|
||||||
(let (tags cat)
|
(let (tags cat)
|
||||||
(if (eq type 'tag)
|
(if (eq type 'tag)
|
||||||
(setq org-agenda-tag-filter filter)
|
(setq org-agenda-tag-filter filter)
|
||||||
|
@ -7418,17 +7420,23 @@ so that the date SD will be in that range."
|
||||||
(defun org-agenda-entry-text-mode (&optional arg)
|
(defun org-agenda-entry-text-mode (&optional arg)
|
||||||
"Toggle entry text mode in an agenda buffer."
|
"Toggle entry text mode in an agenda buffer."
|
||||||
(interactive "P")
|
(interactive "P")
|
||||||
(setq org-agenda-entry-text-mode (or (integerp arg)
|
(if (or org-agenda-tag-filter
|
||||||
(not org-agenda-entry-text-mode)))
|
org-agenda-category-filter
|
||||||
(org-agenda-entry-text-hide)
|
org-agenda-top-category-filter)
|
||||||
(and org-agenda-entry-text-mode
|
(user-error "Can't show entry text in filtered views")
|
||||||
(let ((org-agenda-entry-text-maxlines
|
(setq org-agenda-entry-text-mode (or (integerp arg)
|
||||||
(if (integerp arg) arg org-agenda-entry-text-maxlines)))
|
(not org-agenda-entry-text-mode)))
|
||||||
(org-agenda-entry-text-show)))
|
(org-agenda-entry-text-hide)
|
||||||
(org-agenda-set-mode-name)
|
(and org-agenda-entry-text-mode
|
||||||
(message "Entry text mode is %s. Maximum number of lines is %d"
|
(let ((org-agenda-entry-text-maxlines
|
||||||
(if org-agenda-entry-text-mode "on" "off")
|
(if (integerp arg) arg org-agenda-entry-text-maxlines)))
|
||||||
(if (integerp arg) arg org-agenda-entry-text-maxlines)))
|
(org-agenda-entry-text-show)))
|
||||||
|
(org-agenda-set-mode-name)
|
||||||
|
(message "Entry text mode is %s%s"
|
||||||
|
(if org-agenda-entry-text-mode "on" "off")
|
||||||
|
(if (not org-agenda-entry-text-mode) ""
|
||||||
|
(format " (maximum number of lines is %d)"
|
||||||
|
(if (integerp arg) arg org-agenda-entry-text-maxlines))))))
|
||||||
|
|
||||||
(defun org-agenda-clockreport-mode (&optional with-filter)
|
(defun org-agenda-clockreport-mode (&optional with-filter)
|
||||||
"Toggle clocktable mode in an agenda buffer.
|
"Toggle clocktable mode in an agenda buffer.
|
||||||
|
|
Loading…
Reference in New Issue