Fix: (org-ql-agenda--agenda) Don't overwrite org-agenda-mode-map

This commit is contained in:
Adam Porter 2019-08-08 09:03:10 -05:00
parent b7932063a0
commit d37f7c3eea
2 changed files with 4 additions and 2 deletions

View file

@ -321,6 +321,7 @@ Expands into a call to ~org-ql-select~ with the same arguments. For convenience
*Fixed* *Fixed*
+ Handle date ranges in date-based selectors. (Thanks to [[https://github.com/codygman][Cody Goodman]], [[https://github.com/swflint][Samuel W. Flint]], and [[https://github.com/vikasrawal][Vikas Rawal]].) + Handle date ranges in date-based selectors. (Thanks to [[https://github.com/codygman][Cody Goodman]], [[https://github.com/swflint][Samuel W. Flint]], and [[https://github.com/vikasrawal][Vikas Rawal]].)
+ Don't overwrite bindings in =org-agenda-mode-map=.
*Compatibility* *Compatibility*
+ Fixes for compatibility with Org 9.2. (Thanks to [[https://github.com/ataias][Ataias Pereira Reis]] and [[https://github.com/dakra][Daniel Kraus]].) + Fixes for compatibility with Org 9.2. (Thanks to [[https://github.com/ataias][Ataias Pereira Reis]] and [[https://github.com/dakra][Daniel Kraus]].)

View file

@ -222,8 +222,11 @@ SORT: One or a list of `org-ql' sorting functions, like `date' or
(string (org-ql-agenda--buffer buffer)) (string (org-ql-agenda--buffer buffer))
(null (org-ql-agenda--buffer buffer)) (null (org-ql-agenda--buffer buffer))
(buffer buffer))) (buffer buffer)))
(map (copy-keymap org-agenda-mode-map))
(inhibit-read-only t)) (inhibit-read-only t))
(define-key map "g" #'org-ql-search-refresh)
(with-current-buffer buffer (with-current-buffer buffer
(use-local-map map)
;; Prepare buffer, saving data for refreshing. ;; Prepare buffer, saving data for refreshing.
(setq-local org-ql-buffers-files buffers-files) (setq-local org-ql-buffers-files buffers-files)
(setq-local org-ql-query query) (setq-local org-ql-query query)
@ -231,8 +234,6 @@ SORT: One or a list of `org-ql' sorting functions, like `date' or
(setq-local org-ql-narrow narrow) (setq-local org-ql-narrow narrow)
(setq-local org-ql-super-groups super-groups) (setq-local org-ql-super-groups super-groups)
(setq-local header-line-format (org-ql-agenda--header-line-format buffers-files query)) (setq-local header-line-format (org-ql-agenda--header-line-format buffers-files query))
;; TODO: Derive a minor mode and set keymap there.
(local-set-key "g" #'org-ql-search-refresh)
;; Clear buffer, insert entries, etc. ;; Clear buffer, insert entries, etc.
(erase-buffer) (erase-buffer)
(insert entries) (insert entries)