[elpa] externals/hyperbole 936198bb71 1/4: Add texi docs for smerge and smart magit ibtype (#717)

[ELPA Syncer]

branch: externals/hyperbole
commit 936198bb718ebd443c0fca717280355df5df56c5
Author: Mats Lidell <mats.lidell@lidells.se>
Commit: GitHub <noreply@github.com>

    Add texi docs for smerge and smart magit ibtype (#717)
---
 ChangeLog          |  5 +++++
 hibtypes.el        | 12 +++++++-----
 hui-mouse.el       |  8 +++++---
 man/hyperbole.texi | 35 +++++++++++++++++++++++++----------
 4 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b465218c40..929f858511 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2025-04-27  Mats Lidell  <matsl@gnu.org>
+
+* man/hyperbole.texi (Implicit Button Types): smerge ibut.
+    (Smart Key - Magit Mode): Merge conflict lines.
+
 2025-04-27  Bob Weiner  <rsw@gnu.org>
 
 * test/hywiki-tests.el (hywiki-tests--save-referent-keyseries-use-menu): 
Rewrite
diff --git a/hibtypes.el b/hibtypes.el
index 58788c669f..304b0d70e5 100644
--- a/hibtypes.el
+++ b/hibtypes.el
@@ -3,7 +3,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:    19-Sep-91 at 20:45:31
-;; Last-Mod:     27-Apr-25 at 00:40:38 by Bob Weiner
+;; Last-Mod:     27-Apr-25 at 17:09:24 by Mats Lidell
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -1743,7 +1743,9 @@ If a boolean function or variable, display its value."
 ;;; ========================================================================
 
 (defib smerge ()
-  "Act on conflicts in merge buffers, i.e. when smerge-mode is active."
+  "Act on `smerge-mode' buffer conflicts.
+On a merge conflict marker, keep either the upper, both or the lower
+version of the conflict."
   (when (bound-and-true-p smerge-mode)
     (let (op)
       (save-excursion
@@ -1755,9 +1757,9 @@ If a boolean function or variable, display its value."
               ((looking-at smerge-lower-re)
                (setq op 'smerge-keep-all))))
       (when op
-      (save-excursion
-        (ibut:label-set (match-string-no-properties 0) (match-beginning 0) 
(match-end 0))
-        (hact op))))))
+        (save-excursion
+          (ibut:label-set (match-string-no-properties 0) (match-beginning 0) 
(match-end 0))
+          (hact op))))))
 
 (run-hooks 'hibtypes-end-load-hook)
 (provide 'hibtypes)
diff --git a/hui-mouse.el b/hui-mouse.el
index 075b88a9a5..6b926a0103 100644
--- a/hui-mouse.el
+++ b/hui-mouse.el
@@ -3,7 +3,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:    04-Feb-89
-;; Last-Mod:     25-Apr-25 at 23:35:04 by Mats Lidell
+;; Last-Mod:     27-Apr-25 at 16:49:19 by Mats Lidell
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -1569,8 +1569,10 @@ selected buffer.
 If key is pressed:
  (1) on the last line, quit from the magit mode (\"q\" key binding);
  (2) at the end of a line, scroll up a windowful;
- (3) on an initial read-only header line, cycle visibility of diff sections;
- (4) anywhere else, hide/show the thing at point (\"TAB\" key binding)
+ (3) in a `magit-status-mode' buffer on a merge conflict marker, keep
+     either the upper, both or the lower version of the conflict.
+ (4) on an initial read-only header line, cycle visibility of diff sections;
+ (5) anywhere else, hide/show the thing at point (\"TAB\" key binding)
      unless that does nothing in the mode, then jump to the thing at
      point (\"RET\" key binding) but display based on the value of
      `hpath:display-where'."
diff --git a/man/hyperbole.texi b/man/hyperbole.texi
index c0a1cc3361..63b2e40a18 100644
--- a/man/hyperbole.texi
+++ b/man/hyperbole.texi
@@ -7,7 +7,7 @@
 @c Author:       Bob Weiner
 @c
 @c Orig-Date:     6-Nov-91 at 11:18:03
-@c Last-Mod:     20-Apr-25 at 15:14:53 by Bob Weiner
+@c Last-Mod:     27-Apr-25 at 17:00:36 by Mats Lidell
 
 @c %**start of header (This is for running Texinfo on a region.)
 @setfilename hyperbole.info
@@ -171,7 +171,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.</P>
 
 <PRE>
 Edition 9.0.2pre
-Printed April 20, 2025.
+Printed April 27, 2025.
 
   Published by the Free Software Foundation, Inc.
   Author:    Bob Weiner
@@ -213,7 +213,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 @example
 Edition 9.0.2pre
-April 20, 2025
+April 27, 2025
 
   Published by the Free Software Foundation, Inc.
   Author:    Bob Weiner
@@ -2502,11 +2502,17 @@ not installed by default.  You must manually configure 
it and load it from
 the file, @file{@code{$@{hyperb:dir@}}/hib-doc-id.el}).  See the commentary
 at the top of that file for more information.
 
-@findex ibtypes hywiki-existing-word
-@cindex hywiki existing word
-@item hywiki-existing-word
-When on a HyWiki word with an existing page, display its page and
-optional section.
+@findex ibtypes smerge
+@cindex smerge
+@anchor{smerge}
+@item smerge
+Within a merge conflict buffer, with @code{smerge-mode} active, make
+the conflict marker lines into buttons that select what version to
+keep. The upper, center and lower conflict marker lines keep the upper
+conflict, both conflicts or the lower conflict, respectively.
+
+@xref{Smart Key - Magit Mode} for similar buttons for conflict
+resolution from within the @code{magit-status-mode}.
 
 @findex ibtypes completion
 @cindex completion
@@ -2514,6 +2520,12 @@ optional section.
 Insert the completion at point (from a completions buffer) into the
 minibuffer or the other window.
 
+@findex ibtypes hywiki-existing-word
+@cindex hywiki existing word
+@item hywiki-existing-word
+When on a HyWiki word with an existing page, display its page and
+optional section.
+
 @findex ibtypes action
 @cindex action button
 @cindex action implicit button
@@ -11900,8 +11912,11 @@ If pressed within a Magit buffer and not on a button:
   ACTION KEY
      (1) on the last line, quit from the magit mode (@bkbd{q} key binding);
      (2) at the end of a line, scroll up a windowful;
-     (3) on an initial read-only header line, cycle visibility of diff 
sections;
-     (4) anywhere else, hide/show the thing at point (@bkbd{@key{TAB}} key 
binding)
+     (3) in a @code{magit-status-mode} buffer on a merge conflict
+         marker, keep either the upper, both or the lower version of 
+         the conflict. See also @ref{smerge}.
+     (4) on an initial read-only header line, cycle visibility of diff 
sections;
+     (5) anywhere else, hide/show the thing at point (@bkbd{@key{TAB}} key 
binding)
          unless that does nothing in the mode, then jump to the thing at point
          (@bkbd{@key{RET}} key binding) but display based on the value of
          @code{hpath:display-where}.