[elpa] externals/hyperbole e2f6fbd 21/53: V6.0.2b; Fixed ebut creation argument prompting; Normal key seqs and ESC for meta allowed in HyControl

[Robert Weiner]

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

    V6.0.2b; Fixed ebut creation argument prompting; Normal key seqs and ESC 
for meta allowed in HyControl
    
    2017-10-01  Bob Weiner  <address@hidden>
    
    * hycontrol.el (hycontrol-handle-event):
                   (hycontrol-prettify-event): Fixed to handle large integer 
code events, e.g. M-p.
    
    2017-09-30  Bob Weiner  <address@hidden>
    
    * man/hyperbole.texi (HyControl):
      hycontrol.el (hycontrol-frames, hycontrol-windows): Removed ESC as a quit 
command since now that
        key sequences are supported, this is often used as a meta key prefix.  
Use {q} to quit.
    
    * hact.el (actype:act, actype:action): Fixed regexp match to beginning of 
string; quote mark used
       had somehow been changed to the end of string match regexp.  As a 
result, when explicit
       buttons were being created or modified, no arguments were prompted for.
    
    * hargs.el (hargs:delimited): Removed unneeded properties from any returned 
string.
    
    * hpath.el (hpath:at-p): Added missing non-exist parameter to 
hpath:delimited-possible-path call.
        This extends the prior bug fix for hpath:at-p.  See below.
    
    * hmouse-drv.el (hmouse-key-release-args-emacs): Updated to handle 
cross-frame drags properly
        for when Emacs' event system is fixed to return the proper frame for a 
cross-frame drag
        release event (as of 25.3, it returns the depress frame rather than the 
release frame).
    
    2017-09-29  Bob Weiner  <address@hidden>
    
    * hycontrol.el (hycontrol-prettify-event): Added.
    
    2017-09-28  Bob Weiner  <address@hidden>
    
    * hycontrol.el (hycontrol-handle-event): Expanded to handle single 
non-self-inserting
        keys and key sequences.
---
 .hypb              | Bin 2682 -> 2835 bytes
 Changes            |  31 +++++++++++++++++++++++++++
 DEMO               |   6 ------
 HY-ABOUT           |   2 +-
 HY-ANNOUNCE        |   2 +-
 HY-NEWS            |   2 +-
 Makefile           |   2 +-
 hact.el            |   8 +++----
 hargs.el           |   4 +++-
 hmouse-drv.el      |  33 ++++++++++++++++++++++------
 hmouse-tag.el      |  14 ++++++------
 hpath.el           |   5 +++--
 hui-mouse.el       |   2 +-
 hui.el             |   5 +++++
 hversion.el        |   2 +-
 hycontrol.el       |  62 +++++++++++++++++++++++++++++++++++++++--------------
 hyperbole-pkg.el   |   2 +-
 man/hyperbole.html |  24 ++++++++++-----------
 man/hyperbole.info | Bin 198003 -> 438289 bytes
 man/hyperbole.pdf  | Bin 798841 -> 798605 bytes
 man/hyperbole.texi |  19 ++++++++--------
 man/version.texi   |   8 +++----
 22 files changed, 158 insertions(+), 75 deletions(-)

diff --git a/.hypb b/.hypb
index 64a7049..df46779 100644
Binary files a/.hypb and b/.hypb differ
diff --git a/Changes b/Changes
index 722c2ca..b2fc3f1 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,36 @@
+2017-10-01  Bob Weiner  <address@hidden>
+
+* hycontrol.el (hycontrol-handle-event): 
+               (hycontrol-prettify-event): Fixed to handle large integer code 
events, e.g. M-p.
+
+2017-09-30  Bob Weiner  <address@hidden>
+
+* man/hyperbole.texi (HyControl):
+  hycontrol.el (hycontrol-frames, hycontrol-windows): Removed ESC as a quit 
command since now that
+    key sequences are supported, this is often used as a meta key prefix.  Use 
{q} to quit.
+
+* hact.el (actype:act, actype:action): Fixed regexp match to beginning of 
string; quote mark used
+   had somehow been changed to the end of string match regexp.  As a result, 
when explicit
+   buttons were being created or modified, no arguments were prompted for.
+
+* hargs.el (hargs:delimited): Removed unneeded properties from any returned 
string.
+
+* hpath.el (hpath:at-p): Added missing non-exist parameter to 
hpath:delimited-possible-path call.
+    This extends the prior bug fix for hpath:at-p.  See below.
+
+* hmouse-drv.el (hmouse-key-release-args-emacs): Updated to handle cross-frame 
drags properly
+    for when Emacs' event system is fixed to return the proper frame for a 
cross-frame drag
+    release event (as of 25.3, it returns the depress frame rather than the 
release frame).
+
+2017-09-29  Bob Weiner  <address@hidden>
+
+* hycontrol.el (hycontrol-prettify-event): Added.
+
 2017-09-28  Bob Weiner  <address@hidden>
 
