[elpa] externals/hyperbole 50dc88d 23/53: V6.0.2c - Smart Key and popup menu buffer fixes; simplified Assist Key handling code

[Robert Weiner]

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

    V6.0.2c - Smart Key and popup menu buffer fixes; simplified Assist Key 
handling code
    
    2017-10-04  Bob Weiner  <address@hidden>
    
    * man/hyperbole.texi (Version): Updated to 6.0.2c and rebuilt output 
formats.
    
    * hmouse-sh.el (hmouse-bind-key): Renamed to hmouse-bind-key-emacs since is 
emacs-only.
                   (hmouse-bind-shifted-key): Renamed to 
hmouse-bind-shifted-key-emacs.
    
    2017-10-03  Bob Weiner  <address@hidden>
    
    * hui-window.el (hmouse-alist): In hmouse-drag-horizontally test, removed 
check of
       (not (hmouse-drag-between-windows)) since was tested earlier in 
hmouse-alist.
                    (hmouse-resize-window-side, hmouse-release-left-edge,
                     hmouse-swap-buffers, hmouse-swap-windows,
                     hmouse-modeline-resize-window, hmouse-release-right-edge,
                     hmouse-modeline-click, hmouse-modeline-release): Removed 
optional
        assist-flag arg; used assist-flag free variable instead.
    
    * hmouse-tag.el (smart-tags-display): Fixed to include tags-table found in 
any
        ancestor directory of current directory when tags-table-list already
        contains items.
    
    * hpath.el (hpath:find-program): Changed so Hyperbole external and internal
        file suffix lists are consulted before using standard directory or
        image display methods.  So for example, Emacs.app on macOS, which is 
actually
        a directory, can be displayed/run externally.
               (hpath:external-display-alist-macos): Added .app suffix.
    
    * hui-jmenu.el (hui-menu-buffer-mode-name): mode-name might not be a 
string; pass it through
        format-mode-line to ensure it is a string.  Without this, 
hui-menu-of-buffers could
        trigger an error on some buffers.
---
 .hypb              | Bin 2990 -> 3645 bytes
 Changes            |  35 ++++++++++++++++++++++++++++++-
 HY-ABOUT           |   2 +-
 HY-ANNOUNCE        |   2 +-
 HY-NEWS            |   2 +-
 Makefile           |   2 +-
 hmouse-key.el      |   2 +-
 hmouse-sh.el       |  16 +++++++-------
 hmouse-tag.el      |   5 +++--
 hpath.el           |  12 +++++------
 hui-jmenu.el       |   8 +++++--
 hui-window.el      |  60 ++++++++++++++++++++++++-----------------------------
 hversion.el        |   2 +-
 hyperbole-pkg.el   |   2 +-
 man/hyperbole.html |   8 +++----
 man/hyperbole.info | Bin 438289 -> 438289 bytes
 man/hyperbole.pdf  | Bin 798605 -> 798604 bytes
 man/hyperbole.texi |   8 +++----
 man/version.texi   |   6 +++---
 19 files changed, 102 insertions(+), 70 deletions(-)

diff --git a/.hypb b/.hypb
index 771efd1..914bbde 100644
Binary files a/.hypb and b/.hypb differ
diff --git a/Changes b/Changes
index 69028b5..141b7b0 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,34 @@
+2017-10-04  Bob Weiner  <address@hidden>
+
+* man/hyperbole.texi (Version): Updated to 6.0.2c and rebuilt output formats.
+
+* hmouse-sh.el (hmouse-bind-key): Renamed to hmouse-bind-key-emacs since is 
emacs-only.
+               (hmouse-bind-shifted-key): Renamed to 
hmouse-bind-shifted-key-emacs.
+
+2017-10-03  Bob Weiner  <address@hidden>
+
+* hui-window.el (hmouse-alist): In hmouse-drag-horizontally test, removed 
check of
+   (not (hmouse-drag-between-windows)) since was tested earlier in 
hmouse-alist.
+                (hmouse-resize-window-side, hmouse-release-left-edge,
+                 hmouse-swap-buffers, hmouse-swap-windows,
+                 hmouse-modeline-resize-window, hmouse-release-right-edge,
+                 hmouse-modeline-click, hmouse-modeline-release): Removed 
optional
+    assist-flag arg; used assist-flag free variable instead.
+
+* hmouse-tag.el (smart-tags-display): Fixed to include tags-table found in any
+    ancestor directory of current directory when tags-table-list already
+    contains items.
+
+* hpath.el (hpath:find-program): Changed so Hyperbole external and internal
+    file suffix lists are consulted before using standard directory or
+    image display methods.  So for example, Emacs.app on macOS, which is 
actually
+    a directory, can be displayed/run externally.
+           (hpath:external-display-alist-macos): Added .app suffix.
+
+* hui-jmenu.el (hui-menu-buffer-mode-name): mode-name might not be a string; 
pass it through
+    format-mode-line to ensure it is a string.  Without this, 
hui-menu-of-buffers could
+    trigger an error on some buffers.
+
 2017-10-02  Bob Weiner  <address@hidden>
 
 * hui-window.el (hmouse-pulse-flag): Added to allow disabling visual pulsing 
in Action Mouse
@@ -39,6 +70,8 @@
 * hui-window.el (hmouse-item-to-window): When drag from fixed menu header 
line, pulse the menu
     buffer and move the menu buffer itself to the drag release window.
 
+* man/hyperbole.texi (Version): Updated to 6.0.2b and rebuilt output formats.
+
 * hycontrol.el (hycontrol-handle-event): 
                (hycontrol-prettify-event): Fixed to handle large integer code 
events, e.g. M-p.
 
@@ -70,7 +103,7 @@
 * 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 (Version): Updated to 6.0.2a and rebuilt output formats.
 
 * man/hyperbole.texi (View Specs): Noted that ellipses can no longer be
     turned off.
diff --git a/HY-ABOUT b/HY-ABOUT
index d1574ca..8c7153f 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.2b
+                            Version 6.0.2c
 
 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 4012e22..cfd8e75 100644
--- a/HY-ANNOUNCE
+++ b/HY-ANNOUNCE
@@ -1,4 +1,4 @@
-ANNOUNCE: GNU Hyperbole 6.0.2b for Emacs 24.4 or newer is released
+ANNOUNCE: GNU Hyperbole 6.0.2c 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 2a76fda..877abe3 100644
--- a/HY-NEWS
+++ b/HY-NEWS
@@ -4,7 +4,7 @@
           (See "Changes" for more complete details of changes.)
 
 ===========================================================================
-*                                  V6.0.2b
+*                                  V6.0.2
 ===========================================================================
 
   BUTTONS
diff --git a/Makefile b/Makefile
index e3cec2f..9de2078 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.2b
+HYPB_VERSION = 6.0.2c
 
 # Emacs executable used to byte-compile .el files into .elc's.
 # Possibilities include: emacs, infodock, xemacs, etc.
diff --git a/hmouse-key.el b/hmouse-key.el
index 0b832c7..158f4ef 100644
--- a/hmouse-key.el
+++ b/hmouse-key.el
@@ -119,7 +119,7 @@ Assist Key = shift-right mouse key."
   (interactive)
   (if hyperb:emacs-p
       (progn (hmouse-install t)
-            (hmouse-bind-key 3 #'assist-key-depress-emacs 
#'assist-mouse-key-emacs))
+            (hmouse-bind-key-emacs 3 #'assist-key-depress-emacs 
#'assist-mouse-key-emacs))
     (error "(hmouse-add-unshifted-smart-keys): Works under only GNU Emacs 19 
or above")))
 
 (defun hmouse-toggle-bindings ()
diff --git a/hmouse-sh.el b/hmouse-sh.el
index 379e9de..383d951 100644
--- a/hmouse-sh.el
+++ b/hmouse-sh.el
@@ -30,7 +30,7 @@
 ;;   right-divider
 ;;   bottom-divider
 
-(defun hmouse-bind-key (mouse-key-number depress-cmd release-cmd)
+(defun hmouse-bind-key-emacs (mouse-key-number depress-cmd release-cmd)
   "Ensure MOUSE-KEY-NUMBER (1-5), e.g. 1 for [mouse-1], is globally bound to 
DEPRESS-CMD and RELEASE-CMD (includes depresses and drags).
 Use nil as cmd values to unbind a key.  Works under GNU Emacs only."
   (hmouse-set-key-list
@@ -138,7 +138,7 @@ Use nil as cmd values to unbind a key.  Works under GNU 
Emacs only."
           [mode-line mouse-5])
          ))))
 
-(defun hmouse-bind-shifted-key (shifted-mouse-key-number depress-cmd 
release-cmd)
+(defun hmouse-bind-shifted-key-emacs (shifted-mouse-key-number depress-cmd 
release-cmd)
   "Ensure shifted MOUSE-KEY-NUMBER (1-5), e.g. 1 for [Smouse-1], is globally 
bound to DEPRESS-CMD and RELEASE-CMD (includes depresses and drags).
 Use nil as CMD value to unbind the key.  Works under GNU Emacs only."
   (hmouse-set-key-list
@@ -475,11 +475,11 @@ select the corresponding element around point."
       (if (eq window-system 'dps)
          ;; NEXTSTEP offers only 2 shift-mouse buttons which we use as the 
Smart Keys.
          (progn
-           (hmouse-bind-shifted-key 1 #'action-key-depress-emacs 
#'action-mouse-key-emacs)
-           (hmouse-bind-shifted-key 2 #'assist-key-depress-emacs 
#'assist-mouse-key-emacs))
+           (hmouse-bind-shifted-key-emacs 1 #'action-key-depress-emacs 
#'action-mouse-key-emacs)
+           (hmouse-bind-shifted-key-emacs 2 #'assist-key-depress-emacs 
#'assist-mouse-key-emacs))
        ;; X, OS X or MS Windows
-       (hmouse-bind-shifted-key 2 #'action-key-depress-emacs 
#'action-mouse-key-emacs)
-       (hmouse-bind-shifted-key 3 #'assist-key-depress-emacs 
#'assist-mouse-key-emacs)))
+       (hmouse-bind-shifted-key-emacs 2 #'action-key-depress-emacs 
#'action-mouse-key-emacs)
+       (hmouse-bind-shifted-key-emacs 3 #'assist-key-depress-emacs 
#'assist-mouse-key-emacs)))
      ;;
      ;; XEmacs
      ((featurep 'xemacs)
@@ -537,8 +537,8 @@ select the corresponding element around point."
     ;;
     (if (not (eq window-system 'dps))
        ;; X, OS X or MS Windows
-       (progn (hmouse-bind-key 2 #'action-key-depress-emacs 
#'action-mouse-key-emacs)
-              ;; (hmouse-bind-key 3 #'assist-key-depress-emacs 
#'assist-mouse-key-emacs)
+       (progn (hmouse-bind-key-emacs 2 #'action-key-depress-emacs 
#'action-mouse-key-emacs)
+              ;; (hmouse-bind-key-emacs 3 #'assist-key-depress-emacs 
#'assist-mouse-key-emacs)
               )))
    ;;
    ;; XEmacs
diff --git a/hmouse-tag.el b/hmouse-tag.el
index 9c0fe34..d6c3c19 100644
--- a/hmouse-tag.el
+++ b/hmouse-tag.el
@@ -1217,7 +1217,7 @@ See the \"${hyperb:dir}/smart-clib-sym\" script for more 
information."
   (if next (setq tag nil))
   (let* ((tags-table-list (or list-of-tags-tables
                              (and (boundp 'tags-table-list)
-                                  tags-table-list)
+                                  (nconc (smart-tags-file-list) 
tags-table-list))
                              (smart-tags-file-list)))
         (func (smart-tags-noselect-function))
         (tags-file-name (if tags-table-list
@@ -1304,9 +1304,10 @@ to look.  If no tags file is found, an error is 
signaled."
        (setq tags-table-list (list smart-emacs-tags-file)))
     ;; Return the appropriate tags file list.
     (cond (tags-table-list
+          ;; GNU Emacs when tags tables are found or provided by the user
           (nreverse tags-table-list))
          ((fboundp 'tags-table-check-computed-list)
-          ;; GNU Emacs
+          ;; GNU Emacs in other cases
           (tags-table-check-computed-list)
           tags-table-computed-list)
          ((fboundp 'buffer-tag-table-list)
diff --git a/hpath.el b/hpath.el
index e4a08cd..a2d1c6b 100644
--- a/hpath.el
+++ b/hpath.el
@@ -50,7 +50,7 @@ possible suffixes."
   :type 'string
   :group 'hyperbole-commands)
 
-(defcustom hpath:external-display-alist-macos (list (cons (format 
"\\.\\(%s\\|adaptor\\|app\\|bshlf\\|clr\\|concur\\|create\\|diagram\\|dp\\|e?ps\\|frame\\|gif\\|locus\\|Mesa\\|nib\\|pdf\\|project\\|rtf\\|sense\\|tiff\\|tree\\)$"
+(defcustom hpath:external-display-alist-macos (list (cons (format 
"\\.\\(app\\|%s\\|adaptor\\|app\\|bshlf\\|clr\\|concur\\|create\\|diagram\\|dp\\|e?ps\\|frame\\|gif\\|locus\\|Mesa\\|nib\\|pdf\\|project\\|rtf\\|sense\\|tiff\\|tree\\)$"
                                                                  
hpath:external-open-office-suffixes)
                                                          "open"))
   "*An alist of (FILENAME-REGEXP . DISPLAY-PROGRAM-STRING-OR-LIST)
@@ -1322,15 +1322,15 @@ from path or t."
 Return nil if FILENAME is a directory name or an image file that emacs can 
display.
 See also documentation for the function (hpath:get-external-display-alist) and 
the variable
 `hpath:internal-display-alist'."
-  (cond ((and (stringp filename) (file-directory-p filename))
+  (cond ((let ((case-fold-search t))
+          (hpath:match filename (hpath:get-external-display-alist))))
+       ((let ((case-fold-search nil))
+          (hpath:match filename hpath:internal-display-alist)))
+       ((and (stringp filename) (file-directory-p filename))
         nil)
        ((and (fboundp 'image-mode)
              (string-match hpath:native-image-suffixes filename))
         nil)
-       ((let ((case-fold-search t))
-          (hpath:match filename (hpath:get-external-display-alist))))
-       ((let ((case-fold-search nil))
-            (hpath:match filename hpath:internal-display-alist)))
        (t (hpath:find-file-mailcap filename))))
 
 (defun hpath:match (filename regexp-alist)
diff --git a/hui-jmenu.el b/hui-jmenu.el
index 9b0bb8e..2ce1744 100644
--- a/hui-jmenu.el
+++ b/hui-jmenu.el
@@ -141,9 +141,13 @@
 ;;; ************************************************************************
 
 (defun hui-menu-buffer-mode-name (buffer)
-  (or (cdr (assq 'mode-name (buffer-local-variables buffer)))
+  (let ((mname (cdr (assq 'mode-name (buffer-local-variables buffer)))))
+    (if mname
+       ;; Next line needed to ensure mode name is always formatted as
+       ;; a string.
+       (format-mode-line mname)
       (capitalize (symbol-name
-                  (cdr (assq 'major-mode (buffer-local-variables buffer)))))))
+                  (cdr (assq 'major-mode (buffer-local-variables buffer))))))))
 
 (defun hui-menu-frame-name (frame)
   "Return the name of FRAME."
diff --git a/hui-window.el b/hui-window.el
index 757b030..6ab475e 100644
--- a/hui-window.el
+++ b/hui-window.el
@@ -63,6 +63,7 @@ of screen control commands."
   :type 'function
   :group 'hyperbole-keys)
 
+;; Set this to `hmouse-context-ibuffer-menu' if you use the ibuffer package.
 (defcustom action-key-modeline-function #'hmouse-context-menu
   "Function to call when the Action Mouse Key is clicked in the center portion 
of a modeline."
   :type 'function
@@ -121,17 +122,16 @@ of screen control commands."
                ((hmouse-drag-thing) .
                 ((hmouse-yank-region) . (hmouse-kill-and-yank-region)))
                ((hmouse-drag-window-side) .
-                ((hmouse-resize-window-side) . (hmouse-resize-window-side 
'assist)))
+                ((hmouse-resize-window-side) . (hmouse-resize-window-side)))
                ((hmouse-modeline-depress) .
                 ((action-key-modeline) . (assist-key-modeline)))
                ((hmouse-drag-between-windows) .
                 ;; Note that `hui:link-directly' uses any active
                 ;; region as the label of the button to create.
-                ((or (hmouse-drag-item-to-window) (hui:link-directly)) . 
(hmouse-swap-buffers 'assist)))
+                ((or (hmouse-drag-item-to-window) (hui:link-directly)) . 
(hmouse-swap-buffers)))
                ((hmouse-drag-region-active) .
                 ((hmouse-drag-not-allowed) . (hmouse-drag-not-allowed)))
-               ((setq hkey-value (and (not (hmouse-drag-between-windows))
-                                      (hmouse-drag-horizontally))) .
+               ((setq hkey-value (hmouse-drag-horizontally)) .
                 ((hmouse-horizontal-action-drag) . 
(hmouse-horizontal-assist-drag)))
                ((hmouse-drag-vertically) .
                 ((hmouse-vertical-action-drag) . 
(hmouse-vertical-assist-drag)))
@@ -689,25 +689,24 @@ If the Assist Key is:
   (let ((buffers)
        (w (smart-window-of-coords assist-key-depress-args)))
     (if w (select-window w))
-    (cond ((hmouse-modeline-click 'assist)
-          (cond ((hmouse-release-left-edge 'assist)
+    (cond ((hmouse-modeline-click)
+          (cond ((hmouse-release-left-edge)
                  (if (fboundp 'last)
                      (switch-to-buffer (car (last (buffer-list))))
                    (setq buffers (buffer-list))
                    (switch-to-buffer (nth (1- (length buffers)) buffers))))
-                ((hmouse-release-right-edge 'assist)
+                ((hmouse-release-right-edge)
                  (if (string-match "Hyperbole Smart Keys" (buffer-name))
                      (hkey-help-hide)
                    (hkey-summarize 'current-window)))
                 (t (funcall assist-key-modeline-function))))
-         (t (hmouse-modeline-resize-window 'assist)))))
+         (t (hmouse-modeline-resize-window)))))
 
-(defun hmouse-modeline-click (&optional assist-flag)
-  "Returns non-nil if last Action Key depress and release was at same point in 
a modeline.
-Optional ASSIST-FLAG non-nil means test for Assist Key click instead."
+(defun hmouse-modeline-click ()
+  "Returns non-nil if last Smart Key depress and release was at a single point 
in a modeline."
   ;; Assume depress was in modeline and that any drag has already been handled.
   ;; So just check that release was in modeline.
-  (hmouse-modeline-release assist-flag))
+  (hmouse-modeline-release))
 
 (defun hmouse-modeline-depress ()
   "Returns non-nil if Action Key was depressed on a window mode line.
@@ -725,9 +724,8 @@ If free variable `assist-flag' is non-nil, uses Assist Key."
            (if (not (eq w (minibuffer-window))) (setq mode-ln (1- mode-ln)))
            (and last-press-y mode-ln (= last-press-y mode-ln)))))))
 
-(defun hmouse-modeline-release (&optional assist-flag)
-  "Returns non-nil if Action Key was released on a window mode line.
-Optional non-nil ASSIST-FLAG means test release of Assist Key instead."
+(defun hmouse-modeline-release ()
+  "Returns non-nil if Smart Key was released on a window mode line."
   (let ((args (if assist-flag assist-key-release-args
                action-key-release-args)))
     (if (and (hyperb:window-system) args)
@@ -738,11 +736,10 @@ Optional non-nil ASSIST-FLAG means test release of Assist 
Key instead."
                 (last-press-y (hmouse-y-coord args)))
            (and last-press-y mode-ln (= last-press-y mode-ln)))))))
 
-(defun hmouse-modeline-resize-window (&optional assist-flag)
-  "Resizes window whose mode line was depressed upon by the Action Key.
+(defun hmouse-modeline-resize-window ()
+  "Resizes window whose mode line was depressed on by the last Smart Key.
 Resize amount depends upon the vertical difference between press and release
-of the Action Key.  Optional arg ASSIST-FLAG non-nil means use values from
-Assist Key instead."
+of the Smart Key."
   (cond ((not (hyperb:window-system)) nil)
        ((and (featurep 'xemacs) (not (fboundp 'window-edges)))
         (error "Drag from a mode-line with button1 to resize windows."))
@@ -784,8 +781,8 @@ Assist Key instead."
                         (error nil)))
                   (select-window owind))))))))
 
-(defun hmouse-release-left-edge (&optional assist-flag)
-  "Returns non-nil if last Action Key release was at left window edge.
+(defun hmouse-release-left-edge ()
+  "Returns non-nil if last Smart Key release was at left window edge.
 `hmouse-edge-sensitivity' value determines how near to actual edge the
 release must be."
   (let ((args (if assist-flag assist-key-release-args
@@ -802,8 +799,8 @@ release must be."
                           hmouse-edge-sensitivity)
         (>= (- last-release-x window-left) 0))))
 
-(defun hmouse-release-right-edge (&optional assist-flag)
-  "Returns non-nil if last Action Key release was at right window edge.
+(defun hmouse-release-right-edge ()
+  "Returns non-nil if the last Smart Key release was at right window edge.
 `hmouse-edge-sensitivity' value determines how near to actual edge the
 release must be."
   (let ((args (if assist-flag assist-key-release-args
@@ -820,11 +817,10 @@ release must be."
                            window-right)
         (>= (- window-right last-release-x) 0))))
 
-(defun hmouse-resize-window-side (&optional assist-flag)
-  "Resizes window whose side was depressed upon by the Action Key.
+(defun hmouse-resize-window-side ()
+  "Resizes window whose side was depressed on by the last Smart Key.
 Resize amount depends upon the horizontal difference between press and release
-of the Action Key.  Optional arg ASSIST-FLAG non-nil means use values from
-Assist Key instead."
+of the Smart Key."
   (cond ((featurep 'xemacs)
         ;; Depress events in scrollbars or in non-text area of buffer are
         ;; not visible or identifiable at the Lisp-level, so always return
@@ -863,9 +859,8 @@ Assist Key instead."
                     (shrink-window-horizontally shrink-amount))
                 (select-window owind))))))))
 
-(defun hmouse-swap-buffers (&optional assist-flag)
-  "Swaps buffers in windows selected with last Action Key depress and release.
-If optional arg ASSIST-FLAG is non-nil, uses Assist Key."
+(defun hmouse-swap-buffers ()
+  "Swaps buffers in windows selected with the last Smart Key depress and 
release."
   (let* ((w1 (if assist-flag assist-key-depress-window
               action-key-depress-window))
         (w2 (if assist-flag assist-key-release-window
@@ -879,9 +874,8 @@ If optional arg ASSIST-FLAG is non-nil, uses Assist Key."
     (set-window-buffer w1 w2-buf)
     (set-window-buffer w2 w1-buf)))
 
-(defun hmouse-swap-windows (&optional assist-flag)
-  "Swaps windows selected with last Action Key depress and release.
-If optional arg ASSIST-FLAG is non-nil, uses Assist Key."
+(defun hmouse-swap-windows ()
+  "Swaps the sizes of 2 windows selected with the last Smart Key depress and 
release."
   (let* ((w1 (if assist-flag assist-key-depress-window
               action-key-depress-window))
         (w2 (if assist-flag assist-key-release-window
diff --git a/hversion.el b/hversion.el
index e4529f9..7986148 100644
--- a/hversion.el
+++ b/hversion.el
@@ -23,7 +23,7 @@
 ;;; Public variables
 ;;; ************************************************************************
 
-(defconst hyperb:version "6.0.2b" "GNU Hyperbole revision number.")
+(defconst hyperb:version "6.0.2c" "GNU Hyperbole revision number.")
 
 ;;;###autoload
 (defvar hyperb:microcruft-os-p
diff --git a/hyperbole-pkg.el b/hyperbole-pkg.el
index 6d33147..d796c78 100644
--- a/hyperbole-pkg.el
+++ b/hyperbole-pkg.el
@@ -1,5 +1,5 @@
 ;; -*- no-byte-compile: t -*-
-(define-package "hyperbole" "6.0.2b" "GNU Hyperbole: The Everyday Hypertextual 
Information Manager"
+(define-package "hyperbole" "6.0.2c" "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 cb356f3..a6ddc4f 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.2b, Published October 1, 2017).
+(Edition 6.0.2c, Published October 4, 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.2b
-Printed October 1, 2017.
+Edition 6.0.2c
+Printed October 4, 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.2b or greater of GNU Hyperbole.  Hyperbole runs atop GNU Emacs 24.3
+6.0.2c 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,
diff --git a/man/hyperbole.info b/man/hyperbole.info
index 2890fca..3bf76ab 100644
Binary files a/man/hyperbole.info and b/man/hyperbole.info differ
diff --git a/man/hyperbole.pdf b/man/hyperbole.pdf
index d368a82..cc125e8 100644
Binary files a/man/hyperbole.pdf and b/man/hyperbole.pdf differ
diff --git a/man/hyperbole.texi b/man/hyperbole.texi
index f41ff3c..a84a81b 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.2b
-Printed October 1, 2017.
+Edition 6.0.2c
+Printed October 4, 2017.
 
   Published by the Free Software Foundation, Inc.
   Author:    Bob Weiner
@@ -176,7 +176,7 @@ Printed October 1, 2017.
 
 @center The Everyday Hypertextual Information Manager
 
address@hidden Edition 6.0.2b, October 1, 2017.
address@hidden Edition 6.0.2c, October 4, 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.2b or greater of GNU Hyperbole.  Hyperbole runs atop GNU Emacs 24.3
+6.0.2c 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,
diff --git a/man/version.texi b/man/version.texi
index d8cece6..253bec7 100644
--- a/man/version.texi
+++ b/man/version.texi
@@ -1,4 +1,4 @@
address@hidden UPDATED October 1, 2017
address@hidden UPDATED October 4, 2017
 @set UPDATED-MONTH OCT 2017
address@hidden EDITION 6.0.2b
address@hidden VERSION 6.0.2b
address@hidden EDITION 6.0.2c
address@hidden VERSION 6.0.2c