[elpa] externals/hyperbole 658ca9e 4/6: Fixed issue where Hyperbole improperly bound {q} for quit in with-temp-buffer buffers.

[Robert Weiner]

branch: externals/hyperbole
commit 658ca9e976d9232c5a7150c5bd344144ded43acb
Author: Bob Weiner <address@hidden>
Commit: Bob Weiner <address@hidden>

    Fixed issue where Hyperbole improperly bound {q} for quit in 
with-temp-buffer buffers.
    
    * hmouse-drv.el (hkey-help-show): Limited local binding of {q} to 
hkey-help-hide only
        when in a help-mode (or derived) buffer.
---
 Changes         | 15 ++++++++++-----
 hmouse-drv.el   | 11 ++++++-----
 hui-treemacs.el | 10 +++++++---
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/Changes b/Changes
index 3484c28..25ff4aa 100644
--- a/Changes
+++ b/Changes
@@ -1,6 +1,9 @@
-2017-11-21  Bob Weiner  <address@hidden>
+2017-11-22  Bob Weiner  <address@hidden>
 
-* hversion.el: Updated to 7.0.1 for release.
+* hmouse-drv.el (hkey-help-show): Limited local binding of {q} to 
hkey-help-hide only
+    when in a help-mode (or derived) buffer.
+
+2017-11-21  Bob Weiner  <address@hidden>
 
 * DEMO (Displaying File and Buffer Items): Added description of ace-window 
integration.
 
@@ -14,9 +17,9 @@
 
 * hmouse-drv.el (hkey-ace-window-setup): Setup keyboard-based display of items 
in windows specified by
     short ids.  See its doc string for how to use.
-                (hkey-drag, hkey-drag-jump): Added for mouse drag emulation 
via keyboard from a single
+                (hkey-drag, hkey-drag-to): Added for mouse drag emulation via 
keyboard from a single
     function that uses the selected window point for depress location and the 
parameter RELEASE-WINDOW
-    for the window and its point for release.  hkey-drag-jump is useful as a 
command in the ace-window
+    for the window and its point for release.  hkey-drag-to is useful as a 
command in the ace-window
     package's aw-dispatch-alist, e.g. {i} for insert item, because it leaves 
RELEASE-WINDOW selected.
 
 * hui-select.el (hui-select-ignore-quoted-sexp-modes): Added so major modes to 
ignore for syntactic pair
@@ -56,6 +59,8 @@
 
 2017-11-19  Bob Weiner  <address@hidden>
 
+* hversion.el: Updated to 7.0.1 for release.
+
 * hui-window.el (hmouse-item-to-window): Added support for 
hmouse-drag-item-mode-forms sending
     a sequence of (buffer position) rather than just buffer.
                 (hmouse-drag-item-mode-forms): Added support for dragging 
items from the treemacs
@@ -289,7 +294,7 @@ V7.0.1 changes ^^^^:
 
 2017-10-30  Bob Weiner  <address@hidden>
 
-* man/hyperbole.texi (Glossary): Removed mention of old remote file access 
packages: ange-ftp and EFS.  Use Tramp only
+* man/hyperbole.texi (Glossary): Removed mention of old remote file access 
packages: ange-ftp and EFS.  Use Tamrp only
     now.
                      (Searching and Summarizing): Renamed from Location.
 
diff --git a/hmouse-drv.el b/hmouse-drv.el
index 5b7d659..27d3fc5 100644
--- a/hmouse-drv.el
+++ b/hmouse-drv.el
@@ -347,7 +347,7 @@ Only works when running under a window system, not from a 
dumb terminal."
   (hkey-operate current-prefix-arg))
 
 ;;;###autoload
-(defun hkey-drag-jump (release-window)
+(defun hkey-drag-to (release-window)
   "Emulate Smart Mouse Key drag from selected window to RELEASE-WINDOW.
 If an item is dragged to RELEASE-WINDOW, then RELEASE-WINDOW is selected;
 otherwise, the drag action determines the selected window.
@@ -390,7 +390,7 @@ window, use {M-o i <id-of-window-to-display-item-in>} and 
watch the
 magic happen."
   (require 'ace-window)
   (when key (global-set-key key 'ace-window))
-  (push '(?i hkey-drag-jump "Hyperbole Drag To") aw-dispatch-alist)
+  (push '(?i hkey-drag-to "Hyperbole Drag To") aw-dispatch-alist)
   (setq aw-keys '(?a ?s ?d ?f ?g ?h ?j ?k ?l)
        ;; allows {i} operation to work when only 2 windows exist
        aw-dispatch-always t)
@@ -572,9 +572,10 @@ the current window.  By default, it is displayed according 
to the setting of
          ;; selection.
          (unless (or (where-is-internal 'quit-window (current-local-map))
                      (where-is-internal 'hkey-help-hide (current-local-map)))
-           (if (string-match "^\\*Help\\|Help\\*$" (buffer-name))
-               (help-mode))
-           (local-set-key "q" #'hkey-help-hide))))
+           (when (string-match "^\\*Help\\|Help\\*$" (buffer-name))
+             (help-mode))
+           (when (derived-mode-p 'help-mode)
+             (local-set-key "q" #'hkey-help-hide)))))
     ;; If in a *Completions* buffer, re-select the window that
     ;; generated the completions.
     (if (buffer-live-p completion-reference-buffer)
diff --git a/hui-treemacs.el b/hui-treemacs.el
index d90b2b9..a33b7ce 100644
--- a/hui-treemacs.el
+++ b/hui-treemacs.el
@@ -16,7 +16,7 @@
 ;;; Other required Elisp libraries
 ;;; ************************************************************************
 
-(eval-when-compile (require 'treemacs nil t))
+(eval-and-compile (require 'treemacs nil t))
 
 ;;; ************************************************************************
 ;;; smart-treemacs functions
@@ -95,8 +95,8 @@ Suitable for use as a value of 
`action-key-modeline-buffer-id-function'."
 ;;; treemacs function updates
 ;;; ************************************************************************
 
-;; Add this defsubst in treemacs-tags.el
-(defsubst treemacs--imenu-tag-noselect (file tag-path)
+;; Add this in treemacs-tags.el
+(defun treemacs--imenu-tag-noselect (file tag-path)
   "Return a list of the source buffer for FILE and the position of the tag 
from TAG-PATH."
   (let ((tag (car tag-path))
         (path (cdr tag-path)))
@@ -198,6 +198,10 @@ under or below it."
                (when ,save-window
                   (select-window current-window))))))))))
 
+;; Reload source form of this library so updated version of
+;; `treemacs--execute-button-action' above is used throughout.
+(load "treemacs-interface.el")
+
 ;; Add to treemacs-interface.el.
 ;;;###autoload
 (defun treemacs-node-buffer-and-position (&optional arg)