diff options
| author | Bastien Guerry <bzg@altern.org> | 2012-01-04 16:36:46 +0100 |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2012-01-04 16:36:46 +0100 |
| commit | 5eb414281dae2445662009f7a5950a0f5981f17c (patch) | |
| tree | 31a8f8fe4c7f1fa7fe68c3f3a4148e4995dd8d12 | |
| parent | 346ee30e42e0cc038e0693bb32b70db18e7137ea (diff) | |
| download | org-mode-5eb414281dae2445662009f7a5950a0f5981f17c.tar.gz | |
Fix compiler warning and define an alias for `org-agenda-filter'.
* org-agenda.el: Add an alias for `org-agenda-filter'.
(diary-list-entries-hook): Use the non-obsolete hook.
(org-agenda-filter-apply): Silent compiler warning.
| -rw-r--r-- | lisp/org-agenda.el | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 70df5a1..ca003ef 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -247,7 +247,9 @@ you can \"misuse\" it to also add other text to the header. However, ;; Keep custom values for `org-agenda-filter-preset' compatible with ;; the new variable `org-agenda-tag-filter-preset'. -(defvaralias 'org-agenda-filter-preset 'org-agenda-tag-filter-preset) +(if (fboundp 'defvaralias) + (defvaralias 'org-agenda-filter-preset 'org-agenda-tag-filter-preset) + (defvaralias 'org-agenda-filter 'org-agenda-tag-filter)) (defconst org-agenda-custom-commands-local-options `(repeat :tag "Local settings for this command. Remember to quote values" @@ -1768,7 +1770,7 @@ works you probably want to add it to `org-agenda-custom-commands' for good." (setcdr ass (cdr entry)) (push entry org-agenda-custom-commands)))) -;;; Define the Org-agenda-mode +;;; Define the org-agenda-mode (defvar org-agenda-mode-map (make-sparse-keymap) "Keymap for `org-agenda-mode'.") @@ -4375,7 +4377,7 @@ of what a project is and how to check if it stuck, customize the variable ;;; Diary integration (defvar org-disable-agenda-to-diary nil) ;Dynamically-scoped param. -(defvar list-diary-entries-hook) +(defvar diary-list-entries-hook) (defvar diary-time-regexp) (defun org-get-entries-from-diary (date) "Get the (Emacs Calendar) diary entries for DATE." @@ -4384,8 +4386,8 @@ of what a project is and how to check if it stuck, customize the variable (diary-display-hook '(fancy-diary-display)) (diary-display-function 'fancy-diary-display) (pop-up-frames nil) - (list-diary-entries-hook - (cons 'org-diary-default-entry list-diary-entries-hook)) + (diary-list-entries-hook + (cons 'org-diary-default-entry diary-list-entries-hook)) (diary-file-name-prefix-function nil) ; turn this feature off (diary-modify-entry-list-string-function 'org-modify-diary-entry-string) entries @@ -6362,7 +6364,7 @@ If the line does not have an effort defined, return nil." (defvar org-agenda-filtered-by-category nil) (defun org-agenda-filter-apply (filter type) "Set FILTER as the new agenda filter and apply it." - (let (tags) + (let (tags cat) (if (eq type 'tag) (setq org-agenda-tag-filter filter) (setq org-agenda-category-filter filter |