sync linked_scripts with Master tree

git-svn-id: svn://tug.org/texlive/trunk@10349 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 5 insertions, 8 deletions

diff --git a/Build/source/texk/texlive/linked_scripts/texdoc.tlu b/Build/source/texk/texlive/linked_scripts/texdoc.tlu
index e02f496db75..54fff3d4e80 100755
--- a/Build/source/texk/texlive/linked_scripts/texdoc.tlu
+++ b/Build/source/texk/texlive/linked_scripts/texdoc.tlu
@@ -1,5 +1,5 @@
 #!/usr/bin/env texlua
--- $Id: texdoc.tlu 10142 2008-08-07 16:06:44Z mpg $ -*-Lua-*-
+-- $Id: texdoc.tlu 10337 2008-08-14 11:40:50Z mpg $ -*-Lua-*-
 --[[Revised 2008 by Manuel Pégourié-Gonnard 
     with contributions from Reinhard Kotucha.
     First texlua versions by Frank Küster (2007). 
@@ -807,7 +807,6 @@ setup_config_from_defaults ()
 -- initialising and saving a few values
 exit_code = 0
 no_regex = true
-real_ext_list = config.ext_list
 real_populate_docfiles = populate_docfiles
 real_mixed_populate_docfiles = mixed_populate_docfiles
 real_real_path = real_path
@@ -831,9 +830,6 @@ for docname in list (arg) do
             populate_docfiles = populate_docfiles_sty
             mixed_populate_docfiles = populate_docfiles_sty
             real_path = function (arg) return arg end
-        elseif docname_ext then 
-            config.ext_list = { docname_ext } 
-            docname = docname_base
         end
     end
     -- main "ifcase mode" construct
@@ -879,7 +875,6 @@ for docname in list (arg) do
         end
     end 
     -- restoring possibly diverted values
-    config.ext_list = real_ext_list
     populate_docfiles = real_populate_docfiles
     mixed_populate_docfiles = real_mixed_populate_docfiles
     real_path = real_real_path
diff --git a/Build/source/texk/texlive/linked_scripts/texdoctk.pl b/Build/source/texk/texlive/linked_scripts/texdoctk.pl
index 08c527e521d..e1c9658f79c 100755
--- a/Build/source/texk/texlive/linked_scripts/texdoctk.pl
+++ b/Build/source/texk/texlive/linked_scripts/texdoctk.pl
@@ -191,7 +191,8 @@ my $deffont=$Qbut->cget(-font);
 # ensure readability on high-res screens (suggested by R.Kotucha)
 $deffont='Helvetica -16 bold' if &x_resolution > 1200;
 $Qbut->configure(-font=>$deffont);
-$tlwins{'mainwindow'}{'buttons'}[1]=$cmdframe->Button(-text=>'Search',
+$tlwins{'mainwindow'}{'buttons'}[1]=$cmdframe->Button(
+                              -text=>'Search texdoctk\'s database',
 						      -font=>$deffont,%butcol,
 						      -command=>\&mksrch
 						      )->pack(-side=>'left');
@@ -809,7 +810,8 @@ sub srchstr {
     destroy $srchentry;
     $srchflag=0;
     if (scalar @results == 0) {
-	&popmsg(0,"Search for $string: no matches found.",$cmdframe);
+	&popmsg(0,"Search for $string: no matches found.\n".
+        "Try `texdoc $string' in a command line.",$cmdframe);
     } else {
 #       cancel multiple entries
 	my ($omit,$pack1,$pack2);