+* hycontrol.el (hycontrol-handle-event): Expanded to handle single 
non-self-inserting
+    keys and key sequences.
+
 * man/hyperbole.texi (Version): Updated to 6.02a and rebuilt output formats.
 
 * man/hyperbole.texi (View Specs): Noted that ellipses can no longer be
diff --git a/DEMO b/DEMO
index f9f1cd1..abef9fa 100644
--- a/DEMO
+++ b/DEMO
@@ -1,9 +1,3 @@
-
- 
-
-
- 
-
 * GNU Hyperbole Demonstration and Introduction by Bob Weiner
 
 Welcome to GNU Hyperbole.  Hyperbole will super-charge your GNU Emacs
diff --git a/HY-ABOUT b/HY-ABOUT
index 48b902f..d1574ca 100644
--- a/HY-ABOUT
+++ b/HY-ABOUT
@@ -1,7 +1,7 @@
                          ABOUT GNU HYPERBOLE
                   Designed and Written by Bob Weiner
                 https://www.gnu.org/software/hyperbole/
-                            Version 6.0.2
+                            Version 6.0.2b
 
 GNU Hyperbole (pronounced Ga-new Hi-per-bo-lee), or just Hyperbole, is
 an efficient and programmable hypertextual information management
diff --git a/HY-ANNOUNCE b/HY-ANNOUNCE
index f2cc6bd..4012e22 100644
--- a/HY-ANNOUNCE
+++ b/HY-ANNOUNCE
@@ -1,4 +1,4 @@
-ANNOUNCE: GNU Hyperbole 6.0.2 for Emacs 24.4 or newer is released
+ANNOUNCE: GNU Hyperbole 6.0.2b for Emacs 24.4 or newer is released
 
 The GNU Hyperbole home page, https://www.gnu.org/software/hyperbole, contains a
 number of screenshots of Hyperbole and its menus and links to useful resources.
diff --git a/HY-NEWS b/HY-NEWS
index 877abe3..2a76fda 100644
--- a/HY-NEWS
+++ b/HY-NEWS
@@ -4,7 +4,7 @@
           (See "Changes" for more complete details of changes.)
 
 ===========================================================================
-*                                  V6.0.2
+*                                  V6.0.2b
 ===========================================================================
 
   BUTTONS
diff --git a/Makefile b/Makefile
index 31c12f3..e3cec2f 100644
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,7 @@
 
 # This ver setup won't work under any make except GNU make, so set it manually.
 #HYPB_VERSION = "`head -3 hversion.el | tail -1 | sed -e 's/.*|\(.*\)|.*/\1/'`"
-HYPB_VERSION = 6.0.2
+HYPB_VERSION = 6.0.2b
 
 # Emacs executable used to byte-compile .el files into .elc's.
 # Possibilities include: emacs, infodock, xemacs, etc.
