From 0a51a85b5de0ca245252a679f2c44f1d9d0363dd Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Wed, 26 Jan 2022 18:54:58 +0100 Subject: [PATCH] Make smerge-refine-ignore-whitespace into defcustom * lisp/vc/smerge-mode.el (smerge-refine-ignore-whitespace): Make into defcustom (bug#12585). --- lisp/vc/smerge-mode.el | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el index 6a4f6542b5e..003b26eca41 100644 --- a/lisp/vc/smerge-mode.el +++ b/lisp/vc/smerge-mode.el @@ -925,8 +925,11 @@ Its behavior has mainly two restrictions: to `smerge-refine-regions'. This only matters if `smerge-refine-weight-hack' is nil.") -(defvar smerge-refine-ignore-whitespace t - "If non-nil, `smerge-refine' should try to ignore change in whitespace.") +(defcustom smerge-refine-ignore-whitespace t + "If non-nil, `smerge-refine' should try to ignore change in whitespace." + :type 'boolean + :version "29.1" + :group 'diff) (defvar smerge-refine-weight-hack t "If non-nil, pass to diff as many lines as there are chars in the region. -- 2.39.5