diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2017-07-16 16:08:46 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2017-07-16 17:16:08 -0400 |
| commit | 190371b805dad8c46920dd333f7bac525e6fb34c (patch) | |
| tree | 7316d7bbb4751d08aa480b73d1c54995eb4cca4b /common.sh.in | |
| parent | 3f075458f0f80d53569302795887c41122478c26 (diff) | |
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.
Diffstat (limited to 'common.sh.in')
| -rw-r--r-- | common.sh.in | 6 |
1 files changed, 4 insertions, 2 deletions
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() { |