Skip to content

Commit

Permalink
Fix: (helm-org-ql [v0.6.2]) Compilation warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
alphapapa committed Jun 13, 2024
1 parent 0f01f0a commit f7c3a61
Showing 3 changed files with 116 additions and 85 deletions.
4 changes: 4 additions & 0 deletions README.org
Original file line number Diff line number Diff line change
@@ -558,6 +558,10 @@ Simple links may also be written manually in either sexp or non-sexp form, like:

Nothing new yet.

*** helm-org-ql

Tagged v0.6.2, fixing a compilation warning.

** 0.8.6

*Fixes*
22 changes: 16 additions & 6 deletions helm-org-ql.el
Original file line number Diff line number Diff line change
@@ -2,8 +2,8 @@

;; Author: Adam Porter <adam@alphapapa.net>
;; URL: https://github.com/alphapapa/org-ql
;; Version: 0.6.1
;; Package-Requires: ((emacs "26.1") (dash "2.18.1") (s "1.12.0") (helm-org "1.0") (org-ql "0.6-pre"))
;; Version: 0.6.2
;; Package-Requires: ((emacs "26.1") (compat "29.1.4.5") (dash "2.18.1") (s "1.12.0") (helm-org "1.0") (org-ql "0.6-pre"))

;;; Commentary:

