Skip to content

Commit

Permalink
Merge: v0.7.3
Browse files Browse the repository at this point in the history
  • Loading branch information
alphapapa committed Oct 23, 2023
2 parents ac2d435 + 28c4215 commit ee01bcb
Show file tree
Hide file tree
Showing 5 changed files with 140 additions and 107 deletions.
7 changes: 7 additions & 0 deletions README.org
Original file line number Diff line number Diff line change
Expand Up @@ -559,6 +559,13 @@ Simple links may also be written manually in either sexp or non-sexp form, like:

+ Org v9.7's ~org-element~ API changes required some adjustments. ([[https://github.com/alphapapa/org-ql/issues/364][#364]]. Thanks to several users for reporting, and to [[https://github.com/yantar92][Ihor Radchenko]] for his feedback.)

** 0.7.3

*Fixes*
+ Disable ~case-fold-search~ when collecting headings in outline paths. (Headings that started with a word that is also a to-do keyword but with different capitalization would be matched incorrectly.)
+ Saving of ~org-ql-view~ views. ([[https://github.com/alphapapa/org-ql/issues/378][#378]]. Thanks to [[https://github.com/Pentaquark1][Pentaquark1]] for reporting.)
+ Command ~org-ql-find~ didn't move point to the selected entry. ([[https://github.com/alphapapa/org-ql/issues/380][#380]]. Thanks to [[https://github.com/oantolin][Omar Antolín Camarena]] for reporting.)

** 0.7.2

*Fixes*
Expand Down
10 changes: 6 additions & 4 deletions org-ql-find.el
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@

(defcustom org-ql-find-goto-hook '(org-show-entry org-reveal)
"Functions called when selecting an entry."
;; TODO: Add common choices, including `org-tree-to-indirect-buffer'.
:type 'hook)

(defcustom org-ql-find-display-buffer-action '(display-buffer-same-window)
Expand Down Expand Up @@ -86,10 +87,11 @@ single predicate)."
:query-prefix query-prefix
:query-filter query-filter
:prompt prompt)))
(org-with-point-at marker
(display-buffer (current-buffer) org-ql-find-display-buffer-action)
(select-window (get-buffer-window (current-buffer)))
(run-hook-with-args 'org-ql-find-goto-hook))))
(set-buffer (marker-buffer marker))
(goto-char marker)
(display-buffer (current-buffer) org-ql-find-display-buffer-action)
(select-window (get-buffer-window (current-buffer)))
(run-hook-with-args 'org-ql-find-goto-hook)))

;;;###autoload
(defun org-ql-refile (marker)
Expand Down
6 changes: 4 additions & 2 deletions org-ql-view.el
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,8 @@ update search arguments."
(yes-or-no-p (format "Overwrite view \"%s\"?" name)))
(setf (map-elt org-ql-views name nil #'equal) plist)
(customize-set-variable 'org-ql-views org-ql-views)
(customize-mark-to-save 'org-ql-views))))
(customize-mark-to-save 'org-ql-views)
(custom-save-all))))

(defun org-ql-view-delete ()
"Delete current view (with confirmation)."
Expand All @@ -362,7 +363,8 @@ update search arguments."
(--remove (equal (car it) org-ql-view-title)
org-ql-views))
(customize-set-variable 'org-ql-views org-ql-views)
(customize-mark-to-save 'org-ql-views)))
(customize-mark-to-save 'org-ql-views)
(custom-save-all)))

(defun org-ql-view-customize ()
"Customize view at point in `org-ql-view-sidebar' buffer."
Expand Down
7 changes: 4 additions & 3 deletions org-ql.el
Original file line number Diff line number Diff line change
Expand Up @@ -624,9 +624,10 @@ Returns cons (INHERITED-TAGS . LOCAL-TAGS)."
"Return outline path for heading at point."
(save-excursion
(let ((heading (save-match-data
(if (looking-at org-complex-heading-regexp)
(or (match-string 4) "")
""))))
(let (case-fold-search)
(if (looking-at org-complex-heading-regexp)
(or (match-string-no-properties 4) "")
"")))))
(if (org-up-heading-safe)
;; MAYBE: It seems wrong to call the cache function from
;; inside this function, like a violation of separation of
Expand Down
Loading

0 comments on commit ee01bcb

Please sign in to comment.