about summary refs log tree commit diff
path: root/Util
diff options
context:
space:
mode:
authorm0viefreak <m0viefreak.cm@googlemail.com>2014-02-17 05:07:59 +0100
committerPeter Stephenson <p.w.stephenson@ntlworld.com>2014-02-18 19:54:46 +0000
commitcf02c2f0f30b56c24a7357043c098f59c25191ee (patch)
tree8ecac39dd7015917b815e8bad296b68de8f378a3 /Util
parentbc160bc585e54736bb1d2e4a75225b8076218a81 (diff)
downloadzsh-cf02c2f0f30b56c24a7357043c098f59c25191ee.tar.gz
zsh-cf02c2f0f30b56c24a7357043c098f59c25191ee.tar.xz
zsh-cf02c2f0f30b56c24a7357043c098f59c25191ee.zip
prefer col -bx to colcrt in helpfiles
Diffstat (limited to 'Util')
-rwxr-xr-xUtil/helpfiles12
1 files changed, 6 insertions, 6 deletions
diff --git a/Util/helpfiles b/Util/helpfiles
index 9909a1d26..699ca8321 100755
--- a/Util/helpfiles
+++ b/Util/helpfiles
@@ -67,17 +67,17 @@ if(system('man ' . $args) || !(-s $mantmp)) {
 }
 $args = "$mantmp >$coltmp";
 unlink($coltmp);
-&Info('attempting colcrt - ', $args);
-if(system('colcrt - ' . $args) || !(-s $coltmp)) {
-    unlink($coltmp);
-    &Info('attempting col -bx <', $args);
+&Info('attempting col -bx <', $args);
 # The x is necessary so that spaces don't turn into tabs, which messes
 # up the calculations of indentation on machines which randomly wrap lines
 # round to the previous line (so you see what we're up against).
-    if(system('col -bx <' . $args) || !(-s $coltmp)) {
+if(system('col -bx <' . $args) || !(-s $coltmp)) {
+    unlink($coltmp);
+    &Info('attempting colcrt - ', $args);
+    if(system('colcrt - ' . $args) || !(-s $coltmp)) {
         unlink($mantmp);
         unlink($coltmp);
-        &Die('colcrt and col -bx both failed');
+        &Die('col -bx and colcrt - both failed');
     }
 }
 unlink($mantmp) || &Die('cannot remove tempfile ', $mantmp);