@@ -35,6 +35,7 @@
(require 'cl-lib)
(require 'org)

(require 'compat)
(require 'dash)
(require 's)

@@ -44,6 +45,15 @@
(require 'org-ql)
(require 'org-ql-search)

(declare-function org-ql--normalize-query "org-ql" t t)

;;;; Compatibility

(defalias 'helm-org-ql--show-entry
(if (version< org-version "9.6")
'org-show-entry
'org-fold-show-entry))

;;;; Variables

(defvar helm-org-ql-map
@@ -102,7 +112,7 @@ NAME is passed to `helm-org-ql-source', which see.
NOTE: Atoms in the query are turned into strings where
appropriate, which makes it unnecessary to type quotation marks
around words that are intended to be searched for as indepenent
around words that are intended to be searched for as independent
strings.
All query tokens are wrapped in the operator BOOLEAN (default
@@ -151,7 +161,7 @@ Is transformed into this query:
;; it to go to the previous heading. I don't know why it does that.
(switch-to-buffer (marker-buffer marker))
(goto-char marker)
(org-show-entry))
(helm-org-ql--show-entry))

(defun helm-org-ql-show-marker-indirect (marker)
"Show heading at MARKER with `org-tree-to-indirect-buffer'."
@@ -177,7 +187,7 @@ Is transformed into this query:

;;;###autoload
(cl-defun helm-org-ql-source (buffers-files &key (name "helm-org-ql"))
"Return Helm source named NAME that searches BUFFERS-FILES with `helm-org-ql'."
"Return Helm source named NAME to search BUFFERS-FILES with `helm-org-ql'."
;; Expansion of `helm-build-sync-source' macro.
(helm-make-source name 'helm-source-sync
:candidates (lambda ()
@@ -201,7 +211,7 @@ Is transformed into this query:
(defun helm-org-ql--heading (window-width)
"Return string for Helm for heading at point.
WINDOW-WIDTH should be the width of the Helm window."
(font-lock-ensure (point-at-bol) (point-at-eol))
(font-lock-ensure (pos-bol) (pos-eol))
;; TODO: It would be better to avoid calculating the prefix and width
;; at each heading, but there's no easy way to do that once in each
;; buffer, unless we manually called `org-ql' in each buffer, which
175 changes: 96 additions & 79 deletions org-ql.info
Original file line number Diff line number Diff line change
@@ -112,6 +112,10 @@ Changelog
* 0.2: 02.
* 0.1: 01.

0.9-pre

* helm-org-ql: helm-org-ql (1).

Development

* Copyright assignment::
@@ -1087,6 +1091,18 @@ File: README.info, Node: 09-pre, Next: 086, Up: Changelog

Nothing new yet.

* Menu:

* helm-org-ql: helm-org-ql (1).


File: README.info, Node: helm-org-ql (1), Up: 09-pre

5.1.1 helm-org-ql
-----------------

Tagged v0.6.2, fixing a compilation warning.


File: README.info, Node: 086, Next: 085, Prev: 09-pre, Up: Changelog

@@ -2006,85 +2022,86 @@ GPLv3

Tag Table:
Node: Top225
Node: Contents2009
Node: Screenshots2136
Node: Installation2254
Node: Quelpa2768
Node: Helm support3296
Node: Usage3699
Node: Commands4097
Node: org-ql-find4562
Node: org-ql-open-link5470
Node: org-ql-refile6325
Node: org-ql-search6653
Node: helm-org-ql8584
Node: org-ql-view8962
Node: org-ql-view-sidebar9492
Node: org-ql-view-recent-items9872
Node: org-ql-sparse-tree10368
Node: Queries11168
Node: Non-sexp query syntax12285
Node: General predicates14044
Node: Ancestor/descendant predicates20969
Node: Date/time predicates22097
Node: Functions / Macros25221
Node: Agenda-like views25519
Ref: Function org-ql-block25681
Node: Listing / acting-on results26942
Ref: Caching27150
Ref: Function org-ql-select28063
Ref: Function org-ql-query30489
Ref: Macro org-ql (deprecated)32263
Node: Custom predicates32578
Ref: Macro org-ql-defpred32802
Node: Dynamic block36243
Node: Links38967
Node: Tips39654
Node: Changelog39978
Node: 09-pre40903
Node: 08641010
Node: 08541247
Node: 08441903
Node: 08342355
Node: 08242696
Node: 08143089
Node: 0843510
Node: 07446234
Node: 07346457
Node: 07247191
Node: 07148112
Node: 0748923
Node: 06351789
Node: 06252322
Node: 06152629
Node: 0653199
Node: 05256255
Node: 05156557
Node: 0556982
Node: 04958513
Node: 04858795
Node: 04759144
Node: 04659553
Node: 04559961
Node: 04460322
Node: 04360681
Node: 04260884
Node: 04161045
Node: 0461292
Node: 03265393
Node: 03165796
Node: 0365993
Node: 02369293
Node: 02269527
Node: 02169807
Node: 0270012
Node: 0174090
Node: Development74191
Node: Copyright assignment74424
Node: Notes75014
Node: Comparison with Org Agenda searches75178
Node: org-sidebar76067
Node: License76346
Node: Contents2051
Node: Screenshots2178
Node: Installation2296
Node: Quelpa2810
Node: Helm support3338
Node: Usage3741
Node: Commands4139
Node: org-ql-find4604
Node: org-ql-open-link5512
Node: org-ql-refile6367
Node: org-ql-search6695
Node: helm-org-ql8626
Node: org-ql-view9004
Node: org-ql-view-sidebar9534
Node: org-ql-view-recent-items9914
Node: org-ql-sparse-tree10410
Node: Queries11210
Node: Non-sexp query syntax12327
Node: General predicates14086
Node: Ancestor/descendant predicates21011
Node: Date/time predicates22139
Node: Functions / Macros25263
Node: Agenda-like views25561
Ref: Function org-ql-block25723
Node: Listing / acting-on results26984
Ref: Caching27192
Ref: Function org-ql-select28105
Ref: Function org-ql-query30531
Ref: Macro org-ql (deprecated)32305
Node: Custom predicates32620
Ref: Macro org-ql-defpred32844
Node: Dynamic block36285
Node: Links39009
Node: Tips39696
Node: Changelog40020
Node: 09-pre40945
Node: helm-org-ql (1)41094
Node: 08641235
Node: 08541472
Node: 08442128
Node: 08342580
Node: 08242921
Node: 08143314
Node: 0843735
Node: 07446459
Node: 07346682
Node: 07247416
Node: 07148337
Node: 0749148
Node: 06352014
Node: 06252547
Node: 06152854
Node: 0653424
Node: 05256480
Node: 05156782
Node: 0557207
Node: 04958738
Node: 04859020
Node: 04759369
Node: 04659778
Node: 04560186
Node: 04460547
Node: 04360906
Node: 04261109
Node: 04161270
Node: 0461517
Node: 03265618
Node: 03166021
Node: 0366218
Node: 02369518
Node: 02269752
Node: 02170032
Node: 0270237
Node: 0174315
Node: Development74416
Node: Copyright assignment74649
Node: Notes75239
Node: Comparison with Org Agenda searches75403
Node: org-sidebar76292
Node: License76571

End Tag Table

0 comments on commit f7c3a61

Please sign in to comment.