Bug #195949 - Add one more using_editor conditional for

diff_command. (trunk r8130)

svn path=/main/branches/2.1.2/; revision=8135

diff --git a/bin/etc-update b/bin/etc-update
index 60a55e3b099572a929ff252e78673ebda0443682..7239ed07ba34ec3d63dd9a275c0851a7a2c599b5 100755 (executable)
--- a/bin/etc-update
+++ b/bin/etc-update
@@ -412,8 +412,16 @@ Please select from the menu above (-1 to exit, losing this merge): "
                                   rm ${rm_opts} "${file}"
                                   return 255
                                   ;;
-                               2) ( echo "Showing differences between ${ofile} and ${mfile}"
-                                        diff_command "${ofile}" "${mfile}" ) | ${pager}
+                               2)      if [ "${using_editor}" == 0 ]; then
+                                               (
+                                                       echo "Showing differences between ${ofile} and ${mfile}"
+                                                       diff_command "${ofile}" "${mfile}"
+                                               ) | ${pager}
+                                       else
+                                               echo "Beginning of differences between ${ofile} and ${mfile}"
+                                               diff_command "${ofile}" "${mfile}"
+                                               echo "End of differences between ${ofile} and ${mfile}"
+                                       fi
                                   continue
                                   ;;
                                3) break