[elpa] externals/hyperbole da94aa592b 1/2: Fix global button creation to put button in the proper buffer

[ELPA Syncer]

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

    Fix global button creation to put button in the proper buffer
---
 ChangeLog | 4 ++++
 hui.el    | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 42d5bb9ff7..d2ccb4ee24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+* hui.el (hui:gbut-create, hui:gibut-create): Move position of 'set-buffer' 
call after
+    'hui:buf-writable-err' call so they do not interfere with each other, 
causing buttons
+    to be written to the wrong buffer.
+
 2022-01-23  Mats Lidell  <matsl@gnu.org>
 
 * test/hui-tests.el (hui-gibut-create-link-to-file)
diff --git a/hui.el b/hui.el
index a62b8ab1e2..6e80cb1fb0 100644
--- a/hui.el
+++ b/hui.el
@@ -344,10 +344,11 @@ See `hui:gibut-create' for details."
       (save-excursion
         (setq src-dir default-directory
              actype (hui:actype)
-             but-buf (set-buffer (find-file-noselect gbut:file)))
+             but-buf (find-file-noselect gbut:file))
         (hui:buf-writable-err but-buf "gbut-create")
         ;; This prevents movement of point which might be useful to user.
         (save-excursion
+         (set-buffer but-buf)
          (goto-char (point-max))
           (unless (bolp)
            (insert "\n"))
@@ -481,10 +482,11 @@ Use `hui:gbut-create' to create a global explicit button."
         delimited-label)
     (save-excursion
       (setq delimited-label (concat ibut:label-start lbl ibut:label-end)
-           but-buf (set-buffer (find-file-noselect gbut:file)))
+           but-buf (find-file-noselect gbut:file))
       (hui:buf-writable-err but-buf "gibut-create")
       ;; This prevents movement of point which might be useful to user.
       (save-excursion
+       (set-buffer but-buf)
        (goto-char (point-max))
         (unless (bolp)
          (insert "\n"))