[texinfo] 04/11: remove outdated patches
This is an automated email from the git hooks/post-receive script.
preining pushed a commit to branch master
in repository texinfo.
commit 1edc73b94735a20f247b803e0efa1f77de737a5c
Author: Norbert Preining <preining@debian.org>
Date: Sat Sep 10 23:04:18 2016 +0900
remove outdated patches
---
debian/patches/do-not-require-automake-1.15 | 22 --
debian/patches/fix-index | 60 ----
debian/patches/series | 9 -
debian/patches/upstream-fix-catcode | 18 --
debian/patches/upstream-svn7021-fix-parsing | 80 ------
debian/patches/upstream-svn7022-fix-ouput | 313 ---------------------
.../upstream-svn7027-remove-debug-statement | 26 --
debian/patches/upstream-svn7031-texi2dvi-fix | 22 --
debian/patches/upstream-svn7032-info-match-nocase | 71 -----
.../patches/upstream-svn7041-fix-single-arg-macros | 119 --------
10 files changed, 740 deletions(-)
diff --git a/debian/patches/do-not-require-automake-1.15 b/debian/patches/do-not-require-automake-1.15
deleted file mode 100644
index d2b7951..0000000
--- a/debian/patches/do-not-require-automake-1.15
+++ /dev/null
@@ -1,22 +0,0 @@
----
- configure | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- texinfo.orig/configure
-+++ texinfo/configure
-@@ -3979,13 +3979,13 @@
-
- # Some tools Automake needs.
-
--ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"}
-
-
- AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
--AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake"}
-
-
- AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
diff --git a/debian/patches/fix-index b/debian/patches/fix-index
deleted file mode 100644
index beb3396..0000000
--- a/debian/patches/fix-index
+++ /dev/null
@@ -1,60 +0,0 @@
-fix expansion of TeX macros in index entries, see bug #815205
-should be upstream as it was sent by Gavin
----
- doc/texinfo.tex | 17 +++++++++++++----
- 1 file changed, 13 insertions(+), 4 deletions(-)
-
---- texinfo.orig/doc/texinfo.tex
-+++ texinfo/doc/texinfo.tex
-@@ -3,7 +3,7 @@
- % Load plain if necessary, i.e., if running under initex.
- \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
- %
--\def\texinfoversion{2016-02-05.07.deb2}
-+\def\texinfoversion{2016-02-05.07.deb3}
- %
- % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
- % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-@@ -5118,7 +5118,6 @@
- \putwordIndexNonexistent
- \else
- \catcode`\\ = 0
-- \escapechar = `\\
- %
- % If the index file exists but is empty, then \openin leaves \ifeof
- % false. We have to make TeX try to read something from the file, so
-@@ -6703,7 +6702,6 @@
- \catcode `\>=\other
- \catcode `\`=\other
- \catcode `\'=\other
-- \escapechar=`\\
- %
- % ' is active in math mode (mathcode"8000). So reset it, and all our
- % other math active characters (just in case), to plain's definitions.
-@@ -7681,14 +7679,25 @@
- % alias because \c means cedilla in @tex or @math
- \let\texinfoc=\c
-
-+\newcount\savedcatcodeone
-+\newcount\savedcatcodetwo
-+
- % Used at the time of macro expansion.
- % Argument is macro body with arguments substituted
- \def\scanmacro#1{%
- \newlinechar`\^^M
- \def\xeatspaces{\eatspaces}%
-+ % Temporarily undo catcode changes of \printindex
-+ \savedcatcodeone=\catcode`\@
-+ \savedcatcodetwo=\catcode`\\
-+ \catcode`\@=0
-+ \catcode`\\=\active
- %
- % Process the macro body under the current catcode regime.
-- \scantokens{#1\texinfoc}\aftermacro%
-+ \scantokens{#1@texinfoc}\aftermacro%
-+ %
-+ \catcode`\@=\savedcatcodeone
-+ \catcode`\\=\savedcatcodetwo
- %
- % The \c is to remove the \newlinechar added by \scantokens, and
- % can be noticed by \parsearg.
diff --git a/debian/patches/series b/debian/patches/series
index f22aa28..9f0a468 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,13 +2,4 @@ warn_missing_tex
numerical-signal-names
dont_build_info
info-manpage-mentiones-nonfree
-#do-not-require-automake-1.15
-#upstream-svn7021-fix-parsing
-#upstream-svn7022-fix-ouput
-#upstream-svn7027-remove-debug-statement
-#upstream-svn7031-texi2dvi-fix
-#upstream-svn7032-info-match-nocase
-#upstream-svn7041-fix-single-arg-macros
-#fix-index
-#upstream-fix-catcode
reproducible-makeinfo
diff --git a/debian/patches/upstream-fix-catcode b/debian/patches/upstream-fix-catcode
deleted file mode 100644
index 78529b2..0000000
--- a/debian/patches/upstream-fix-catcode
+++ /dev/null
@@ -1,18 +0,0 @@
-fix unprotected ~ in second pass (Closes: #822492)
-
-patch by Ted Ts'o, applied upstream
----
- util/texi2dvi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- texinfo.orig/util/texi2dvi
-+++ texinfo/util/texi2dvi
-@@ -812,7 +812,7 @@
-
- # do the special catcode trick for ~ in filenames only for Texinfo,
- # not LaTeX.
-- if test x"$in_lang" = xtexinfo && test $catcode_special = maybe; then
-+ if test x"$in_lang" = xtexinfo && test $catcode_special != false ; then
- catcode_special=true
- else
- catcode_special=false
diff --git a/debian/patches/upstream-svn7021-fix-parsing b/debian/patches/upstream-svn7021-fix-parsing
deleted file mode 100644
index 40370ea..0000000
--- a/debian/patches/upstream-svn7021-fix-parsing
+++ /dev/null
@@ -1,80 +0,0 @@
-Fix for bug #814830 from upstream svn 7021
-2016-02-15 Gavin Smith <gavinsmith0123@gmail.com>
-
- * doc/texinfo.tex (\setchapterstyle, \headings, \setchapternewpage)
- (\everyheadingmarks, \everyfootingmarks): Define with
- \parseargdef to read argument on the line instead of delimiting
- the argument with a space. This is necessary in case newlines
- are active, which is the case at the very start of the file due
- to the definitions in \enablebackslashhack. Broken
- @setchapternewpage reported by Norbert Preining.
- (\enablebackslashhack): Turn off special meanings after two
- active newlines instead of after three, and add comments to
- explain what is going on.
----
- doc/texinfo.tex | 17 +++++++++--------
- 1 file changed, 9 insertions(+), 8 deletions(-)
-
---- texinfo.orig/doc/texinfo.tex
-+++ texinfo/doc/texinfo.tex
-@@ -3,7 +3,7 @@
- % Load plain if necessary, i.e., if running under initex.
- \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
- %
--\def\texinfoversion{2016-02-05.07}
-+\def\texinfoversion{2016-02-05.07.deb1}
- %
- % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
- % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-@@ -3513,9 +3513,9 @@
- \def\oddheadingmarks{\headingmarks{odd}{heading}}
- \def\evenfootingmarks{\headingmarks{even}{footing}}
- \def\oddfootingmarks{\headingmarks{odd}{footing}}
--\def\everyheadingmarks#1 {\headingmarks{even}{heading}{#1}
-+\parseargdef\everyheadingmarks{\headingmarks{even}{heading}{#1}
- \headingmarks{odd}{heading}{#1} }
--\def\everyfootingmarks#1 {\headingmarks{even}{footing}{#1}
-+\parseargdef\everyfootingmarks{\headingmarks{even}{footing}{#1}
- \headingmarks{odd}{footing}{#1} }
- % #1 = even/odd, #2 = heading/footing, #3 = top/bottom.
- \def\headingmarks#1#2#3 {%
-@@ -3536,7 +3536,7 @@
- % By default, they are off at the start of a document,
- % and turned `on' after @end titlepage.
-
--\def\headings #1 {\csname HEADINGS#1\endcsname}
-+\parseargdef\headings{\csname HEADINGS#1\endcsname}
-
- \def\headingsoff{% non-global headings elimination
- \evenheadline={\hfil}\evenfootline={\hfil}%
-@@ -6071,7 +6071,7 @@
- \fi
- }
-
--\def\setchapternewpage #1 {\csname CHAPPAG#1\endcsname}
-+\parseargdef\setchapternewpage{\csname CHAPPAG#1\endcsname}
-
- \def\CHAPPAGoff{%
- \global\let\contentsalignmacro = \chappager
-@@ -6220,7 +6220,7 @@
- % I don't think this chapter style is supported any more, so I'm not
- % updating it with the new noderef stuff. We'll see. --karl, 11aug03.
- %
--\def\setchapterstyle #1 {\csname CHAPF#1\endcsname}
-+\parseargdef\setchapterstyle{\csname CHAPF#1\endcsname}
- %
- \def\unnchfopen #1{%
- \chapoddpage
-@@ -11116,9 +11116,10 @@
- @global@let\ = @eatinput%
- @catcode`@^^M=13%
- @def@c{@fixbackslash@c}%
-+ % Definition for the newline at the end of this file.
- @def ^^M{@let^^M@secondlinenl}%
-- @gdef @secondlinenl{@let^^M@thirdlinenl}%
-- @gdef @thirdlinenl{@fixbackslash}%
-+ % Definition for a newline in the main Texinfo file.
-+ @gdef @secondlinenl{@fixbackslash}%
- }}
-
- {@catcode`@^=7 @catcode`@^^M=13%
diff --git a/debian/patches/upstream-svn7022-fix-ouput b/debian/patches/upstream-svn7022-fix-ouput
deleted file mode 100644
index 24f26fe..0000000
--- a/debian/patches/upstream-svn7022-fix-ouput
+++ /dev/null
@@ -1,313 +0,0 @@
-Fix missing output when doing info --output - (Closes: #814743)
-upstream svn 7022
-
-2016-02-20 Gavin Smith <gavinsmith0123@gmail.com>
-
- * info/info.c (get_initial_file): Handle --file option here
- instead of in 'main', as well as handling invocation as "info
- '(FILE)NODE'", and the full path to FILE as the "initial file". Use
- "dir" as the last resort of the initial file. Don't add a node to the
- list of nodes to load.
- (add_initial_nodes): Add "Top" node to list of nodes to load if no
- others are given. Remove error message for initial_file undefined.
- (main): Handle --where option separately for --all given and not given.
- * info/session.c (info_follow_menus): Free initial node if following
- menus strictly and a menu entry is dangling.
- * info/t/node-no-file.sh: Change expected error message.
-
- This is so that "info --output -" outputs the dir node, as used to
- happen. Vincent Lefevre reported that it doesn't happen for
- Texinfo 6.1.
-
- 2016-02-15 Gavin Smith <gavinsmith0123@gmail.com>
-
- * doc/texinfo.tex (\setchapterstyle, \headings, \setchapternewpage)
----
- info/dir.c | 1
- info/info.c | 165 +++++++++++++++++++++++++++----------------------
- info/session.c | 8 ++
- info/t/node-no-file.sh | 4 -
- 4 files changed, 102 insertions(+), 76 deletions(-)
-
---- texinfo.orig/info/dir.c
-+++ texinfo/info/dir.c
-@@ -52,6 +52,7 @@
-
- node = xmalloc (sizeof (NODE));
- *node = *dir_node;
-+ fprintf(stderr, "%p\n", node);
-
- return node;
- }
---- texinfo.orig/info/info.c
-+++ texinfo/info/info.c
-@@ -165,7 +165,9 @@
- static void init_messages (void);
-
-
--/* Interpret the first non-option argument, either by looking it up as a dir
-+/* Find the first file to load (and possibly the first node as well).
-+ If the --file option is given, use that as the file, otherwise try to
-+ interpret the first non-option argument, either by looking it up as a dir
- entry, looking for a file by that name, or finding a man page by that name.
- Set INITIAL_FILE to the name of the initial Info file. */
- static void
-@@ -173,14 +175,69 @@
- {
- REFERENCE *entry;
-
-+ /* User used "--file". */
-+ if (user_filename)
-+ {
-+ if (!IS_ABSOLUTE(user_filename) && HAS_SLASH(user_filename)
-+ && !(user_filename[0] == '.' && IS_SLASH(user_filename[1])))
-+ {
-+ /* Prefix "./" to the filename to prevent a lookup
-+ in INFOPATH. */
-+ char *s;
-+ asprintf (&s, "%s%s", "./", user_filename);
-+ free (user_filename);
-+ user_filename = s;
-+ }
-+ if (IS_ABSOLUTE(user_filename) || HAS_SLASH(user_filename))
-+ initial_file = info_add_extension (0, user_filename, 0);
-+ else
-+ initial_file = info_find_fullpath (user_filename, 0);
-+
-+ if (!initial_file)
-+ {
-+ if (!filesys_error_number)
-+ filesys_error_number = ENOENT;
-+ *error = filesys_error_string (user_filename, filesys_error_number);
-+ }
-+
-+ return;
-+ }
-+
- if (!(*argv)[0])
-- return;
-+ {
-+ /* No more non-option arguments. */
-+ initial_file = xstrdup("dir");
-+ return;
-+ }
-+
-+ /* If first argument begins with '(', add it as if it were given with
-+ '--node'. This is to support invoking like
-+ "info '(emacs)Buffers'". If it is a well-formed node spec then
-+ the rest of the arguments are menu entries to follow, or an
-+ index entry. */
-+ if ((*argv)[0][0] == '(')
-+ {
-+ info_parse_node ((*argv)[0]);
-+ if (info_parsed_filename)
-+ {
-+ initial_file = info_find_fullpath (info_parsed_filename, 0);
-+ if (initial_file)
-+ {
-+ add_pointer_to_array (info_new_reference (initial_file,
-+ info_parsed_nodename),
-+ ref_index, ref_list, ref_slots, 2);
-+ /* Remove this argument from the argument list. */
-+ memmove (*argv, *argv + 1, *argc-- * sizeof (char *));
-+ return;
-+ }
-+ }
-+ }
-
- /* If there are any more arguments, the initial file is the
- dir entry given by the first one. */
- {
-- /* If they say info info, show them info-stnd.texi. (Get
-- info.texi with info -f info.) */
-+ /* If they say info info (or info -O info, etc.), show them
-+ info-stnd.texi. (Get info.texi with info -f info.) */
- if ((*argv)[0] && mbscasecmp ((*argv)[0], "info") == 0)
- (*argv)[0] = "info-stnd";
-
-@@ -267,8 +324,8 @@
- }
- }
-
-- /* Otherwise, we want the dir node. The only node to be displayed
-- or output will be "Top". */
-+ /* Otherwise, use the dir node. */
-+ initial_file = xstrdup("dir");
- return;
- }
-
-@@ -310,12 +367,7 @@
- int j;
-
- if (!initial_file)
-- {
-- free (*error);
-- asprintf (error, _("No file given for node '%s'."),
-- user_nodenames[i]);
-- continue;
-- }
-+ continue; /* Shouldn't happen. */
-
- /* Check for a node by this name, and if there isn't one
- look for an inexact match. */
-@@ -413,9 +465,16 @@
- free (program);
- }
-
-+ /* Default is the "Top" node if there were no other nodes. */
-+ if (ref_index == 0 && initial_file)
-+ {
-+ add_pointer_to_array (info_new_reference (initial_file, "Top"),
-+ ref_index, ref_list, ref_slots, 2);
-+ }
-+
- /* If there are arguments remaining, they are the names of menu items
- in sequential info files starting from the first one loaded. */
-- else if (*argv && ref_index > 0)
-+ if (*argv && ref_index > 0)
- {
- NODE *initial_node; /* Node to start following menus from. */
- NODE *node_via_menus;
-@@ -459,6 +518,7 @@
- }
- }
-
-+ fprintf(stderr, "B %p\n", initial_node);
- /* If there are arguments remaining, follow menus inexactly. */
- if (argc != 0)
- {
-@@ -883,6 +943,18 @@
- /* If only one match, don't start in a menu of matches. */
- if (ref_index == 1)
- all_matches_p = 0;
-+
-+ /* --where */
-+ if (print_where_p)
-+ {
-+ int i;
-+ if (!ref_list)
-+ exit (1);
-+
-+ for (i = 0; ref_list[i]; i++)
-+ printf ("%s\n", ref_list[i]->filename);
-+ exit (0);
-+ }
- }
- else
- {
-@@ -900,57 +972,7 @@
- }
- }
-
-- /* User used "--file". */
-- if (user_filename)
-- {
-- if (!IS_ABSOLUTE(user_filename) && HAS_SLASH(user_filename)
-- && !(user_filename[0] == '.' && IS_SLASH(user_filename[1])))
-- {
-- /* Prefix "./" to the filename to prevent a lookup
-- in INFOPATH. */
-- char *s;
-- asprintf (&s, "%s%s", "./", user_filename);
-- free (user_filename);
-- user_filename = s;
-- }
-- if (IS_ABSOLUTE(user_filename) || HAS_SLASH(user_filename))
-- initial_file = info_add_extension (0, user_filename, 0);
-- else
-- initial_file = info_find_fullpath (user_filename, 0);
--
-- if (!initial_file)
-- {
-- if (!filesys_error_number)
-- filesys_error_number = ENOENT;
-- error = filesys_error_string (user_filename,
-- filesys_error_number);
-- }
-- else
-- add_pointer_to_array (info_new_reference (initial_file, "Top"),
-- ref_index, ref_list, ref_slots, 2);
-- goto skip_get_initial_file;
-- }
--
-- /* If first argument begins with '(', add it as if it were given with
-- '--node'. This is to support invoking like
-- "info '(emacs)Buffers'". If it is a well-formed node spec then
-- the rest of the arguments are menu entries to follow, or an
-- index entry. */
-- if (argv[0] && argv[0][0] == '(')
-- {
-- info_parse_node (argv[0]);
-- if (info_parsed_filename)
-- {
-- add_pointer_to_array (info_new_reference (info_parsed_filename,
-- info_parsed_nodename),
-- ref_index, ref_list, ref_slots, 2);
-- memmove (argv, argv + 1, argc-- * sizeof (char *));
-- goto skip_get_initial_file;
-- }
-- }
--
- get_initial_file (&argc, &argv, &error);
--skip_get_initial_file:
-
- /* If the user specified `--index-search=STRING',
- start the info session in the node corresponding
-@@ -990,18 +1012,15 @@
- {
- add_initial_nodes (argc, argv, &error);
- }
-- }
-
-- /* --where */
-- if (print_where_p)
-- {
-- int i;
-- if (!ref_list)
-- exit (1);
-+ /* --where */
-+ if (print_where_p)
-+ {
-+ if (initial_file)
-+ printf ("%s\n", initial_file);
-+ exit (0);
-+ }
-
-- for (i = 0; ref_list[i]; i++)
-- printf ("%s\n", ref_list[i]->filename);
-- exit (0);
- }
-
- /* --output */
---- texinfo.orig/info/session.c
-+++ texinfo/info/session.c
-@@ -2815,7 +2815,13 @@
- entry->label,
- node_printed_rep (initial_node));
- }
-- return strict ? 0 : initial_node;
-+ if (strict)
-+ {
-+ free_history_node (initial_node);
-+ return 0;
-+ }
-+ else
-+ return initial_node;
- }
-
- debug (3, ("node: %s, %s", node->fullpath, node->nodename));
---- texinfo.orig/info/t/node-no-file.sh
-+++ texinfo/info/t/node-no-file.sh
-@@ -1,5 +1,5 @@
- #!/bin/sh
--# Copyright (C) 2014 Free Software Foundation, Inc.
-+# Copyright (C) 2014, 2016 Free Software Foundation, Inc.
- #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -19,4 +19,4 @@
-
- # Ask for a node without saying which file it's in
- $GINFO --output - --node nodename \
-- 2>&1 | grep 'No file given'
-+ 2>&1 | grep 'Cannot find node'
diff --git a/debian/patches/upstream-svn7027-remove-debug-statement b/debian/patches/upstream-svn7027-remove-debug-statement
deleted file mode 100644
index fdc09c6..0000000
--- a/debian/patches/upstream-svn7027-remove-debug-statement
+++ /dev/null
@@ -1,26 +0,0 @@
-upstream svn 7027 -- remove debug statements in info
----
- info/dir.c | 1 -
- info/info.c | 1 -
- 2 files changed, 2 deletions(-)
-
---- texinfo.orig/info/dir.c
-+++ texinfo/info/dir.c
-@@ -52,7 +52,6 @@
-
- node = xmalloc (sizeof (NODE));
- *node = *dir_node;
-- fprintf(stderr, "%p\n", node);
-
- return node;
- }
---- texinfo.orig/info/info.c
-+++ texinfo/info/info.c
-@@ -518,7 +518,6 @@
- }
- }
-
-- fprintf(stderr, "B %p\n", initial_node);
- /* If there are arguments remaining, follow menus inexactly. */
- if (argc != 0)
- {
diff --git a/debian/patches/upstream-svn7031-texi2dvi-fix b/debian/patches/upstream-svn7031-texi2dvi-fix
deleted file mode 100644
index 4f6cc1f..0000000
--- a/debian/patches/upstream-svn7031-texi2dvi-fix
+++ /dev/null
@@ -1,22 +0,0 @@
-upstream svn7031 fix for texi2dvi not rebuilding properly
- * util/texi2dvi (filter_files): Ensure that this function does not
- make any non zero return status when the list of new xref files is
- empty. Otherwise that causes a prematurate exit of calling
- function, notably run_index. Remember texi2dvi is running under
- set -e regime.
----
- util/texi2dvi | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- texinfo.orig/util/texi2dvi
-+++ texinfo/util/texi2dvi
-@@ -988,7 +988,8 @@
- # that match PREDICATE.
- filter_files ()
- {
-- test -n "$xref_files_new" && echo "$xref_files_new" |
-+ test -n "$xref_files_new" || return 0
-+ echo "$xref_files_new" |
- # Filter existing files matching the criterion.
- #
- while read file; do
diff --git a/debian/patches/upstream-svn7032-info-match-nocase b/debian/patches/upstream-svn7032-info-match-nocase
deleted file mode 100644
index 974d662..0000000
--- a/debian/patches/upstream-svn7032-info-match-nocase
+++ /dev/null
@@ -1,71 +0,0 @@
-cherrypick upstream svn 7032 to fix case-insensitive info lookups (Closes: #815941)
-
-Changelog entry
- * info/info-utils.c (info_get_menu_entry_by_label): Always check
- case-insensitively, so that manpages are not preferred to a
- case-insensitive dir match when invoking. Problem reported by
- Vincent Lefevre.
----
- info/info-utils.c | 37 ++++++++++++-------------------------
- 1 file changed, 12 insertions(+), 25 deletions(-)
-
---- texinfo.orig/info/info-utils.c
-+++ texinfo/info/info-utils.c
-@@ -215,45 +215,32 @@
-
- /* Get the entry associated with LABEL in the menu of NODE. Return a
- pointer to the ENTRY if found, or null. Return value should not
-- be freed by caller. */
-+ be freed by caller. If SLOPPY, allow initial matches, like
-+ "Buffers" for a LABEL "buffer". */
- REFERENCE *
- info_get_menu_entry_by_label (NODE *node, char *label, int sloppy)
- {
- register int i;
-+ int best_guess = -1;
- REFERENCE *entry;
- REFERENCE **references = node->references;
-
- if (!references)
- return 0;
-
-- /* First look for an exact match. */
- for (i = 0; (entry = references[i]); i++)
- {
-- if (REFERENCE_MENU_ITEM != entry->type) continue;
-- if (strcmp (label, entry->label) == 0)
-- return entry;
-+ if (entry->type != REFERENCE_MENU_ITEM)
-+ continue;
-+ if (mbscasecmp (label, entry->label) == 0)
-+ return entry; /* Exact, case-insensitive match. */
-+ else if (sloppy && best_guess == -1
-+ && (mbsncasecmp (entry->label, label, strlen (label)) == 0))
-+ best_guess = i;
- }
-
-- /* If the item wasn't found, search the list sloppily. Perhaps this
-- user typed "buffer" when they really meant "Buffers". */
-- if (sloppy)
-- {
-- int i;
-- int best_guess = -1;
--
-- for (i = 0; (entry = references[i]); i++)
-- {
-- if (REFERENCE_MENU_ITEM != entry->type) continue;
-- if (mbscasecmp (label, entry->label) == 0)
-- return entry; /* Exact, case-insensitive match. */
-- else if (best_guess == -1
-- && (mbsncasecmp (entry->label, label, strlen (label)) == 0))
-- best_guess = i;
-- }
--
-- if (!entry && best_guess != -1)
-- return references[best_guess];
-- }
-+ if (sloppy && best_guess != -1)
-+ return references[best_guess];
-
- return 0;
- }
diff --git a/debian/patches/upstream-svn7041-fix-single-arg-macros b/debian/patches/upstream-svn7041-fix-single-arg-macros
deleted file mode 100644
index 94c0e02..0000000
--- a/debian/patches/upstream-svn7041-fix-single-arg-macros
+++ /dev/null
@@ -1,119 +0,0 @@
-cherrypick fix for #815734 from upstream
-upstream changelog entry:
-2016-03-05 Gavin Smith <gavinsmith0123@gmail.com>
-
- * doc/texinfo.tex (\defmacro): Don't attempt to strip spaces at
- the start of the argument to a macro taking only one argument.
- This could lead to an error ("Argument of @gobblespaces has an
- extra }") for an empty argmuent. Reported by Norbert Preining
- for ESS manual.
- (\gobblespaces): Removed.
- (\parsemargdef, \scanmacro, \defmacro): Put "\xeatspaces" in
- body of macro, instead of "\processmacroarg". For
- single-argument macros, make it disappear instead of letting it
- equal to \eatspaces.
----
- doc/texinfo.tex | 36 ++++++++++--------------------------
- 1 file changed, 10 insertions(+), 26 deletions(-)
-
---- texinfo.orig/doc/texinfo.tex
-+++ texinfo/doc/texinfo.tex
-@@ -3,7 +3,7 @@
- % Load plain if necessary, i.e., if running under initex.
- \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
- %
--\def\texinfoversion{2016-02-05.07.deb1}
-+\def\texinfoversion{2016-02-05.07.deb2}
- %
- % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
- % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-@@ -7685,7 +7685,7 @@
- % Argument is macro body with arguments substituted
- \def\scanmacro#1{%
- \newlinechar`\^^M
-- \def\xprocessmacroarg{\eatspaces}%
-+ \def\xeatspaces{\eatspaces}%
- %
- % Process the macro body under the current catcode regime.
- \scantokens{#1\texinfoc}\aftermacro%
-@@ -7915,7 +7915,7 @@
- \paramno=0\def\paramlist{}%
- \let\hash\relax
- % \hash is redefined to `#' later to get it into definitions
-- \let\processmacroarg\relax
-+ \let\xeatspaces\relax
- \parsemargdefxxx#1,;,%
- \ifnum\paramno<10\relax\else
- \paramno0\relax
-@@ -7927,7 +7927,7 @@
- \else \let\next=\parsemargdefxxx
- \advance\paramno by 1
- \expandafter\edef\csname macarg.\eatspaces{#1}\endcsname
-- {\processmacroarg{\hash\the\paramno}}%
-+ {\xeatspaces{\hash\the\paramno}}%
- \edef\paramlist{\paramlist\hash\the\paramno,}%
- \fi\next}
-
-@@ -8153,16 +8153,9 @@
- %%%%%%%%%%%%%% End of code for > 10 arguments %%%%%%%%%%%%%%%%%%
-
-
--
--% Remove following spaces at the expansion stage.
--% This works because spaces are discarded before each argument when TeX is
--% getting the arguments for a macro.
--% This must not be immediately followed by a }.
--\long\def\gobblespaces#1{#1}
--
- % This defines a Texinfo @macro or @rmacro, called by \parsemacbody.
- % \macrobody has the body of the macro in it, with placeholders for
--% its parameters, looking like "\processmacroarg{\hash 1}".
-+% its parameters, looking like "\xeatspaces{\hash 1}".
- % \paramno is the number of parameters
- % \paramlist is a TeX parameter text, e.g. "#1,#2,#3,"
- % There are eight cases: recursive and nonrecursive macros of zero, one,
-@@ -8173,14 +8166,13 @@
- \def\defmacro{%
- \let\hash=##% convert placeholders to macro parameter chars
- \ifnum\paramno=1
-- \def\processmacroarg{\gobblespaces}%
-+ \def\xeatspaces##1{##1}%
- % This removes the pair of braces around the argument. We don't
- % use \eatspaces, because this can cause ends of lines to be lost
- % when the argument to \eatspaces is read, leading to line-based
- % commands like "@itemize" not being read correctly.
- \else
-- \def\processmacroarg{\xprocessmacroarg}%
-- \let\xprocessmacroarg\relax
-+ \let\xeatspaces\relax % suppress expansion
- \fi
- \ifrecursive %%%%%%%%%%%%%% Recursive %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- \ifcase\paramno
-@@ -8193,12 +8185,9 @@
- \noexpand\braceorline
- \expandafter\noexpand\csname\the\macname @@@\endcsname}%
- \expandafter\xdef\csname\the\macname @@@\endcsname##1{%
-- \expandafter\noexpand\csname\the\macname @@@@\endcsname{%
-- \noexpand\gobblespaces##1\empty}%
-- % The \empty is for \gobblespaces in case #1 is empty
-- }%
-- \expandafter\xdef\csname\the\macname @@@@\endcsname##1{%
-- \egroup\noexpand\scanmacro{\macrobody}}%
-+ \egroup
-+ \noexpand\scanmacro{\macrobody}%
-+ }%
- \else
- \ifnum\paramno<10\relax % at most 9
- % See non-recursive section below for comments
-@@ -8237,11 +8226,6 @@
- \noexpand\braceorline
- \expandafter\noexpand\csname\the\macname @@@\endcsname}%
- \expandafter\xdef\csname\the\macname @@@\endcsname##1{%
-- \expandafter\noexpand\csname\the\macname @@@@\endcsname{%
-- \noexpand\gobblespaces##1\empty}%
-- % The \empty is for \gobblespaces in case #1 is empty
-- }%
-- \expandafter\xdef\csname\the\macname @@@@\endcsname##1{%
- \egroup
- \noexpand\scanmacro{\macrobody}%
- }%
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/texinfo.git
Reply to: