diff options
| author | Bastien Guerry <bzg@altern.org> | 2013-03-02 12:10:35 +0100 |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2013-03-02 12:10:35 +0100 |
| commit | e57ce7bd78173d74d4c8285771f665328db4c351 (patch) | |
| tree | 36a6fc5549362e7ac67a4092ae61b0ee2d74fab0 | |
| parent | 8ef19cdeeeeb981b6e84fb5fec0fa4649f7d4de3 (diff) | |
| parent | c8d5674562e2803f6324f066396df346f464a4c7 (diff) | |
| download | org-mode-e57ce7bd78173d74d4c8285771f665328db4c351.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/org-agenda.el | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 4e296db..414fd2b 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -7339,6 +7339,8 @@ If the line does not have an effort defined, return nil." (defun org-agenda-filter-apply (filter type) "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) (if (eq type 'tag) (setq org-agenda-tag-filter filter) @@ -7770,17 +7772,23 @@ so that the date SD will be in that range." (defun org-agenda-entry-text-mode (&optional arg) "Toggle entry text mode in an agenda buffer." (interactive "P") - (setq org-agenda-entry-text-mode (or (integerp arg) - (not org-agenda-entry-text-mode))) - (org-agenda-entry-text-hide) - (and org-agenda-entry-text-mode - (let ((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. Maximum number of lines is %d" - (if org-agenda-entry-text-mode "on" "off") - (if (integerp arg) arg org-agenda-entry-text-maxlines))) + (if (or org-agenda-tag-filter + org-agenda-category-filter + org-agenda-top-category-filter) + (user-error "Can't show entry text in filtered views") + (setq org-agenda-entry-text-mode (or (integerp arg) + (not org-agenda-entry-text-mode))) + (org-agenda-entry-text-hide) + (and org-agenda-entry-text-mode + (let ((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) "Toggle clocktable mode in an agenda buffer. |