Fix/Revert: Don't derive a new mode; check a variable in refresh

Using a different major mode in org-ql-view buffers causes some Org Agenda
remote commands to not work, because they test whether the major mode
is org-agenda-mode.  Even though these remote commands are not
guaranteed to work, it was not intended to break them now, so this
restores compatibility with them.

Fixes #102.  Thanks to Alois Janíček (@aloisjanicek) for reporting.

This reverts commit ba7d4a2e82.

Released as 0.4.4.
This commit is contained in:
Adam Porter 2020-03-15 14:58:06 -05:00
parent ba7d4a2e82
commit 4fef5b089f
4 changed files with 80 additions and 62 deletions

View file

@ -398,6 +398,11 @@ Expands into a call to ~org-ql-select~ with the same arguments. For convenience
/Note:/ Breaking changes may be made before version 1.0, but in the event of major changes, attempts at backward compatibility will be made with obsolescence declarations, translation of arguments, etc. Users who need stability guarantees before 1.0 may choose to use tagged stable releases. /Note:/ Breaking changes may be made before version 1.0, but in the event of major changes, attempts at backward compatibility will be made with obsolescence declarations, translation of arguments, etc. Users who need stability guarantees before 1.0 may choose to use tagged stable releases.
** 0.4.4
*Fixed*
+ Compatibility with Org Agenda remote editing commands (some of which were broken by 0.4.3). (Fixes [[https://github.com/alphapapa/org-ql/issues/102][#102]]. Thanks to [[https://github.com/AloisJanicek][Alois Janíček]] for reporting.)
** 0.4.3 ** 0.4.3
*Fixed* *Fixed*

View file

@ -309,7 +309,7 @@ TYPE may be `ts', `ts-active', `ts-inactive', `clocked', or
If PROMPT is non-nil (interactively, with prefix), prompt to If PROMPT is non-nil (interactively, with prefix), prompt to
update search arguments." update search arguments."
(interactive "P") (interactive "P")
(unless (eq major-mode 'org-ql-view-mode) (unless org-ql-view-buffers-files
(user-error "Not an Org QL View buffer")) (user-error "Not an Org QL View buffer"))
(let* ((current-line (buffer-substring-no-properties (line-beginning-position) (line-end-position))) (let* ((current-line (buffer-substring-no-properties (line-beginning-position) (line-end-position)))
(old-pos (point)) (old-pos (point))
@ -356,10 +356,6 @@ update search arguments."
;;;; Functions ;;;; Functions
(define-derived-mode org-ql-view-mode org-agenda-mode "Org QL View"
"Major mode for `org-ql-view' buffers."
(setf buffer-read-only t))
(defun org-ql-view--list-buffer () (defun org-ql-view--list-buffer ()
"Return view list buffer." "Return view list buffer."
(with-current-buffer (get-buffer-create "*Org QL View List*") (with-current-buffer (get-buffer-create "*Org QL View List*")
@ -474,8 +470,9 @@ with human-readable strings."
If NAME is non-nil, return buffer by that name instead of using If NAME is non-nil, return buffer by that name instead of using
default buffer." default buffer."
(with-current-buffer (get-buffer-create (or name (concat org-ql-view-buffer-name-prefix "*"))) (with-current-buffer (get-buffer-create (or name (concat org-ql-view-buffer-name-prefix "*")))
(unless (eq major-mode 'org-ql-view-mode) (unless (eq major-mode 'org-agenda-mode)
(org-ql-view-mode)) (org-agenda-mode)
(setf buffer-read-only t))
(current-buffer))) (current-buffer)))
(defun org-ql-view--format-relative-date (difference) (defun org-ql-view--format-relative-date (difference)

View file

@ -2,7 +2,7 @@
;; Author: Adam Porter <adam@alphapapa.net> ;; Author: Adam Porter <adam@alphapapa.net>
;; Url: https://github.com/alphapapa/org-ql ;; Url: https://github.com/alphapapa/org-ql
;; Version: 0.4.3 ;; Version: 0.4.4
;; Package-Requires: ((emacs "26.1") (dash "2.13") (dash-functional "1.2.0") (f "0.17.2") (org "9.0") (org-super-agenda "1.2-pre") (ov "1.0.6") (peg "0.6") (s "1.12.0") (ts "0.2-pre")) ;; Package-Requires: ((emacs "26.1") (dash "2.13") (dash-functional "1.2.0") (f "0.17.2") (org "9.0") (org-super-agenda "1.2-pre") (ov "1.0.6") (peg "0.6") (s "1.12.0") (ts "0.2-pre"))
;; Keywords: hypermedia, outlines, Org, agenda ;; Keywords: hypermedia, outlines, Org, agenda

View file

@ -63,6 +63,7 @@ Functions / Macros
Changelog Changelog
* 0.4.4: 044.
* 0.4.3: 043. * 0.4.3: 043.
* 0.4.2: 042. * 0.4.2: 042.
* 0.4.1: 041. * 0.4.1: 041.
@ -96,7 +97,9 @@ File: README.info, Node: Contents, Next: Screenshots, Prev: Top, Up: Top
1 Contents 1 Contents
********** **********
• • • • • • • •
• •
• • • • • •
 
File: README.info, Node: Screenshots, Next: Installation, Prev: Contents, Up: Top File: README.info, Node: Screenshots, Next: Installation, Prev: Contents, Up: Top
@ -148,8 +151,7 @@ File: README.info, Node: Usage, Next: Changelog, Prev: Installation, Up: Top
4 Usage 4 Usage
******* *******
• • • • • •
• • • • •
Feedback on these APIs is welcome. Eventually, after being tested Feedback on these APIs is welcome. Eventually, after being tested
and polished, they will be considered stable. and polished, they will be considered stable.
@ -704,6 +706,7 @@ releases.
* Menu: * Menu:
* 0.4.4: 044.
* 0.4.3: 043. * 0.4.3: 043.
* 0.4.2: 042. * 0.4.2: 042.
* 0.4.1: 041. * 0.4.1: 041.
@ -718,9 +721,21 @@ releases.
* 0.1: 01. * 0.1: 01.
 
File: README.info, Node: 043, Next: 042, Up: Changelog File: README.info, Node: 044, Next: 043, Up: Changelog
5.1 0.4.3 5.1 0.4.4
=========
*Fixed*
• Compatibility with Org Agenda remote editing commands (some of
which were broken by 0.4.3). (Fixes #102
(https://github.com/alphapapa/org-ql/issues/102). Thanks to Alois
Janíček (https://github.com/AloisJanicek) for reporting.)

File: README.info, Node: 043, Next: 042, Prev: 044, Up: Changelog
5.2 0.4.3
========= =========
*Fixed* *Fixed*
@ -730,7 +745,7 @@ File: README.info, Node: 043, Next: 042, Up: Changelog
 
File: README.info, Node: 042, Next: 041, Prev: 043, Up: Changelog File: README.info, Node: 042, Next: 041, Prev: 043, Up: Changelog
5.2 0.4.2 5.3 0.4.2
========= =========
*Fixed* *Fixed*
@ -739,7 +754,7 @@ File: README.info, Node: 042, Next: 041, Prev: 043, Up: Changelog
 
File: README.info, Node: 041, Next: 04, Prev: 042, Up: Changelog File: README.info, Node: 041, Next: 04, Prev: 042, Up: Changelog
5.3 0.4.1 5.4 0.4.1
========= =========
*Fixed* *Fixed*
@ -749,7 +764,7 @@ File: README.info, Node: 041, Next: 04, Prev: 042, Up: Changelog
 
File: README.info, Node: 04, Next: 032, Prev: 041, Up: Changelog File: README.info, Node: 04, Next: 032, Prev: 041, Up: Changelog
5.4 0.4 5.5 0.4
======= =======
_Note:_ The next release, 0.5, may include changes which will require _Note:_ The next release, 0.5, may include changes which will require
@ -830,7 +845,7 @@ as they will be pushed to the master branch when ready.
 
File: README.info, Node: 032, Next: 031, Prev: 04, Up: Changelog File: README.info, Node: 032, Next: 031, Prev: 04, Up: Changelog
5.5 0.3.2 5.6 0.3.2
========= =========
*Fixed* *Fixed*
@ -843,7 +858,7 @@ File: README.info, Node: 032, Next: 031, Prev: 04, Up: Changelog
 
File: README.info, Node: 031, Next: 03, Prev: 032, Up: Changelog File: README.info, Node: 031, Next: 03, Prev: 032, Up: Changelog
5.6 0.3.1 5.7 0.3.1
========= =========
*Fixed* *Fixed*
@ -853,7 +868,7 @@ File: README.info, Node: 031, Next: 03, Prev: 032, Up: Changelog
 
File: README.info, Node: 03, Next: 023, Prev: 031, Up: Changelog File: README.info, Node: 03, Next: 023, Prev: 031, Up: Changelog
5.7 0.3 5.8 0.3
======= =======
*Added* *Added*
@ -918,7 +933,7 @@ File: README.info, Node: 03, Next: 023, Prev: 031, Up: Changelog
 
File: README.info, Node: 023, Next: 022, Prev: 03, Up: Changelog File: README.info, Node: 023, Next: 022, Prev: 03, Up: Changelog
5.8 0.2.3 5.9 0.2.3
========= =========
*Fixed* *Fixed*
@ -928,8 +943,8 @@ File: README.info, Node: 023, Next: 022, Prev: 03, Up: Changelog
 
File: README.info, Node: 022, Next: 021, Prev: 023, Up: Changelog File: README.info, Node: 022, Next: 021, Prev: 023, Up: Changelog
5.9 0.2.2 5.10 0.2.2
========= ==========
*Fixed* *Fixed*
• (deadline auto) selector matched entries whose deadlines had a • (deadline auto) selector matched entries whose deadlines had a
@ -939,7 +954,7 @@ File: README.info, Node: 022, Next: 021, Prev: 023, Up: Changelog
 
File: README.info, Node: 021, Next: 02, Prev: 022, Up: Changelog File: README.info, Node: 021, Next: 02, Prev: 022, Up: Changelog
5.10 0.2.1 5.11 0.2.1
========== ==========
*Fixed* *Fixed*
@ -949,7 +964,7 @@ File: README.info, Node: 021, Next: 02, Prev: 022, Up: Changelog
 
File: README.info, Node: 02, Next: 01, Prev: 021, Up: Changelog File: README.info, Node: 02, Next: 01, Prev: 021, Up: Changelog
5.11 0.2 5.12 0.2
======== ========
*Added* *Added*
@ -1032,7 +1047,7 @@ File: README.info, Node: 02, Next: 01, Prev: 021, Up: Changelog
 
File: README.info, Node: 01, Prev: 02, Up: Changelog File: README.info, Node: 01, Prev: 02, Up: Changelog
5.12 0.1 5.13 0.1
======== ========
First tagged release. First tagged release.
@ -1093,43 +1108,44 @@ GPLv3
 
Tag Table: Tag Table:
Node: Top225 Node: Top225
Node: Contents1447 Node: Contents1462
Node: Screenshots1574 Node: Screenshots1636
Node: Installation1692 Node: Installation1754
Node: Quelpa2330 Node: Quelpa2392
Node: Usage2773 Node: Usage2835
Node: Commands3122 Node: Commands3163
Node: org-ql-search3595 Node: org-ql-search3636
Node: helm-org-ql5243 Node: helm-org-ql5284
Node: org-ql-view5655 Node: org-ql-view5696
Node: org-ql-view-sidebar5853 Node: org-ql-view-sidebar5894
Node: org-ql-view-recent-items6209 Node: org-ql-view-recent-items6250
Node: org-ql-sparse-tree6693 Node: org-ql-sparse-tree6734
Node: Queries7493 Node: Queries7534
Node: Non-sexp query syntax8401 Node: Non-sexp query syntax8442
Node: General predicates10108 Node: General predicates10149
Node: Ancestor/descendant predicates14915 Node: Ancestor/descendant predicates14956
Node: Date/time predicates16043 Node: Date/time predicates16084
Node: Functions / Macros18698 Node: Functions / Macros18739
Node: Agenda-like views18931 Node: Agenda-like views18972
Node: Listing / acting-on results20336 Node: Listing / acting-on results20377
Node: Changelog24938 Node: Changelog24979
Node: 04325512 Node: 04425568
Node: 04225695 Node: 04325913
Node: 04125854 Node: 04226108
Node: 0426093 Node: 04126267
Node: 03230024 Node: 0426506
Node: 03130401 Node: 03230437
Node: 0330596 Node: 03130814
Node: 02333569 Node: 0331009
Node: 02233795 Node: 02333982
Node: 02134061 Node: 02234208
Node: 0234260 Node: 02134476
Node: 0138295 Node: 0234675
Node: Notes38396 Node: 0138710
Node: Comparison with Org Agenda searches38558 Node: Notes38811
Node: org-sidebar39429 Node: Comparison with Org Agenda searches38973
Node: License39708 Node: org-sidebar39844
Node: License40123
 
End Tag Table End Tag Table