texdoc 0.64 fixing bug when DISPLAY is unset on Unix.

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

5 files changed, 11 insertions, 5 deletions

diff --git a/Master/texmf/doc/man/man1/texdoc.1 b/Master/texmf/doc/man/man1/texdoc.1
index 721b62b8277..6729b1acccc 100644
--- a/Master/texmf/doc/man/man1/texdoc.1
+++ b/Master/texmf/doc/man/man1/texdoc.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
-.TH TEXDOC "1" "February 2010" "texdoc 0.63" "User Commands"
+.TH TEXDOC "1" "February 2010" "texdoc 0.64" "User Commands"
 .SH NAME
 texdoc \- find & view documentation in TeX Live
 .SH SYNOPSIS
diff --git a/Master/texmf/doc/man/man1/texdoc.man1.pdf b/Master/texmf/doc/man/man1/texdoc.man1.pdf
index 617ce1fa018..6ae1c6d9c35 100644
--- a/Master/texmf/doc/man/man1/texdoc.man1.pdf
+++ b/Master/texmf/doc/man/man1/texdoc.man1.pdf
diff --git a/Master/texmf/doc/texdoc/News b/Master/texmf/doc/texdoc/News
index 433f39c8420..e40ac7dbf31 100644
--- a/Master/texmf/doc/texdoc/News
+++ b/Master/texmf/doc/texdoc/News
@@ -1,3 +1,9 @@
+Version 0.64
+------------
+
+Fix a crash when DISPLAY is unset on Unix by querying xprop more carefully.
+(Bug introduced in 0.61.)
+
 Version 0.63
 ------------
 
@@ -7,7 +13,7 @@ Version 0.62
 ------------
 
 Support for zipped documentation is now an official option.
-Read the warnings before using it!
+Please read the warnings before using it!
 
 Version 0.61
 ------------
diff --git a/Master/texmf/scripts/texdoc/config.tlu b/Master/texmf/scripts/texdoc/config.tlu
index 3ff14178f8c..5ddc77e59bc 100644
--- a/Master/texmf/scripts/texdoc/config.tlu
+++ b/Master/texmf/scripts/texdoc/config.tlu
@@ -382,10 +382,10 @@ function desktop_environment_viewer()
         return '(gnome-open %s) &'
     end
     if not is_in_path('xprop') then return end
-    local xprop_fh = io.popen('xprop -root _DT_SAVE_MODE')
+    local xprop_fh = io.popen('xprop -root _DT_SAVE_MODE 2>/dev/null')
     local xprop_out = xprop_fh:read('*line')
     xprop_fh:close()
-    if string.find(xprop_out, '= "xfce4"$') then     -- xfce
+    if xprop_out and string.find(xprop_out, '= "xfce4"$') then     -- xfce
         return '(exo-open %s) &'
     end
 end
diff --git a/Master/texmf/scripts/texdoc/constants.tlu b/Master/texmf/scripts/texdoc/constants.tlu
index 837e3c0534c..24163ea556b 100644
--- a/Master/texmf/scripts/texdoc/constants.tlu
+++ b/Master/texmf/scripts/texdoc/constants.tlu
@@ -15,7 +15,7 @@ load_env(L, {
 -- progname and version
 fullname    = arg[0]
 progname    = 'texdoc'
-version = '0.63'
+version = '0.64'
 
 -- make sure to update setup_config_from_cl() accordingly
 -- and set a default value in setup_config_from_defaults() if relevant