branch: externals/hyperbole commit 71115d6c76c08ed464edb03874a40a6d9c5845a6 Author: Mats Lidell <mats.lid...@lidells.se> Commit: GitHub <nore...@github.com>
Fix even more warnings (#100) --- ChangeLog | 24 ++++++++++++++++++++++++ hmouse-drv.el | 7 +++++++ hsys-org.el | 5 +---- hui-menu.el | 2 +- hui-mouse.el | 23 +++++++++++++++-------- hui-treemacs.el | 3 +++ hycontrol.el | 5 +++++ kotl/kotl-mode.el | 2 +- 8 files changed, 57 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1430864..5ff30be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,29 @@ 2021-06-19 Mats Lidell <ma...@gnu.org> +* hui-menu.el (hyperbole-menubar-menu): Use easy-menu-add-item. + +* hmouse-drv.el (window-jump, wj-vec-left, wj-vec-right, wj-vec-down) + (wj-vec-up): Declare function and variables. + +* hsys-org.el (org-link): Use org-link-open-from-string. + +* hui-mouse.el (helm-action-buffer, helm-alive-p, helm-buffer): Declare + helm variables. + (company-show-doc-buffer, company-show-location) + (company-select-mouse): Declare helm functions. + (smart-calendar): Use calendar-scroll-left-three-months and + calendar-scroll-right-three-months + (smart-calendar-assist): Use calendar-scroll-left-three-months and + calendar-scroll-right-three-months and diary-view-entries. + +* hui-treemacs.el (treemacs-version, aw-ignored-buffers): Declare + variables. + +* hycontrol.el (ibuffer-mode-map): Declare used variable. + +* kotl/kotl-mode.el (kotl-mode:end-of-buffer): looking-back requires two + args. + * test/hyrolo-tests.el (hyrolo-demo-search-work) (hyrolo-demo-tab-jump-to-first-match, hyrolo-demo-toggle-visibility): Add tests for hyrolo. diff --git a/hmouse-drv.el b/hmouse-drv.el index b232dd7..8795039 100644 --- a/hmouse-drv.el +++ b/hmouse-drv.el @@ -126,6 +126,13 @@ This permits the Smart Keys to behave as paste keys.") (defvar aw-frame-size) (defvar aw-keys) +;; window-jump +(declare-function window-jump "ext:window-jump") +(defvar wj-vec-left) +(defvar wj-vec-right) +(defvar wj-vec-down) +(defvar wj-vec-up) + ;;; ************************************************************************ ;;; Private variables ;;; ************************************************************************ diff --git a/hsys-org.el b/hsys-org.el index b1b493d..634d1ed 100644 --- a/hsys-org.el +++ b/hsys-org.el @@ -83,10 +83,7 @@ with different settings of this option. For example, a nil value makes "Follows an optional Org mode LINK to its target. If LINK is nil, follows any link at point. Otherwise, triggers an error." (if (stringp link) - (cond ((fboundp #'org-link-open-from-string) - (org-link-open-from-string link)) - ((fboundp #'org-open-link-from-string) - (org-open-link-from-string link))) ;; autoloaded + (org-link-open-from-string link) (org-open-at-point))) ;; autoloaded (defact org-internal-link-target (&optional link-target) diff --git a/hui-menu.el b/hui-menu.el index 0c1accd..f784244 100644 --- a/hui-menu.el +++ b/hui-menu.el @@ -292,7 +292,7 @@ Return t if cutoff, else nil." "Koutline") ((global-key-binding [menu-bar OO-Browser]) "OO-Browser")))) - (add-submenu nil (infodock-hyperbole-menu t) add-before)))) + (easy-menu-add-item (current-global-map) '("menu-bar") (infodock-hyperbole-menu t) add-before)))) ;; Force a menu-bar update. (force-mode-line-update)) diff --git a/hui-mouse.el b/hui-mouse.el index a2d7439..c844abd 100644 --- a/hui-mouse.el +++ b/hui-mouse.el @@ -138,6 +138,9 @@ Its default value is #'smart-scroll-down. To disable it, set it to (declare-function helm-resume "ext:helm") (declare-function helm-window "ext:helm-lib") (declare-function with-helm-buffer "ext:helm-lib") +(defvar helm-action-buffer) +(defvar helm-alive-p) +(defvar helm-buffer) (declare-function ibuffer-mark-for-delete "ibuffer") (declare-function ibuffer-unmark-forward "ibuffer") @@ -152,6 +155,12 @@ Its default value is #'smart-scroll-down. To disable it, set it to (declare-function gnus-topic-read-group "gnus-topic") +(declare-function company-show-doc-buffer "ext:company") +;; (declare-function company-quick-help-manual-begin "ext:company?") +(declare-function company-show-location "ext:company") +(declare-function company-select-mouse "ext:company") + + ;;; ************************************************************************ ;;; Hyperbole context-sensitive keys dispatch table ;;; ************************************************************************ @@ -740,9 +749,9 @@ If key is pressed: (interactive) (cond ((eobp) (calendar-cursor-to-nearest-date) - (scroll-calendar-left-three-months 1)) + (calendar-scroll-left-three-months 1)) ((< (current-column) 5) (calendar-cursor-to-nearest-date) - (scroll-calendar-right-three-months 1)) + (calendar-scroll-right-three-months 1)) (t (calendar-cursor-to-nearest-date) (diary-view-entries 1)))) @@ -762,10 +771,10 @@ If assist-key is pressed: (interactive) (cond ((eobp) (calendar-cursor-to-nearest-date) - (scroll-calendar-right-three-months 1)) + (calendar-scroll-right-three-months 1)) ((< (current-column) 5) (calendar-cursor-to-nearest-date) - (scroll-calendar-left-three-months 1)) - (t (mark-diary-entries)))) + (calendar-scroll-left-three-months 1)) + (t (diary-mark-entries)))) ;;; ************************************************************************ ;;; smart-company mode functions @@ -884,9 +893,7 @@ If assist-key is pressed: ;; Prevent any region selection from causing multiple files ;; to be marked for deletion; we want to mark only one. (deactivate-mark t) - (if (fboundp 'dired-flag-file-deletion) - (dired-flag-file-deletion 1) - (dired-flag-file-deleted 1))))) + (dired-flag-file-deletion 1)))) ;;; ************************************************************************ ;;; smart-gnus functions diff --git a/hui-treemacs.el b/hui-treemacs.el index 60025f8..2492c2f 100644 --- a/hui-treemacs.el +++ b/hui-treemacs.el @@ -18,6 +18,8 @@ (eval-and-compile (require 'treemacs nil t)) +(defvar treemacs-version) + (unless (and (featurep 'treemacs) (string-greaterp treemacs-version "v2")) (error "(hui-treemacs): Hyperbole requires Treemacs package version 2.0 or greater")) @@ -32,6 +34,7 @@ (declare-function treemacs-node-buffer-and-position "etx:treemacs-mouse-interface") (declare-function treemacs-quit "ext:treemacs-core-utils") (declare-function treemacs-toggle-node "ext:treemacs-interface") +(defvar aw-ignored-buffers) ;;; ************************************************************************ ;;; smart-treemacs functions diff --git a/hycontrol.el b/hycontrol.el index 18dc3a6..84c722c 100644 --- a/hycontrol.el +++ b/hycontrol.el @@ -228,6 +228,11 @@ The final predicate should always be t, for default values, typically of zero.") "HyControl copy of `prefix-arg' that it changes within key bindings. `pre-command-hook' synchronizes this value to `prefix-arg'.") +;;; ************************************************************************ +;;; Public declarations +;;; ************************************************************************ +(defvar ibuffer-mode-map) + ;;; Frame Keys (defvar hycontrol-frames-mode-map diff --git a/kotl/kotl-mode.el b/kotl/kotl-mode.el index c34ddc4..f43d869 100644 --- a/kotl/kotl-mode.el +++ b/kotl/kotl-mode.el @@ -1540,7 +1540,7 @@ Leave point at the start of the cell." (interactive) (kotl-mode:maintain-region-highlight) (goto-char (point-max)) - (when (looking-back "\\]\\s-*") + (when (looking-back "\\]\\s-*" nil) ;; Internal Koutline structures are exposed, re-narrow the Koutline (kotl-mode)) ;; To move to cell end.