[elpa] externals/hyperbole 8e6ea41 12/51: Fix ibut handling in programming modes; add button links to glossary

[Stefan Monnier]

branch: externals/hyperbole
commit 8e6ea41a1a3e8a769dbc9d0e466aee46d716f790
Author: Bob Weiner <rsw@gnu.org>
Commit: Bob Weiner <rsw@gnu.org>

    Fix ibut handling in programming modes; add button links to glossary
---
 Changes            |  28 +++++++++++++++++++++-------
 DEMO               |   4 ++--
 HY-NEWS            |   2 +-
 Makefile           |   2 +-
 hbut.el            |  21 +++++++++++----------
 man/hyperbole.html |  27 +++++++++++++++++++++++++++
 man/hyperbole.info | Bin 518845 -> 519705 bytes
 man/hyperbole.pdf  | Bin 1278484 -> 1280037 bytes
 man/hyperbole.texi |  23 +++++++++++++++++++++++
 9 files changed, 86 insertions(+), 21 deletions(-)

diff --git a/Changes b/Changes
index c1e4fe2..797965d 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,17 @@
+2020-01-21  Bob Weiner  <rsw@gnu.org>
+
+* hbut.el (ibut:at-p): Fixed to recognize non-labeled ibuttons in programming 
modes.
+
+* man/hyperbole.texi (Glossary): Added Action Button, Elink, Ilink, Glink
+    definitions to the glossary.
+
+* Makefile (GNUFTP): Added --replace option in case need to quickly replace a
+    release when first uploading it.
+
+==============================================================================
+V7.0.8 post-release changes ^^^^:
+==============================================================================
+
 2020-01-20  Bob Weiner  <rsw@gnu.org>
 
 * Published 7.0.8 test release.
@@ -101,7 +115,7 @@
           (htype:def-symbol): Added.
 
 ==============================================================================
-V7.0.8 changes ^^^^:
+V7.0.8 test release changes ^^^^:
 ==============================================================================
 
 2019-10-01  Bob Weiner  <rsw@gnu.org>
@@ -147,7 +161,7 @@ V7.0.8 changes ^^^^:
     predicate result display.
 
 ==============================================================================
-V7.0.7 changes ^^^^:
+V7.0.7 test release changes ^^^^:
 ==============================================================================
 
 2019-09-17  Bob Weiner  <rsw@gnu.org>
@@ -334,7 +348,7 @@ V7.0.7 changes ^^^^:
 * DEMO: Changed most 'click' uses in DEMO to 'press'.
 
 ==============================================================================
-V7.0.6 changes ^^^^:
+V7.0.6 test release changes ^^^^:
 ==============================================================================
 
 * man/hyperbole.texi (Implicit Button Type Summaries): Changed to Implicit
@@ -355,7 +369,7 @@ V7.0.6 changes ^^^^:
    how to run test code either from .el or .elc files.
 
 ==============================================================================
-V7.0.5 changes ^^^^:
+V7.0.5 test release changes ^^^^:
 ==============================================================================
 
 2019-08-25  Bob Weiner  <rsw@gnu.org>
@@ -435,7 +449,7 @@ V7.0.5 changes ^^^^:
     change the 3rd section and production releases change the second.
 
 ==============================================================================
-V7.0.4 changes ^^^^:
+V7.0.4 test release changes ^^^^:
 ==============================================================================
 
 2019-08-06  Bob Weiner  <rsw@gnu.org>
@@ -443,7 +457,7 @@ V7.0.4 changes ^^^^:
 * hyrolo-menu.el (infodock-hyrolo-menu): Fixed Edit-Rolo to call a function 
rather than an sexp.
 
 ==============================================================================
-V7.0.3b changes ^^^^:
+V7.0.3b test release changes ^^^^:
 ==============================================================================
 
 2019-08-05  Bob Weiner  <rsw@gnu.org>
@@ -723,7 +737,7 @@ for expanded Org mode reference handling.
     support for helm-pydoc buffers.
 
 ==============================================================================
-V7.0.3a changes ^^^^:
+V7.0.3a test release changes ^^^^:
 ==============================================================================
 
 2019-05-11  Bob Weiner  <rsw@gnu.org>
