[elpa] externals/hyperbole 2399a098a9 2/4: Merge branch 'master' of hyperbole into rsw

[ELPA Syncer]

branch: externals/hyperbole
commit 2399a098a9c099e7a9b9bfbf2501388758ac5bd1
Merge: 602539e0a7 358cbf87a4
Author: Robert Weiner <rsw@gnu.org>
Commit: Robert Weiner <rsw@gnu.org>

    Merge branch 'master' of hyperbole into rsw
---
 ChangeLog          | 10 ++++++++++
 hypb.el            |  4 ++--
 test/MANIFEST      |  3 ++-
 test/hypb-tests.el | 11 ++++++++++-
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1018851e73..0928dc8f8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2023-05-20  Mats Lidell  <matsl@gnu.org>
+
+* test/MANIFEST: Add missing hargs-tests.el.
+
 2023-05-19  Bob Weiner  <rsw@gnu.org>
 
 * hui.el (hui:ebut-link-directly, hui:ibut-link-directly): Display msg at
@@ -45,6 +49,12 @@
 * hsys-org.el (hsys-org-link-at-p): Simplify to use org-link-any-re and require
     an Org version with this.
 
+2023-05-14  Mats Lidell  <matsl@gnu.org>
+
+* hypb.el (hypb:oct-to-int): mapc takes two args.
+
+* test/hypb-tests.el: Add tests for hypb:oct-to-int.
+
 2023-05-14  Bob Weiner  <rsw@gnu.org>
 
 * hui-window.el: Change context-specific commentary to refer to 
"man/hkey-help.txt".
diff --git a/hypb.el b/hypb.el
index 71e8712d44..cc28eeaa2a 100644
--- a/hypb.el
+++ b/hypb.el
@@ -3,7 +3,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:     6-Oct-91 at 03:42:38
-;; Last-Mod:     14-May-23 at 10:51:09 by Bob Weiner
+;; Last-Mod:     14-May-23 at 22:54:11 by Mats Lidell
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -1049,7 +1049,7 @@ Without file, the banner is prepended to the current 
buffer."
            (setq dec-num (+ (* dec-num 8)
                             (when (and (>= o ?0) (<= o ?7))
                               (- o ?0)))))
-         oct-str "")
+         oct-str)
     dec-num))
 
 ;;; ************************************************************************
diff --git a/test/MANIFEST b/test/MANIFEST
index 42e013ce41..a67e84cc0f 100644
--- a/test/MANIFEST
+++ b/test/MANIFEST
@@ -1,6 +1,7 @@
 --- HYPERBOLE TEST CASES ---
 demo-tests.el           - unit tests from examples in the DEMO
-hactypes-test.el        - Ert tests for hactypes
+hactypes-tests.el       - Ert tests for hactypes
+hargs-tests.el          - hargs unit tests
 hbut-tests.el           - hbut unit tests
 hib-kbd-tests.el        - unit test for hib-kbd
 hib-social-tests.el     - Test for hib-social
diff --git a/test/hypb-tests.el b/test/hypb-tests.el
index f742fd2b45..162146588e 100644
--- a/test/hypb-tests.el
+++ b/test/hypb-tests.el
@@ -3,7 +3,7 @@
 ;; Author:       Mats Lidell <matsl@gnu.org>
 ;;
 ;; Orig-Date:     5-Apr-21 at 18:53:10
-;; Last-Mod:     13-May-23 at 10:10:25 by Bob Weiner
+;; Last-Mod:     14-May-23 at 23:12:39 by Mats Lidell
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -65,6 +65,15 @@
       (mock (file-exists-p "/home/user/hyperbole/.git") => nil)
       (should (equal (car (hypb:installation-type)) "unknown")))))
 
+(ert-deftest hypb--oct-to-int ()
+  "Verify oct to int conversion."
+  (should (= (hypb:oct-to-int 0) 0))
+  (should (= (hypb:oct-to-int 1) 1))
+  (should (= (hypb:oct-to-int 7) 7))
+  (should (= (hypb:oct-to-int 10) 8))
+  (should (= (hypb:oct-to-int 2000) 1024))
+  (should-error (hypb:oct-to-int 8) :type 'error))
+
 ;; This file can't be byte-compiled without the `el-mock' package (because of
 ;; the use of the `with-mock' macro), which is not a dependency of Hyperbole.
 ;;  Local Variables: