From 190371b805dad8c46920dd333f7bac525e6fb34c Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Sun, 16 Jul 2017 16:08:46 -0400
Subject: ediff: learn --merge, and gain an optional REGEX filter for
 --recursive

This brings it much closer to being a complete interface to ediff on files.
---
 common.sh.in | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'common.sh.in')

diff --git a/common.sh.in b/common.sh.in
index 2488a69..54431fe 100644
--- a/common.sh.in
+++ b/common.sh.in
@@ -1,6 +1,6 @@
 # begin common.sh {{{
 
-# Copyright (C) 2013-2014, 2016 Luke Shumaker <lukeshu@sbcglobal.net>
+# Copyright (C) 2013-2014, 2016-2017 Luke Shumaker <lukeshu@sbcglobal.net>
 #
 # This file is not considered part of GNU Emacs.
 #
@@ -42,7 +42,9 @@ flag() {
 		printf -- "%s\n" "$flag"
 		flag=''
 	fi
-	printf -- "%- ${_flag_indent}s%s\n" "$flag" "$(print "${@:2}")"
+	local text
+	text="$(print "${@:2}")"
+	printf -- "%- ${_flag_indent}s%s\n" "$flag" "${text//$'\n'/"$(printf -- "\n%- ${_flag_indent}s%s\n" '')"}"
 }
 
 error() {
-- 
cgit v1.2.3