diff --git a/DEMO b/DEMO
index cd93c8b..7dc1899 100644
--- a/DEMO
+++ b/DEMO
@@ -645,8 +645,8 @@ bindings.  Press the Action Key on the Info reference and 
try it.  Press the
 Action Key on the key binding of your personal button file and then store the
 implicit link there if you like.
 
-Since Emacs and most GNU programs include Info manuals, you now a simple way to
-link to and jump to any named item within a manual.
+Since Emacs and most GNU programs include Info manuals, you now have a simple
+way to link to and jump to any named item within a manual.
 
 *** Remote Paths
 
diff --git a/HY-NEWS b/HY-NEWS
index 8fc5862..6a1e716 100644
--- a/HY-NEWS
+++ b/HY-NEWS
@@ -80,7 +80,7 @@
       example of implicit button labels.
 
     - Glossary: Updated Implicit Button and Global Button entries with
-      changes.
+      changes.  Added Action Button, Elink, Ilink, Glink definitions.
 
 
   KOUTLINER
diff --git a/Makefile b/Makefile
index 4e45276..70ef8ab 100644
--- a/Makefile
+++ b/Makefile
@@ -116,7 +116,7 @@ SHELL = /bin/sh
 # Shell commands you may want to change for your particular system.
 CP = \cp -p
 ETAGS = \etags
-GNUFTP = \gnupload --to ftp.gnu.org:hyperbole
+GNUFTP = \gnupload --to ftp.gnu.org:hyperbole --replace
 GPG = \gpg
 GZIP = \gzip -c
 INSTALL = \install -m 644 -c
diff --git a/hbut.el b/hbut.el
index 53c13eb..17e2c5b 100644
--- a/hbut.el
+++ b/hbut.el
@@ -1219,16 +1219,17 @@ excluding delimiters, not just one."
         (label-key-start-end (ibut:label-p nil nil nil t t))
         (lbl-key (car label-key-start-end)))
     (unwind-protect
-       (when (not (hbut:outside-comment-p))
-         ;; Skip past any optional label and separators
-         (when label-key-start-end
-           (goto-char (nth 2 label-key-start-end)) 
-           (when (looking-at ibut:label-separator-regexp)
-             ;; Move past up to 2 possible characters of ibut
-             ;; delimiters; this prevents recognizing labeled,
-             ;; delimited ibuts of a single character but no one
-             ;; should need that.
-             (goto-char (min (+ 2 (match-end 0)) (point-max)))))
+       (progn
+         (when (not (hbut:outside-comment-p))
+           ;; Skip past any optional label and separators
+           (when label-key-start-end
+             (goto-char (nth 2 label-key-start-end)) 
+             (when (looking-at ibut:label-separator-regexp)
+               ;; Move past up to 2 possible characters of ibut
+               ;; delimiters; this prevents recognizing labeled,
+               ;; delimited ibuts of a single character but no one
+               ;; should need that.
+               (goto-char (min (+ 2 (match-end 0)) (point-max))))))
 
          ;; Check for an implicit button at current point, record its
          ;; attributes and return a button symbol for it.
diff --git a/man/hyperbole.html b/man/hyperbole.html
index aec4361..163bfd3 100644
--- a/man/hyperbole.html
+++ b/man/hyperbole.html
@@ -7184,11 +7184,18 @@ if any emacs-related terms are unfamiliar to you.
 </p>
 <dl compact="compact">
 <dt><b>Action</b></dt>
+<dt><b>Button Action</b></dt>
 <dd><p>An executable behavior associated with a Hyperbole button.  
<em>Links</em>
 are a specific class of actions which display existing entities, such as
 files. See also <b>Action Type</b>.
 </p>
 </dd>
+<dt><b>Action Button</b></dt>
+<dd><p>An implicit button that uses a universal button syntax delimited by 
&lt;angle brackets&gt;
+to invoke any available Hyperbole action type or Emacs Lisp function.  
Alternatively,
+if it is an Emacs Lisp variable name, its action is to display the variable 
value.
+</p>
+</dd>
 <dt><b>Action Key</b></dt>
 <dd><p>See <b>Smart Key</b>.
 </p>
@@ -7352,6 +7359,13 @@ its predicate is true.
 location.
 </p>
 </dd>
+<dt><b>Elink</b></dt>
+<dt><b>link-to-ebut</b></dt>
+<dd><p>An Action Button that links to an explicit button.  It begins with 
&lt;elink:
+followed by an explicit button label, an optional ebut file and ends with a
+closing &gt;.
+</p>
+</dd>
 <dt><b>Environment</b></dt>
 <dd><p>See <b>Hyperbole Environment</b>.
 </p>
@@ -7384,6 +7398,12 @@ and may be activated with the Action Key when editing 
this file.  By
 default, this is the same as the user&rsquo;s personal button file.
 </p>
 </dd>
+<dt><b>Glink</b></dt>
+<dt><b>link-to-gbut</b></dt>
+<dd><p>An Action Button that links to a global button.  It begins with 
&lt;glink:
+followed by a global button label and then a closing &gt;.
+</p>
+</dd>
 <dt><b>Global Button File</b></dt>
 <dd><p>See <b>Button File, personal</b> and <b>Global Button</b>.
 </p>
@@ -7433,6 +7453,13 @@ also lookup records from Google/GMail Contacts and the 
Big Brother
 DataBase (BBDB) package.
 </p>
 </dd>
+<dt><b>Ilink</b></dt>
+<dt><b>link-to-ibut</b></dt>
+<dd><p>An Action Button that links to another implicit button.  It begins with 
&lt;ilink:
+followed by an implicit button label, an optional ibut file and ends with a
+closing &gt;.
+</p>
+</dd>
 <dt><b>Implicit Button</b></dt>
 <dd><p>A button recognized contextually by Hyperbole.  Such buttons contain no
 button data but may have an optional preceding label that looks like this:
diff --git a/man/hyperbole.info b/man/hyperbole.info
index ef82339..15cd0bf 100644
Binary files a/man/hyperbole.info and b/man/hyperbole.info differ
diff --git a/man/hyperbole.pdf b/man/hyperbole.pdf
index 190d715..f8b38e1 100644
Binary files a/man/hyperbole.pdf and b/man/hyperbole.pdf differ
diff --git a/man/hyperbole.texi b/man/hyperbole.texi
index 5466944..7b23dde 100644
--- a/man/hyperbole.texi
+++ b/man/hyperbole.texi
@@ -6097,10 +6097,16 @@ if any emacs-related terms are unfamiliar to you.
 @table @b
 
 @item Action
+@itemx Button Action
 An executable behavior associated with a Hyperbole button.  @dfn{Links}
 are a specific class of actions which display existing entities, such as
 files. See also @b{Action Type}.
 
+@item Action Button
+An implicit button that uses a universal button syntax delimited by <angle 
brackets>
+to invoke any available Hyperbole action type or Emacs Lisp function.  
Alternatively,
+if it is an Emacs Lisp variable name, its action is to display the variable 
value.
+
 @item Action Key
 See @b{Smart Key}.
 
@@ -6246,6 +6252,12 @@ its predicate is true.
 A mouse button press in one location and following release in another
 location.
 
+@item Elink
+@itemx link-to-ebut
+An Action Button that links to an explicit button.  It begins with <elink:
+followed by an explicit button label, an optional ebut file and ends with a
+closing >.
+
 @item Environment
 See @b{Hyperbole Environment}.
 
@@ -6274,6 +6286,11 @@ buttons are stored in the file given by the variable 
@code{gbut:file}
 and may be activated with the Action Key when editing this file.  By
 default, this is the same as the user's personal button file.
 
+@item Glink
+@itemx link-to-gbut
+An Action Button that links to a global button.  It begins with <glink:
+followed by a global button label and then a closing >.
+
 @item Global Button File
 See @b{Button File, personal} and @b{Global Button}.
 
@@ -6315,6 +6332,12 @@ multi-line, hierarchically ordered free form text 
records.  It can
 also lookup records from Google/GMail Contacts and the Big Brother
 DataBase (BBDB) package.
 
+@item Ilink
+@itemx link-to-ibut
+An Action Button that links to another implicit button.  It begins with <ilink:
+followed by an implicit button label, an optional ibut file and ends with a
+closing >.
+
 @item Implicit Button
 A button recognized contextually by Hyperbole.  Such buttons contain no
 button data but may have an optional preceding label that looks like this: