[elpa] externals/hyperbole dcc51fb827 15/19: Change pushd to cd since /bin/sh does not support pushd

[ELPA Syncer]

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

    Change pushd to cd since /bin/sh does not support pushd
---
 ChangeLog          | 9 ++++++---
 FAST-DEMO          | 2 +-
 hbut.el            | 3 +--
 test/demo-tests.el | 8 ++++----
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5ba684c69f..5617e81393 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+* test/demo-tests.el (fast-demo-key-series-shell-cd-hyperb-dir):
+  FAST-DEMO: Change pushd to cd since /bin/sh does not support pushd.
+
 2022-07-23  Bob Weiner  <rsw@gnu.org>
 
 * hbut.el (ibut:to): Clear any hbut:current attributes before trying
@@ -65,7 +68,7 @@
 * hui-mouse.el (smart-imenu-item-p): Support -99 position value
     that Emacs uses to indicate a rescan should be done.
 
-* test/demo-tests.el (fast-demo-key-series-shell-pushd-hyperb-dir,
+* test/demo-tests.el (fast-demo-key-series-shell-cd-hyperb-dir,
                       fast-demo-key-series-shell-grep,
                       fast-demo-key-series-shell-apropos):
     Use 'sh' instead of 'bash' for wider applicability.
@@ -300,7 +303,7 @@
 
 2022-06-13  Mats Lidell  <matsl@gnu.org>
 
-* test/demo-tests.el (fast-demo-key-series-shell-pushd-hyperb-dir)
+* test/demo-tests.el (fast-demo-key-series-shell-cd-hyperb-dir)
     (fast-demo-key-series-shell-grep, fast-demo-key-series-shell-apropos):
     Tests for shell related key series examples in the fast demo.
 
@@ -420,7 +423,7 @@
 
 * hbut.el (ebut:label-p): Fix handling when point is on final RET and
     have nested lists as in here with braces:
-    { M-x shell RET M-> (pushd ${hyperb:dir}) RET }
+    { M-x shell RET M-> (cd ${hyperb:dir}) RET }
     by adding a (forward-list) call in the first 'while' construct.
 
 2022-05-14  Bob Weiner  <rsw@gnu.org>
diff --git a/FAST-DEMO b/FAST-DEMO
index 08e604944a..a70feb54a0 100644
--- a/FAST-DEMO
+++ b/FAST-DEMO
@@ -187,7 +187,7 @@
        don't forget to reset it to your preferred shell when you are ready
        with the demo.
 
-    { M-x shell RET M-> (pushd ${hyperb:dir}) RET }
+    { M-x shell RET M-> (cd ${hyperb:dir}) RET }
 
        Move to a directory in a shell based on a Lisp variable.  Sections
        within key series surrounded by parentheses maintain spaces between
diff --git a/hbut.el b/hbut.el
index 9864e3c5b2..724ecdac73 100644
--- a/hbut.el
+++ b/hbut.el
@@ -233,7 +233,7 @@ to two lines."
                      (setq start t))
                    start)
                  ;; Handle expressions like:
-                 ;; { M-x shell RET M-> (pushd ${hyperb:dir}) RET }
+                 ;; { M-x shell RET M-> (cd ${hyperb:dir}) RET }
                  (save-excursion
                    (when (eq ?\( (char-syntax (preceding-char)))
                      (condition-case ()
@@ -1563,7 +1563,6 @@ Return nil if no implicit button at point."
     (let* ((types (htype:category 'ibtypes))
           ;; Global var used in (hact) function, don't delete.
           (hrule:action #'actype:identity)
-          (lbl-key-start-end)
           (ibpoint (point-marker))
           (itype)
           (is-type categ))
diff --git a/test/demo-tests.el b/test/demo-tests.el
index 035599546a..1bbfa6b9e6 100644
--- a/test/demo-tests.el
+++ b/test/demo-tests.el
@@ -3,7 +3,7 @@
 ;; Author:       Mats Lidell <matsl@gnu.org>
 ;;
 ;; Orig-Date:    30-Jan-21 at 12:00:00
-;; Last-Mod:     23-Jul-22 at 19:18:48 by Bob Weiner
+;; Last-Mod:     24-Jul-22 at 09:18:04 by Bob Weiner
 ;;
 ;; Copyright (C) 2021  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -526,15 +526,15 @@ enough files with matching mode loaded."
       (global-set-key (kbd "C-x C-b") old)
       (hy-test-helpers:kill-buffer dir))))
 
-(ert-deftest fast-demo-key-series-shell-pushd-hyperb-dir ()
-  "Action key executes pushd shell command."
+(ert-deftest fast-demo-key-series-shell-cd-hyperb-dir ()
+  "Action key executes cd shell command."
   (skip-unless (not noninteractive))
   (let* ((shell-file-name (executable-find "sh"))
          (shell-buffer-name "*shell*")
         (existing-shell-flag (get-buffer-process shell-buffer-name)))
     (unwind-protect
         (with-temp-buffer
-          (insert "{ M-x shell RET M-> (pushd ${hyperb:dir} && echo 
\"PWD=$(pwd)\") RET }")
+          (insert "{ M-x shell RET M-> (cd ${hyperb:dir} && echo 
\"PWD=$(pwd)\") RET }")
           (goto-char 5)
           (action-key)
           (hy-test-helpers:consume-input-events)