[elpa] externals/hyperbole 1f27deb 09/20: * hibtypes.el (annot-bib): Added markdown-mode to the excluded list to avoid conflict with its links.

[Robert Weiner]

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

    * hibtypes.el (annot-bib): Added markdown-mode to the excluded list to 
avoid conflict with its links.
                  (markdown-internal-link): Added to follow internal Markdown 
links.
      man/hyperbole.texi: (Implicit Buttons): Added markdown-internal-link.
    
    * hsys-www.el: Renamed from hsys-w3.el since it is not related to the Emacs 
W3 web browser any longer.
    
    * Demo (HTML and Markdown Hash Links): Added this section.
      hib-social.el (social-reference): Changed so disabled this implicit 
button type in html and related modes
        only if within double or single quotes.
      hibtypes.el (pathname):
      hpath.el (hpath:to-markup-anchor): Renamed from hpath:to-html-anchor and 
generalized for use with Markdown as well.
        Added recognition of section links like:
            - [Why was Hyperbole developed?](#why-was-hyperbole-developed)
          so the pathname implicit button type matches when the Action Key is 
pressed anywhere on or after the
          hash character and jumps to the section:
            ## Why was Hyperbole developed?
          accounting for any trailing punctuation and differences in case.
               (hpath:markdown-suffix-regexp, hpath:markdown-anchor-id-pattern, 
hpath:markdown-section-pattern): Added.
               (hpath:markup-link-anchor-regexp): Renamed from 
hpath:html-link-anchor-regexp.
---
 .hypb                     |  Bin 2398 -> 2548 bytes
 Changes                   |   24 ++++++++++++++++-
 DEMO                      |   20 ++++++++++++--
 MANIFEST                  |    2 +-
 Makefile                  |    4 +--
 hib-social.el             |   16 +++++++++---
 hibtypes.el               |   51 ++++++++++++++++++++++++++++++------
 hpath.el                  |   64 ++++++++++++++++++++++++++++++++-------------
 hsys-w3.el => hsys-www.el |   10 +++----
 hypb.el                   |    2 +-
 man/hyperbole.html        |   27 +++++++++++--------
 man/hyperbole.info        |  Bin 431672 -> 432025 bytes
 man/hyperbole.pdf         |  Bin 793823 -> 794560 bytes
 man/hyperbole.texi        |   21 ++++++++++-----
 man/version.texi          |    8 +++---
 15 files changed, 185 insertions(+), 64 deletions(-)

diff --git a/.hypb b/.hypb
index 451014c..3d0e2d6 100644
Binary files a/.hypb and b/.hypb differ
diff --git a/Changes b/Changes
index b02e77c..e0e71e2 100644
--- a/Changes
+++ b/Changes
@@ -2,9 +2,31 @@
 
 2016-08-05  Bob Weiner  <address@hidden>
 
+* hibtypes.el (annot-bib): Added markdown-mode to the excluded list to avoid 
conflict with its links.
+              (markdown-internal-link): Added to follow internal Markdown 
links.
+  man/hyperbole.texi: (Implicit Buttons): Added markdown-internal-link.
+
+* hsys-www.el: Renamed from hsys-w3.el since it is not related to the Emacs W3 
web browser any longer.
+
+* Demo (HTML and Markdown Hash Links): Added this section.
+  hib-social.el (social-reference): Changed so disabled this implicit button 
type in html and related modes
+    only if within double or single quotes.
+  hibtypes.el (pathname):
+  hpath.el (hpath:to-markup-anchor): Renamed from hpath:to-html-anchor and 
generalized for use with Markdown as well.
+    Added recognition of section links like: 
+        - [Why was Hyperbole developed?](#why-was-hyperbole-developed)
+      so the pathname implicit button type matches when the Action Key is 
pressed anywhere on or after the
+      hash character and jumps to the section:
+        ## Why was Hyperbole developed?
+      accounting for any trailing punctuation and differences in case.
+           (hpath:markdown-suffix-regexp, hpath:markdown-anchor-id-pattern, 
hpath:markdown-section-pattern): Added.
+           (hpath:markup-link-anchor-regexp): Renamed from 
hpath:html-link-anchor-regexp.
+
+* hib-social.el (social-reference): Disabled this implicit button type within 
quoted strings and within
+    parentheses when in Markdown mode.
+
 * hib-social.el (social-reference): Disabled this implicit button type in html 
and related modes so
     in-file link references are not matched as social hash tags and made the 
list of modes a variable,
-
   hpath.el (hpath:to-html-anchor): Added.
            (hpath:find): Rewrote to follow HTML in-file anchor references.
 
diff --git a/DEMO b/DEMO
index a679294..d363235 100644
--- a/DEMO
+++ b/DEMO
@@ -112,7 +112,7 @@ used to return the search results.
 
 You can change which browser is used with {C-h h c w}, the Cust/Web-Search
 menu.  Advanced users can change the search engines listed by editing the
-option, hyperbole-web-search-alist.
+option, <(hyperbole-web-search-alist)>.
 
 ** Help Buffers
 
@@ -251,7 +251,7 @@ operates upon the path.  These are `pathname' implicit 
buttons.  For example,
 activate "HY-ABOUT".  HY-ABOUT or `HY-ABOUT' would work as well or
 "~/.emacs".
 
-** Paths with Line and Column Numbers
+*** Paths with Line and Column Numbers
 
 If you want to display a path at a specific line number and optionally column
 number, then add each number preceded by a colon at the end of the path.
@@ -259,6 +259,22 @@ For example, "HY-ABOUT:10" displays HY-ABOUT at line 10, 
the second
 paragraph, with point at the start of the line.  "HY-ABOUT:18:7" shows the
 first numbered item on line 18 at column 7, where the text starts.
 
+*** HTML and Markdown Hash Links
+
+Often links to HTML and Markdown files use a hash mark (#) plus an identifier
+to refer to a section of such files.  When the Action Key is pressed on any
+such reference, it jumps to the section referenced by the link.
+
+For example, "man/hyperbole.html#Smart-Keys" will take you to the Smart Keys
+description in the HTML version of the Hyperbole manual.  Inside that manual
+in HTML form, "#Smart-Keys" would do the same thing.  Similarly,
+"README.md#why-was-hyperbole-developed" jumps to the referenced section of
+that Markdown file, while accounting for the difference in case, whitespace
+and trailing punctuation between the identifier and the section header.
+(Inline Markdown links surrounded by parentheses and square bracketed
+reference links work similarly but are handled specifically as Markdown
+links, not as pathnames).
+
 *** Path Suffixes and Variables
 
 Most file path buttons directly name their associated files in full, but
diff --git a/MANIFEST b/MANIFEST
index fa43c27..4745150 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -92,5 +92,5 @@ smart-clib-sym      - Test whether symbol appears within a 
set of C libraries
 
 --- EXTERNAL SYSTEM ENCAPSULATIONS ---
 hsys-org.el         - GNU Hyperbole support for Emacs Org mode links
-hsys-w3.el          - GNU Hyperbole support for Emacs W3 World-Wide Web (WWW) 
browsing
+hsys-www.el         - GNU Hyperbole support for Emacs W3 World-Wide Web (WWW) 
browsing
 
diff --git a/Makefile b/Makefile
index fb97328..ef5b751 100644
--- a/Makefile
+++ b/Makefile
@@ -143,7 +143,7 @@ EL_COMPILE = hact.el hactypes.el hargs.el hbdata.el 
hbmap.el hbut.el \
             hib-social.el hibtypes.el \
             hinit.el hload-path.el hlvar.el hmail.el hmh.el hmoccur.el 
hmouse-info.el \
             hmouse-drv.el hmouse-key.el hmouse-mod.el hmouse-sh.el 
hmouse-tag.el \
-            hpath.el hrmail.el hsettings.el hsmail.el hsys-org.el hsys-w3.el 
htz.el \
+            hpath.el hrmail.el hsettings.el hsmail.el hsys-org.el hsys-www.el 
htz.el \
             hycontrol.el hui-jmenu.el hui-menu.el hui-mini.el hui-mouse.el 
hui-select.el \
             hui-window.el hui.el hvar.el hversion.el hvm.el hypb.el 
hyperbole.el \
             hyrolo-logic.el hyrolo-menu.el hyrolo.el hywconfig.el set.el
@@ -158,7 +158,7 @@ ELC_COMPILE =  hactypes.elc hibtypes.elc hib-debbugs.elc 
hib-doc-id.elc hib-kbd.
             hargs.elc hbdata.elc hbmap.elc hbut.elc hgnus.elc hhist.elc \
             hinit.elc hload-path.elc hlvar.elc hmail.elc hmh.elc hmoccur.elc 
hmouse-info.elc \
             hmouse-drv.elc hmouse-key.elc hmouse-mod.elc hmouse-sh.elc 
hmouse-tag.elc \
-            hpath.elc hrmail.elc hsettings.elc hsmail.elc hsys-org.elc 
hsys-w3.elc htz.elc \
+            hpath.elc hrmail.elc hsettings.elc hsmail.elc hsys-org.elc 
hsys-www.elc htz.elc \
             hycontrol.elc hui-jmenu.elc hui-menu.elc hui-mini.elc 
hui-mouse.elc hui-select.elc \
             hui-window.elc hui.elc hvar.elc hversion.elc hvm.elc hypb.elc 
hyperbole.elc \
             hyrolo-logic.elc hyrolo-menu.elc hyrolo.elc hywconfig.elc set.elc
diff --git a/hib-social.el b/hib-social.el
index 55d8fe3..62e441d 100644
--- a/hib-social.el
+++ b/hib-social.el
@@ -29,6 +29,7 @@
 
 (eval-when-compile (require 'browse-url))
 (require 'hbut)
+(require 'hargs)
 
 ;;; ************************************************************************
 ;;; Public variables
@@ -64,7 +65,7 @@
   "Regular expression that matches a social media hashtag or username 
reference.
 See `ibtypes::social-reference' for format details.")
 
-(defvar hibtypes-social-inhibit-modes '(html-mode web-mode xml-mode sgml-mode 
texinfo-mode para-mode)
+(defvar hibtypes-social-inhibit-modes '(texinfo-mode para-mode)
   "*List of major modes in which to inhibit any possible social media tag 
matches.")
 
 ;;; ************************************************************************
@@ -80,8 +81,17 @@ Reference format is:
 The first part of the label for a button of this type is the social
 media service name.  The service name defaults to the value of
 `hibtypes-social-default-service' (default value of \"twitter\")
-when not given, so #hashtag would be the same as twitter#hashtag."
-  (when (and (not (memq major-mode hibtypes-social-inhibit-modes))
+when not given, so #hashtag would be the same as twitter#hashtag.
+
+This will not match within any single line, single or
+double-quoted strings or within any buffer whose major mode is
+listed in `hibtypes-social-inhibit-modes'."
+  (when (and (not (or (memq major-mode hibtypes-social-inhibit-modes)
+                     (hargs:delimited "\"" "\"")
+                     (hargs:delimited "[\`\']" "\'" t)
+                     ;; Avoid Markdown parenthesized hash links
+                     (and (eq major-mode 'markdown-mode)
+                          (hargs:delimited "(" ")"))))
             (save-excursion
               (if (looking-at "address@hidden:alnum:]]")
                   (skip-chars-backward "address@hidden:alnum:]"))
diff --git a/hibtypes.el b/hibtypes.el
index 89b8ee8..91d9ed3 100644
--- a/hibtypes.el
+++ b/hibtypes.el
@@ -75,10 +75,10 @@
 
 (defib pathname ()
   "Makes a valid pathname display the path entry.
-Also works for delimited and non-delimited remote pathnames and
-Texinfo @file{} entries.  Emacs Lisp library files (filenames
-without any directory component that end in .el and .elc) are
-looked up using the `load-path' directory list.
+Also works for delimited and non-delimited remote pathnames, Texinfo @file{}
+entries, HTML # link references and Markdown # section link references.
+Emacs Lisp library files (filenames without any directory component that end
+in .el and .elc) are looked up using the `load-path' directory list.
 
 See `hpath:at-p' function documentation for possible delimiters.
 See `hpath:suffixes' variable documentation for suffixes that are added to or
@@ -234,9 +234,7 @@ constituent character, and must not be in buffers whose 
names begin with a
        buffer-file-name
        (let ((chr (aref (buffer-name) 0)))
         (not (or (eq chr ?\ ) (eq chr ?*))))
-       (not (memq major-mode '(c-mode objc-mode c++-mode java-mode)))
-       ;; Force [PPG-sw-process-id], if defined, to take precedence.
-       (not (htype:names 'ibtypes 'ppg-sw-process))
+       (not (memq major-mode '(c-mode objc-mode c++-mode java-mode 
markdown-mode)))
        (let* ((ref-and-pos (hbut:label-p t "[" "]" t))
              (ref (car ref-and-pos)))
         (and ref (eq ?w (char-syntax (aref ref 0)))
@@ -244,6 +242,43 @@ constituent character, and must not be in buffers whose 
names begin with a
                     (hact 'annot-bib ref))))))
 
 ;;; ========================================================================
+;;; Displays in-file Markdown link referents.
+;;; ========================================================================
+
+(defib markdown-link ()
+  "Displays any in-file Markdown link referent.  Pathnames and urls are 
handled elsewhere."
+  (when (and (eq major-mode 'markdown-mode)
+            (not (hpath:www-at-p)))
+    (let ((opoint (point))
+         npoint)
+      (cond ((markdown-link-p) 
+            (condition-case ()
+                ;; Follows a reference link to its referent.
+                (progn (markdown-jump)
+                       (when (/= opoint (point))
+                         (setq npoint (point))
+                         (goto-char opoint)
+                         (hact 'link-to-file buffer-file-name npoint)))
+              ;; May be on the name of an inline link, so move to the
+              ;; link itself and follow that.
+              (error 
+               (skip-chars-forward "^\]\[()")
+               (if (looking-at "\][\[\(]")
+                   (progn (skip-chars-forward "\]\[\(")
+                          ;; Leave point on the link even if not activated
+                          ;; here, so that code elsewhere activates it.
+                          (if (and (markdown-link-p)
+                                   (not (or (hpath:www-at-p) (hpath:at-p))))
+                              (progn (hpath:display-buffer (current-buffer))
+                                     (hact 'markdown-follow-link-at-point))))
+                 (goto-char opoint)
+                 nil))))
+           ((markdown-wiki-link-p)
+            (hpath:display-buffer (current-buffer))
+            (hact 'markdown-follow-wiki-link-at-point))))))
+            
+
+;;; ========================================================================
 ;;; Summarizes an Internet rfc for random access browsing by section.
 ;;; ========================================================================
 
@@ -859,7 +894,7 @@ GNUS is a news and mail reader."
 ;;; Follows URLs by invoking a web browser.
 ;;; ========================================================================
 
-(require 'hsys-w3)
+(require 'hsys-www)
 
 ;;; ========================================================================
 ;;; Displays Info nodes when double quoted "(file)node" button is activated.
diff --git a/hpath.el b/hpath.el
index ea3a41b..ff2ab60 100644
--- a/hpath.el
+++ b/hpath.el
@@ -281,14 +281,25 @@ use with string-match.")
 ;;; Private variables
 ;;; ************************************************************************
 
-(defconst hpath:html-suffix-regexp "\\.[a-z]*htm[a-z0-9]*"
-  "Regexp that matches to any common html file suffix.")
-
 (defconst hpath:html-anchor-id-pattern "\\(id\\|name\\)=['\"]%s['\"]?"
   "Regexp matching an html anchor id definition and containing a %s for 
replacement of a specific anchor id.")
 
-(defconst hpath:html-link-anchor-regexp (concat "\\(" hpath:html-file-suffix 
"\\)\\(#\\)\\([^\]\[#^{}<>\"\\ \n\t\f\r]*\\)")
-  "Regexp that matches an html filename followed by a hash (#) and an optional 
in-file anchor name.")
+(defconst hpath:html-suffix-regexp "\\.[a-zA-Z]*[hH[tT][mM][a-zA-Z0-9]*"
+  "Regexp that matches to any common html file suffix.")
+
+(defconst hpath:markdown-anchor-id-pattern "^[ ]*%s: "
+  "Regexp matching a Markdown anchor id definition and containing a %s for 
replacement of a specific anchor id.")
+
+(defconst hpath:markdown-section-pattern "^#+[ \t]+%s\\([ \t[:punct:]]*\\)$"
+  "Regexp matching a Markdown section header and containing a %s for 
replacement of a specific section name.")
+
+(defconst hpath:markdown-suffix-regexp "\\.[mM][dD]"
+  "Regexp that matches to a Markdown file suffix.")
+
+(defconst hpath:markup-link-anchor-regexp
+ (concat "\\(" hpath:html-file-suffix "\\|" hpath:markdown-suffix-regexp
+        "\\)\\(#\\)\\([^\]\[#^{}<>\"\\ \n\t\f\r]*\\)")
+  "Regexp that matches an markup filename followed by a hash (#) and an 
optional in-file anchor name.")
 
 (defvar hpath:prefix-regexp "\\`[-!&][ ]*"
   "Regexp matching command characters which may precede a pathname.
@@ -569,7 +580,7 @@ program)."
               ;; Loc may be a buffer without a file
               (if (stringp loc) loc default-directory))
          filename (hpath:absolute-to filename dir)
-         path (if (string-match hpath:html-link-anchor-regexp filename)
+         path (if (string-match hpath:markup-link-anchor-regexp filename)
                   (progn (setq hash t
                                anchor (match-string 3 filename))
                          (substring filename 0 (match-end 1)))
@@ -628,20 +639,37 @@ program)."
                                       (assq 'other-window
                                             hpath:display-where-alist))))
                         path)
-                       (if (or hash anchor) (hpath:to-html-anchor hash anchor))
+                       (if (or hash anchor) (hpath:to-markup-anchor hash 
anchor))
                        t)))))))
 
-(defun hpath:to-html-anchor (hash anchor)
+(defun hpath:to-markup-anchor (hash anchor)
   "Move point to the definition of ANCHOR if found or if only HASH is non-nil, 
move to the beginning of the buffer."
   (cond ((and (stringp anchor) (not (string-empty-p anchor)))
-        (let ((point (point)))
-          (goto-char (point-min))
-          (if (re-search-forward (format hpath:html-anchor-id-pattern 
(regexp-quote anchor)) nil t)
-              (progn (forward-line 0)
-                     (recenter 0))
-            (goto-char point)
-            (error "(hpath:to-html-anchor): Anchor `%s' not found in the 
visible buffer portion"
-                   anchor))))
+        (cond ((string-match hpath:html-suffix-regexp buffer-file-name)
+               ;; HTML link ids are case-sensitive.
+               (let ((opoint (point))
+                     (case-fold-search))
+                 (goto-char (point-min))
+                 (if (re-search-forward (format hpath:html-anchor-id-pattern 
(regexp-quote anchor)) nil t)
+                     (progn (forward-line 0)
+                            (recenter 0))
+                   (goto-char opoint)
+                   (error "(hpath:to-markup-anchor): Anchor `%s' not found in 
the visible buffer portion"
+                          anchor))))
+              ((string-match hpath:markdown-suffix-regexp buffer-file-name)
+               (let ((opoint (point))
+                     ;; Markdown link ids are case insensitive and -
+                     ;; characters may be converted to spaces at the
+                     ;; point of definition.
+                     (case-fold-search t)
+                     (anchor-name (subst-char-in-string ?- ?\  anchor)))
+                 (goto-char (point-min))
+                 (if (re-search-forward (format hpath:markdown-section-pattern 
(regexp-quote anchor-name)) nil t)
+                     (progn (forward-line 0)
+                            (recenter 0))
+                   (goto-char opoint)
+                   (error "(hpath:to-markup-anchor): Section `%s' not found in 
the visible buffer portion"
+                          anchor-name))))))
        (hash (goto-char (point-min)))))
 
 (defun hpath:find-executable (executable-list)
@@ -993,7 +1021,7 @@ to it."
 (defun hpath:handle-urls ()
   (let ((remote-fs-package (hpath:remote-available-p)))
       (progn
-       ;; www-url functions are defined in "hsys-w3.el".
+       ;; www-url functions are defined in "hsys-www.el".
        (put 'expand-file-name   remote-fs-package   'www-url-expand-file-name)
        (put 'find-file-noselect remote-fs-package   
'www-url-find-file-noselect)
        ;; Necessary since Dired overrides other file-name-handler-alist
@@ -1062,7 +1090,7 @@ If `/~' appears, all of FILENAME through that `/' is 
discarded."
     (remove-hook 'file-name-handler-alist
                 (cons hpath:remote-regexp 'tramp-file-name-handler))
 
-    ;; www-url functions are defined in "hsys-w3.el".
+    ;; www-url functions are defined in "hsys-www.el".
     (put 'expand-file-name   'tramp nil)
     (put 'find-file-noselect 'tramp nil)
     ;; Necessary since Dired overrides other file-name-handler-alist
diff --git a/hsys-w3.el b/hsys-www.el
similarity index 94%
rename from hsys-w3.el
rename to hsys-www.el
index d67320a..7f36bf0 100644
--- a/hsys-w3.el
+++ b/hsys-www.el
@@ -1,4 +1,4 @@
-;;; hsys-w3.el ---  GNU Hyperbole support for Emacs World-Wide Web (WWW) 
browsing
+;;; hsys-www.el ---  GNU Hyperbole support for Emacs World-Wide Web (WWW) 
browsing
 ;;
 ;; Author:       Bob Weiner
 ;;
@@ -27,12 +27,10 @@
 ;;; Other required Elisp libraries
 ;;; ************************************************************************
 
+;;; This does not require any particular web browser.
 (require 'browse-url)
 (require 'hbut)
 
-;;; Does not load any particular web browser but requires a package like 'w3'
-;;; to operate properly.
-
 ;;; ************************************************************************
 ;;; Public functions and types
 ;;; ************************************************************************
@@ -112,6 +110,6 @@ is used.  Valid values of this variable include 
`browse-url-default-browser' and
               (current-buffer))
       (apply 'find-file-noselect path args))))
 
-(provide 'hsys-w3)
+(provide 'hsys-www)
 
-;;; hsys-w3.el ends here
+;;; hsys-www.el ends here
diff --git a/hypb.el b/hypb.el
index 0c138a7..9155499 100644
--- a/hypb.el
+++ b/hypb.el
@@ -671,7 +671,7 @@ Without file, the banner is prepended to the current 
buffer."
 (defun hypb:browse-home-page ()
   "Visit the web home page for Hyperbole."
   (interactive)
-  (require 'hsys-w3)
+  (require 'hsys-www)
   (hact 'www-url hypb:home-page))
 
 ;;; ************************************************************************
diff --git a/man/hyperbole.html b/man/hyperbole.html
index ea6cc5b..1152645 100644
--- a/man/hyperbole.html
+++ b/man/hyperbole.html
@@ -3256,7 +3256,8 @@ brings together many existing line finding commands that 
are difficult
 to recall quickly when needed, simplifying finding and then jumping to
 matching lines by using the Action Key.  It includes commands for
 filtering a buffer to just those lines that either match or do not
-match a regular expression.
+match a regular expression.  It also includes a submenu for quick
+access to popular web search engines.
 </p>
 <p>Below are each of the commands on the Find menu.
 </p>
@@ -3277,6 +3278,7 @@ match a regular expression.
 <a name="index-web-search"></a>
 <a name="index-C_002dc-_002f"></a>
 <a name="index-hyperbole_002dweb_002dsearch_002dbrowser_002dfunction"></a>
+<a name="index-hyperbole_002dweb_002dsearch_002dalist"></a>
 <a name="index-hypb_003argrep_002dcommand"></a>
 <a name="index-locate_002dcommand"></a>
 <ul>
@@ -3300,9 +3302,12 @@ match a regular expression.
 </li><li> Web/ -             Select a search engine and term and search with 
them.
                    The option, 
<code>hyperbole-web-search-browser-function</code>,
                    determines whether results are displayed within Emacs or
-                   with an external web browser. Hyperbole typically binds
-                   the key <kbd>{C-c /}</kbd> for quick access to this menu.  
It
-                   looks like this:
+                   with an external web browser. Hyperbole binds
+                   the key <kbd>{C-c /}</kbd> for quick access to this menu, 
if it
+                   is not already bound prior to Hyperbole&rsquo;s 
initialization.
+                   A short video introduction to the Find/Web menu may be found
+                   at <a 
href="https://youtu.be/8lMlJed0-OM";>https://youtu.be/8lMlJed0-OM</a>. The 
Find/Web menu looks
+                   like this: 
 <div class="smallexample">
 <pre class="smallexample">Web&gt;  Amazon Bing Dictionary Elisp Facebook 
Google Hub(git) Images
       Maps RFCs StackOverflow Twitter Wikipedia Youtube
@@ -6827,7 +6832,7 @@ for frame control.  Pressing <kbd>{t}</kbd> switches 
between window and
 frame control once in HyControl.  Hyperbole also binds <kbd>{C-c \}</kbd>
 for quick access to HyControl&rsquo;s window control menu if it was not
 already bound prior to Hyperbole&rsquo;s initialization.  A long video
-demonstrating most of HyControl&rsquo;s features is available at:
+demonstrating most of HyControl&rsquo;s features is available at
 <a href="https://youtu.be/M3-aMh1ccJk";>https://youtu.be/M3-aMh1ccJk</a>.
 </p>
 <a name="index-Info_002ddirectory_002dlist"></a>
@@ -7200,12 +7205,11 @@ is made only if the key is not bound prior to loading 
Hyperbole.
 <a name="index-C_002dc-_002f-2"></a>
 </dd>
 <dt><kbd>{C-c /}</kbd></dt>
-<dd><p>Search the Web: Display a minibuffer menu of web search engines.
-Once an engine is selected, prompt for a search term and
-perform the associated search.  Hyperbole typically binds the
-key <kbd>{C-c /}</kbd> for quick access to this list; otherwise, the
-Find/Web minibuffer menu item, <kbd>{C-h h f w}</kbd>, will do the same
-thing.
+<dd><p>Search the Web: Display a minibuffer menu of web search engines.  Once
+an engine is selected, prompt for a search term and perform the
+associated search.  This binding is made only if the key is not bound
+prior to loading Hyperbole; otherwise, the Find/Web minibuffer menu
+item, <kbd>{C-h h f w}</kbd>, will do the same thing.
 </p>
 <a name="index-key-binding_002c-C_002dc-C_002dr"></a>
 <a name="index-C_002dc-C_002dr-1"></a>
@@ -10688,6 +10692,7 @@ Next: <a href="#Concept-Index" accesskey="n" 
rel="next">Concept Index</a>, Previ
 <tr><td></td><td valign="top"><a 
href="#index-hyperbole-1"><code>hyperbole</code></a>:</td><td>&nbsp;</td><td 
valign="top"><a href="#Smart-Key-_002d-Default-Context">Smart Key - Default 
Context</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="#index-hyperbole_002dinit_002dhook">hyperbole-init-hook</a>:</td><td>&nbsp;</td><td
 valign="top"><a href="#Hook-Variables">Hook Variables</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="#index-hyperbole_002dpopup_002dmenu"><code>hyperbole-popup-menu</code></a>:</td><td>&nbsp;</td><td
 valign="top"><a href="#Smart-Key-_002d-Default-Context">Smart Key - Default 
Context</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="#index-hyperbole_002dweb_002dsearch_002dalist">hyperbole-web-search-alist</a>:</td><td>&nbsp;</td><td
 valign="top"><a href="#Menus">Menus</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="#index-hyperbole_002dweb_002dsearch_002dbrowser_002dfunction">hyperbole-web-search-browser-function</a>:</td><td>&nbsp;</td><td
 valign="top"><a href="#Menus">Menus</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="#index-hyrolo_002dadd"><code>hyrolo-add</code></a>:</td><td>&nbsp;</td><td
 valign="top"><a href="#Rolo-Menu">Rolo Menu</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="#index-hyrolo_002dadd_002dhook">hyrolo-add-hook</a>:</td><td>&nbsp;</td><td
 valign="top"><a href="#Rolo-Keys">Rolo Keys</a></td></tr>
diff --git a/man/hyperbole.info b/man/hyperbole.info
index 00495f6..be63eb0 100644
Binary files a/man/hyperbole.info and b/man/hyperbole.info differ
diff --git a/man/hyperbole.pdf b/man/hyperbole.pdf
index 56ee0ab..8d31186 100644
Binary files a/man/hyperbole.pdf and b/man/hyperbole.pdf differ
diff --git a/man/hyperbole.texi b/man/hyperbole.texi
index 98b014c..620c380 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.1
-Printed July 27, 2016.
+Edition 6.0.2
+Printed August 5, 2016.
 
   Published by the Free Software Foundation, Inc.
   Author:    Bob Weiner
@@ -176,7 +176,7 @@ Printed July 27, 2016.
 
 @center The Everyday Hypertextual Information Manager
 
address@hidden Edition 6.0.1, July 27, 2016.
address@hidden Edition 6.0.2, August 5, 2016.
 
 @sp 2
 @noindent
@@ -1179,6 +1179,12 @@ program.
 Summarizes contents of an Internet rfc from anywhere within an rfc buffer.
 Each line of the summary may be selected to jump to the associated section.
 
address@hidden markdown-internal-link
address@hidden ibtypes markdown-internal-link
address@hidden markdown link
+Displays any in-file Markdown link referent.  Pathnames and urls are
+handled elsewhere.
+
 @item annot-bib
 @findex ibtypes annot-bib
 @cindex bibliography
@@ -1284,10 +1290,11 @@ at line-num and optional column-num.  Also works for 
remote pathnames.
 @cindex remote path
 @cindex filename
 @cindex link, pathname
-Makes a valid pathname display the path entry.  Also works for delimited and
-non-delimited remote pathnames and Texinfo @file{} entries.  Emacs Lisp
-library files (filenames without any directory component that end in .el and
-.elc) are looked up using the @code{load-path} directory list.
+Makes a valid pathname display the path entry.  Texinfo @@file{}
+entries, HTML # link references and Markdown # section link
+references.  Emacs Lisp library files (filenames without any directory
+component that end in .el and .elc) are looked up using
+the @code{load-path} directory list.
 
 @noindent
 See the function documentation for @code{hpath:at-p} for possible
diff --git a/man/version.texi b/man/version.texi
index 3295267..2b828fa 100644
--- a/man/version.texi
+++ b/man/version.texi
@@ -1,4 +1,4 @@
address@hidden UPDATED July 27, 2016
address@hidden UPDATED-MONTH Jul 2016
address@hidden EDITION 6.0.1
address@hidden VERSION 6.0.1
address@hidden UPDATED August 5, 2016
address@hidden UPDATED-MONTH AUG 2016
address@hidden EDITION 6.0.2
address@hidden VERSION 6.0.2