From 28a91a6c991a37aa0691f76c95a3e10637596c60 Mon Sep 17 00:00:00 2001
From: Tim Shimmin <tes@sgi.com>
Date: Tue, 25 Sep 2007 04:04:36 +0000
Subject: [PATCH] Make the -l option default for check. Use -xdiff for
 graphical version. Merge of master-melb:xfs-cmds:29761a by kenmcd.

  Make the -l option default for check.
  Use -xdiff for graphical version.
---
 common | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/common b/common
index 6b61abf6..267fce38 100644
--- a/common
+++ b/common
@@ -20,13 +20,6 @@ _setenvironment
 check=${check-true}
 
 diff=diff
-if [ ! -z "$DISPLAY" ]
-then
-    which xdiff >/dev/null 2>&1 && diff=xdiff
-    which gdiff >/dev/null 2>&1 && diff=gdiff
-    which tkdiff >/dev/null 2>&1 && diff=tkdiff
-    which xxdiff >/dev/null 2>&1 && diff=xxdiff
-fi
 verbose=false
 group=false
 xgroup=false
@@ -112,7 +105,8 @@ check options
     -xfs                test XFS (default)
     -udf                test UDF
     -nfs                test NFS
-    -l			line mode diff [xdiff]
+    -l			line mode diff (default)
+    -xdiff		graphical mode diff
     -n			show me, do not run tests
     -q			quick [deprecated]
     -T			output timestamps
@@ -147,9 +141,20 @@ testlist options
 	    xpand=false
 	    ;;
 
-	-l)	# line mode for diff, not gdiff over modems
-	    diff=diff
+	-l)	# line mode for diff, default now, keep for backward compat
+	    xpand=false
+	    ;;
+
+	-xdiff)	# graphical diff mode
 	    xpand=false
+
+	    if [ ! -z "$DISPLAY" ]
+	    then
+		which xdiff >/dev/null 2>&1 && diff=xdiff
+		which gdiff >/dev/null 2>&1 && diff=gdiff
+		which tkdiff >/dev/null 2>&1 && diff=tkdiff
+		which xxdiff >/dev/null 2>&1 && diff=xxdiff
+	    fi
 	    ;;
 
 	-q)	# "quick", no longer used - always quick :-)
-- 
2.30.2