[6318] avoid C-g in index-apropos.sh

[Gavin D. Smith]

Revision: 6318
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6318
Author:   gavin
Date:     2015-06-07 15:14:42 +0000 (Sun, 07 Jun 2015)
Log Message:
-----------
avoid C-g in index-apropos.sh

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/info/t/index-apropos.sh

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-06-07 14:22:45 UTC (rev 6317)
+++ trunk/ChangeLog     2015-06-07 15:14:42 UTC (rev 6318)
@@ -1,9 +1,13 @@
 2015-06-07  Gavin Smith  <address@hidden>
 
-       * info/t/replaced-viewed.sh: Use rm -f instead of rm.
+       * info/t/index-apropos.sh: Don't send C-g to controlled program.
 
 2015-06-07  Gavin Smith  <address@hidden>
 
+       * info/t/replace-viewed.sh: Use rm -f instead of rm.
+
+2015-06-07  Gavin Smith  <address@hidden>
+
        * info/nodes.c (forget_info_file): Function replaced.  Don't 
        free the file buffer because it could still be referenced in a 
        displayed node.

Modified: trunk/info/t/index-apropos.sh
===================================================================
--- trunk/info/t/index-apropos.sh       2015-06-07 14:22:45 UTC (rev 6317)
+++ trunk/info/t/index-apropos.sh       2015-06-07 15:14:42 UTC (rev 6318)
@@ -24,22 +24,10 @@
 # result. Then type "i" followed by <TAB> to check the indices in the
 # file are still there.
 
-printf '\033xindex-apropos\rlink\rD' >$PTY_TYPE
+printf '\033xindex-apropos\rlink\r\t\ri\txxxx\rq' >$PTY_TYPE
+# We exited the "i" prompt with "xxx\r" instead of "\007" because
+# C-g leads typeahead to be discarded so it would not be reliable.
 
-# Wait for the M-x index-apropos to finish.  If we don't do this,
-# ginfo sometimes doesn't exit, and is timed out.  We are unsure why
-# but it could be because C-g is interpreted differently while this
-# command is running.
-echo 'waiting for index-apropos to finish...' >&2
-
-# Synchronize
-while ! test -f $GINFO_OUTPUT ; do sleep 1 ; done
-echo ...synchronized >&2
-cat $GINFO_OUTPUT >&2
-rm -f $GINFO_OUTPUT
-
-printf '\t\ri\t\x07q' >$PTY_TYPE
-
 . $t/Timeout-test.inc
 
 cleanup