[elpa] externals/hyperbole 2b9d47e 33/53: Merge branch 'master' of git.sv.gnu.org:/srv/git/hyperbole with Mats assist-flag fix.

[Robert Weiner]

branch: externals/hyperbole
commit 2b9d47edde545d17dc1b94122073fa83a462e6a5
Merge: aba412a 2e55c34
Author: Bob Weiner <address@hidden>
Commit: Bob Weiner <address@hidden>

    Merge branch 'master' of git.sv.gnu.org:/srv/git/hyperbole with Mats 
assist-flag fix.
---
 hmouse-drv.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hmouse-drv.el b/hmouse-drv.el
index 6755414..3b4f2f9 100644
--- a/hmouse-drv.el
+++ b/hmouse-drv.el
@@ -20,7 +20,6 @@
 
 ;; Quiet byte compiler warnings for these free variables.
 (eval-when-compile
-  (defvar assist-flag nil)
   (defvar hkey-action nil)
   (defvar pred-value nil))
 
@@ -87,6 +86,9 @@ Note that this may be a buffer different than where the 
release occurs.")
 (defvar assist-key-help-flag nil
   "When non-nil, forces display of help for next Assist Key release.")
 
+(defvar assist-flag nil
+  "Non-nil when Hyperbole's Assist Key is in use rather than the Action Key.")
+
 (defcustom hkey-debug nil
   "If non-nil, displays a message with the context and values from each Smart 
Key activation.
 Default is nil."