summaryrefslogtreecommitdiff
path: root/hyperbole.el
diff options
context:
space:
mode:
authorBob Weiner <rsw@gnu.org>2017-12-14 17:12:43 -0500
committerBob Weiner <rsw@gnu.org>2017-12-14 17:12:43 -0500
commite8038811c79ff76b6f188acf360a454a8ef7b753 (patch)
tree2c76601fae12c73aae48e85bf935dc297654e452 /hyperbole.el
parent751121f50deadec04bda2261919187fc4f8779e7 (diff)
Fixed a cyclic Lisp library require; improved multi-frame hkey-throw
* hmouse-drv.el (hkey-throw): Partially solved temporary display of newly created frames (when not given focus initially with a '(no-focus-on-map . t) property), so hkey-throw to a new target frame now temporarily displays the target frame and then makes the start frame the uppermost frame. When on an item though, the item is not visible during the temporary display yet. * Makefile (texinfo): Added texinfo dependency target and added additional image dependencies in man/im. * hyperbole.el (require 'hmouse-drv): Changed from hmouse-key to prevent a require cycle during macro expansion. hmouse-key.el: Changed requires to just be during compile since hyperbole.el now includes these requires and will load hmouse-key.
Diffstat (limited to 'hyperbole.el')
-rw-r--r--hyperbole.el5
1 files changed, 2 insertions, 3 deletions
diff --git a/hyperbole.el b/hyperbole.el
index 71ced94..1128370 100644
--- a/hyperbole.el
+++ b/hyperbole.el
@@ -382,7 +382,8 @@ frame, those functions by default still return the prior frame."
(if (consp frame-x-dot-y) (setcar frame-x-dot-y (selected-frame)))
frame-x-dot-y)))
-(require 'hmouse-key)
+;; hmouse-drv will load hui-mouse and hmouse-key
+(mapc #'require '(hsettings hmouse-drv hmouse-sh))
;;; ************************************************************************
;;; You shouldn't need to modify anything below here.
@@ -681,8 +682,6 @@ If FLAG is nil then text is shown, while if FLAG is t the text is hidden."
;;; Load Site-specific Configurations and Initialize Hyperbole Package
;;; ************************************************************************
-(require 'hsettings)
-
(defun hyperb:init ()
"Standard configuration routine for Hyperbole."
(interactive)