diff --git a/hact.el b/hact.el
index 9b94e50..1086188 100644
--- a/hact.el
+++ b/hact.el
@@ -228,11 +228,11 @@ performing ACTION."
     (if (null action)
        (error "(actype:act): Null action for: `%s'" actype)
       ;; Next 2 lines are needed so that relative paths are expanded
-      ;; properly but in rare cases, it can improperly expand simple
-      ;; string arguments like, "tags", as a pathname when it is not
+      ;; properly.  But in rare cases, this can improperly expand simple
+      ;; string arguments like "tags" as a pathname, when it is not
       ;; being used as a path.  So do this only if actype is a defact
       ;; and not a defun to limit any potential impact. RSW - 9/22/2017
-      (if (symbolp action) (string-match "\\'actypes::" (symbol-name action))
+      (if (symbolp action) (string-match "\\`actypes::" (symbol-name action))
        (setq args (action:path-args-abs args)))
       (let ((hist-elt (hhist:element)))
        (run-hooks 'action-act-hook)
@@ -257,7 +257,7 @@ ACTYPE may be a Hyperbole actype or Emacs Lisp function."
        (setq actname actype
              actype (intern actype))
       (setq actname (symbol-name actype)))
-    (cond ((htype:body (if (string-match "\\'actypes::" actname)
+    (cond ((htype:body (if (string-match "\\`actypes::" actname)
                           actype
                         (intern-soft (concat "actypes::" actname)))))
          ((fboundp actype) actype)
diff --git a/hargs.el b/hargs.el
index 3d0881c..ef7b059 100644
--- a/hargs.el
+++ b/hargs.el
@@ -128,7 +128,9 @@ With optional LIST-POSITIONS-FLAG, return list of 
(string-matched start-pos end
                 (setq end (1- end))
               t)
             (< start end)
-            (let ((string (hypb:replace-match-string "[\n\r]\\s-*" 
(buffer-substring start end) " " t)))
+            (let ((string (substring-no-properties
+                           (hypb:replace-match-string
+                            "[\n\r]\\s-*" (buffer-substring start end) " " 
t))))
               (if list-positions-flag
                   (list string start end)
                 string)))))))
diff --git a/hmouse-drv.el b/hmouse-drv.el
index 53f4a1d..49b29d2 100644
--- a/hmouse-drv.el
+++ b/hmouse-drv.el
@@ -542,16 +542,37 @@ With optional ARG, override them iff ARG is positive."
         (not (minibuffer-window-active-p window))
         window)))
 
+(defun hmouse-key-release-window-emacs (pos)
+  "Returns window of current mouse position POS if in a window, else nil.
+POS must be the result of calling (mouse-position)."
+  (ignore-errors (window-at (cadr pos) (cddr pos) (car pos))))
+
 (defun hmouse-key-release-args-emacs (event)
   (if (integerp event)
       (list event)
     (let ((ev-type-str (and (listp event) (symbol-name (car event)))))
-      (if (or (and ev-type-str
-                  (string-match "\\(double\\|triple\\)-mouse" ev-type-str))
-             (not (= (length event) 3)))
-         event
-       ;; Remove depress coordinates and send only release coordinates.
-       (list (car event) (nth 2 event))))))
+      (cond ((or (and ev-type-str
+                     (string-match "\\(double\\|triple\\)-mouse" ev-type-str))
+                (not (= (length event) 3)))
+            event)
+           ((and ev-type-str (string-match "drag-mouse" ev-type-str)
+                 ;; end of drag event; if drag crossed frames, the location
+                 ;; will contain a frame and some relative coordinates;
+                 ;; change to window of release and window's character 
coordinates
+                 ;; if within a window
+                 (let ((pos (event-end event))
+                       mouse-pos coords window)
+                   (when (and (framep (posn-window pos))
+                              (setq mouse-pos (mouse-position)
+                                    coords (cdr mouse-pos)
+                                    window (hmouse-key-release-window-emacs 
mouse-pos)))
+                     (setcar pos window)
+                     (setcar (nthcdr 2 pos) coords)))
+                 ;; always fall through cond
+                 nil))
+           ;; Remove depress coordinates and send only release coordinates.
+           (t (list (car event) (nth 2 event)))))))
+
 
 (defun hmouse-save-region (&optional frame)
   "Saves any active region within the current buffer.
diff --git a/hmouse-tag.el b/hmouse-tag.el
index 04f13f9..9c0fe34 100644
--- a/hmouse-tag.el
+++ b/hmouse-tag.el
@@ -619,12 +619,14 @@ buffer."
                          (error "(smart-lisp): `%s' definition not found in 
any tag table" tag)))))))))
 
 (defun smart-lisp-at-definition-p ()
-    "Returns t when point is on the first line of a non-alias Lisp definition, 
else nil."
-    (save-excursion
-      (beginning-of-line)
-      (and (looking-at "\\(;*[ \t]*\\)?(def")
-          ;; Ignore alias definitions since those typically have symbol tags 
to lookup.
-          (not (looking-at "\\(;*[ \t]*\\)?(def[^ \t\n\r]*alias")))))
+    "Returns t when point is in a non-help buffer on the first line of a 
non-alias Lisp definition, else nil."
+    (unless (derived-mode-p 'help-mode)
+      (save-excursion
+       (beginning-of-line)
+       ;; Exclude any define- lines.
+       (and (looking-at "\\(;*[ \t]*\\)?(def[[:alnum:]]*[[:space:]]")
+            ;; Ignore alias definitions since those typically have symbol tags 
to lookup.
+            (not (looking-at "\\(;*[ \t]*\\)?(def[^ \t\n\r]*alias"))))))
 
 (defun smart-lisp-at-load-expression-p ()
     "Returns t when point is on the first line of a Lisp library load 
expression, else nil."
diff --git a/hpath.el b/hpath.el
index e47e08a..1bc593c 100644
--- a/hpath.el
+++ b/hpath.el
@@ -523,13 +523,14 @@ paths are allowed.  Absolute pathnames must begin with a 
`/' or `~'."
    ;; ((hpath:is-p (hargs:delimited "file://" "[ \t\n\r\"\'\}]" nil t)))
    ((hpath:remote-at-p))
    ((hpath:www-at-p) nil)
-   ((hpath:is-p (hpath:delimited-possible-path) type non-exist))))
+   ((hpath:is-p (hpath:delimited-possible-path non-exist) type non-exist))))
 
 (defun hpath:delimited-possible-path (&optional non-exist)
   "Returns delimited possible path or non-delimited remote path at point, if 
any.
 No validity checking is done on the possible path.  Delimiters may be:
 double quotes, open and close single quote, whitespace, or Texinfo file 
references.
-With optional NON-EXIST, nonexistent local paths are allowed.  Absolute 
pathnames must begin with a `/' or `~'."
+With optional NON-EXIST, nonexistent local paths are allowed.  Absolute 
pathnames
+must begin with a `/' or `~'."
   (or (hargs:delimited "\"" "\"") 
       ;; Filenames in Info docs or Python files
       (hargs:delimited "[`'‘]" "[`'’]" t t)
diff --git a/hui-mouse.el b/hui-mouse.el
index 12255cb..469f365 100644
--- a/hui-mouse.el
+++ b/hui-mouse.el
@@ -221,7 +221,7 @@ Its default value is #'smart-scroll-down."
     ;;
     ;; Imenu listing in GNU Emacs
     ((smart-imenu-item-at-p)
-     . ((smart-imenu-display-item-where (car hkey-value) (cdr hkey-value)) 
.emacs
+     . ((smart-imenu-display-item-where (car hkey-value) (cdr hkey-value)) .
        (imenu-choose-buffer-index)))
     ;;
     ;; Function menu listing mode in XEmacs
diff --git a/hui.el b/hui.el
index b25eb6f..2bfb476 100644
--- a/hui.el
+++ b/hui.el
@@ -921,6 +921,11 @@ Buffer without File      link-to-buffer-tmp"
                 (buffer-file-name
                  (list 'link-to-file buffer-file-name (point)))
                 (t (list 'link-to-buffer-tmp (buffer-name))))
+               ;;
+               ;; Deleted link to elisp possibility as it can embed
+               ;; long elisp functions in the button data file and
+               ;; possibly not parse them correctly.
+               ;;
                ;; (and (fboundp 'smart-emacs-lisp-mode-p)
                ;;      (smart-emacs-lisp-mode-p)
                ;;      (or (eq (char-syntax (following-char)) ?\()
diff --git a/hversion.el b/hversion.el
index 4929ea8..e4529f9 100644
--- a/hversion.el
+++ b/hversion.el
@@ -23,7 +23,7 @@
 ;;; Public variables
 ;;; ************************************************************************
 
-(defconst hyperb:version "6.0.2a" "GNU Hyperbole revision number.")
+(defconst hyperb:version "6.0.2b" "GNU Hyperbole revision number.")
 
 ;;;###autoload
 (defvar hyperb:microcruft-os-p
diff --git a/hycontrol.el b/hycontrol.el
index d006612..dc0e894 100644
--- a/hycontrol.el
+++ b/hycontrol.el
@@ -194,7 +194,8 @@ set to 1.  If it is > `hycontrol-maximum-units', it is set 
to
                   ((eq e ?n) (set-frame-width nil (- (frame-width) arg)))
                   ((eq e ?o) (setq w (selected-window)) (other-window arg) (if 
(eq w (selected-window)) (other-window 1)))
                   ((eq e ?O) (setq w (selected-window)) (other-frame arg) (if 
(eq w (selected-window)) (other-frame 1)))
-                  ((memq e (list ?q (aref (kbd "<escape>") 0))) (throw 'done 
t))
+                  ;; ((memq e (list ?q (aref (kbd "<escape>") 0))) (throw 
'done t))
+                  ((eq e ?q) (throw 'done t))
                   ((eq e ?s) (set-frame-height nil (- (frame-height) arg)))
                   ((eq e ?t) (throw 'done nil))
                   ((eq e ?u) (unbury-buffer))
@@ -222,11 +223,13 @@ set to 1.  If it is > `hycontrol-maximum-units', it is 
set to
                   ((and (integerp e) (>= e ?0) (<= e ?9))
                    (setq arg (+ (* arg 10) (- e ?0)))
                    (if (> arg hycontrol-maximum-units) (setq arg (- e ?0))))
-                  ((hycontrol-handle-event e))
+                  ((hycontrol-handle-event e arg))
                   (t (beep)
-                     (if debug (hycontrol-message debug "(HyDebug): 
Frame/window unhandled event - %s" e))))
+                     (if debug (hycontrol-message debug "(HyDebug): 
Frame/window unhandled event - %s"
+                                                  (hycontrol-prettify-event 
e)))))
                  (discard-input))
-             (error (if debug (hycontrol-message debug "(HyDebug): 
Frame/window unhandled event - %s" e))
+             (error (if debug (hycontrol-message debug "(HyDebug): 
Frame/window unhandled event - %s"
+                                                 (hycontrol-prettify-event e)))
                     (discard-input)
                     (beep)))))
        (message "Finished controlling frames")
@@ -279,7 +282,8 @@ set to 1.  If it is > `hycontrol-maximum-units', it is set 
to
                   ((eq e ?n) (shrink-window-horizontally arg))
                   ((eq e ?o) (setq w (selected-window)) (other-window arg) (if 
(eq w (selected-window)) (other-window 1)))
                   ((eq e ?O) (setq w (selected-window)) (other-frame arg) (if 
(eq w (selected-window)) (other-frame 1)))
-                  ((memq e (list ?q (aref (kbd "<escape>") 0))) (throw 'done 
t))
+                  ;; ((memq e (list ?q (aref (kbd "<escape>") 0))) (throw 
'done t))
+                  ((eq e ?q) (throw 'done t))
                   ((eq e ?s) (shrink-window arg))
                   ((eq e ?t) (throw 'done nil))
                   ((eq e ?u) (unbury-buffer))
@@ -308,11 +312,13 @@ set to 1.  If it is > `hycontrol-maximum-units', it is 
set to
                   ((and (integerp e) (>= e ?0) (<= e ?9))
                    (setq arg (+ (* arg 10) (- e ?0)))
                    (if (> arg hycontrol-maximum-units) (setq arg (- e ?0))))
-                  ((hycontrol-handle-event e))
+                  ((hycontrol-handle-event e arg))
                   (t (beep)
-                     (if debug (hycontrol-message debug "(HyDebug): 
Frame/window unhandled event - %s" e))))
+                     (if debug (hycontrol-message debug "(HyDebug): 
Frame/window unhandled event - %s"
+                                                  (hycontrol-prettify-event 
e)))))
                  (discard-input))
-             (error (if debug (hycontrol-message debug "(HyDebug): 
Frame/window unhandled event - %s" e))
+             (error (if debug (hycontrol-message debug "(HyDebug): 
Frame/window unhandled event - %s"
+                                                  (hycontrol-prettify-event 
e)))
                     (beep)
                     (discard-input)))))
        (message "Finished controlling windows")
@@ -656,6 +662,14 @@ See its documentation for more information."
   (if (y-or-n-p "Delete all windows in this frame other than the selected 
one?")
       (delete-other-windows)))
 
+(defun hycontrol-prettify-event (e)
+  "Return a formatted version of event E ready for printing."
+  (cond ((integerp e)
+        (key-description (vector e)))
+       ((sequencep e) 
+        (key-description e))
+       (t e)))
+
 (defun hycontrol-frame-height (&optional frame)
   "Return the height of optional FRAME or the selected frame.  This includes 
all graphical window manager decorations.
 Under a graphical window system, this is in pixels; otherwise, it is in 
characters."
@@ -677,8 +691,10 @@ MAX-MSGS is a number used only if ZOOM-FUNC is undefined 
and an error message is
        (funcall zoom-func))
     (hycontrol-user-error max-msgs "(HyControl): Zooming requires separate 
\"zoom-frm.el\" Emacs Lisp library installation")))
 
-(defun hycontrol-handle-event (e)
-  "Process input event E or return nil if cannot process it."
+(defun hycontrol-handle-event (e arg)
+  "Process input event E with prefix ARG set and return it or return nil if 
cannot process it."
+  (setq current-prefix-arg arg)
+  (if (eq e 'escape) (setq e 27)) ; Convert escape symbol to character code.
   (cond ((listp e)
         (cond
          ((eq (car e) 'delete-frame)
@@ -699,13 +715,27 @@ MAX-MSGS is a number used only if ZOOM-FUNC is undefined 
and an error message is
         (if (commandp (key-binding (vector e)))
             (call-interactively (key-binding (vector e)))
           (setq e nil)))
-       ;; Doesn't work right for self-insert-chars, so ignore integers.
-       ;; ((integerp e)
-       ;;  (if (commandp (key-binding (char-to-string e)))
-       ;;      (call-interactively (key-binding (char-to-string e)))
-       ;;    (setq e nil)))
+       ;; Ignore self-insert-chars since many characters are used as
+       ;; HyControl commands.
+       ((integerp e)
+        (cond ((keymapp (key-binding (vector e)))
+               ;; Read a whole key sequence to get the binding
+               (let ((keys (vector)))
+                 (while (and (if (eq e 'escape) (setq e 27) t) ; Convert 
escape symbol to character code.
+                             (setq keys (vconcat keys (vector e)))
+                             (keymapp (key-binding (vector e))))
+                   (setq e (read-key)))
+                 (cond ((and (commandp (key-binding keys))
+                             (not (memq (key-binding keys) 
'(self-insert-command))))
+                        (call-interactively (key-binding keys)))
+                       (t (setq e nil)))
+                 (discard-input)))
+              ((and (commandp (key-binding (vector e)))
+                    (not (memq (key-binding (vector e)) 
'(self-insert-command))))
+               (call-interactively (key-binding (vector e))))
+              (t (setq e nil))))
        (t (setq e nil)))
-  (if e t))
+  e)
 
 (defun hycontrol-make-frame ()
    "Create and select a new frame with the same size and selected buffer as 
the selected frame.
diff --git a/hyperbole-pkg.el b/hyperbole-pkg.el
index 0ecf320..6d33147 100644
--- a/hyperbole-pkg.el
+++ b/hyperbole-pkg.el
@@ -1,5 +1,5 @@
 ;; -*- no-byte-compile: t -*-
-(define-package "hyperbole" "6.0.2" "GNU Hyperbole: The Everyday Hypertextual 
Information Manager"
+(define-package "hyperbole" "6.0.2b" "GNU Hyperbole: The Everyday Hypertextual 
Information Manager"
   '((emacs "24.4"))
   :url "http://www.gnu.org/software/hyperbole";
   :keywords '("comm" "convenience" "files" "frames" "hypermedia" "languages"
diff --git a/man/hyperbole.html b/man/hyperbole.html
index 0d6bd40..cb356f3 100644
--- a/man/hyperbole.html
+++ b/man/hyperbole.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
 <html>
 <!-- This manual is for GNU Hyperbole
-(Edition 6.0.2, Published August 9, 2016).
+(Edition 6.0.2b, Published October 1, 2017).
 
 Copyright (C) 1989-2016  Free Software Foundation, Inc.
 
@@ -322,8 +322,8 @@ WITHOUT ANY WARRANTY, without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.</P>
 
 <PRE>
-Edition 6.0.2a
-Printed September 28, 2017.
+Edition 6.0.2b
+Printed October 1, 2017.
 
   Published by the Free Software Foundation, Inc.
   Author:    Bob Weiner
@@ -737,7 +737,7 @@ Next: <a href="#Buttons" accesskey="n" 
rel="next">Buttons</a>, Previous: <a href
 <h2 class="chapter">1 Introduction</h2>
 
 <p>This edition of the GNU Hyperbole Manual is for use with any version
-6.0.2a or greater of GNU Hyperbole.  Hyperbole runs atop GNU Emacs 24.3
+6.0.2b or greater of GNU Hyperbole.  Hyperbole runs atop GNU Emacs 24.3
 or higher.  It will trigger an error if your Emacs is older.
 </p>
 <p>This chapter summarizes the structure of the rest of the manual,
@@ -3454,10 +3454,10 @@ f}</kbd>.
 <a name="index-submodes"></a>
 <p>Once in HyControl, your minibuffer window at the bottom of the
 selected frame will display a summary of keys you may use to adjust
-your windows until you press <kbd>{q}</kbd> or <kbd>{<span 
class="key">ESC</span>}</kbd> to quit from
-HyControl.  The key, <kbd>{t}</kbd>, will always toggle between controlling
-frames and windows, the <em>submodes</em> of HyControl, with the upper
-left of the minibuffer prompt showing which type of control is active.
+your windows until you press <kbd>{q}</kbd> to quit from HyControl.  The
+key, <kbd>{t}</kbd>, will always toggle between controlling frames and
+windows, the <em>submodes</em> of HyControl, with the upper left of the
+minibuffer prompt showing which type of control is active.
 </p>
 <a name="index-numeric-argument"></a>
 <a name="index-multiplier"></a>
@@ -3724,10 +3724,9 @@ sizes by which to zoom.
 <dd><p>Toggle between WINDOW and FRAME submodes.
 </p>
 <a name="index-screen_002c-q"></a>
-<a name="index-screen_002c-ESC"></a>
-<a name="index-q-or-ESC"></a>
+<a name="index-q-1"></a>
 </dd>
-<dt><kbd>{q or <span class="key">ESC</span>}</kbd></dt>
+<dt><kbd>{q}</kbd></dt>
 <dd><p>Quit from HyControl mode and restore normal key bindings.
 </p></dd>
 </dl>
@@ -10411,7 +10410,7 @@ Next: <a href="#Function" accesskey="n" 
rel="next">Function</a>, Previous: <a hr
 <tr><td colspan="4"> <hr></td></tr>
 <tr><th><a name="Key-Index_ky_letter-Q">Q</a></th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a 
href="#index-q"><code>q</code></a>:</td><td>&nbsp;</td><td valign="top"><a 
href="#Menus">Menus</a></td></tr>
-<tr><td></td><td valign="top"><a href="#index-q-or-ESC"><code>q or <span 
class="key">ESC</span></code></a>:</td><td>&nbsp;</td><td valign="top"><a 
href="#HyControl">HyControl</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="#index-q-1"><code>q</code></a>:</td><td>&nbsp;</td><td valign="top"><a 
href="#HyControl">HyControl</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
 <tr><th><a name="Key-Index_ky_letter-R">R</a></th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a 
href="#index-right"><code>right</code></a>:</td><td>&nbsp;</td><td 
valign="top"><a href="#HyControl">HyControl</a></td></tr>
@@ -10460,7 +10459,6 @@ Next: <a href="#Function" accesskey="n" 
rel="next">Function</a>, Previous: <a hr
 <tr><td></td><td valign="top"><a href="#index-screen_002c-d"><code>screen, 
d</code></a>:</td><td>&nbsp;</td><td valign="top"><a 
href="#HyControl">HyControl</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-screen_002c-D"><code>screen, 
D</code></a>:</td><td>&nbsp;</td><td valign="top"><a 
href="#HyControl">HyControl</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-screen_002c-down"><code>screen, 
down</code></a>:</td><td>&nbsp;</td><td valign="top"><a 
href="#HyControl">HyControl</a></td></tr>
-<tr><td></td><td valign="top"><a href="#index-screen_002c-ESC"><code>screen, 
<span class="key">ESC</span></code></a>:</td><td>&nbsp;</td><td valign="top"><a 
href="#HyControl">HyControl</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-screen_002c-f"><code>screen, 
f</code></a>:</td><td>&nbsp;</td><td valign="top"><a 
href="#HyControl">HyControl</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-screen_002c-h"><code>screen, 
h</code></a>:</td><td>&nbsp;</td><td valign="top"><a 
href="#HyControl">HyControl</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-screen_002c-H"><code>screen, 
H</code></a>:</td><td>&nbsp;</td><td valign="top"><a 
href="#HyControl">HyControl</a></td></tr>
diff --git a/man/hyperbole.info b/man/hyperbole.info
index 8cdb9a8..2890fca 100644
Binary files a/man/hyperbole.info and b/man/hyperbole.info differ
diff --git a/man/hyperbole.pdf b/man/hyperbole.pdf
index ee0eec3..d368a82 100644
Binary files a/man/hyperbole.pdf and b/man/hyperbole.pdf differ
diff --git a/man/hyperbole.texi b/man/hyperbole.texi
index bb61e1b..f41ff3c 100644
--- a/man/hyperbole.texi
+++ b/man/hyperbole.texi
@@ -151,8 +151,8 @@ WITHOUT ANY WARRANTY, without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.</P>
 
 <PRE>
-Edition 6.0.2a
-Printed September 28, 2017.
+Edition 6.0.2b
+Printed October 1, 2017.
 
   Published by the Free Software Foundation, Inc.
   Author:    Bob Weiner
@@ -176,7 +176,7 @@ Printed September 28, 2017.
 
 @center The Everyday Hypertextual Information Manager
 
address@hidden Edition 6.0.2a, September 28, 2017.
address@hidden Edition 6.0.2b, October 1, 2017.
 
 @sp 2
 @noindent
@@ -444,7 +444,7 @@ Smart Keyboard Keys
 @chapter Introduction
 
 This edition of the GNU Hyperbole Manual is for use with any version
-6.0.2a or greater of GNU Hyperbole.  Hyperbole runs atop GNU Emacs 24.3
+6.0.2b or greater of GNU Hyperbole.  Hyperbole runs atop GNU Emacs 24.3
 or higher.  It will trigger an error if your Emacs is older.
 
 This chapter summarizes the structure of the rest of the manual,
@@ -2812,10 +2812,10 @@ f}.
 @cindex submodes
 Once in HyControl, your minibuffer window at the bottom of the
 selected frame will display a summary of keys you may use to adjust
-your windows until you press @bkbd{q} or @address@hidden to quit from
-HyControl.  The key, @bkbd{t}, will always toggle between controlling
-frames and windows, the @dfn{submodes} of HyControl, with the upper
-left of the minibuffer prompt showing which type of control is active.
+your windows until you press @bkbd{q} to quit from HyControl.  The
+key, @bkbd{t}, will always toggle between controlling frames and
+windows, the @dfn{submodes} of HyControl, with the upper left of the
+minibuffer prompt showing which type of control is active.
 
 @cindex numeric argument
 @cindex multiplier
@@ -3009,8 +3009,7 @@ FRAME mode zooming requires the separately available
 Toggle between WINDOW and FRAME submodes.
 
 @kindex screen, q
address@hidden screen, @key{ESC}
address@hidden q or @key{ESC}
address@hidden q
 Quit from HyControl mode and restore normal key bindings.
 @end table
 
diff --git a/man/version.texi b/man/version.texi
index c78c2a1..d8cece6 100644
--- a/man/version.texi
+++ b/man/version.texi
@@ -1,4 +1,4 @@
address@hidden UPDATED August 9, 2016
address@hidden UPDATED-MONTH AUG 2016
address@hidden EDITION 6.0.2
address@hidden VERSION 6.0.2
address@hidden UPDATED October 1, 2017
address@hidden UPDATED-MONTH OCT 2017
address@hidden EDITION 6.0.2b
address@hidden VERSION 6.0.2b