texinfo: Update to 6.3
This commit is contained in:
Alexey Pavlov
parent
64ac69070a
commit
13532ace03
@ -1,5 +1,5 @@
|
||||
--- origsrc/texinfo-6.0.93/info/t/Init-inter.inc 2016-01-30 14:23:36.000000000 -0500
|
||||
+++ src/texinfo-6.0.93/info/t/Init-inter.inc 2016-02-01 22:08:30.655328200 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/Init-inter.inc 2016-01-30 14:23:36.000000000 -0500
|
||||
+++ src/texinfo-6.1.90/info/t/Init-inter.inc 2016-08-14 20:23:14.113752500 -0400
|
||||
@@ -110,8 +110,8 @@ run_ginfo ()
|
||||
exec 7>&- ;
|
||||
exec 8>$FINISHEDFIFO ;
|
||||
@ -20,8 +20,8 @@
|
||||
|
||||
# Check for pgrep
|
||||
if findprog pgrep; then
|
||||
--- origsrc/texinfo-6.0.93/info/t/Timeout-test.inc 2015-07-13 17:45:42.000000000 -0400
|
||||
+++ src/texinfo-6.0.93/info/t/Timeout-test.inc 2016-02-01 22:08:30.655328200 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/Timeout-test.inc 2015-07-13 17:45:42.000000000 -0400
|
||||
+++ src/texinfo-6.1.90/info/t/Timeout-test.inc 2016-08-14 20:23:14.129378200 -0400
|
||||
@@ -39,7 +39,7 @@ fi
|
||||
# "read -t 0" has an exit status of 1, not 2
|
||||
|
||||
@ -31,8 +31,8 @@
|
||||
status=$?
|
||||
fi
|
||||
|
||||
--- origsrc/texinfo-6.0.93/info/t/adjust-anchors.sh 2015-06-05 11:47:04.000000000 -0400
|
||||
+++ src/texinfo-6.0.93/info/t/adjust-anchors.sh 2016-02-01 22:08:30.655328200 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/adjust-anchors.sh 2015-06-05 11:47:04.000000000 -0400
|
||||
+++ src/texinfo-6.1.90/info/t/adjust-anchors.sh 2016-08-14 20:23:14.129378200 -0400
|
||||
@@ -27,8 +27,8 @@ run_ginfo -f anchors
|
||||
|
||||
# Go to anchor in a UTF-8 encoded file when the current character encoding is
|
||||
@ -44,8 +44,8 @@
|
||||
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
--- origsrc/texinfo-6.0.93/info/t/all-only.sh 2015-01-29 20:49:27.000000000 -0500
|
||||
+++ src/texinfo-6.0.93/info/t/all-only.sh 2016-02-01 22:08:30.670956500 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/all-only.sh 2015-01-29 20:49:27.000000000 -0500
|
||||
+++ src/texinfo-6.1.90/info/t/all-only.sh 2016-08-14 20:23:14.129378200 -0400
|
||||
@@ -25,7 +25,7 @@ MANPATH=.; export MANPATH
|
||||
# to that file without loading a menu of matching files. This relies
|
||||
# on there being no "intera" entry in "dir".
|
||||
@ -55,8 +55,8 @@
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
grep '^File: intera.info, Node: Top' $GINFO_OUTPUT
|
||||
--- origsrc/texinfo-6.0.93/info/t/anchor-positions.sh 2015-01-29 20:49:46.000000000 -0500
|
||||
+++ src/texinfo-6.0.93/info/t/anchor-positions.sh 2016-02-01 22:08:30.670956500 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/anchor-positions.sh 2015-01-29 20:49:46.000000000 -0500
|
||||
+++ src/texinfo-6.1.90/info/t/anchor-positions.sh 2016-08-14 20:23:14.145004900 -0400
|
||||
@@ -22,7 +22,7 @@ srcdir=${srcdir:-.}
|
||||
# encoding conversion doesn't cause the program to freeze.
|
||||
LANG=en_US.iso8859-1; export LANG
|
||||
@ -66,8 +66,8 @@
|
||||
|
||||
. $t/Timeout-test.inc
|
||||
cleanup
|
||||
--- origsrc/texinfo-6.0.93/info/t/body-start.sh 2015-01-29 20:49:53.000000000 -0500
|
||||
+++ src/texinfo-6.0.93/info/t/body-start.sh 2016-02-01 22:08:30.670956500 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/body-start.sh 2015-01-29 20:49:53.000000000 -0500
|
||||
+++ src/texinfo-6.1.90/info/t/body-start.sh 2016-08-14 20:23:14.145004900 -0400
|
||||
@@ -20,7 +20,7 @@ srcdir=${srcdir:-.}
|
||||
|
||||
run_ginfo -f body-start
|
||||
@ -77,8 +77,8 @@
|
||||
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
--- origsrc/texinfo-6.0.93/info/t/c-u-m-x-scroll-forward.sh 2016-01-13 07:32:36.000000000 -0500
|
||||
+++ src/texinfo-6.0.93/info/t/c-u-m-x-scroll-forward.sh 2016-02-01 22:08:30.670956500 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/c-u-m-x-scroll-forward.sh 2016-01-13 07:32:36.000000000 -0500
|
||||
+++ src/texinfo-6.1.90/info/t/c-u-m-x-scroll-forward.sh 2016-08-14 20:23:14.145004900 -0400
|
||||
@@ -31,8 +31,8 @@ COLUMNS=80; export COLUMNS
|
||||
run_ginfo -f intera -n 'Scroll four lines'
|
||||
|
||||
@ -90,8 +90,8 @@
|
||||
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
--- origsrc/texinfo-6.0.93/info/t/dir-dangling-entry.sh 2015-05-18 11:40:57.000000000 -0400
|
||||
+++ src/texinfo-6.0.93/info/t/dir-dangling-entry.sh 2016-02-01 22:08:30.686577100 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/dir-dangling-entry.sh 2015-05-18 11:40:57.000000000 -0400
|
||||
+++ src/texinfo-6.1.90/info/t/dir-dangling-entry.sh 2016-08-14 20:23:14.160651700 -0400
|
||||
@@ -22,7 +22,7 @@ srcdir=${srcdir:-.}
|
||||
|
||||
run_ginfo non-existent
|
||||
@ -101,8 +101,8 @@
|
||||
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
--- origsrc/texinfo-6.0.93/info/t/dir-entry-to-subdir.sh 2015-07-15 09:06:41.000000000 -0400
|
||||
+++ src/texinfo-6.0.93/info/t/dir-entry-to-subdir.sh 2016-02-01 22:08:30.686577100 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/dir-entry-to-subdir.sh 2015-07-15 09:06:41.000000000 -0400
|
||||
+++ src/texinfo-6.1.90/info/t/dir-entry-to-subdir.sh 2016-08-14 20:23:14.160651700 -0400
|
||||
@@ -20,7 +20,7 @@ srcdir=${srcdir:-.}
|
||||
|
||||
# Follow a dir entry to a file in a subdirectory of infodir
|
||||
@ -112,8 +112,19 @@
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
cat $GINFO_OUTPUT
|
||||
--- origsrc/texinfo-6.0.93/info/t/empty-infopath.sh 2015-05-17 05:07:17.000000000 -0400
|
||||
+++ src/texinfo-6.0.93/info/t/empty-infopath.sh 2016-02-01 22:08:30.686577100 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/dir-merge.sh 2016-07-16 07:01:35.000000000 -0400
|
||||
+++ src/texinfo-6.1.90/info/t/dir-merge.sh 2016-08-14 20:28:32.499909100 -0400
|
||||
@@ -23,7 +23,7 @@ INFOPATH=$INFOPATH:$t/infodir/subdir
|
||||
# Follow a reference to file in merged dir
|
||||
run_ginfo -v hide-note-references=On file-in-subdir
|
||||
|
||||
-printf q >$PTY_TYPE
|
||||
+printf q >&7
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
cleanup
|
||||
--- origsrc/texinfo-6.1.90/info/t/empty-infopath.sh 2015-05-17 05:07:17.000000000 -0400
|
||||
+++ src/texinfo-6.1.90/info/t/empty-infopath.sh 2016-08-14 20:23:14.160651700 -0400
|
||||
@@ -24,7 +24,7 @@ srcdir=${srcdir:-.}
|
||||
INFOPATH=
|
||||
export INFOPATH
|
||||
@ -123,8 +134,8 @@
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
cleanup
|
||||
--- origsrc/texinfo-6.0.93/info/t/end-of-line.sh 2015-01-29 20:51:15.000000000 -0500
|
||||
+++ src/texinfo-6.0.93/info/t/end-of-line.sh 2016-02-01 22:08:30.686577100 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/end-of-line.sh 2015-01-29 20:51:15.000000000 -0500
|
||||
+++ src/texinfo-6.1.90/info/t/end-of-line.sh 2016-08-14 20:23:14.160651700 -0400
|
||||
@@ -20,7 +20,7 @@ srcdir=${srcdir:-.}
|
||||
|
||||
run_ginfo -f intera
|
||||
@ -134,8 +145,8 @@
|
||||
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
--- origsrc/texinfo-6.0.93/info/t/gc-split.sh 2016-01-13 07:33:11.000000000 -0500
|
||||
+++ src/texinfo-6.0.93/info/t/gc-split.sh 2016-02-01 22:08:30.702203100 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/gc-split.sh 2016-01-13 07:33:11.000000000 -0500
|
||||
+++ src/texinfo-6.1.90/info/t/gc-split.sh 2016-08-14 20:23:14.176268500 -0400
|
||||
@@ -22,7 +22,7 @@ run_ginfo -f split
|
||||
# Cause the garbage collector to run in a split file by cancelling an
|
||||
# incremental search. Refresh the screen afterwards to increase the
|
||||
@ -145,8 +156,8 @@
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
cleanup
|
||||
--- origsrc/texinfo-6.0.93/info/t/goal-column.sh 2015-01-29 20:51:53.000000000 -0500
|
||||
+++ src/texinfo-6.0.93/info/t/goal-column.sh 2016-02-01 22:08:30.702203100 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/goal-column.sh 2015-01-29 20:51:53.000000000 -0500
|
||||
+++ src/texinfo-6.1.90/info/t/goal-column.sh 2016-08-14 20:23:14.176268500 -0400
|
||||
@@ -20,9 +20,9 @@ srcdir=${srcdir:-.}
|
||||
|
||||
run_ginfo -f intera -n 'Goal column'
|
||||
@ -160,8 +171,8 @@
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
diff $GINFO_OUTPUT $t/node-target
|
||||
--- origsrc/texinfo-6.0.93/info/t/goto-quoted.sh 2015-01-29 20:51:54.000000000 -0500
|
||||
+++ src/texinfo-6.0.93/info/t/goto-quoted.sh 2016-02-01 22:08:30.702203100 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/goto-quoted.sh 2015-01-29 20:51:54.000000000 -0500
|
||||
+++ src/texinfo-6.1.90/info/t/goto-quoted.sh 2016-08-14 20:23:14.176268500 -0400
|
||||
@@ -20,7 +20,7 @@ srcdir=${srcdir:-.}
|
||||
|
||||
run_ginfo -f quoting
|
||||
@ -171,8 +182,8 @@
|
||||
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
--- origsrc/texinfo-6.0.93/info/t/inc-sea-bs-after-strip-cr.sh 2015-09-25 12:28:14.000000000 -0400
|
||||
+++ src/texinfo-6.0.93/info/t/inc-sea-bs-after-strip-cr.sh 2016-02-01 22:08:30.702203100 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/inc-sea-bs-after-strip-cr.sh 2015-09-25 12:28:14.000000000 -0400
|
||||
+++ src/texinfo-6.1.90/info/t/inc-sea-bs-after-strip-cr.sh 2016-08-14 20:23:14.191881400 -0400
|
||||
@@ -23,8 +23,8 @@ srcdir=${srcdir:-.}
|
||||
# stripped from the file. This is the case for the test file because
|
||||
# the tag table entry is incorrect for the second node.
|
||||
@ -184,8 +195,8 @@
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
cleanup
|
||||
--- origsrc/texinfo-6.0.93/info/t/inc-sea-forward-nonregex.sh 2016-01-13 07:31:57.000000000 -0500
|
||||
+++ src/texinfo-6.0.93/info/t/inc-sea-forward-nonregex.sh 2016-02-01 22:08:30.717828300 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/inc-sea-forward-nonregex.sh 2016-01-13 07:31:57.000000000 -0500
|
||||
+++ src/texinfo-6.1.90/info/t/inc-sea-forward-nonregex.sh 2016-08-14 20:23:14.191881400 -0400
|
||||
@@ -24,8 +24,8 @@ run_ginfo -f search
|
||||
# search. Test deleting characters from search string with backspace. Go
|
||||
# forward to match in next node. Test we end up at the end of the match
|
||||
@ -197,8 +208,8 @@
|
||||
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
--- origsrc/texinfo-6.0.93/info/t/inc-sea-forward.sh 2016-01-13 07:32:54.000000000 -0500
|
||||
+++ src/texinfo-6.0.93/info/t/inc-sea-forward.sh 2016-02-01 22:08:30.717828300 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/inc-sea-forward.sh 2016-01-13 07:32:54.000000000 -0500
|
||||
+++ src/texinfo-6.1.90/info/t/inc-sea-forward.sh 2016-08-14 20:23:14.191881400 -0400
|
||||
@@ -24,8 +24,8 @@ run_ginfo -f search
|
||||
# search string with backspace. Go forward to match in next node. Test
|
||||
# we end up at the end of the match string by trying to wrap to the next line
|
||||
@ -210,8 +221,8 @@
|
||||
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
--- origsrc/texinfo-6.0.93/info/t/inc-sea-history.sh 2016-01-13 07:32:59.000000000 -0500
|
||||
+++ src/texinfo-6.0.93/info/t/inc-sea-history.sh 2016-02-01 22:08:30.717828300 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/inc-sea-history.sh 2016-01-13 07:32:59.000000000 -0500
|
||||
+++ src/texinfo-6.1.90/info/t/inc-sea-history.sh 2016-08-14 20:23:14.207521700 -0400
|
||||
@@ -21,15 +21,15 @@ srcdir=${srcdir:-.}
|
||||
run_ginfo -f inc-sea-history
|
||||
|
||||
@ -231,8 +242,8 @@
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
if test $RETVAL = 0; then
|
||||
--- origsrc/texinfo-6.0.93/info/t/inc-sea-insensitive.sh 2016-01-13 07:33:06.000000000 -0500
|
||||
+++ src/texinfo-6.0.93/info/t/inc-sea-insensitive.sh 2016-02-01 22:08:30.717828300 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/inc-sea-insensitive.sh 2016-01-13 07:33:06.000000000 -0500
|
||||
+++ src/texinfo-6.1.90/info/t/inc-sea-insensitive.sh 2016-08-14 20:23:14.207521700 -0400
|
||||
@@ -23,8 +23,8 @@ run_ginfo -f intera -n 'Incremental sear
|
||||
# Search for "match" with incremental search, adding an upper-case character
|
||||
# to make the search case-sensitive. Delete it and check the search goes back
|
||||
@ -244,8 +255,8 @@
|
||||
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
--- origsrc/texinfo-6.0.93/info/t/index-apropos.sh 2015-09-30 09:20:23.000000000 -0400
|
||||
+++ src/texinfo-6.0.93/info/t/index-apropos.sh 2016-02-01 22:08:30.717828300 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/index-apropos.sh 2015-09-30 09:20:23.000000000 -0400
|
||||
+++ src/texinfo-6.1.90/info/t/index-apropos.sh 2016-08-14 20:23:14.207521700 -0400
|
||||
@@ -24,7 +24,7 @@ run_ginfo
|
||||
# result. Then type "i" followed by <TAB> to check the indices in the
|
||||
# file are still there.
|
||||
@ -255,8 +266,8 @@
|
||||
# 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.
|
||||
|
||||
--- origsrc/texinfo-6.0.93/info/t/index-completing.sh 2015-01-29 20:52:07.000000000 -0500
|
||||
+++ src/texinfo-6.0.93/info/t/index-completing.sh 2016-02-01 22:08:30.733453500 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/index-completing.sh 2015-01-29 20:52:07.000000000 -0500
|
||||
+++ src/texinfo-6.1.90/info/t/index-completing.sh 2016-08-14 20:23:14.207521700 -0400
|
||||
@@ -20,7 +20,7 @@ srcdir=${srcdir:-.}
|
||||
|
||||
run_ginfo -f index-search
|
||||
@ -266,8 +277,8 @@
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
grep '^Node: Node 2' $GINFO_OUTPUT
|
||||
--- origsrc/texinfo-6.0.93/info/t/index-long-nodeline.sh 2015-01-29 20:52:09.000000000 -0500
|
||||
+++ src/texinfo-6.0.93/info/t/index-long-nodeline.sh 2016-02-01 22:08:30.733453500 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/index-long-nodeline.sh 2015-01-29 20:52:09.000000000 -0500
|
||||
+++ src/texinfo-6.1.90/info/t/index-long-nodeline.sh 2016-08-14 20:23:14.223133500 -0400
|
||||
@@ -21,7 +21,8 @@ srcdir=${srcdir:-.}
|
||||
run_ginfo -f split
|
||||
# Follow an menu item from the index node to a node where physical lines
|
||||
@ -278,8 +289,8 @@
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
if test ! -f $GINFO_OUTPUT; then
|
||||
--- origsrc/texinfo-6.0.93/info/t/index-search.sh 2015-01-29 20:52:11.000000000 -0500
|
||||
+++ src/texinfo-6.0.93/info/t/index-search.sh 2016-02-01 22:08:30.733453500 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/index-search.sh 2015-01-29 20:52:11.000000000 -0500
|
||||
+++ src/texinfo-6.1.90/info/t/index-search.sh 2016-08-14 20:23:14.223133500 -0400
|
||||
@@ -21,7 +21,7 @@ srcdir=${srcdir:-.}
|
||||
run_ginfo -f intera
|
||||
# Search in indices with 'virtual-index' command. Go down to index
|
||||
@ -289,8 +300,8 @@
|
||||
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
--- origsrc/texinfo-6.0.93/info/t/index.sh 2015-01-29 20:52:12.000000000 -0500
|
||||
+++ src/texinfo-6.0.93/info/t/index.sh 2016-02-01 22:08:30.733453500 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/index.sh 2015-01-29 20:52:12.000000000 -0500
|
||||
+++ src/texinfo-6.1.90/info/t/index.sh 2016-08-14 20:23:14.223133500 -0400
|
||||
@@ -20,7 +20,7 @@ srcdir=${srcdir:-.}
|
||||
|
||||
run_ginfo -f intera
|
||||
@ -300,8 +311,8 @@
|
||||
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
--- origsrc/texinfo-6.0.93/info/t/last-no-history.sh 2015-03-03 10:18:23.000000000 -0500
|
||||
+++ src/texinfo-6.0.93/info/t/last-no-history.sh 2016-02-01 22:08:30.733453500 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/last-no-history.sh 2015-03-03 10:18:23.000000000 -0500
|
||||
+++ src/texinfo-6.1.90/info/t/last-no-history.sh 2016-08-14 20:23:14.238772600 -0400
|
||||
@@ -21,7 +21,7 @@ srcdir=${srcdir:-.}
|
||||
run_ginfo -f intera
|
||||
|
||||
@ -311,8 +322,8 @@
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
cleanup
|
||||
--- origsrc/texinfo-6.0.93/info/t/last-node-not-top-level.sh 2015-01-29 20:52:15.000000000 -0500
|
||||
+++ src/texinfo-6.0.93/info/t/last-node-not-top-level.sh 2016-02-01 22:08:30.749079100 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/last-node-not-top-level.sh 2015-01-29 20:52:15.000000000 -0500
|
||||
+++ src/texinfo-6.1.90/info/t/last-node-not-top-level.sh 2016-08-14 20:23:14.238772600 -0400
|
||||
@@ -21,7 +21,8 @@ srcdir=${srcdir:-.}
|
||||
run_ginfo -f last-node-not-top-level -v scroll-last-node=Top
|
||||
|
||||
@ -323,8 +334,8 @@
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
grep 'Node: Top' $GINFO_OUTPUT
|
||||
--- origsrc/texinfo-6.0.93/info/t/menu-sequence.sh 2015-01-29 20:52:16.000000000 -0500
|
||||
+++ src/texinfo-6.0.93/info/t/menu-sequence.sh 2016-02-01 22:08:30.749079100 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/menu-sequence.sh 2015-01-29 20:52:16.000000000 -0500
|
||||
+++ src/texinfo-6.1.90/info/t/menu-sequence.sh 2016-08-14 20:23:14.238772600 -0400
|
||||
@@ -20,7 +20,8 @@ srcdir=${srcdir:-.}
|
||||
|
||||
run_ginfo -f intera
|
||||
@ -335,8 +346,8 @@
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
if test ! -f $GINFO_OUTPUT; then
|
||||
--- origsrc/texinfo-6.0.93/info/t/next-quoted.sh 2015-03-03 10:18:50.000000000 -0500
|
||||
+++ src/texinfo-6.0.93/info/t/next-quoted.sh 2016-02-01 22:08:30.749079100 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/next-quoted.sh 2015-03-03 10:18:50.000000000 -0500
|
||||
+++ src/texinfo-6.1.90/info/t/next-quoted.sh 2016-08-14 20:23:14.238772600 -0400
|
||||
@@ -20,7 +20,7 @@ srcdir=${srcdir:-.}
|
||||
|
||||
run_ginfo -f quoting
|
||||
@ -346,8 +357,8 @@
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
if test ! -f $GINFO_OUTPUT; then
|
||||
--- origsrc/texinfo-6.0.93/info/t/no-index.sh 2015-01-29 20:52:25.000000000 -0500
|
||||
+++ src/texinfo-6.0.93/info/t/no-index.sh 2016-02-01 22:08:30.749079100 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/no-index.sh 2015-01-29 20:52:25.000000000 -0500
|
||||
+++ src/texinfo-6.1.90/info/t/no-index.sh 2016-08-14 20:23:14.254383900 -0400
|
||||
@@ -20,7 +20,7 @@ srcdir=${srcdir:-.}
|
||||
|
||||
run_ginfo -f sample
|
||||
@ -357,8 +368,8 @@
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
cleanup
|
||||
--- origsrc/texinfo-6.0.93/info/t/quoted-label-and-target.sh 2015-03-03 10:21:53.000000000 -0500
|
||||
+++ src/texinfo-6.0.93/info/t/quoted-label-and-target.sh 2016-02-01 22:08:30.749079100 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/quoted-label-and-target.sh 2015-03-03 10:21:53.000000000 -0500
|
||||
+++ src/texinfo-6.1.90/info/t/quoted-label-and-target.sh 2016-08-14 20:23:14.254383900 -0400
|
||||
@@ -21,7 +21,7 @@ srcdir=${srcdir:-.}
|
||||
run_ginfo -f quoting
|
||||
|
||||
@ -368,8 +379,8 @@
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
if test ! -f $GINFO_OUTPUT; then
|
||||
--- origsrc/texinfo-6.0.93/info/t/quoted-label-as-target.sh 2015-03-03 10:17:19.000000000 -0500
|
||||
+++ src/texinfo-6.0.93/info/t/quoted-label-as-target.sh 2016-02-01 22:08:30.764704800 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/quoted-label-as-target.sh 2015-03-03 10:17:19.000000000 -0500
|
||||
+++ src/texinfo-6.1.90/info/t/quoted-label-as-target.sh 2016-08-14 20:23:14.254383900 -0400
|
||||
@@ -20,7 +20,7 @@ srcdir=${srcdir:-.}
|
||||
|
||||
run_ginfo -f quoting
|
||||
@ -379,8 +390,8 @@
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
if test ! -f $GINFO_OUTPUT; then
|
||||
--- origsrc/texinfo-6.0.93/info/t/quoted-manual-in-label.sh 2015-07-23 06:54:53.000000000 -0400
|
||||
+++ src/texinfo-6.0.93/info/t/quoted-manual-in-label.sh 2016-02-01 22:08:30.764704800 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/quoted-manual-in-label.sh 2015-07-23 06:54:53.000000000 -0400
|
||||
+++ src/texinfo-6.1.90/info/t/quoted-manual-in-label.sh 2016-08-14 20:23:14.270011500 -0400
|
||||
@@ -20,7 +20,7 @@ srcdir=${srcdir:-.}
|
||||
|
||||
run_ginfo -f quoting
|
||||
@ -390,8 +401,8 @@
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
if test ! -f $GINFO_OUTPUT; then
|
||||
--- origsrc/texinfo-6.0.93/info/t/quoted-manual-in-target.sh 2015-07-23 06:56:59.000000000 -0400
|
||||
+++ src/texinfo-6.0.93/info/t/quoted-manual-in-target.sh 2016-02-01 22:08:30.764704800 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/quoted-manual-in-target.sh 2015-07-23 06:56:59.000000000 -0400
|
||||
+++ src/texinfo-6.1.90/info/t/quoted-manual-in-target.sh 2016-08-14 20:23:14.270011500 -0400
|
||||
@@ -21,7 +21,7 @@ srcdir=${srcdir:-.}
|
||||
run_ginfo -f quoting
|
||||
# Follow a cross-reference with a manual and quoted nodename in the target,
|
||||
@ -401,8 +412,8 @@
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
if test ! -f $GINFO_OUTPUT; then
|
||||
--- origsrc/texinfo-6.0.93/info/t/quoted-target.sh 2015-03-03 10:21:27.000000000 -0500
|
||||
+++ src/texinfo-6.0.93/info/t/quoted-target.sh 2016-02-01 22:08:30.764704800 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/quoted-target.sh 2015-03-03 10:21:27.000000000 -0500
|
||||
+++ src/texinfo-6.1.90/info/t/quoted-target.sh 2016-08-14 20:23:14.270011500 -0400
|
||||
@@ -20,7 +20,7 @@ srcdir=${srcdir:-.}
|
||||
|
||||
run_ginfo -f quoting
|
||||
@ -412,8 +423,8 @@
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
if test ! -f $GINFO_OUTPUT; then
|
||||
--- origsrc/texinfo-6.0.93/info/t/relative-reference.sh 2016-01-30 07:02:32.000000000 -0500
|
||||
+++ src/texinfo-6.0.93/info/t/relative-reference.sh 2016-02-01 22:08:30.780330700 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/relative-reference.sh 2016-01-30 07:02:32.000000000 -0500
|
||||
+++ src/texinfo-6.1.90/info/t/relative-reference.sh 2016-08-14 20:23:14.270011500 -0400
|
||||
@@ -22,8 +22,8 @@ srcdir=${srcdir:-.}
|
||||
# Close window (so destination file will be forgotten), and do it again with
|
||||
# the other window.
|
||||
@ -425,8 +436,8 @@
|
||||
|
||||
. $t/Timeout-test.inc
|
||||
cleanup
|
||||
--- origsrc/texinfo-6.0.93/info/t/replace-viewed.sh 2016-01-30 14:44:36.000000000 -0500
|
||||
+++ src/texinfo-6.0.93/info/t/replace-viewed.sh 2016-02-01 22:10:21.317349300 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/replace-viewed.sh 2016-01-30 14:44:36.000000000 -0500
|
||||
+++ src/texinfo-6.1.90/info/t/replace-viewed.sh 2016-08-14 20:23:14.285634800 -0400
|
||||
@@ -32,7 +32,7 @@ if test $GINFO_PID = unknown ; then
|
||||
RETVAL=77 # skip test
|
||||
cleanup
|
||||
@ -447,8 +458,8 @@
|
||||
|
||||
rm -f t/replace-viewed.info
|
||||
. $t/Timeout-test.inc
|
||||
--- origsrc/texinfo-6.0.93/info/t/resize-in-completions.sh 2015-06-06 10:11:40.000000000 -0400
|
||||
+++ src/texinfo-6.0.93/info/t/resize-in-completions.sh 2016-02-01 22:08:30.780330700 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/resize-in-completions.sh 2015-06-06 10:11:40.000000000 -0400
|
||||
+++ src/texinfo-6.1.90/info/t/resize-in-completions.sh 2016-08-14 20:23:14.285634800 -0400
|
||||
@@ -22,16 +22,16 @@ srcdir=${srcdir:-.}
|
||||
|
||||
run_ginfo -f file-menu
|
||||
@ -469,8 +480,8 @@
|
||||
fi
|
||||
|
||||
. $t/Timeout-test.inc
|
||||
--- origsrc/texinfo-6.0.93/info/t/search-after-tag.sh 2015-01-29 20:52:56.000000000 -0500
|
||||
+++ src/texinfo-6.0.93/info/t/search-after-tag.sh 2016-02-01 22:08:30.780330700 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/search-after-tag.sh 2015-01-29 20:52:56.000000000 -0500
|
||||
+++ src/texinfo-6.1.90/info/t/search-after-tag.sh 2016-08-14 20:23:14.285634800 -0400
|
||||
@@ -20,7 +20,7 @@ srcdir=${srcdir:-.}
|
||||
|
||||
run_ginfo -f intera -n Searching
|
||||
@ -480,8 +491,8 @@
|
||||
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
--- origsrc/texinfo-6.0.93/info/t/search-empty.sh 2015-01-29 20:52:58.000000000 -0500
|
||||
+++ src/texinfo-6.0.93/info/t/search-empty.sh 2016-02-01 22:08:30.780330700 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/search-empty.sh 2015-01-29 20:52:58.000000000 -0500
|
||||
+++ src/texinfo-6.1.90/info/t/search-empty.sh 2016-08-14 20:23:14.301272400 -0400
|
||||
@@ -20,7 +20,7 @@ srcdir=${srcdir:-.}
|
||||
|
||||
run_ginfo -f intera
|
||||
@ -491,8 +502,8 @@
|
||||
|
||||
. $t/Timeout-test.inc
|
||||
cleanup
|
||||
--- origsrc/texinfo-6.0.93/info/t/search-skip-screen.sh 2015-01-29 20:52:59.000000000 -0500
|
||||
+++ src/texinfo-6.0.93/info/t/search-skip-screen.sh 2016-02-01 22:08:30.795956000 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/search-skip-screen.sh 2015-01-29 20:52:59.000000000 -0500
|
||||
+++ src/texinfo-6.1.90/info/t/search-skip-screen.sh 2016-08-14 20:23:14.301272400 -0400
|
||||
@@ -21,7 +21,7 @@ srcdir=${srcdir:-.}
|
||||
run_ginfo -v search-skip-screen=Off -f search
|
||||
|
||||
@ -502,8 +513,19 @@
|
||||
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
--- origsrc/texinfo-6.0.93/info/t/split-file-menu.sh 2015-01-29 20:53:06.000000000 -0500
|
||||
+++ src/texinfo-6.0.93/info/t/split-file-menu.sh 2016-02-01 22:08:30.795956000 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/search-split-after-index.sh 2016-02-13 10:13:22.000000000 -0500
|
||||
+++ src/texinfo-6.1.90/info/t/search-split-after-index.sh 2016-08-14 20:28:49.073402700 -0400
|
||||
@@ -21,7 +21,7 @@ srcdir=${srcdir:-.}
|
||||
# Search for text in a split file after loading an index entry from the
|
||||
# command-line.
|
||||
run_ginfo -f split 'Link to node'
|
||||
-printf '/node\r}}}}}q' >$PTY_TYPE
|
||||
+printf '/node\r}}}}}q' >&7
|
||||
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
--- origsrc/texinfo-6.1.90/info/t/split-file-menu.sh 2015-01-29 20:53:06.000000000 -0500
|
||||
+++ src/texinfo-6.1.90/info/t/split-file-menu.sh 2016-08-14 20:23:14.301272400 -0400
|
||||
@@ -23,7 +23,7 @@ run_ginfo -f split 'Second'
|
||||
# Follow a menu entry in a split file to a node in a different subfile from
|
||||
# the one containing "Top". Check that we arrived properly and remembered
|
||||
@ -513,8 +535,8 @@
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
if test ! -f $GINFO_OUTPUT; then
|
||||
--- origsrc/texinfo-6.0.93/info/t/split-footnotes.sh 2015-09-30 09:24:12.000000000 -0400
|
||||
+++ src/texinfo-6.0.93/info/t/split-footnotes.sh 2016-02-01 22:08:30.795956000 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/split-footnotes.sh 2015-09-30 09:24:12.000000000 -0400
|
||||
+++ src/texinfo-6.1.90/info/t/split-footnotes.sh 2016-08-14 20:23:14.301272400 -0400
|
||||
@@ -20,7 +20,7 @@ srcdir=${srcdir:-.}
|
||||
|
||||
run_ginfo -f intera -n 'Node with footnotes' -v automatic-footnotes=On
|
||||
@ -524,8 +546,8 @@
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
cleanup
|
||||
--- origsrc/texinfo-6.0.93/info/t/split-index.sh 2015-01-29 20:53:11.000000000 -0500
|
||||
+++ src/texinfo-6.0.93/info/t/split-index.sh 2016-02-01 22:08:30.795956000 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/split-index.sh 2015-01-29 20:53:11.000000000 -0500
|
||||
+++ src/texinfo-6.1.90/info/t/split-index.sh 2016-08-14 20:23:14.316887200 -0400
|
||||
@@ -21,7 +21,7 @@ srcdir=${srcdir:-.}
|
||||
# Follow an index entry in a split file
|
||||
|
||||
@ -535,8 +557,8 @@
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
if test ! -f $GINFO_OUTPUT; then
|
||||
--- origsrc/texinfo-6.0.93/info/t/star-note-non-whitespace.sh 2015-01-29 20:53:15.000000000 -0500
|
||||
+++ src/texinfo-6.0.93/info/t/star-note-non-whitespace.sh 2016-02-01 22:08:30.811581600 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/star-note-non-whitespace.sh 2015-01-29 20:53:15.000000000 -0500
|
||||
+++ src/texinfo-6.1.90/info/t/star-note-non-whitespace.sh 2016-08-14 20:23:14.316887200 -0400
|
||||
@@ -22,7 +22,7 @@ run_ginfo -f intera -n 'Star note non-wh
|
||||
|
||||
# Check that "*note" is not interpreted as a cross-reference marker if
|
||||
@ -546,8 +568,8 @@
|
||||
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
--- origsrc/texinfo-6.0.93/info/t/tab-argument.sh 2015-01-29 20:53:18.000000000 -0500
|
||||
+++ src/texinfo-6.0.93/info/t/tab-argument.sh 2016-02-01 22:08:30.811581600 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/tab-argument.sh 2015-01-29 20:53:18.000000000 -0500
|
||||
+++ src/texinfo-6.1.90/info/t/tab-argument.sh 2016-08-14 20:23:14.316887200 -0400
|
||||
@@ -20,7 +20,7 @@ srcdir=${srcdir:-.}
|
||||
|
||||
run_ginfo -f intera -n 'Argument to tab'
|
||||
@ -557,8 +579,8 @@
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
diff $GINFO_OUTPUT $t/node-target
|
||||
--- origsrc/texinfo-6.0.93/info/t/tab-no-xref.sh 2015-02-21 05:00:16.000000000 -0500
|
||||
+++ src/texinfo-6.0.93/info/t/tab-no-xref.sh 2016-02-01 22:08:30.811581600 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/tab-no-xref.sh 2015-02-21 05:00:16.000000000 -0500
|
||||
+++ src/texinfo-6.1.90/info/t/tab-no-xref.sh 2016-08-14 20:23:14.332512800 -0400
|
||||
@@ -21,7 +21,7 @@ srcdir=${srcdir:-.}
|
||||
run_ginfo -v scroll-last-node=Top -f no-xref.info
|
||||
# Check that pressing tab in a file with no cross-references or menus
|
||||
@ -568,8 +590,8 @@
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
cleanup
|
||||
--- origsrc/texinfo-6.0.93/info/t/tab-skip-node.sh 2015-02-21 07:13:53.000000000 -0500
|
||||
+++ src/texinfo-6.0.93/info/t/tab-skip-node.sh 2016-02-01 22:08:30.811581600 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/tab-skip-node.sh 2015-02-21 07:13:53.000000000 -0500
|
||||
+++ src/texinfo-6.1.90/info/t/tab-skip-node.sh 2016-08-14 20:23:14.332512800 -0400
|
||||
@@ -23,7 +23,7 @@ run_ginfo -f tab-skip-node
|
||||
# when pressing tab, and then going back in the window history, goes
|
||||
# back to the last node that was actually displayed, and not to the
|
||||
@ -579,8 +601,8 @@
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
grep 'Node: Top' $GINFO_OUTPUT
|
||||
--- origsrc/texinfo-6.0.93/info/t/tab.sh 2015-03-03 11:35:08.000000000 -0500
|
||||
+++ src/texinfo-6.0.93/info/t/tab.sh 2016-02-01 22:08:30.811581600 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/tab.sh 2015-03-03 11:35:08.000000000 -0500
|
||||
+++ src/texinfo-6.1.90/info/t/tab.sh 2016-08-14 20:23:14.332512800 -0400
|
||||
@@ -20,7 +20,7 @@ srcdir=${srcdir:-.}
|
||||
|
||||
run_ginfo -f intera
|
||||
@ -590,8 +612,8 @@
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
if test ! -f $GINFO_OUTPUT; then
|
||||
--- origsrc/texinfo-6.0.93/info/t/window-split-dir.sh 2015-07-14 08:42:33.000000000 -0400
|
||||
+++ src/texinfo-6.0.93/info/t/window-split-dir.sh 2016-02-01 22:08:30.827207600 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/window-split-dir.sh 2015-07-14 08:42:33.000000000 -0400
|
||||
+++ src/texinfo-6.1.90/info/t/window-split-dir.sh 2016-08-14 20:23:14.332512800 -0400
|
||||
@@ -21,7 +21,7 @@ srcdir=${srcdir:-.}
|
||||
# Load dir node
|
||||
run_ginfo
|
||||
@ -601,8 +623,8 @@
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
grep '^File: dir' $GINFO_OUTPUT
|
||||
--- origsrc/texinfo-6.0.93/info/t/xref-across-lines.sh 2015-08-12 16:33:16.000000000 -0400
|
||||
+++ src/texinfo-6.0.93/info/t/xref-across-lines.sh 2016-02-01 22:08:30.827207600 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/xref-across-lines.sh 2015-08-12 16:33:16.000000000 -0400
|
||||
+++ src/texinfo-6.1.90/info/t/xref-across-lines.sh 2016-08-14 20:23:14.348140000 -0400
|
||||
@@ -19,7 +19,7 @@ srcdir=${srcdir:-.}
|
||||
. $t/Init-inter.inc
|
||||
|
||||
@ -612,8 +634,8 @@
|
||||
. $t/Timeout-test.inc
|
||||
|
||||
diff $GINFO_OUTPUT $t/node-target
|
||||
--- origsrc/texinfo-6.0.93/info/t/xref-to-anchor.sh 2015-07-14 08:02:25.000000000 -0400
|
||||
+++ src/texinfo-6.0.93/info/t/xref-to-anchor.sh 2016-02-01 22:08:30.827207600 -0500
|
||||
--- origsrc/texinfo-6.1.90/info/t/xref-to-anchor.sh 2015-07-14 08:02:25.000000000 -0400
|
||||
+++ src/texinfo-6.1.90/info/t/xref-to-anchor.sh 2016-08-14 20:23:14.348140000 -0400
|
||||
@@ -20,10 +20,10 @@ srcdir=${srcdir:-.}
|
||||
|
||||
run_ginfo -f xref_to_anchor
|
||||
@ -1,7 +1,7 @@
|
||||
# Maintainer: Alexey Pavlov <alexpux@gmail.com>
|
||||
|
||||
pkgname=('texinfo' 'info' 'texinfo-tex')
|
||||
pkgver=6.1
|
||||
pkgver=6.3
|
||||
pkgrel=1
|
||||
pkgdesc="Utilities to work with and produce manuals, ASCII text, and on-line documentation from a single source file"
|
||||
arch=('i686' 'x86_64')
|
||||
@ -9,19 +9,15 @@ url="https://www.gnu.org/software/texinfo/"
|
||||
license=('GPL3')
|
||||
makedepends=('ncurses-devel' 'gettext-devel' 'findutils' 'gzip' 'perl')
|
||||
source=(https://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}
|
||||
6.0.93-1-fix_interactive_tests.patch
|
||||
invalid.patch
|
||||
help.patch
|
||||
6.1.90-1-fix_interactive_tests.patch
|
||||
0001-texinfo-5.1-msys2.patch
|
||||
0002-manifest.all.patch
|
||||
0003-be-content-with-older-gettext.msys2.patch
|
||||
0004-no-w32-stuff.msys2.patch
|
||||
0005-fix-makeinfo-exeext.msys2.patch)
|
||||
sha256sums=('ac68394ce21b2420ba7ed7cec65d84aacf308cc88e9bf4716fcfff88286883d2'
|
||||
sha256sums=('246cf3ffa54985118ec2eea2b8d0c71b92114efe6282c2ae90d65029db4cf93a'
|
||||
'SKIP'
|
||||
'ba4a35cee96731d2dbbce3b13fb04fe443ea35b86479bc0227271a9f5547d19f'
|
||||
'bffe0615027b29901ea4be42fd00a7f3dd20f6fa820a61de6eb1aa88a427bfc7'
|
||||
'61f0ea5064bc871c4fdb7809a75ec4e41ae37f76d18bd2ac973a10d74ba9b3ec'
|
||||
'4fde5a5b6d83df412c49076120639accd754f4ed5b3212f999b9324a9195fe13'
|
||||
'78d58e51288fae64b73084d9f275621628a7100d5d79192329c506785a06eb61'
|
||||
'5bc6680fa441b26ed18a794ad201a1252dba9f03d5426c87e42d33c758a4a039'
|
||||
'8631da81d0ee9531afb65df3deeb56a9893b0ee0c13e396449905451d094878b'
|
||||
@ -30,10 +26,8 @@ sha256sums=('ac68394ce21b2420ba7ed7cec65d84aacf308cc88e9bf4716fcfff88286883d2'
|
||||
|
||||
prepare() {
|
||||
cd ${srcdir}/${pkgname}-${pkgver}
|
||||
patch -p2 -i ${srcdir}/6.0.93-1-fix_interactive_tests.patch
|
||||
patch -p0 -i ${srcdir}/invalid.patch
|
||||
patch -p2 -i ${srcdir}/help.patch
|
||||
|
||||
patch -p2 -i ${srcdir}/6.1.90-1-fix_interactive_tests.patch
|
||||
|
||||
patch -p1 -i ${srcdir}/0001-texinfo-5.1-msys2.patch
|
||||
patch -p1 -i ${srcdir}/0002-manifest.all.patch
|
||||
#patch -p1 -i ${srcdir}/0003-be-content-with-older-gettext.msys2.patch
|
||||
|
||||
@ -1,64 +0,0 @@
|
||||
--- origsrc/texinfo-6.1/info/dir.c 2016-02-06 07:20:23.000000000 -0500
|
||||
+++ src/texinfo-6.1/info/dir.c 2016-03-04 16:27:54.478422100 -0500
|
||||
@@ -74,7 +74,7 @@ build_dir_node (void)
|
||||
"A few useful Info commands:\n"
|
||||
"\n"
|
||||
" 'q' quits;\n"
|
||||
-" '?' lists all Info commands;\n"
|
||||
+" 'H' lists all Info commands;\n"
|
||||
" 'h' starts the Info tutorial;\n"
|
||||
" 'mTexinfo RET' visits the Texinfo manual, etc.\n"
|
||||
|
||||
--- origsrc/texinfo-6.1/install-info/install-info.c 2016-02-06 07:20:24.000000000 -0500
|
||||
+++ src/texinfo-6.1/install-info/install-info.c 2016-03-04 16:27:54.478422100 -0500
|
||||
@@ -2,7 +2,7 @@
|
||||
$Id: install-info.c 6906 2016-01-01 18:33:45Z karl $
|
||||
|
||||
Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
||||
- 2005, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015
|
||||
+ 2005, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016
|
||||
Free Software Foundation, Inc.
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
@@ -646,7 +646,7 @@ The first time you invoke Info you start
|
||||
%s\tThis is the top of the INFO tree\n\
|
||||
\n\
|
||||
This (the Directory node) gives a menu of major topics.\n\
|
||||
- Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n\
|
||||
+ Typing \"q\" exits, \"H\" lists all Info commands, \"d\" returns here,\n\
|
||||
\"h\" gives a primer for first-timers,\n\
|
||||
\"mEmacs<Return>\" visits the Emacs manual, etc.\n\
|
||||
\n\
|
||||
--- origsrc/texinfo-6.1/install-info/tests/ii-0018-expected-dir-file 2015-12-16 05:45:49.000000000 -0500
|
||||
+++ src/texinfo-6.1/install-info/tests/ii-0018-expected-dir-file 2016-03-04 16:30:18.949743200 -0500
|
||||
@@ -5,7 +5,7 @@ The first time you invoke Info you start
|
||||
File: dir, Node: Top This is the top of the INFO tree
|
||||
|
||||
This (the Directory node) gives a menu of major topics.
|
||||
- Typing "q" exits, "?" lists all Info commands, "d" returns here,
|
||||
+ Typing "q" exits, "H" lists all Info commands, "d" returns here,
|
||||
"h" gives a primer for first-timers,
|
||||
"mEmacs<Return>" visits the Emacs manual, etc.
|
||||
|
||||
--- origsrc/texinfo-6.1/install-info/tests/ii-0019-expected-dir-file 2015-12-16 06:01:06.000000000 -0500
|
||||
+++ src/texinfo-6.1/install-info/tests/ii-0019-expected-dir-file 2016-03-04 16:30:59.488994700 -0500
|
||||
@@ -5,7 +5,7 @@ The first time you invoke Info you start
|
||||
File: dir, Node: Top This is the top of the INFO tree
|
||||
|
||||
This (the Directory node) gives a menu of major topics.
|
||||
- Typing "q" exits, "?" lists all Info commands, "d" returns here,
|
||||
+ Typing "q" exits, "H" lists all Info commands, "d" returns here,
|
||||
"h" gives a primer for first-timers,
|
||||
"mEmacs<Return>" visits the Emacs manual, etc.
|
||||
|
||||
--- origsrc/texinfo-6.1/util/dir-example 2016-02-06 07:20:25.000000000 -0500
|
||||
+++ src/texinfo-6.1/util/dir-example 2016-03-04 16:27:54.478422100 -0500
|
||||
@@ -17,7 +17,7 @@ This is the Info main menu (aka director
|
||||
A few useful Info commands:
|
||||
|
||||
`q' quits;
|
||||
- `?' lists all Info commands;
|
||||
+ `H' lists all Info commands;
|
||||
`h' starts the Info tutorial;
|
||||
`mTexinfo RET' visits the Texinfo manual, etc.
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
--- info/infokey.c (revision 7039)
|
||||
+++ info/infokey.c (revision 7040)
|
||||
@@ -463,9 +463,12 @@
|
||||
int keymap_bind_keyseq (Keymap, int *, KEYMAP_ENTRY *);
|
||||
|
||||
KEYMAP_ENTRY ke;
|
||||
+ static InfoCommand invalid_function = { 0 };
|
||||
|
||||
ke.type = ISFUNC;
|
||||
- ke.value.function = &function_doc_array[a];
|
||||
+ ke.value.function = a != A_INVALID
|
||||
+ ? &function_doc_array[a]
|
||||
+ : &invalid_function;
|
||||
To_seq (0);
|
||||
|
||||
if (section == info)
|
||||
Loading…
x
Reference in New Issue
Block a user